部分bug解决

src/views/procurementManagement/priceConfig/edit.vue

@@ -2,7 +2,7 @@
   <div class="form">
     <van-nav-bar :title="$t('priceConfig.name')" :left-text="$t('common.back')" left-arrow @click-left="onClickLeft">
     </van-nav-bar>
-    <van-form @submit="editSubmit" label-align="top" style="margin-top: 20px">
+    <van-form @submit="editSubmit" label-align="top" style="margin-top: 20px" readonly>
       <van-cell-group inset>
         <van-field v-model="formData.supplierInfoName" is-link readonly :label="$t('priceConfig.supplier')"
                    :placeholder="$t('priceConfig.selectSupplier')" />
@@ -11,7 +11,8 @@
         </van-popup>
         <van-field v-model="formData.productInfoName" is-link readonly :label="$t('priceConfig.itemName')"
                    :placeholder="$t('priceConfig.selectItemName')" v-if="route.query.id" />
-
+        <van-field v-model="formData.productCode" readonly :label="'物料编码'" v-if="route.query.id" />
+        <van-field v-model="formData.productUnit" is-link readonly :label="'单位'" v-if="route.query.id" />
         <van-field v-model="formData.price" :label="$t('priceConfig.supplyUnitPrice')" :placeholder="$t('priceConfig.pleaseEnterSupplyUnitPrice')"
                    :rules="[{ required: true, message: $t('priceConfig.supplyUnitPriceCanNotBeEmpty')}]" required v-if="route.query.id" />
         <!-- 明细列表 -->
@@ -20,11 +21,11 @@
         </van-popup>
       </van-cell-group>
 
-      <div style="margin: 16px">
+      <!-- <div style="margin: 16px">
         <van-button round block type="primary" native-type="submit">
           {{$t('common.submit')}}
         </van-button>
-      </div>
+      </div> -->
 
     </van-form>
   </div>
@@ -55,7 +56,7 @@ const handleAddRow = () => {
     price: "",
   });
 };
-const getDict = () => {
+const getDict = async () => {
   proxy
     .post("/supplierInfo/page", { pageNum: 1, pageSize: 9999 })
     .then((res) => {
@@ -77,6 +78,16 @@ const getDict = () => {
         };
       });
     });
+
+  const res = await proxy.getDictOne(["material_unit"]);
+  let unit = res["material_unit"].data.map((x) => ({
+    label: x.dictValue,
+    value: x.dictKey,
+  }));
+  formData.value.productUnit = proxy.dictValueLabel(
+    formData.value.productUnit,
+    unit
+  );
 };
 
 const columns = ref([]);
@@ -121,10 +132,11 @@ const editSubmit = () => {
 };
 
 onMounted(() => {
-  console.log(route.query);
   formData.value = {
     supplierInfoName: route.query.supplierName,
     productInfoName: route.query.productClassifyName,
+    productCode: route.query.productCode,
+    productUnit: route.query.productUnit,
     id: route.query.id,
     supplierInfoId: route.query.supplierInfoId,
     productInfoId: route.query.productInfoId,

src/views/procurementManagement/priceConfig/index.vue

@@ -28,10 +28,18 @@ const listData = ref([]);
 
 const listConfig = ref([
   {
+    label: "所属分类",
+    prop: "productClassifyName",
+  },
+  {
     label: proxy.t("priceConfig.supplier"),
     prop: "supplierName",
   },
   {
+    label: "物料编码",
+    prop: "productCode",
+  },
+  {
     label: proxy.t("priceConfig.itemName"),
     prop: "productName",
   },

src/views/salesContract/claim/add.vue

@@ -1,20 +1,8 @@
 <template>
   <div class="form">
-    <van-nav-bar
-      :title="$t('claim.name')"
-      :left-text="$t('common.back')"
-      left-arrow
-      @click-left="onClickLeft"
-    >
+    <van-nav-bar :title="$t('claim.name')" :left-text="$t('common.back')" left-arrow @click-left="onClickLeft">
     </van-nav-bar>
-    <testForm
-      v-model="formData.data"
-      :formOption="formOption"
-      :formConfig="formConfig"
-      :rules="rules"
-      @onSubmit="onSubmit"
-      ref="formDom"
-    ></testForm>
+    <testForm v-model="formData.data" :formOption="formOption" :formConfig="formConfig" :rules="rules" @onSubmit="onSubmit" ref="formDom"></testForm>
   </div>
 </template>
 
@@ -50,6 +38,7 @@ const formOption = reactive({
   scroll: true,
   labelWidth: "62pk",
   submitBtnText: proxy.t("common.submit"),
+  hiddenSubmitBtn: false,
   btnConfig: {
     isNeed: true,
     listTitle: proxy.t("claim.relatedContract"),
@@ -136,46 +125,68 @@ const getDict = () => {
     })
     .then((res) => {
       formOption.btnConfig.listConfig[0].data = res.data.rows;
+      formDom.value.formDataListShowLabelOne();
     });
 };
 onMounted(() => {
   getDict();
-  if (route.query.isClaim != "1") {
-    proxy
-      .get(`/claim/sumClaimMoney?businessId=${route.query.id}`)
-      .then((res) => {
-        let waitAmount = Number(route.query.amount) - Number(res.data);
-        formData.data = {
-          businessId: route.query.id,
-          status: route.query.status + "",
-          currency: route.query.currency,
-          waitAmount,
-          accountManagementId: route.query.accountManagementId,
-          accountManagementName: route.query.accountManagementName,
-          currencyMoney: route.query.currency + " " + parseFloat(waitAmount),
-          transactionTime: route.query.transactionTime,
-          claimContractList: [],
-        };
-      });
-  } else {
-    formOption.btnConfig.isNeed = false;
-    formOption.readonly = true;
-    formOption.submitBtnText = proxy.t("claim.cancelClaim");
-    proxy.post("/claim/claimRecord", { businessId: route.query.id }).then(
-      (res) => {
-        formData.data = {
-          accountManagementName: route.query.accountManagementName,
-          currencyMoney: route.query.currency + " " + route.query.amount,
-          transactionTime: route.query.transactionTime,
-          claimContractList: res.data,
-        };
-        // formDom.value.formDataListShowLabelOne();
-      },
-      (err) => {
-        return showFailToast(err.message);
-      }
-    );
-  }
+  formOption.btnConfig.isNeed = false;
+  formOption.readonly = true;
+  // formOption.submitBtnText = proxy.t("claim.cancelClaim");
+  formOption.hiddenSubmitBtn = true;
+  proxy.post("/claim/claimRecord", { businessId: route.query.id }).then(
+    (res) => {
+      formData.data = {
+        accountManagementName: route.query.accountManagementName,
+        currencyMoney: route.query.currency + " " + route.query.amount,
+        transactionTime: route.query.transactionTime,
+        claimContractList: res.data.map((x) => ({
+          ...x,
+          contractIdName: x.contractCode,
+        })),
+      };
+      // formDom.value.formDataListShowLabelOne();
+    },
+    (err) => {
+      return showFailToast(err.message);
+    }
+  );
+  // if (route.query.isClaim != "1") {
+  //   proxy
+  //     .get(`/claim/sumClaimMoney?businessId=${route.query.id}`)
+  //     .then((res) => {
+  //       let waitAmount = Number(route.query.amount) - Number(res.data);
+  //       formData.data = {
+  //         businessId: route.query.id,
+  //         status: route.query.status + "",
+  //         currency: route.query.currency,
+  //         waitAmount,
+  //         accountManagementId: route.query.accountManagementId,
+  //         accountManagementName: route.query.accountManagementName,
+  //         currencyMoney: route.query.currency + " " + parseFloat(waitAmount),
+  //         transactionTime: route.query.transactionTime,
+  //         claimContractList: [],
+  //       };
+  //     });
+  // } else {
+  //   formOption.btnConfig.isNeed = false;
+  //   formOption.readonly = true;
+  //   formOption.submitBtnText = proxy.t("claim.cancelClaim");
+  //   proxy.post("/claim/claimRecord", { businessId: route.query.id }).then(
+  //     (res) => {
+  //       formData.data = {
+  //         accountManagementName: route.query.accountManagementName,
+  //         currencyMoney: route.query.currency + " " + route.query.amount,
+  //         transactionTime: route.query.transactionTime,
+  //         claimContractList: res.data,
+  //       };
+  //       // formDom.value.formDataListShowLabelOne();
+  //     },
+  //     (err) => {
+  //       return showFailToast(err.message);
+  //     }
+  //   );
+  // }
 });
 
 const onSubmit = () => {

src/views/salesContract/claim/index.vue

@@ -1,30 +1,11 @@
 <template>
-  <van-nav-bar
-    :title="$t('claim.name')"
-    left-text=""
-    left-arrow
-    @click-left="onClickLeft"
-  >
+  <van-nav-bar :title="$t('claim.name')" left-text="" left-arrow @click-left="onClickLeft">
   </van-nav-bar>
-  <van-search
-    v-model="req.keyword"
-    :placeholder="$t('common.pleaseEnterKeywords')"
-    @search="onRefresh"
-  />
+  <van-search v-model="req.keyword" :placeholder="$t('common.pleaseEnterKeywords')" @search="onRefresh" />
   <van-pull-refresh v-model="loading" @refresh="onRefresh">
     <div class="list">
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        :finished-text="$t('common.noMore')"
-        @load="getList"
-        style="margin-bottom: 60px"
-      >
-        <commonList
-          :data="listData"
-          @onClick="toDtl"
-          :config="listConfig"
-        ></commonList>
+      <van-list v-model:loading="loading" :finished="finished" :finished-text="$t('common.noMore')" @load="getList" style="margin-bottom: 60px">
+        <commonList :data="listData" @onClick="toDtl" :config="listConfig"></commonList>
       </van-list>
     </div>
   </van-pull-refresh>
@@ -66,7 +47,8 @@ const getList = (type) => {
           return {
             ...x,
             isClaimText: text,
-            dfAcountName: x.name + ` (${x.accountOpening})`,
+            dfAcountName:
+              x.name + x.accountOpening ? ` (${x.accountOpening})` : "",
             currencyMoney: x.currency + " " + x.amount,
           };
         });