信息变更

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

@@ -544,17 +544,24 @@ func (this *InfoChangeController) GetInfoForItem() {
 // @router /getchangelist/:id [get]
 func (this *InfoChangeController) GetChangeEntity() {
 	Id := this.Ctx.Input.Param(":id")
+	var models [2]supplier.OilSupplier
 	var model supplier.OilSupplier
+	var enumModel supplier.OilSupplier
 	svc := supplier.GetOilSupplierService(utils.DBE)
 	svc.GetEntityByIdBytbl(OilSupplierName, Id, &model)
+	models[0] = model
+
 	var infoitems []infochange.OilInfoChangeItem
 	where := " SupplierId = " + Id
 	where = where + " and ChangeStatus = 0"
 	svc.GetEntitysByWhere(OilInfoChangeItemName, where, &infoitems)
-	immumodel := reflect.ValueOf(&model)
+	tmpModel := &model
+	enumModel = *tmpModel
+	immumodel := reflect.ValueOf(&enumModel)
 	elem := immumodel.Elem()
 	if len(infoitems) == 0 {
-		this.Data["json"] = &model
+		models[1] = enumModel
+		this.Data["json"] = &models
 		this.ServeJSON()
 		return
 	}else {
@@ -564,6 +571,9 @@ func (this *InfoChangeController) GetChangeEntity() {
 			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() == "float64" {
+				floatchangeinfo, _ := strconv.ParseFloat(info.ChangeInfo,64)
+				elem.FieldByName(info.SelectItem).SetFloat(floatchangeinfo)
 			} 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))
@@ -571,7 +581,8 @@ func (this *InfoChangeController) GetChangeEntity() {
 				elem.FieldByName(info.SelectItem).SetString(info.ChangeInfo)
 			}
 		}
-		this.Data["json"] = &model
+		models[1] = enumModel
+		this.Data["json"] = &models
 		this.ServeJSON()
 	}
 }
@@ -722,6 +733,13 @@ func (this *InfoChangeController) AddInfoChangeItemCh() {
 	var err error
 	where := " SupplierId = " + model.SupplierId
 	where = where + " and InfoId = " + model.MInfoId
+
+	var deleteEntity infochange.OilInfoChangeItem
+	delMainId, _ := strconv.Atoi(model.MInfoId)
+	deleteEntity.InfoId = delMainId
+	svc.DBE.Delete(deleteEntity)
+
+	var infoitementitys []infochange.OilInfoChangeItem
 	for i := 0; i < len(model.InfochangeForm); i++ {
 		var infoitementity infochange.OilInfoChangeItem
 		infoitementity.SelectItem = model.InfochangeForm[i].SelectItem
@@ -730,20 +748,13 @@ func (this *InfoChangeController) AddInfoChangeItemCh() {
 		infoitementity.ChangeStatus = 0
 		infoitementity.SupplierId, _ = strconv.Atoi(model.SupplierId)
 		infoitementity.InfoId, _ = strconv.Atoi(model.MInfoId)
-
-		where = where + " and SelectItem = '" + model.InfochangeForm[i].SelectItem + "'"
-		var infoitemmodel []infochange.OilInfoChangeItem
-		svc.GetEntitysByWhere(OilInfoChangeItemName, where, &infoitemmodel)
-		if len(infoitemmodel) > 0 {
-			cols := []string{"ChangeInfo", "BeChangeInfo", "ChangeStatus"}
-			svc.UpdateEntityBywheretbl(OilInfoChangeItemName, &infoitementity, cols, where)
-		} else {
-			infoitementity.CreateOn = time.Now()
-			infoitementity.CreateBy = this.User.Realname
-			infoitementity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
-			_, err = svc.InsertEntityBytbl(""+OilInfoChangeItemName, &infoitementity)
-		}
+		infoitementity.CreateOn = time.Now()
+		infoitementity.CreateBy = this.User.Realname
+		infoitementity.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+		infoitementitys = append(infoitementitys, infoitementity)
 	}
+	_, err = svc.InsertEntityBytbl(""+OilInfoChangeItemName, &infoitementitys)
+
 	var errinfo ErrorDataInfo
 	if err == nil {
 		//新增

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

@@ -36,7 +36,7 @@
                   <!-- <el-autocomplete class="inline-input" v-model="formData.SupplierName" :readonly="companyReadonly" :fetch-suggestions="querySearch"
                              :maxlength="255" placeholder="请输入内容" style="width: 100%"  @select="handleSelect" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
             </el-autocomplete> -->
-                  <el-input v-model="formData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%"
+                  <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" v-model="formData.SupplierName" :maxlength="255" placeholder="请输入" style="width: 100%"
                     v-if="authUser && authUser.Profile.IsCompanyUser == 1">
                   </el-input>
                   <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
@@ -55,7 +55,7 @@
               <el-col :span="8">
                 <el-form-item label="单位关系">
                   <el-select ref="SpecType" v-model="formData.SpecTypeCode"
-                    :class="getchange('SpecTypeCode') ? 'modified-form-input' : ''" placeholder="请选择"
+                    :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''" placeholder="请选择"
                     style="width: 100%">
                     <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
                     </el-option>
@@ -63,10 +63,21 @@
                 </el-form-item>
               </el-col>
 
+              <el-col :span="16">
+                <el-form-item label="管理单位">
+                  <el-select filterable clearable v-model="formData.MgrUnit" maxlength="255"
+                             :class="changedForm['MgrUnit'] ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
+                    <el-option v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
+                               :value="item.Key">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
               <el-col :span="8">
                 <el-form-item label="国家" prop="Country">
                   <el-select v-model="formData.Country" filterable placeholder="请选择" style="width: 100%"
-                    :class="getchange('Country') ? 'modified-form-input' : ''">
+                    :class="changedForm['Country'] ? 'modified-form-input' : ''">
                     <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value"
                       :value="item.value">
                       <span style="float: left">{{ item.value }}</span>
@@ -86,21 +97,12 @@
               </el-form-item>
             </el-col> -->
 
-              <el-col :span="8">
-                <el-form-item label="管理单位">
-                  <el-select filterable v-model="formData.MgrUnit" maxlength="255"
-                    :class="getchange('MgrUnit') ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
-                    <el-option v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
-                      :value="item.Key">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
+
 
               <el-col :span="8">
                 <el-form-item label="中石油准入证编号">
                   <el-input v-model="formData.PACNumber" maxlength="255" placeholder="请输入"
-                    :class="getchange('PACNumber') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['PACNumber'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -110,7 +112,7 @@
               <el-col :span="8">
                 <el-form-item label="证件合一">
                   <el-select v-model="formData.CredentialFlag" placeholder="请选择" @change="showorhid" style="width: 100%"
-                    :class="getchange('CredentialFlag') ? 'modified-form-input' : ''">
+                    :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''">
                     <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                   </el-select>
@@ -120,7 +122,7 @@
               <el-col :span="8">
                 <el-form-item label-width="150px" label="统一社会信用代码" prop="CommercialNo">
                   <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="true"
-                    :class="getchange('CommercialNo') ? 'modified-form-input' : ''" placeholder="请输入"
+                    :class="changedForm['CommercialNo'] ? 'modified-form-input' : ''" placeholder="请输入"
                     style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -131,7 +133,7 @@
               <el-col :span="8">
                 <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
                   <el-input v-model="formData.CountryTaxNo" maxlength="50"
-                    :class="getchange('CountryTaxNo') ? 'modified-form-input' : ''" placeholder="请输入"
+                    :class="changedForm['CountryTaxNo'] ? 'modified-form-input' : ''" placeholder="请输入"
                     style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -140,7 +142,7 @@
               <el-col :span="8">
                 <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
                   <el-input v-model="formData.OrganCode" maxlength="50" placeholder="请输入"
-                    :class="getchange('OrganCode') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['OrganCode'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -151,13 +153,13 @@
                   <el-row>
                     <el-col :span="10">
                       <el-cascader :options="countryoptions" :props="countryprops" maxlength="20"
-                        :class="getchange('Province') ? 'modified-form-input' : ''" placeholder="省市区" v-model="CityAry"
+                        :class="changedForm['Province'] || changedForm['City'] || changedForm['Street'] ? 'modified-form-input' : ''" placeholder="省市区" v-model="CityAry"
                         style="width: 100%" @change="handleAreaChange">
                       </el-cascader>
                     </el-col>
                     <el-col :span="14">
                       <el-input v-model="formData.Address" maxlength="500" placeholder="详细地址" style="width: 100%"
-                        :class="getchange('Address') ? 'modified-form-input' : ''">
+                        :class="changedForm['Address'] ? 'modified-form-input' : ''">
                       </el-input>
                     </el-col>
                   </el-row>
@@ -166,7 +168,7 @@
               <el-col :span="8">
                 <el-form-item label="邮编" prop="ZipCode">
                   <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入"
-                    :class="getchange('ZipCode') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['ZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -176,13 +178,13 @@
                   <el-row>
                     <el-col :span="10">
                       <el-cascader :options="countryoptions" :props="countryprops"
-                        :class="getchange('LinkProvince') ? 'modified-form-input' : ''" placeholder="省市区"
+                        :class="changedForm['LinkProvince'] || changedForm['LinkCity'] || changedForm['LinkStreet'] ? 'modified-form-input' : ''" placeholder="省市区"
                         v-model="LinkCityAry" maxlength="20" style="width: 100%" @change="handleLinkAreaChange">
                       </el-cascader>
                     </el-col>
                     <el-col :span="14">
                       <el-input v-model="formData.LinkAddress" maxlength="500" placeholder="详细地址" style="width: 100%"
-                        :class="getchange('LinkAddress') ? 'modified-form-input' : ''">
+                        :class="changedForm['LinkAddress'] ? 'modified-form-input' : ''">
                       </el-input>
                     </el-col>
                   </el-row>
@@ -191,7 +193,7 @@
               <el-col :span="8">
                 <el-form-item label="邮编" prop="LinkZipCode">
                   <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入"
-                    :class="getchange('LinkZipCode') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['LinkZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -201,7 +203,7 @@
               <el-col :span="8">
                 <el-form-item label="法定代表人姓名" prop="LegalPerson">
                   <el-input v-model="formData.LegalPerson" maxlength="20" placeholder="请输入"
-                    :class="getchange('LegalPerson') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['LegalPerson'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -210,7 +212,7 @@
                 <el-form-item label="公司类型" prop="CompanyType">
                   <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create
-                    :class="getchange('CompanyType') ? 'modified-form-input' : ''" :disabled="!canUpdateSupplier"
+                    :class="changedForm['CompanyType'] ? 'modified-form-input' : ''" :disabled="!canUpdateSupplier"
                     placeholder="请选择" style="width: 100%;">
                     <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
                       style="width: 100%">
@@ -222,7 +224,7 @@
               <el-col :span="8">
                 <el-form-item label="注册资本" prop="RegCapital">
                   <el-input type="number" v-model="formData.RegCapital" :min="1"
-                    :class="getchange('RegCapital') ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
+                    :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入" style="width: 100%">
                     <template slot="append">万元</template>
                   </el-input>
                 </el-form-item>
@@ -231,7 +233,7 @@
               <el-col :span="8">
                 <el-form-item label="成立时间">
                   <el-date-picker v-model="formData.SetupTime" type="date"
-                    :class="getchange('SetupTime') ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
+                    :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
                     value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
                   </el-date-picker>
                 </el-form-item>
@@ -240,7 +242,7 @@
               <el-col :span="8">
                 <el-form-item label="开户银行" prop="DepositBank">
                   <el-input v-model="formData.DepositBank" maxlength="50" placeholder="请输入"
-                    :class="getchange('DepositBank') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['DepositBank'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -248,7 +250,7 @@
               <el-col :span="8">
                 <el-form-item label="银行账号" prop="BankAccount">
                   <el-input v-model="formData.BankAccount" maxlength="50" placeholder="请输入"
-                    :class="getchange('BankAccount') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['BankAccount'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -256,7 +258,7 @@
               <el-col :span="8">
                 <el-form-item label="联系人姓名" prop="ContactName">
                   <el-input v-model="formData.ContactName" maxlength="20" placeholder="请输入"
-                    :class="getchange('ContactName') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['ContactName'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -264,14 +266,14 @@
               <el-col :span="8">
                 <el-form-item label="移动电话" prop="Mobile">
                   <el-input v-model="formData.Mobile" maxlength="20" placeholder="请输入"
-                    :class="getchange('Mobile') ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    :class="changedForm['Mobile'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="固定电话" prop="Telphone">
                   <el-input v-model="formData.Telphone" maxlength="20" placeholder="请输入"
-                    :class="getchange('Telphone') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['Telphone'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -279,28 +281,28 @@
               <el-col :span="8">
                 <el-form-item label="传真" prop="Fax">
                   <el-input v-model="formData.Fax" maxlength="20" placeholder="请输入"
-                    :class="getchange('Fax') ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    :class="changedForm['Fax'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="财务电话" prop="CompanyTel">
                   <el-input v-model="formData.CompanyTel" placeholder="请输入" maxlength="20"
-                    :class="getchange('CompanyTel') ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['CompanyTel'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="电子邮箱" prop="EMail">
                   <el-input v-model="formData.EMail" maxlength="50" placeholder="请输入"
-                    :class="getchange('EMail') ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    :class="changedForm['EMail'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
 
               <el-col :span="8">
                 <el-form-item label="银行信用等级">
                   <el-input v-model="formData.BankCreditRating" maxlength="10"
-                    :class="getchange('BankCreditRating') ? 'modified-form-input' : ''" placeholder="请输入"
+                    :class="changedForm['BankCreditRating'] ? 'modified-form-input' : ''" placeholder="请输入"
                     style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -310,7 +312,7 @@
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                   <el-select v-model="formData.HseTraining" placeholder="请选择"
-                    :class="getchange('HseTraining') ? 'modified-form-input' : ''" style="width: 100%;">
+                    :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
                     <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                       style="width: 100%">
                     </el-option>
@@ -327,20 +329,20 @@
               <el-col :span="8">
                 <el-form-item label="质量管理体系认证情况及认证机构">
                   <el-input v-model="formData.QualitySystemCert" maxlength="200" placeholder="请输入" type="textarea"
-                    :class="IsModified ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    :class="changedForm['QualitySystemCert'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="产品质量认证情况及认证机构">
                   <el-input v-model="formData.ProductQualityCert" placeholder="请输入" maxlength="200" type="textarea"
-                    :class="IsModified ? 'modified-form-input' : ''">
+                    :class="changedForm['ProductQualityCert'] ? 'modified-form-input' : ''">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="生产/制造许可证获证情况及编号">
                   <el-input v-model="formData.MaunLicense" placeholder="请输入" maxlength="200" type="textarea"
-                    :class="IsModified ? 'modified-form-input' : ''"></el-input>
+                    :class="changedForm['MaunLicense'] ? 'modified-form-input' : ''"></el-input>
                 </el-form-item>
               </el-col>
               <!-- <el-col :span="8">
@@ -354,7 +356,7 @@
               <el-col :span="8">
                 <el-form-item label="中石油物资供应商证书">
                   <el-input v-model="formData.SupplierCertificate" maxlength="255" placeholder="请输入" style="width: 100%"
-                    :class="IsModified ? 'modified-form-input' : ''">
+                    :class="changedForm['SupplierCertificate'] ? 'modified-form-input' : ''">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -362,7 +364,7 @@
               <el-col :span="8">
                 <el-form-item label="安全生产许可证">
                   <el-input v-model="formData.SafetyLicense" maxlength="200" placeholder="请输入" type="textarea"
-                    :class="IsModified ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['SafetyLicense'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -370,20 +372,20 @@
               <el-col :span="8">
                 <el-form-item label="行业特殊要求的认证证书">
                   <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" maxlength="200" type="textarea"
-                    :class="IsModified ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['SpecIndustryCert'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="营业范围" prop="BusinessScope">
                   <el-input v-model="formData.BusinessScope" maxlength="200" placeholder="请输入" type="textarea"
-                    :class="IsModified ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    :class="changedForm['BusinessScope'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="16">
                 <el-form-item label="备注">
                   <el-input v-model="formData.Remark" maxlength="500" placeholder="请输入" type="textarea"
-                    :class="IsModified ? 'modified-form-input' : ''" style="width: 100%">
+                    :class="changedForm['Remark'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -770,6 +772,46 @@
         AccessCardNo3: '',
         myitemsshow: false,
         yasuoname: '',
+        changedForm: {
+          SupplierName: false,
+          SpecTypeCode: false,
+          Country: false,
+          InStyle: false,
+          MgrUnit: false,
+          PACNumber: false,
+          CredentialFlag: false,
+          CommercialNo: false,
+          CountryTaxNo: false,
+          OrganCode: false,
+          Province: false,
+          Address: false,
+          ZipCode: false,
+          LinkProvince: false,
+          LinkAddress: false,
+          LinkZipCode: false,
+          LegalPerson: false,
+          CompanyType: false,
+          RegCapital: false,
+          SetupTime: false,
+          DepositBank: false,
+          BankAccount: false,
+          ContactName: false,
+          Mobile: false,
+          Telphone: false,
+          Fax: false,
+          CompanyTel: false,
+          EMail: false,
+          BankCreditRating: false,
+          HseTraining: false,
+          QualitySystemCert: false,
+          ProductQualityCert: false,
+          MaunLicense: false,
+          SupplierCertificate: false,
+          SafetyLicense: false,
+          SpecIndustryCert: false,
+          BusinessScope: false,
+          Remark: false,
+        },
         SubfileForm: {
           Id: '',
           SupplierId: '',
@@ -1134,7 +1176,6 @@
       this.backhistroy.certId = this.MInfoId
       this.formData.Id = this.serviceId
       this.initDatas()
-      this.GetItemsDatas()
       this.getDictOptions()
       this.getbusList1()
       this.getsubfile1()
@@ -1148,13 +1189,12 @@
     methods: {
       initDatas() {
         this.getMainInfo()
-        console.log("-33333333333222222", this.formData)
         if (this.formData.Id) {
           api.GetChangeEntity(this.formData.Id, this.$axios)
             .then(res => {
-              this.formData = res.data;
-              console.log("---this.formDatathis.formData-", this.formData)
-              this.copyformdata = _.cloneDeep(this.formData);
+              this.copyformdata = _.cloneDeep(res.data[0])
+
+              this.formData = res.data[1]
               this.CityAry = []
               this.CityAry.push(this.formData.Province)
               this.CityAry.push(this.formData.City)
@@ -1163,6 +1203,9 @@
               this.LinkCityAry.push(this.formData.LinkProvince)
               this.LinkCityAry.push(this.formData.LinkCity)
               this.LinkCityAry.push(this.formData.LinkStreet)
+
+
+              this.GetItemsDatas()
             })
             .catch(err => {
               console.error(err);
@@ -1173,13 +1216,11 @@
         api.GetMainInfo(this.MInfoId, this.$axios)
           .then(res => {
             this.Infomain = res.data.items;
-            console.log("this.Infomain", this.Infomain)
             if (this.Infomain.length > 0) {
               this.entrydetail.business = this.Infomain[0].BusinessKey + ''
               this.entrydetail.instance = this.Infomain[0].WorkFlowId + ''
               this.entrydetail.Status = this.Infomain[0].Status + ''
             }
-            console.log("---ent", this.entrydetail)
           })
           .catch(err => {
             console.error(err);
@@ -1349,7 +1390,8 @@
         let fileurl = fileurlall.split("|")
         return fileurl[0]
       },
-      getchange(key) {
+
+      /*getchange(key) {
         if (this.infochangedata) {
           for (var i = 0; i < this.infochangedata.length; i++) {
             if (this.infochangedata[i].SelectItem == key) {
@@ -1359,12 +1401,12 @@
           return false
         }
 
-      },
+      },*/
       GetItemsDatas() {
         if (this.MInfoId) {
           api.getEntityThen(this.MInfoId, this.$axios)
             .then(res => {
-              this.infochangedata = res.data.items;
+              this.infochangedata = res.data.items
               this.InfoData = res.data.items
             })
             .catch(err => {
@@ -1375,17 +1417,21 @@
       comparevalue(newValue) {
         let _this = this
         _this.infochangeItemList = []
-        console.log("-newValue----", newValue)
+        if (!newValue || !_this.copyformdata) {
+          return
+        }
         _.forEach(newValue, function (value, key) {
-          if (_this.copyformdata[key] != value) {
+          if (_this.copyformdata[key] !== value) {
+            _this.changedForm[key] = true
             _this.infochangeForm = {}
             _this.infochangeForm.SelectItem = key
             _this.infochangeForm.ChangeInfo = value
             _this.infochangeForm.BeChangeInfo = _this.copyformdata[key]
             _this.infochangeItemList.push(_this.infochangeForm)
+          } else {
+            _this.changedForm[key] = false
           }
         })
-        console.log("==this.infochangeItemList==", this.infochangeItemList)
       },
       //保存修改
       makesure() {
@@ -1604,13 +1650,11 @@
           MInfoId: this.MInfoId,
           InfochangeForm: this.infochangeItemList
         }
-        console.log("save", AllInfochangeItemList)
 
         api.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
           if (res.data.code === 0) {
-            console.log("---res.data.--", res.data)
             //保存成功后，初始化数据，变成修改
-            this.initDatas();
+            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
@@ -1778,6 +1822,9 @@
     .el-input__inner {
       background-color: wheat;
     }
+    .el-textarea__inner {
+      background-color: wheat;
+    }
   }
 
   .attach-uploader .el-upload {