修改

src/BIZComponents/inventoryTable.vue

@@ -189,7 +189,6 @@
               style="margin-bottom: 20px"
               :prop="'datasource.' + scope.$index + '.guaranteePeriod'"
               :rules="{
-
                 pattern: numberReg,
                 message: '请输入质保期',
                 trigger: 'blur'
@@ -323,7 +322,6 @@
           <DictSelection
             dictName="产地"
             clearable
-            
             v-model="scope.row.provenance"
             multiple
           >
@@ -396,7 +394,9 @@
           <el-date-picker
             style="width: 140px"
             v-model="scope.row.produceDeliveryDeadline"
-            @change="setDeliveryDays(scope.row, scope.$index, 'guaranteePeriod')"
+            @change="
+              setDeliveryDays(scope.row, scope.$index, 'guaranteePeriod')
+            "
             type="date"
             placeholder="选择日期"
           >
@@ -419,7 +419,9 @@
             style="width: 140px"
             :disabled="isContractId"
             v-model="scope.row.customerExpectDeliveryDeadline"
-            @change="setDeliveryDays(scope.row, scope.$index, 'guaranteePeriod')"
+            @change="
+              setDeliveryDays(scope.row, scope.$index, 'guaranteePeriod')
+            "
             type="date"
             placeholder="选择日期"
           >
@@ -755,7 +757,7 @@
             slot: 'provenance',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 200,
+            minWidth: 200
           },
           {
             width: 120,
@@ -996,7 +998,11 @@
               this.form.datasource[i],
               'guaranteePeriodDeadline',
               guaranteePeriodUnitName != 'second'
-                ? this.setDay(item.guaranteePeriod, guaranteePeriodUnitName,item)
+                ? this.setDay(
+                    item.guaranteePeriod,
+                    guaranteePeriodUnitName,
+                    item
+                  )
                 : ''
             );
             // }
@@ -1012,7 +1018,7 @@
             this.form.datasource[index],
             'guaranteePeriodDeadline',
             guaranteePeriodUnitName != 'second'
-              ? this.setDay(row.guaranteePeriod, guaranteePeriodUnitName,row)
+              ? this.setDay(row.guaranteePeriod, guaranteePeriodUnitName, row)
               : ''
           );
         }
@@ -1026,9 +1032,12 @@
           ? 'year'
           : 'second';
       },
-      setDay(addDay, dateType = 'day',item) {
-        let tiem= this.contractBookType==1? item.produceDeliveryDeadline:item.customerExpectDeliveryDeadline;
-        return dayjs( tiem|| new Date())
+      setDay(addDay, dateType = 'day', item) {
+        let tiem =
+          this.contractBookType == 1
+            ? item.produceDeliveryDeadline
+            : item.customerExpectDeliveryDeadline;
+        return dayjs(tiem || new Date())
           .add(addDay, dateType)
           .format('YYYY-MM-DD');
       },
@@ -1089,7 +1098,11 @@
               item['guaranteePeriodDeadline'] =
                 item['guaranteePeriodDeadline'] ||
                 guaranteePeriodUnitName != 'second'
-                  ? this.setDay(item.guaranteePeriod, guaranteePeriodUnitName,item)
+                  ? this.setDay(
+                      item.guaranteePeriod,
+                      guaranteePeriodUnitName,
+                      item
+                    )
                   : '';
             }
           });
@@ -1105,15 +1118,25 @@
               data.payAmount || data?.contractVO?.discountTotalPrice;
           }
 
-          let codeList = this.form.datasource.filter(item=>item.productCode).map((item) => item.productCode);
+          let codeList = this.form.datasource
+            .filter((item) => item.productCode)
+            .map((item) => item.productCode);
           //获取仓库库存
           let inventoryTotalList = await getInventoryTotalAPI(codeList);
-          this.form.datasource.filter(item=>item.productCode).forEach((item) => {
-            let find =
-              inventoryTotalList.find((key) => key.code == item.productCode) ||
-              {};
-            item.availableCountBase = find.availableCountBase;
-          });
+          this.form.datasource
+            .filter((item) => item.productCode)
+            .forEach((item, index) => {
+              let find =
+                inventoryTotalList.find(
+                  (key) => key.code == item.productCode
+                ) || {};
+              this.form.datasource;
+              this.$set(
+                this.form.datasource[index],
+                'availableCountBase',
+                find.availableCountBase
+              );
+            });
           this.$refs.table.reload();
         }
       },
@@ -1170,8 +1193,8 @@
             item.extField.packingSpecification
           );
           this.$set(parasm, 'customerMark', this.customerMark);
-          if(item.purchaseOrigins?.length>0){
-            item.purchaseOrigins=item.purchaseOrigins.map(val=>val+'')
+          if (item.purchaseOrigins?.length > 0) {
+            item.purchaseOrigins = item.purchaseOrigins.map((val) => val + '');
           }
           this.$set(parasm, 'provenance', item.purchaseOrigins || []);
           if (idx == -1) {

src/BIZComponents/inventoryTableDetails.vue

@@ -113,9 +113,12 @@
         form: {
           discountTotalPrice: 0,
           datasource: []
-        },
-
-        columns: [
+        }
+      };
+    },
+    computed: {
+      columns() {
+        return [
           {
             width: 45,
             type: 'index',
@@ -162,9 +165,9 @@
           },
           {
             width: 200,
-            prop: 'supplierMark',
+            prop: 'customerMark',
             label: '供应商代号',
-            slot: 'supplierMark',
+            slot: 'customerMark',
             headerSlot: 'headerSupplierMark',
             align: 'center',
             show: this.contractBookType == 2
@@ -195,7 +198,6 @@
             headerSlot: 'headerTotalCount',
             align: 'center'
           },
-
           {
             width: 120,
             prop: 'measuringUnit',
@@ -219,7 +221,6 @@
             show: this.pageName == 'send',
             align: 'center'
           },
-
           {
             width: 120,
             prop: 'singleWeight',
@@ -242,7 +243,6 @@
             slot: 'weightUnit',
             align: 'center'
           },
-
           {
             width: 160,
             prop: 'pricingWay',
@@ -317,7 +317,6 @@
             slot: 'modelType',
             align: 'center'
           },
-
           {
             width: 120,
             prop: 'imgCode',
@@ -330,14 +329,12 @@
             label: '产地',
             slot: 'provenance',
             align: 'center',
-            // show:this.contractBookType==2,
             minWidth: 200,
             showOverflowTooltip: true,
             formatter: (row, column) => {
-       
               return row.provenance && row.provenance.length
                 ? row.provenance
-                    .map((item) => this.getDictValue('产地', item ))
+                    .map((item) => this.getDictValue('产地', item))
                     .join(',')
                 : '';
             }
@@ -356,13 +353,6 @@
                 ?.toString();
             }
           },
-          {
-            width: 120,
-            prop: 'approvalNumber',
-            align: 'center',
-            label: '批准文号',
-            showOverflowTooltip: true
-          },
           {
             width: 120,
             prop: 'packingSpecification',
@@ -370,7 +360,6 @@
             label: '包装规格',
             showOverflowTooltip: true
           },
-
           {
             width: 160,
             prop: 'customerExpectDeliveryDeadline',
@@ -408,7 +397,6 @@
             slot: 'guaranteePeriodDeadline',
             align: 'center'
           },
-
           {
             width: 220,
             prop: 'customerReqFiles',
@@ -466,9 +454,8 @@
             align: 'center'
           }
         ]
-      };
+      }
     },
-    computed: {},
 
     created() {
       this.requestDict('生产类型');
@@ -507,7 +494,7 @@
         return comitDatasource;
       },
       setDeliveryDays() {
-        console.log(this.form.datasource,'this.form.datasource')
+        console.log(this.form.datasource, 'this.form.datasource');
         this.form.datasource.forEach((item, i) => {
           let guaranteePeriodUnitName = this.guaranteePeriodUnit(
             item.guaranteePeriodUnitCode
@@ -533,7 +520,7 @@
           : 'second';
       },
       setDay(addDay, dateType = 'day') {
-        console.log(addDay)
+        console.log(addDay);
         return dayjs(this.contractStartDate || new Date())
           .add(addDay, dateType)
           .format('YYYY-MM-DD');
@@ -555,7 +542,7 @@
               data.discountTotalPrice ||
               data?.contractVO?.discountTotalPrice;
           }
-        this.setDeliveryDays();
+          this.setDeliveryDays();
 
           // this.supplierObj = await this.getSupplierObj(
           //   productList,

src/BIZComponents/product-list.vue

@@ -141,13 +141,13 @@
             minWidth: 110
           },
 
-          {
-            prop: 'extField.approvalNumber',
-            align: 'center',
-            label: '批准文号',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+          // {
+          //   prop: 'extField.approvalNumber',
+          //   align: 'center',
+          //   label: '批准文号',
+          //   showOverflowTooltip: true,
+          //   minWidth: 110
+          // },
           {
             prop: 'extField.packingSpecification',
             align: 'center',

src/views/bpm/handleTask/components/businessOpportunity/saleGeneralityInventoryTable.vue

@@ -604,13 +604,13 @@
                 : '';
             }
           },
-          {
-            width: 120,
-            prop: 'approvalNumber',
-            align: 'center',
-            label: '批准文号',
-            showOverflowTooltip: true
-          },
+          // {
+          //   width: 120,
+          //   prop: 'approvalNumber',
+          //   align: 'center',
+          //   label: '批准文号',
+          //   showOverflowTooltip: true
+          // },
           {
             width: 120,
             prop: 'packingSpecification',

src/views/bpm/handleTask/components/contact/contactDetailDialog.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" @tab-click="handleActive" type="card">
       <el-tab-pane label="基本信息" name="base">
         <el-form
-          label-width="120px"
+          label-width="140px"
           class="el-form-box"
           ref="formRef"
           :model="form">
@@ -29,8 +29,7 @@
                 <el-input v-model="form.salesmanName" disabled></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+     
             <el-col :span="8">
               <el-form-item label="客户名称：" prop="name">
                 <el-input v-model="form.name" disabled></el-input>
@@ -46,8 +45,7 @@
                 <el-input v-model="form.simpleName" disabled></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+
             <el-col :span="8">
               <el-form-item label="法定代表人：" prop="legalPerson">
                 <el-input v-model="form.legalPerson" disabled></el-input>
@@ -63,25 +61,14 @@
                 <el-input v-model="form.authorizationLimit" disabled></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+    
             <el-col :span="8">
               <el-form-item label="单位电话：" prop="phone">
                 <el-input v-model="form.phone" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="地址：" prop="addressId">
-                <el-input v-model="form.addressName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="详细地址：" prop="address">
-                <el-input v-model="form.address" disabled></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
+      
+     
             <el-col :span="8">
               <el-form-item
                 class="form_item_label"
@@ -96,13 +83,28 @@
                 <el-input v-model="form.industryFullName" disabled></el-input>
               </el-form-item>
             </el-col>
+
+            <el-col :span="24">
+              <el-form-item label="注册地址：" prop="addressId">
+                <el-input v-model="form.addressName" disabled style="width: 35%;"></el-input>
+                <el-input v-model="form.address" disabled style="width: 65%;"></el-input>
+              </el-form-item>
+            </el-col>
+   
+          
+    
+       
+          <el-col :span="24">
+              <el-form-item label="联系地址：" prop="addressId">
+                <el-input v-model="otherForm.addressName" disabled style="width: 35%;"></el-input>
+                <el-input v-model="otherForm.address" disabled style="width: 65%;"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="营业类型：" prop="companyCategoryId">
                 <el-input v-model="form.companyCategoryName" disabled></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="8">
               <el-form-item label="企业类型：" prop="companyCategoryId">
                 <el-input v-model="form.enterpriseTypeName" disabled></el-input>
@@ -118,8 +120,7 @@
                 <el-input v-model="form.businessScope" disabled></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+
             <el-col :span="8">
               <el-form-item label="主营产品：" prop="mainProduct">
                 <el-input v-model="form.mainProduct" disabled></el-input>
@@ -140,8 +141,7 @@
               </el-form-item>
 
             </el-col>
-          </el-row>
-          <el-row>
+      
             <el-col :span="16">
               <el-form-item label="经营范围" prop="businessScope">
                 <el-input
@@ -153,15 +153,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item prop="businessLicenseFile" label="营业执照附件：">
-                <fileMain v-model="form.businessLicenseFile" type="view" ></fileMain>
-<!--                <el-link v-if="form.businessLicenseFile && form.businessLicenseFile !== ''"-->
-<!--                         type="primary" :underline="false"-->
-<!--                         @click="downloadFile(form.businessLicenseFile)"> {{ form.businessLicenseFile.name }}-->
-<!--                </el-link>-->
-              </el-form-item>
-            </el-col>
+
             <el-col :span="16">
               <el-form-item label="备注：" prop="remark">
                 <el-input type="textarea" v-model="form.remark" disabled></el-input>

src/views/bpm/handleTask/components/contactQC/contactDetailDialog.vue

@@ -28,8 +28,7 @@
                 {{ otherForm.salesmanName }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+      
             <el-col :span="8">
               <el-form-item label="客户名称：" prop="name">
                 {{ form.name }}
@@ -45,8 +44,7 @@
                 {{ form.simpleName }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+
             <el-col :span="8">
               <el-form-item label="法定代表人：" prop="legalPerson">
                 {{ form.legalPerson }}
@@ -62,8 +60,7 @@
                 {{ form.authorizationLimit }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+     
             <el-col :span="8">
               <el-form-item label="单位电话：" prop="phone">
                 {{ form.phone }}
@@ -79,8 +76,7 @@
                 {{ form.address }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+ 
             <el-col :span="8">
               <el-form-item
                 label="统一社会信用代码："
@@ -89,6 +85,22 @@
                 {{ form.unifiedSocialCreditCode }}
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="注册地址：" prop="addressId">
+                <el-input v-model="form.addressName" disabled style="width: 35%;"></el-input>
+                <el-input v-model="form.address" disabled style="width: 65%;"></el-input>
+              </el-form-item>
+            </el-col>
+   
+          
+    
+       
+          <el-col :span="24">
+              <el-form-item label="联系地址：" prop="addressId">
+                <el-input v-model="otherForm.addressName" disabled style="width: 35%;"></el-input>
+                <el-input v-model="otherForm.address" disabled style="width: 65%;"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="所属行业：" prop="industry">
                 {{ form.industryFullName }}
@@ -99,8 +111,7 @@
                 {{ form.companyCategoryName }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+     
             <el-col :span="8">
               <el-form-item label="企业类型：" prop="companyCategoryId">
                 {{ form.enterpriseTypeName }}
@@ -116,8 +127,7 @@
                 {{ form.businessScope }}
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+    
             <el-col :span="8">
               <el-form-item label="主营产品：" prop="mainProduct">
                 {{ form.mainProduct }}
@@ -128,20 +138,8 @@
                 {{ form.parentName }}
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item prop="businessLicenseFile" label="营业执照附件：">
-                <fileMain
-                  v-model="form.businessLicenseFile"
-                  type="view"
-                ></fileMain>
-                <!--               <el-link v-if="form.businessLicenseFile.name && form.businessLicenseFile.name !== ''"-->
-                <!--                        type="primary" :underline="false"-->
-                <!--                        @click="downloadFile(form.businessLicenseFile)"> {{ form.businessLicenseFile.name }}-->
-                <!--               </el-link>-->
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
+
+
             <el-col :span="16">
               <el-form-item label="备注：" prop="remark">
                 {{ form.remark }}

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

@@ -98,7 +98,7 @@
       <template v-slot:taxRate="{ row, $index }">
         <el-form-item prop="taxRate">
           <el-input
-            v-model="form.taxRate"
+            v-model="row.taxRate"
             style="width: 100%"
             :disabled="status == 'Detail'"
           >
@@ -112,26 +112,7 @@
             v-model="form.files"
             :type="status == 'Detail' ? 'view' : ''"
           ></fileMain>
-          <!--          <fileUpload-->
-          <!--            v-if="status != 'Detail'"-->
-          <!--            v-model="form.files"-->
-          <!--            module="main"-->
-          <!--            :showLib="false"-->
-          <!--            :limit="5"-->
-          <!--          />-->
-          <!--          <div-->
-          <!--            v-if=" form.files && form.files?.length && status == 'Detail' ">-->
-          <!--            <el-link-->
-          <!--              v-for="link in form.files"-->
-          <!--              :key="link.id"-->
-          <!--              type="primary"-->
-          <!--              :underline="false"-->
-          <!--              @click="downloadFile(link)"-->
-          <!--            >-->
-          <!--              {{ link.name }}-->
-          <!--            </el-link-->
-          <!--            >-->
-          <!--          </div>-->
+       
         </el-form-item>
       </template>
 
@@ -594,7 +575,7 @@
       label: '税率',
       slot: 'taxRate',
       align: 'center',
-      isMerge: true,
+      // isMerge: true,
       showOverflowTooltip: true
     },
     {

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

@@ -483,13 +483,13 @@
                 : '';
             }
           },
-          {
-            minWidth: 120,
-            prop: 'approvalNumber',
-            align: 'center',
-            label: '批准文号',
-            showOverflowTooltip: true
-          },
+          // {
+          //   minWidth: 120,
+          //   prop: 'approvalNumber',
+          //   align: 'center',
+          //   label: '批准文号',
+          //   showOverflowTooltip: true
+          // },
           {
             minWidth: 120,
             prop: 'packingSpecification',

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

@@ -261,6 +261,27 @@
             slot: 'expectReceiveDate',
             align: 'center'
           },
+          {
+            width: 120,
+            prop: 'produceType',
+            align: 'center',
+            label: '属性类型',
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.produceType && row.produceType.length
+                ? row.produceType
+                .map((item) => this.getDictValue('生产类型', item))
+                    .join(',')
+                : '';
+            }
+          },
+          {
+            width: 120,
+            prop: 'packingSpecification',
+            align: 'center',
+            label: '包装规格',
+            showOverflowTooltip: true
+          },
           {
             width: 160,
             prop: 'technicalDrawings',
@@ -287,6 +308,7 @@
     },
     created() {
       this.requestDict('产地');
+      this.requestDict('生产类型');
       this.getDetailData(this.businessId);
       
     },

src/views/bpm/handleTask/components/purchaseOrder/accountstatement/purchaseForm.vue

@@ -178,7 +178,7 @@ export default {
         sourceType: {required: true, message: '请选择', trigger: 'change'},
         contactId: {required: true, message: '请选择', trigger: 'change'},
         projectId: {required: true, message: '请选择', trigger: 'change'},
-        orderId: {required: true, message: '请选择', trigger: 'change'},
+        // orderId: {required: true, message: '请选择', trigger: 'change'},
         dateType: {required: true, message: '请选择', trigger: 'change'},
         year: {required: true, message: '请选择', trigger: 'change'},
         quarter: {required: true, message: '请选择', trigger: 'change'},

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTableReturn.vue

@@ -747,13 +747,13 @@
                 : '';
             }
           },
-          {
-            width: 120,
-            prop: 'approvalNumber',
-            align: 'center',
-            label: '批准文号',
-            showOverflowTooltip: true
-          },
+          // {
+          //   width: 120,
+          //   prop: 'approvalNumber',
+          //   align: 'center',
+          //   label: '批准文号',
+          //   showOverflowTooltip: true
+          // },
           {
             width: 120,
             prop: 'packingSpecification',

src/views/bpm/handleTask/components/saleOrder/returnGoods/inventoryTableReturnDetail.vue

@@ -251,13 +251,13 @@
                 : '';
             }
           },
-          {
-            width: 120,
-            prop: 'approvalNumber',
-            align: 'center',
-            label: '批准文号',
-            showOverflowTooltip: true
-          },
+          // {
+          //   width: 120,
+          //   prop: 'approvalNumber',
+          //   align: 'center',
+          //   label: '批准文号',
+          //   showOverflowTooltip: true
+          // },
           {
             width: 120,
             prop: 'packingSpecification',