rev:工单前端报工

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] }}

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 />

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 => {