From 4cbe9148f13d90c04916a742a55d597e5bdd6210 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Mon, 3 Mar 2025 16:55:59 +0800
Subject: [PATCH] plm BMM

---
 .../com_projectInfo-add-or-update.vue         |  5 +--
 .../project/projectInfo/projectInfo.vue       | 12 +++++++
 .../technicalSpecificationList.vue            | 16 ++++++++-
 src/views/modules/tooling/searchToolApply.vue |  9 +++++
 src/views/modules/tooling/toolingInfo.vue     | 36 +++++++++----------
 5 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index adaca0c..f99473c 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -254,8 +254,9 @@
 </template>
 
 <script>
-  import {projectInfoSearch,
-  searchOperatorWithSite,
+  import {
+    projectInfoSearch,
+    searchOperatorWithSite,
     searchProjectTeamStr,
     searchUserRoll,
     saveProjectInfo,
diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index a3151a1..966b769 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -15,6 +15,15 @@
       <el-form-item :label="'客户项目编码'">
         <el-input v-model="searchData.customerProjectNo" style="width: 130px"></el-input>
       </el-form-item>
+      <el-form-item label="项目优先级">
+        <dict-data-select dict-type="project_info_priority" clearable v-model="searchData.priority"></dict-data-select>
+      </el-form-item>
+      <el-form-item label="客户代码">
+        <el-input v-model="searchData.customerId" />
+      </el-form-item>
+      <el-form-item label="客户名称">
+        <el-input v-model="searchData.customerName" />
+      </el-form-item>
       <el-form-item label=" ">
         <el-button @click="search()" type="primary" style="margin-left: 2px;margin-top:0px">查询</el-button>
         <el-button @click="addOrUpdateHandle('save')" type="primary" style="margin-left: 2px;margin-top: 0px">新增</el-button>
@@ -443,6 +452,9 @@
           projectType:'',
           projectOwnerName:'',
           customerProjectNo:'',
+          priority:'',
+          customerId:'',
+          customerName:'',
           userName:this.$store.state.user.name,
         },
         contactChooseFlag:false,
diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue
index cc7bc8c..214bfa5 100644
--- a/src/views/modules/sampleManagement/technicalSpecificationList.vue
+++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue
@@ -12,7 +12,20 @@
         <el-input v-model="searchData.testPartNo" style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="'状态'">
-        <el-input v-model="searchData.statusDesc" style="width: 130px"></el-input>
+        <el-select v-model="searchData.statusDesc" clearable style="width: 130px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="草稿" value="草稿"></el-option>
+          <el-option label="审批中" value="审批中"></el-option>
+          <el-option label="已升版" value="已升版"></el-option>
+          <el-option label="已完成" value="已完成"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="'ECN'">
+        <el-select v-model="searchData.ecnFlag" clearable style="width: 130px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label=" ">
         <el-button @click="search()" type="primary" style="margin-left: 2px;margin-top:0px">查询</el-button>
@@ -453,6 +466,7 @@
           oriCodeNo: '',
           statusDesc: '',
           codeNo:'',
+          ecnFlag: '',
           buNo:'',
         },
         pageIndex: 1,
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index 19b0ced..22e3c7e 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -22,6 +22,14 @@
           placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item :label="'状态'">
+        <el-select v-model="searchData.status" clearable style="width: 80px">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="草稿" value="草稿"></el-option>
+          <el-option label="审批中" value="审批中"></el-option>
+          <el-option label="下达" value="下达"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label=" ">
         <el-button @click="search()" type="primary" style="margin-left: 2px;margin-top:0px">查询</el-button>
 <!--        <el-button @click="addOrUpdateHandle('save')" type="primary" style="margin-left: 2px;margin-top: 0px">新增</el-button>-->
@@ -643,6 +651,7 @@
           applyNo:'',
           startDate:'',
           endDate:'',
+          status:'',
         },
         toolData:[],
         visibleU:false,
diff --git a/src/views/modules/tooling/toolingInfo.vue b/src/views/modules/tooling/toolingInfo.vue
index 1aac825..2a13aa7 100644
--- a/src/views/modules/tooling/toolingInfo.vue
+++ b/src/views/modules/tooling/toolingInfo.vue
@@ -23,6 +23,21 @@
             <el-input v-model="searchData.projectName" clearable/>
           </el-form-item>
         </el-col>
+        <el-col :span="2">
+          <el-form-item label="项目优先级">
+            <dict-data-select dict-type="project_info_priority" clearable v-model="searchData.priority"></dict-data-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2">
+          <el-form-item label="项目来源">
+            <dict-data-select dict-type="project_info_source" clearable v-model="searchData.projectSource"></dict-data-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="2">
+          <el-form-item label="客户代码">
+            <el-input v-model="searchData.customerId" clearable/>
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label=" ">
             <el-button plain type="primary" @click="initDataBtn" >查 询</el-button>
@@ -217,6 +232,9 @@
           projectType:'',
           projectOwnerName:'',
           projectName:'',
+          priority:'',
+          projectSource:'',
+          customerId:'',
           userName:this.$store.state.user.name,
         },
         exportList:[],
@@ -281,24 +299,6 @@
             fixed: '',
             columnWidth: 200
           },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 106001001,
-            serialNumber: '106001001Table1Status',
-            tableId: "106001001Table1",
-            tableName: "项目信息主表",
-            columnProp: "status",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "项目状态",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 100
-          },
           {
             userId: this.$store.state.user.name,
             functionId: 106001001,