修改

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

@@ -176,11 +176,7 @@
             label: '状态',
             fixed: 'left',
             formatter: (row, column) => {
-              return row.isInquiry == 1
-                ? '部分核价'
-                : row.isInquiry == 2
-                ? '全部核价完成'
-                : '未核价';
+              return row.isInquiry==1?'部分核价':row.isInquiry==2?'全部核价完成':row.isInquiry==3?'核价中':'未核价'
             },
             align: 'center'
           },

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

@@ -206,11 +206,7 @@
             filterMethod: this.isInquiryFn,
             // sortable: true,
             formatter: (row, column) => {
-              return row.isInquiry == 1
-                ? '部分核价'
-                : row.isInquiry == 2
-                ? '全部核价完成'
-                : '未核价';
+              return row.isInquiry==1?'部分核价':row.isInquiry==2?'全部核价完成':row.isInquiry==3?'核价中':'未核价'
             },
             align: 'center'
           },

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

@@ -913,7 +913,6 @@
       },
 
       async putTableValue({ productList, rawDetailList, outputDetailList }) {
-
         this.$refs.inventoryTable &&
           this.$refs.inventoryTable.putTableValue(productList);
         this.$refs.rawDetailListRef &&
@@ -960,6 +959,11 @@
       async getDetailData(id) {
         this.loading = true;
         const data = await getDetail(id);
+        let info = await getProductsBySource({
+          relationId: this.form.relationId,
+          relationType: this.form.relationType
+        });
+
         this.loading = false;
         if (data) {
           if (data.contractVO.sourceType == 3 && data.contractVO.sourceId) {
@@ -1031,17 +1035,17 @@
               isFirstProcess
             });
             this.getLinkInfo(partaId);
-            data.productList.forEach((item) => {
-              item['supplierMark'] = item.customerMark;
-            });
-            if (data.productList.lenght > 1) {
+
+       
+
+            if (info.productList.lenght > 1) {
               this.$refs.planTableListRef.contractOpen(
-                data.productList,
+                info.productList,
                 contractVO.contractStartDate
               );
             } else {
               this.contractSuccess({
-                productList: data.productList,
+                productList: info.productList,
                 contractStartDate: contractVO.contractStartDate
               });
             }

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

@@ -1107,7 +1107,7 @@
             item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode
               ? item.guaranteePeriodUnitCode + ''
               : '';
-            item.deliveryDeadline = item.customerExpectDeliveryDeadline;
+            // item.deliveryDeadline = item.customerExpectDeliveryDeadline;
             // if (item.deliveryDays) {
             //   item['deliveryDeadline'] = this.setDay(item.deliveryDays);//customerExpectDeliveryDeadline
             // }

src/views/purchasingManage/purchasePlanManage/components/detailDialog.vue

@@ -71,7 +71,7 @@
             <el-form-item label="完结日期：" prop="receiveDate">
               <el-input v-model="form.receiveDate" disabled></el-input>
             </el-form-item>
-            <el-form-item prop="askFile" label="附件：">
+            <el-form-item prop="files" label="附件：">
               <fileMain v-model="form.files" type="view"></fileMain>
             </el-form-item>
           </el-col>
@@ -136,7 +136,7 @@
                   :underline="false"
                   @click.native="handleMethod(scope.row)"
                 >
-                  {{ scope.row.expectReceiveDate }}
+                查看分批时间
                 </el-link>
               </div>
             </template>
@@ -317,7 +317,7 @@
             label: '状态',
             fixed: 'left',
             formatter: (row, column) => {
-              return row.isInquiry==1?'部分核价':row.isInquiry==2?'全部核价完成':'未核价'
+              return row.isInquiry==1?'部分核价':row.isInquiry==2?'全部核价完成':row.isInquiry==3?'核价中':'未核价'
             },
             align: 'center'
           },

src/views/saleManage/contact/components/addContactDialog.vue

@@ -670,7 +670,7 @@
             </el-link>
             <el-popconfirm
               class="ele-action"
-              title="确定要删除此吗？"
+              title="确定要删除此资质吗？"
               @confirm="handleRemove(scope.row)"
             >
               <template v-slot:reference>