销售报价单->生成合同时，自动带出客户简称到合同名称字段

(报价单只能单选)采购核价单->生成合同时，带出核价单名称，自动带出客户简称到合同名称字段(采购核价单可以多选，所以核价单字段用核价单名称逗号分隔)
核价管理详情产品清单不可以删除

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

@@ -20,7 +20,7 @@
         height="calc(100vh - 350px)"
         class="dict-table"
       >
- 
+
       </ele-pro-table>
     </el-card>
 

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

@@ -247,6 +247,7 @@
             reviewerTime: '',
             sourceId: this.current.id,
             sourceType: 1,
+            sourceName: data.code,
             status: '',
             totalPrice: data.totalPrice,
             type: '1',

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

@@ -14,7 +14,7 @@
           v-model="radio1"
           @input="changeValue"
           :label="form.supplierId"
-          style="margin-right;: 10px"
+          style="margin-right: 10px"
           :disabled="status == 'Detail'"
           >是否中标</el-radio
         >
@@ -22,10 +22,10 @@
           class="ele-action"
           title="确定要删除吗？"
           @confirm="removeSupplier"
-          :disabled="status == 'Detail'"
+          v-if="status!=='Detail'"
         >
           <template v-slot:reference>
-            <el-link type="danger" :underline="false" icon="el-icon-delete">
+            <el-link  type="danger" :underline="false" icon="el-icon-delete">
               删除
             </el-link>
           </template>

src/views/purchasingManage/inquiryManage/index.vue

@@ -141,7 +141,7 @@
   import planDetaillog from '../../purchasingManage/purchasePlanManage/components/detailDialog.vue';
   import popModal from '@/components/pop-modal';
   import dictMixins from '@/mixins/dictMixins';
-  import { contactTypeTree } from '@/api/saleManage/contact';
+  import {contactDetail, contactTypeTree} from '@/api/saleManage/contact';
 
   import {
     getTableList,
@@ -205,13 +205,13 @@
             showOverflowTooltip: true,
             minWidth: 200
           },
-          {
-            prop: 'supplierNames',
-            label: '供应商名称',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 200
-          },
+          // {
+          //   prop: 'supplierNames',
+          //   label: '供应商名称',
+          //   align: 'center',
+          //   showOverflowTooltip: true,
+          //   minWidth: 200
+          // },
           {
             prop: 'winnerName',
             label: '中标供应商',
@@ -323,16 +323,17 @@
         this.$refs.table.reload({ page: 1, where });
       },
       //新增合同
-      addGenerateContract(type, row) {
+      async addGenerateContract(type, row) {
         let { verify, text, ids } = this.verify(type, row);
         if (!verify) {
           this.$message.warning(text);
           return;
         }
 
-        generateContract(ids).then((res) => {
-          this.$refs.addContractBookDialogRef.open('add', res, true);
-        });
+        let contractInfo = await generateContract(ids);
+        let contact = await contactDetail(contractInfo.contractVO.partbId);
+        contractInfo.contractVO.contractName = contact.base.simpleName;
+        this.$refs.addContractBookDialogRef.open('add', contractInfo, true);
       },
       //新增编辑
       openEdit(type, row) {

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

@@ -280,7 +280,7 @@
 
       <headerTitle title="产品清单" style="margin-top: 30px"></headerTitle>
 
-      <inventoryTable ref="inventoryTable"></inventoryTable>
+      <inventoryTable ref="inventoryTable" :is-show-supplier-mark="true"></inventoryTable>
       <el-row style="margin-top: 20px">
         <el-col :span="12">
           <el-form-item
@@ -890,6 +890,7 @@
       cancel() {
         this.$nextTick(() => {
           this.activeName = 'base';
+          this.isFlag = false;
           // 关闭后，销毁所有的表单数据
           this.$refs['otherForm'] && this.$refs['otherForm'].resetFields();
           this.$refs['formRef'] && this.$refs['formRef'].resetFields();

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

@@ -424,6 +424,12 @@
             label: '型号',
             slot: 'modelType'
           },
+          {
+            width: 120,
+            prop: 'supplierMark',
+            label: '供应商代号',
+            slot: 'supplierMark'
+          },
           {
             width: 120,
             prop: 'specification',

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

@@ -233,6 +233,17 @@
             ></el-input>
           </el-form-item>
         </template>
+        <template v-slot:supplierMark="scope">
+          <el-form-item
+            style="margin-bottom: 20px"
+            :prop="'datasource.' + scope.$index + '.supplierMark'"
+          >
+            <el-input
+              v-model="scope.row.supplierMark"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+        </template>
         <template v-slot:technicalDrawings="scope">
           <el-form-item
             style="margin-bottom: 20px"
@@ -275,6 +286,9 @@
         <template v-slot:headerDeadline="{ column }">
           <span class="is-required">{{ column.label }}</span>
         </template>
+        <template v-slot:headerSupplierMark="{ column }">
+          <span class="is-required">{{ column.label }}</span>
+        </template>
         <template v-slot:headerProductName="{ column }">
           <span class="is-required">{{ column.label }}</span>
         </template>
@@ -385,6 +399,13 @@
             label: '型号',
             slot: 'modelType'
           },
+          {
+            width: 120,
+            prop: 'supplierMark',
+            label: '供应商代号',
+            headerSlot: 'headerSupplierMark',
+            slot: 'supplierMark'
+          },
           {
             width: 120,
             prop: 'specification',

src/views/purchasingManage/purchaseOrder/invoice/components/addInvoiceDialog.vue

@@ -110,6 +110,7 @@
 
     <headerTitle title="产品清单" style="margin-top: 30px"></headerTitle>
     <inventoryTable
+      :is-show-supplier-mark="true"
       ref="inventoryTableref"
       :orderId="form.orderId"
     ></inventoryTable>

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

@@ -202,6 +202,12 @@
             label: '型号',
             slot: 'modelType'
           },
+          {
+            width: 120,
+            prop: 'supplierMark',
+            label: '供应商代号',
+            slot: 'supplierMark',
+          },
           {
             width: 120,
             prop: 'specification',

src/views/saleManage/quotation/index.vue

@@ -340,7 +340,6 @@
             categoryName: '',
             contractEndDate: '',
             contractFile: [],
-            contractName: '',
             contractNo: '',
             contractNumber: '',
             contractStartDate: '',
@@ -375,6 +374,7 @@
             reviewerTime: '',
             sourceId: row.id,
             sourceType: 1,
+            sourceName: data.code,
             status: '',
             totalPrice: data.totalPrice,
             type: '1',
@@ -389,10 +389,6 @@
           productList: data.quoteProductList
         };
         // return;
-        console.log(
-          this.$refs.addContractBookDialogRef,
-          'this.$refs.addContractBookDialogRef'
-        );
         this.$refs.addContractBookDialogRef.open('add', obj, true);
       },
       //查看详情