我的工单

src/api/task.js

@@ -87,3 +87,11 @@ export function getTaskDetail (taskId) {
     method: 'get'
   })
 }
+
+// 根据工单id获取工艺工序列表
+export function getTechList (taskId) {
+  return request({
+    url: request.adornUrl(`/biz-service/WorkController/query/${taskId}`),
+    method: 'get'
+  })
+}

src/views/modules/warehouse/stock-order-inbound.vue

@@ -9,6 +9,11 @@
               <el-input v-model="dataForm.recordCode" :disabled="true" placeholder="编码系统自动生成"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="入库申请人" prop="applicant">
+               <user-component v-model="dataForm.applicant" :disabled="display" :user-id.sync="dataForm.applicant"/>
+            </el-form-item>
+          </el-col>
         </el-row>
         <template v-for="(item, index) in dataList">
           <div :key="index" class="my-line">
@@ -180,6 +185,8 @@
             }
           })
         } else if (item) {
+          item.applicant = this.$store.state.user.id
+          console.log(this.$store.state.user, 'qqqqqqqqq')
           this.addOne(item)
         } else if (!display) {
           this.addOne()
@@ -218,7 +225,7 @@
             }
             this.dataList.forEach((item) => {
               postData.push({...item,
-                applicant: this.dataForm.userId,
+                applicant: this.dataForm.applicant,
                 materialName: item.materialName ? item.materialName : item.materialId,
                 materialTypeId: item.materialTypeId ? item.materialTypeId : item.cateId,
                 orgId: this.$store.state.user.orgId,

src/views/modules/worder/add-or-update.vue

@@ -162,6 +162,9 @@ export default {
         ],
         receiver: [
           { required: true, message: '请输入工单任务接收人', trigger: 'blur' }
+        ],
+        attachList: [
+          { required: true, message: '请选择附件', trigger: 'change' }
         ]
       }
     }

src/views/modules/works/work.vue

@@ -13,14 +13,6 @@
         <el-button @click="queryData()">查询</el-button>
       </el-form-item>
     </el-form>
-    <!-- <el-radio-group @change="queryData" v-model="dataForm.state">
-      <el-radio-button
-        v-for="item in optionsState"
-        :key="item.code"
-        :label="item.code"
-        >{{ item.value }}</el-radio-button
-      >
-    </el-radio-group> -->
     <el-tabs v-model="dataForm.state" @tab-click="queryData">
       <el-tab-pane label="未开始" name="1"></el-tab-pane>
       <el-tab-pane label="待操作" name="2"></el-tab-pane>
@@ -185,11 +177,11 @@
           >
           <el-button
             v-if="
-              isAuth('work:clt:check') &&
-              Number(scope.row.state) === 2 &&
-              (scope.row.nodeType === 'check' ||
-                scope.row.nodeType === 't-check')
-            "
+                isAuth('work:clt:check') &&
+                Number(scope.row.state) === 2 &&
+                (scope.row.nodeType === 'check' ||
+                  scope.row.nodeType === 't-check')
+              "
             type="text"
             size="small"
             @click="checkTask(scope.row.taskId, 2)"
@@ -290,7 +282,7 @@
         :rules="checkDialogFormRules"
         ref="checkDialogForm"
       >
-        <el-form-item
+        <!-- <el-form-item
           v-if="
             checkDialogForm.checkType !== '1' && checkDialogForm.checkType !== 1
           "
@@ -306,7 +298,7 @@
             <el-option label="返回上一级" value="2"></el-option>
             <el-option label="报损" value="3"></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           label="完成记录说明"
           prop="operationRecords"
@@ -319,13 +311,18 @@
             placeholder="请输入"
           ></el-input>
         </el-form-item>
-        <el-form-item label="备注" prop="notes" label-width="120px">
+        <!-- <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">
+          <el-select v-model="checkDialogForm.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-row v-if="checkDialogForm.checkType != null">
           <el-table
@@ -462,7 +459,8 @@ import {
   completeTask,
   checkTask,
   damageTask,
-  getTaskDetail
+  getTaskDetail,
+  getTechList
 } from '@/api/task'
 import { workTypeMasterList } from '@/api/worktype'
 import templateList from '../warehouse/template-list'
@@ -549,6 +547,7 @@ export default {
           { required: true, message: '完成记录说明不能为空', trigger: 'blur' }
         ],
         checkType: [{ required: true, message: '请选择', trigger: 'blur' }],
+        disqualificationNodeId: [{ required: true, message: '请选择', trigger: 'blur' }],
         measureRecord1: [
           { required: true, message: '请输入', trigger: 'blur' }
         ],
@@ -583,7 +582,8 @@ export default {
         17: '其他'
       },
       taskTypeOption: taskTypeOption,
-      rankTypeOption: rankTypeOption
+      rankTypeOption: rankTypeOption,
+      techOptions: []
     }
   },
   created () {
@@ -744,6 +744,11 @@ export default {
         this.passTask()
       } else {
         this.checkDialogForm.checkType = null
+        getTechList(this.checkDialogForm.taskId).then(({data}) => {
+          if (data && data.code === '200') {
+            this.techOptions = data.data
+          }
+        })
         this.refuseTask()
       }
     },