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

sgzb-auth/pom.xml

@@ -56,6 +56,13 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <!--加密依赖包-->
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
 
     </dependencies>
 	

sgzb-auth/src/main/java/com/bonus/sgzb/auth/SgzbAuthApplication.java

@@ -1,5 +1,6 @@
 package com.bonus.sgzb.auth;
 
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -14,6 +15,7 @@ import org.springframework.context.annotation.ComponentScan;
  */
 @EnableRyFeignClients
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@EnableEncryptableProperties
 public class SgzbAuthApplication {
     public static void main(String[] args) {
         SpringApplication.run(SgzbAuthApplication.class, args);

sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java

@@ -158,4 +158,13 @@ public class Constants
     /** 调试分公司*/
     public static final String TS = "调试分公司";
 
+    /** 退库任务*/
+    public static final int BACK_TASK_TYPE = 36; //退料核查中
+
+    /** 退库状态 - 退料已提交*/
+    public static final String BACK_SUBMIT_STATUS = "38"; //退料已提交
+
+    /** 退库状态 - 退料核查中*/
+    public static final String BACK_CHECKING_STATUS = "39"; //退料核查中
+
 }

sgzb-gateway/src/main/java/com/bonus/sgzb/gateway/SgzbGatewayApplication.java

@@ -25,11 +25,9 @@ public class SgzbGatewayApplication implements CommandLineRunner {
     private StringEncryptor encryptor;
     @Override
     public void run(String... args) throws Exception {
-        String nacos = encrypt("Jjsp@nacos2023" );
         String mysqlNm = encrypt("root" );
         String mysqlPs = encrypt("Bonus@admin123!" );
         String redis = encrypt("Dszbns@Redis123!" );
-        System.err.println( "nacos原始明文密码加密后的结果为：" + nacos );
         System.err.println( "mysqlNm原始明文密码加密后的结果为：" + mysqlNm );
         System.err.println( "mysqlPs原始明文密码加密后的结果为：" + mysqlPs );
         System.err.println( "redis原始明文密码加密后的结果为：" + redis );

sgzb-gateway/src/main/resources/bootstrap.yml

@@ -25,8 +25,6 @@ spring:
       nacos:
         enabled: true
     nacos:
-      username: nacos
-      password: ENC(gQ6+/ZE1DwP8W8IFKQDEllLgAJIOIZ5CBy334W5W/uCdyCrNosOWVuCzIPsm/ZF9)
       discovery:
         # 服务注册地址
         server-addr: 192.168.0.14:8848

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java

@@ -118,22 +118,22 @@ public class BackReceiveController extends BaseController {
     @Log(title = "退料接收明细-web", businessType = BusinessType.QUERY)
     @PostMapping("/getReceiveViewWebNum")
     public AjaxResult getReceiveViewWebNum(@RequestBody BackApplyInfo record) {
-        int res = 0;
+        boolean allowBack = true;
         String[] split = record.getTypeId().split(",");
         for (String s : split) {
             record.setModelId(s);
             record.setTypeId(null);
             List<BackApplyInfo> list = backReceiveService.receiveView(record);
             for (BackApplyInfo backApplyInfo : list) {
-                if (Double.valueOf(backApplyInfo.getNum()).intValue() != 0) {
+                if (Double.valueOf(backApplyInfo.getNum()).intValue() < 0) {
-                    res++;
+                    allowBack = allowBack && false;
                 }
             }
         }
-        if (res > 0) {
+        if (allowBack) {
-            return AjaxResult.success(0);
-        } else {
             return AjaxResult.success(1);
+        } else {
+            return AjaxResult.success(0);
         }
     }
 

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

@@ -82,6 +82,10 @@ public class BackApplyInfo {
      * 在用数量
      */
     private String num;
+    /**
+     * 已完成的退料数量
+     */
+    private String finishedBackNum;
     /**
      * 编码
      */
@@ -229,4 +233,7 @@ public class BackApplyInfo {
      *
      */
     private  Integer pageSize;
+
+    /**0:未完成退料,可以撤回 1:已完成退料,不能撤回*/
+    private Integer isFinished;
 }

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

@@ -270,4 +270,7 @@ public class TmTask implements Serializable {
     private Integer souceByRefuse;
     private int souceBy;
 
+    /**0:update_time ASC 1:update_time DESC 2:task_status ASC 3:task_status DESC*/
+    private int orderStatus;
+
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java

@@ -209,4 +209,6 @@ public interface BackReceiveMapper {
     List<TmTask> getScrapBackMachine(TmTask task);
 
     int updateStatus(BackApplyInfo record);
+
+    int finishBackCheckDetails(BackApplyInfo record);
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java

@@ -99,6 +99,10 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         return backReceiveMapper.updateStatus(record);
     }
 
+    private int finishBackCheckDetails(BackApplyInfo record) {
+        return backReceiveMapper.finishBackCheckDetails(record);
+    }
+
     private int updateTaskStatus(int taskId, int i) {
         int res;
         res = backReceiveMapper.updateTaskStatus(taskId, i);
@@ -173,8 +177,12 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         if (StringUtils.isNotBlank(record.getTypeId())) {
             for (String s : record.getTypeId().split(",")) {
                 record.setTypeId(s);
+                if (allZeros) {
                     //修改back_apply_details为已退料（1）
                     res = updateStatus(record);
+                }
+                //完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回
+                finishBackCheckDetails(record);
                 List<BackApplyInfo> hgList = backReceiveMapper.getHgList(record);
                 if (hgList != null && hgList.size() > 0) {
                     res = insertIad(hgList);

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java

@@ -538,6 +538,7 @@ public class TmTaskServiceImpl implements TmTaskService {
         List<TmTask> tmTaskList;
         if (roles.contains(STRING_ADMIN)) {
             tmTaskList = tmTaskMapper.getAuditListByLeaseTmTask(record);
+//            System.out.println(record.getTypeId());
         } else if (deptId != null) {
             record.setCompanyId(deptId.intValue());
             tmTaskList = tmTaskMapper.getAuditListByLeaseTmTaskByPeople(record);

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

@@ -24,7 +24,7 @@ public class BmUnitInfo {
   /**单位类型*/
 
   @ApiModelProperty(value = "类型ID")
-  private long typeId;
+  private String typeId;
   /**联系人*/
   @Excel(name = "联系人")
   @ApiModelProperty(value = "联系人")
@@ -108,11 +108,11 @@ public class BmUnitInfo {
   }
 
 
-  public long getTypeId() {
+  public String getTypeId() {
     return typeId;
   }
 
-  public void setTypeId(long typeId) {
+  public void setTypeId(String typeId) {
     this.typeId = typeId;
   }
 

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitInfoServiceImpl.java

@@ -47,6 +47,11 @@ public class BmUnitInfoServiceImpl implements BmUnitInfoService {
     @Override
     public AjaxResult unitInfoAdd(BmUnitInfo bmUnitInfo) {
         BmUnitInfo info = bmUnitInfoMapper.selectByName(bmUnitInfo.getUnitName());
+//        if (bmUnitInfo.getTypeId().equals("0")){
+//            bmUnitInfo.setTypeId("内部单位");
+//        }else {
+//            bmUnitInfo.setTypeId("外部单位");
+//        }
         if (StringUtils.isNotNull(info)) {
             return AjaxResult.error("新增往来单位名称重复，请重新提交！！！");
         }

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

@@ -617,8 +617,11 @@
   <update id="updateStatus">
     update back_apply_details set back_status = 1 where parent_id = #{parentId} and type_id = #{typeId}
   </update>
+  <update id="finishBackCheckDetails">
+    update back_check_details set is_finished = 1 where parent_id = #{parentId} and type_id = #{typeId}
+  </update>
   <delete id="deleteCheckDetails">
-    delete from back_check_details where parent_id = #{parentId} and type_id = #{typeId}
+    delete from back_check_details where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
     <if test="maId != null and maId != ''">
       and ma_id = #{maId}
     </if>
@@ -713,6 +716,7 @@
       bad.status as status,
       bad.back_status as backStatus,
       IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
+      bb.finished_back_num,
       mt.manage_type as manageType,
       CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
     FROM
@@ -731,6 +735,16 @@
           parent_id=#{id}
         GROUP BY type_id
       ) aa on aa.typeId=bad.type_id
+      LEFT JOIN (
+        SELECT
+        type_id as typeId,
+        SUM(IFNULL(back_num,0)) as finished_back_num
+        FROM
+        back_check_details
+        WHERE
+        parent_id=#{id} and is_finished = 1
+        GROUP BY type_id
+      ) bb on bb.typeId=bad.type_id
     WHERE
       bai.id=#{id}
       <if test="typeId != null and typeId != ''">

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

@@ -480,6 +480,7 @@
 
   <select id="getAuditListByLeaseTmTask" resultType="com.bonus.sgzb.app.domain.TmTask">
       SELECT DISTINCT
+      bui.type_id,
       tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName,
       bpl.lot_id as proId,bpl.lot_name as proName,
       bui.unit_id as unitId,bui.unit_name as unitName,
@@ -531,11 +532,20 @@
                tt.code like concat('%', #{record.keyWord}, '%'))
       </if>
       GROUP BY tt.task_id
-      ORDER BY tt.update_time DESC
+      order by
+      case when #{record.orderStatus} = 0 then tt.update_time
+            when #{record.orderStatus} = 1 then tt.update_time
+            when #{record.orderStatus} = 2 then tt.task_status
+            when #{record.orderStatus} = 3 then tt.task_status
+      end
+      <if test="record.orderStatus == 1 or record.orderStatus == 3">
+        desc
+      </if>
   </select>
 
   <select id="getAuditManageListByLeaseTmTask" resultType="com.bonus.sgzb.app.domain.TmTask">
       SELECT DISTINCT
+      bui.type_id,
       tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,
       bpl.lot_id as proId,bpl.lot_name as proName,
       bui.unit_id as unitId,bui.unit_name as unitName,
@@ -591,7 +601,15 @@
           AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%'))
       </if>
       GROUP BY tt.task_id
-      ORDER BY tt.task_status,tt.update_time DESC
+      order by
+      case when #{record.orderStatus} = 0 then tt.update_time
+            when #{record.orderStatus} = 1 then tt.update_time
+            when #{record.orderStatus} = 2 then tt.task_status
+            when #{record.orderStatus} = 3 then tt.task_status
+      end
+      <if test="record.orderStatus == 1 or record.orderStatus == 3">
+        desc
+      </if>
   </select>
 
   <select id="getAuditListByLeaseInfo" resultType="com.bonus.sgzb.app.domain.LeaseApplyInfo">
@@ -945,6 +963,7 @@
   </select>
   <select id="getAuditListByLeaseTmTaskByPeople" resultType="com.bonus.sgzb.app.domain.TmTask">
     SELECT DISTINCT
+    bui.type_id,
     tt.*, su.phonenumber AS phoneNumber, sd.dept_name as deptName,su.nick_name as nickName,su.user_id as userId,
     bpl.lot_id as proId,bpl.lot_name as proName,
     bui.unit_id as unitId,bui.unit_name as unitName,
@@ -998,7 +1017,15 @@
            tt.code like concat('%', #{record.keyWord}, '%'))
     </if>
     GROUP BY tt.task_id
-    ORDER BY tt.update_time DESC
+    order by
+    case when #{record.orderStatus} = 0 then tt.update_time
+          when #{record.orderStatus} = 1 then tt.update_time
+          when #{record.orderStatus} = 2 then tt.task_status
+          when #{record.orderStatus} = 3 then tt.task_status
+    end
+    <if test="record.orderStatus == 1 or record.orderStatus == 3">
+      desc
+    </if>
   </select>
   <select id="getLeaseApplyDetailsByApply" resultType="com.bonus.sgzb.app.domain.LeaseApplyDetails">
     SELECT

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java

@@ -2,6 +2,7 @@ package com.bonus.sgzb.material.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import com.bonus.sgzb.common.core.constant.Constants;
 import com.bonus.sgzb.common.core.utils.DateUtils;
 import com.bonus.sgzb.common.core.utils.ListPagingUtil;
 import com.bonus.sgzb.common.core.utils.ServletUtils;
@@ -162,8 +163,8 @@ public class BackApplyController extends BaseController {
                 return AjaxResult.error("后台退料编号生成异常，请重试!");
             }
             bean.setCode(code);
-            bean.setTaskType(36);
+            bean.setTaskType(Constants.BACK_TASK_TYPE);
-            bean.setTaskStatus("37");
+            bean.setTaskStatus(Constants.BACK_SUBMIT_STATUS);
             // 创建任务
             boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
             if (addTaskResult && bean.getTaskId() != null) {
@@ -176,7 +177,6 @@ public class BackApplyController extends BaseController {
                     if (StringUtils.isNull(bean.getBackApplyInfo())) {
                         return AjaxResult.error("退料任务信息为空，请重新选择后上传!");
                     }
-
                     Integer taskId = bean.getTaskId();
                     // 根据设备所属分公司拆分集合
                     List<List<BackApplyInfo>> backApplyInfoList = CollUtil.groupByField(bean.getBackApplyDetails(), "companyId");
@@ -195,6 +195,15 @@ public class BackApplyController extends BaseController {
                             backApplyInfo.setTaskId(taskId);
                             /*设置设备所属分公司,用于交给哪家审核*/
                             backApplyInfo.setCompanyId(backApplyInfo1.getCompanyId());
+                            if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(101L)) {
+                                backApplyInfo.setStatus("1");
+                            }
+                            if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(102L)) {
+                                backApplyInfo.setStatus("3");
+                            }
+                            backApplyInfo.setDirectAuditBy(1);
+                            backApplyInfo.setDirectAuditTime(DateUtils.getTime());
+                            backApplyInfo.setDirectAuditRemark("系统自动审批");
                             // 创建领料任务，返回领料任务编号
                             addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0;
                             // 领料任务编号
@@ -206,6 +215,8 @@ public class BackApplyController extends BaseController {
                                     for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) {
                                         /*  设置领料任务ID*/
                                         leaseApplyDetails.setId(backApplyInfoId);
+                                        leaseApplyDetails.setRemark("系统自动审核");
+                                        leaseApplyDetails.setAuditNum(leaseApplyDetails.getNum());
                                         // 插入领料任务明细
                                         boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;
                                         if (!addLeaseTaskDetailsResult) {
@@ -251,8 +262,8 @@ public class BackApplyController extends BaseController {
                 return AjaxResult.error("后台退料编号生成异常，请重试!");
             }
             bean.setCode(code);
-            bean.setTaskType(36);
+            bean.setTaskType(Constants.BACK_TASK_TYPE);
-            bean.setTaskStatus("38");
+            bean.setTaskStatus(Constants.BACK_SUBMIT_STATUS);
             bean.setCreateBy(SecurityUtils.getLoginUser().getUserid().toString());
             // 创建任务
             boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
@@ -301,6 +312,7 @@ public class BackApplyController extends BaseController {
                                         leaseApplyDetails.setId(backApplyInfoId);
                                         leaseApplyDetails.setUpdateBy("admin");
                                         leaseApplyDetails.setRemark("系统自动审核");
+                                        leaseApplyDetails.setAuditNum(leaseApplyDetails.getNum());
                                         // 插入领料任务明细
                                         boolean addLeaseTaskDetailsResult = backApplyService.uploadByCq(leaseApplyDetails) > 0;
                                         if (!addLeaseTaskDetailsResult) {
@@ -350,8 +362,8 @@ public class BackApplyController extends BaseController {
                 return AjaxResult.error("后台退料编号生成异常，请重试!");
             }
             bean.setCode(code);
-            bean.setTaskType(36);
+            bean.setTaskType(Constants.BACK_TASK_TYPE);
-            bean.setTaskStatus("37");
+            bean.setTaskStatus(Constants.BACK_SUBMIT_STATUS);
             boolean addTaskResult = backApplyService.insertSelective(bean) > 0;
             // 创建任务
             if (addTaskResult && bean.getTaskId() != null) {
@@ -381,6 +393,15 @@ public class BackApplyController extends BaseController {
                             backApplyInfo.setTaskId(taskId);
                             /*设置设备所属分公司,用于交给哪家审核*/
                             backApplyInfo.setCompanyId(backApplyInfo1.getCompanyId());
+                            if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(101L)) {
+                                backApplyInfo.setStatus("1");
+                            }
+                            if (backApplyInfo1.getCompanyId() != null && backApplyInfo1.getCompanyId().equals(102L)) {
+                                backApplyInfo.setStatus("3");
+                            }
+                            backApplyInfo.setDirectAuditBy(1);
+                            backApplyInfo.setDirectAuditTime(DateUtils.getTime());
+                            backApplyInfo.setDirectAuditRemark("系统自动审批");
                             // 创建领料任务，返回领料任务编号
                             addLeaseTaskResult = backApplyService.insertBackApply(backApplyInfo) > 0;
                             // 领料任务编号
@@ -392,6 +413,8 @@ public class BackApplyController extends BaseController {
                                     for (BackApplyInfo leaseApplyDetails : leaseApplyDetailsList) {
                                         /*  设置领料任务ID*/
                                         leaseApplyDetails.setId(backApplyInfoId);
+                                        leaseApplyDetails.setRemark("系统自动审核");
+                                        leaseApplyDetails.setAuditNum(leaseApplyDetails.getNum());
                                         // 插入领料任务明细
                                         boolean addLeaseTaskDetailsResult = backApplyService.upload(leaseApplyDetails) > 0;
                                         if (!addLeaseTaskDetailsResult) {

sgzb-ui/src/views/base/comeAndGo/index.vue

@@ -102,7 +102,7 @@
             <el-table-column
                 label="单位类型"
                 align="center"
-                prop="typeName"
+                prop="typeId"
                 :show-overflow-tooltip="true"
             />
             <el-table-column
@@ -190,8 +190,11 @@
                     />
                 </el-form-item>
                 <el-form-item label="单位类型" prop="typeId">
-                    <!-- <el-input v-model="form.typeId " placeholder="请选择单位类型" /> -->
+                  <el-radio-group v-model="form.typeId">
-                    <el-select
+                    <el-radio :label="0">内部单位</el-radio>
+                    <el-radio :label="1">外部单位</el-radio>
+                  </el-radio-group>
+<!--                    <el-select
                         v-model="form.typeId"
                         placeholder="请选择单位类型"
                         style="width: 100%"
@@ -205,7 +208,7 @@
                             :value="item.id"
                             v-show="item.status != '1'"
                         ></el-option>
-                    </el-select>
+                    </el-select>-->
                 </el-form-item>
                 <el-form-item label="所属上级" prop="deptId">
                     <treeselect
@@ -371,6 +374,17 @@ export default {
         getList() {
             this.loading = true
             unitInfoAll(this.queryParams).then((response) => {
+                console.log(response)
+                response.rows.forEach(item => {
+                  switch (item.typeId) {
+                    case '0':
+                      item.typeId = '内部单位';
+                      break;
+                    case '1':
+                      item.typeId = '外部单位';
+                      break;
+                  }
+                })
                 this.unitList = response.rows
                 this.total = response.total
                 this.loading = false
@@ -386,6 +400,7 @@ export default {
             this.form = {
                 unitId: undefined,
                 unitName: undefined,
+                typeId: undefined,
                 dictType: undefined,
                 status: '0',
                 remark: undefined,
@@ -434,7 +449,8 @@ export default {
                 if (valid) {
                     this.isLoading = true
                     if (this.form.unitId != undefined) {
-                        updateUnit(this.form)
+                        console.log(this.form)
+                        /*updateUnit(this.form)
                             .then((response) => {
                                 this.$modal.msgSuccess('修改成功')
                                 this.open = false
@@ -443,8 +459,9 @@ export default {
                             })
                             .catch(() => {
                                 this.isLoading = false
-                            })
+                            })*/
                     } else {
+                        console.log(this.form)
                         addUnit(this.form)
                             .then((response) => {
                                 this.$modal.msgSuccess('新增成功')

sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue

@@ -61,7 +61,7 @@
           </el-table-column> -->
         </el-table>
         <div class="order_footer">
-          <div>审核：</div>
+          <!-- <div>审核：</div> -->
           <div>退料：</div>
           <div>操作人：</div>
         </div>

sgzb-ui/src/views/claimAndRefund/return/dialogFormExame.vue

@@ -98,7 +98,7 @@
           </el-table-column>-->
         </el-table>
         <div class="order_footer">
-          <div>审核：</div>
+          <!-- <div>审核：</div> -->
           <div>退料：</div>
           <div>操作人：</div>
         </div>

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

@@ -75,6 +75,24 @@
                 </el-select>
             </el-form-item>
 
+            <el-form-item label="排序管理" prop="orderStatus">
+                <el-select
+                    v-model="queryParams.orderStatus"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in orderStatusList"
+                        :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"
@@ -171,6 +189,12 @@
                 prop="unitName"
                 show-overflow-tooltip
             />
+            <el-table-column
+              label="单位类型"
+              align="center"
+              prop="typeId"
+              show-overflow-tooltip
+            />
             <el-table-column
                 label="领料工程"
                 align="center"
@@ -206,7 +230,6 @@
                 align="center"
                 prop="createTimes"
                 show-overflow-tooltip
-                sortable
             />
             <el-table-column
                 label="任务状态"
@@ -401,6 +424,12 @@ export default {
                 { name: '出库进行中', id: 34 },
                 { name: '完成', id: 35 },
             ],
+            orderStatusList: [
+                { name: '申请时间-升序', id: 0 },
+                { name: '申请时间-降序', id: 1 },
+                { name: '任务状态-升序', id: 2 },
+                { name: '任务状态-降序', id: 3 },
+            ],
         }
     },
     created() {
@@ -427,9 +456,20 @@ export default {
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum,
                 taskStatus: this.queryParams.taskStatus,
+                orderStatus: this.queryParams.orderStatus,
             }
 
             const res = await getLeaseAuditListAll(params)
+            res.data.rows.forEach(item => {
+              switch (item.typeId) {
+                case '0':
+                  item.typeId = '内部单位';
+                  break;
+                case '1':
+                  item.typeId = '外部单位';
+                  break;
+              }
+            })
             this.loading = false
             this.leaseAuditList = res.data.rows
             this.total = res.data.total

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

@@ -73,6 +73,24 @@
                 </el-select>
             </el-form-item>
 
+            <el-form-item label="排序管理" prop="orderStatus">
+                <el-select
+                    v-model="queryParams.orderStatus"
+                    filterable
+                    clearable
+                    style="width: 240px"
+                    placeholder="请选择"
+                >
+                    <el-option
+                        v-for="item in orderStatusList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+
             <el-form-item label="申请日期" prop="time">
                 <el-date-picker
                     v-model="queryParams.time"
@@ -166,6 +184,12 @@
                 prop="unitName"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+              label="单位类型"
+              align="center"
+              prop="typeId"
+              :show-overflow-tooltip="true"
+            />
             <el-table-column
                 label="领料工程"
                 align="center"
@@ -581,6 +605,12 @@ export default {
                 { name: '出库进行中', id: 34 },
                 { name: '完成', id: 35 },
             ],
+            orderStatusList: [
+                { name: '申请时间-升序', id: 0 },
+                { name: '申请时间-降序', id: 1 },
+                { name: '任务状态-升序', id: 2 },
+                { name: '任务状态-降序', id: 3 },
+            ],
         }
     },
     created() {
@@ -614,11 +644,22 @@ export default {
                 souceBy: 0,
                 pageSize: this.queryParams.pageSize,
                 pageNum: this.queryParams.pageNum,
+                orderStatus: this.queryParams.orderStatus,
             }
 
             const res = await getLeaseManageListAll(params)
             this.loading = false
             console.log('getList ============', res, '列表查询')
+            res.data.rows.forEach(item => {
+              switch (item.typeId) {
+                case '0':
+                  item.typeId = '内部单位';
+                  break;
+                case '1':
+                  item.typeId = '外部单位';
+                  break;
+              }
+            })
             this.leaseAuditList = res.data.rows
             // this.leaseAuditList.forEach((item,index)=>{
             //   console.log(item.leaseApplyInfoList)

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

@@ -671,11 +671,7 @@ export default {
             proList: [],
             taskStatusList: [
                 {
-                    name: '待退料审核',
+                    name: '退料已提交',
-                    id: '37',
-                },
-                {
-                    name: '退料审核通过',
                     id: '38',
                 },
                 {
@@ -685,11 +681,7 @@ export default {
                 {
                     name: '退料完成',
                     id: '40',
-                },
+                }
-                {
-                    name: '退料审核驳回',
-                    id: '101',
-                },
             ],
             rowObj: {},
             loadingType: '',

sgzb-ui/src/views/claimAndreturn/return/auditing/index.vue

@@ -655,14 +655,6 @@ export default {
             unitList: [],
             proList: [],
             taskStatusList: [
-                {
-                    name: '待审核',
-                    id: '37',
-                },
-                {
-                    name: '已审核',
-                    id: '38',
-                },
                 {
                     name: '退料核查中',
                     id: '39',
@@ -670,11 +662,7 @@ export default {
                 {
                     name: '退料完成',
                     id: '40',
-                },
+                }
-                {
-                    name: '退料驳回',
-                    id: '101',
-                },
             ],
             loadingList: [],
             loadingTotal: 0,

sgzb-ui/src/views/claimAndreturn/return/receive/component/handlePage.vue

@@ -166,6 +166,12 @@
                 prop="preNum"
                 :show-overflow-tooltip="true"
             />
+            <el-table-column
+                label="已完成退料数量"
+                align="center"
+                prop="finishedBackNum"
+                :show-overflow-tooltip="true"
+            />
             <el-table-column
                 label="待退料数量"
                 align="center"
@@ -182,6 +188,17 @@
                         }}
                     </span>
                 </template>
+                <!-- <template slot-scope="scope">
+                  <el-input
+                    v-model.number="scope.row.num"
+                    placeholder="请输入待退料数量"
+                    type="number"
+                    min="1"
+                    clearable
+                    @input="checkNum(scope.row)"
+                    style="width: 100%"
+                  />
+                </template> -->
             </el-table-column>
             <el-table-column
                 label="操作"
@@ -237,7 +254,7 @@
                         @click="handleBackup(scope.row)"
                         v-if="
                             !isView &&
-                            scope.row.num < scope.row.preNum &&
+                            scope.row.num < (scope.row.preNum - scope.row.finishedBackNum) &&
                             scope.row.backStatus == 0
                         "
                     >
@@ -1467,6 +1484,18 @@ export default {
             this.selChangeList = list
             console.log(list, '复选框选中的数据！')
         },
+
+        // 待退料数量输入框
+        checkNum(row) {
+            // console.log(row)
+            let maxNum = row.preNum
+            if (row.num <= 1) {
+              row.num = 1
+            } else if (row.num >= maxNum) {
+              row.num = maxNum
+            }
+        },
+
     },
     watch: {
         innerVisible: {

sgzb-ui/src/views/claimAndreturn/return/receive/component/home.vue

@@ -326,11 +326,7 @@ export default {
             proList: [],
             taskStatusList: [
                 {
-                    name: '待退料审核',
+                    name: '退料已提交',
-                    id: '37',
-                },
-                {
-                    name: '退料审核通过',
                     id: '38',
                 },
                 {
@@ -340,11 +336,7 @@ export default {
                 {
                     name: '退料完成',
                     id: '40',
-                },
+                }
-                {
-                    name: '退料审核驳回',
-                    id: '101',
-                },
             ],
             rowObj: {},
         }