前后端：信息变更----审批完成后更相信资质有效期,fix页面显示数据问题

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

@@ -1023,7 +1023,7 @@ func (this *InfoChangeController) AddInfoMain() {
 	var suppliermodel supplier.OilSupplier
 	var errinfo ErrorDataInfo
 	svc := infochange.GetInfoChangeService(utils.DBE)
-	where := " SupplierId = " + SupplierId + " and Status < 11"
+	where := " SupplierId = " + SupplierId + " and Status < 11 and Status != 8"
 	svc.GetEntitysByWhere(OilInfoChangeName, where, &infochm)
 	if len(infochm) > 0 {
 		errinfo.Message = "有已提交在申请中的信息变更，请审批完成后再提交！"
@@ -1821,13 +1821,12 @@ func (this *InfoChangeController) CommonAuditEntity() {
 		panic("工作流异常，请联系管理员！" + receiveVal)
 	}
 
-	// TODO 审批完成 更新相关信息
-	//var infoChangeEntityAfterUpdate infochange.OilInfoChange
-	//infoSrv.GetEntityById(infoId, &infoChangeEntityAfterUpdate)
-	//if infoChangeEntityAfterUpdate.Status == suppliercert.STOREING_STATUS {
-	//	fmt.Println("资质变更入库完成, 开始实际变更信息: supplierId" + strconv.Itoa(infoChangeEntityAfterUpdate.SupplierId) + "变更信息表ID: " + infoId)
-	//	this.updateChangeInfo(infoChangeEntityAfterUpdate.SupplierId, infoId)
-	//}
+	var infoChangeEntityAfterUpdate infochange.OilInfoChange
+	infoSrv.GetEntityById(infoId, &infoChangeEntityAfterUpdate)
+	if infoChangeEntityAfterUpdate.Status == suppliercert.STOREING_STATUS {
+		fmt.Println("资质变更入库完成, 开始实际变更信息: supplierId" + strconv.Itoa(infoChangeEntityAfterUpdate.SupplierId) + "变更信息表ID: " + infoId)
+		this.updateChangeInfo(infoChangeEntityAfterUpdate.SupplierId, infoId)
+	}
 }
 
 // @Title 交费用户确认交费
@@ -2086,11 +2085,11 @@ func (this *InfoChangeController) updateChangeInfo(supplierId int, infoId string
 	svc.GetEntities(&qualDetail, where1)
 	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"})
+			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"})
 		}
 	}
 }

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

@@ -41,10 +41,10 @@
             </el-autocomplete> -->
                   <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">
+                    v-if="authUser && authUser.Profile.IsCompanyUser == 1" :readonly="InfoStatus > 0 || butnab">
                   </el-input>
                   <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
-                    placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
+                    placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0" :readonly="InfoStatus > 0 || butnab">
                   </el-input>
                 </el-form-item>
               </el-col>
@@ -59,7 +59,7 @@
               <el-col :span="8">
                 <el-form-item label="单位关系">
                   <el-select ref="SpecType" v-model="formData.SpecTypeCode"
-                    :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''" placeholder="请选择"
+                    :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''" placeholder="请选择" :disabled="InfoStatus > 0 || butnab"
                     style="width: 100%">
                     <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
                     </el-option>
@@ -80,7 +80,7 @@
 
               <el-col :span="8">
                 <el-form-item label="中石油准入证编号">
-                  <el-input v-model="formData.PACNumber" maxlength="255" placeholder="请输入"
+                  <el-input v-model="formData.PACNumber" maxlength="255" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                             :class="changedForm['PACNumber'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -105,7 +105,7 @@
 
               <el-col :span="8">
                 <el-form-item label="管理单位">
-                  <el-select filterable clearable v-model="formData.MgrUnit" maxlength="255"
+                  <el-select filterable clearable v-model="formData.MgrUnit" maxlength="255" :disabled="InfoStatus > 0 || butnab"
                     :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">
@@ -116,7 +116,7 @@
 
               <el-col :span="8">
                 <el-form-item label="国家" prop="Country">
-                  <el-select v-model="formData.Country" filterable placeholder="请选择" style="width: 100%"
+                  <el-select v-model="formData.Country" filterable placeholder="请选择" style="width: 100%" :disabled="InfoStatus > 0 || butnab"
                     :class="changedForm['Country'] ? 'modified-form-input' : ''">
                     <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value"
                       :value="item.value">
@@ -129,7 +129,7 @@
 
               <el-col :span="8">
                 <el-form-item label="证件类型">
-                  <el-select v-model="formData.CredentialFlag" placeholder="请选择" @change="showorhid" style="width: 100%"
+                  <el-select v-model="formData.CredentialFlag" placeholder="请选择" @change="showorhid" style="width: 100%" :disabled="InfoStatus > 0 || butnab"
                     :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''">
                     <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
@@ -151,7 +151,7 @@
               <el-col :span="8">
                 <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
                   <el-input v-model="formData.CountryTaxNo" maxlength="50"
-                    :class="changedForm['CountryTaxNo'] ? 'modified-form-input' : ''" placeholder="请输入"
+                    :class="changedForm['CountryTaxNo'] ? 'modified-form-input' : ''" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -159,7 +159,7 @@
 
               <el-col :span="8">
                 <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
-                  <el-input v-model="formData.OrganCode" maxlength="50" placeholder="请输入"
+                  <el-input v-model="formData.OrganCode" maxlength="50" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['OrganCode'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -170,13 +170,13 @@
                 <el-form-item label="注册地址" prop="Province">
                   <el-row>
                     <el-col :span="10">
-                      <el-cascader ref="cascaderAdd" :options="countryoptions" :props="countryprops" maxlength="20" filterable
+                      <el-cascader ref="cascaderAdd" :options="countryoptions" :props="countryprops" maxlength="20" filterable :disabled="InfoStatus > 0 || butnab"
                         :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%"
+                      <el-input v-model="formData.Address" maxlength="500" placeholder="详细地址" style="width: 100%" :readonly="InfoStatus > 0 || butnab"
                         :class="changedForm['Address'] ? 'modified-form-input' : ''">
                       </el-input>
                     </el-col>
@@ -185,7 +185,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="邮编" prop="ZipCode">
-                  <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入"
+                  <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['ZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -195,14 +195,14 @@
                 <el-form-item label="通信地址" prop="LinkProvince">
                   <el-row>
                     <el-col :span="10">
-                      <el-cascader ref="cascaderAddrLink" :options="countryoptions" :props="countryprops" filterable
+                      <el-cascader ref="cascaderAddrLink" :options="countryoptions" :props="countryprops" filterable :disabled="InfoStatus > 0 || butnab"
                         :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%"
+                      <el-input v-model="formData.LinkAddress" maxlength="500" placeholder="详细地址" style="width: 100%" :readonly="InfoStatus > 0 || butnab"
                         :class="changedForm['LinkAddress'] ? 'modified-form-input' : ''">
                       </el-input>
                     </el-col>
@@ -211,7 +211,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="邮编" prop="LinkZipCode">
-                  <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入"
+                  <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['LinkZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -221,7 +221,7 @@
 
               <el-col :span="8">
                 <el-form-item label="法定代表人姓名" prop="LegalPerson">
-                  <el-input v-model="formData.LegalPerson" maxlength="20" placeholder="请输入"
+                  <el-input v-model="formData.LegalPerson" maxlength="20" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['LegalPerson'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -231,7 +231,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="changedForm['CompanyType'] ? 'modified-form-input' : ''" :disabled="!canUpdateSupplier"
+                    :class="changedForm['CompanyType'] ? 'modified-form-input' : ''" :disabled="InfoStatus > 0 || butnab"
                     placeholder="请选择" style="width: 100%;">
                     <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
                       style="width: 100%">
@@ -242,7 +242,7 @@
 
               <el-col :span="8">
                 <el-form-item label="注册资本" prop="RegCapital">
-                  <el-input type="number" v-model.number="formData.RegCapital" :min="1"
+                  <el-input type="number" v-model.number="formData.RegCapital" :min="1" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
                     style="width: 100%">
                     <template slot="append">万元</template>
@@ -252,7 +252,7 @@
 
               <el-col :span="8">
                 <el-form-item label="成立时间" prop="SetupTime">
-                  <el-date-picker v-model="formData.SetupTime" type="date"
+                  <el-date-picker v-model="formData.SetupTime" type="date" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
                     value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
                   </el-date-picker>
@@ -261,7 +261,7 @@
 
               <el-col :span="8">
                 <el-form-item label="开户银行" prop="DepositBank">
-                  <el-input v-model="formData.DepositBank" maxlength="50" placeholder="请输入"
+                  <el-input v-model="formData.DepositBank" maxlength="50" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['DepositBank'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -269,7 +269,7 @@
 
               <el-col :span="8">
                 <el-form-item label="银行账号" prop="BankAccount">
-                  <el-input v-model="formData.BankAccount" maxlength="50" placeholder="请输入"
+                  <el-input v-model="formData.BankAccount" maxlength="50" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['BankAccount'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -277,7 +277,7 @@
 
               <el-col :span="8">
                 <el-form-item label="联系人姓名" prop="ContactName">
-                  <el-input v-model="formData.ContactName" maxlength="20" placeholder="请输入"
+                  <el-input v-model="formData.ContactName" maxlength="20" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['ContactName'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -285,14 +285,14 @@
 
               <el-col :span="8">
                 <el-form-item label="移动电话" prop="Mobile">
-                  <el-input v-model="formData.Mobile" maxlength="20" placeholder="请输入"
+                  <el-input v-model="formData.Mobile" maxlength="20" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :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="请输入"
+                  <el-input v-model="formData.Telphone" maxlength="20" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['Telphone'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -300,28 +300,28 @@
 
               <el-col :span="8">
                 <el-form-item label="传真" prop="Fax">
-                  <el-input v-model="formData.Fax" maxlength="20" placeholder="区号-0000000"
+                  <el-input v-model="formData.Fax" maxlength="20" placeholder="区号-0000000" :readonly="InfoStatus > 0 || butnab"
                     :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="区号-0000000" maxlength="20"
+                  <el-input v-model="formData.CompanyTel" placeholder="区号-0000000" maxlength="20" :readonly="InfoStatus > 0 || butnab"
                     :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="请输入"
+                  <el-input v-model="formData.EMail" maxlength="50" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
                     :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"
+                  <el-input v-model="formData.BankCreditRating" maxlength="10" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['BankCreditRating'] ? 'modified-form-input' : ''" placeholder="请输入"
                     style="width: 100%">
                   </el-input>
@@ -331,7 +331,7 @@
               <el-col :span="8">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                  <el-select v-model="formData.HseTraining" placeholder="请选择"
+                  <el-select v-model="formData.HseTraining" placeholder="请选择" :disabled="InfoStatus > 0 || butnab"
                     :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%">
@@ -348,27 +348,27 @@
             <el-row :gutter="60">
               <el-col :span="8">
                 <el-form-item label="质量管理体系认证情况及认证机构">
-                  <el-input v-model="formData.QualitySystemCert" maxlength="200" placeholder="请输入" type="textarea"
+                  <el-input v-model="formData.QualitySystemCert" maxlength="200" placeholder="请输入" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :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"
+                  <el-input v-model="formData.ProductQualityCert" placeholder="请输入" maxlength="200" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :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"
+                  <el-input v-model="formData.MaunLicense" placeholder="请输入" maxlength="200" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['MaunLicense'] ? 'modified-form-input' : ''"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="所代理制造商名称">
-                  <el-input v-model="formData.MaunAgent" maxlength="255" placeholder="请输入" type="textarea"
+                  <el-input v-model="formData.MaunAgent" maxlength="255" placeholder="请输入" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['MaunAgent'] ? 'modified-form-input' : ''">
                   </el-input>
                 </el-form-item>
@@ -376,7 +376,7 @@
 
               <el-col :span="8">
                 <el-form-item label="中石油物资供应商证书">
-                  <el-input v-model="formData.SupplierCertificate" maxlength="255" placeholder="请输入" style="width: 100%"
+                  <el-input v-model="formData.SupplierCertificate" maxlength="255" placeholder="请输入" type="textarea" style="width: 100%" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['SupplierCertificate'] ? 'modified-form-input' : ''">
                   </el-input>
                 </el-form-item>
@@ -384,7 +384,7 @@
 
               <el-col :span="8">
                 <el-form-item label="安全生产许可证">
-                  <el-input v-model="formData.SafetyLicense" maxlength="200" placeholder="请输入" type="textarea"
+                  <el-input v-model="formData.SafetyLicense" maxlength="200" placeholder="请输入" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['SafetyLicense'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -392,20 +392,20 @@
 
               <el-col :span="8">
                 <el-form-item label="行业特殊要求的认证证书">
-                  <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" maxlength="200" type="textarea"
+                  <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" maxlength="200" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :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" placeholder="营业执照上的信息" type="textarea"
+                  <el-input v-model="formData.BusinessScope" placeholder="营业执照上的信息" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :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"
+                  <el-input v-model="formData.Remark" maxlength="500" placeholder="请输入" type="textarea" :readonly="InfoStatus > 0 || butnab"
                     :class="changedForm['Remark'] ? 'modified-form-input' : ''" style="width: 100%">
                   </el-input>
                 </el-form-item>
@@ -1663,7 +1663,7 @@
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改
             this.initDatas()
-            this.$router.push('/')
+            this.$router.push('/oilsupplier/infochangech')
             this.ComAuditdialogShow = false
             this.butnab = true
             this.$message({

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

@@ -60,8 +60,10 @@
               <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=='5'" style="color:#E6A23C">待法规处审核</span>
-              <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">审核未通过</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=='7'" style="color:#F56C6C">待入库</span>
+              <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
               <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待二级单位分办</span>
               <span v-if="scope.row.Status=='-10'" style="color:#F56C6C">分办未通过</span>
               <span v-if="scope.row.Status=='11'" style="color:#67C23A">审核通过</span>
@@ -169,10 +171,10 @@
 <script>
   import {
     mapGetters
-  } from 'vuex';
-  import supplierapi from '@/api/oilsupplier/supplier';
-  import api from '@/api/oilsupplier/infochange';
-  import annapi from '@/api/oilsupplier/annualaudit'
+  } from 'vuex'
+  // import supplierapi from '@/api/oilsupplier/supplier'
+  import api from '@/api/oilsupplier/infochange'
+  // import annapi from '@/api/oilsupplier/annualaudit'
   import page401 from '@/components/error/401.vue'
 
   export default {
@@ -186,30 +188,30 @@
     },
     name: 'annualaudit',
 
-    data() {
+    data () {
       return {
         addshow: false,
         dialogVisible: false,
         delevisble: false,
-        //列表数据
+        // 列表数据
         selectsupplierlist: [],
         entityList: [],
-        //分页参数
+        // 分页参数
         size: 10,
         currentPage: 1,
         currentItemCount: 0,
-        //列表排序
+        // 列表排序
         Column: {
           Order: '',
           Prop: ''
         },
-        //查询时间
+        // 查询时间
         CreateOn: '',
-        //查询项
+        // 查询项
         searchFormReset: {},
         entityForm: {
           Id: '',
-          SupplierId: '',
+          SupplierId: ''
         },
         searchForm: {
           Id: '',
@@ -241,7 +243,7 @@
           CreateBy: '',
           ModifiedOn: '',
           ModifiedUserId: '',
-          ModifiedBy: '',
+          ModifiedBy: ''
 
         },
         tableColumns: [
@@ -253,14 +255,14 @@
           //   sort: true
           // },
           {
-            prop: "SupplierName",
+            prop: 'SupplierName',
             label: '企业名称',
             width: 100,
             sort: true
           },
 
           {
-            prop: "PACNumber",
+            prop: 'PACNumber',
             label: '中石油准入证编号',
             width: 200,
             sort: true
@@ -273,7 +275,6 @@
           //   sort: true
           // },
 
-
           // {
           //   prop: "MgrUnit",
           //   label: '管理单位',
@@ -309,36 +310,36 @@
           // },
 
           {
-            prop: "CommercialNo",
+            prop: 'CommercialNo',
             label: '工商注册号',
             width: 100,
             sort: true
-          },
+          }
 
         ],
         IsCompanyUser: 0,
         supplierList: [],
-        suplen: 1,
+        suplen: 1
       }
     },
-    created() {
+    created () {
       this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-      //查询条件初始值备份
+      // 查询条件初始值备份
       Object.assign(this.searchFormReset, this.searchForm)
-      //查询列表
+      // 查询列表
       this.initDatas()
       this.getselectsupplier()
-      //this.getDictOptions()
+      // this.getDictOptions()
       this.getSupplierList()
     },
     methods: {
-        initDatas() {
-        //分页及列表条件
+      initDatas () {
+        // 分页及列表条件
         let params = {
           _currentPage: this.currentPage,
           _size: this.size,
           Order: this.Column.Order,
-          Prop: this.Column.Prop,
+          Prop: this.Column.Prop
         }
         let myCreateOn = []
         // 解析时间
@@ -349,9 +350,9 @@
           myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
           myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
         }
-        //查询条件
+        // 查询条件
         Object.assign(params, this.searchForm)
-        //访问接口
+        // 访问接口
         api.getSuppList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
@@ -359,15 +360,15 @@
           console.error(err)
         })
       },
-      getSupplierList() {
+      getSupplierList () {
         let _this = this
         _this.supplierList = []
         let params = {
-          SuppTypeCode: '',
+          SuppTypeCode: ''
         }
         _this.$axios.get('/annualaudit/getsupplierforchange', {
-            params
-          })
+          params
+        })
           .then(res => {
             _this.supplierList = res.data
             if (_this.supplierList) {
@@ -397,77 +398,74 @@
           console.error(err)
         })
       },
-      addinfochange() {
+      addinfochange () {
         if (this.IsCompanyUser === 1) {
           this.addInfoChangeCom()
         } else {
           this.addshow = true
         }
       },
-      addInfoChangeCom() {
+      addInfoChangeCom () {
         if (this.entityForm.SupplierId > 0) {
-          this.$confirm("确定添加变更申请, 是否继续?", "提示", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
+          this.$confirm('确定添加变更申请, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           })
             .then(() => {
               api.addInfoChMain(this.entityForm, this.$axios).then(res => {
                 if (res.data.code === 0) {
-                  //保存成功后，初始化数据，变成修改
-                  this.entityForm.Id = res.data.item;
+                  // 保存成功后，初始化数据，变成修改
+                  this.entityForm.Id = res.data.item
                   this.$router.push({
                     path: '/oilsupplier/infochangech/' + this.entityForm.SupplierId + '/operation',
                     query: {
                       InfoStatus: 0,
-                      infoId: this.entityForm.Id,
+                      infoId: this.entityForm.Id
                     }
                   })
                   this.$message({
                     type: 'success',
                     message: res.data.message
-                  });
-
+                  })
                 } else {
                   this.$message({
                     type: 'warning',
                     message: res.data.message
-                  });
+                  })
                 }
               }).catch(err => {
                 console.error(err)
-              });
+              })
             })
-            .catch(() => {});
+            .catch(() => {})
         }
       },
-      addInfoChange() {
+      addInfoChange () {
         this.$refs['EntityFormref'].validate((valid) => {
           if (valid) {
-            this.entityForm.SupplierId = this.entityForm.SupplierId + ""
+            this.entityForm.SupplierId = this.entityForm.SupplierId + ''
             api.addInfoChMain(this.entityForm, this.$axios).then(res => {
               if (res.data.code === 0) {
-                //保存成功后，初始化数据，变成修改
-                this.entityForm.Id = res.data.item;
-                this.initDatas();
+                // 保存成功后，初始化数据，变成修改
+                this.entityForm.Id = res.data.item
+                this.initDatas()
                 this.addshow = false
                 this.$message({
                   type: 'success',
                   message: res.data.message
-                });
-
+                })
               } else {
                 this.$message({
                   type: 'warning',
                   message: res.data.message
-                });
+                })
               }
             }).catch(err => {
               console.error(err)
-            });
+            })
           }
         })
-
       },
       delInfoChangech (Id) {
         this.$confirm('该操作将彻底删除的数据，是否继续？', '提示', {
@@ -491,25 +489,25 @@
           })
         })
       },
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
-          //this.dictOptions.customerList = res.data.items['customerList']
-          //this.dictOptions.projectList = res.data.items['projectList']
+          // this.dictOptions.customerList = res.data.items['customerList']
+          // this.dictOptions.projectList = res.data.items['projectList']
 
         }).catch(err => {
           console.error(err)
         })
       },
 
-      searchCommand(command) {
+      searchCommand (command) {
         if (command == 'search') {
           this.dialogVisible = true
         } else if (command == 'clear') {
           this.clearSearch()
         }
       },
-      //列表排序功能
-      orderby(column) {
+      // 列表排序功能
+      orderby (column) {
         if (column.order == 'ascending') {
           this.Column.Order = 'asc'
         } else if (column.order == 'descending') {
@@ -518,47 +516,46 @@
         this.Column.Prop = column.prop
         this.initDatas()
       },
-      clearSearch() {
-        Object.assign(this.searchForm, this.searchFormReset);
-        //this.searchForm = this.searchFormReset;
+      clearSearch () {
+        Object.assign(this.searchForm, this.searchFormReset)
+        // this.searchForm = this.searchFormReset;
         this.CreateOn = ''
         this.initDatas()
       },
-      handleSearch() {
-        this.currentPage = 1;
-        this.dialogVisible = false;
-        this.initDatas();
+      handleSearch () {
+        this.currentPage = 1
+        this.dialogVisible = false
+        this.initDatas()
       },
-      handleCurrentChange(value) {
+      handleCurrentChange (value) {
         this.currentPage = value
         this.initDatas()
       },
-      handleSizeChange(value) {
+      handleSizeChange (value) {
         this.size = value
         this.currentPage = 1
         this.initDatas()
       },
-      deleteEntity(row) {
+      deleteEntity (row) {
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
-            this.initDatas();
+            this.initDatas()
             this.$message({
               type: 'success',
               message: res.data.message
-            });
-
+            })
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
-            });
+            })
           }
         }).catch(err => {
           console.error(err)
-        });
+        })
       },
 
-      jstimehandle(val) {
+      jstimehandle (val) {
         if (val === '') {
           return '----'
         } else if (val === '0001-01-01T00:00:00Z') {
@@ -573,20 +570,19 @@
         }
       },
 
-      formatDateTime(date) {
-        var y = date.getFullYear();
-        var m = date.getMonth() + 1;
-        m = m < 10 ? ('0' + m) : m;
-        var d = date.getDate();
-        d = d < 10 ? ('0' + d) : d;
-        var h = date.getHours();
-        var minute = date.getMinutes();
-        minute = minute < 10 ? ('0' + minute) : minute;
-        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      formatDateTime (date) {
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        m = m < 10 ? ('0' + m) : m
+        var d = date.getDate()
+        d = d < 10 ? ('0' + d) : d
+        var h = date.getHours()
+        var minute = date.getMinutes()
+        minute = minute < 10 ? ('0' + minute) : minute
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute
       }
     }
   }
-
 </script>
 
 <style lang="scss">