年审分办 默认通过直接往前走

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -924,14 +924,14 @@
     <el-dialog title="分办" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form label-width="90px" :model="shenheForm" ref="EntityFormref">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批状态">
-              <el-radio-group v-model="shenheForm.SuccessStatus">
-                <el-radio :label="1">通过</el-radio>
-                <el-radio :label="0">退回</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+          <!--  <el-form-item label="审批状态">-->
+          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
+          <!--      <el-radio :label="1">通过</el-radio>-->
+          <!--      <el-radio :label="0">退回</el-radio>-->
+          <!--    </el-radio-group>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -1726,20 +1726,20 @@ export default {
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
-            this.$message({
-              type: 'warning',
-              message: '请填写审批意见！'
-            })
-            return
-          }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
-            this.$message({
-              type: 'warning',
-              message: '审批意见不能低于20个字符！'
-            })
-            return false
-          }
+          // if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '请填写审批意见！'
+          //   })
+          //   return
+          // }
+          // if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '审批意见不能低于20个字符！'
+          //   })
+          //   return false
+          // }
         } else {
           this.shenheForm.AuditorRemark = this.backRemark
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
@@ -1761,6 +1761,7 @@ export default {
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
+        this.shenheForm.SuccessStatus = 1
         console.log('二级单位分办审批结果确认')
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/basicauditoperation.vue

@@ -816,14 +816,14 @@
     <el-dialog title="分办" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form label-width="90px" :model="shenheForm" ref="EntityFormref">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批状态">
-              <el-radio-group v-model="shenheForm.SuccessStatus">
-                <el-radio :label="1">通过</el-radio>
-                <el-radio :label="0">退回</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+          <!--  <el-form-item label="审批状态">-->
+          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
+          <!--      <el-radio :label="1">通过</el-radio>-->
+          <!--      <el-radio :label="0">退回</el-radio>-->
+          <!--    </el-radio-group>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -2278,20 +2278,20 @@
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
-            this.$message({
-              type: 'warning',
-              message: '请填写审批意见！'
-            })
-            return
-          }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
-            this.$message({
-              type: 'warning',
-              message: '审批意见不能低于20个字符！'
-            })
-            return false
-          }
+          // if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '请填写审批意见！'
+          //   })
+          //   return
+          // }
+          // if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '审批意见不能低于20个字符！'
+          //   })
+          //   return false
+          // }
         } else {
           this.shenheForm.AuditorRemark = this.backRemark
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
@@ -2314,6 +2314,7 @@
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
         console.log('二级单位分办审批结果确认')
+        this.shenheForm.SuccessStatus = 1
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {
           return false

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/techoperation.vue

@@ -730,14 +730,14 @@
     <el-dialog title="分办" :visible.sync="dialogSecUnitSeparateVisible" width="520px">
       <el-form label-width="90px" :model="shenheForm" ref="EntityFormref">
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="审批状态">
-              <el-radio-group v-model="shenheForm.SuccessStatus">
-                <el-radio :label="1">通过</el-radio>
-                <el-radio :label="0">退回</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
+          <!--<el-col :span="24">-->
+          <!--  <el-form-item label="审批状态">-->
+          <!--    <el-radio-group v-model="shenheForm.SuccessStatus">-->
+          <!--      <el-radio :label="1">通过</el-radio>-->
+          <!--      <el-radio :label="0">退回</el-radio>-->
+          <!--    </el-radio-group>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 1">
             <el-form-item label="初审人员">
               <!--<el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">-->
@@ -1546,20 +1546,20 @@
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
-            this.$message({
-              type: 'warning',
-              message: '请填写审批意见！'
-            })
-            return
-          }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
-            this.$message({
-              type: 'warning',
-              message: '审批意见不能低于20个字符！'
-            })
-            return false
-          }
+          // if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '请填写审批意见！'
+          //   })
+          //   return
+          // }
+          // if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          //   this.$message({
+          //     type: 'warning',
+          //     message: '审批意见不能低于20个字符！'
+          //   })
+          //   return false
+          // }
         } else {
           this.shenheForm.AuditorRemark = this.backRemark
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
@@ -1581,6 +1581,7 @@
       },
       // 二级单位分办审批结果确认 ⬇
       secUnitSeparateAuditMakeSure () {
+        this.shenheForm.SuccessStatus = 1
         console.log('二级单位分办审批结果确认')
         let checkRes = this.secUnitSeparateAuditParamsCheck()
         if (!checkRes) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -3416,8 +3416,8 @@
             // 保存成功后，初始化数据，变成修改
             this.getEntityById()
             if (this.$refs['WfHistory']) {
-                this.$refs['WfHistory'].getHistoryTask()
-              }
+              this.$refs['WfHistory'].getHistoryTask()
+            }
             this.dialogComSubmitToSeparateUnitVisible = false
             this.$message({
               type: 'success',