Kaynağa Gözat

字段修改

yusheng 1 yıl önce
ebeveyn
işleme
d343e31a19
28 değiştirilmiş dosya ile 143 ekleme ve 122 silme
  1. 3 2
      src/BIZComponents/inventoryTable.vue
  2. 1 1
      src/BIZComponents/inventoryTableDetails.vue
  3. 4 4
      src/BIZComponents/product-list.vue
  4. 2 2
      src/BIZComponents/saleGeneralityInventoryTable.vue
  5. 1 1
      src/main.js
  6. 4 1
      src/views/financialManage/invoiceManage/components/addOrEditDialog.vue
  7. 1 1
      src/views/purchasingManage/inquiryManage/components/inventoryTable.vue
  8. 2 2
      src/views/purchasingManage/producerManage/components/addContactDialog.vue
  9. 2 2
      src/views/purchasingManage/producerManage/components/contactDetailDialog.vue
  10. 2 2
      src/views/purchasingManage/purchaseNeedManage/components/detailDialog.vue
  11. 3 3
      src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue
  12. 6 1
      src/views/purchasingManage/purchaseOrder/components/addDialog.vue
  13. 2 2
      src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue
  14. 2 2
      src/views/purchasingManage/purchaseOrder/components/supplierGoodsListDialog.vue
  15. 13 9
      src/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue
  16. 8 8
      src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue
  17. 1 1
      src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue
  18. 1 1
      src/views/purchasingManage/purchaseOrder/returnGoods/components/inventoryTable.vue
  19. 7 0
      src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue
  20. 11 10
      src/views/purchasingManage/purchasePlanManage/components/inventoryTable.vue
  21. 2 2
      src/views/purchasingManage/supplierManage/components/addContactDialog.vue
  22. 31 39
      src/views/purchasingManage/supplierManage/components/contactDetailDialog.vue
  23. 28 20
      src/views/saleManage/contact/components/addContactDialog.vue
  24. 1 1
      src/views/saleManage/saleOrder/invoice/components/detailDialog.vue
  25. 1 1
      src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue
  26. 1 1
      src/views/saleManage/saleOrder/invoice/components/replaceTable.vue
  27. 2 2
      src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturn.vue
  28. 1 1
      src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturnDetail.vue

+ 3 - 2
src/BIZComponents/inventoryTable.vue

@@ -904,7 +904,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row?.produceType
@@ -1268,6 +1268,7 @@
                 ) || {};
               item.availableCountBase = find.availableCountBase;
             });
+            this.$forceUpdate()
           this.$refs.table.reload();
         }
       },
@@ -1316,7 +1317,7 @@
           this.$set(parasm, 'pricingWay', item.pricingWay || 1);
 
           this.$set(parasm, 'imgCode', item.imgCode);
-          this.$set(parasm, 'produceType', item.produceType);
+          this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
           this.$set(
             parasm,

+ 1 - 1
src/BIZComponents/inventoryTableDetails.vue

@@ -340,7 +340,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row?.produceType

+ 4 - 4
src/BIZComponents/product-list.vue

@@ -160,13 +160,13 @@
             minWidth: 110
           },
           {
-            prop: 'produceType',
+            prop: 'componentAttribute',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
-              return row.produceType && row.produceType.length
-                ? row.produceType
+              return row.componentAttribute && row.componentAttribute.length
+                ? row.componentAttribute
                     .map((item) => this.getDictV('productionType', item))
                     .join(',')
                 : '';

+ 2 - 2
src/BIZComponents/saleGeneralityInventoryTable.vue

@@ -817,7 +817,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row.produceType && row.produceType.length
@@ -1379,7 +1379,7 @@
           this.$set(parasm, 'customerMark', this.customerMark);
 
           this.$set(parasm, 'imgCode', item.imgCode);
-          this.$set(parasm, 'produceType', item.produceType);
+          this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'approvalNumber', item.extField.approvalNumber);
           this.$set(
             parasm,

+ 1 - 1
src/main.js

@@ -28,7 +28,7 @@ Vue.config.productionTip = false;
 Vue.use(Vue2OrgTree);
 Vue.use(EleAdmin, {
   response: {
-    dataName: 'list'
+    dataName: 'list',
   },
   mapKey: MAP_KEY,
   license: LICENSE_CODE,

+ 4 - 1
src/views/financialManage/invoiceManage/components/addOrEditDialog.vue

@@ -730,7 +730,10 @@
       handleSave(flag) {
         this.$refs.form.validate(async (valid) => {
           if (!valid) return this.$message.warning('有必填项未填,请检查');
-          let tableData = await this.$refs.table.getTableValidate();
+          let tableData = {}
+          if(this.form.sourceType!=4||this.form.sourceType!=5){
+            tableData=await this.$refs.table.getTableValidate();
+          }
           this.form.link = tableData.link;
           this.form.detailList = tableData.detailList;
           const API =

+ 1 - 1
src/views/purchasingManage/inquiryManage/components/inventoryTable.vue

@@ -369,7 +369,7 @@
             minWidth: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row.produceType && row.produceType.length

+ 2 - 2
src/views/purchasingManage/producerManage/components/addContactDialog.vue

@@ -988,7 +988,7 @@ export default {
         {
           prop: 'produceType',
           align: 'center',
-          label: '生产类型',
+          label: '属性类型',
           showOverflowTooltip: true,
           minWidth: 110
         },
@@ -1521,7 +1521,7 @@ export default {
         this.$set(params, 'specification', item.specification);
         this.$set(params, 'weightUnit', item.weightUnit);
         this.$set(params, 'imgCode', item.imgCode);
-        this.$set(params, 'produceType', item.produceType);
+        this.$set(params, 'produceType', item.componentAttribute);
         this.$set(params, 'approvalNumber', item.approvalNumber);
         this.$set(params, 'packingSpecification', item.packingSpecification);
         this.supplyList.push(params);

+ 2 - 2
src/views/purchasingManage/producerManage/components/contactDetailDialog.vue

@@ -1287,9 +1287,9 @@ export default {
           minWidth: 110
         },
         {
-          prop: 'produceType',
+          prop: '属性类型',
           align: 'center',
-          label: '生产类型',
+          label: 'produceType',
           showOverflowTooltip: true,
           minWidth: 110
         },

+ 2 - 2
src/views/purchasingManage/purchaseNeedManage/components/detailDialog.vue

@@ -89,11 +89,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="完成日期:" prop="finishDate">
               <el-input v-model="form.finishDate" disabled></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="用途:" prop="useTo">
               <el-input

+ 3 - 3
src/views/purchasingManage/purchaseNeedManage/components/inventoryTable.vue

@@ -522,7 +522,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row.produceType && row.produceType.length
@@ -684,7 +684,7 @@
           this.$set(parasm, 'specification', item.specification);
           this.$set(parasm, 'remark', '');
           this.$set(parasm, 'imgCode', item.imgCode);
-          this.$set(parasm, 'produceType', item.produceType);
+          this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
           this.$set(
             parasm,
@@ -748,7 +748,7 @@
           this.$set(parasm, 'specification', item.specification);
           this.$set(parasm, 'remark', '');
           this.$set(parasm, 'imgCode', item.imgCode);
-          this.$set(parasm, 'produceType', item.produceType);
+          this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
           this.$set(
             parasm,

+ 6 - 1
src/views/purchasingManage/purchaseOrder/components/addDialog.vue

@@ -1218,8 +1218,13 @@
         this.form = Object.assign({}, this.form, {
           contractId: obj.id,
           contractName: obj.contractName,
-          contractNo: obj.contractNo
+          contractNo: obj.contractNo,
+          relationId: obj.id,
+          relationName: obj.contractName,
+          relationCode: obj.contractNo,
+          
         });
+
         await this.getPlanInfo(this.form.contractId);
         await this.getDetailData(obj.id);
         // //采购询价表

+ 2 - 2
src/views/purchasingManage/purchaseOrder/components/inventoryTable.vue

@@ -747,7 +747,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row.produceType && row.produceType.length
@@ -1178,7 +1178,7 @@
           this.$set(parasm, 'specification', item.specification);
           this.$set(parasm, 'weightUnit', item.weightUnit);
           this.$set(parasm, 'imgCode', item.imgCode);
-          this.$set(parasm, 'produceType', item.produceType);
+          this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'approvalNumber', item.extField?.approvalNumber);
           this.$set(parasm, 'singleWeight', item.roughWeight);
           this.$set(parasm, 'pricingWay',item.pricingWay||1);

+ 2 - 2
src/views/purchasingManage/purchaseOrder/components/supplierGoodsListDialog.vue

@@ -108,7 +108,7 @@
           {
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             minWidth: 110
           },
@@ -224,7 +224,7 @@
           this.$set(params, 'specification', item.specification);
           this.$set(params, 'weightUnit', item.weightUnit);
           this.$set(params, 'imgCode', item.imgCode);
-          this.$set(params, 'produceType', item.produceType);
+          this.$set(params, 'produceType', item.componentAttribute);
           this.$set(params, 'approvalNumber', item.approvalNumber);
           this.$set(params, 'packingSpecification', item.packingSpecification);
           if (item.purchaseOrigins?.length) {

+ 13 - 9
src/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue

@@ -464,15 +464,15 @@
                   : '';
               }
             },
-            {
-              width: 80,
-              prop: 'deliveryDays',
-              label: '交期(天)',
-              slot: 'deliveryDays',
-              align: 'center',
-              show:v!=2,
+            // {
+            //   width: 80,
+            //   prop: 'deliveryDays',
+            //   label: '交期(天)',
+            //   slot: 'deliveryDays',
+            //   align: 'center',
+            //   show:v!=2,
 
-            },
+            // },
             {
               width: 160,
               prop: 'deliveryDeadline',
@@ -489,7 +489,11 @@
               slot: 'guaranteePeriod',
               align: 'center',
               show:v!=2,
-
+              formatter: (_row, _column, cellValue) => {
+              return (
+                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
+              );
+            },
             },
             {
               width: 160,

+ 8 - 8
src/views/purchasingManage/purchaseOrder/invoice/components/inventoryTable.vue

@@ -318,7 +318,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true
           },
           {
@@ -483,13 +483,13 @@
                 : '';
             }
           },
-          {
-            width: 80,
-            prop: 'deliveryDays',
-            label: '交期(天)',
-            slot: 'deliveryDays',
-            align: 'center'
-          },
+          // {
+          //   width: 80,
+          //   prop: 'deliveryDays',
+          //   label: '交期(天)',
+          //   slot: 'deliveryDays',
+          //   align: 'center'
+          // },
           {
             width: 160,
             prop: 'deliveryDeadline',

+ 1 - 1
src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue

@@ -299,7 +299,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true
           },
           {

+ 1 - 1
src/views/purchasingManage/purchaseOrder/returnGoods/components/inventoryTable.vue

@@ -358,7 +358,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true
           },
           {

+ 7 - 0
src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue

@@ -384,6 +384,13 @@
             label: '待采数量',
             align: 'center'
           },
+          // {
+          //   width: 120,
+          //   prop: 'singleWeight',
+          //   label: '单重',
+          //   slot: 'singleWeight',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'totalWeight',

+ 11 - 10
src/views/purchasingManage/purchasePlanManage/components/inventoryTable.vue

@@ -546,6 +546,13 @@
             slot: 'availableCountBase',
             align: 'center'
           },
+          // {
+          //   width: 120,
+          //   prop: 'singleWeight',
+          //   label: '单重',
+          //   slot: 'singleWeight',
+          //   align: 'center'
+          // },
           {
             width: 120,
             prop: 'totalWeight',
@@ -586,13 +593,7 @@
             slot: 'brand',
             align: 'center'
           },
-          // {
-          //   width: 120,
-          //   prop: 'singleWeight',
-          //   label: '单重',
-          //   slot: 'singleWeight',
-          //   align: 'center'
-          // },
+ 
 
           {
             width: 160,
@@ -639,7 +640,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row.produceType && row.produceType.length
@@ -867,7 +868,7 @@
           this.$set(parasm, 'specification', item.specification);
           this.$set(parasm, 'remark', '');
           this.$set(parasm, 'imgCode', item.imgCode);
-          this.$set(parasm, 'produceType', item.produceType);
+          this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'singleWeight', item.roughWeight);
 
           this.$set(parasm, 'approvalNumber', item.extField.approvalNumber);
@@ -907,7 +908,7 @@
 
           this.$set(parasm, 'remark', '');
           this.$set(parasm, 'imgCode', item.imgCode);
-          this.$set(parasm, 'produceType', item.produceType);
+          this.$set(parasm, 'produceType', item.componentAttribute);
           this.$set(parasm, 'approvalNumber', item.extField.approvalNumber);
           this.$set(
             parasm,

+ 2 - 2
src/views/purchasingManage/supplierManage/components/addContactDialog.vue

@@ -1019,7 +1019,7 @@
           {
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             minWidth: 110
           },
@@ -1567,7 +1567,7 @@
           this.$set(params, 'specification', item.specification);
           this.$set(params, 'weightUnit', item.weightUnit);
           this.$set(params, 'imgCode', item.imgCode);
-          this.$set(params, 'produceType', item.produceType);
+          this.$set(params, 'produceType', item.componentAttribute);
           this.$set(params, 'approvalNumber', item.approvalNumber);
           this.$set(params, 'packingSpecification', item.packingSpecification);
           this.$set(params, 'purchasingCycle', item.purchasingCycle);

+ 31 - 39
src/views/purchasingManage/supplierManage/components/contactDetailDialog.vue

@@ -36,8 +36,7 @@
                 <el-input v-model="form.serialNo" disabled></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+ 
             <el-col :span="8">
               <el-form-item label="供应商简称:" prop="simpleName">
                 <el-input v-model="form.simpleName" disabled></el-input>
@@ -53,8 +52,7 @@
                 <el-input v-model="form.registeredCapital" disabled></el-input>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
+         
             <el-col :span="8">
               <el-form-item label="授信额度:" prop="authorizationLimit">
                 <el-input v-model="form.authorizationLimit" disabled></el-input>
@@ -65,18 +63,6 @@
                 <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-row>
-          <el-row>
-            <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-col :span="8">
               <el-form-item
                 label="统一社会信用代码:"
@@ -86,13 +72,30 @@
                 <el-input v-model="form.unifiedSocialCreditCode" 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="industry">
                 <el-input v-model="form.industryFullName" 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.companyCategoryName" disabled></el-input>
@@ -108,8 +111,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>
@@ -131,8 +133,7 @@
 
             </el-col>
 
-          </el-row>
-          <el-row>
+   
             <el-col :span="16">
               <el-form-item label="备注:" prop="remark">
                 <el-input v-model="form.remark" disabled type="textarea"></el-input>
@@ -230,8 +231,8 @@
             {{ row.remark }}
           </template>
         </ele-pro-table>
-        <headerTitle title="其他信息" style="margin-top: 30px"></headerTitle>
-        <el-form
+        <!-- <headerTitle title="其他信息" style="margin-top: 30px"></headerTitle> -->
+        <!-- <el-form
           label-width="130px"
           ref="otherFormRef"
           :model="otherForm"
@@ -257,7 +258,7 @@
                 </el-input>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="8">
+            <el-col :span="8">
               <el-form-item
                 label="分管部门:"
                 prop="deptId"
@@ -270,7 +271,7 @@
               <el-form-item label="业务员:" prop="salesmanId">
                 {{otherForm.salesmanName}}
               </el-form-item>
-            </el-col> -->
+            </el-col>
 
             <el-col :span="8">
               <el-form-item label="寄件人:" prop="sender">
@@ -282,18 +283,9 @@
                 <el-input v-model="otherForm.senderPhone" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="寄件人地址:" prop="addressId">
-                <el-input v-model="otherForm.addressName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="寄件人详细地址:" prop="address">
-                <el-input v-model="otherForm.address" disabled></el-input>
-              </el-form-item>
-            </el-col>
+    
           </el-row>
-        </el-form>
+        </el-form> -->
       </el-tab-pane>
 <!--      <el-tab-pane label="银行信息" name="bank">-->
 <!--      -->
@@ -1290,7 +1282,7 @@ export default {
         {
           prop: 'produceType',
           align: 'center',
-          label: '生产类型',
+          label: '属性类型',
           showOverflowTooltip: true,
           minWidth: 110,
           formatter: (row, column) => {
@@ -1416,7 +1408,7 @@ export default {
         pageNum: page,
         size: limit,
         ...where,
-        relationId: this.form.id
+        contactId: this.form.id
       });
     },
     /* 订单表格表格数据源 */

+ 28 - 20
src/views/saleManage/contact/components/addContactDialog.vue

@@ -243,7 +243,7 @@
                 </DictSelection>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="form.type!=2">
               <el-form-item label="资质审查" prop="qualificationCensorship">
                 <el-radio v-model="form.qualificationCensorship" label="1"
                   >启用</el-radio
@@ -650,16 +650,24 @@
               修改
             </el-link>
 
-            <!--            <el-link-->
-            <!--              v-if="isNeed_process_is_close&&[0, 3].includes(scope.row.processStatus)"-->
-            <!--              type="primary"-->
-            <!--              :underline="false"-->
-            <!--              icon="el-icon-plus"-->
-            <!--              @click="submit(scope.row)"-->
-            <!--            >-->
-            <!--              提交-->
-            <!--            </el-link>-->
-
+            <el-link
+              v-if="[0, 3].includes(scope.row.processStatus)&&form.type==1&& form.qualificationCensorship == '2'"
+              type="primary"
+              :underline="false"
+              icon="el-icon-plus"
+              @click="submit(scope.row)"
+            >
+              提交
+            </el-link>
+            <el-link
+              v-if="[0, 3].includes(scope.row.processStatus)&&form.type==2"
+              type="primary"
+              :underline="false"
+              icon="el-icon-plus"
+              @click="submit(scope.row)"
+            >
+              提交
+            </el-link>
             <el-popconfirm
               class="ele-action"
               title="确定要删除此资质包吗?"
@@ -774,9 +782,9 @@
       <el-button
         type="primary"
         v-if="
-          ((form.type == 1 && activeName == 4) ||
-            (form.type == 2 && activeName == 5) ||
-            form?.id) &&
+          form.type == 1 &&
+          activeName == 4 &&
+          form?.id &&
           form.qualificationCensorship == '1'
         "
         @click="save('sub')"
@@ -1014,7 +1022,7 @@
           {
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             minWidth: 110,
             formatter: (row, column) => {
@@ -1478,7 +1486,7 @@
             businessKey: 'contact_qc_approve',
             formCreateUserId: row.createUserId,
             variables: {
-              certificationType: 1
+              certificationType: this.form.type
             }
             // callBackMethodType : '1',
             // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',
@@ -1822,13 +1830,13 @@
           this.$set(params, 'specification', item.specification);
           this.$set(params, 'weightUnit', item.weightUnit);
           this.$set(params, 'imgCode', item.imgCode);
-          this.$set(params, 'produceType', item.produceType);
+          this.$set(params, 'produceType', item.componentAttribute);
           this.$set(params, 'approvalNumber', item.approvalNumber);
           this.$set(params, 'packingSpecification', item.packingSpecification);
-          if(item.purchaseOrigins?.length){
-            item.purchaseOrigins=item.purchaseOrigins.map(val=>val+'')
+          if (item.purchaseOrigins?.length) {
+            item.purchaseOrigins = item.purchaseOrigins.map((val) => val + '');
           }
-          this.$set(params, 'provenance', item.purchaseOrigins||[]);
+          this.$set(params, 'provenance', item.purchaseOrigins || []);
           this.supplyList.push(params);
         });
       },

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -366,7 +366,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             formatter: (row, column) => {
               return row?.produceType
                 ?.map((item) => {

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/inventoryTable.vue

@@ -468,7 +468,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             formatter: (row, column) => {
               return row?.produceType
                 ?.map((item) => {

+ 1 - 1
src/views/saleManage/saleOrder/invoice/components/replaceTable.vue

@@ -642,7 +642,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true
           },
           ...this.dynamicsColumns,

+ 2 - 2
src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturn.vue

@@ -837,7 +837,7 @@ export default {
           width: 120,
           prop: 'produceType',
           align: 'center',
-          label: '生产类型',
+          label: '属性类型',
           showOverflowTooltip: true,
           formatter: (row, column) => {
             return row.produceType && row.produceType.length
@@ -1381,7 +1381,7 @@ export default {
         this.$set(params, 'specification', item.specification);
         this.$set(params, 'weightUnit', item.weightUnit);
         this.$set(params, 'imgCode', item.imgCode);
-        this.$set(params, 'produceType', item.produceType);
+        this.$set(params, 'produceType', item.componentAttribute);
         this.$set(params, 'productionDays', item.productionDays);
         this.$set(params, 'approvalNumber', item.extField.approvalNumber);
         this.$set(params, 'singleWeight', item.roughWeight);

+ 1 - 1
src/views/saleManage/saleOrder/returnGoods/components/inventoryTableReturnDetail.vue

@@ -241,7 +241,7 @@
             width: 120,
             prop: 'produceType',
             align: 'center',
-            label: '生产类型',
+            label: '属性类型',
             showOverflowTooltip: true,
             formatter: (row, column) => {
               return row.produceType && row.produceType.length