bug

src/BIZComponents/inventoryTable.vue

@@ -1182,7 +1182,7 @@
           this.$set(parasm, 'measuringUnit', item.measuringUnit);
           this.$set(parasm, 'specification', item.specification);
           this.$set(parasm, 'weightUnit', item.weightUnit);
-          this.$set(parasm, 'singleWeight', item.roughWeight);
+          this.$set(parasm, 'singleWeight', item.netWeight);
           this.$set(parasm, 'pricingWay', item.pricingWay || 1);
 
           this.$set(parasm, 'imgCode', item.imgCode);

src/views/bpm/handleTask/components/financialManage/invoiceManage/components/addOrEditDialog.vue

@@ -139,12 +139,6 @@
         <el-col :span="12" :gutter="12" v-if="taskDefinitionKey != 'starter'">
           <el-form-item prop="files" label="发票附件">
             <fileMain v-model="form.files"></fileMain>
-            <!--            <fileUpload-->
-            <!--              v-model="form.files"-->
-            <!--              module="main"-->
-            <!--              :showLib="false"-->
-            <!--              :limit="10"-->
-            <!--            />-->
           </el-form-item>
         </el-col>
       </el-row>
@@ -344,6 +338,7 @@
           },
           feeTypeId: { required: true, message: '请选择', trigger: 'change' },
           amount: { required: true, message: '请输入', trigger: 'blur' },
+          files: { required: true, message: '请上传', trigger: 'blur' },
           type: { required: true, message: '请选择', trigger: 'change' }
         }
       };

src/views/bpm/handleTask/components/inquiryManage/addDialog.vue

@@ -401,8 +401,8 @@
           supplierCode: data.base.code,
           files: [],
           preferentialPrice: '',
-          settlementMode: '',
-          settlementModeName: '',
+          settlementMode: '4',
+          settlementModeName: '分期付款',
           taxRate: '',
           totalPrice: '',
           resultList: [obj]
@@ -438,8 +438,8 @@
           item['files'] = [];
           item['supplierName'] = item.name;
           item['preferentialPrice'] = '';
-          item['settlementMode'] = '';
-          item['settlementModeName'] = '';
+          item['settlementMode'] = '4';
+          item['settlementModeName'] = '分期付款';
           item['taxRate'] = '';
           item['totalPrice'] = '';
           item['resultList'] = copyObj(this.$refs.inventoryTable.selection);

src/views/bpm/handleTask/components/inquiryManage/inquiryTable.vue

@@ -58,11 +58,7 @@
       <template v-slot:settlementMode="{ row, $index }">
         <el-form-item
           prop="settlementMode"
-          :rules="{
-            required: true,
-            message: '请输入优惠价',
-            trigger: 'change'
-          }"
+
         >
           <DictSelection
             dictName="结算方式"
@@ -775,7 +771,7 @@
                 supplierName: 0,
                 supplierTotalPrice: 0,
                 preferentialPrice: 0,
-                settlementMode: 0,
+                settlementMode: '4',
                 taxRate: 0,
                 files: 0,
                 deliveryDate: 0

src/views/bpm/handleTask/components/purchaseNeedManage/addDialog.vue

@@ -9,7 +9,7 @@
             prop="sourceType"
             style="margin-bottom: 22px"
           >
-          <DictSelection
+            <DictSelection
               dictName="需求来源类型"
               clearable
               v-model="form.sourceType"
@@ -58,17 +58,18 @@
             />
           </el-form-item>
         </el-col>
-        <el-col v-if="form.sourceType==1" :span="12">
+        <el-col v-if="form.sourceType == 1" :span="12">
           <el-form-item label="销售合同">
             <el-input
               clearable
               v-model="form.saleContractName"
               @click.native="handleContractBtn"
               @clear="clearContrcat"
-              placeholder="请选择"/>
+              placeholder="请选择"
+            />
           </el-form-item>
         </el-col>
-        <el-col v-if="form.sourceType==1" :span="12">
+        <el-col v-if="form.sourceType == 1" :span="12">
           <el-form-item label="销售订单">
             <el-input
               clearable
@@ -126,12 +127,7 @@
         <el-col :span="12">
           <el-form-item prop="files" label="附件">
             <fileMain v-model="form.files"></fileMain>
-<!--            <fileUpload-->
-<!--              v-model="form.files"-->
-<!--              module="main"-->
-<!--              :showLib="false"-->
-<!--              :limit="1"-->
-<!--            />-->
+
           </el-form-item>
         </el-col>
       </el-row>
@@ -162,11 +158,10 @@
   import { getDetail } from '@/api/bpm/components/purchasingManage/purchaseNeedManage';
   import { copyObj } from '@/utils/util';
   import { listOrganizations } from '@/api/system/organization';
-  import ContractListDialog from "@/views/bpm/handleTask/components/saleOrder/contractListDialog.vue";
-  import OrderListDialog from "@/views/bpm/handleTask/components/saleOrder/invoice/orderListDialog.vue";
-  import {getTableList as getSaleOrderListAPI} from "@/api/bpm/components/saleManage/saleorder";
-  import fileMain from "@/components/addDoc/index.vue";
-
+  import ContractListDialog from '@/views/bpm/handleTask/components/saleOrder/contractListDialog.vue';
+  import OrderListDialog from '@/views/bpm/handleTask/components/saleOrder/invoice/orderListDialog.vue';
+  import { getTableList as getSaleOrderListAPI } from '@/api/bpm/components/saleManage/saleorder';
+  import fileMain from '@/components/addDoc/index.vue';
   export default {
     props: {
       businessId: {
@@ -322,9 +317,9 @@
         this.form = Object.assign({}, this.form, {
           saleContractId: obj.id,
           saleContractName: obj.contractName,
-          saleContractNo: obj.contractNo,
+          saleContractNo: obj.contractNo
         });
-        this.getSaleOrderList(this.form.saleContractId)
+        this.getSaleOrderList(this.form.saleContractId);
       },
       /* 表格数据源 */
       async getSaleOrderList(contractId) {
@@ -333,27 +328,26 @@
           size: 10,
           contractId
         });
-        this.form.saleOrderId = res.list[0]?.id
-        this.form.saleOrderNo = res.list[0]?.orderNo
-
+        this.form.saleOrderId = res.list[0]?.id;
+        this.form.saleOrderNo = res.list[0]?.orderNo;
       },
       //清除合同
       clearContrcat() {
         this.clearing = true;
-        this.form.saleContractNo = ''
-        this.form.saleContractId = ''
-        this.form.saleContractName = ''
+        this.form.saleContractNo = '';
+        this.form.saleContractId = '';
+        this.form.saleContractName = '';
         setTimeout(() => {
           this.clearing = false;
         }, 500);
       },
 
-      handleSourceType(){
-        this.form.saleOrderId = ''
-        this.form.saleOrderNo = ''
-        this.form.saleContractNo = ''
-        this.form.saleContractId = ''
-        this.form.saleContractName = ''
+      handleSourceType() {
+        this.form.saleOrderId = '';
+        this.form.saleOrderNo = '';
+        this.form.saleContractNo = '';
+        this.form.saleContractId = '';
+        this.form.saleContractName = '';
       },
 
       //选择订单弹框
@@ -366,26 +360,25 @@
       },
 
       //选择订单回调
-      changeOrder(obj) {
+      async changeOrder(obj) {
         this.form = Object.assign({}, this.form, {
           saleOrderId: obj.id,
           saleOrderNo: obj.orderNo,
           saleContractId: obj.contractId,
           saleContractName: obj.contractName,
-          saleContractNo: obj.contractNo,
-        })
+          saleContractNo: obj.contractNo
+        });
       },
-//清除订单
+      //清除订单
       clearSaleOrder() {
         this.clearing = true;
-        this.form.saleOrderId = ''
-        this.form.saleOrderNo = ''
+        this.form.saleOrderId = '';
+        this.form.saleOrderNo = '';
         setTimeout(() => {
           this.clearing = false;
         }, 500);
       },
 
-
       getValidate() {
         return Promise.all([
           new Promise((resolve, reject) => {