Merge branch 'master' into stage

src/components/process/PurchasePayment.vue

@@ -147,17 +147,7 @@ const judgeStatus = () => {
   }
   return false;
 };
-const type = ref([
-  {
-    label: "未核销",
-    value: "0",
-  },
-  {
-    label: "发票核销",
-    value: "1",
-  },
-]);
-const advanceCode = ref([]);
+const payMethod = ref([]);
 const formOption = reactive({
   inline: true,
   labelWidth: 100,
@@ -193,7 +183,7 @@ const formConfig = computed(() => {
       type: "select",
       label: "付款类型",
       prop: "type",
-      data: type.value,
+      data: payMethod.value,
       itemWidth: 33,
       style: "width: 100%",
       fn: () => {
@@ -371,6 +361,23 @@ const getDict = () => {
         });
       }
     });
+  proxy
+    .post("/dictTenantData/page", {
+      pageNum: 1,
+      pageSize: 999,
+      dictCode: "pay_method",
+      tenantId: useUserStore().user.tenantId,
+    })
+    .then((res) => {
+      if (res.rows && res.rows.length > 0) {
+        payMethod.value = res.rows.map((item) => {
+          return {
+            label: item.dictValue,
+            value: item.dictKey,
+          };
+        });
+      }
+    });
   proxy.post("/supplierInfo/page", { pageNum: 1, pageSize: 999 }).then((res) => {
     if (res.rows && res.rows.length > 0) {
       supplierList.value = res.rows.map((item) => {

src/views/customer/portrait/index.vue

@@ -38,7 +38,7 @@
           <div class="title-box">
             <TitleInfo :content="titleList[3]"></TitleInfo>
           </div>
-          <div class="content-box">
+          <div class="content-box" style="height: 254px !important">
             <LineTrend :customerId="customerId" :key="customerId"></LineTrend>
           </div>
         </div>
@@ -106,7 +106,6 @@ onMounted(() => {
     }
     .box-two {
       margin: 10px 0;
-      flex: 1;
       box-sizing: border-box;
     }
   }