Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java

@@ -198,4 +198,19 @@ public class BackApplyInfo {
      * 报废数量
      */
     private Integer bfNum;
+
+    /**
+     * 报废原因
+     */
+    private String scrapReason;
+
+    /**
+     * 报废类型0：自然报废，1人为报废
+     */
+    private String scrapType;
+
+    /**
+     * 图片地址
+     */
+    private String fileUrl;
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -312,6 +312,15 @@
     <if test="remark != null and remark != ''">
       remark,
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      scrap_reason,
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      scrap_type,
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      file_url,
+    </if>
     <if test="companyId != null">
       company_id,
     </if>
@@ -343,6 +352,15 @@
     <if test="remark != null and remark != ''">
       #{remark},
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      #{scrapReason},
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      #{scrapType},
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      #{fileUrl},
+    </if>
     <if test="companyId != null">
       #{companyId},
     </if>
@@ -512,6 +530,15 @@
     <if test="companyId != null">
       company_id,
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      audit_remark,
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      scrap_type,
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      file_url,
+    </if>
     create_time
     )
     values (
@@ -538,6 +565,15 @@
     <if test="companyId != null">
       #{companyId},
     </if>
+    <if test="scrapReason != null and scrapReason != ''">
+      #{scrapReason},
+    </if>
+    <if test="scrapType != null and scrapType != ''">
+      #{scrapType},
+    </if>
+    <if test="fileUrl != null and fileUrl != ''">
+      #{fileUrl},
+    </if>
     NOW()
     )
   </insert>
@@ -749,7 +785,10 @@
       bcd.parent_id as parentId,
       bcd.create_by as createBy,
       bcd.ma_id as maId,
-      bai.company_id as companyId
+      bai.company_id as companyId,
+      bcd.scrap_reason as scrapReason,
+      bcd.scrap_type as scrapType,
+      bcd.file_url as fileUrl
     FROM
       back_check_details bcd
         LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id

sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml

@@ -522,6 +522,10 @@
           AND bpl.lot_id = #{record.projectId}
       </if>
 
+      <if test="record.taskStatus != null and record.taskStatus != ''">
+          AND tt.task_status = #{record.taskStatus}
+      </if>
+
       <if test="record.keyWord != null and record.keyWord != ''">
           AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or
                tt.code like concat('%', #{record.keyWord}, '%'))
@@ -665,7 +669,7 @@
         tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
         bpi.lot_id as proId,   bpi.pro_id as  projectId,bpi.lot_name as proName,
         bui.unit_id as unitId,bui.unit_name as unitName,
-        tt.create_by as applyFor,d.`name` as taskName,
+        su.nick_name as applyFor,d.`name` as taskName,
 
         su2.user_name as companyAuditBy,
         lai.company_audit_time as companyAuditTime,
@@ -687,7 +691,7 @@
         bai.agreement_id as agreementId
       FROM
         tm_task tt
-          LEFT JOIN sys_user su ON tt.create_by = su.user_name
+          LEFT JOIN sys_user su ON tt.create_by = su.user_id
           LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
           LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
           LEFT JOIN bm_agreement_info bai ON bai.agreement_id = tta.agreement_id

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java

@@ -492,7 +492,8 @@ public class BackApplyServiceImpl implements BackApplyService {
         if (CollUtil.isNotEmpty(dto.getBackApplyList())) {
             for (BackApplyListDto backApplyListDto : dto.getBackApplyList()) {
                 for (BackApplyInfo backApplyDetail : backApplyListDto.getBackApplyDetails()) {
-                    dto.setAuditNum(backApplyDetail.getNum());
+                    dto.setId(backApplyListDto.getId());
+                    dto.setAuditNum(backApplyDetail.getPreNum());
                     re = backApplyMapper.auditAll(dto);
                 }
             }

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)
+                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)
             })

sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue

@@ -563,7 +563,6 @@ export default {
             modelList: [],
           // 采购状态下拉数据
           statusList: [
-            { label: '全部', taskState: null },
             { label: '待审核', taskState: 122 },
             { label: '入库审核中', taskState: 105 },
             { label: '已驳回', taskState: 106 },

sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/home.vue

@@ -510,7 +510,6 @@ export default {
             modelList: [],
             // 采购状态下拉数据
             statusList: [
-                { label: '全部', taskState: null },
                 { label: '待通知', taskState: 24 },
                 { label: '待验收', taskState: 25 },
                 { label: '验收合格', taskState: 26 },