Merge remote-tracking branch 'origin/master' into dev

src/views/assets/addAssetsOrder.vue

@@ -914,9 +914,10 @@ export default {
         handleCreate() {
             this.$refs.assetsForm.validate(valid => {
                 if (valid) {
-                    if (this.assetsForm.id) {
+                    if (this.assetsForm.id && !this.$route.query.reorder) {
                         this.updateOrder();
                     } else {
+                        this.assetsForm.id = null;
                         this.addOrder();
                     }
                 }

src/views/assets/orderDetail.vue

@@ -1985,9 +1985,9 @@ export default {
               return;
             }
             break;
-          case 'RECHECK_REPORT':
-            this.flowDoFourthCheck();
-            break;
+          // case 'RECHECK_REPORT':
+          //   this.flowDoFourthCheck();
+          //   break;
         }
         callback(verify);
       }
@@ -2531,6 +2531,7 @@ export default {
     },
     // 提交节点
     commit(state) {
+      this.flowDoFourthCheck();
       this.$refs.board.commit(state);
     },
     getPreviousNode(pNode) {

src/views/assets/terminateList.vue

@@ -242,7 +242,8 @@ export default {
                     back: '/assets/terminateList',
                     couldEdit: true,
                     couldBack: true,
-                    disabledStatus: false
+                    disabledStatus: false,
+                    reorder: true
                 }
             })
         },

src/views/income/assets/declareDetail.vue

@@ -72,7 +72,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" :span="6"
             v-if="declareForm.businessType === 'COMMISSION_DECLARE_ASSET_EVALUATE'">
-            <el-form-item label="提成下限：" prop="definedLowLimitAmount" label-width="180px" class="postInfo-container-item">
+            <el-form-item label="提成下限：" prop="definedLowLimitAmount" label-width="140px" class="postInfo-container-item">
               <el-input v-model="declareForm.definedLowLimitAmount" type="number"
                 :disabled="declareForm.businessType !== 'COMMISSION_DECLARE_ASSET_EVALUATE' || nodeBusinessInfo.nodeCode !== 'DEPARTMENT_LEADER_CHECK' || !couldEdit">
                 <template #suffix>