From faa9d4fb3d441f266dc1b5cb4c936dbfb138ef03 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 29 May 2026 19:29:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/oem/oemProcess/index.vue            | 28 +++++++++++++--
 .../components/addEditInfoDialog.vue          | 12 +++----
 .../tankSolutionSystem/info.vue               | 36 +++++++++----------
 .../tankSolutionTaskDispose.vue               |  5 ++-
 4 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/src/views/oem/oemProcess/index.vue b/src/views/oem/oemProcess/index.vue
index 1ba07013..fff02c78 100644
--- a/src/views/oem/oemProcess/index.vue
+++ b/src/views/oem/oemProcess/index.vue
@@ -56,7 +56,7 @@ export default {
         // size: "medium",
         simplePage: true,
         searchShow: true,
-        searchMenuSpan: 18,
+        searchMenuSpan: 6,
         searchIcon: true,
         searchIndex: 3,
         tree: false,
@@ -106,6 +106,30 @@ export default {
             search: true,
             display: false,
           },
+          {
+            label: "工序名称",
+            prop: "paName",
+            search: true,
+            // sortable: 'custom',
+            filter: true,
+            span: 24,
+            // type: "select",
+            // filterable: true,
+            // dicUrl:"/api/blade-scheduling/processSet/findList",
+            // props:{
+            //   label: "name",
+            //   value:"id"
+            // },
+            hide:true,
+            display:true,
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入工艺能力",
+            //     trigger: "blur",
+            //   },
+            // ],
+          },
           {
             label: "工序",
             prop: "processIdStr",
@@ -159,7 +183,7 @@ export default {
           {
             label: "工序大类",
             prop: "statementCategoryId",
-            search: false,
+            search: true,
             sortable: 'custom',
             filter: true,
             span: 24,
diff --git a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue b/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
index fc1d874c..2347ae79 100644
--- a/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/components/addEditInfoDialog.vue
@@ -254,11 +254,11 @@
                         </div>
                     </div>
                 </el-col>
-                <el-col :span="8">
+                <!-- <el-col :span="8">
                     <el-form-item label="有效期：" prop="validDate">
                         <el-date-picker :disabled="type == 'view'" v-model="form.validDate" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 100%;" />
                     </el-form-item>
-                </el-col>
+                </el-col> -->
 
 
             </el-row>
@@ -336,9 +336,9 @@ export default {
                 processUserId: [
                     { required: true, message: '请选择主管工艺', trigger: 'blur' },
                 ],
-                validDate: [
-                    { required: true, message: '请选择有效期', trigger: 'blur' },
-                ],
+                // validDate: [
+                //     { required: true, message: '请选择有效期', trigger: 'blur' },
+                // ],
                 analysisCycle: [
                     { required: true, message: '请选择测试周期', trigger: 'blur' },
                 ],
@@ -584,7 +584,7 @@ export default {
                         jobTypeMonthValue:this.form.jobType == 2 ? monthArr.join(',') : '',
                         jobTypeYearValue:this.form.jobType == 3 ? yearArr.join(',') : '',
                         isPutOff:this.form.isPutOff ? 1 : 0,
-                        validDate:this.form.validDate,
+                        // validDate:this.form.validDate,
                         analysisCycle:this.form.analysisCycle
                     }
                     console.log('params----------------',params)
diff --git a/src/views/qualityManagement/tankSolutionSystem/info.vue b/src/views/qualityManagement/tankSolutionSystem/info.vue
index ee6395c0..47a7eb41 100644
--- a/src/views/qualityManagement/tankSolutionSystem/info.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/info.vue
@@ -536,24 +536,24 @@ export default {
                             },
                         ],
                     },
-                    {
-                        label: '有效期',
-                        prop: 'validDate',
-                        search: false,
-                        sortable: "custom",
-                        type: 'date',
-                        width: 120,
-                        filter: true,
-                        span: 8,
-                        display: false,
-                        rules: [
-                            {
-                                required: true,
-                                message: '请输入有效期',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
+                    // {
+                    //     label: '有效期',
+                    //     prop: 'validDate',
+                    //     search: false,
+                    //     sortable: "custom",
+                    //     type: 'date',
+                    //     width: 120,
+                    //     filter: true,
+                    //     span: 8,
+                    //     display: false,
+                    //     rules: [
+                    //         {
+                    //             required: true,
+                    //             message: '请输入有效期',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
                     {
                         label: '上次化验日期',
                         prop: 'lastTest',
diff --git a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
index e571a058..1cec2895 100644
--- a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
@@ -398,12 +398,15 @@ export default {
                     },
                     {
                         label: '槽液到期时间',
-                        prop: 'expiryDate',
+                        prop: 'tankEndTime',
                         search: false,
                         sortable: 'custom',
                         filter: true,
                         span: 24,
                         width: 160,
+                        type:'date',
+                        format:"YYYY-MM-DD",
+                        valueFormat:"YYYY-MM-DD",
                     },
                     // {
                     //     label: '槽液到期时间',