From 574cae4b63e8381b28fdb367d325903ee018aa83 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 26 Feb 2025 10:55:37 +0800
Subject: [PATCH] =?UTF-8?q?2025-02-26=20=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/changeManagement/changeRecord.vue | 32 ++++++++++++-------
 src/views/modules/part/partInformation.vue    | 32 +++++++++++--------
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/src/views/modules/changeManagement/changeRecord.vue b/src/views/modules/changeManagement/changeRecord.vue
index 8b8bae1..0463493 100644
--- a/src/views/modules/changeManagement/changeRecord.vue
+++ b/src/views/modules/changeManagement/changeRecord.vue
@@ -3,7 +3,7 @@
 
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData">
-      <el-form-item :label="'BU'">
+      <el-form-item label="BU">
         <el-select v-model="searchData.buNo" placeholder="请选择" clearable style="width: 130px">
           <el-option
             v-for = "i in buList"
@@ -13,9 +13,16 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'申请编码'">
+      <el-form-item label="申请编码">
         <el-input v-model="searchData.changeNo" clearable style="width: 120px"></el-input>
       </el-form-item>
+      <el-form-item label="变更单状态">
+        <el-select v-model="searchData.changeStatus" clearable style="width: 100px">
+          <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 v-if="authSearch" @click="getDataList">查询</el-button>
         <download-excel
@@ -1277,6 +1284,7 @@
         searchData: {
           site: this.$store.state.user.site,
           changeNo: '',
+          changeStatus: '',
           menuId: this.$route.meta.menuId,
           buNo: '',
           page: 1,
@@ -1473,7 +1481,7 @@
             columnImage: false,
             status: true,
             fixed: '',
-            columnWidth: 100
+            columnWidth: 80
           },
           {
             userId: this.$store.state.user.name,
@@ -1483,7 +1491,7 @@
             tableName: '工程变更记录表',
             columnProp: 'changeNo',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '申请编号',
             columnHidden: false,
             columnImage: false,
@@ -1499,7 +1507,7 @@
             tableName: '工程变更记录表',
             columnProp: 'applicantName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '申请人',
             columnHidden: false,
             columnImage: false,
@@ -1515,7 +1523,7 @@
             tableName: '工程变更记录表',
             columnProp: 'applicationDepartmentName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '申请部门',
             columnHidden: false,
             columnImage: false,
@@ -1531,7 +1539,7 @@
             tableName: '工程变更记录表',
             columnProp: 'changeStatus',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '变更单状态',
             columnHidden: false,
             columnImage: false,
@@ -1547,7 +1555,7 @@
             tableName: '工程变更记录表',
             columnProp: 'nodeName',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '当前节点',
             columnHidden: false,
             columnImage: false,
@@ -1563,7 +1571,7 @@
             tableName: '工程变更记录表',
             columnProp: 'ecnStage',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: 'ECN阶段',
             columnHidden: false,
             columnImage: false,
@@ -1579,7 +1587,7 @@
             tableName: '工程变更记录表',
             columnProp: 'changeType',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '变更类别',
             columnHidden: false,
             columnImage: false,
@@ -1595,7 +1603,7 @@
             tableName: '工程变更记录表',
             columnProp: 'ecnType',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: 'ECN种类',
             columnHidden: false,
             columnImage: false,
@@ -1659,7 +1667,7 @@
             tableName: '工程变更记录表',
             columnProp: 'createBy2',
             headerAlign: 'center',
-            align: 'center',
+            align: 'left',
             columnLabel: '当前节点审批人',
             columnHidden: false,
             columnImage: false,
diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue
index aac6470..037f1cd 100644
--- a/src/views/modules/part/partInformation.vue
+++ b/src/views/modules/part/partInformation.vue
@@ -2,33 +2,38 @@
   <div class="mod-config">
     <!-- 查询条件 -->
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'物料编码'">
+      <el-form-item label="物料编码">
         <el-input v-model="searchData.partNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'物料描述'">
+      <el-form-item label="物料描述">
         <el-input v-model="searchData.partDesc" clearable style="width: 210px"></el-input>
       </el-form-item>
-<!--      <el-form-item :label="'物料规格型号'">-->
-<!--        <el-input v-model="searchData.spec" clearable style="width: 120px"></el-input>-->
-<!--      </el-form-item>-->
-      <el-form-item :label="'是否在用'">
-        <el-select v-model="searchData.active" clearable style="width: 120px">
+      <el-form-item label="是否在用">
+        <el-select v-model="searchData.active" clearable style="width: 80px">
           <el-option label="启用" value="Y"></el-option>
           <el-option label="停用" value="N"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="'物料状态'">
-        <el-select v-model="searchData.status" clearable style="width: 120px">
+      <el-form-item label="物料状态">
+        <el-select v-model="searchData.status" clearable style="width: 100px">
           <el-option label="正式物料" value="Y"></el-option>
           <el-option label="临时物料" value="N"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="零件类型">
+        <el-select v-model="searchData.partType" clearable style="width: 100px">
+          <el-option label="Manufactured" value="Manufactured"></el-option>
+          <el-option label="Manufactured Recipe" value="Manufactured Recipe"></el-option>
+          <el-option label="Purchased (raw)" value="Purchased (raw)"></el-option>
+          <el-option label="Purchased" value="Purchased"></el-option>
+        </el-select>
+      </el-form-item>
     </el-form>
     <el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
-      <el-form-item :label="'IFS料号'">
+      <el-form-item label="IFS料号">
         <el-input v-model="searchData.ifsPartNo" clearable style="width: 120px"></el-input>
       </el-form-item>
-      <el-form-item :label="'录入时间'">
+      <el-form-item label="录入时间">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.startDate"
@@ -40,7 +45,7 @@
       <el-form-item style="margin-top: 23px;">
         <label style="margin-left: 0px;font-size: 19px">&#10142</label>
       </el-form-item>
-      <el-form-item :label="' '">
+      <el-form-item label=" ">
         <el-date-picker
           style="width: 120px"
           v-model="searchData.endDate"
@@ -1677,7 +1682,8 @@
           page: 1,
           limit: 10,
           status: '',
-          ifsPartNo: ''
+          ifsPartNo: '',
+          partType: ''
         },
         // 其它
         loading: false,