2024-10-20

1 year ago · 8c6e279df9
10 changed files with 88 additions and 84 deletions
--- a/src/api/project/project.js
+++ b/src/api/project/project.js
@ -30,7 +30,7 @@ export const getContactChooseData2= data => createAPI(`/project/getContactChoose
 export const saveProjectContactList= data => createAPI(`/project/saveProjectContactList`,'post',data)
 export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,'post',data)
 export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data)
-export const getProjectPartList= data => createAPI(`/project/getProjectPartList`,'get',data)
+export const getProjectPartList= data => createAPI(`/project/getProjectPartList`,'post',data)
 export const getProjectPart= data => createAPI(`/project/getProjectPart`,'get',data)
 export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data)
 export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data)
--- a/src/views/modules/customer/customerInformationManagement.vue
+++ b/src/views/modules/customer/customerInformationManagement.vue
@ -924,6 +924,23 @@ export default {
      // ======== 列表表头 ========
      columnList: [
        {
+          userId: this.$store.state.user.name,
+          functionId: 101001,
+          serialNumber: '101001Table1CustomerNo',
+          tableId: '101001Table1',
+          tableName: '客户信息表',
+          columnProp: 'customerNo',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '客户代码',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 160
+        },{
          userId: this.$store.state.user.name,
          functionId: 101001,
          serialNumber: '101001Table1CustomerDesc',
--- a/src/views/modules/project/projectInfo/com_project_info_quotation.vue
+++ b/src/views/modules/project/projectInfo/com_project_info_quotation.vue
@ -43,42 +43,6 @@ export default {
          fixed: '',
          columnWidth: 100
        },
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 101002001,
-        //   serialNumber: '101002001Table5CustomerNo',
-        //   tableId: '101002001Table5',
-        //   tableName: '报价信息表',
-        //   columnProp: 'customerNo',
-        //   headerAlign: 'center',
-        //   align: 'center',
-        //   columnLabel: '客户编码',
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: false,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: '',
-        //   columnWidth: 120
-        // },
-        // {
-        //   userId: this.$store.state.user.name,
-        //   functionId: 101002001,
-        //   serialNumber: '101002001Table5CustomerName',
-        //   tableId: '101002001Table5',
-        //   tableName: '报价信息表',
-        //   columnProp: 'customerName',
-        //   headerAlign: 'center',
-        //   align: 'center',
-        //   columnLabel: '客户名称',
-        //   columnHidden: false,
-        //   columnImage: false,
-        //   columnSortable: false,
-        //   sortLv: 0,
-        //   status: true,
-        //   fixed: '',
-        //   columnWidth: 120
-        // },
        {
          userId: this.$store.state.user.name,
          functionId: 101002001,
@ -160,7 +124,7 @@ export default {
          columnProp: 'customerInquiryNo',
          headerAlign: 'center',
          align: 'center',
-          columnLabel: '客户报价单号',
+          columnLabel: '客户询价单号',
          columnHidden: false,
          columnImage: false,
          columnSortable: false,
@ -178,7 +142,7 @@ export default {
          columnProp: 'internalInquiryNo',
          headerAlign: 'center',
          align: 'center',
-          columnLabel: '内部报价单号',
+          columnLabel: '内部询价单号',
          columnHidden: false,
          columnImage: false,
          columnSortable: false,
--- a/src/views/modules/project/projectInfo/com_project_sample.vue
+++ b/src/views/modules/project/projectInfo/com_project_sample.vue
@ -114,7 +114,7 @@
            columnProp: 'trackerName',
            headerAlign: 'center',
            align: 'center',
-            columnLabel: '跟单员',
+            columnLabel: 'CS',
            columnHidden: false,
            columnImage: false,
            columnSortable: false,
@ -132,7 +132,25 @@
            columnProp: 'engineerName',
            headerAlign: 'center',
            align: 'center',
-            columnLabel: '工程师',
+            columnLabel: 'NPI工程师',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 80
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1ApproverName',
+            tableId: '103001Table1',
+            tableName: '打样信息表',
+            columnProp: 'approverName',
+            headerAlign: 'center',
+            align: 'center',
+            columnLabel: 'Approver',
            columnHidden: false,
            columnImage: false,
            columnSortable: false,
@ -285,24 +303,6 @@
            fixed: '',
            columnWidth: 80
          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 103001,
-            serialNumber: '103001Table1CreateDate',
-            tableId: '103001Table1',
-            tableName: '打样信息表',
-            columnProp: 'createDate',
-            headerAlign: 'center',
-            align: 'center',
-            columnLabel: '创建时间',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 160
-          },
        ],
        // 导出 start
        exportData: [],
--- a/src/views/modules/project/projectInfo/com_project_test.vue
+++ b/src/views/modules/project/projectInfo/com_project_test.vue
@ -96,7 +96,7 @@ export default {
          columnProp: 'trackerName',
          headerAlign: 'center',
          align: 'center',
-          columnLabel: '跟单员',
+          columnLabel: 'Artwork',
          columnHidden: false,
          columnImage: false,
          columnSortable: false,
@ -114,7 +114,7 @@ export default {
          columnProp: 'engineerName',
          headerAlign: 'center',
          align: 'center',
-          columnLabel: '工程师',
+          columnLabel: '  TP工程师',
          columnHidden: false,
          columnImage: false,
          columnSortable: false,
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@ -1134,6 +1134,9 @@ export default {
      if (newVal === false){
        this.rejectOpinion = ''
      }
+    },
+    "searchData.proofingNo"(newVal,oldVal){
+      this.searchData.proofingNo = newVal.toUpperCase()
    }
  },
  computed: {
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@ -1013,6 +1013,12 @@ export default {
      if (newVal === '' || newVal === null || newVal === undefined){
        this.modalData.trackerName = ''
      }
+    },
+    "searchData.quotationNo"(newVal,oldVal){
+      this.searchData.quotationNo = newVal.toUpperCase()
+    },
+    "searchData.quotationBatchNo"(newVal,oldVal){
+      this.searchData.quotationBatchNo = newVal.toUpperCase()
    }
  },
  data() {
--- a/src/views/modules/quotation/sellForQuotation.vue
+++ b/src/views/modules/quotation/sellForQuotation.vue
@ -1552,7 +1552,19 @@ export default {
        this.getApprovalList()
        this.getPriceCheckProperties();
      }
-    }
+    },
+    "searchData.customerNo"(newVal,oldVal){
+      this.searchData.customerNo = newVal.toUpperCase()
+    },
+    "searchData.quotationNo"(newVal,oldVal){
+      this.searchData.quotationNo = newVal.toUpperCase()
+    },
+    "searchData.internalInquiryNo"(newVal,oldVal){
+      this.searchData.internalInquiryNo = newVal.toUpperCase()
+    },
+    "searchData.projectId"(newVal,oldVal){
+      this.searchData.projectId = newVal.toUpperCase()
+    },
  },
  mounted() {
  },
--- a/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
+++ b/src/views/modules/quotation/sellForQuotation/quoteDetail.vue
@ -650,24 +650,6 @@ export default {
          fixed: '',
          columnWidth: 100
        },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 102003,
-          serialNumber: '102003Table3CodeNo',
-          tableId: '102003Table3',
-          tableName: '项目物料表',
-          columnProp: 'codeNo',
-          headerAlign: 'center',
-          align: 'center',
-          columnLabel: '模板编码',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: '',
-          columnWidth: 120
-        },
      ],
      //报价明细新增对象
      quotationDetail: {
@ -688,6 +670,8 @@ export default {
        site:this.$store.state.user.site,
        testPartNo:undefined,// 项目编号
        partDesc:undefined,// 项目名称
+        finalPartNo:undefined,// 正式料号
+        customerPartNo:undefined,// 客户料号
      },
      fullscreen:false,
      // 报价明细 参数列表
@ -852,6 +836,8 @@ export default {
        site:this.$store.state.user.site,
        testPartNo:undefined,// 项目编号
        partDesc:undefined,// 项目名称
+        finalPartNo:undefined,// 正式料号
+        customerPartNo:undefined,// 客户料号
      }
      this.projectPartTable = [];
    },
@ -1284,18 +1270,23 @@ export default {
             :visible.sync="projectPartDialogFlag">
    <!--搜索条件-->
    <el-form :model="projectPartData" ref="projectPartDataForm" :inline="true" label-position="top">
-      <el-form-item label="产品编号" prop="toolNo">
+      <el-form-item label="产品编号" prop="testPartNo">
        <el-input v-model="projectPartData.testPartNo" clearable/>
      </el-form-item>
-      <el-form-item label="产品名称" prop="toolDescription">
+      <el-form-item label="产品名称" prop="partDesc">
        <el-input v-model="projectPartData.partDesc" clearable/>
      </el-form-item>
+      <el-form-item label="客户料号" prop="customerPartNo">
+        <el-input v-model="projectPartData.customerPartNo" clearable/>
+      </el-form-item>
+      <el-form-item label="正式料号" prop="finalPartNo">
+        <el-input v-model="projectPartData.finalPartNo" clearable/>
+      </el-form-item>
      <el-form-item label=" ">
        <el-button @click="getProjectPartList" type="primary">查 询</el-button>
      </el-form-item>
    </el-form>
-    <el-table height="300px" stripe border width="30%" @row-dblclick="dblClickProjectPartTable"
-              :data="projectPartTable" ref="projectPartDataTable" :style="{marginTop:'10px'}">
+    <el-table height="300px" stripe border @row-dblclick="dblClickProjectPartTable" :data="projectPartTable" ref="projectPartDataTable" :style="{marginTop:'10px'}">
      <el-table-column
        v-for="(item,index) in projectPartDetailList" :key="index"
        :sortable="item.columnSortable"
--- a/src/views/modules/quotation/toBeQuoted.vue
+++ b/src/views/modules/quotation/toBeQuoted.vue
@ -566,6 +566,17 @@ export default {
  mounted() {

  },
+  watch:{
+    "searchData.quotationBatchNo"(newVal,oldVal){
+      this.searchData.quotationBatchNo = newVal.toUpperCase();
+    },
+    "searchData.customerNo"(newVal,oldVal){
+      this.searchData.customerNo = newVal.toUpperCase();
+    },
+    "searchData.projectId"(newVal,oldVal){
+      this.searchData.projectId = newVal.toUpperCase();
+    }
+  }
 }

 </script>