退回原因修改

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist.vue

@@ -33,8 +33,8 @@
         <el-table-column
                   label="是否为制造商" width="100">
                   <template slot-scope="scope">
-                    <el-tag type="info" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)">非制造商</el-tag>
-                    <el-tag type="success" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)">制造商</el-tag>
+                    <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)">非制造商</el-button>
+                    <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)">制造商</el-button>
                   </template>
         </el-table-column>
         <el-table-column prop="CertSubStatus"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -431,7 +431,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
           } else if (this.formData.Status === '5') {
             this.auditTitle = '集中评审'
             this.auditstepcode = 'PROF_REGULATION'
-            this.shenheForm.AuditorRemark = '集中评审通过'
+            this.shenheForm.AuditorRemark = '集中评审通过。'
           }
           this.inStyle = this.formData.InStyle
           this.getFileList()
@@ -460,7 +460,11 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          if (this.formData.Status === '5') {
+            this.textplaceholder = '请填写审批意见'
+          }else{
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          }
         } else {
           if (this.formData.Status == '5') {
             this.textplaceholder = ''
@@ -520,6 +524,7 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
+          this.radioChange()
         }
       },
       // 获取资质文件
@@ -695,18 +700,32 @@ import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
         } else {
           if (this.formData.Status === '10') {
             this.shenheForm.AuditorRemark = this.backRemark
           }
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
-            .Status !== '5' && this.formData.Status !== '10') {
+            .Status !== '5') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },

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

@@ -444,7 +444,7 @@
           } else if (this.formData.Status === '5') {
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
-            this.shenheForm.AuditorRemark = '集中评审通过'
+            this.shenheForm.AuditorRemark = '集中评审通过。'
           }
           this.inStyle = this.formData.InStyle
           this.getFileList()
@@ -488,7 +488,11 @@
 
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          if (this.formData.Status === '5') {
+            this.textplaceholder = '请填写审批意见'
+          }else{
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          }
         } else {
           if (this.formData.Status == '5') {
             this.textplaceholder = ''
@@ -561,6 +565,7 @@
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
+          this.radioChange()
         }
       },
       getDictOptions () {
@@ -707,18 +712,32 @@
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
         } else {
           if (this.formData.Status === '10') {
             this.shenheForm.AuditorRemark = this.backRemark
           }
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
-            .Status !== '5' && this.formData.Status !== '10') {
+            .Status !== '5') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/techdataopera.vue

@@ -451,7 +451,7 @@
           } else if (_this.formData.Status === '5') {
             this.auditTitle = '集中审批'
             this.auditstepcode = 'PROF_REGULATION'
-            this.shenheForm.AuditorRemark = '集中评审通过'
+            this.shenheForm.AuditorRemark = '集中评审通过。'
           }
           this.inStyle = this.formData.InStyle
           this.getSortList()
@@ -495,7 +495,11 @@
 
       radioChange () {
         if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          if (this.formData.Status === '5') {
+            this.textplaceholder = '请填写审批意见'
+          }else{
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          }
         } else {
           if (this.formData.Status == '5') {
             this.textplaceholder = ''
@@ -570,6 +574,7 @@
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
+          this.radioChange()
         }
       },
       getDictOptions () {
@@ -714,18 +719,32 @@
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
         }  else {
           if (this.formData.Status === '10') {
             this.shenheForm.AuditorRemark = this.backRemark
           }
           if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData
-            .Status !== '5' && this.formData.Status !== '10') {
+            .Status !== '5') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },

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

@@ -766,7 +766,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="请输入备注内容">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于5个字">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -687,7 +687,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="请输入备注内容">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于5个字">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -567,8 +567,8 @@
           <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 :label="1" @change="radioChange">通过</el-radio>
+                <el-radio :label="0" @change="radioChange">退回</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -599,7 +599,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="请输入备注内容">
+              <el-input v-model="shenheForm.AuditorRemark" type="textarea" placeholder="退回意见不能少于5个字">
               </el-input>
             </el-form-item>
           </el-col>

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

@@ -128,9 +128,9 @@
                 <el-table-column
                           label="是否为制造商" width="100">
                           <template slot-scope="scope">
-                            <el-tag type="info" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope)">非制造商</el-tag>
-                            <el-tag type="success" v-else-if="scope.row.IsManufacturer == 1" @click="type_change(scope)">制造商</el-tag>
-                            <span v-else>——</span>
+                              <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)">非制造商</el-button>
+                              <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)">制造商</el-button>
+                              <span v-else>——</span>
                           </template>
                 </el-table-column>
                 <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -572,7 +572,7 @@
       radioChange () {
         if (this.formData.Status == '5') {
           if (this.shenheForm.SuccessStatus === 1) {
-            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+            this.textplaceholder = '请填写审核意见'
             if (this.inStyle == '1') {
               this.shenheForm.AuditorRemark = '集中评审通过。'
             } else if (this.inStyle == '2') {
@@ -596,6 +596,12 @@
             }
             this.shenheForm.AuditorRemark = ''
           }
+        }else {
+          if (this.shenheForm.SuccessStatus === 1){
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          } else{
+              this.textplaceholder = '退回意见不能少于5个字'
+            }
         }
       },
       changeOrgUnit (val) {
@@ -930,6 +936,7 @@
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
+          this.radioChange()
         }
       },
 
@@ -996,6 +1003,13 @@
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
           // if ((!this.auditer || this.auditer === 0) && this.formData.Status == '3') {
           //   this.$message({
           //     type: 'warning',
@@ -1007,13 +1021,20 @@
           if (this.formData.Status === '10') {
             this.shenheForm.AuditorRemark = this.backRemark
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/goodsedit.vue

@@ -587,7 +587,7 @@
       radioChange () {
         if (this.formData.Status == '5') {
           if (this.shenheForm.SuccessStatus === 1) {
-            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+            this.textplaceholder = '请填写审核意见'
             if (this.inStyle == '1') {
               this.shenheForm.AuditorRemark = '集中评审通过。'
             } else if (this.inStyle == '2') {
@@ -611,6 +611,12 @@
             }
             this.shenheForm.AuditorRemark = ''
           }
+        }else {
+          if (this.shenheForm.SuccessStatus === 1){
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          } else{
+              this.textplaceholder = '退回意见不能少于5个字'
+            }
         }
       },
       changeOrgUnit (val) {
@@ -950,6 +956,7 @@
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
+          this.radioChange()
         }
       },
       allocationBtn() {
@@ -1008,13 +1015,20 @@
               }
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          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
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
           // if ((!this.auditer || this.auditer === 0) && this.formData.Status == '3') {
           //   this.$message({
           //     type: 'warning',
@@ -1026,13 +1040,20 @@
           if (this.formData.Status === '10') {
             this.shenheForm.AuditorRemark = this.backRemark
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -569,7 +569,7 @@
       radioChange () {
         if (this.formData.Status == '5') {
           if (this.shenheForm.SuccessStatus === 1) {
-            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+            this.textplaceholder = '请填写审核意见'
             if (this.inStyle == '1') {
               this.shenheForm.AuditorRemark = '集中评审通过。'
             } else if (this.inStyle == '2') {
@@ -593,6 +593,12 @@
             }
             this.shenheForm.AuditorRemark = ''
           }
+        }else {
+          if (this.shenheForm.SuccessStatus === 1){
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          } else{
+              this.textplaceholder = '退回意见不能少于5个字'
+            }
         }
       },
       changeOrgUnit (val) {
@@ -928,6 +934,7 @@
           this.dialogVisible = true
         } else {
           this.dialogMakeSure = true
+          this.radioChange()
         }
       },
 
@@ -994,6 +1001,13 @@
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
           // if ((!this.auditer || this.auditer === 0) && this.formData.Status == '3') {
           //   this.$message({
           //     type: 'warning',
@@ -1005,13 +1019,20 @@
           if (this.formData.Status === '10') {
             this.shenheForm.AuditorRemark = this.backRemark
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5' && this.formData.Status !== '10') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3' && this.formData.Status !== '5') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.formData.Status === '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写退回意见！'
+            })
+            return
+          }
         }
         this.checkstatus()
       },