From 67cc80eebbed5e05bc98a04ea9aebf5fdf91cc0d Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Tue, 1 Nov 2022 20:16:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/dv/repair/index.vue      |  2 +-
 src/views/mes/md/workstation/index.vue | 39 +++++++++++++++++++++-----
 src/views/mes/pro/schedule/index.vue   |  1 -
 src/views/mes/pro/schedule/proTask.vue |  2 +-
 4 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/views/mes/dv/repair/index.vue b/src/views/mes/dv/repair/index.vue
index 8e3ef14..b541614 100644
--- a/src/views/mes/dv/repair/index.vue
+++ b/src/views/mes/dv/repair/index.vue
@@ -98,7 +98,7 @@
 
     <el-table v-loading="loading" :data="repairList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="维修单编号" width="100px" align="center" prop="repairCode" />
+      <el-table-column label="维修单编号" width="120px" align="center" prop="repairCode" />
       <el-table-column label="维修单名称" width="150px" align="center" prop="repairName" :show-overflow-tooltip="true"/>
       <el-table-column label="设备编码" align="center" prop="machineryCode" />
       <el-table-column label="设备名称" align="center" prop="machineryName" />
diff --git a/src/views/mes/md/workstation/index.vue b/src/views/mes/md/workstation/index.vue
index f476dd5..af8b60f 100644
--- a/src/views/mes/md/workstation/index.vue
+++ b/src/views/mes/md/workstation/index.vue
@@ -37,13 +37,15 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="工序名称" prop="processName">
-            <el-input
-              v-model="queryParams.processName"
-              placeholder="请输入工序名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
+          <el-form-item label="所属工序" prop="processName">
+            <el-select v-model="queryParams.processId" placeholder="请选择工序">
+                <el-option
+                  v-for="item in processOptions"
+                  :key="item.processId"
+                  :label="item.processName"
+                  :value="item.processId"
+                ></el-option>
+              </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -371,6 +373,12 @@ export default {
         enableFlag: [
           { required: true, message: "是否启用不能为空", trigger: "blur" }
         ],
+        workshopId: [
+          { required: true, message: "请选择所属车间", trigger: "blur" }
+        ],
+        processId: [
+          { required: true, message: "请选择所属工序", trigger: "blur" }
+        ]        
       }
     };
   },
@@ -466,6 +474,23 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams ={
+        pageNum: 1,
+        pageSize: 10,
+        workstationCode: null,
+        workstationName: null,
+        workstationAddress: null,
+        workshopId: null,
+        workshopCode: null,
+        workshopName: null,
+        processId: null,
+        processCode: null,
+        processName: null,
+        warehouseId: null,
+        locationId: null,
+        areaId: null,
+        enableFlag: null,
+      };
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue
index 72a603b..cba8103 100644
--- a/src/views/mes/pro/schedule/index.vue
+++ b/src/views/mes/pro/schedule/index.vue
@@ -111,7 +111,6 @@
       <el-table-column label="单位" align="center" prop="unitOfMeasure" />
       <el-table-column label="工单数量" align="center" prop="quantity" />                 
       <el-table-column label="调整数量" align="center" prop="quantityChanged" />
-      <el-table-column label="已排产数量" align="center" width="100px" prop="quantityScheduled" />
       <el-table-column label="已生产数量" align="center" width="100px" prop="quantityProduced" /> 
       <el-table-column label="客户编码" align="center" prop="clientCode" />
       <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue
index 61ea541..eb7514b 100644
--- a/src/views/mes/pro/schedule/proTask.vue
+++ b/src/views/mes/pro/schedule/proTask.vue
@@ -139,7 +139,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="生产时长" prop="duration">
-              <el-input v-model="form.duration" @change="calculateEndTime" placeholder="请输入生产时长" />
+              <el-input-number :precision="0" :step="1" v-model="form.duration" @change="calculateEndTime" placeholder="请输入生产时长" />
             </el-form-item>
           </el-col>
           <el-col :span="8">