From 27f8851f5debce3625e8f30aad36f1a6c090f352 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Mon, 29 May 2023 13:00:33 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue | 2 +-
 mes/qd/src/views/wms/product_manage/workorder/index.vue      | 1 -
 .../src/views/wms/product_manage/workorder/reportDialog.vue  | 5 ++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
index de156ed8..42f962f2 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/ViewDialog.vue
@@ -143,8 +143,8 @@
       :highlight-current-row="true"
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
-      <el-table-column prop="seq_number" label="顺序号" />
       <el-table-column prop="workorder_code" label="工单编号" />
+      <el-table-column prop="seq_number" label="报工顺序号" />
       <el-table-column prop="shift_type_scode" label="班次类型">
         <template slot-scope="scope">
           {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue
index e46700b5..919cfcda 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/index.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue
@@ -387,7 +387,6 @@
         <el-table-column prop="real_qty" label="报工总数" />
         <el-table-column prop="nok_qty" label="报废总数" />
         <el-table-column prop="report_qty" label="报修总数" />
-        <el-table-column prop="person_name" label="生产人员" />
         <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
         <el-table-column prop="dq_real_qty" label="电气实际数量" width="100" show-overflow-tooltip />
         <el-table-column prop="material_name" label="物料名称" width="120" show-overflow-tooltip />
diff --git a/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue b/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
index 5b7b0481..3dbdb1fe 100644
--- a/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/reportDialog.vue
@@ -83,7 +83,7 @@
       <el-table-column prop="confirm_time" label="审核时间" align="center" />
       <el-table-column label="操作" width="120px" align="center" fixed="right">
         <template slot-scope="scope">
-          <el-button :disabled="scope.row.report_status !=='1'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
+          <el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
         </template>
       </el-table-column>
 
@@ -176,6 +176,9 @@ export default {
   methods: {
     close() {
       this.$emit('AddChanged')
+      this.form.workorder_code = null
+      this.form.is_report = null
+      this.tableData = []
     },
     open() {
       crudProduceshiftorder.reportQuery({ workorder_code: this.form.workorder_code }).then(res => {