前后:省市区颜色;信息变更资质文件不展示增项,年审文件

src/dashoo.cn/backend/api/business/oilsupplier/supplierfile/supplierfile.go

@@ -14,7 +14,7 @@ type OilSupplierFile struct {
 	NeedFileType      string    `xorm:"VARCHAR(50)"`
 	NeedFileCode      string    `xorm:"VARCHAR(20)"`
 	FileType          int       `xorm:"INT(10)"`
-	SupType           int       `xorm:"INT(10)"`
+	SupType           int       `xorm:"INT(10)" comment('类型：1.准入 2.增项 3.增项审核通过添加到准入 4 信息变更添加 5 信息变更审核通过')`
 	FileExt           string    `xorm:"VARCHAR(10)"`
 	FileName          string    `xorm:"VARCHAR(50)"`
 	EffectDate        time.Time `xorm:"DATETIME"`

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

@@ -1693,7 +1693,7 @@ func (this *AnnualAuditController) AddQualChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！不能重复添加"
+		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
@@ -1906,7 +1906,7 @@ func (this *AnnualAuditController) AddAppChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！不能重复添加"
+		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

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

@@ -10,6 +10,7 @@ import (
 	"dashoo.cn/backend/api/business/oilsupplier/tableheader"
 	"encoding/json"
 	"fmt"
+	. "github.com/linxGnu/goseaweedfs"
 	"github.com/tealeg/xlsx"
 	"log"
 	"os"
@@ -29,7 +30,7 @@ import (
 	"dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
-	. "github.com/linxGnu/goseaweedfs"
+	_ "github.com/linxGnu/goseaweedfs"
 )
 
 type OilGoodsAptitudeController struct {

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

@@ -200,6 +200,7 @@ func (this *QualChangeController) FileList() {
 		}
 	}
 	SupplierId := this.GetString("SupplierId")
+	SupType := this.GetString("SupType")
 	MInfoId := this.GetString("MInfoId")
 	if SupplierId != "" {
 		where = where + " and a.SupplierId = '" + SupplierId + "'"
@@ -208,6 +209,10 @@ func (this *QualChangeController) FileList() {
 	if SupplierTypeCode != "" {
 		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
 	}
+	if SupType != "" {
+		// 信息变更不获取增项和年审 审核中的资质文件,一个资质只能参与一个流程
+		where = where + " and a.SupType in (1,3,4,5)"
+	}
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, MInfoId)
 	var datainfo DataInfo
 	datainfo.Items = list
@@ -272,7 +277,7 @@ func (this *QualChangeController) AuditFileList() {
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	if SupplierTypeCode != "" {
-		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
+		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "') and a.SupType in (1,3,4,5)"
 	}
 	//where = where + " and (b.FileUrl != '' OR a.IsDelete = 1)"
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilQualChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, MInfoId)
@@ -575,7 +580,7 @@ func (this *QualChangeController) AddQualChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！不能重复添加"
+		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

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

@@ -2886,25 +2886,25 @@ func (this *OilSupplierController) CheckSupplierFile() {
 	supplierService.GetEntityById(file.SupplierId, &supplierEntity)
 	//获取准入信息表
 	var supplierCertEntity []suppliercert.OilSupplierCert
+	// 查询出已有哪些资质
+	var tableheaderList []qualchange.OilQualChangeDetail1
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId) + " and SupType in (1,3,4,5)"
+	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
+	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
+	var companyHasHeaders string
+	for _, tableheader := range tableheaderList {
+		companyHasHeaders += tableheader.NeedFileType + ","
+	}
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	filesvc := supplierfile.GetSupplierfileService(utils.DBE)
+	mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
+
 	supplierService.GetEntitysByWhere("OilSupplierCert", "SupplierId = "+strconv.Itoa(file.SupplierId), &supplierCertEntity)
 	for _, cert := range supplierCertEntity {
 		//对准入范围的判断
 		var certSubList []suppliercertsub.OilSupplierCertSub
 		certsubService := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
-		certsubService.GetListByCertId(strconv.Itoa(cert.Id), &certSubList)
-
-		// 查询出已有哪些资质
-		var tableheaderList []qualchange.OilQualChangeDetail1
-		fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId)
-		svcHeader := tableheader.GetTableHeaderService(utils.DBE)
-		svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
-		var companyHasHeaders string
-		for _, tableheader := range tableheaderList {
-			companyHasHeaders += tableheader.NeedFileType + ","
-		}
-		paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
-		filesvc := supplierfile.GetSupplierfileService(utils.DBE)
-		mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
+		certsubService.GetEntitysByWhere(OilSupplierCertSubName, "SupplierCertId = " + strconv.Itoa(cert.Id) + " and Type != '2'", &certSubList)
 
 		idString := ""
 		idString1 := ""
@@ -3035,7 +3035,7 @@ func (this *OilSupplierController) CheckSupplierFileNew() {
 
 	// 查询出已有哪些资质
 	var tableheaderList []qualchange.OilQualChangeDetail1
-	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId)
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId)  + " and SupType in (1,2,3,5)"
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string
@@ -3390,7 +3390,14 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 
 	// 查询出已有哪些资质
 	var tableheaderList []qualchange.OilQualChangeDetail1
-	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId)
+	whereInfoFile := ""
+	if file.CertId == "0"{
+		// 信息变更 不获取 增项和年审审核中的数据
+		whereInfoFile = " and SupType in (1,3,4,5)"
+	} else {
+		whereInfoFile = " and SupType in (1,2,3,5)"
+	}
+	fileSql := "SELECT * from OilSupplierFile WHERE SupplierId = " + strconv.Itoa(file.SupplierId) + whereInfoFile
 	svcHeader := tableheader.GetTableHeaderService(utils.DBE)
 	svcHeader.DBE.SQL(fileSql).Find(&tableheaderList)
 	var companyHasHeaders string
@@ -3401,19 +3408,25 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 	filesvc := supplierfile.GetSupplierfileService(utils.DBE)
 	mergerCertSkipField := paramSvc.GetBaseparameterMessage("GFGL", "paramset", "MergerCertSkipFieldName")
 
-	for _, cert := range certList {
+	for _,cert := range certList {
 		if file.CertId != "0" && strconv.Itoa(cert.Id) != file.CertId {
 			continue
 		}
+		whereInfo := ""
+		if file.CertId == "0"{
+			// 信息变更 不获取 增项审核中的数据
+			whereInfo = " and Type != '2'"
+		}
 
 		var certSubList2 suppliercertsub.OilSupplierCertSub
 		certSubList2.LackFile = ""
 		certSubList2.IsQuestion = 0
-		svcHeader.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSubList2, []string{"LackFile", "IsQuestion"}, "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id)+" and SupplierCertId = "+strconv.Itoa(cert.Id))
+		svcHeader.UpdateEntityBywheretbl(OilSupplierCertSubName, &certSubList2, []string{"LackFile", "IsQuestion"}, "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id)+" and SupplierCertId = "+strconv.Itoa(cert.Id) + whereInfo)
 
 		//对准入范围的判断
 		var certSubList []suppliercertsub.OilSupplierCertSub
 		certsubService.GetListByCertId(strconv.Itoa(cert.Id), &certSubList)
+		certsubService.GetEntitysByWhere(OilSupplierCertSubName, "SupplierCertId = " + strconv.Itoa(cert.Id) + whereInfo, &certSubList)
 		idString := ""
 		idString1 := ""
 		for i := 0; i < len(certSubList); i = i + 1000 {
@@ -3524,10 +3537,11 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 			}
 		}
 
+
 	}
 	var certSubList1 []suppliercertsub.OilSupplierCertSub
 	var total int64
-	where3 := "IsQuestion = 2 and SupplierId = " + strconv.Itoa(supplierEntity.Id)
+	where3 := "IsQuestion = 2 and SupplierId = "+strconv.Itoa(supplierEntity.Id)
 	if file.FileName != "" {
 		where3 += " and LackFile like '%" + file.FileName + "%'"
 	}
@@ -3535,7 +3549,7 @@ func (this *OilSupplierController) CheckSupplierFileList() {
 		where3 += " and Name like '%" + file.SubName + "%'"
 	}
 	if file.CertId != "0" {
-		where3 += " and SupplierCertId = " + file.CertId
+		where3 += " and SupplierCertId = "+file.CertId
 	}
 	total = certsubService.GetPagingEntitiesWithOrderBytbl("", file.CurrentPage, file.Size, "Id", true, &certSubList1, where3)
 

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

@@ -1801,7 +1801,7 @@ func (this *OilSupplierCertAppendController) AddAppChange() {
 	svc.GetEntityByWhere(BaseTableHeader, where1, &tableHeader)
 
 	if has {
-		errinfo.Message = "操作失败！不能重复添加"
+		errinfo.Message = "操作失败！该资质已添加或正在参与其他流程审核"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
 		this.ServeJSON()

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

@@ -1034,7 +1034,7 @@ func (this *OilSupplierCertAppendSubController) FileList() {
 	}
 	SupplierTypeCode := this.GetString("SupplierTypeCode")
 	if SupplierTypeCode != "" {
-		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "')"
+		where = where + " and a.SupplierTypeCode in ( '000', '" + SupplierTypeCode + "') and a.SupType in (1,2,3,5)"
 	}
 	total := svc.GetQualPagingEntities(OilSupplierFileName, OilAppendChangeDetailName, page.CurrentPage, page.Size, orderby, asc, &list, where, MInfoId)
 	var datainfo DataInfo

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

@@ -918,6 +918,9 @@
   }
 </script>
 <style>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
 .formDataInfo .el-input__inner[readonly]{
     border-color:#DCDFE6;
 }

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

@@ -1747,6 +1747,9 @@ export default {
 }
 </script>
 <style>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
 .formDataInfo .el-input__inner[readonly] {
   border-color: #dcdfe6;
 }

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

@@ -934,6 +934,9 @@
   }
 </script>
 <style>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
 .formDataInfo .el-input__inner[readonly]{
     border-color:#DCDFE6;
 }

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

@@ -2543,6 +2543,9 @@
   }
 </script>
 <style lang='scss'>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2708,6 +2708,9 @@
   }
 </script>
 <style lang='scss'>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2530,6 +2530,9 @@
   }
 </script>
 <style lang='scss'>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2899,6 +2899,10 @@ export default {
 </script>
 
 <style lang='scss'>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
+
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2649,6 +2649,10 @@
 </script>
 
 <style lang='scss'>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
+
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2350,6 +2350,15 @@ import Viewer from 'v-viewer'
         this.ComAuditdialogShow = true
       },
       separateUnitSubmitClick () {
+        for (let idx in this.subfileList) {
+          if (this.subfileList[idx].OldFileUrl === '' && this.subfileList[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         this.getFirAuditerByDept()
         this.dialogSeparateUnitAuditVisible = true
       },
@@ -2421,6 +2430,15 @@ import Viewer from 'v-viewer'
         })
       },
       comSubmitToSeparateUnitClick () {
+        for (let idx in this.subfileList) {
+          if (this.subfileList[idx].OldFileUrl === '' && this.subfileList[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         this.dialogComSubmitToSeparateUnitVisible = true
       },
       // 企业用户自行提交审批
@@ -3390,6 +3408,9 @@ import Viewer from 'v-viewer'
 </script>
 
 <style lang='scss'>
+  .el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -3092,6 +3092,15 @@
       },
       // 二级分办单位点击提交按钮
       separateUnitSubmitClick () {
+        for (let idx in this.subfileList) {
+          if (this.subfileList[idx].OldFileUrl === '' && this.subfileList[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         this.getFirAuditerByDept()
         this.dialogSeparateUnitAuditVisible = true
       },
@@ -3163,6 +3172,15 @@
         })
       },
       comSubmitToSeparateUnitClick () {
+        for (let idx in this.subfileList) {
+          if (this.subfileList[idx].OldFileUrl === '' && this.subfileList[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         this.dialogComSubmitToSeparateUnitVisible = true
       },
       // 企业用户自行提交审批
@@ -3544,6 +3562,9 @@
 </script>
 
 <style lang='scss'>
+  .el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2297,6 +2297,15 @@ import Viewer from 'v-viewer'
 
       separateUnitSubmitClick () {
         console.log('提交审核按钮')
+        for (let idx in this.subfileList) {
+          if (this.subfileList[idx].OldFileUrl === '' && this.subfileList[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         this.getFirAuditerByDept()
         this.dialogSeparateUnitAuditVisible = true
       },
@@ -2367,6 +2376,15 @@ import Viewer from 'v-viewer'
         })
       },
       comSubmitToSeparateUnitClick () {
+        for (let idx in this.subfileList) {
+          if (this.subfileList[idx].OldFileUrl === '' && this.subfileList[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         this.dialogComSubmitToSeparateUnitVisible = true
       },
       // 企业用户自行提交审批
@@ -3363,6 +3381,9 @@ import Viewer from 'v-viewer'
 </script>
 
 <style lang='scss'>
+  .el-cascader.is-disabled .el-cascader__label {
+    color: #333333;
+  }
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2679,6 +2679,9 @@
 </script>
 
 <style lang='scss'>
+.el-cascader.is-disabled .el-cascader__label {
+  color: #333333;
+}
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -2480,6 +2480,9 @@
   }
 </script>
 <style lang="scss">
+  .el-cascader.is-disabled .el-cascader__label {
+    color: #333333;
+  }
   .modified-form-input {
     .el-input__inner {
       background-color: lightblue !important;

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

@@ -900,9 +900,9 @@
                         </div>
                         </viewer>
                       </el-col>
-                      <el-col :span="4" v-if="scope.row.FileUrl != ''">
-                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                    </el-col>
+<!--                      <el-col :span="4" v-if="scope.row.FileUrl != ''">-->
+<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                    </el-col>-->
                     </el-row>
 
 
@@ -1017,9 +1017,9 @@
                         </div>
                       </viewer>
                     </el-col>
-                    <el-col :span="4" v-if="scope.row.FileUrl != ''">
-                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                    </el-col>
+<!--                    <el-col :span="4" v-if="scope.row.FileUrl != ''">-->
+<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                    </el-col>-->
                   </el-row>
 
                   <!-- <el-row align="middle">
@@ -1134,9 +1134,9 @@
                         </div>
                         </viewer>
                       </el-col>
-                     <el-col :span="4" v-if="scope.row.FileUrl != ''">
-                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                    </el-col>
+<!--                     <el-col :span="4" v-if="scope.row.FileUrl != ''">-->
+<!--                      <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                    </el-col>-->
                     </el-row>
 
 
@@ -2578,6 +2578,7 @@
         const params = {
           SupplierId: this.supplierId,
           SupplierTypeCode: '01',
+          SupType: '2',
           MInfoId: this.MInfoId,
           _currentPage: this.currentPageProject,
           _size: this.sizeProject
@@ -2622,6 +2623,7 @@
         const params = {
           SupplierId: this.supplierId,
           SupplierTypeCode: '02',
+          SupType: '2',
           MInfoId: this.MInfoId,
           _currentPage: this.currentPageProject2,
           _size: this.sizeProject2
@@ -2666,6 +2668,7 @@
         const params = {
           SupplierId: this.supplierId,
           SupplierTypeCode: '03',
+          SupType: '2',
           MInfoId: this.MInfoId,
           _currentPage: this.currentPageProject3,
           _size: this.sizeProject3
@@ -3478,6 +3481,15 @@
       },
       // 提交信息变更审核
       companySubmitApplyBtn () {
+        for (let idx in this.subfileList1) {
+          if (this.subfileList1[idx].OldFileUrl === '' && this.subfileList1[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList1[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         // this.commitshow = true
         this.ComAuditdialogShow = true
       },
@@ -3494,6 +3506,15 @@
       // 二级分办单位替企业申请：
       separateUnitSubmitApplyBtn () {
         // this.saveinfochange(1)
+        for (let idx in this.subfileList1) {
+          if (this.subfileList1[idx].OldFileUrl === '' && this.subfileList1[idx].FileUrl === '') {
+            this.$message({
+              type: 'warning',
+              message: this.subfileList1[idx].NeedFileType + '没有上传，不能提交！'
+            })
+            return
+          }
+        }
         this.getFirAuditerByDept()
         this.commitshow = true
       },
@@ -3622,6 +3643,9 @@
 </script>
 
 <style lang='scss'>
+  .el-cascader.is-disabled .el-cascader__label {
+    color: #333333;
+  }
   .el-icon-close:hover
   {
     color:red;

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

@@ -654,9 +654,9 @@
                           </div>
                         </viewer>
                       </el-col>
-                      <el-col :span="4" v-if="scope.row.FileUrl != '' && currentStatus <= 0 && currentStatus != -5">
-                        <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                      </el-col>
+<!--                      <el-col :span="4" v-if="scope.row.FileUrl != '' && currentStatus <= 0 && currentStatus != -5">-->
+<!--                        <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                      </el-col>-->
                     </el-row>
 
 
@@ -3589,6 +3589,9 @@
   }
 </script>
 <style lang='scss'>
+  .el-cascader.is-disabled .el-cascader__label {
+    color: #333333;
+  }
   .el-icon-close:hover
   {
     color:red;

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

@@ -684,9 +684,9 @@
                           </div>
                         </viewer>
                       </el-col>
-                      <el-col :span="4" v-if="scope.row.FileUrl != '' && currentStatus <= 0 && currentStatus != -5">
-                        <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                      </el-col>
+<!--                      <el-col :span="4" v-if="scope.row.FileUrl != '' && currentStatus <= 0 && currentStatus != -5">-->
+<!--                        <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                      </el-col>-->
                     </el-row>
 
 
@@ -4090,6 +4090,9 @@
   }
 </script>
 <style lang='scss'>
+  .el-cascader.is-disabled .el-cascader__label {
+    color: #333333;
+  }
   .el-icon-close:hover
   {
     color:red;

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

@@ -645,9 +645,9 @@
                           </div>
                         </viewer>
                       </el-col>
-                      <el-col :span="4" v-if="scope.row.FileUrl != '' && currentStatus <= 0 && currentStatus != -5">
-                        <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>
-                      </el-col>
+<!--                      <el-col :span="4" v-if="scope.row.FileUrl != '' && currentStatus <= 0 && currentStatus != -5">-->
+<!--                        <i class="el-icon-close" :style="{'float': 'right', 'height': '100%','line-height': lineheight(scope.row.FileUrlList.length)  + 'px',}" @click="iconclear(scope.row)"></i>-->
+<!--                      </el-col>-->
                     </el-row>
 
 
@@ -3643,6 +3643,9 @@
   }
 </script>
 <style lang='scss'>
+  .el-cascader.is-disabled .el-cascader__label {
+    color: #333333;
+  }
   .el-icon-close:hover
   {
     color:red;