bug

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

@@ -462,6 +462,7 @@
             :pricingWay="form.pricingWay"
             :isChangeCount="false"
             @setDiscountTotalPrice="setDiscountTotalPrice"
+            :isTemporary="true"
           ></inventoryTable1>
         </el-tab-pane>
         <el-tab-pane
@@ -1466,19 +1467,19 @@
             }
           );
 
-          commitData.productList.forEach((item) => {
-            if (!item.productCode) {
-              isTemporary.push(item.productName);
-            }
-          });
-          if (isTemporary.length > 0) {
-            this.$message.error(
-              isTemporary.toString() +
-                '是临时产品，无法创建合同，请先去主数据维护！'
-            );
+          // commitData.productList.forEach((item) => {
+          //   if (!item.productCode) {
+          //     isTemporary.push(item.productName);
+          //   }
+          // });
+          // if (isTemporary.length > 0) {
+          //   this.$message.error(
+          //     isTemporary.toString() +
+          //       '是临时产品，无法创建合同，请先去主数据维护！'
+          //   );
 
-            return;
-          }
+          //   return;
+          // }
           let relationId =
             this.form.type == 1 ? this.form.partaId : this.form.partbId;
           if (this.isUpdate) {

src/views/purchasingManage/purchaseOrder/outSourceSend/components/detailDialog.vue

@@ -263,6 +263,34 @@
             slot: 'specification',
             align: 'center'
           },
+          {
+            width: 120,
+            prop: 'imgCode',
+            align: 'center',
+            label: '图号/件号',
+            showOverflowTooltip: true
+          },
+          {
+            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: 200,
             prop: 'supplierMark',
@@ -405,13 +433,13 @@
                 : '';
             }
           },
-          {
-            width: 120,
-            prop: 'deliveryDays',
-            label: '交期(天)',
-            slot: 'deliveryDays',
-            align: 'center'
-          },
+          // {
+          //   width: 120,
+          //   prop: 'deliveryDays',
+          //   label: '交期(天)',
+          //   slot: 'deliveryDays',
+          //   align: 'center'
+          // },
           {
             width: 200,
             prop: 'guaranteePeriod',
@@ -449,11 +477,7 @@
             prop: 'technicalDrawings',
             label: '技术图纸',
             slot: 'technicalDrawings',
-            formatter: (_row, _column, cellValue) => {
-              return (
-                (_row.guaranteePeriod || '') + _row.guaranteePeriodUnitName
-              );
-            },
+            
             align: 'center'
           },
           {

src/views/purchasingManage/purchaseOrder/outSourceSend/components/inventoryTable.vue

@@ -300,7 +300,14 @@
             prop: 'produceType',
             align: 'center',
             label: '属性类型',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            formatter: (row, column) => {
+              return row.produceType && row.produceType.length
+                ? row.produceType
+                    .map((item) => this.getDictValue('生产类型', item))
+                    .join(',')
+                : '';
+            }
           },
           // {
           //   width: 120,
@@ -455,19 +462,7 @@
             }
           },
 
-          // {
-          //   width: 80,
-          //   prop: 'deliveryDays',
-          //   label: '交期(天)',
-          //   slot: 'deliveryDays'
-          // },
-          // {
-          //   width: 160,
-          //   prop: 'deliveryDeadline',
-          //   label: '交期截止日期',
-          //   slot: 'deliveryDeadline',
-          //   show: this.isDeliveryDeadline
-          // },
+
           {
             prop: 'provenance',
             label: '产地',
@@ -580,6 +575,7 @@
     },
     created() {
       this.requestDict('产地');
+      this.requestDict('生产类型');
       // getWarehouseList().then((res) => {
       //   this.warehouseList = res;
       // });

src/views/saleManage/saleOrder/customerReturnOrder/addOrEditDialog.vue

@@ -600,7 +600,7 @@
             businessKey: 'sales_return_handle_approve',
             formCreateUserId: data.createUserId,
             variables: {
-              businessCode: data.returnNo
+              businessCode: data.returnHandleNo
             }
           };
 

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

@@ -1144,7 +1144,7 @@
             variables: {
               returnSourceType: data.returnSourceType,
               storemanIds: storemanIds.toString(),
-              businessCode: res.returnNo
+              businessCode: data.returnNo
             }
             // callBackMethodType : '1',
             // callBackMethod : 'proTargetPlanApproveApiImpl.updatePlanApprovalStatus',