提审理单

src/api/task.js

@@ -131,3 +131,12 @@ export function batchCompleteTask (data) {
     data
   })
 }
+
+// 提审理单
+export function submitTask (data) {
+  return request({
+    url: request.adornUrl(`/biz-service/WorkController/submit`),
+    method: 'post',
+    data
+  })
+}

src/views/modules/common/upload-component-v2.vue

@@ -1,6 +1,6 @@
 <template>
   <section>
-    <el-col :span="24">
+    <span>
       <el-upload
         :disabled="display"
         class="upload-demo"
@@ -30,7 +30,7 @@
         > -->
         <el-button v-if="templateCode !== ''" size="small" @click="downloadTemplate">下载模板</el-button>
       </el-upload>
-    </el-col>
+    </span>
     <!-- 图片预览 -->
     <el-dialog
       title="图片预览"

src/views/modules/works/work.vue

@@ -224,6 +224,17 @@
             size="small"
             @click="damageTask(scope.row.nodeId, scope.row.productionId)"
             >报损</el-button
+            >
+            <el-button
+            v-if="
+              isAuth('work:clt:check') &&
+              Number(scope.row.state) === 2 &&
+              scope.row.taskType !== 'routine'
+            "
+            type="text"
+            size="small"
+            @click="submitTask(scope.row.nodeId, scope.row.productionId)"
+            >提审理单</el-button
           >
         </template>
       </el-table-column>
@@ -310,23 +321,6 @@
         :rules="checkDialogFormRules"
         ref="checkDialogForm"
       >
-        <!-- <el-form-item
-          v-if="
-            checkDialogForm.checkType !== '1' && checkDialogForm.checkType !== 1
-          "
-          label="检验类型"
-          prop="checkType"
-          label-width="120px"
-        >
-          <el-select
-            v-model="checkDialogForm.checkType"
-            placeholder="请选择检验类型"
-            style="width: 100%"
-          >
-            <el-option label="返回上一级" value="2"></el-option>
-            <el-option label="报损" value="3"></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item
           label="完成记录说明"
           prop="operationRecords"
@@ -339,14 +333,6 @@
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item label="备注" prop="notes" label-width="120px">
-          <el-input
-            v-model="checkDialogForm.notes"
-            type="textarea"
-            :rows="2"
-            placeholder="请输入备注"
-          ></el-input>
-        </el-form-item> -->
         <el-form-item label="发生工序节点" prop="disqualificationNodeId" label-width="120px" v-if="checkDialogForm.checkType === 2">
           <el-select v-model="checkDialogForm.disqualificationNodeId">
             <el-option v-for="item in techOptions" :key="item.id" :value="item.id" :label="item.nodeName"></el-option>
@@ -473,6 +459,45 @@
         <el-button type="primary" @click="finishSubmit" v-reClick>确 定</el-button>
       </div>
     </el-dialog>
+
+<!-- 提审理单 -->
+    <el-dialog
+      title="提审理单"
+      width="50%"
+      :visible.sync="submitDialogFormVisible"
+    >
+      <el-form
+        :model="submitDialogForm"
+        :rules="submitDialogFormRules"
+        ref="submitDialogForm"
+      >
+        <el-form-item
+          label="完成记录说明"
+          prop="operationRecords"
+          label-width="120px"
+        >
+          <el-input
+            v-model="submitDialogForm.operationRecords"
+            type="textarea"
+            :rows="2"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="发生工序节点" prop="disqualificationNodeId" label-width="120px" >
+          <el-select v-model="submitDialogForm.disqualificationNodeId">
+            <el-option v-for="item in techOptions" :key="item.id" :value="item.id" :label="item.nodeName"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="附件" prop="attachList" label-width="120px">
+            <upload-component :accept="'*'" v-model="submitDialogForm.attachList" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="submitDialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitSubmit" v-reClick>确 定</el-button>
+      </div>
+    </el-dialog>
+    
     <!-- 文件预览 -->
     <preview-component v-if="previewVisible" ref="preview" />
     <attach-detail-dialog ref="attachDetail"/>
@@ -491,7 +516,8 @@ import {
   getTechList,
   batchStart,
   batchCheckTask,
-  batchCompleteTask
+  batchCompleteTask,
+  submitTask
 } from '@/api/task'
 import { workTypeMasterList } from '@/api/worktype'
 import templateList from '../warehouse/template-list'
@@ -499,8 +525,9 @@ import PreviewComponent from '../common/preview-component'
 import UserComponent from '@/views/modules/common/user-component'
 import { taskTypeOption, rankTypeOption } from '@/utils/enums'
 import AttachDetailDialog from '../common/attach-detail-dialog'
+import UploadComponent from '../common/upload-component-v2'
 export default {
-  components: { UserComponent, PreviewComponent, templateList, AttachDetailDialog },
+  components: { UserComponent, PreviewComponent, templateList, AttachDetailDialog, UploadComponent },
   name: 'work',
   computed: {
     userId: {
@@ -616,7 +643,19 @@ export default {
       taskTypeOption: taskTypeOption,
       rankTypeOption: rankTypeOption,
       techOptions: [],
-      multipleSelection: [] // 多选的数据
+      multipleSelection: [], // 多选的数据
+      submitDialogFormVisible: false,
+      submitDialogForm: {
+        operationRecords: '',
+        notes: '',
+        prodProductionRecordList: []
+      },
+      submitDialogFormRules: {
+        operationRecords: [
+          { required: true, message: '完成记录说明不能为空', trigger: 'blur' }
+        ],
+        disqualificationNodeId: [{ required: true, message: '请选择', trigger: 'blur' }]
+      }
     }
   },
   created () {
@@ -988,6 +1027,31 @@ export default {
         this.finishDialogFormVisible = true
         this.finishDialogForm.taskIds = this.multipleSelection.map(t => t.taskId)
       }
+    },
+    submitTask () {
+      this.submitDialogFormVisible = true
+    },
+    submitSubmit () {
+      this.$refs['submitDialogForm'].validate((valid) => {
+        if (valid) {
+          let submitData = this.submitDialogForm
+          submitTask(submitData).then(({ data }) => {
+            if (data && data.code === '200') {
+              this.$message({
+                type: 'success',
+                message: '操作成功!'
+              })
+              this.damageDialogFormVisible = false
+              this.getDataList()
+            } else {
+              this.$message({
+                type: 'error',
+                message: data.msg
+              })
+            }
+          })
+        }
+      })
     }
   }
 }