add:排产相关功能。 rev:修改工单管理，销售订单管理，工厂日历功能；

2023-07-05 16:00:55 +08:00
parent cc5d6be4da
commit e233f01bec
28 changed files with 1226 additions and 738 deletions
--- a/mes/qd/src/api/wms/pcs/saleOrder.js
+++ b/mes/qd/src/api/wms/pcs/saleOrder.js
@@ -24,4 +24,12 @@ export function edit(data) {
  })
 }

-export default { add, edit, del }
+export function excelImport(data) {
+  return request({
+    url: 'api/mpsSaleOrder/excelImport',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, excelImport }
--- a/mes/qd/src/views/wms/pcs/saleorder/UploadDialog.vue
+++ b/mes/qd/src/views/wms/pcs/saleorder/UploadDialog.vue
@@ -0,0 +1,116 @@
+<template>
+  <el-dialog
+    title="导入Excel文件"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    width="400px"
+    :show-close="true"
+    @close="close"
+    @open="open"
+  >
+    <el-upload
+      ref="upload"
+      class="upload-demo"
+      action=""
+      drag
+      :on-exceed="is_one"
+      :limit="1"
+      :auto-upload="false"
+      :multiple="false"
+      :show-file-list="true"
+      :on-change="uploadByJsqd"
+      :file-list="fileList"
+      accept=".xlsx,.xls"
+    >
+      <i class="el-icon-upload" />
+      <div class="el-upload__text">
+        将文件拖到此处，或
+        <em>点击上传</em>
+      </div>
+      <div slot="tip" class="el-upload__tip">只能上传Excel文件，且不超过10MB</div>
+    </el-upload>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="submit">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import crudSaleOrder from '@/api/wms/pcs/saleOrder'
+import CRUD, { crud } from '@crud/crud'
+
+export default {
+  name: 'UploadDialog',
+  mixins: [crud()],
+  components: {},
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: String
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      fileList: [],
+      file1: ''
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    },
+    openParam: {
+      handler(newValue, oldValue) {
+        this.opendtlParam = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    is_one() {
+      this.crud.notify('只能上传一个excel文件！', CRUD.NOTIFICATION_TYPE.WARNING)
+    },
+    // 文件校验方法
+    beforeAvatarUpload(file) {
+      // 不能导入大小超过2Mb的文件
+      if (file.size > 10 * 1024 * 1024) {
+        return false
+      }
+      return true
+    },
+    // 文件发生改变就会触发的事件
+    uploadByJsqd(file) {
+      this.file1 = file
+    },
+    submit() {
+      if (this.beforeAvatarUpload(this.file1)) {
+        this.fileList.name = this.file1.name
+        this.fileList.url = ''
+        var formdata = new FormData()
+        formdata.append('file', this.file1.raw)
+        // excelImport：请求接口 formdata：传递参数
+        crudSaleOrder.excelImport(formdata).then((res) => {
+          this.crud.notify('导入成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+          this.$emit('tableChanged3', '')
+          this.$emit('update:dialogShow', false)
+        })
+      } else {
+        this.crud.notify('文件过大，请上传小于10MB的文件〜', CRUD.NOTIFICATION_TYPE.WARNING)
+      }
+    }
+  }
+}
+</script>
+
--- a/mes/qd/src/views/wms/pcs/saleorder/index.vue
+++ b/mes/qd/src/views/wms/pcs/saleorder/index.vue
@@ -12,7 +12,13 @@
          label-suffix=":"
        >
          <el-form-item label="销售单号">
-            <el-input v-model="query.sale_code" clearable placeholder="销售单号" style="width: 200px;" class="filter-item" />
+            <el-input
+              v-model="query.sale_code"
+              clearable
+              placeholder="销售单号"
+              style="width: 200px;"
+              class="filter-item"
+            />
          </el-form-item>
          <el-form-item label="物料搜索">
            <el-input
@@ -31,7 +37,7 @@
              value-format="yyyy-MM-dd HH:mm:ss"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
-              :default-time="['00:00:00','23:59:59']"
+              :default-time="['00:00:00', '23:59:59']"
              @change="crud.toQuery"
            />
          </el-form-item>
@@ -62,7 +68,7 @@
              placeholder="请选择"
            />
          </el-form-item>
-          <el-form-item label="是否正常">
+          <!-- <el-form-item label="是否正常">
            <el-select
              v-model="query.is_success"
              style="width: 200px"
@@ -78,11 +84,21 @@
                :value="item.value"
              />
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <rrOperation :crud="crud" />
        </el-form>
      </div>
      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-upload2"
+          size="mini"
+          @click="uploadShow = true"
+        >
+          导入
+        </el-button>
        <el-button
          slot="right"
          class="filter-item"
@@ -95,26 +111,58 @@
        </el-button>
      </crudOperation>
      <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" size="mini" label-width="80px">
-        </el-form>
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="500px"
+      >
+        <el-form ref="form" :model="form" size="mini" label-width="80px" />
        <div slot="footer" class="dialog-footer">
          <el-button type="text" @click="crud.cancelCU">取消</el-button>
-          <el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
+          <el-button
+            :loading="crud.cu === 2"
+            type="primary"
+            @click="crud.submitCU"
+          >确认</el-button>
        </div>
      </el-dialog>
      <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table
+        ref="table"
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
        <el-table-column type="selection" width="55" />
-        <el-table-column prop="sale_code" label="销售单号" min-width="100" show-overflow-tooltip/>
+        <el-table-column
+          prop="sale_code"
+          label="销售单号"
+          min-width="100"
+          show-overflow-tooltip
+        />
        <el-table-column prop="seq_no" label="明细序号" />
-        <el-table-column prop="sale_type" label="销售单类型" min-width="100" show-overflow-tooltip>
+        <el-table-column
+          prop="sale_type"
+          label="销售单类型"
+          min-width="100"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
            {{ dict.label.PCS_SAL_TYPE[scope.row.sale_type] }}
          </template>
        </el-table-column>
        <el-table-column prop="material_code" label="物料编码" />
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
+        <el-table-column
+          prop="material_name"
+          label="物料名称"
+          min-width="100"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
        <el-table-column prop="status" label="状态">
          <template slot-scope="scope">
            {{ dict.label.PCS_SALE_STATUS[scope.row.status] }}
@@ -122,15 +170,28 @@
        </el-table-column>
        <el-table-column prop="sale_qty" label="销售数量" />
        <el-table-column prop="produce_seq" label="生产顺序" />
-        <el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')"/>
-        <el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')"/>
-        <el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150"  />
-        <el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip/>
-        <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200"/>
+        <el-table-column prop="cust_code" label="客户编码" :min-width="flexWidth('cust_code',crud.data,'客户编码')" />
+        <el-table-column prop="cust_name" label="客户名称" :min-width="flexWidth('cust_name',crud.data,'cust_name')" />
+        <el-table-column prop="unit_name" label="计量单位" show-overflow-tooltip min-width="150" />
+        <el-table-column prop="plandeliver_date" label="计划交期" min-width="100" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="200" />
        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
-        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')"/>
-<!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
+        <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column
+          prop="create_time"
+          label="创建时间"
+          min-width="120"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="confirm_time"
+          label="修改时间"
+          min-width="120"
+          show-overflow-tooltip
+        />
+        <!-<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
          <template slot-scope="scope">
            <udOperation
              :data="scope.row"
@@ -142,6 +203,7 @@
      <!--分页组件-->
      <pagination />
    </div>
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
    <Dialog :dialog-show.sync="dialogShow" />
  </div>
 </template>
@@ -151,20 +213,45 @@ import crudSaleOrder from '@/api/wms/pcs/saleOrder'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
+import UploadDialog from '@/views/wms/pcs/saleorder/UploadDialog'
 import Dialog from '@/views/wms/pcs/saleorder/Dialog'
 import pagination from '@crud/Pagination'
-import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect'
+import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudClassstandard from '@/api/wms/basedata/master/classstandard'

-const defaultForm = { sale_id: null, sale_code: null, seq_no: null, sale_type: null, material_id: null, status: null, sale_qty: null, produce_seq: null, cust_id: null, qty_unit_id: null, plandeliver_date: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, cust_code: null, cust_name: null }
+const defaultForm = {
+  sale_id: null,
+  sale_code: null,
+  seq_no: null,
+  sale_type: null,
+  material_id: null,
+  status: null,
+  sale_qty: null,
+  produce_seq: null,
+  cust_id: null,
+  qty_unit_id: null,
+  plandeliver_date: null,
+  create_id: null,
+  create_name: null,
+  create_time: null,
+  update_optid: null,
+  update_optname: null,
+  update_time: null,
+  cust_code: null,
+  cust_name: null
+}
 export default {
  name: 'SaleOrder',
  dicts: ['PCS_SALE_STATUS', 'PCS_SAL_TYPE', 'IS_OR_NOT'],
-  components: { pagination, crudOperation, rrOperation, Treeselect, Dialog },
+  components: { pagination, crudOperation, rrOperation, Treeselect, UploadDialog, Dialog },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
-    return CRUD({ title: '销售订单', url: 'api/saleOrder', idField: 'sale_id', sort: 'sale_id,desc',
+    return CRUD({
+      title: '销售订单',
+      url: 'api/mpsSaleOrder',
+      idField: 'sale_id',
+      sort: 'sale_id,desc',
      optShow: {
        add: false,
        edit: false,
@@ -172,17 +259,16 @@ export default {
        reset: true,
        download: false
      },
-      crudMethod: { ...crudSaleOrder }})
+      crudMethod: { ...crudSaleOrder }
+    })
  },
  data() {
    return {
      classes3: [],
+      uploadShow: false,
      dialogShow: false,
-      permission: {
-      },
-      queryTypeOptions: [
-        { key: 'sale_code', display_name: '销售单号' }
-      ]
+      permission: {},
+      queryTypeOptions: [{ key: 'sale_code', display_name: '销售单号' }]
    }
  },
  created() {
@@ -191,7 +277,7 @@ export default {
  methods: {
    queryClassId() {
      const param = {
-        'class_idStr': this.class_idStr
+        class_idStr: this.class_idStr
      }
      crudClassstandard.queryClassById(param).then(res => {
        this.classes = res.content.map(obj => {
@@ -205,6 +291,9 @@ export default {
    importin() {
      this.dialogShow = true
    },
+    tableChanged3() {
+      this.crud.toQuery()
+    },
    buildTree(classes) {
      classes.forEach(data => {
        if (data.children) {
@@ -249,6 +338,4 @@ export default {
 }
 </script>

-<style scoped>
-
-</style>
+<style scoped></style>
--- a/mes/qd/src/views/wms/product_manage/workorder/index.vue
+++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue
@@ -10,7 +10,7 @@
          label-width="90px"
          label-suffix=":"
        >
-          <el-form-item label="生产车间">
+          <!-- <el-form-item label="生产车间">
            <el-select
              v-model="query.product_area"
              clearable
@@ -27,7 +27,7 @@
                :value="item.value"
              />
            </el-select>
-          </el-form-item>
+          </el-form-item> -->
          <!-- 搜索 -->
          <el-form-item label="工单检索">
            <el-input
@@ -109,7 +109,7 @@
              @change="crud.toQuery"
            />
          </el-form-item>
-          <el-form-item label="物料系列" >
+          <el-form-item label="物料系列">
            <treeselect
              v-model="query.product_series"
              :options="classes3"
@@ -139,7 +139,7 @@
              @change="crud.toQuery"
            />
          </el-form-item>
-          <rrOperation :crud="crud"/>
+          <rrOperation :crud="crud" />
        </el-form>
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -275,7 +275,7 @@
            </el-select>
          </el-form-item>
          <el-form-item v-if="false" label="物料标识" prop="material_id">
-            <el-input v-model="form.material_id" style="width: 200px;"/>
+            <el-input v-model="form.material_id" style="width: 200px;" />
          </el-form-item>
          <el-form-item label="物料编码" prop="material_code">
            <el-input
@@ -301,10 +301,10 @@
            />
          </el-form-item>
          <el-form-item label="物料单重" prop="material_weight">
-            <el-input v-model="form.material_weight" style="width: 200px;"/>
+            <el-input v-model="form.material_weight" style="width: 200px;" />
          </el-form-item>
          <el-form-item label="计划数量" prop="plan_qty">
-            <el-input v-model="form.plan_qty" style="width: 200px;"/>
+            <el-input v-model="form.plan_qty" style="width: 200px;" />
          </el-form-item>
          <el-form-item label="计划开始时间" prop="planproducestart_date">
            <el-date-picker
@@ -323,7 +323,7 @@
            />
          </el-form-item>
          <el-form-item v-if="crud.status.edit" label="实际数量" prop="report_qty">
-            <el-input v-model="form.real_qty" style="width: 200px;"/>
+            <el-input v-model="form.real_qty" style="width: 200px;" />
          </el-form-item>
          <el-form-item label="班次类型" prop="shift_type_scode">
            <el-select
@@ -343,7 +343,7 @@
            </el-select>
          </el-form-item>
          <el-form-item label="销售单标识">
-            <el-input v-model="form.sale_id" style="width: 200px;"/>
+            <el-input v-model="form.sale_id" style="width: 200px;" />
          </el-form-item>
          <el-form-item label="是否搬运" prop="is_needmove">
            <el-radio
@@ -424,64 +424,85 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识"/>
-        <el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')">
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
+        <el-table-column prop="workorder_id" label="工单id" width="160px">
          <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_code }}</el-link>
+            <el-link type="warning" @click="toView(scope.row)">{{ scope.row.workorder_id }}</el-link>
          </template>
        </el-table-column>
+        <el-table-column prop="workorder_code" label="工单编号" width="85px" />
        <el-table-column prop="workorder_status" label="工单状态">
          <template slot-scope="scope">
            {{ dict.label.MPS_BD_ORDERSTATUS[scope.row.workorder_status] }}
          </template>
        </el-table-column>
        <!--        <el-table-column prop="workprocedure_code" label="工序编码" />-->
-        <el-table-column prop="product_area" label="生产车间"/>
-        <el-table-column prop="plan_qty" label="计划数量"/>
-        <el-table-column prop="outupperlimit_qty" label="满筐数量"/>
-        <el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip/>
-        <el-table-column prop="real_qty" label="报工总数"/>
-        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')"/>
-        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')"/>
-        <el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')"/>
-        <el-table-column prop="workprocedure_name" label="工序名称"
-                         :min-width="flexWidth('workprocedure_name',crud.data,'工序名称')"/>
-        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4"/>
-        <el-table-column prop="planproducestart_date" label="计划开始时间"
-                         :min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"/>
-        <el-table-column prop="planproduceend_date" label="计划结束时间"
-                         :min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"/>
-        <el-table-column prop="realproducestart_date" label="实际开始时间"
-                         :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"/>
-        <el-table-column prop="realproduceend_date" label="实际结束时间"
-                         :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"/>
-        <el-table-column prop="is_canupdate_update" label="允许修改报工数" :formatter="formatBoolean" width="200"
-                         show-overflow-tooltip/>
-        <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean"/>
+        <el-table-column prop="product_area" label="生产车间" />
+        <el-table-column prop="plan_qty" label="计划数量" />
+        <el-table-column prop="outupperlimit_qty" label="满筐数量" />
+        <el-table-column prop="dq_real_qty" label="电气实时数" width="100" show-overflow-tooltip />
+        <el-table-column prop="real_qty" label="报工总数" />
+        <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
+        <el-table-column prop="device_code" label="当前设备编码" :min-width="flexWidth('device_code',crud.data,'当前设备编码')" />
+        <el-table-column
+          prop="workprocedure_name"
+          label="工序名称"
+          :min-width="flexWidth('workprocedure_name',crud.data,'工序名称')"
+        />
+        <el-table-column prop="material_weight" label="物料单重" width="100" :formatter="crud.formatQlNum4" />
+        <el-table-column
+          prop="planproducestart_date"
+          label="计划开始时间"
+          :min-width="flexWidth('planproducestart_date',crud.data,'计划开始时间')"
+        />
+        <el-table-column
+          prop="planproduceend_date"
+          label="计划结束时间"
+          :min-width="flexWidth('planproduceend_date',crud.data,'计划结束时间')"
+        />
+        <el-table-column
+          prop="realproducestart_date"
+          label="实际开始时间"
+          :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')"
+        />
+        <el-table-column
+          prop="realproduceend_date"
+          label="实际结束时间"
+          :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')"
+        />
+        <el-table-column
+          prop="is_canupdate_update"
+          label="允许修改报工数"
+          :formatter="formatBoolean"
+          width="200"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="is_needmove" label="是否搬运" :formatter="formatBoolean" />
        <el-table-column prop="shift_type_scode" label="班次类型">
          <template slot-scope="scope">
            {{ dict.label.PDM_BI_SHIFTTYPE[scope.row.shift_type_scode] }}
          </template>
        </el-table-column>
-        <el-table-column prop="create_type" label="创建类型"  width="100">
+        <el-table-column prop="create_type" label="创建类型" width="100">
          <template slot-scope="scope">
            {{ dict.label.WORKORDER_CREATE_TYPE[scope.row.create_type] }}
          </template>
        </el-table-column>
-        <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常"/>
-        <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip/>
-        <el-table-column prop="remark" label="备注"/>
-        <el-table-column prop="nok_qty" label="报废总数"/>
-        <el-table-column prop="report_qty" label="报修总数"/>
-        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip/>
-        <el-table-column prop="current_produce_person_name" label="操作工" show-overflow-tooltip/>
-        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
-        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')"/>
-        <el-table-column prop="down_name" label="下发人" :min-width="flexWidth('down_name',crud.data,'下发人')"/>
-        <el-table-column prop="down_time" label="下发时间" :min-width="flexWidth('down_time',crud.data,'下发时间')"/>
-        <el-table-column prop="confirm_name" label="完工人" :min-width="flexWidth('confirm_name',crud.data,'完工人')"/>
-        <el-table-column prop="confirm_time" label="完工时间" :min-width="flexWidth('confirm_time',crud.data,'完工时间')"/>
+        <el-table-column prop="is_error" :formatter="formatBoolean" label="是否异常" />
+        <el-table-column prop="error_info" label="异常信息" show-overflow-tooltip />
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="nok_qty" label="报废总数" />
+        <el-table-column prop="report_qty" label="报修总数" />
+        <el-table-column prop="person_real_qty" label="人员实际数量" width="100" show-overflow-tooltip />
+        <el-table-column prop="current_produce_person_name" label="操作工" show-overflow-tooltip />
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="down_name" label="下发人" :min-width="flexWidth('down_name',crud.data,'下发人')" />
+        <el-table-column prop="down_time" label="下发时间" :min-width="flexWidth('down_time',crud.data,'下发时间')" />
+        <el-table-column prop="confirm_name" label="完工人" :min-width="flexWidth('confirm_name',crud.data,'完工人')" />
+        <el-table-column prop="confirm_time" label="完工时间" :min-width="flexWidth('confirm_time',crud.data,'完工时间')" />
        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
          <template slot-scope="scope">
            <udOperation
@@ -492,7 +513,7 @@
        </el-table-column>
      </el-table>
      <!--分页组件-->
-      <pagination/>
+      <pagination />
    </div>
    <MaterDtl
      :dialog-show.sync="materialShow"
@@ -500,11 +521,11 @@
      :mater-opt-code="materType"
      @setMaterValue="setMaterValue"
    />
-    <ViewDialog ref="child3"/>
-    <reportDialog ref="report" @AddChanged="querytable"/>
-    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3"/>
-    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable"/>
-    <ReplaceDeviceDialog ref="child4" @AddChanged="querytable"/>
+    <ViewDialog ref="child3" />
+    <reportDialog ref="report" @AddChanged="querytable" />
+    <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="tableChanged3" />
+    <AddDialog :dialog-show.sync="addShow" @AddChanged="querytable" />
+    <ReplaceDeviceDialog ref="child4" @AddChanged="querytable" />
  </div>
 </template>

--- a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
+++ b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js
@@ -41,7 +41,7 @@ export function submits(data) {
 }
 export function unSubmits(data) {
  return request({
-    url: 'api/produceWorkorder/submits',
+    url: 'api/produceWorkorder/unSubmits',
    method: 'post',
    data
  })
@@ -112,7 +112,6 @@ export function reportQuery(data) {
  })
 }

-
 export function reportQuery3(data) {
  return request({
    url: '/api/produceWorkorder/reportQuery3',