领料申请增加任务状态搜索, 优化领料审核详情页任务状态显示

sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue

@@ -57,6 +57,24 @@
                 </el-select>
             </el-form-item>
 
+            <el-form-item label="任务状态" prop="taskStatus">
+                <el-select
+                    v-model="queryParams.taskStatus"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in taskStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
             <el-form-item label="申请日期">
                 <el-date-picker
                     v-model="queryParams.time"
@@ -379,6 +397,14 @@ export default {
             unitList: [], //来往单位集合
             proList: [], //工程集合
             currentUserName: sessionStorage.getItem('userName'),
+            taskStatusList: [
+                { name: '待分公司审核', id: 30 },
+                { name: '待分管部门审核', id: 31 },
+                { name: '待内部审核', id: 32 },
+                { name: '待出库', id: 33 },
+                { name: '出库进行中', id: 34 },
+                { name: '完成', id: 35 },
+            ],
         }
     },
     created() {
@@ -404,6 +430,7 @@ export default {
                 souceBy: 0,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum,
+                taskStatus: this.queryParams.taskStatus,
             }
 
             const res = await getLeaseAuditListAll(params)

sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue

@@ -617,7 +617,11 @@ export default {
             this.queryParams.leaseApplyDetails.forEach((v) => {
                 this.$set(v, 'applyFor', this.queryParams.applyFor)
                 this.$set(v, 'updateTimes', this.queryParams.updateTimes)
-                this.$set(v, 'taskName', v.statusName)
+                if (!res.rows[0].directAuditRemark) {
+                    this.$set(v, 'taskName', this.queryParams.taskName)
+                } else {
+                    this.$set(v, 'taskName', v.statusName)
+                }
                 this.$set(v, 'createTime', this.queryParams.createTimes)
                 this.$set(v, 'updateTime', this.queryParams.updateTimes)
             })