Merge branch 'hotfix/Hotfix-zh-309' into develop

src/views/supply/apply/apply_list.vue

@@ -424,10 +424,14 @@
                 </el-button>
                 <el-button
                   v-if="
-                    $checkBtnRole('edit', $route.meta.roles) &&
-                    !scope.row.automaticStatus &&
-                    (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                    scope.row.type === 2
+                    ($checkBtnRole('edit', $route.meta.roles) &&
+                      !scope.row.automaticStatus &&
+                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
+                      scope.row.type === 2) ||
+                    ($checkBtnRole('edit', $route.meta.roles) &&
+                      scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.type == 2)
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"

src/views/supply/apply/components/engin_return_form.vue

@@ -915,9 +915,11 @@ export default {
               this.$errorMsg('请输入申请数量')
               return
             }
-            if (Number(this.goodsList[i].invoiceNum) > 0) {
-              this.$errorMsg('申请数量需为负数')
-              return
+            if (this.goodsList[i].type == 2) {
+              if (Number(this.goodsList[i].invoiceNum) > 0) {
+                this.$errorMsg('申请数量需为负数')
+                return
+              }
             }
           }
           // if(!this.screenForm.warehouse) {

src/views/supply/apply/engin_list.vue

@@ -454,10 +454,14 @@
                 </el-button>
                 <el-button
                   v-if="
-                    !scope.row.automaticStatus &&
-                    $checkBtnRole('edit', $route.meta.roles) &&
-                    (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
-                    scope.row.type === 2
+                    (!scope.row.automaticStatus &&
+                      $checkBtnRole('edit', $route.meta.roles) &&
+                      (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'FAIL') &&
+                      scope.row.type === 2) ||
+                    ($checkBtnRole('edit', $route.meta.roles) &&
+                      scope.row.automaticStatus &&
+                      scope.row.examineStatus === 'SAVE' &&
+                      scope.row.type == 2)
                   "
                   type="text"
                   @click="toReturnForm(scope.row)"