前端: 工作流流程图大小及位置调整。年审的审批意见的长度限制降低到长度2及相关提示文案

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

@@ -7,7 +7,8 @@
     </el-breadcrumb>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>年审基本信息表</span>
+        <span v-if="formData.SupplierName !== ''">{{formData.SupplierName}}</span>
+        <span v-else>年审基本信息表</span>
         <span style="float: right;">
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-popover>
@@ -772,7 +773,7 @@
 
 
         <el-tab-pane label="审批流程">
-          <el-card class="box-card" style="height: 800px">
+          <el-card class="box-card">
             <div slot="header" class="clearfix">
               <span>审批流程</span>
             </div>
@@ -911,7 +912,7 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 0">
             <el-form-item label="退回原因">
-              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于5个字">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于2个字">
               </el-input>
             </el-form-item>
           </el-col>
@@ -969,7 +970,7 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 0">
             <el-form-item label="退回原因">
-              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于5个字">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于2个字">
               </el-input>
             </el-form-item>
           </el-col>
@@ -1243,7 +1244,7 @@ export default {
         auditerName: '',
         fushenauditer: '',
         auditBtn: false,
-        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
+        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容）',
         audithistoryshow: false,
         dialogProfAudit: false,
         canUpdateSupplier: true,
@@ -1773,10 +1774,10 @@ export default {
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '审批意见不能低于20个字符！'
+              message: '审批意见不能少于2个字！'
             })
             return false
           }
@@ -1789,10 +1790,10 @@ export default {
             })
             return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '退回意见不能少于2个字！'
             })
             return
           }
@@ -2033,9 +2034,9 @@ export default {
       },
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容）'
         } else {
-          this.textplaceholder = '退回意见不能少于5个字'
+          this.textplaceholder = '退回意见不能少于2个字'
         }
         if (this.AnnualStatus === '7' && this.shenheForm.SuccessStatus === 1) {
           this.shenheForm.AuditorRemark = '入库审批已通过。'
@@ -2615,13 +2616,14 @@ export default {
             this.isAccess()
             this.getstatus(this.AnnualId)
             // this.$router.push('/')
+            this.btnLoading = false
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             })
+            this.btnLoading = false
           }
-          this.btnLoading = false
         }).catch(err => {
           this.dialogVisibleBack = false
           this.btnLoading = false
@@ -2656,14 +2658,15 @@ export default {
                 type: 'success',
                 message: res.data.message
               })
+              this.btnLoading = false
             } else {
               this.$message({
                 type: 'warning',
                 message: res.data.message
               })
+              this.btnLoading = false
             }
           })
-          this.btnLoading = false
         }).catch(() => {
           this.$message({
             type: 'info',
@@ -2718,20 +2721,20 @@ export default {
       },
       commonAuditParamsCheck () {
         if (this.shenheForm.SuccessStatus === 1) {
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 2 && this.AnnualStatus && this.AnnualStatus !== '10') {
             if (this.AnnualStatus !== '5' && this.AnnualStatus !== '7') {
               this.$message({
                 type: 'warning',
-                message: '审批意见不能低于20个字符！'
+                message: '审批意见不能少于2个字！'
               })
               return false
             }
           }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '退回意见不能少于2个字！'
             })
             return false
           }
@@ -2762,20 +2765,20 @@ export default {
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 2 && this.AnnualStatus && this.AnnualStatus !== '10') {
             if (this.AnnualStatus !== '5') {
               this.$message({
                 type: 'warning',
-                message: '审批意见不能低于20个字符！'
+                message: '审批意见不能少于2个字！'
               })
               return
             }
           }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '退回意见不能少于2个字！'
             })
             return
           }

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

@@ -800,7 +800,7 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 0">
             <el-form-item label="退回原因">
-              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于5个字">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于2个字">
               </el-input>
             </el-form-item>
           </el-col>
@@ -858,7 +858,7 @@
           </el-col>
           <el-col :span="24" v-if="shenheForm.SuccessStatus == 0">
             <el-form-item label="退回原因">
-              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于5个字">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于2个字">
               </el-input>
             </el-form-item>
           </el-col>
@@ -1122,7 +1122,7 @@
         auditerName: '',
         fushenauditer: '',
         auditBtn: false,
-        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）',
+        textplaceholder: '审核意见须具体、明确（含企业资质、资信、能力等内容）',
         audithistoryshow: false,
         dialogProfAudit: false,
         canUpdateSupplier: true,
@@ -1655,9 +1655,9 @@
       },
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容）'
         } else {
-          this.textplaceholder = '退回意见不能少于5个字'
+          this.textplaceholder = '退回意见不能少于2个字'
         }
       },
       SetFormData (fdata) {
@@ -2306,20 +2306,20 @@
       },
       commonAuditParamsCheck () {
         if (this.shenheForm.SuccessStatus === 1) {
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 2 && this.AnnualStatus && this.AnnualStatus !== '10') {
             if (this.AnnualStatus !== '5') {
               this.$message({
                 type: 'warning',
-                message: '审批意见不能低于20个字符！'
+                message: '审批意见不能少于2个字！'
               })
               return false
             }
           }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '退回意见不能少于2个字！'
             })
             return false
           }
@@ -2435,10 +2435,10 @@
             })
             return
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '审批意见不能低于20个字符！'
+              message: '审批意见不能少于2个字！'
             })
             return false
           }
@@ -2450,10 +2450,10 @@
             })
             return false
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '退回意见不能少于2个字！'
             })
             return
           }
@@ -2530,20 +2530,20 @@
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 2 && this.AnnualStatus && this.AnnualStatus !== '10') {
             if (this.AnnualStatus !== '5') {
               this.$message({
                 type: 'warning',
-                message: '审批意见不能低于20个字符！'
+                message: '审批意见不能少于2个字！'
               })
               return
             }
           }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5) {
+          if (this.shenheForm.AuditorRemark.trim().length < 2) {
             this.$message({
               type: 'warning',
-              message: '退回意见不能低于5个字符！'
+              message: '退回意见不能少于2个字！'
             })
             return
           }