From 5a8cf751849b884fa956e3716c3e097d4d737e03 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 25 Jul 2022 15:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workorderSelect/single.vue | 209 ++++++++++++++++++++++
 src/views/mes/wm/issue/index.vue          | 112 +++++++-----
 src/views/mes/wm/issue/line.vue           |   2 +-
 3 files changed, 276 insertions(+), 47 deletions(-)
 create mode 100644 src/components/workorderSelect/single.vue

diff --git a/src/components/workorderSelect/single.vue b/src/components/workorderSelect/single.vue
new file mode 100644
index 0000000..6907cf6
--- /dev/null
+++ b/src/components/workorderSelect/single.vue
@@ -0,0 +1,209 @@
+<template>
+    <el-dialog title="工作站选择"
+    v-if="showFlag"
+    :visible.sync="showFlag"
+    :modal= false
+    width="80%"
+    center
+  >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="工单编码" prop="workorderCode">
+        <el-input
+          v-model="queryParams.workorderCode"
+          placeholder="请输入工单编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="工单名称" prop="workorderName">
+        <el-input
+          v-model="queryParams.workorderName"
+          placeholder="请输入工单名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品编号" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          placeholder="请输入产品编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="产品名称" prop="productName">
+        <el-input
+          v-model="queryParams.productName"
+          placeholder="请输入产品名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="客户名称" prop="clientName">
+        <el-input
+          v-model="queryParams.clientName"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="workorderList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick">
+        <el-table-column width="55" align="center" >
+            <template v-slot="scope">
+                <el-radio v-model="selectedWorkorderId" :label="scope.row.workorderId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+            </template>
+        </el-table-column>
+        <el-table-column label="工单编码" width="180" prop="workorderCode" >
+        </el-table-column>
+        <el-table-column label="工单名称" width="200" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
+        <el-table-column label="工单来源" align="center" prop="orderSource" >
+            <template slot-scope="scope">
+                <dict-tag :options="dict.type.mes_workorder_sourcetype" :value="scope.row.orderSource"/>
+            </template>
+        </el-table-column>
+        <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />
+        <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
+        <el-table-column label="产品名称" width="200" align="center" prop="productName" :show-overflow-tooltip="true"/>
+        <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
+        <el-table-column label="单位" align="center" prop="unitOfMeasure" />
+        <el-table-column label="工单数量" align="center" prop="quantity" />                 
+        <el-table-column label="客户编码" align="center" prop="clientCode" />
+        <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
+        <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelect">确 定</el-button>
+        <el-button @click="showFlag=false">取 消</el-button>
+    </div>
+  </el-dialog>
+
+</template>
+<script>
+    import { listWorkorder} from "@/api/mes/pro/workorder";
+    export default {
+        name: 'WorkOrderSelectSingle',
+        components: {},
+        dicts: ['mes_order_status','mes_workorder_sourcetype'],
+        data() {
+            return {
+                showFlag: false,
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                selectedWorkorderId: undefined,
+                selectedRows: [],
+                 // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                 // 生产工单表格数据
+                workorderList: [],
+                 // 弹出层标题
+                title: "",
+                // 是否显示弹出层
+                open: false,
+                // 查询参数
+                queryParams: {
+                    workorderCode: null,
+                    workorderName: null,
+                    orderSource: null,
+                    sourceCode: null,
+                    productId: null,
+                    productCode: null,
+                    productName: null,
+                    productSpc: null,
+                    unitOfMeasure: null,
+                    quantity: null,
+                    quantityProduced: null,
+                    quantityChanged: null,
+                    quantityScheduled: null,
+                    clientId: null,
+                    clientCode: null,
+                    clientName: null,
+                    requestDate: null,
+                    parentId: null,
+                    ancestors: null,
+                    status: 'CONFIRMED',
+                },
+
+            }
+        },
+        created() {
+            this.getList();
+        },
+        methods:{
+            /** 查询生产工单列表 */
+            getList() {
+                this.loading = true;
+                listWorkorder(this.queryParams).then(response => {
+                    this.workorderList = response.data;
+                    this.loading = false;
+                });
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.getList();
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.resetForm("queryForm");
+                this.handleQuery();
+            },
+            handleCurrent(row){
+                if(row){
+                    this.selectedRows = row;
+                }
+            },
+            // 单选选中数据
+            handleRowChange(row) {
+                if(row){
+                    this.selectedRows = row;
+                }
+            },
+            //双击选中
+            handleRowDbClick(row){
+                if(row){
+                    this.selectedRows = row;
+                    this.$emit('onSelected',this.selectedRows);
+                    this.showFlag = false;
+                }
+            },
+            //确定选中
+            confirmSelect(){
+                if(this.selectedWorkorderId == null || this.selectedWorkorderId == 0){
+                    this.$notify({
+                        title:'提示',
+                        type:'warning',
+                        message: '请至少选择一条数据!'
+                    });
+                    return;
+                }
+                this.$emit('onSelected',this.selectedRows);
+                this.showFlag = false;
+            }
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/src/views/mes/wm/issue/index.vue b/src/views/mes/wm/issue/index.vue
index 1d27bfb..907fe4e 100644
--- a/src/views/mes/wm/issue/index.vue
+++ b/src/views/mes/wm/issue/index.vue
@@ -183,12 +183,27 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="工作站" prop="workstationName">
-              <el-input v-model="form.workstationName" placeholder="请选择工作站" />
+          <el-col :span="8">
+             <el-form-item label="领料日期" prop="issueDate">
+              <el-date-picker clearable
+                v-model="form.issueDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择领料日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <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
@@ -202,51 +217,28 @@
           </el-col>
         </el-row>        
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="生产工单编号" prop="workorderCode">
-              <el-input v-model="form.workorderCode" />
+          <el-col :span="8">
+            <el-form-item label="工作站" prop="workstationName">
+              <el-input v-model="form.workstationName" 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-col :span="12">
-            <el-form-item label="生产工单名称" prop="workorderName">
-              <el-input v-model="form.workorderName" />
+          <el-col :span="8">
+            <el-form-item label="生产工单" prop="workorderCode">
+              <el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
+                <el-button slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
+              </el-input>
             </el-form-item>
+            <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="生产任务编码" prop="taskCode">
+          <el-col :span="8">
+            <el-form-item label="生产任务" prop="taskCode">
               <el-input v-model="form.taskCode" placeholder="请输入生产任务编码" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="生产任务名称" prop="taskName">
-              <el-input v-model="form.taskName" placeholder="请输入生产任务名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <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="12">
-            <el-form-item label="领料日期" prop="issueDate">
-              <el-date-picker clearable
-                v-model="form.issueDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择领料日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        </el-row>        
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注" prop="remark">
@@ -270,13 +262,15 @@
 
 <script>
 import { listIssueheader, getIssueheader, delIssueheader, addIssueheader, updateIssueheader, execute } from "@/api/mes/wm/issueheader";
+import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
+import WorkorderSelect from "@/components/workorderSelect/single.vue"
 import {getTreeList} from "@/api/mes/wm/warehouse"
 import {genCode} from "@/api/system/autocode/rule"
 import Issueline from "./line.vue";
 export default {
   name: "Issueheader",
   dicts: ['mes_order_status'],
-  components: {Issueline},
+  components: {Issueline,WorkstationSelect,WorkorderSelect},
   data() {
     return {
       autoGenFlag:false,
@@ -390,8 +384,10 @@ export default {
         issueName: null,
         workstationId: null,
         workstationCode: null,
+        workstationName: null,
         workorderId: null,
         workorderCode: null,
+        workorderName: null,
         taskId: null,
         taskCode: null,
         warehouseId: null,
@@ -438,7 +434,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加生产领料单头";
+      this.title = "添加生产领料单";
       this.optType = "add";
     },
     /** 修改按钮操作 */
@@ -446,12 +442,13 @@ export default {
       this.reset();
       const issueId = row.issueId || this.ids
       getIssueheader(issueId).then(response => {
+        debugger;
         this.form = response.data;
         this.warehouseInfo[0] = response.data.warehouseId;    
         this.warehouseInfo[1] = response.data.locationId;    
         this.warehouseInfo[2] = response.data.areaId;  
         this.open = true;
-        this.title = "修改生产领料单头";
+        this.title = "修改生产领料单";
         this.optType = "edit";
       });
     },
@@ -523,7 +520,30 @@ export default {
         this.form.areaId = obj[2];
       }
     },
-        //自动生成编码
+    //选择工作站
+    handleWorkstationSelect(){
+      this.$refs.wsSelect.showFlag = true;
+    },
+    onWorkstationSelected(row){
+      debugger;
+      if(row != undefined && row != null){
+        this.form.workstationId = row.workstationId;
+        this.form.workstationCode = row.workstationCode;
+        this.form.workstationName = row.workstationName;
+      }
+    },
+    //选择生产工单
+    handleWorkorderSelect(){
+      this.$refs.woSelect.showFlag = true;
+    },
+    onWorkorderSelected(row){
+      if(row != undefined && row != null){
+        this.form.workorderId = row.workorderId;
+        this.form.workorderCode = row.workorderCode;
+        this.form.workorderName = row.workorderName;
+      }
+    },
+    //自动生成编码
     handleAutoGenChange(autoGenFlag){
       if(autoGenFlag){
         genCode('ISSUE_CODE').then(response =>{
diff --git a/src/views/mes/wm/issue/line.vue b/src/views/mes/wm/issue/line.vue
index 0e9ebde..b3b46f6 100644
--- a/src/views/mes/wm/issue/line.vue
+++ b/src/views/mes/wm/issue/line.vue
@@ -191,7 +191,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        issueId: null,
+        issueId: this.issueId,
         itemId: null,
         itemCode: null,
         itemName: null,