打印模板和关闭工单

Dockerfile-prod

@@ -7,7 +7,7 @@ RUN echo "server {  \
                       listen       90; \
                       client_max_body_size 50M; \
                       location   /prod-api/ { \
-                      proxy_pass              http://192.168.3.181:8080/; \
+                      proxy_pass              http://192.168.3.181:8101/; \
                       proxy_redirect          off; \
                       proxy_set_header        Host mes-ui; \
                       proxy_set_header        X-Real-IP \$remote_addr; \

src/api/mes/pro/workorder.js

@@ -79,6 +79,15 @@ export function closeWorkorder(data) {
   })
 }
 
+// 检查关闭生产工单
+export function closeCheck(data) {
+  return request({
+    url: '/mes/pro/workorder/closeCheck',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除生产工单
 export function delWorkorder(workorderId) {
   return request({

src/views/mes/pro/workorder/indexApply.vue

@@ -579,7 +579,8 @@ import {
   printInfo,
   doCheckToolNum,
   delComWorkorder,
-  closeWorkorder
+  closeWorkorder,
+  closeCheck
 } from "@/api/mes/pro/workorder";
 import { addProtaskList } from "@/api/mes/pro/protask";
 import shiftSelectMixin from '@/utils/shiftSelectMixin'
@@ -826,10 +827,39 @@ export default {
         workorderId: v,
         status: "CLOSE"
       }))
-      closeWorkorder(JSON.stringify(obj)).then(({data}) => {
-        this.$message.success('关闭工单成功')
-        this.getList();
+      const params = this.selectedRows.map(v=>({
+        workorderId: v.workorderId,
+        workorderCode: v.workorderCode,
+        checkState: 1
+      }))
+      closeCheck(params).then(res => {
+        if(!res.msg) {
+          params.forEach(vv=> {
+            vv.checkState = 2
+          })
+          closeCheck(params).then(res => {
+            if(!res.msg) {
+              params.forEach(vv=> {
+                vv.checkState = 3
+              })
+              closeCheck(params).then(res => {
+                if(!res.msg) {
+                  this.$modal.confirm('经检查，工单符合关闭条件，是否确认关闭工单？（注意：一经确认关闭，无法取消关闭。）').then(() => {
+                    this.$modal.confirm('请再次确认是否关闭工单？（注意：一经确认关闭，无法取消关闭。）').then(() => {
+                      closeWorkorder(JSON.stringify(obj)).then(({data}) => {
+                        this.$message.success('关闭工单成功')
+                        this.getList();
+                      })
+                    })
+                  })
+                }
+              })
+            }
+          })
+        }
       })
+      
+
     },
     showArrangDetail(row, arrangeCode) {
       this.arrangeOpen = true;

src/views/mes/report/index.vue

@@ -91,6 +91,11 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="是否为库存模板" align="center" prop="remark" >
+        <template slot-scope="scope">
+          {{scope.row.inventoryTemplate ? '是':'否'}}
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" v-if="operation" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -128,7 +133,7 @@
 
     <!-- 添加或修改报表管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="模版名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入模版名称" />
         </el-form-item>
@@ -142,6 +147,22 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否为库存模板" prop="inventoryTemplate">
+          <el-select
+              v-model="form.inventoryTemplate"
+              placeholder="是否为库存模板"
+              clearable
+            >
+              <el-option
+                label="是"
+                :value="true"
+              />
+              <el-option
+                label="否"
+                :value="false"
+              />
+            </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -260,6 +281,7 @@ export default {
       this.form = {
         id: null,
         filePath: null,
+        inventoryTemplate: false,
         name: null,
         content: null,
         createTime: null,