bug

src/BIZComponents/saleGeneralityInventoryTable.vue

@@ -100,16 +100,12 @@
         </el-form-item>
       </template>
       <template v-slot:headerCustomerMark="{ column }">
-        <span class="is-required">{{ column.label }}</span>
+        <span >{{ column.label }}</span>
       </template>
       <template v-slot:customerMark="{ row, $index }">
         <el-form-item
           :prop="'datasource.' + $index + '.customerMark'"
-          :rules="{
-            required: true,
-            message: '请输入客户代号',
-            trigger: 'change'
-          }"
+    
         >
           <el-input v-model="row.customerMark" placeholder="请输入"></el-input>
         </el-form-item>
@@ -656,7 +652,11 @@
       pricingWay: {
         type: [Number, String],
         default: 1
-      }
+      },
+      customerMark: {
+        default: '',
+        type: String
+      },
     },
     data() {
       const defaultForm = {
@@ -1242,6 +1242,12 @@
         }
         return isNaN(num) ? '' : num.toFixed(2);
       },
+      setCustomerMark(customerMark){
+        this.form.datasource.forEach(item=>{
+          item['customerMark']=customerMark
+          this.$forceUpdate()
+        })
+      },
       //修改回显
       async putTableValue(data) {
         let productList =
@@ -1370,6 +1376,7 @@
           this.$set(parasm, 'specification', item.specification);
           this.$set(parasm, 'weightUnit', item.weightUnit);
           this.$set(parasm, 'singleWeight', item.roughWeight);
+          this.$set(parasm, 'customerMark', this.customerMark);
 
           this.$set(parasm, 'imgCode', item.imgCode);
           this.$set(parasm, 'produceType', item.produceType);

src/components/AssetTree/index.vue

@@ -78,7 +78,11 @@
       codeS: {
         type: String,
         default: ''
-      }
+      },
+      filterCode: {
+        type: String,
+        default: ''
+      },
     },
     data() {
       return {
@@ -115,6 +119,9 @@
           console.log(res.data)
           if (res?.code == '0') {
             this.treeList = res.data;
+            if(this.filterCode){
+              this.treeList[0].children=this.treeList[0].children.filter(item=>item.code==this.filterCode)
+            }
             this.$emit('setRootId', res.data[0].id);
             if (this.treeFormate) {
               this.treeList = this.treeFormate(this.treeList);

src/enum/dict.js

@@ -28,7 +28,7 @@ export default {
   商机阶段: 'business_stage_code',
   合同类型: 'contract_type',
   销售类型: 'order_type',
-  退货: 'sale_return_order_type',
+  退货类型: 'sale_return_order_type',
   联系人状态: 'contact_link_status',
   需求类型: 'requirement_source_type',
   采购订单类型: 'purchase_type',

src/views/contractManage/contractBook/components/addDialog.vue

@@ -881,14 +881,21 @@
 
       //选择供应商
       async changeSupplier(obj) {
+        if(!obj.id){return}
+
+        const { base, other } = await contactDetail(obj.id);
+
         this.form = Object.assign({}, this.form, {
-          partbId: obj.id,
-          partbName: obj.name,
-          partbAddress: obj.addressName + obj.address,
+          partbId: base.id,
+          partbName: base.name,
+          partbAddress: other.addressName
+            ? other.addressName + other.address
+            : base.addressName + other.address,
           partbLinkId: '',
           partbLinkName: '',
           partbEmail: '',
-          partbTel: ''
+          partbTel: '',
+          partbUnifiedSocialCreditCode:obj.unifiedSocialCreditCode
         });
         await this.getLinkInfo(obj.id);
         this.$nextTick(() => {
@@ -914,7 +921,6 @@
 
         this.loading = false;
         if (data) {
-
           this.$nextTick(() => {
             this.dictChange(contractVO.type, 'init');
             this.form.HJQD = this.form.partbName;
@@ -928,7 +934,7 @@
               this.$refs.paymentListTable.putTableValue(
                 data.receiptPaymentList
               );
-            console.log(this.$refs.rawDetailListRef)
+            console.log(this.$refs.rawDetailListRef);
             this.$refs.rawDetailListRef &&
               this.$refs.rawDetailListRef.putTableValueNew(contractVO.rawList); //原料
             this.$refs.outputDetailListRef &&
@@ -1139,17 +1145,20 @@
       },
       //选择客户回调
       async changeParent(obj) {
+        if(!obj.id){return}
+        const { base, other } = await contactDetail(obj.id);
         this.form = Object.assign({}, this.form, {
-          partaId: obj.id,
-          partaName: obj.name,
-          partaAddress: obj.addressName + obj.address,
+          partaId: base.id,
+          partaName: base.name,
+          partaAddress: other.addressName
+            ? other.addressName + other.address
+            : base.addressName + other.address,
           partaLinkId: '',
           partaLinkName: '',
           partaEmail: '',
           partaTel: '',
-          //contractName: obj.name,
-          customerMark: obj.serialNo,
-          partaUnifiedSocialCreditCode: obj.unifiedSocialCreditCode
+          customerMark: base.serialNo,
+          partaUnifiedSocialCreditCode: base.unifiedSocialCreditCode
         });
         await this.getLinkInfo(obj.id);
 
@@ -1313,6 +1322,12 @@
             Tel,
             firstLink.mobilePhone || this.linkNameOptions[0]?.mobilePhone
           );
+          this.changePersonel();
+          if (contractVO.type == 1) {
+            this.changeParent({ id: contractVO.partaId });
+          } else {
+            this.changeSupplier({ id: contractVO.partbId });
+          }
         });
       },
       //切换计价方式重新算费用
@@ -1412,7 +1427,11 @@
             {},
             {
               contract: this.form,
-              productList: [...this.$refs.inventoryTable.getTableValue(),...rawDetailList,...outputDetailList],
+              productList: [
+                ...this.$refs.inventoryTable.getTableValue(),
+                ...rawDetailList,
+                ...outputDetailList
+              ],
               receiptPaymentList: this.$refs.paymentListTable.getTableValue()
             }
           );
@@ -1466,8 +1485,7 @@
             formCreateUserId: data.contractVO.createUserId,
             variables: {
               businessType: data.contractVO.type,
-             businessCode:res.contractNo
-
+              businessCode: res.contractNo
             }
             // callBackMethodType : '1',
             // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
@@ -1524,13 +1542,6 @@
         });
 
         this.setValue(data);
-        let contactId =
-          this.form.type == 2
-            ? data.contractVO.partbId
-            : data.contractVO.partaId;
-        let { base } = await contactDetail(contactId);
-        console.log(data,'data')
-        this.$set(this.form, 'contractName',sourceName);
       },
       //核价清单
       async changeInquiryDetailList({ data }) {
@@ -1545,17 +1556,10 @@
         this.$set(this.form, 'contractName', base.simpleName);
       },
       //报价单
-      async changeQuotationList({ data, sourceCode }) {
+      async changeQuotationList({ data, sourceCode, sourceName }) {
         this.setValue(data);
         this.$set(this.form, 'sourceName', sourceCode);
         this.$set(this.form, 'sourceId', data.contractVO.sourceId);
-
-        let contactId =
-          this.form.type == 2
-            ? data.contractVO.partbId
-            : data.contractVO.partaId;
-        let { base } = await contactDetail(contactId);
-        this.$set(this.form, 'contractName', base.simpleName);
       },
       //选择采购计划
       handPlan(e) {
@@ -1660,7 +1664,9 @@
           },
           productList: info.productList || []
         };
+
         this.setValue(form);
+        this.$set(this.form, 'contractName', row.name);
       },
       //获取商机详情
       async getOpportunityDetailData(id) {

src/views/contractManage/contractBook/components/quotationList.vue

@@ -225,7 +225,7 @@ export default {
       let data = await this.addGenerateContract();
 
       if (data) {
-        this.$emit('changeParent', { data, sourceCode: this.current.code });
+        this.$emit('changeParent', { data, sourceCode: this.current.code,sourceName:this.current.name });
 
         this.handleClose();
       }

src/views/purchasingManage/inquiryManage/components/addDialog.vue

@@ -560,16 +560,24 @@
           item['totalPrice'] = '';
           item['resultList'] = copyObj(this.$refs.inventoryTable.selection);
           item['resultList'].forEach((val) => {
+            item['deliveryDate']=val.expectReceiveDate
             val['remark'] = '';
-            val.supplierName = item.name;
+            val.supplierName = item.name; 
+            val.supplierProductCode = val.productCode; 
+            val.supplierProductName = val.productName; 
             val.isWinner = 1;
           });
 
           let supplierIndex = supplierIds.indexOf(item.supplierId);
           if (supplierIndex == -1) {
+  
             this.supplierList.push(item);
+
+          
           } else {
+            console.log(1)
             item['resultList'].forEach((val) => {
+  
               let isHave = this.supplierList[supplierIndex].resultList.some(
                 (i) => i.productCode == val.productCode
               );

src/views/purchasingManage/inquiryManage/components/generateContractsDialog.vue

@@ -88,8 +88,8 @@ export default {
     },
     async handleGenerate(i) {
       let contractInfo = await generateContract({inquiryIds: [this.form.id], supplierId: i.supplierId});
-      let contact = await contactDetail(contractInfo.contractVO.partbId);
-      contractInfo.contractVO.contractName = contact.base.simpleName;
+    
+      contractInfo.contractVO.contractName =this.form.inquiryName ;
       await this.$refs.addContractBookDialogRef.open('add', contractInfo, true, 'inquiryManage');
     },
     cancel() {

src/views/purchasingManage/inquiryManage/components/inquiryTable.vue

@@ -207,7 +207,7 @@
         >
           <el-input
             v-model="scope.row.deliveryDays"
-            :disabled="status == 'Detail'"
+            disabled
           ></el-input>
         </el-form-item>
       </template>
@@ -668,9 +668,24 @@
       console.log(this.obj);
       this.radio1 = this.radio;
       this.getSpanArr();
+      this.$nextTick(()=>{
+        this.setDeliveryDays()
+
+      })
       // this.dataList=copyObj(this.list)
     },
     methods: {
+      //计算交期
+      setDeliveryDays(){
+
+        this.form.resultList.forEach(item=>{
+          let day=this.form.deliveryDate&&((new Date(this.form.deliveryDate).getTime()-new Date().getTime())/1000/60/60/24)
+          item.deliveryDays=Math.ceil(day)||1
+        })
+        this.$forceUpdate()
+      
+        
+      },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
         if (this.columns[columnIndex]?.isMerge) {
           const _row = this.spanArr[rowIndex]?.supplierName || 0;
@@ -688,9 +703,7 @@
       deliveryDateChange(row) {
         this.$emit('deliveryDateChange', (data) => {
           let is = false;
-          console.log(data, 'data');
-
-          console.log(new Date(this.form.deliveryDate).getTime(), 'data');
+       
 
           if (data.length > 0) {
             data.forEach((item) => {
@@ -705,7 +718,9 @@
           if (is) {
             this.$message.error('交货日期大于到货日期');
           }
+       
         });
+        this.setDeliveryDays()
       },
       getSpanArr() {
         let pos = 0;
@@ -800,8 +815,8 @@
       },
       //修改回显
       putTableValue(data) {
-        console.log(data,';data')
         this.form.resultList = copyObj(data);
+        this.setDeliveryDays()
       },
 
       remove(productCode) {

src/views/purchasingManage/inquiryManage/index.vue

@@ -54,13 +54,13 @@
             >
           </template>
           <!-- 查看详情列 -->
-          <template v-slot:planName="{ row }">
+          <template v-slot:planCode="{ row }">
             <el-link
               type="primary"
               :underline="false"
               @click="openPlanDetail(row)"
             >
-              {{ row.planName }}</el-link
+              {{ row.planCode }}</el-link
             >
           </template>
           <!-- 状态 -->
@@ -192,7 +192,7 @@ import generateContractsDialog from "@/views/purchasingManage/inquiryManage/comp
           {
             prop: 'inquiryCode',
             slot: 'inquiryCode',
-            label: '采购询价单编码',
+            label: '采购询价编码',
             align: 'center',
             showOverflowTooltip: true,
             sortable: true,
@@ -200,15 +200,24 @@ import generateContractsDialog from "@/views/purchasingManage/inquiryManage/comp
           },
           {
             prop: 'inquiryName',
-            label: '采购询价单名称',
+            label: '采购询价名称',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 200
           },
+          {
+            prop: 'planCode',
+            slot: 'planCode',
+
+            label: '采购计划编码',
+            align: 'center',
+            showOverflowTooltip: true,
+            sortable: true,
+            minWidth: 200
+          },
           {
             prop: 'planName',
-            slot: 'planName',
-            label: '采购计划单名称',
+            label: '采购计划名称',
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 200
@@ -347,8 +356,7 @@ import generateContractsDialog from "@/views/purchasingManage/inquiryManage/comp
         }
         if(isOnly){
           let contractInfo = await generateContract({inquiryIds: ids, supplierId: list[0].winnerSuppleIds});
-          let contact = await contactDetail(contractInfo.contractVO.partbId);
-          contractInfo.contractVO.contractName = contact.base.simpleName;
+          contractInfo.contractVO.contractName = list[0].inquiryName;
           await this.$refs.addContractBookDialogRef.open('add', contractInfo, true, 'inquiryManage');
         }else {
           this.generateContractsDialogFlag = true;

src/views/purchasingManage/purchaseOrder/components/addDialog.vue

@@ -59,7 +59,7 @@
           <el-form-item
             prop="remark"
             label="是否首工序"
-            v-if="['3', '4', '5', '6','7'].includes(form.sourceType)"
+            v-if="['3', '4', '5', '6', '7'].includes(form.sourceType)"
           >
             <el-radio-group v-model="form.isFirstProcess">
               <el-radio v-for="item in processList" :label="item.value">{{
@@ -74,7 +74,7 @@
           >
           outsourceType
           </el-form-item> -->
-          
+
           <el-form-item
             v-if="form.relationType == 1"
             label="采购需求单"
@@ -367,7 +367,7 @@
         <el-tab-pane
           label="带料清单"
           name="2"
-          v-if="['3', '4', '5', '6','7'].includes(form.sourceType)"
+          v-if="['3', '4', '5', '6', '7'].includes(form.sourceType)"
         >
           <inventoryTable
             ref="rawDetailListRef"
@@ -383,7 +383,7 @@
         <el-tab-pane
           label="产出清单"
           name="3"
-          v-if="['3', '4', '5', '6','7'].includes(form.sourceType)"
+          v-if="['3', '4', '5', '6', '7'].includes(form.sourceType)"
         >
           <inventoryTable
             ref="outputDetailListRef"
@@ -536,7 +536,6 @@
   import { getInventoryTotalAPI } from '@/api/wms';
   import modalTitle from '@/BIZComponents/modalTitle.vue';
   import { contactDetail } from '@/api/saleManage/contact';
-
   export default {
     mixins: [dictMixins],
     components: {
@@ -828,8 +827,12 @@
         this.$set(this.form, 'relationCode', data.planCode);
         const res = await getplanDetail(data.id);
         this.$set(this.form, 'isFirstProcess', res.isFirstProcess);
+        if (res.detailList.lenght > 1) {
+          this.$refs.planTableListRef.open(res);
+        } else {
+          this.putTableValue(res);
+        }
 
-        this.$refs.planTableListRef.open(res);
         // let form = {
         //   contractVO: {
         //     ...this.form
@@ -863,8 +866,14 @@
         this.$set(this.form, 'relationCode', data.inquiryCode);
         const res = await getpurchaseinquiry(data.id);
         this.$set(this.form, 'isFirstProcess', res.isFirstProcess);
-
-        this.$refs.planTableListRef.open(res);
+        res['rawDetailList'] = res.rawList;
+        res['outputDetailList'] = res.outputList;
+        if (res.detailList.lenght > 1) {
+          this.$refs.planTableListRef.open(res);
+        } else {
+          this.putTableValue(res);
+        }
+       
       },
 
       async putTableValue({ detailList, rawDetailList, outputDetailList }) {
@@ -905,6 +914,7 @@
             });
             this.setProductInfo();
           });
+          await this.changeParent({id:info.partbId})
         }
 
         const codeList = [
@@ -962,19 +972,7 @@
         this.form.payAmount = val;
         //this.form.payAmount = undefined
       },
-      //选择供应商
-      changeSupplier(obj) {
-        this.form = Object.assign({}, this.form, {
-          partbId: obj.id,
-          partbName: obj.name,
-          partbAddress: obj.addressName + obj.address,
-          partbLinkId: '',
-          partbLinkName: '',
-          partbEmail: '',
-          partbTel: ''
-        });
-        this.getLinkInfo(obj.id);
-      },
+
       //选择合同获取合同的详情
       async getDetailData(id) {
         this.loading = true;
@@ -1050,10 +1048,17 @@
               isFirstProcess
             });
             this.getLinkInfo(partaId);
-            this.$refs.planTableListRef.contractOpen(
-              data.productList,
-              contractVO.contractStartDate
-            );
+            if (data.productList > 1) {
+              this.$refs.planTableListRef.contractOpen(
+                data.productList,
+                contractVO.contractStartDate
+              );
+            } else {
+              this.contractSuccess({
+                productList: data.productList,
+                contractStartDate: contractVO.contractStartDate
+              });
+            }
 
             this.$refs.rawDetailListRef &&
               this.$refs.rawDetailListRef.putTableValue(contractVO.rawList); //原料
@@ -1149,18 +1154,24 @@
       },
       //选择供应商回调
       async changeParent(obj) {
+        const { base, other } = await contactDetail(obj.id);
+
         this.form = Object.assign({}, this.form, {
-          partbId: obj.id,
-          partbName: obj.name,
-          partbAddress: obj.addressName + obj.address,
+          partbId: base.id,
+          partbName: base.name,
+          partbAddress: other.addressName
+            ? other.addressName + other.address
+            : base.addressName + other.address,
           partbLinkId: '',
           partbLinkName: '',
           partbEmail: '',
           partbTel: '',
-          supplierMark: obj.serialNo
+          supplierMark: base.serialNo,
+          partbUnifiedSocialCreditCode: base.unifiedSocialCreditCode
+          
         });
         await this.getLinkInfo(obj.id);
-        //  const {productList}= await contactDetail(obj.id);
+
         //  this.form.productList=productList
 
         this.$nextTick(() => {
@@ -1395,7 +1406,7 @@
         ]);
       },
       async save(type) {
-        let is=false
+        let is = false;
         try {
           await this.getValidate();
           // 表单验证通过，执行保存操作

src/views/saleManage/businessOpportunity/components/addOpportunityDialog.vue

@@ -156,7 +156,8 @@
     <inventoryTable
       ref="inventoryTable"
       :pricingWay="form.pricingWay"
-      :isCustomerMark="false"
+      :customerMark="form.customerMark"
+      :isCustomerMark="true"
       :isDeliveryDeadline="false"
       :isGuaranteePeriod="false"
       pageName="businessOpportunity"
@@ -256,6 +257,7 @@ export default {
       pricingWay: 1,
       expectedSigningAmount:'',
       periodOfValidity:'',
+      customerMark:'',
       files: []
     };
 
@@ -385,6 +387,10 @@ export default {
     changeParent(obj) {
       this.$set(this.form, 'contactId', obj.id);
       this.$set(this.form, 'contactName', obj.name);
+      this.$set(this.form, 'customerMark', obj.serialNo);
+      this.$nextTick(()=>{
+        this.$refs.inventoryTable.setCustomerMark(obj.serialNo)
+      })
     },
     //选择负责人回调
     changeHead(obj, id) {

src/views/saleManage/businessOpportunity/components/saleGeneralityInventoryTable.vue

@@ -642,6 +642,10 @@
         default: true,
         type: Boolean
       },
+      customerMark:{
+        default: '',
+        type: String
+      },
       contractBookType: {
         default: 1
       },
@@ -766,8 +770,6 @@
             prop: 'customerMark',
             label: '客户代号',
             slot: 'customerMark',
-            headerSlot: 'headerCustomerMark',
-            show: this.isCustomerMark,
             align: 'center'
           },
           {
@@ -1109,6 +1111,12 @@
         this.singleWeightChange(row, index);
         this.getTotalPrice();
       },
+      setCustomerMark(customerMark){
+        this.form.datasource.forEach(item=>{
+          item['customerMark']=customerMark
+          this.$forceUpdate()
+        })
+      },
       //计算总金额
       getTotalPrice(row) {
         if (this.form.datasource.length) {
@@ -1334,6 +1342,8 @@
            this.$set(parasm, 'produceType', item.produceType);
           this.$set(parasm, 'approvalNumber', item.extField.approvalNumber);
           this.$set(parasm, 'packingSpecification', item.extField.packingSpecification);
+          this.$set(parasm, 'customerMark', this.customerMark);
+
           if (idx == -1) {
             this.form.datasource.push(row);
           }

src/views/saleManage/quotation/components/addDialog.vue

@@ -196,9 +196,9 @@
       <headerTitle title="报价单产品清单"></headerTitle>
       <inventoryTable
         ref="inventoryTable"
-        :isCustomerMark="false"
         :isDeliveryDeadline="false"
         :isGuaranteePeriod="false"
+        :customerMark="212"
       ></inventoryTable>
 
       <el-row style="margin-top: 20px">
@@ -543,18 +543,27 @@ export default {
       this.$set(this.form, 'quoteEmail', obj.email);
     },
     //选择客户回调
-    changeParent(obj) {
+    async changeParent(obj) {
+
+      const {base,other}= await contactDetail(obj.id)
       this.form = Object.assign({}, this.form, {
-        contactId: obj.id,
-        contactName: obj.name,
-        contactAddress: obj.addressName + obj.address,
+        contactId: base.id,
+        contactName: base.name,
+        contactAddress: other.addressName + other.address,
         contactLinkId: '',
         contactLinkName: '',
         contactEmail: '',
-        contactTel: ''
+        contactTel: '',
+        customerMark: base.serialNo,
+  
       });
+
       this.getLinkInfo(obj.id);
-      this.getBusinessList(obj.name);
+      this.getBusinessList(base.name);
+
+      this.$nextTick(()=>{
+        this.$refs.inventoryTable.setCustomerMark(base.serialNo)
+      })
     },
 
     handParent() {
@@ -583,21 +592,19 @@ export default {
           this.form.quoteAddress = this.enterprisePage[0].address;
         }
         if (this.contactData.id) {
-          this.changeParent(this.contactData);
+          this.changeParent({id:this.contactData.id});
         }
         if(this.businessOpportunityData.id){
           this.form.opportunityId = this.businessOpportunityData.id;
           await this.opportunityChange(this.businessOpportunityData.id);
-          let data = await contactDetail(this.businessOpportunityData.contactId);
           this.form.opportunityType = 1;
-          this.changeParent(data.base);
+          this.changeParent({id:this.businessOpportunityData.contactId});
         }
         if (row.id) {
           this.form.opportunityId = row.id;
           await this.opportunityChange(row.id);
-          let data = await contactDetail(row.contactId);
           this.form.opportunityType = 1;
-          this.changeParent(data.base);
+          this.changeParent({id:row.contactId});
         }
       } else {
         this.isUpdate = true;

src/views/saleManage/saleOrder/components/addDialog.vue

@@ -570,30 +570,7 @@ export default {
       });
     },
 
-    //选择供应商
-    async changeSupplier(obj) {
-      this.form = Object.assign({}, this.form, {
-        partbId: obj.id,
-        partbName: obj.name,
-        partbAddress: obj.addressName + obj.address,
-        partbLinkId: '',
-        partbLinkName: '',
-        partbEmail: '',
-        partbTel: ''
-      });
-      await this.getLinkInfo(obj.id);
-      this.$nextTick(() => {
-        let firstLink =
-          this.linkNameOptions.find((item) => item.ifChief == 1) || {};
-        this.form = Object.assign({}, this.form, {
-          partbLinkId: firstLink.id || this.linkNameOptions[0]?.id,
-          partbLinkName:
-            firstLink.linkName || this.linkNameOptions[0]?.linkName,
-          partbTel:
-            firstLink.mobilePhone || this.linkNameOptions[0]?.mobilePhone
-        });
-      });
-    },
+
     //选择合同获取合同的详情
     async getDetailData(id) {
       this.loading = true;
@@ -742,7 +719,7 @@ export default {
         partaLinkName: '',
         partaEmail: '',
         partaTel: '',
-        unifiedSocialCreditCode:base.unifiedSocialCreditCode,
+        partaUnifiedSocialCreditCode:base.unifiedSocialCreditCode,
         customerMark: base.serialNo,
         receiveAddress:other.addressName + other.address,
       });

src/views/saleManage/saleOrder/components/contractListDialog.vue

@@ -24,6 +24,7 @@
             id="20"
             :isFirstRefreshTable="false"
             ref="treeList"
+            :filterCode="this.type"
           />
         </div>
         <!-- 表格 -->

src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -389,6 +389,8 @@
       };
     },
     created() {
+      this.requestDict('生产类型');
+
       getWarehouseList().then((res) => {
         this.warehouseList = res;
       });
@@ -473,6 +475,12 @@
             prop: 'produceType',
             align: 'center',
             label: '生产类型',
+            formatter: (row, column) => {
+              return row?.produceType?.map((item) =>{
+
+               return this.getDictValue('生产类型', item)
+              })?.toString()
+            },
             showOverflowTooltip: true
           },
           ...this.dynamicsColumns,
@@ -938,11 +946,7 @@
           if (isNaN(value) || Number(value) <= 0) {
             this.$message.error('请输入大于0的数');
             callback(new Error('请输入大于0的数字'));
-          } else if (Number(value) > row.warehouseNum) {
-            // this.$message.error('输入的数字不能大于仓库物品数');
-            // callback(new Error('输入的数字不能大于仓库物品数'));
-            callback();
-          } else if (Number(value) > row.orderTotalCount) {
+          }  else if (Number(value) > row.orderTotalCount) {
             this.$message.error('输入的数字不能大于最大发货值');
             callback(new Error('输入的数字不能大于最大发货值'));
           } else {

src/views/saleManage/saleOrder/invoiceConfirm/index.vue

@@ -161,7 +161,7 @@ import {
 } from '@/api/saleManage/saleordersendrecord';
 import dictMixins from '@/mixins/dictMixins';
 import processSubmitDialog from "@/BIZComponents/processSubmitDialog/processSubmitDialog.vue";
-import {getSendConfirmTableList} from "@/api/saleManage/invoiceConfirm";
+import {getSendConfirmTableList,deleteSendConfirmInformation} from "@/api/saleManage/invoiceConfirm";
 
 export default {
   mixins: [dictMixins],
@@ -391,7 +391,7 @@ export default {
     },
     //删除接口
     remove(delData) {
-      deleteSendInformation(delData).then((res) => {
+      deleteSendConfirmInformation(delData).then((res) => {
         this.$message.success('删除成功！');
         this.reload();
       });

src/views/saleManage/saleOrder/returnGoods/components/addReturnGoodsDialog.vue

@@ -48,7 +48,7 @@
             style="margin-bottom: 22px"
           >
             <DictSelection
-              dictName="退货方式"
+              dictName="退货类型"
               clearable
               v-model="form.type"
               @change="onchangeLink"