From 09ae477647005a52b546778e53a8348bec70f610 Mon Sep 17 00:00:00 2001
From: jiayang yue <jiayang.yue@xujiesoft.com>
Date: Mon, 17 Mar 2025 23:04:20 +0800
Subject: [PATCH] =?UTF-8?q?2025.03.17=20=E6=96=87=E6=A1=A3=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=20-=20=E4=BC=98=E5=8C=96=20=E8=AF=A2=E4=BB=B7?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/eam/com_project_proof_record.vue  |  9 ++-
 src/views/modules/eam/eamProjectPartInfo.vue  | 14 ++--
 .../modules/inquiry/inquiryApplication.vue    | 73 +++++++++++++++----
 src/views/modules/inquiry/inquiryDetail.vue   | 35 +++++----
 .../inquiryTechnicalMaterialsNoBuilt.vue      | 10 +++
 src/views/modules/part/quicklyCreateBom.vue   |  3 +
 6 files changed, 101 insertions(+), 43 deletions(-)

diff --git a/src/views/modules/eam/com_project_proof_record.vue b/src/views/modules/eam/com_project_proof_record.vue
index 07326ab..6a981c1 100644
--- a/src/views/modules/eam/com_project_proof_record.vue
+++ b/src/views/modules/eam/com_project_proof_record.vue
@@ -94,12 +94,15 @@
                   v-else
                   header-align="center"
                   align="center"
-                  width="120"
+                  width="140"
                   fixed="left"
                   label="操作">
                   <template slot-scope="scope">
                     <a type="primary" size="small" v-if="scope.row.documentDefinitionListId !== '-1'" @click="uploadFile(scope.row)">上传文件</a>
                     <a type="text" size="small" v-if="scope.row.documentId !== null" @click="viewDocumentFile(scope.row)">查看附件</a>
+                    <a type="text" size="small" v-if="scope.row.documentId !== null && scope.row.createdBy ===
+                    $store.state.user.name"
+                       @click="proofDocumentDelete(scope.row)">删除</a>
                   </template>
                 </el-table-column>
                 <el-table-column label="序号" type="index" align="center" :index="indexMethod">
@@ -1323,7 +1326,7 @@
           testPartNo: this.proofDocumenCurrentRow.testPartNo,
           partDesc: this.proofDocumenCurrentRow.partDesc,
           page: 1,
-          limit: 1000
+          limit: -1
         }
         return getProofDocument(tempData).then(({data}) => {
           if (data && data.code === 0) {
@@ -1722,7 +1725,7 @@
         }
         if (tempData.createBy !== tempData.username) {
           this.$message({
-            message: '只能删除上传人的上传打样文档',
+            message: '只有上传人才能删除该文件',
             type: 'warning'
           })
         }else {
diff --git a/src/views/modules/eam/eamProjectPartInfo.vue b/src/views/modules/eam/eamProjectPartInfo.vue
index 426e727..a6492a6 100644
--- a/src/views/modules/eam/eamProjectPartInfo.vue
+++ b/src/views/modules/eam/eamProjectPartInfo.vue
@@ -342,12 +342,14 @@
               v-if="this.authUpdate"
               header-align="center"
               align="center"
-              width="120"
+              width="140"
               fixed="left"
               label="操作">
               <template slot-scope="scope">
                 <a type="primary" v-if="scope.row.documentDefinitionListId !== '-1'" @click="uploadFile(scope.row)">上传文件</a>
                 <a type="text" size="small" v-if="shouldShowDelete(scope.row) || scope.row.projectPhase === 'SOP文档'" @click="viewMassDocumentFile(scope.row)">查看附件</a>
+                <a type="text" size="small" v-if="shouldShowDelete(scope.row) && scope.row.createdBy === $store.state.user.name"
+                   @click="massProductionDocumentDelete(scope.row)">删除</a>
               </template>
             </el-table-column>
           <el-table-column
@@ -2663,7 +2665,7 @@ import {updateColumnSize} from "../../../api/table";
             columnProp: 'createDate',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '创建时间',
+            columnLabel: '上传时间',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -2681,7 +2683,7 @@ import {updateColumnSize} from "../../../api/table";
             columnProp: 'createdBy',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '创建人',
+            columnLabel: '上传人',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -2902,7 +2904,7 @@ import {updateColumnSize} from "../../../api/table";
             columnProp: 'createDate',
             headerAlign: 'center',
             align: 'center',
-            columnLabel: '创建时间',
+            columnLabel: '上传时间',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -2920,7 +2922,7 @@ import {updateColumnSize} from "../../../api/table";
             columnProp: 'createdBy',
             headerAlign: 'center',
             align: 'left',
-            columnLabel: '创建人',
+            columnLabel: '上传人',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -4903,7 +4905,7 @@ import {updateColumnSize} from "../../../api/table";
         }
         if (tempData.createBy !== tempData.username) {
           this.$message({
-            message: '只能删除自己创建的打样记录',
+            message: '只有上传人才能删除该文件',
             type: 'warning'
           })
         }else {
diff --git a/src/views/modules/inquiry/inquiryApplication.vue b/src/views/modules/inquiry/inquiryApplication.vue
index bffc49c..cb308aa 100644
--- a/src/views/modules/inquiry/inquiryApplication.vue
+++ b/src/views/modules/inquiry/inquiryApplication.vue
@@ -53,8 +53,8 @@
         <el-select v-model="searchData.status" style="width: 120px">
           <el-option label="全部" value=""></el-option>
           <el-option label="草稿" value="C"></el-option>
-          <el-option label="已下达" value="B"></el-option>
-          <el-option label="已报价" value="A"></el-option>
+          <el-option label="下达" value="B"></el-option>
+          <el-option label="已转报价" value="A"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="'PjM'">
@@ -138,7 +138,7 @@
             <span v-if="!item.columnHidden">
               <span v-if="scope.row.status === 'C'">草稿</span>
               <span v-if="scope.row.status === 'B'">下达</span>
-              <span v-if="scope.row.status === 'A'">已报价</span>
+              <span v-if="scope.row.status === 'A'">已转报价</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>
@@ -158,10 +158,10 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="140"
+        width="100"
         label="操作">
         <template slot-scope="scope">
-          <el-link style="cursor: pointer" @click="addInquiryPartModal(scope.row)">新增产品</el-link>
+<!--          <el-link style="cursor: pointer" @click="addInquiryPartModal(scope.row)">新增产品</el-link>-->
           <el-link style="cursor: pointer" v-if="scope.row.status === 'C'"
                    @click="updateModalStatus(scope.row,'B')">下达
           </el-link>
@@ -615,6 +615,7 @@ export default {
         quoter: '',
         quoterName: '',
         status: '',
+        bomStatusDb: '',
         remark: '',
         createDate: '',
         createBy: '',
@@ -972,6 +973,24 @@ export default {
           fixed: '',
           columnWidth: 100
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5022,
+          serialNumber: '5022Table1BomStatusDb',
+          tableId: '5022Table1',
+          tableName: '询价信息表',
+          columnProp: 'bomStatusDb',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '是否创建技术资料',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 110
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 5022,
@@ -1103,12 +1122,12 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5022,
-          serialNumber: '5022Table2PartDesc',
+          serialNumber: '5022Table2TestPartDesc',
           tableId: '5022Table2',
           tableName: '询价产品表',
-          columnProp: 'partDesc',
+          columnProp: 'testPartDesc',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '产品描述',
           columnHidden: false,
           columnImage: false,
@@ -1116,7 +1135,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 150
         },
         {
           userId: this.$store.state.user.name,
@@ -1126,7 +1145,7 @@ export default {
           tableName: '询价产品表',
           columnProp: 'inquiryQty',
           headerAlign: 'center',
-          align: 'center',
+          align: 'right',
           columnLabel: '询价数量',
           columnHidden: false,
           columnImage: false,
@@ -1134,7 +1153,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
@@ -1170,7 +1189,25 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 100
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 5022,
+          serialNumber: '5022Table2PartBomStatus',
+          tableId: '5022Table2',
+          tableName: '询价产品表',
+          columnProp: 'partBomStatus',
+          headerAlign: 'center',
+          align: 'center',
+          columnLabel: '状态',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 100
         },
         {
           userId: this.$store.state.user.name,
@@ -1180,7 +1217,7 @@ export default {
           tableName: '询价产品表',
           columnProp: 'remark',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '备注',
           columnHidden: false,
           columnImage: false,
@@ -1188,7 +1225,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 120
+          columnWidth: 160
         },
         {
           userId: this.$store.state.user.name,
@@ -1491,6 +1528,9 @@ export default {
       /*第二个表格高度的动态调整*/
       this.height = window.innerHeight - 210;
     })
+    EventBus.$on('refreshInquiryOneDetail1', () => {
+      this.refreshCurrentTabTable();
+    });
   },
   created() {
     this.getSiteAndBuByUserName()
@@ -1627,6 +1667,7 @@ export default {
         quoterName: '',
         customerInquiryNo: '',
         status: 'C',
+        bomStatusDb: '未创建',
         priorityLevel: '',
         requestDate: new Date(),
         requiredCompletionDate: '',
@@ -2447,9 +2488,9 @@ export default {
         // 遍历dataList 取-后的值
         this.resultList.forEach((item) => {
           if (item.status === 'A') {
-            item.status = '已报价'
+            item.status = '已转报价'
           } else if (item.status === 'B') {
-            item.status = '已下达'
+            item.status = '下达'
           } else if (item.status === 'C') {
             item.status = '草稿'
           }
diff --git a/src/views/modules/inquiry/inquiryDetail.vue b/src/views/modules/inquiry/inquiryDetail.vue
index 0d00fda..4b08cc1 100644
--- a/src/views/modules/inquiry/inquiryDetail.vue
+++ b/src/views/modules/inquiry/inquiryDetail.vue
@@ -90,7 +90,7 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="草稿" value="C"></el-option>
           <el-option label="已下达" value="B"></el-option>
-          <el-option label="已报价" value="A"></el-option>
+          <el-option label="已转报价" value="A"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="' '">
@@ -143,7 +143,7 @@
             <span v-if="!item.columnHidden">
               <span v-if="scope.row.status === 'C'">草稿</span>
               <span v-if="scope.row.status === 'B'">已下达</span>
-              <span v-if="scope.row.status === 'A'">已报价</span>
+              <span v-if="scope.row.status === 'A'">已转报价</span>
             </span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
                                                style="width: 100px; height: 80px"/></span>
@@ -352,7 +352,7 @@ export default {
   },
   computed: {
     statusDisplay() {
-      return this.inquiryPartCurrentRow.status === 'C' ? '草稿' : (this.inquiryPartCurrentRow.status === 'B' ? '已下达' : '已报价')
+      return this.inquiryPartCurrentRow.status === 'C' ? '草稿' : (this.inquiryPartCurrentRow.status === 'B' ? '已下达' : '已转报价')
     },
     priorityLevelDisplay() {
       return this.inquiryPartCurrentRow.priorityLevel === 'A' ? '普通' : (this.inquiryPartCurrentRow.priorityLevel === ' B' ? '重要' : '紧急')
@@ -567,8 +567,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5023,
-          serialNumber: '5023Table2PartNo',
-          tableId: '5023Table2',
+          serialNumber: '5023Table1PartNo',
+          tableId: '5023Table1',
           tableName: '询价明细表',
           columnProp: 'partNo',
           headerAlign: 'center',
@@ -585,10 +585,10 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5023,
-          serialNumber: '5023Table2PartDesc',
-          tableId: '5023Table2',
+          serialNumber: '5023Table1TestPartDesc',
+          tableId: '5023Table1',
           tableName: '询价明细表',
-          columnProp: 'partDesc',
+          columnProp: 'testPartDesc',
           headerAlign: 'center',
           align: 'center',
           columnLabel: '产品描述',
@@ -621,8 +621,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5023,
-          serialNumber: '5023Table2InquiryQty',
-          tableId: '5023Table2',
+          serialNumber: '5023Table1InquiryQty',
+          tableId: '5023Table1',
           tableName: '询价明细表',
           columnProp: 'inquiryQty',
           headerAlign: 'center',
@@ -639,8 +639,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5023,
-          serialNumber: '5023Table2Unit',
-          tableId: '5023Table2',
+          serialNumber: '5023Table1Unit',
+          tableId: '5023Table1',
           tableName: '询价明细表',
           columnProp: 'umName',
           headerAlign: 'center',
@@ -657,8 +657,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5023,
-          serialNumber: '5023Table2CodeNo',
-          tableId: '5023Table2',
+          serialNumber: '5023Table1CodeNo',
+          tableId: '5023Table1',
           tableName: '询价明细表',
           columnProp: 'codeNo',
           headerAlign: 'center',
@@ -693,8 +693,8 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: 5023,
-          serialNumber: '5023Table2Remark',
-          tableId: '5023Table2',
+          serialNumber: '5023Table1Remark',
+          tableId: '5023Table1',
           tableName: '询价明细表',
           columnProp: 'remark',
           headerAlign: 'center',
@@ -1158,7 +1158,6 @@ export default {
   },
 
   activated() {
-    console.log(this.$route.query.id)
     if (this.$route.query.id) {
       this.getDataList(this.$route.query.id);
       this.activeTable = 'inquiryPartDetail';
@@ -1450,7 +1449,7 @@ export default {
         // 遍历dataList 取-后的值
         this.resultList.forEach((item) => {
           if (item.status === 'A') {
-            item.status = '已报价'
+            item.status = '已转报价'
           } else if (item.status === 'B') {
             item.status = '已下达'
           } else if (item.status === 'C') {
diff --git a/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue b/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue
index 3277983..176d3ff 100644
--- a/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue
+++ b/src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue
@@ -1721,6 +1721,16 @@ export default {
     },
 
     submitTechnicalMaterials(row){
+      if (this.inquiryPartDataList.length === 0) {
+        this.$message.warning('请先添加询价产品！')
+        return
+      }
+      for (const item of this.inquiryPartDataList) {
+        if (item.partBomStatus === '未创建') {
+          this.$message.warning('请先创建询价产品:' + item.testPartDesc + ' 的BOM！')
+          return // 直接结束整个函数
+        }
+      }
       this.$confirm('是否确认提交技术资料?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
diff --git a/src/views/modules/part/quicklyCreateBom.vue b/src/views/modules/part/quicklyCreateBom.vue
index 103e02a..95928d1 100644
--- a/src/views/modules/part/quicklyCreateBom.vue
+++ b/src/views/modules/part/quicklyCreateBom.vue
@@ -668,6 +668,7 @@ export default {
       this.searchData.buNo = row.buNo
       this.searchData.partNo = row.partNo
       this.searchData.partDesc = row.partDesc
+      this.searchData.testPartId = row.id
       this.getNodeTree()
       this.partModelFlag = false
     },
@@ -869,6 +870,8 @@ export default {
     updateInquiryDetailStatus () {
       let inData = {
         id: this.searchData.id,
+        testPartId: this.searchData.testPartId,
+        testPartDesc: this.searchData.partDesc,
         partBomStatus: this.searchData.partBomStatus,
         updateBy: this.$store.state.user.name,
       }