页面跳转 按钮限制 变色 资质不可变

src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -1225,7 +1225,7 @@ func (this *InfoChangeController) InfoAudit() {
 	} else if infomodel.Status == suppliercert.CENT_AUDIT_STATUS {
 		status = suppliercert.ALL_PASE_STATUS
 		step = 3
-		backstatus = suppliercert.NO_THIRD_TRIAL_STATUS
+		backstatus = suppliercert.NO_CENT_AUDIT_STATUS
 	}
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM

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

@@ -80,7 +80,7 @@
           <el-col :span="12">
             <el-form-item label="资质名称" required>
               <!-- <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型"></el-input> -->
-              <el-select v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" size="medium">
+              <el-select v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" :disabled="IsMust">
                 <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
                 </el-option>
               </el-select>
@@ -182,7 +182,7 @@
         SubClassIds: [],
         SupplierCertId: 0,
         InStyle: '1',
-
+        IsMust:false,
         businessList: [],
         subfileList: [],
         techList: [],
@@ -446,6 +446,7 @@
       },
       showDialog () {
         // this.doclist = []
+        this.IsMust = false
         this.Title = '新增文件'
         this.SubfileForm.Id = ''
         this.SubfileForm.SupplierId = this.SupplierId
@@ -465,6 +466,7 @@
         this.visible = true
       },
       openDialog (val) {
+        this.IsMust = true
         this.Title = '上传文件'
         this.SubfileForm.Id = val.Id
         this.SubfileForm.SupplierId = val.SupplierId

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

@@ -826,7 +826,7 @@
               return
             }
           }
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.AnnualStatus && this.AnnualStatus !== '10') {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
@@ -834,7 +834,7 @@
             return
           }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5) {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'

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

@@ -592,6 +592,7 @@
         chooseAuditorVisible: false,
         myitemsshow: false,
         auditstepcode: '',
+        scrollTop:'',
         auditBtn: false,
         AccessCardNolist: [],
         AccessCardNo1: '',
@@ -883,6 +884,7 @@
       this.serviceId = this.$route.params.opera
       this.InfoStatus = this.$route.query.InfoStatus
       this.infoId = this.serviceId
+      console.log(this.infoId, 'this.infoId')
       this.initDatas()
       this.auditget()
       this.getDictOptions()
@@ -1219,7 +1221,6 @@
           })
       },
       bfdataformat(val) {
-        //debugger
         if (val.SelectItem == 'SpecTypeCode') {
           if (val.BeChangeInfo == '1') {
             return '一般外部'
@@ -1254,8 +1255,8 @@
           } else if (val.BeChangeInfo === '5000-01-01T23:59:59+08:00') {
             return '永久'
           } else {
-            val = val.replace('T', ' ')
-            return val.substring(0, 10)
+            let val2 = val.BeChangeInfo.replace('T', ' ')
+            return val2.substring(0, 10)
           }
         } else {
           return val.BeChangeInfo
@@ -1297,8 +1298,8 @@
           } else if (val.ChangeInfo == '5000-01-01T23:59:59+08:00') {
             return '永久'
           } else {
-            val = val.replace('T', ' ')
-            return val.substring(0, 10)
+            let val2 = val.ChangeInfo.replace('T', ' ')
+            return val2.substring(0, 10)
           }
         } else {
           return val.ChangeInfo
@@ -1471,7 +1472,12 @@
       },
       radioChange() {
         if (this.shenheForm.SuccessStatus === 1) {
-          this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          
+          if(this.InfoStatus == '5'){
+            this.textplaceholder = ''
+          }else{
+            this.textplaceholder = '审核意见须具体、明确（含企业资质、资信、能力等内容，不少于20字）'
+          }
         } else {
           this.textplaceholder = '退回意见不能少于5个字'
         }
@@ -1496,15 +1502,22 @@
       //审核通过
       makeSure() {
         if (this.shenheForm.SuccessStatus === 1) {
-          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.formData.Status !== '3') {
+          if (this.shenheForm.AuditorRemark.trim().length < 20 && this.InfoStatus && this.InfoStatus !== '3' && this.InfoStatus !== '5') {
             this.$message({
               type: 'warning',
               message: '审批意见不能低于20个字符！'
             })
             return
           }
+          if (this.shenheForm.AuditorRemark.trim().length < 1 && this.InfoStatus && this.InfoStatus == '5') {
+            this.$message({
+              type: 'warning',
+              message: '请填写审批意见！'
+            })
+            return
+          }
         } else {
-          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.formData.Status !== '3') {
+          if (this.shenheForm.AuditorRemark.trim().length < 5 && this.InfoStatus && this.InfoStatus !== '3') {
             this.$message({
               type: 'warning',
               message: '退回意见不能低于5个字符！'
@@ -1585,6 +1598,10 @@
     .el-input__inner {
       background-color: wheat;
     }
+
+    .el-textarea__inner {
+      background-color: wheat;
+    }
   }
 
 </style>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -14,11 +14,11 @@
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="itemsshow">查看变更项</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px"
-            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1|| InfoStatus == -2 || InfoStatus == -10) && !butnab" @click="saveinfochange">保存
+            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1|| InfoStatus == -2 || InfoStatus == -10 ) && !butnab" @click="saveinfochange">保存
           </el-button>
           <!-- <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button> -->
           <el-button type="primary" size="mini" @click="submitInfoChange"
-            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2 || InfoStatus == -10) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
+            v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2 || InfoStatus == -10 || InfoStatus == -5) && !butnab && authUser.Profile.IsCompanyUser == 1">提交分办
           </el-button>
           <el-button type="primary" size="mini" @click="submitApplyBtn"
                      v-if="(InfoStatus == 0 || InfoStatus == '' || InfoStatus == -1 || InfoStatus == -2 || InfoStatus == -10) && authUser.Profile.IsCompanyUser == 0 ">提交申请
@@ -1366,6 +1366,7 @@
             .then(res => {
               this.copyformdata = _.cloneDeep(res.data[0])
               this.formData = res.data[1]
+              console.log(res,"aaaaaaaaa")
               this.CityAry = []
               this.CityAry.push(this.formData.Province)
               this.CityAry.push(this.formData.City)
@@ -1633,8 +1634,8 @@
           } else if (val.BeChangeInfo === '5000-01-01T23:59:59+08:00') {
             return '永久'
           } else {
-            val = val.replace('T', ' ')
-            return val.substring(0, 10)
+            let val2 = val.BeChangeInfo.replace('T', ' ')
+            return val2.substring(0, 10)
           }
         } else {
           return val.BeChangeInfo
@@ -1676,8 +1677,8 @@
           } else if (val.ChangeInfo == '5000-01-01T23:59:59+08:00') {
             return '永久'
           } else {
-            val = val.replace('T', ' ')
-            return val.substring(0, 10)
+            let val2 = val.ChangeInfo.replace('T', ' ')
+            return val2.substring(0, 10)
           }
         } else {
           return val.ChangeInfo

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/index.vue

@@ -378,7 +378,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
       editData (row) {
         let _this = this
         _this.$router.push({
-          path: `/oilsupplier/supplierappend/` + (row.AppendType === '01' ? '1' : (row.AppendType === '02' ? '2' : '3')) + `/` + (row.AppendType === '01' ? 'goodsoperation' : (row.AppendType === '02' ? 'bassicoperation' : 'techdataopera')),
+          path: `/oilsupplier/supplierappend/` + (row.AppendType === '01' ? '1' : (row.AppendType === '02' ? '2' : '3')) + `/` + (row.AppendType === '01' ? 'goodsdataopera' : (row.AppendType === '02' ? 'basisdataopera' : 'techdataopera')),
           query: {
             Id: row.Id,
             editFlag: 1 // 编辑标记： 1 修改，0 不修改

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierps/index.vue

@@ -44,7 +44,13 @@
       <el-table :data="entityList" id="rebateSetTable" size="mini" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" width="120" align="center" fixed="right">
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/supplieraudit/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId+'&jzps=1'">
+            <router-link :to="'/oilsupplier/supplieraudit/' + scope.row.Id + '/goodsedit?certid=' + scope.row.CertId+'&jzps=1'" v-if="scope.row.SupplierTypeName == '物资类'">
+              <el-button type="text" title="集中评审"  icon="el-icon-edit" size="mini">集中评审</el-button>
+            </router-link>
+            <router-link :to="'/oilsupplier/supplieraudit/' + scope.row.Id + '/techedit?certid=' + scope.row.CertId+'&jzps=1'" v-if="scope.row.SupplierTypeName == '技术服务类'">
+              <el-button type="text" title="集中评审"  icon="el-icon-edit" size="mini">集中评审</el-button>
+            </router-link>
+            <router-link :to="'/oilsupplier/supplieraudit/' + scope.row.Id + '/basisedit?certid=' + scope.row.CertId+'&jzps=1'" v-if="scope.row.SupplierTypeName == '基建类'">
               <el-button type="text" title="集中评审"  icon="el-icon-edit" size="mini">集中评审</el-button>
             </router-link>
           </template>