From b3d458662e2f75a3296c2a21294fbfd0923e4162 Mon Sep 17 00:00:00 2001
From: yanshikui <yanshikui666@126.com>
Date: Thu, 26 Dec 2024 11:18:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dvsubjectSelect/multi.vue |  2 +-
 src/components/stockSelect/multi.vue     |  6 +++---
 src/components/userSelect/multi.vue      | 24 +++++++++++-----------
 src/components/userSelect/single.vue     | 26 ++++++++++++------------
 src/views/mes/dv/checkplan/index.vue     |  2 +-
 src/views/mes/dv/machinery/index.vue     |  4 ++--
 src/views/mes/dv/subject/index.vue       |  2 +-
 src/views/mes/md/client/index.vue        |  2 +-
 src/views/mes/md/mditem/index.vue        |  2 +-
 src/views/mes/pro/process/index.vue      | 15 ++++++++++----
 src/views/mes/pro/proroute/product.vue   | 20 +++++++++---------
 src/views/mes/report/index.vue           |  2 +-
 src/views/mes/wm/area/index.vue          | 14 ++++++-------
 src/views/system/user/index.vue          |  3 +++
 14 files changed, 67 insertions(+), 57 deletions(-)

diff --git a/src/components/dvsubjectSelect/multi.vue b/src/components/dvsubjectSelect/multi.vue
index fc81c82..99334b5 100644
--- a/src/components/dvsubjectSelect/multi.vue
+++ b/src/components/dvsubjectSelect/multi.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="设备选择"
+  <el-dialog title="项目选择"
     v-if="showFlag"
     :visible.sync="showFlag"
     :modal= false
diff --git a/src/components/stockSelect/multi.vue b/src/components/stockSelect/multi.vue
index ab3b7c3..3467d1e 100644
--- a/src/components/stockSelect/multi.vue
+++ b/src/components/stockSelect/multi.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="人员选择"
+  <el-dialog title="库存选择"
     v-if="showFlag"
     :visible.sync="showFlag"
     :modal= false
@@ -95,7 +95,7 @@
         </el-form-item>
       </el-form>
 
-      <el-row :gutter="10" class="mb8">    
+      <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
             type="warning"
@@ -129,7 +129,7 @@
           </template>
         </el-table-column>
       </el-table>
-    
+
       <pagination
         v-show="total>0"
         :total="total"
diff --git a/src/components/userSelect/multi.vue b/src/components/userSelect/multi.vue
index 993200b..f35c0b5 100644
--- a/src/components/userSelect/multi.vue
+++ b/src/components/userSelect/multi.vue
@@ -64,21 +64,21 @@
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.status"-->
+<!--                active-value="0"-->
+<!--                inactive-value="1"-->
+<!--                @change="handleStatusChange(scope.row)"-->
+<!--              ></el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
-          </el-table-column>         
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -239,4 +239,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/userSelect/single.vue b/src/components/userSelect/single.vue
index 72357f1..8136558 100644
--- a/src/components/userSelect/single.vue
+++ b/src/components/userSelect/single.vue
@@ -62,26 +62,26 @@
                 <template v-slot="scope">
                     <el-radio v-model="selectedId" :label="scope.row.userId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
                 </template>
-            </el-table-column>          
+            </el-table-column>
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
+<!--          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-switch-->
+<!--                v-model="scope.row.status"-->
+<!--                active-value="0"-->
+<!--                inactive-value="1"-->
+<!--                @change="handleStatusChange(scope.row)"-->
+<!--              ></el-switch>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
-          </el-table-column>         
+          </el-table-column>
         </el-table>
 
         <pagination
@@ -255,4 +255,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/dv/checkplan/index.vue b/src/views/mes/dv/checkplan/index.vue
index bd485c7..6678316 100644
--- a/src/views/mes/dv/checkplan/index.vue
+++ b/src/views/mes/dv/checkplan/index.vue
@@ -493,7 +493,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dv/checkplan/export', {
+      this.download('mes/dv/checkplan/export', {
         ...this.queryParams
       }, `checkplan_${new Date().getTime()}.xlsx`)
     },
diff --git a/src/views/mes/dv/machinery/index.vue b/src/views/mes/dv/machinery/index.vue
index e724aff..1587ed0 100644
--- a/src/views/mes/dv/machinery/index.vue
+++ b/src/views/mes/dv/machinery/index.vue
@@ -176,7 +176,7 @@
           <el-col :span="14">
             <el-row>
               <el-col :span="16">
-                <el-form-item label="设备编码" prop="itemCode">
+                <el-form-item label="设备编码" prop="machineryCode">
                   <el-input v-model="form.machineryCode" :disabled="optType != 'add'" readonly="readonly" maxlength="64" v-if="['view','edit'].indexOf(optType)> -1"/>
                   <el-input v-model="form.machineryCode" :disabled="optType != 'add'" placeholder="请输入设备编码" maxlength="64" v-else/>
                 </el-form-item>
@@ -193,7 +193,7 @@
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="设备名称" prop="itemName">
+                <el-form-item label="设备名称" prop="machineryName">
                   <el-input v-model="form.machineryName"  maxlength="255" readonly="readonly" v-if="optType=='view'" />
                   <el-input v-model="form.machineryName" placeholder="请输入设备名称" maxlength="255" v-else/>
                 </el-form-item>
diff --git a/src/views/mes/dv/subject/index.vue b/src/views/mes/dv/subject/index.vue
index 23606ba..245f796 100644
--- a/src/views/mes/dv/subject/index.vue
+++ b/src/views/mes/dv/subject/index.vue
@@ -353,7 +353,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('dv/dvsubject/export', {
+      this.download('mes/dv/dvsubject/export', {
         ...this.queryParams
       }, `dvsubject_${new Date().getTime()}.xlsx`)
     },
diff --git a/src/views/mes/md/client/index.vue b/src/views/mes/md/client/index.vue
index a9b0cf3..57159e4 100644
--- a/src/views/mes/md/client/index.vue
+++ b/src/views/mes/md/client/index.vue
@@ -657,7 +657,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('md/client/export', {
+      this.download('/mes/md/client/export', {
         ...this.queryParams
       }, `client_${new Date().getTime()}.xlsx`)
     },
diff --git a/src/views/mes/md/mditem/index.vue b/src/views/mes/md/mditem/index.vue
index 96bdfff..7b3304c 100644
--- a/src/views/mes/md/mditem/index.vue
+++ b/src/views/mes/md/mditem/index.vue
@@ -331,7 +331,7 @@
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="form.remark" type="textarea" readonly v-if="optType=='view'"></el-input>
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" v-else></el-input>
+              <el-input v-model="form.remark" type="textarea" maxlength="500" placeholder="请输入内容" v-else></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/mes/pro/process/index.vue b/src/views/mes/pro/process/index.vue
index c62d36b..ac642d7 100644
--- a/src/views/mes/pro/process/index.vue
+++ b/src/views/mes/pro/process/index.vue
@@ -18,12 +18,19 @@
         />
       </el-form-item>
       <el-form-item label="是否启用" prop="enableFlag">
-        <el-input
+        <el-select
           v-model="queryParams.enableFlag"
-          placeholder="请输入是否启用"
+          placeholder="是否启用"
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+          style="width: 215px"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
diff --git a/src/views/mes/pro/proroute/product.vue b/src/views/mes/pro/proroute/product.vue
index 0b01430..a5c2618 100644
--- a/src/views/mes/pro/proroute/product.vue
+++ b/src/views/mes/pro/proroute/product.vue
@@ -102,7 +102,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -122,17 +122,17 @@
                     </el-input>
                     <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>
                 </el-form-item>
-            </el-col>        
+            </el-col>
             <el-col :span="8">
                 <el-form-item label="产品物料名称" prop="itemName">
                     <el-input v-model="form.itemName" placeholder="请选择产品" disabled/>
                 </el-form-item>
-            </el-col>    
+            </el-col>
             <el-col :span="8">
                 <el-form-item label="单位" prop="unitOfMeasure">
                     <el-input v-model="form.unitOfMeasure" placeholder="请选择产品" disabled/>
                 </el-form-item>
-            </el-col>    
+            </el-col>
         </el-row>
         <el-row>
             <el-col :span="24">
@@ -279,7 +279,7 @@ export default {
           this.form.itemCode = obj.itemCode;
           this.form.itemName = obj.itemName;
           this.form.specification = obj.specification;
-          this.form.unitOfMeasure = obj.unitOfMeasure;  
+          this.form.unitOfMeasure = obj.unitOfMeasure;
         }
     },
     // 取消按钮
@@ -359,7 +359,7 @@ export default {
             updateRouteproduct(this.form).then(response => {
                 this.$modal.msgSuccess("修改成功");
                 this.open = false;
-                this.getList();                
+                this.getList();
             });
           } else {
             addRouteproduct(this.form).then(response => {
@@ -377,14 +377,14 @@ export default {
                 //             moveRouteproduct(this.form).then(response =>{
                 //                 this.$modal.msgSuccess("切换成功");
                 //                 this.open = false;
-                //                 this.getList(); 
-                //             })        
+                //                 this.getList();
+                //             })
                 //         ).catch(
                 //             () => {
                 //                 this.$message({
                 //                     type: 'info',
                 //                     message: '已取消'
-                //                 });          
+                //                 });
                 //         });
           }
         }
@@ -402,7 +402,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('pro/routeproduct/export', {
+      this.download('mes/pro/routeproduct/export', {
         ...this.queryParams
       }, `routeproduct_${new Date().getTime()}.xlsx`)
     }
diff --git a/src/views/mes/report/index.vue b/src/views/mes/report/index.vue
index 7e9ba2b..a4a870d 100644
--- a/src/views/mes/report/index.vue
+++ b/src/views/mes/report/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
       <el-form-item label="报表名称" prop="name">
         <el-input
           v-model="queryParams.name"
diff --git a/src/views/mes/wm/area/index.vue b/src/views/mes/wm/area/index.vue
index e54a774..0c91c48 100644
--- a/src/views/mes/wm/area/index.vue
+++ b/src/views/mes/wm/area/index.vue
@@ -159,7 +159,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -176,7 +176,7 @@
             <el-row>
               <el-col :span="16">
                 <el-form-item label="库位编码" prop="areaCode">
-                  <el-input v-model="form.areaCode" placeholder="请输入库位编码" />
+                  <el-input v-model="form.areaCode" placeholder="请输入库位编码" maxlength="64"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -184,7 +184,7 @@
                   <el-switch v-model="autoGenFlag"
                       active-color="#13ce66"
                       active-text="自动生成"
-                      @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+                      @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">
                   </el-switch>
               </el-form-item>
               </el-col>
@@ -192,7 +192,7 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item label="库位名称" prop="areaName">
-                  <el-input v-model="form.areaName" placeholder="请输入库位名称" />
+                  <el-input v-model="form.areaName" placeholder="请输入库位名称" maxlength="255"/>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -253,7 +253,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="500"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -440,7 +440,7 @@ export default {
     },
     /**
      * 冻结状态变更
-     * @param row 
+     * @param row
      */
     handleFrozenChange(row){
       let text = row.frozenFlag === "Y" ? "冻结" : "解冻";
@@ -476,7 +476,7 @@ export default {
         });
       }else{
         this.form.areaCode = null;
-      }      
+      }
     }
   }
 };
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b820e79..4235eba 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -429,6 +429,9 @@ export default {
           { required: true, message: "用户名称不能为空", trigger: "blur" },
           { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
+        deptId: [
+          { required: true, message: "所属部门不能为空", trigger: "blur" }
+        ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],