信息变更，变更项，地址

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

@@ -1,9 +1,9 @@
-
 <template>
   <div>
     <!--startprint1-->
     <!--打印内容开始-->
-    <el-form class="formDataInfo" label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform" :disabled="disabled">
+    <el-form class="formDataInfo" label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform"
+      :disabled="disabled">
       <el-row>
         <!--<el-col :span="8">
           <el-form-item label="DEMO">
@@ -19,29 +19,33 @@
         </el-col>-->
 
         <el-col :span="16">
-          <el-form-item label="供方名称" prop="SupplierName" >
+          <el-form-item label="供方名称" prop="SupplierName">
             <!-- <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"  :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
+            <el-input v-model="formData.SupplierName" :maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入"
+              style="width: 100%" v-if="authUser && authUser.Profile.IsCompanyUser == 1">
             </el-input>
-            <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%" v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
+            <el-input v-model="formData.SupplierName" :maxlength="255" @change="inputCompanyName"
+              :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"
+              v-if="!authUser || authUser.Profile.IsCompanyUser == 0">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8" v-if="this.formData.Status == '7'||this.formData.Status == '8'||appendStatus">
           <el-form-item label="准入编码">
-            <el-input v-model="formData.AccessCardNo" :readonly="this.formData.Status != '7'||this.formData.Status != '8'||appendStatus" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.AccessCardNo"
+              :readonly="this.formData.Status != '7'||this.formData.Status != '8'||appendStatus" placeholder="请输入"
+              style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="供应商类型">
             <el-select ref="OperType" v-model="formData.OperType" :disabled="this.formData.Status > '0'&&!appendStatus"
-                       placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Key">
+              placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in OperTypeOptions" :key="item.Id" :label="item.Key" :value="item.Key">
               </el-option>
             </el-select>
           </el-form-item>
@@ -49,25 +53,21 @@
 
         <el-col :span="8">
           <el-form-item label="单位关系">
-            <el-select ref="SpecType" v-model="formData.SpecTypeCode" @change="currentSel" :disabled="this.formData.Status > '0'&&!appendStatus"
-                       placeholder="请选择" style="width: 100%">
-              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
+            <el-select ref="SpecType" v-model="formData.SpecTypeCode" @change="currentSel"
+              :disabled="this.formData.Status > '0'&&!appendStatus" placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="国家" prop="Country" >
+          <el-form-item label="国家" prop="Country">
             <!--<el-input v-model="formData.Country" maxlength="255" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
             </el-input>-->
-            <el-select v-model="formData.Country" :disabled="!canUpdateSupplier" filterable placeholder="请选择" style="width: 100%">
-              <el-option
-                v-for="item in countryListOptions"
-                :key="item.key"
-                :label="item.value"
-                :value="item.value">
+            <el-select v-model="formData.Country" :disabled="!canUpdateSupplier" filterable placeholder="请选择"
+              style="width: 100%">
+              <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value" :value="item.value">
                 <span style="float: left">{{ item.value }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
               </el-option>
@@ -77,28 +77,28 @@
 
         <el-col :span="8">
           <el-form-item label="准入方式">
-            <el-select  ref="inStyle" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
-                       placeholder="请选择" style="width: 100%" @change="InStyleChange">
-              <el-option  v-for="item in InOptions" :key="item.Id" :label="item.Key"
-                         :value="item.Value">
+            <el-select ref="inStyle" v-model="formData.InStyle" :disabled="this.formData.Status > '0'&&!appendStatus"
+              placeholder="请选择" style="width: 100%" @change="InStyleChange">
+              <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" :value="item.Value">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
 
-         <el-col :span="8">
-          <el-form-item label="管理单位" >
-            <el-select filterable v-model="formData.MgrUnit" maxlength="255"  clearable :disabled="this.formData.Status > '0'&&!appendStatus" placeholder="请输入" style="width: 100%">
-            <el-option  v-for="item in ManagementUnitOptions" :key="item.Value" :label="item.Key"
-                         :value="item.Key">
+        <el-col :span="8">
+          <el-form-item label="管理单位">
+            <el-select filterable v-model="formData.MgrUnit" maxlength="255" clearable
+              :disabled="this.formData.Status > '0'&&!appendStatus" 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" :readonly="this.formData.Status > '0'&&!appendStatus" placeholder="请输入" style="width: 100%">
+        <el-col :span="8">
+          <el-form-item label="中石油准入证编号">
+            <el-input v-model="formData.PACNumber" maxlength="255" :readonly="this.formData.Status > '0'&&!appendStatus"
+              placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -106,8 +106,9 @@
 
 
         <el-col :span="8">
-           <el-form-item label="证件合一">
-            <el-select v-model="formData.CredentialFlag" :disabled="!canUpdateSupplier" placeholder="请选择"  @change="showorhid" style="width: 100%">
+          <el-form-item label="证件合一">
+            <el-select v-model="formData.CredentialFlag" :disabled="!canUpdateSupplier" placeholder="请选择"
+              @change="showorhid" style="width: 100%">
               <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
@@ -115,8 +116,9 @@
         </el-col>
 
         <el-col :span="8">
-          <el-form-item label="统一社会信用代码" prop="CommercialNo" >
-            <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+          <el-form-item label="统一社会信用代码" prop="CommercialNo">
+            <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+              style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -125,14 +127,16 @@
 
         <el-col :span="8">
           <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
-            <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+              style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
           <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
-            <el-input v-model="formData.OrganCode" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.OrganCode" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+              style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -147,42 +151,48 @@
           <el-form-item label="注册地址" prop="Province">
             <el-row>
               <el-col :span="10">
-                <el-cascader ref="cascaderAdd" :options="countryoptions" :props="countryprops" maxlength="20" :disabled="!canUpdateSupplier" placeholder="省市区"
-                             v-model="CityAry" style="width: 100%" @change="handleAreaChange">
+                <el-cascader ref="cascaderAdd" :options="countryoptions" :props="countryprops" maxlength="20"
+                  :disabled="!canUpdateSupplier" 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="详细地址" :readonly="!canUpdateSupplier" style="width: 100%">
+                <el-input v-model="formData.Address" maxlength="500" placeholder="详细地址" :readonly="!canUpdateSupplier"
+                  style="width: 100%">
                 </el-input>
               </el-col>
             </el-row>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="邮编" prop="ZipCode" >
-            <el-input v-model="formData.ZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+          <el-form-item label="邮编" prop="ZipCode">
+            <el-input v-model="formData.ZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+              style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="16">
-          <el-form-item label="通信地址" prop="LinkProvince" >
+          <el-form-item label="通信地址" prop="LinkProvince">
             <el-row>
               <el-col :span="10">
-                <el-cascader ref="cascaderAddrLink" :options="countryoptions" :props="countryprops" :disabled="!canUpdateSupplier" placeholder="省市区"
-                             v-model="LinkCityAry" maxlength="20" style="width: 100%" @change="handleLinkAreaChange">
+                <el-cascader ref="cascaderAddrLink" :options="countryoptions" :props="countryprops"
+                  :disabled="!canUpdateSupplier" 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" :readonly="!canUpdateSupplier" placeholder="详细地址" style="width: 100%">
+                <el-input v-model="formData.LinkAddress" maxlength="500" :readonly="!canUpdateSupplier"
+                  placeholder="详细地址" style="width: 100%">
                 </el-input>
               </el-col>
             </el-row>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="邮编" prop="LinkZipCode" >
-            <el-input v-model="formData.LinkZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+          <el-form-item label="邮编" prop="LinkZipCode">
+            <el-input v-model="formData.LinkZipCode" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+              style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -210,7 +220,7 @@
             <el-input v-model="formData.HouseNo" placeholder="请输入" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>-->
-        </el-row>
+      </el-row>
       <el-row>
 
 
@@ -221,19 +231,20 @@
         </el-col>-->
         <el-row>
           <el-col :span="8">
-            <el-form-item label="法定代表人姓名" prop="LegalPerson" >
-              <el-input v-model="formData.LegalPerson" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-form-item label="法定代表人姓名" prop="LegalPerson">
+              <el-input v-model="formData.LegalPerson" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+                style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="公司类型" prop="CompanyType" >
+            <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 :disabled="!canUpdateSupplier" placeholder="请选择"
-                         style="width: 100%;">
+              <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create
+                :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%">
+                  style="width: 100%">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -243,21 +254,21 @@
             <el-form-item label="成立时间">
               <!--<el-date v-model="formData.SetupTime" maxlength="50" type="date" placeholder="请输入"
                 style="width: 100%"> </el-date>-->
-              <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier" format="yyyy 年 MM 月 dd 日"
-                              value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
+              <el-date-picker v-model="formData.SetupTime" type="date" :readonly="!canUpdateSupplier"
+                format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
               </el-date-picker>
             </el-form-item>
           </el-col>
 
         </el-row>
 
-          <!--<el-col :span="8">
+        <!--<el-col :span="8">
             <el-form-item label="行业类别">
               <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>-->
 
-          <!--<el-col :span="8">
+        <!--<el-col :span="8">
             <el-form-item label="行业类别名称">
               <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
             </el-form-item>
@@ -265,8 +276,9 @@
         <el-row>
 
           <el-col :span="8">
-            <el-form-item label="注册资本" prop="RegCapital" >
-              <el-input type="number" v-model="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-form-item label="注册资本" prop="RegCapital">
+              <el-input type="number" v-model="formData.RegCapital" :min="1" :readonly="!canUpdateSupplier"
+                placeholder="请输入" style="width: 100%">
                 <template slot="append">万元</template>
               </el-input>
             </el-form-item>
@@ -275,7 +287,7 @@
           <el-col :span="8">
             <el-form-item label="币种">
               <el-select v-model="formData.Currency" :disabled="!canUpdateSupplier" placeholder="请选择"
-                         style="width: 100%;">
+                style="width: 100%;">
                 <el-option v-for="item in CurrencyOptions" :key="item.Value" :label="item.Key" :value="item.Value">
                 </el-option>
               </el-select>
@@ -283,8 +295,9 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="开户银行" prop="DepositBank" >
-              <el-input v-model="formData.DepositBank" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-form-item label="开户银行" prop="DepositBank">
+              <el-input v-model="formData.DepositBank" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+                style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
@@ -294,48 +307,55 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="联系人姓名" prop="ContactName">
-              <el-input v-model="formData.ContactName" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+              <el-input v-model="formData.ContactName" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+                style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="移动电话" prop="Mobile" >
-              <el-input v-model="formData.Mobile" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"></el-input>
+            <el-form-item label="移动电话" prop="Mobile">
+              <el-input v-model="formData.Mobile" maxlength="20" :readonly="!canUpdateSupplier" placeholder="请输入"
+                style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="银行账号" prop="BankAccount" >
-              <el-input v-model="formData.BankAccount" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-form-item label="银行账号" prop="BankAccount">
+              <el-input v-model="formData.BankAccount" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+                style="width: 100%">
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-col :span="8">
-          <el-form-item label="固定电话" prop="Telphone" >
-            <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000" style="width: 100%">
+          <el-form-item label="固定电话" prop="Telphone">
+            <el-input v-model="formData.Telphone" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
+              style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
 
         <el-col :span="8">
-          <el-form-item label="传真" prop="Fax" >
-            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000" style="width: 100%"></el-input>
+          <el-form-item label="传真" prop="Fax">
+            <el-input v-model="formData.Fax" maxlength="20" :readonly="!canUpdateSupplier" placeholder="区号-0000000"
+              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" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="20" style="width: 100%">
+          <el-form-item label="财务电话" prop="CompanyTel">
+            <el-input v-model="formData.CompanyTel" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="20"
+              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" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%"></el-input>
+          <el-form-item label="电子邮箱" prop="EMail">
+            <el-input v-model="formData.EMail" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入"
+              style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
 
@@ -347,7 +367,8 @@
 
         <el-col :span="8">
           <el-form-item label="银行信用等级">
-            <el-input v-model="formData.BankCreditRating" maxlength="10" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
+            <el-input v-model="formData.BankCreditRating" maxlength="10" :readonly="!canUpdateSupplier"
+              placeholder="请输入" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -366,9 +387,10 @@
         <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" :disabled="!canUpdateSupplier" placeholder="请选择" style="width: 100%;">
+            <el-select v-model="formData.HseTraining" :disabled="!canUpdateSupplier" placeholder="请选择"
+              style="width: 100%;">
               <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
-                         style="width: 100%">
+                style="width: 100%">
               </el-option>
             </el-select>
 
@@ -378,27 +400,31 @@
       </el-row>
     </el-form>
 
-    <el-form class="formDataInfo" label-position="top" ref="EntityFormCert" :rules="rulesform" :model="formData" :disabled="disabled">
+    <el-form class="formDataInfo" label-position="top" ref="EntityFormCert" :rules="rulesform" :model="formData"
+      :disabled="disabled">
       <el-row :gutter="60">
         <el-col :span="8">
           <el-form-item label="质量管理体系认证情况及认证机构">
-            <el-input v-model="formData.QualitySystemCert" :readonly="this.formData.Status > '0'" maxlength="200" placeholder="请输入" type="textarea"
-                      style="width: 100%"></el-input>
+            <el-input v-model="formData.QualitySystemCert" :readonly="this.formData.Status > '0'" maxlength="200"
+              placeholder="请输入" type="textarea" style="width: 100%"></el-input>
           </el-form-item>
         </el-col>
-      <el-col :span="8">
+        <el-col :span="8">
           <el-form-item label="产品质量认证情况及认证机构">
-            <el-input v-model="formData.ProductQualityCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"></el-input>
+            <el-input v-model="formData.ProductQualityCert" :readonly="this.formData.Status > '0'" placeholder="请输入"
+              maxlength="200" type="textarea"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="生产/制造许可证获证情况及编号">
-            <el-input v-model="formData.MaunLicense" placeholder="请输入" :readonly="this.formData.Status > '0'" maxlength="200" type="textarea"></el-input>
+            <el-input v-model="formData.MaunLicense" placeholder="请输入" :readonly="this.formData.Status > '0'"
+              maxlength="200" type="textarea"></el-input>
           </el-form-item>
         </el-col>
-         <el-col :span="8">
-          <el-form-item label="所代理制造商名称" >
-            <el-input v-model="formData.MaunAgent" maxlength="255" :readonly="this.formData.Status > '0'" placeholder="请输入" type="textarea">
+        <el-col :span="8">
+          <el-form-item label="所代理制造商名称">
+            <el-input v-model="formData.MaunAgent" maxlength="255" :readonly="this.formData.Status > '0'"
+              placeholder="请输入" type="textarea">
             </el-input>
           </el-form-item>
         </el-col>
@@ -424,29 +450,29 @@
         </el-col>-->
         <el-col :span="8">
           <el-form-item label="安全生产许可证">
-            <el-input v-model="formData.SafetyLicense" :readonly="this.formData.Status > '0'" maxlength="200" placeholder="请输入" type="textarea"
-                      style="width: 100%">
+            <el-input v-model="formData.SafetyLicense" :readonly="this.formData.Status > '0'" maxlength="200"
+              placeholder="请输入" type="textarea" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
 
         <el-col :span="8">
           <el-form-item label="行业特殊要求的认证证书">
-            <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入" maxlength="200" type="textarea"
-                      style="width: 100%">
+            <el-input v-model="formData.SpecIndustryCert" :readonly="this.formData.Status > '0'" placeholder="请输入"
+              maxlength="200" type="textarea" 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" :readonly="!canUpdateSupplier" placeholder="营业执照上的信息" type="textarea"
-                      style="width: 100%"></el-input>
+            <el-input v-model="formData.BusinessScope" maxlength="200" :readonly="!canUpdateSupplier"
+              placeholder="营业执照上的信息" type="textarea" 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" :readonly="this.formData.Status > '0'" placeholder="请输入" type="textarea"
-                      style="width: 100%">
+            <el-input v-model="formData.Remark" maxlength="500" :readonly="this.formData.Status > '0'" placeholder="请输入"
+              type="textarea" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
@@ -487,107 +513,105 @@
         default: false
       },
     },
-    data () {
+    data() {
 
 
-      var checkemail= (rule, value, callback) => {
-          if (value) {
-            let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的邮箱地址'))
-            } else {
-              callback()
-            }
-          }
-          else{
+      var checkemail = (rule, value, callback) => {
+        if (value) {
+          let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的邮箱地址'))
+          } else {
             callback()
           }
-        };
+        } else {
+          callback()
+        }
+      };
 
-      var checkCommercialNo =  (rule, value, callback) => {
+      var checkCommercialNo = (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入统一社会信用代码'));
         } else {
-          if(this.showorhidflag=='hid'){
+          if (this.showorhidflag == 'hid') {
             let re = /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g
             if (!re.test(value)) {
               callback(new Error('请输入正确的统一社会信用代码'))
             } else {
               callback()
             }
-          }
-          else{
+          } else {
             callback()
           }
         }
       };
       //查找是否有公司信息，若有则补全信息。
-      var checkSupplierName =  (rule, value, callback) => {
+      var checkSupplierName = (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入供方名称'));
         } else {
           callback();
         }
       };
-       //检查邮编格式
-      var checkZipCode =  (rule, value, callback) => {
+      //检查邮编格式
+      var checkZipCode = (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入邮编'));
         } else {
           let re = /^[1-9]\d{5}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的邮编'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的邮编'))
+          } else {
+            callback()
+          }
         }
       };
       //检查手机号
-       var checkMobile =  (rule, value, callback) => {
+      var checkMobile = (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入手机号码'));
         } else {
           let re = /^1[3456789]\d{9}$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的手机号码'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的手机号码'))
+          } else {
+            callback()
+          }
         }
       };
 
-        //固话检验
-       var checkTelphone =  (rule, value, callback) => {
+      //固话检验
+      var checkTelphone = (rule, value, callback) => {
         if (!value) {
           callback(new Error('请输入固话号码'));
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的固话格式为：区号-0000000'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的固话格式为：区号-0000000'))
+          } else {
+            callback()
+          }
         }
       };
 
       //传真检验
-       var checkFax =  (rule, value, callback) => {
+      var checkFax = (rule, value, callback) => {
         if (!value) {
           callback();
         } else {
           let re = /^((0\d{2,3}-\d{7,8})|(1[35874]\d{9}))$/
-            if (!re.test(value)) {
-              callback(new Error('请输入正确的传真格式为：区号-0000000'))
-            } else {
-              callback()
-            }
+          if (!re.test(value)) {
+            callback(new Error('请输入正确的传真格式为：区号-0000000'))
+          } else {
+            callback()
+          }
         }
       };
 
       return {
-        address:[],
-        linkaddress:[],
-        showorhidflag:'hid',
+        address: [],
+        linkaddress: [],
+        showorhidflag: 'hid',
         selectoptions: [{
           value: '1',
           label: '三证合一'
@@ -600,7 +624,7 @@
         }],
         companyReadonly: false,
         companynames: [],
-        ManagementUnitOptions:[],
+        ManagementUnitOptions: [],
         UnitRelationOptions: [],
         OperTypeOptions: [],
         InOptions: [],
@@ -641,7 +665,7 @@
             validator: checkFax,
             trigger: 'blur'
           }],
-          BusinessScope:[{
+          BusinessScope: [{
             required: true,
             message: '请输入营业范围',
             trigger: 'change'
@@ -751,28 +775,28 @@
         },
       }
     },
-    created () {
+    created() {
       // if(this.authUser && this.authUser.Profile.IsCompanyUser === 1){
       //   this.inputCompanyName(this.authUser.Profile.Realname)
       // }
     },
     watch: {
       dictData: {
-        handler (newName, oldName) {
+        handler(newName, oldName) {
           this.getDictOptions()
         },
         immediate: true
       }
     },
     methods: {
-      InStyleChange (val) {
+      InStyleChange(val) {
         if (val === '2') {
           this.formData.MgrUnit = '中国石油天然气股份有限公司'
         }
       },
-      currentSel (event) {
-        if (event==2){
-          this.formData.InStyle='5'
+      currentSel(event) {
+        if (event == 2) {
+          this.formData.InStyle = '5'
           // for(let item of this.$refs.inStyle.options) {
           //   if(item.value=='5'){
           //       console.log(item.style)
@@ -780,24 +804,23 @@
           //      //隐藏
           //   }
           // }
-          }else{
-            this.formData.InStyle='1'
-            }
+        } else {
+          this.formData.InStyle = '1'
+        }
       },
 
-      showorhid(val){
-          if(val=='1'||val=='2'){
-            this.showorhidflag='hid'
-            this.formData.OrganCode=""
-            this.formData.CountryTaxNo=""
-          }
-          else{
-            if(this.formData.CommercialNo!=""){
-              this.formData.OrganCode=this.formData.CommercialNo
-              this.formData.CountryTaxNo=this.formData.CommercialNo
-            }
-             this.showorhidflag='show'
+      showorhid(val) {
+        if (val == '1' || val == '2') {
+          this.showorhidflag = 'hid'
+          this.formData.OrganCode = ""
+          this.formData.CountryTaxNo = ""
+        } else {
+          if (this.formData.CommercialNo != "") {
+            this.formData.OrganCode = this.formData.CommercialNo
+            this.formData.CountryTaxNo = this.formData.CommercialNo
           }
+          this.showorhidflag = 'show'
+        }
       },
       //注释原因：三证合一，五证合一，取消自动填充
       // commnoChange () {
@@ -842,10 +865,10 @@
               _this.formData.DepositBank = res.data.items[0].DepositBank
               _this.formData.BankAccount = res.data.items[0].BankAccount
               _this.formData.ContactName = res.data.items[0].ContactName
-              if(res.data.items[0].Mobile!=null&&res.data.items[0].Mobile!=""){
-                  _this.formData.Mobile = res.data.items[0].Mobile
-              }else{
-                 _this.formData.Mobile = res.data.items[0].UserTelephone
+              if (res.data.items[0].Mobile != null && res.data.items[0].Mobile != "") {
+                _this.formData.Mobile = res.data.items[0].Mobile
+              } else {
+                _this.formData.Mobile = res.data.items[0].UserTelephone
               }
               _this.formData.Telphone = res.data.items[0].Telphone
               _this.formData.Fax = res.data.items[0].Fax
@@ -861,9 +884,9 @@
           })
       },
 
-      getDictOptions () {
+      getDictOptions() {
         if (this.dictData) {
-          this.ManagementUnitOptions=this.dictData['ManagementUnit']
+          this.ManagementUnitOptions = this.dictData['ManagementUnit']
           this.UnitRelationOptions = this.dictData['UnitRelation']
           this.OperTypeOptions = this.dictData['OperType']
           this.InOptions = this.dictData['InOptions']
@@ -884,13 +907,13 @@
           // }
         }
       },
-      getCityList (val) {
+      getCityList(val) {
         let resultData = JSON.parse(val)
         let countstr = JSON.stringify(resultData.districts[0].districts)
         countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
         this.countryoptions = JSON.parse(countstr)
       },
-      getCountryList (val) {
+      getCountryList(val) {
         let tmpJson = JSON.parse(val)
         this.countryListOptions = []
         for (let idx in tmpJson) {
@@ -910,8 +933,8 @@
         this.formData.City = value[1]
         this.formData.Street = value[2]
         //this.formData.ZipCode = value[2]
-        this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
-        this.formData.LinkAllAddress= this.linkaddress[0]+'/'+this.linkaddress[1]+'/'+this.linkaddress[2]
+        this.address = this.$refs['cascaderAdd'].currentLabels
+        this.formData.AllAddress = this.address[0] + '/' + this.address[1] + '/' + this.address[2]
       },
       handleLinkAreaChange(value) {
         this.formData.LinkProvince = value[0]
@@ -919,10 +942,10 @@
         this.formData.LinkStreet = value[2]
         //this.formData.LinkZipCode = value[2]
         this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
-        this.formData.LinkAllAddress= this.linkaddress[0]+'/'+this.linkaddress[1]+'/'+this.linkaddress[2]
+        this.formData.LinkAllAddress = this.linkaddress[0] + '/' + this.linkaddress[1] + '/' + this.linkaddress[2]
       },
 
-      formatDateTime (date) {
+      formatDateTime(date) {
         var y = date.getFullYear();
         var m = date.getMonth() + 1;
         m = m < 10 ? ('0' + m) : m;
@@ -940,7 +963,7 @@
       //   // 调用 callback 返回建议列表的数据
       //   cb(results)
       // },
-      createFilter (queryString) {
+      createFilter(queryString) {
         return (restaurant) => {
           return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
         }
@@ -948,36 +971,40 @@
       // handleSelect (item) {
       //   this.$emit('selectcompany', item)
       // },
-      inputCompanyName (val) {
+      inputCompanyName(val) {
         this.$emit('inputcompany', val)
       },
-      }
     }
+  }
 
 </script>
 <style>
-.formDataInfo .el-input__inner[readonly]{
-    border-color:#DCDFE6;
-}
-.formDataInfo .el-input__inner[readonly]:focus{
-    border-color:#DCDFE6;
-}
-.formDataInfo .el-textarea__inner[readonly]{
-    border-color:#DCDFE6;
-}
-.formDataInfo .el-textarea__inner[readonly]:focus{
-    border-color:#DCDFE6;
-}
-
-.formDataInfo .el-input__inner[disabled]{
-    color:black;
+  .formDataInfo .el-input__inner[readonly] {
+    border-color: #DCDFE6;
+  }
+
+  .formDataInfo .el-input__inner[readonly]:focus {
+    border-color: #DCDFE6;
+  }
+
+  .formDataInfo .el-textarea__inner[readonly] {
+    border-color: #DCDFE6;
+  }
+
+  .formDataInfo .el-textarea__inner[readonly]:focus {
+    border-color: #DCDFE6;
+  }
+
+  .formDataInfo .el-input__inner[disabled] {
+    color: black;
     opacity: 1;
     background-color: white;
-}
-.formDataInfo .el-textarea__inner[disabled]{
-    color:black;
+  }
+
+  .formDataInfo .el-textarea__inner[disabled] {
+    color: black;
     opacity: 1;
     background-color: white;
-}
+  }
 
 </style>

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

@@ -802,8 +802,8 @@
         this.formData.City = value[1]
         this.formData.Street = value[2]
         //this.formData.ZipCode = value[2]
-        this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
-        this.formData.LinkAllAddress= this.linkaddress[0]+'/'+this.linkaddress[1]+'/'+this.linkaddress[2]
+        this.address = this.$refs['cascaderAdd'].currentLabels
+        this.formData.AllAddress = this.address[0] + '/' + this.address[1] + '/' + this.address[2]
       },
       handleLinkAreaChange (value) {
         this.formData.LinkProvince = value[0]

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

@@ -940,6 +940,8 @@
           Id: '',
           SupplierName: '',
           OilCertificateNo: '',
+          AllAddress: '',
+          LinkAllAddress: '',
           Grade: '',
           MgrUnit: '',
           OperType: '',
@@ -1024,6 +1026,8 @@
           WorkFlowId: '',
           Status: '',
         },
+        address: [],
+        linkaddress: [],
         chooseAuditorVisible: false,
         fushenauditer: '', //复审人员
         auditer: '',
@@ -1198,7 +1202,7 @@
       initDatas() {
         this.getMainInfo()
         let params = {
-          InfomainId : this.MInfoId
+          InfomainId: this.MInfoId
         }
         if (this.formData.Id) {
           api.GetChangeEntity(this.formData.Id, params, this.$axios)
@@ -1416,48 +1420,59 @@
         if (this.MInfoId) {
           api.getEntityThen(this.MInfoId, this.$axios)
             .then(res => {
+              this.InfoData = []
               this.infochangedata = res.data.items
-              this.InfoData = res.data.items
+              if (this.infochangedata) {
+                for (var i = 0; i < this.infochangedata.length; i++) {
+                  if (this.infochangedata[i].SelectItem != "Province" && this.infochangedata[i].SelectItem !=
+                    "City" && this.infochangedata[i].SelectItem != "Street" && this.infochangedata[i]
+                    .SelectItem != "LinkProvince" && this.infochangedata[i].SelectItem != "LinkCity" && this
+                    .infochangedata[i].SelectItem != "LinkStreet") {
+                    this.InfoData.push(this.infochangedata[i])
+                  }
+                }
+              }
+              console.log("-this.InfoData---",this.InfoData)
             })
             .catch(err => {
               console.error(err);
             });
         }
       },
-      InStyleChange (val) {
+      InStyleChange(val) {
         if (val === '2') {
           this.formData.MgrUnit = '中国石油天然气股份有限公司'
         }
       },
-       bfdataformat(val) {
+      bfdataformat(val) {
         //debugger
         if (val.SelectItem == "SpecTypeCode") {
-          if (val.BeChangeInfo == "1"){
+          if (val.BeChangeInfo == "1") {
             return "一般外部"
-          }else if (val.BeChangeInfo == "2") {
+          } else if (val.BeChangeInfo == "2") {
             return "多元内部"
           }
-        }else if (val.SelectItem == "InStyle") {
-          if (val.BeChangeInfo == "1"){
+        } else if (val.SelectItem == "InStyle") {
+          if (val.BeChangeInfo == "1") {
             return "评审准入"
-          }else if (val.BeChangeInfo == "2") {
+          } else if (val.BeChangeInfo == "2") {
             return "一级物资备案准入"
-          }else if (val.BeChangeInfo == "3") {
+          } else if (val.BeChangeInfo == "3") {
             return "二级物资备案准入"
-          }else if (val.BeChangeInfo == "4") {
+          } else if (val.BeChangeInfo == "4") {
             return "战略合作准入"
-          }else if (val.BeChangeInfo == "5") {
+          } else if (val.BeChangeInfo == "5") {
             return "内部多元准入"
           }
-        }else if (val.SelectItem == "CredentialFlag") {
-          if (val.BeChangeInfo == "1"){
+        } else if (val.SelectItem == "CredentialFlag") {
+          if (val.BeChangeInfo == "1") {
             return "三证合一"
-          }else if (val.BeChangeInfo == "2") {
+          } else if (val.BeChangeInfo == "2") {
             return "五证合一"
-          }else if (val.BeChangeInfo == "3") {
+          } else if (val.BeChangeInfo == "3") {
             return "常规"
           }
-        }else if (val.SelectItem == "SetupTime") {
+        } else if (val.SelectItem == "SetupTime") {
           if (val.BeChangeInfo === '') {
             return '----'
           } else if (val.BeChangeInfo === '0001-01-01T08:00:00+08:00') {
@@ -1468,40 +1483,39 @@
             val = val.replace('T', ' ')
             return val.substring(0, 10)
           }
-        }
-        else {
+        } else {
           return val.BeChangeInfo
         }
       },
       dataformat(val) {
         //debugger
         if (val.SelectItem == "SpecTypeCode") {
-          if (val.ChangeInfo == "1"){
+          if (val.ChangeInfo == "1") {
             return "一般外部"
-          }else if (val.ChangeInfo == "2") {
+          } else if (val.ChangeInfo == "2") {
             return "多元内部"
           }
-        }else if (val.SelectItem == "InStyle") {
-          if (val.ChangeInfo == "1"){
+        } else if (val.SelectItem == "InStyle") {
+          if (val.ChangeInfo == "1") {
             return "评审准入"
-          }else if (val.ChangeInfo == "2") {
+          } else if (val.ChangeInfo == "2") {
             return "一级物资备案准入"
-          }else if (val.ChangeInfo == "3") {
+          } else if (val.ChangeInfo == "3") {
             return "二级物资备案准入"
-          }else if (val.ChangeInfo == "4") {
+          } else if (val.ChangeInfo == "4") {
             return "战略合作准入"
-          }else if (val.ChangeInfo == "5") {
+          } else if (val.ChangeInfo == "5") {
             return "内部多元准入"
           }
-        }else if (val.SelectItem == "CredentialFlag") {
-          if (val.ChangeInfo == "1"){
+        } else if (val.SelectItem == "CredentialFlag") {
+          if (val.ChangeInfo == "1") {
             return "三证合一"
-          }else if (val.ChangeInfo == "2") {
+          } else if (val.ChangeInfo == "2") {
             return "五证合一"
-          }else if (val.ChangeInfo == "3") {
+          } else if (val.ChangeInfo == "3") {
             return "常规"
           }
-        }else if (val.SelectItem == "SetupTime") {
+        } else if (val.SelectItem == "SetupTime") {
           if (val.ChangeInfo == "") {
             return '----'
           } else if (val.ChangeInfo == "0001-01-01T08:00:00+08:00") {
@@ -1512,8 +1526,7 @@
             val = val.replace('T', ' ')
             return val.substring(0, 10)
           }
-        }
-        else {
+        } else {
           return val.ChangeInfo
         }
       },
@@ -1552,20 +1565,8 @@
               _this.infochangeForm.SelectItemName = "组织机构代码"
             } else if (_this.infochangeForm.SelectItem == "Address") {
               _this.infochangeForm.SelectItemName = "注册地址"
-            } else if (_this.infochangeForm.SelectItem == "Province") {
-              _this.infochangeForm.SelectItemName = "省直辖市"
-            } else if (_this.infochangeForm.SelectItem == "City") {
-              _this.infochangeForm.SelectItemName = "地市区县"
-            } else if (_this.infochangeForm.SelectItem == "Street") {
-              _this.infochangeForm.SelectItemName = "街道"
             } else if (_this.infochangeForm.SelectItem == "LinkAddress") {
               _this.infochangeForm.SelectItemName = "通信地址-单位地址"
-            } else if (_this.infochangeForm.SelectItem == "LinkProvince") {
-              _this.infochangeForm.SelectItemName = "通信地址-省直辖市"
-            } else if (_this.infochangeForm.SelectItem == "LinkCity") {
-              _this.infochangeForm.SelectItemName = "通信地址-地市区县"
-            } else if (_this.infochangeForm.SelectItem == "LinkStreet") {
-              _this.infochangeForm.SelectItemName = "通信地址-街道"
             } else if (_this.infochangeForm.SelectItem == "ZipCode") {
               _this.infochangeForm.SelectItemName = "邮编"
             } else if (_this.infochangeForm.SelectItem == "LinkZipCode") {
@@ -1618,8 +1619,11 @@
               _this.infochangeForm.SelectItemName = "营业范围"
             } else if (_this.infochangeForm.SelectItem == "Remark") {
               _this.infochangeForm.SelectItemName = "备注"
+            } else if (_this.infochangeForm.SelectItem == "AllAddress") {
+              _this.infochangeForm.SelectItemName = "注册地址"
+            } else if (_this.infochangeForm.SelectItem == "LinkAllAddress") {
+              _this.infochangeForm.SelectItemName = "通信地址"
             }
-
             _this.infochangeForm.ChangeInfo = value
             _this.infochangeForm.BeChangeInfo = _this.copyformdata[key]
             _this.infochangeItemList.push(_this.infochangeForm)
@@ -1840,15 +1844,13 @@
       },
       //保存信息变更数据
       saveinfochange() {
-        this.address = this.$refs['cascaderAdd'].currentLabels
-        this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
-        console.log("----",this.CityAry,this.address,this.linkaddress)
         let AllInfochangeItemList = {
           SupplierId: this.serviceId,
           MInfoId: this.MInfoId,
           InfochangeForm: this.infochangeItemList
         }
-        console.log("----",this.infochangeItemList)
+        console.log("----", this.infochangeItemList)
+        debugger
         api.addInfoChangeItemCh(AllInfochangeItemList, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改
@@ -1910,6 +1912,8 @@
         this.formData.Province = value[0]
         this.formData.City = value[1]
         this.formData.Street = value[2]
+        this.address = this.$refs['cascaderAdd'].currentLabels
+        this.formData.AllAddress = this.address[0] + '/' + this.address[1] + '/' + this.address[2]
         //this.formData.ZipCode = value[2]
       },
       handleLinkAreaChange(value) {
@@ -1917,6 +1921,8 @@
         this.formData.LinkCity = value[1]
         this.formData.LinkStreet = value[2]
         //this.formData.LinkZipCode = value[2]
+        this.linkaddress = this.$refs['cascaderAddrLink'].currentLabels
+        this.formData.LinkAllAddress = this.linkaddress[0] + '/' + this.linkaddress[1] + '/' + this.linkaddress[2]
       },
       //提交信息变更审核
       submitInfoChange() {