From 7c8fec11d0c6d1354d9480ab0a0c423557011158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Sun, 8 Sep 2024 10:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E5=A4=B4=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=BD=9C=E7=AB=99=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=86=E6=96=99=E6=97=B6=E9=97=B4=E7=B2=BE=E7=A1=AE=E5=88=B0?=
 =?UTF-8?q?=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/wm/issue/index.vue | 55 ++++++++++++++------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue
index 9c4e229..7945278 100644
--- a/src/views/mes/wm/issue/index.vue
+++ b/src/views/mes/wm/issue/index.vue
@@ -107,12 +107,13 @@
         </template>
       </el-table-column>
       <el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/>    
-      <el-table-column label="生产工单" align="center" prop="workorderCode" />     
+      <el-table-column label="生产工单" align="center" prop="workorderCode" />    
+      <el-table-column label="工作站" align="center" prop="workstationName" />    
       <el-table-column label="客户编号" align="center" prop="clientCode" />     
       <el-table-column label="客户名称" align="center" prop="clientName" />
       <el-table-column label="领料日期" align="center" prop="issueDate" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d} {h}:{i}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="单据状态" align="center" prop="status">
@@ -187,36 +188,13 @@
              <el-form-item label="领料日期" prop="issueDate">
               <el-date-picker clearable
                 v-model="form.issueDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择领料日期">
+                type="datetime"
+                default-time="12:00:00"
+                value-format="yyyy-MM-dd HH:mm"
+                placeholder="请选择领料日期时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="领料仓库">
-              <el-cascader v-model="warehouseInfo"
-                :options="warehouseOptions"
-                :props="warehouseProps"
-                @change="handleWarehouseChanged"
-              >                  
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="单据状态" prop="status">
-              <el-select v-model="form.status" disabled>
-                <el-option
-                  v-for="dict in dict.type.mes_order_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>        
-        <el-row>
           <el-col :span="8">
             <el-form-item label="生产工单" prop="workorderCode">
               <el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
@@ -225,6 +203,22 @@
             </el-form-item>
             <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="工作站" prop="workstationCode">
+              <el-input v-model="form.workstationCode" placeholder="请选择工作站" >
+                <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"></el-button>
+              </el-input>
+            </el-form-item>
+            <WorkstationSelect ref="wsSelect" @onSelected="onWorkstationSelected"> </WorkstationSelect>
+          </el-col>
+        </el-row>        
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="工作站名称" prop="workstationName">
+              <el-input v-model="form.workstationName" readonly placeholder="请选择工作站" >               
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="客户编号" >
               <el-input v-model="form.clientCode" placeholder="请选择生产工单" >               
@@ -546,8 +540,7 @@ export default {
       this.$refs.woSelect.showFlag = true;
     },
     onWorkorderSelected(row){
-      if(row != undefined && row != null){
-        debugger;
+      if(row != undefined && row != null){        
         this.form.workorderId = row.workorderId;
         this.form.workorderCode = row.workorderCode;
         this.form.workorderName = row.workorderName;