修改仓管入库驳回操作

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/inboundDetails.vue

@@ -430,7 +430,7 @@
 
     data() {
       return {
-				isEdit: true,
+				isEdit: true, // 是否可以编辑(货位和质检状态)
 				showTable: true, // 解决set数组Table不刷新问题
         title: '信息',
         qualityStatus: {
@@ -443,48 +443,14 @@
           1: '不合格',
           3: '让步接收'
         }, // 质检结果 0合格 1不合格 3让步接收
-        selectionChangeList: [],
-        selectionChangeList2: [],
-        selectionChangeList3: [],
-        metaList: [],
-        infoData: {},
-        warehousingMaterialList: [],
-        materialCodeReqList: [],
-        tableData2: [],
-        fromUserList: [],
-
-        num: 1,
-        stepsList: [
-          { status: 'Done', nodeName: '创建' },
-          { status: 'Done', nodeName: '暂存', time: '2023-01-06' },
-          { status: 'Done', nodeName: '收货中' },
-          { status: 'Processing', nodeName: '已收货' }
-        ],
-        list: [
-          {
-            name: '紧急',
-            color: 'red'
-          },
-          {
-            name: '重要',
-            color: 'blue'
-          },
-          {
-            name: '已催办',
-            color: 'red'
-          }
-        ],
-        stepsTitle: '已完成',
-        stepsStatus: 'success',
-        active: 0
+        infoData: {}, // 上传入库信息
+        warehousingMaterialList: [], // 物品列表
+        materialCodeReqList: [], // 包装列表
+				metaList: [], // 物料列表
       };
     },
-    watch: {},
     computed: {
       ...mapGetters(['getDictValue'])
-      // tableHeader() {
-      //   return tableHeader(this.infoData?.extInfo?.assetType);
-      // }
     },
     methods: {
 			// 仓库选择
@@ -754,19 +720,6 @@
         console.log('------------------');
         console.log(this.infoData);
       },
-      handleSave() {
-        if (
-          !this.selectionChangeList2.length &&
-          !this.selectionChangeList3.length
-        )
-          return this.$message.warning('请选择退货明细');
-        let params = [
-          ...this.selectionChangeList2,
-          ...this.selectionChangeList3
-        ];
-        this.$emit('saveDate', params);
-        this.cancel();
-      },
       ...mapActions('dict', ['requestDict'])
     }
   };
@@ -780,133 +733,6 @@
     word-break: break-all;
     white-space: nowrap;
   }
-  .stepsStatus {
-    width: 40%;
-    margin: 0 auto;
-  }
-
-  .p20 {
-    padding: 20px;
-  }
-
-  .flex {
-    display: flex;
-  }
-
-  .title {
-    justify-content: space-between;
-    border-bottom: 1px solid #ccc;
-    padding-bottom: 5px;
-
-    span {
-      font-size: 16px;
-    }
-
-    .col {
-      padding-left: 40px;
-      font-size: 14px;
-      color: #aaaaaa;
-    }
-  }
-
-  .degree {
-    margin-right: 10px;
-    padding: 0px 15px;
-    color: #fff;
-    font-size: 13px;
-    line-height: 23px;
-    border-radius: 23px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-
-    span {
-      width: 5px;
-      height: 5px;
-      border-radius: 100%;
-      margin-right: 6px;
-      background-color: #fff;
-    }
-  }
-
-  .red {
-    background-color: rgb(163, 0, 20);
-  }
-
-  .blue {
-    background-color: #1989fa;
-  }
-
-  .createdInfo {
-    justify-content: space-around;
-    margin-top: 10px;
-    font-size: 14px;
-
-    .col {
-      color: #6e6e6e;
-      padding-right: 10px;
-    }
-  }
-
-  .mt40 {
-    margin-top: 40px;
-  }
-
-  .custSteps {
-    margin-top: 20px;
-    margin-left: 70px;
-
-    .box {
-      width: 158px;
-      border: 1px solid #ccc;
-      padding: 10px;
-      flex-direction: row;
-      flex-wrap: wrap;
-      // justify-content: space-between;
-      font-size: 12px;
-      color: #9e9e9e;
-
-      .x {
-        width: 20px;
-        height: 15px;
-        margin-right: 5px;
-      }
-
-      .q {
-        background-color: #d0e4d5;
-      }
-
-      .b {
-        background-color: #1989fa;
-      }
-
-      .g {
-        background-color: #157a2c;
-      }
-
-      .r {
-        background-color: #a30014;
-      }
-
-      .a {
-        align-items: center;
-        margin-bottom: 10px;
-      }
-
-      .mr10 {
-        margin-right: 10px;
-      }
-
-      .mb0 {
-        margin-bottom: 0;
-      }
-    }
-
-    .stepsInfo {
-      // flex: 1;
-      width: 483px;
-    }
-  }
 
   .mt20 {
     margin-top: 20px;
@@ -915,87 +741,4 @@
   .content-detail {
     overflow: hidden;
   }
-
-  .executor {
-    font-size: 14px;
-
-    .col {
-      color: #6e6e6e;
-      padding-right: 10px;
-    }
-  }
-
-  .result {
-    justify-content: space-around;
-  }
-
-  .mr20 {
-    margin-right: 20px;
-  }
-
-  .details {
-    font-size: 14px;
-    margin-bottom: 10px;
-  }
-
-  .customSteps {
-    margin-top: 40px;
-    font-size: 14px;
-    margin-left: 80px;
-
-    .time {
-      font-size: 12px;
-      color: #6e6e6e;
-      margin-right: 20px;
-      position: relative;
-
-      &::after {
-        content: '';
-        width: 1px;
-        height: 100%;
-        background-color: #157a2c;
-        position: absolute;
-        right: -26px;
-      }
-    }
-
-    .flex:last-child {
-      .time {
-        &::after {
-          display: none;
-        }
-      }
-    }
-
-    .round {
-      margin-right: 20px;
-      width: 10px;
-      height: 10px;
-      border-radius: 100%;
-      background-color: #157a2c;
-      position: relative;
-
-      span {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 4px;
-        height: 4px;
-        background-color: #fff;
-        border-radius: 100%;
-        transform: translate(-2px, -2px);
-      }
-    }
-
-    .text {
-      .info {
-        margin-top: 10px;
-        width: 955px;
-        background-color: #f0f3f3;
-        overflow: hidden;
-        padding: 10px;
-        margin-bottom: 10px;
-      }
-    }
-  }
 </style>

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/submit.vue

@@ -131,7 +131,8 @@
         this.$refs.formRef.validate(async (validate) => {
           if ((!validate || !data) && !!pass)
             return this.$message.warning('有必填项未填，请检查');
-          if (this.permissionType == 'update') await saleReturnUpdateAPI(data);
+          if (this.permissionType == 'update' && !!pass)
+            await saleReturnUpdateAPI(data);
           let variables = {
             pass: !!pass
           };
@@ -140,7 +141,7 @@
               this.form.userId;
           }
           // 销售退货入库
-          if (this.taskDefinitionKey === 'storeman') {
+          if (this.taskDefinitionKey === 'storeman' && !!pass) {
             // 获取销售退货入库信息
             let storageData = await this.getReturnStorage();
             // 是否已经入库
@@ -158,7 +159,7 @@
                 }
               });
             } else {
-              // 入库来源storageSource 0-正常  1-外部
+              // 入库来源storageSource 0-正常  1-外部(外部跳过内部审核流程)
               storageData.storageSource = 1;
               // 获取货位信息(判断货位信息是否填写)
               let houseListLength = storageData.outInDetailAddPOList.map(