Explorar el Código

信息变更流程修改

huahaiyan hace 6 años
padre
commit
2416884f3b

+ 3 - 1
src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochange.go

@@ -7,7 +7,7 @@ import (
 type OilInfoChange struct {
 	Id                  int       `xorm:"<- not null pk autoincr INT(10)"`
 	SupplierId          int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
-	AccessCardNo        int       `xorm:"not null default 0 comment('准入证号') INT(10)"`
+	AccessCardNo        string    `xorm:"comment('准入证号') VARCHAR(50)"`
 	OldAccessCardNo     int       `xorm:"not null default 0 comment('曾用准入证号') INT(10)"`
 	SupplierName        string    `xorm:"comment('企业名称') VARCHAR(255)"`
 	Status              string    `xorm:"comment('状态标识') VARCHAR(10)"`
@@ -86,6 +86,8 @@ type OilInfoChange struct {
 	LinkHouseNo         string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
 	LinkZipCode         string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
 	HseTraining         string    `xorm:"default '0' comment('是否需要进行HSE审查培训') VARCHAR(2)"`
+	PACNumber           string    `xorm:"comment('中石油准入证编号') VARCHAR(50)"`
+	SupplierCertificate string    `xorm:"comment('中石油物资供应商证书') VARCHAR(200)"`
 }
 
 type OilInfoChangeItem struct {

+ 52 - 32
src/dashoo.cn/backend/api/controllers/oilsupplier/infochange.go

@@ -4,7 +4,6 @@ import (
 	"dashoo.cn/backend/api/business/audithistory"
 	"dashoo.cn/backend/api/business/auditsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/infochange"
-	"dashoo.cn/backend/api/business/oilsupplier/qualchange"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
@@ -103,7 +102,7 @@ func (this *InfoChangeController) GetEntityThen() {
 	InfoId := this.Ctx.Input.Param(":id")
 	var model []infochange.OilInfoChangeItem
 	svc := infochange.GetInfoChangeService(utils.DBE)
-	where := " InfoId = " + InfoId + " and ChangeStatus = 0"
+	where := " InfoId = " + InfoId
 	svc.GetEntitysByWhere(OilInfoChangeItemName, where, &model)
 	var datainfo DataInfo
 	datainfo.Items = model
@@ -551,21 +550,27 @@ func (this *InfoChangeController) GetChangeEntity() {
 	svc.GetEntitysByWhere(OilInfoChangeItemName, where, &infoitems)
 	immumodel := reflect.ValueOf(&model)
 	elem := immumodel.Elem()
-	for _, info := range infoitems {
-		fmt.Println(info.SelectItem)
-		fmt.Println(";;;;;;;;;", elem.FieldByName(info.SelectItem).Type().String())
-		if elem.FieldByName(info.SelectItem).Type().String() == "int64" {
-			intchangeinfo, _ := strconv.ParseInt(info.ChangeInfo, 10, 64)
-			elem.FieldByName(info.SelectItem).SetInt(intchangeinfo)
-		} else if elem.FieldByName(info.SelectItem).Type().String() == "time.Time" {
-			t, _ := time.Parse("2006-01-02", info.ChangeInfo)
-			elem.FieldByName(info.SelectItem).Set(reflect.ValueOf(t))
-		} else {
-			elem.FieldByName(info.SelectItem).SetString(info.ChangeInfo)
+	if len(infoitems) == 0 {
+		this.Data["json"] = &model
+		this.ServeJSON()
+		return
+	}else {
+		for _, info := range infoitems {
+			fmt.Println(info.SelectItem)
+			fmt.Println(";;;;;;;;;", elem.FieldByName(info.SelectItem).Type().String())
+			if elem.FieldByName(info.SelectItem).Type().String() == "int64" {
+				intchangeinfo, _ := strconv.ParseInt(info.ChangeInfo, 10, 64)
+				elem.FieldByName(info.SelectItem).SetInt(intchangeinfo)
+			} else if elem.FieldByName(info.SelectItem).Type().String() == "time.Time" {
+				t, _ := time.Parse("2006-01-02", info.ChangeInfo)
+				elem.FieldByName(info.SelectItem).Set(reflect.ValueOf(t))
+			} else {
+				elem.FieldByName(info.SelectItem).SetString(info.ChangeInfo)
+			}
 		}
+		this.Data["json"] = &model
+		this.ServeJSON()
 	}
-	this.Data["json"] = &model
-	this.ServeJSON()
 }
 
 // @Title 获取列表
@@ -826,6 +831,8 @@ func (this *InfoChangeController) AddInfoMain() {
 	}
 	svc.GetEntityById(SupplierId, &suppliermodel)
 	infochmain.OldSupplierName = suppliermodel.SupplierName
+	infochmain.PACNumber = suppliermodel.PACNumber
+	infochmain.SupplierCertificate = suppliermodel.SupplierCertificate
 	infochmain.MgrUnit = suppliermodel.MgrUnit
 	infochmain.OilCertificateNo = suppliermodel.OilCertificateNo
 	infochmain.OperType = suppliermodel.OperType
@@ -1160,25 +1167,33 @@ func (this *InfoChangeController) InfoAudit() {
 		if infomodel.Status == suppliercert.CENT_AUDIT_STATUS {
 			//信息更新
 			var infochangeitemmodel infochange.OilInfoChangeItem
+			var supmodel supplier.OilSupplier
 			infochangeitemmodel.ChangeStatus = 1
 			infomodel.Status = status
 			itemswhere := "InfoId = " + utils.ToStr(infoid)
 			myerr = svc.UpdateEntityBywheretbl(OilInfoChangeItemName, &infochangeitemmodel, []string{"ChangeStatus"}, itemswhere)
-			myerr = this.updatesupplier(dataother.SuppId, infoitems, infomodel)
+			myerr = this.updatesupplier(OilSupplierName,dataother.SuppId, infoitems, supmodel)
 			//资质更新
-			var qualdetail []qualchange.OilQualChangeDetail
-			where := "SupplierId = " + utils.ToStr(dataother.SuppId)
-			svc.GetEntities(&qualdetail, where)
-			if len(qualdetail) > 0 {
-				for i := 0; i < len(qualdetail); i++ {
-					var supfilemodel supplierfile.OilSupplierFile
-					supfilemodel.FileName = qualdetail[i].FileName
-					supfilemodel.FileUrl = qualdetail[i].FileUrl
-					supfilemodel.EffectDate = qualdetail[i].EffectDate
-					svc.UpdateEntityBytbl(OilSupplierFileName, qualdetail[i].FileId, &supfilemodel, []string{"FileName", "FileUrl", "EffectDate"})
-				}
-			}
+			where := "SupplierId = " + utils.ToStr(dataother.SuppId)+" and SupType = 2"
+			var supfilemodel supplierfile.OilSupplierFile
+			supfilemodel.SupType = 3
+			svc.UpdateEntityBywheretbl(OilSupplierFileName, &supfilemodel, []string{"SupType"}, where)
+			//var qualdetail []qualchange.OilQualChangeDetail
+			//svc.UpdateEntityBytbl(OilSupplierFileName, qualdetail[i].FileId, &supfilemodel, []string{"SupType"})
+			//where := "SupplierId = " + utils.ToStr(dataother.SuppId)
+			//svc.GetEntities(&qualdetail, where)
+			//if len(qualdetail) > 0 {
+			//	for i := 0; i < len(qualdetail); i++ {
+			//		var supfilemodel supplierfile.OilSupplierFile
+			//		supfilemodel.FileName = qualdetail[i].FileName
+			//		supfilemodel.FileUrl = qualdetail[i].FileUrl
+			//		supfilemodel.EffectDate = qualdetail[i].EffectDate
+			//		supfilemodel.SupType = 3
+			//		svc.UpdateEntityBytbl(OilSupplierFileName, qualdetail[i].FileId, &supfilemodel, []string{"FileName", "FileUrl", "EffectDate","SupType"})
+			//	}
+			//}
 		}
+		infomodel.Status = status
 		infomodel.Step = step
 		if receiveVal == "true" {
 			cols := []string{
@@ -1258,15 +1273,20 @@ func (this *InfoChangeController) InfoAudit() {
 }
 
 //更新供方信息表
-func (this *InfoChangeController) updatesupplier(suppid int, infoitems []infochange.OilInfoChangeItem, infomodel infochange.OilInfoChange) error {
+func (this *InfoChangeController) updatesupplier(supname string,suppid int, infoitems []infochange.OilInfoChangeItem, supmodel supplier.OilSupplier) error {
 	svc := infochange.GetInfoChangeService(utils.DBE)
 	var err error
-	var cols []string
 	if len(infoitems) > 0 {
 		for i := 0; i < len(infoitems); i++ {
-			cols = append(cols, infoitems[i].SelectItem)
+			//var cols []string
+			//cols = append(cols, infoitems[i].SelectItem)
+			where := " Id = "+utils.ToStr(suppid)
+			var sql string
+			sql = `UPDATE ` + supname + ` set ` + infoitems[i].SelectItem + ` = ` + infoitems[i].ChangeInfo + ` where ` + where
+			_, err = svc.DBE.Exec(sql)
+			//err = svc.UpdateEntityBytbl(OilSupplierName, suppid, &supmodel, cols)
 		}
 	}
-	err = svc.UpdateEntityBytbl(OilSupplierName, suppid, &infomodel, cols)
+
 	return err
 }

+ 96 - 30
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/auditoperation.vue

@@ -12,7 +12,13 @@
         </span>
         <span style="float: right;">
           <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">审核</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
+            v-if="auditBtn && InfoStatus == '1'">初审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
+            v-if="auditBtn && InfoStatus == '2'">复审</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="submitInfoChange"
+            v-if="auditBtn && InfoStatus == '5'">集中评审</el-button>
+          <!-- <el-button type="primary" size="mini" @click="submitInfoChange" v-if="InfoStatus > 0">审核</el-button> -->
           <router-link :to="'/oilsupplier/infochangech/infoaudit'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -411,10 +417,12 @@
             </div>
             <el-table :data="subfileList1" border>
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="OldFileName" label="原文件" show-overflow-tooltip>
+              <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <a :href="'http://'+fileurlcut(scope.row.OldFileUrl)" target="_blank"
-                    class="buttonText">{{scope.row.OldFileName}}</a>
+                  <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
+                      class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -422,10 +430,12 @@
                   {{ jstimehandle(scope.row.OldEffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="FileName" label="变更后文件" show-overflow-tooltip>
+              <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <a :href="'http://'+fileurlcut(scope.row.FileUrl)" target="_blank"
-                    class="buttonText">{{scope.row.FileName}}</a>
+                  <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                      class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
@@ -459,10 +469,12 @@
             </div>
             <el-table :data="subfileList2" border>
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="OldFileName" label="原文件" show-overflow-tooltip>
+              <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <a :href="'http://'+fileurlcut(scope.row.OldFileUrl)" target="_blank"
-                    class="buttonText">{{scope.row.OldFileName}}</a>
+                  <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
+                      class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -470,10 +482,12 @@
                   {{ jstimehandle(scope.row.OldEffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="FileName" label="变更后文件" show-overflow-tooltip>
+              <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <a :href="'http://'+fileurlcut(scope.row.FileUrl)" target="_blank"
-                    class="buttonText">{{scope.row.FileName}}</a>
+                  <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                      class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
@@ -507,10 +521,12 @@
             </div>
             <el-table :data="subfileList3" border>
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
-              <el-table-column prop="OldFileName" label="原文件" show-overflow-tooltip>
+              <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <a :href="'http://'+fileurlcut(scope.row.OldFileUrl)" target="_blank"
-                    class="buttonText">{{scope.row.OldFileName}}</a>
+                  <div v-for="(tmpUrl, index) in scope.row.OldFileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank"
+                      class="buttonText">{{scope.row.OldFileName.split('$')[index]}}</a>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -518,10 +534,12 @@
                   {{ jstimehandle(scope.row.OldEffectDate+'') }}
                 </template>
               </el-table-column>
-              <el-table-column prop="FileName" label="变更后文件" show-overflow-tooltip>
+              <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <a :href="'http://'+fileurlcut(scope.row.FileUrl)" target="_blank"
-                    class="buttonText">{{scope.row.FileName}}</a>
+                  <div v-for="(tmpUrl, index) in scope.row.FileUrlList">
+                    <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
+                      class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
@@ -573,6 +591,7 @@
     mapGetters
   } from 'vuex'
   import _ from 'lodash';
+  import apiCert from '@/api/oilsupplier/suppliercert'
   import supplierapi from '@/api/oilsupplier/supplier';
   import api from '@/api/oilsupplier/infochange';
   import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
@@ -589,10 +608,12 @@
 
     data() {
       return {
+        auditstepcode: '',
+        auditBtn: false,
         AccessCardNolist: [],
         AccessCardNo1: '',
         AccessCardNo2: '',
-        AccessCardNo3:'',
+        AccessCardNo3: '',
         SubfileForm: {
           Id: '',
           SupplierId: '',
@@ -882,22 +903,47 @@
               this.entrydetail.business = this.Infomain[0].BusinessKey + ''
               this.entrydetail.instance = this.Infomain[0].WorkFlowId + ''
               this.entrydetail.Status = this.Infomain[0].Status + ''
+              this.InfoStatus = this.Infomain[0].Status + ''
+              if (this.Infomain[0].Status === '1') {
+                this.auditstepcode = 'FIRST_TRIAL'
+              } else if (this.Infomain[0].Status === '2') {
+                this.auditstepcode = 'SECOND_TRIAL'
+              } else if (this.Infomain[0].Status === '5') {
+                this.auditstepcode = 'PROF_REGULATION'
+              }
             }
-            console.log("---ent", this.entrydetail)
+            this.isAccess()
           })
           .catch(err => {
             console.error(err);
           });
       },
+      isAccess() {
+        apiCert.isAccess(this.auditstepcode, this.$axios).then(res => {
+          this.auditBtn = res.data
+        }).catch(err => {
+          console.log(err)
+        })
+      },
+      fileurlcut(val, index) {
+        let fileurlall = val.split('$')[index]
+        let fileurl = fileurlall.split("|")
+        return fileurl[0]
+      },
       getAccessCardNo() {
-        api.GeAccessCardNo(this.supplierId, this.$axios)
+        api.GeAccessCardNo(this.SuppId, this.$axios)
           .then(res => {
             this.AccessCardNolist = res.data.items;
-            console.log("this.AccessCardNolist", this.AccessCardNolist)
             if (this.AccessCardNolist) {
-              this.AccessCardNo1= this.AccessCardNolist[0].AccessCardNo
-              this.AccessCardNo2 = this.AccessCardNolist[1].AccessCardNo
-              this.AccessCardNo3 = this.AccessCardNolist[2].AccessCardNo
+              for (var i = 0; i < this.AccessCardNolist.length; i++) {
+                if (this.AccessCardNolist[i].SupplierTypeCode == "01") {
+                  this.AccessCardNo1 = this.AccessCardNolist[i].AccessCardNo
+                } else if (this.AccessCardNolist[i].SupplierTypeCode == "02") {
+                  this.AccessCardNo2 = this.AccessCardNolist[i].AccessCardNo
+                } else if (this.AccessCardNolist[i].SupplierTypeCode == "03") {
+                  this.AccessCardNo3 = this.AccessCardNolist[i].AccessCardNo
+                }
+              }
             }
           })
           .catch(err => {
@@ -918,7 +964,14 @@
           .then(res => {
             _this.subfileList1 = res.data.items
             _this.currentItemCount = res.data.currentItemCount
-            console.log("----this.subfileList---", this.subfileList1)
+            for (let idx in _this.subfileList1) {
+              _this.subfileList1[idx].FileUrlList = _this.subfileList1[idx].FileUrl.split('$')
+
+            }
+            for (let idx1 in _this.subfileList1) {
+              _this.subfileList1[idx1].OldFileUrlList = _this.subfileList1[idx1].OldFileUrl.split('$')
+
+            }
           })
           .catch(err => {
             console.error(err)
@@ -956,7 +1009,14 @@
           .then(res => {
             _this.subfileList2 = res.data.items
             _this.currentItemCount = res.data.currentItemCount
-            console.log("----this.subfileList---", this.subfileList2)
+            for (let idx in _this.subfileList2) {
+              _this.subfileList2[idx].FileUrlList = _this.subfileList2[idx].FileUrl.split('$')
+
+            }
+            for (let idx1 in _this.subfileList2) {
+              _this.subfileList2[idx1].OldFileUrlList = _this.subfileList2[idx1].OldFileUrl.split('$')
+
+            }
           })
           .catch(err => {
             console.error(err)
@@ -994,7 +1054,14 @@
           .then(res => {
             _this.subfileList3 = res.data.items
             _this.currentItemCount = res.data.currentItemCount
-            console.log("----this.subfileList---", this.subfileList3)
+            for (let idx in _this.subfileList3) {
+              _this.subfileList3[idx].FileUrlList = _this.subfileList3[idx].FileUrl.split('$')
+
+            }
+            for (let idx1 in _this.subfileList3) {
+              _this.subfileList3[idx1].OldFileUrlList = _this.subfileList3[idx1].OldFileUrl.split('$')
+
+            }
           })
           .catch(err => {
             console.error(err)
@@ -1034,7 +1101,6 @@
           api.getEntityThen(this.infoId, this.$axios)
             .then(res => {
               this.infochangedata = res.data.items;
-              console.log("this.infochangedata", this.infochangedata)
             })
             .catch(err => {
               console.error(err);

+ 22 - 11
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/_opera/operation.vue

@@ -99,8 +99,8 @@
 
               <el-col :span="8">
                 <el-form-item label="中石油准入证编号">
-                  <el-input v-model="formData.OilCertificateNo" maxlength="255" placeholder="请输入"
-                    :class="getchange('OilCertificateNo') ? 'modified-form-input' : ''" style="width: 100%">
+                  <el-input v-model="formData.PACNumber" maxlength="255" placeholder="请输入"
+                    :class="getchange('PACNumber') ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -869,8 +869,8 @@
           value: 'SupplierName',
           label: '企业名称'
         }, {
-          value: 'OilCertificateNo',
-          label: '中石油供应商证书号'
+          value: 'PACNumber',
+          label: '中石油准入证编号'
         }, {
           value: 'Grade',
           label: '级别'
@@ -1130,7 +1130,7 @@
       this.serviceId = this.$route.params.opera
       this.supplierId = this.serviceId
       this.InfoStatus = this.$route.query.InfoStatus
-      this.MInfoId = this.$route.query.infoId
+      this.MInfoId = this.$route.query.infoId + ""
       this.backhistroy.certId = this.MInfoId
       this.formData.Id = this.serviceId
       this.initDatas()
@@ -1191,9 +1191,15 @@
             this.AccessCardNolist = res.data.items;
             console.log("this.AccessCardNolist", this.AccessCardNolist)
             if (this.AccessCardNolist) {
-              this.AccessCardNo1 = this.AccessCardNolist[0].AccessCardNo
-              this.AccessCardNo2 = this.AccessCardNolist[1].AccessCardNo
-              this.AccessCardNo3 = this.AccessCardNolist[2].AccessCardNo
+              for (var i= 0;i<this.AccessCardNolist.length;i++){
+                if(this.AccessCardNolist[i].SupplierTypeCode == "01"){
+                  this.AccessCardNo1= this.AccessCardNolist[i].AccessCardNo
+                }else if(this.AccessCardNolist[i].SupplierTypeCode == "02"){
+                  this.AccessCardNo2= this.AccessCardNolist[i].AccessCardNo
+                } else if(this.AccessCardNolist[i].SupplierTypeCode == "03"){
+                  this.AccessCardNo3= this.AccessCardNolist[i].AccessCardNo
+                }
+              }
             }
           })
           .catch(err => {
@@ -1478,8 +1484,7 @@
       },
       uploadrequest(option) {
         let _this = this
-        console.log("process.env.upfilehost",process.env.upfilehost)
-        debugger
+        console.log("process.env.upfilehost", process.env.upfilehost)
         if (process.client) {
           const myDomain = window.location.host
           axios.post(process.env.upfilehost, {})
@@ -1692,7 +1697,7 @@
         }
         this.entityForm.fushenauditer = this.fushenauditer
         this.entityForm.auditer = this.auditer
-        this.entityForm.MInfoId = this.MInfoId + ""
+        this.entityForm.MInfoId = this.MInfoId
         api.commitAuditEntity(this.supplierId, this.entityForm, this.$axios).then(res => {
           if (res.data.code === 0) {
             // 保存成功后,初始化数据,变成修改
@@ -1769,6 +1774,12 @@
 </script>
 
 <style lang='scss'>
+  .modified-form-input {
+    .el-input__inner {
+      background-color: wheat;
+    }
+  }
+
   .attach-uploader .el-upload {
     border: 1px dashed #63B8FF;
     cursor: pointer;

+ 3 - 3
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochangech/index.vue

@@ -59,7 +59,7 @@
               <span v-if="scope.row.Status=='-1'" style="color:#F56C6C">初审未通过</span>
               <span v-if="scope.row.Status=='2'" style="color:#E6A23C">待复审</span>
               <span v-if="scope.row.Status=='-2'" style="color:#F56C6C">复审未通过</span>
-              <span v-if="scope.row.Status=='3'" style="color:#E6A23C">待法规处审核</span>
+              <span v-if="scope.row.Status=='5'" style="color:#E6A23C">待法规处审核</span>
               <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">审核未通过</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
             </template>
@@ -253,8 +253,8 @@
           },
 
           {
-            prop: "OilCertificateNo",
-            label: '中石油供应商证书号',
+            prop: "PACNumber",
+            label: '中石油准入证编号',
             width: 200,
             sort: true
           },