Parcourir la source

年审信息变更修改

huahaiyan il y a 6 ans
Parent
commit
074f525059

+ 330 - 357
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/operation.vue

@@ -2,333 +2,183 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/annuaudit' }">年审基本信息表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审基本信息表</el-breadcrumb-item>
       <el-breadcrumb-item>编辑</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card">
-      <div slot="header">
-        <span>
-          <i class="icon icon-table2"></i> 编辑
-        </span>
-        <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-          <router-link :to="'/oilsupplier/annuaudit'">
-            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
-          </router-link>
-        </span>
-      </div>
-      <el-form label-width="240px" ref="EntityForm" :model="formData">
-            <div slot="header" class="clearfix">
+      <div slot="header" class="clearfix">
               <span>年审基本信息表</span>
-              <span style="float: right;">
+              <!-- <span style="float: right;">
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-              </span>
+              </span> -->
             </div>
-            <el-form label-width="140px" ref="EntityForm" :model="formData">
-              <el-row>
-                <!--<el-col :span="8">
-                  <el-form-item label="DEMO">
-                    <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-                      <el-option
-                        v-for="item in wellNoOptions"
-                        :key="item.Id"
-                        :label="item.Value"
-                        :value="item.Id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="16">
-                  <el-form-item label="供方名称" required>
-                    <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="单位关系">
-                    <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable 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="统一社会信用代码" required>
-                    <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="税务登记证编号" required>
-                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="组织机构代码" required>
-                    <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <!--<el-col :span="8">
-                  <el-form-item label="税务登记证地税编号">
-                    <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-                <el-col :span="16">
-                  <el-form-item label="注册地址" required>
-                    <el-row>
-                      <el-col :span="8">
-                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
-                        </el-cascader>
-                      </el-col>
-                      <el-col :span="16">
-                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
-                      </el-col>
-                    </el-row>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="邮编" required>
-                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="16">
-                  <el-form-item label="通信地址" required>
-                    <el-row>
-                      <el-col :span="8">
-                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
-                        </el-cascader>
-                      </el-col>
-                      <el-col :span="16">
-                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
-                      </el-col>
-                    </el-row>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="邮编" required>
-                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <!--<el-col :span="8">
-                  <el-form-item label="省直辖市">
-                    <el-input v-model="formData.Province" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="地市区县">
-                    <el-input v-model="formData.City" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="街道">
-                    <el-input v-model="formData.Street" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="门牌号">
-                    <el-input v-model="formData.HouseNo" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
 
+      <el-steps :active="formData.Step" simple align-center finish-status="success">
+        <el-step title="企业信息"></el-step>
+        <el-step title="企业情况"></el-step>
+        <el-step title="企业资质"></el-step>
+        <el-step title="提交审批"></el-step>
+        <el-step title="审批完成"></el-step>
+      </el-steps>
+
+      <el-tabs tab-position="right" style="margin-top: 20px">
+        <el-tab-pane label="企业信息">
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>供方基本信息表</span>
+              <!-- <span style="float: right;">
+                <el-button type="primary" size="mini" @click="saveEntity">保存基本信息</el-button>
+              </span> -->
+            </div>
+            <tech-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser" :disabled ="true"
+              :canUpdateSupplier="canUpdateSupplier" @selectcompany="changeFormData" @inputcompany="inputCompany">
+            </tech-info>
+          </el-card>
+        </el-tab-pane>
 
-              </el-row>
-            </el-form>
+        <el-tab-pane label="企业情况" >
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>企业人员结构情况</span>
+              <!-- <span style="float: right;">
+                <el-button type="primary" size="mini" @click="updateNumberEntity">保存人员结构情况</el-button>
+              </span> -->
+            </div>
 
-            <el-form label-width="140px" ref="EntityFormLic" :model="formData">
+            <el-form label-width="220px" ref="EntityFormNumber" :model="formDataCert" :disabled ="true" >
               <el-row>
-                <!--<el-col :span="8">
-                  <el-form-item label="产品质量认证情况及认证机构">
-                    <el-input v-model="formData.ProductQualityCert" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="生产制造许可证获证情况及编号">
-                    <el-input v-model="formData.MaunLicense" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-                <!--<el-col :span="8">
-                  <el-form-item label="外地企业进津备案通知书">
-                    <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="法定代表人姓名">
-                    <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <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-form-item label="行业类别名称">
-                    <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="注册资本">
-                    <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="联系人姓名">
-                    <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="币种">
-                    <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="公司类型">
-                    <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="成立时间">
-                    <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
                 <el-col :span="8">
-                  <el-form-item label="开户银行">
-                    <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="企业员工总数">
+                    <el-input-number v-model="formDataCert.WorkerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="银行账号">
-                    <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="合同化用工数量">
+                    <el-input-number v-model="formDataCert.ContractNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="移动电话">
-                    <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="大学及以上学历人员数量">
+                    <el-input-number v-model="formDataCert.UniversityNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="固定电话">
-                    <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="技术、管理人员数量">
+                    <el-input-number v-model="formDataCert.TechnicalNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="传真">
-                    <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="高级及以上职称人员数量">
+                    <el-input-number v-model="formDataCert.AboveProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="公司电话">
-                    <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="电子邮箱">
-                    <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="中级职称人员数量">
+                    <el-input-number v-model="formDataCert.MiddleProfNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="QQ号码">
-                    <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="具有国家注册执业资格人员数量">
+                    <el-input-number v-model="formDataCert.NationalRegNum" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="银行信用等级">
-                    <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="具有国家注册执业资格证书总数">
+                    <el-input-number v-model="formDataCert.NationalCertTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="公司网址">
-                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="设计人员总数">
+                    <el-input-number v-model="formDataCert.DesignerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="HSE审查培训">
-                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+                  <el-form-item label="技术工人总数">
+                    <el-input-number v-model="formDataCert.SkillerTotal" controls-position="right" :min="0"
+                      style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
-
               </el-row>
             </el-form>
+          </el-card>
 
-            <el-form label-position="top" ref="EntityFormCert" :model="formData">
-              <el-row :gutter="60">
-                <el-col :span="8">
-                  <el-form-item label="质量管理体系认证情况">
-                    <el-input v-model="formData.QualitySystemCert" 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.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <!--<el-col :span="12">
-                  <el-form-item label="企业资质证书级别">
-                    <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-                <el-col :span="8">
-                  <el-form-item label="安全生产许可证">
-                    <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>企业主要装备情况</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="equipmentdialog">添加</el-button> -->
+            </div>
+            <equipment-list ref="equipmentList" :data="equipmentList" :SupplierCertId="certId"
+              :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></equipment-list>
+          </el-card>
 
-                <el-col :span="8">
-                  <el-form-item label="行业特殊要求的认证证书">
-                    <el-input v-model="formData.SpecIndustryCert" 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.QualitySystemCert" placeholder="请输入" type="textarea"
-                      style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input v-model="formData.Remark" placeholder="请输入" type="textarea" style="width: 100%">
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-              </el-row>
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年主要工程业绩</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="performancedialog">添加</el-button> -->
+            </div>
+            <performance-list ref="performanceList" :data="performanceList" :SupplierCertId="certId" :disabled ="true"
+              :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></performance-list>
+          </el-card>
 
-            </el-form>
-      </el-form>
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>拥有专利、专有技术及工法</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="patentdialog">添加</el-button> -->
+            </div>
+            <patent-list ref="patentList" :data="patentList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+              height="360px" style="margin-top: 20px">
+            </patent-list>
           </el-card>
 
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span>近三年获得省部级及以上主要技术、管理成果、获奖项目</span>
+              <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="winningdialog">添加</el-button> -->
+            </div>
+            <winning-list ref="winningList" :data="winningList" :SupplierCertId="certId" :SupplierTypeCode="classId"
+              height="360px" style="margin-top: 20px">
+            </winning-list>
+          </el-card>
+        </el-tab-pane>
+
+        <el-tab-pane label="企业资质">
+          <business-list ref="businessList" :data="businessList" :SupplierCertId="certId" :SupplierId="serviceId"
+            :SupplierTypeCode="classId" @close="nexStepCB" height="360px" style="margin-top: 20px"></business-list>
+        </el-tab-pane>
+
+        <el-tab-pane label="提交审批">
+          <el-card class="box-card" style="height: 800px">
+            <div slot="header" class="clearfix">
+              <span>审批流程</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading"
+                  @click="AuditEntity">提交审批
+                </el-button>
+              </span>
+            </div>
+            <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+          </el-card>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
   </div>
 </template>
 
@@ -336,31 +186,55 @@
   import {
     mapGetters
   } from 'vuex'
-  import supplierapi from '@/api/oilsupplier/supplier';
-  import api from '@/api/oilsupplier/technologyservice';
+  import api from '@/api/oilsupplier/supplier'
+  import apiCert from '@/api/oilsupplier/suppliercert'
+  import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
+  import WfHistory from '@/components/workflow/wfhistory.vue'
+  import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
+
+  import EquipmentList from '@/components/oilsupplier/equipmentlist'
+  import PerformanceList from '@/components/oilsupplier/performancelist'
+  import PatentList from '@/components/oilsupplier/patentlist'
+  import WinningList from '@/components/oilsupplier/winninglist'
+  import BusinessList from '@/components/oilsupplier/businesslist'
+  import TechInfo from '@/components/oilsupplier/techinfo'
+
+   
   export default {
     computed: {
       ...mapGetters({
         authUser: 'authUser'
       })
     },
+    components: {
+      SupplierFileTable,
+      WfHistory,
+      SupplierCertEdit,
+
+      EquipmentList, //企业主要装备情况
+      PerformanceList, //近三年主要工程业绩列表
+      PatentList, //拥有专利、专有技术及工法列表
+      WinningList, //近三年获得省部级及以上主要技术、管理成果、获奖项目列表
+      BusinessList, //选择准入范围
+      TechInfo,
+    },
     name: 'oiltechnologyserviceEdit',
 
     data() {
       return {
-        UnitRelationOptions: [],
-        UnitRelationAry: [],
-        countryoptions: [],
-        countryprops: {
-          value: 'adcode',
-          label: 'name',
-          children: 'districts'
-        },
-        CityAry: [],
+        canUpdateSupplier: true,
+        dictData: null,
+        applyLoading: false,
+        equipmentList: [], //企业主要装备情况
+        performanceList: [], //近三年主要工程业绩
+        patentList: [], //拥有专利、专有技术及工法
+        winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
+        businessList: [], //准入业务
         serviceId: '',
         certId: '',
-        classId: '03',
-       formData: {
+        classId: '',
+        WorkflowId: '',
+        formData: {
           Id: '',
           SupplierName: '',
           OilCertificateNo: '',
@@ -380,6 +254,12 @@
           Street: '',
           HouseNo: '',
           ZipCode: '',
+          LinkAddress: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkHouseNo: '',
+          LinkZipCode: '',
           QualitySystemCert: '',
           ProductQualityCert: '',
           MaunLicense: '',
@@ -396,7 +276,7 @@
           Currency: '',
           ContactName: '',
           CompanyType: '',
-          SetupTime: '',
+          SetupTime: null,
           DepositBank: '',
           BankAccount: '',
           EMail: '',
@@ -431,8 +311,10 @@
           CertId: 0,
           SupplierTypeCode: '',
           SupplierTypeName: '',
-          Step: 0
+          Step: 0,
+          HseTraining: 0,
         },
+
         formDataCert: {
           WorkerTotal: 0,
           ContractNum: 0,
@@ -447,101 +329,188 @@
           Status: 0,
           WorkflowId: ''
         },
+        entrydetail: {
+          process: 'oil_audit_apply',
+          business: '',
+          instance: ''
+        },
       }
     },
     created() {
       this.serviceId = this.$route.params.opera;
-      this.getDictOptions();
-      console.log(this.serviceId);
-      if(this.serviceId != 'add' && this.serviceId>0) {
-        this.formData.Id = this.serviceId;
-        this.initDatas();
-      } else {
-        this.formData.Id = 0;
+      if (this.$route.query.certid) {
+        this.certId = this.$route.query.certid + ''
       }
+      this.WorkflowId = this.$route.query.WorkflowId + ''
+      this.getDictOptions();
+      this.formData.Id = this.serviceId
+      this.initDatas();
+      console.log("---this.formData---",this.formData)
+      // console.log(this.serviceId);
+      // if(this.serviceId != 'add' && this.serviceId>0) {
+      //   this.formData.Id = this.serviceId;
+      //   this.initDatas();
+      // } else {
+      //   this.formData.Id = 0;
+      // }
     },
     methods: {
-      initDatas() {
-        console.log("----this.formData.Id---",this.formData.Id)
-       if (this.formData.Id) {
-          supplierapi.getEntityAndCert(this.formData.Id, this.$axios).then(res => {
-            this.formData = res.data
-            // this.formDataCert.WorkerTotal = this.formData.WorkerTotal
-            // this.formDataCert.ContractNum = this.formData.ContractNum
-            // this.formDataCert.UniversityNum = this.formData.UniversityNum
-            // this.formDataCert.TechnicalNum = this.formData.TechnicalNum
-            // this.formDataCert.AboveProfNum = this.formData.AboveProfNum
-            // this.formDataCert.MiddleProfNum = this.formData.MiddleProfNum
-            // this.formDataCert.NationalRegNum = this.formData.NationalRegNum
-            // this.formDataCert.NationalCertTotal = this.formData.NationalCertTotal
-            // this.formDataCert.DesignerTotal = this.formData.DesignerTotal
-            // this.formDataCert.SkillerTotal = this.formData.SkillerTotal
-            // this.formDataCert.Status = this.formData.Status
-            // this.formDataCert.WorkflowId = this.formData.WorkflowId
-
-            //this.entrydetail.business = this.certId
-            // this.entrydetail.instance = this.formDataCert.WorkflowId
-            // if (this.certId && this.formDataCert.WorkflowId) {
-            //   this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
-            // }
-
+      inputCompany(val) {
+        if (!this.certId) {
+          api.getEntityByName(val, this.$axios).then(res => {
+            if (res.data && res.data.Id) {
+              this.SetFormData(res.data)
+            }
           }).catch(err => {
             console.error(err)
-          });
+          })
+        }
+      },
+      changeFormData(fdata) {
+        if (!this.certId) {
+          this.SetFormData(fdata)
+        }
+      },
+      SetFormData(fdata) {
+        this.isCanUpdateSupplier(fdata.Id)
+        this.formData.Id = fdata.Id
+        this.formData.SupplierName = fdata.SupplierName
+        this.formData.OilCertificateNo = fdata.OilCertificateNo
+        this.formData.Grade = fdata.Grade
+        this.formData.MgrUnit = fdata.MgrUnit
+        this.formData.OperType = fdata.OperType
+        this.formData.Country = fdata.Country
+        this.formData.MaunAgent = fdata.MaunAgent
+        this.formData.ConstructTeam = fdata.ConstructTeam
+        this.formData.CommercialNo = fdata.CommercialNo
+        this.formData.OrganCode = fdata.OrganCode
+        this.formData.CountryTaxNo = fdata.CountryTaxNo
+        this.formData.LocalTaxNo = fdata.LocalTaxNo
+        this.formData.Address = fdata.Address
+        this.formData.Province = fdata.Province
+        this.formData.City = fdata.City
+        this.formData.Street = fdata.Street
+        this.formData.HouseNo = fdata.HouseNo
+        this.formData.ZipCode = fdata.ZipCode
+        this.formData.LinkAddress = fdata.LinkAddress
+        this.formData.LinkProvince = fdata.LinkProvince
+        this.formData.LinkCity = fdata.LinkCity
+        this.formData.LinkStreet = fdata.LinkStreet
+        this.formData.LinkHouseNo = fdata.LinkHouseNo
+        this.formData.LinkZipCode = fdata.LinkZipCode
+        this.formData.LegalPerson = fdata.LegalPerson
+        this.formData.CategoryCode = fdata.CategoryCode
+        this.formData.CategoryName = fdata.CategoryName
+        this.formData.RegCapital = fdata.RegCapital
+        this.formData.Currency = fdata.Currency
+        this.formData.ContactName = fdata.ContactName
+        this.formData.CompanyType = fdata.CompanyType
+        this.formData.SetupTime = fdata.SetupTime
+        this.formData.DepositBank = fdata.DepositBank
+        this.formData.BankAccount = fdata.BankAccount
+        this.formData.EMail = fdata.EMail
+        this.formData.BankCreditRating = fdata.BankCreditRating
+        this.formData.Mobile = fdata.Mobile
+        this.formData.Telphone = fdata.Telphone
+        this.formData.Fax = fdata.Fax
+        this.formData.CompanyTel = fdata.CompanyTel
+        this.formData.QQ = fdata.QQ
+        this.formData.CompanyUrl = fdata.CompanyUrl
+        this.formData.HseTraining = fdata.HseTraining
+        this.formData.SpecTypeCode = fdata.SpecTypeCode
+
+        this.$refs["TechInfo"].CityAry = []
+        this.$refs["TechInfo"].CityAry.push(this.formData.Province)
+        this.$refs["TechInfo"].CityAry.push(this.formData.City)
+        this.$refs["TechInfo"].CityAry.push(this.formData.Street)
+        this.$refs["TechInfo"].LinkCityAry = []
+        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
+        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
+        this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+        this.$refs["TechInfo"].UnitRelationAry = []
+        if (this.formData.SpecTypeCode.length > 0) {
+          this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
         }
       },
 
-      getDictOptions() {
-        api.getDictList(this.$axios).then(res => {
-          //this.wellNoOptions = res.data.items['WellNo']
-          //this.supervisersOptions = res.data.items['Supervisers']
+      isCanUpdateSupplier(supplierId) {
+        api.isCanUpdateSupplier(supplierId, this.$axios).then(res => {
+          this.canUpdateSupplier = (res.data.code === 0)
         }).catch(err => {
           console.error(err)
         })
       },
+      equipmentdialog() {
+        this.$refs["equipmentList"].showDialog()
+      },
+      performancedialog() {
+        this.$refs["performanceList"].showDialog()
+      },
+      patentdialog() {
+        this.$refs["patentList"].showDialog()
+      },
+      winningdialog() {
+        this.$refs["winningList"].showDialog()
+      },
+       initDatas() {
+        this.isCanUpdateSupplier(this.formData.Id)
+        if (this.formData.Id) {
+          console.log("---this.certId----",this.certId)
+          api.getEntityAndCert(this.certId, this.$axios).then(res => {
+            this.formData = res.data
+            console.log("---res.data----",res.data)
+            this.formDataCert.WorkerTotal = this.formData.WorkerTotal
+            this.formDataCert.ContractNum = this.formData.ContractNum
+            this.formDataCert.UniversityNum = this.formData.UniversityNum
+            this.formDataCert.TechnicalNum = this.formData.TechnicalNum
+            this.formDataCert.AboveProfNum = this.formData.AboveProfNum
+            this.formDataCert.MiddleProfNum = this.formData.MiddleProfNum
+            this.formDataCert.NationalRegNum = this.formData.NationalRegNum
+            this.formDataCert.NationalCertTotal = this.formData.NationalCertTotal
+            this.formDataCert.DesignerTotal = this.formData.DesignerTotal
+            this.formDataCert.SkillerTotal = this.formData.SkillerTotal
+            this.formDataCert.Status = this.formData.Status
+            this.formDataCert.WorkflowId = this.formData.WorkflowId
+            this.$refs["TechInfo"].CityAry = []
+            this.$refs["TechInfo"].CityAry.push(this.formData.Province)
+            this.$refs["TechInfo"].CityAry.push(this.formData.City)
+            this.$refs["TechInfo"].CityAry.push(this.formData.Street)
+            this.$refs["TechInfo"].LinkCityAry = []
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkProvince)
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkCity)
+            this.$refs["TechInfo"].LinkCityAry.push(this.formData.LinkStreet)
+            this.$refs["TechInfo"].UnitRelationAry = []
+            if (this.formData.SpecTypeCode.length > 0) {
+              this.$refs["TechInfo"].UnitRelationAry = this.formData.SpecTypeCode.split(',')
+            }
 
-      //保存信息
-      saveEntity() {
-        this.$refs['EntityForm'].validate((valid) => {
-          if (valid) {
-            //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-
-            if (!this.formData.Id) {
-              this.addEntity();
-            } else {
-              this.updateEntity();
+            this.entrydetail.business = this.certId
+            this.entrydetail.instance = this.WorkflowId
+            if (this.certId && this.WorkflowId) {
+              this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
             }
 
-          } else {
-            return false
-          }
-        })
+          }).catch(err => {
+            console.error(err)
+          });
+        }
       },
 
-      addEntity() {
-        supplierapi.addEntity(this.formData, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            //保存成功后,初始化数据,变成修改
-            this.formData.Id = res.data.item;
-            this.initDatas();
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
+      
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          this.dictData = res.data.items
+          /*this.UnitRelationOptions = res.data.items['UnitRelation']
+          this.getCityList(res.data.items['GaodeMapChinaAreas'])
+          this.CompanyTypeOptions = res.data.items['CompanyType']*/
         }).catch(err => {
           console.error(err)
-        });
+        })
       },
 
-      updateEntity() {
-        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+      AuditEntity() {
+        this.applyLoading = true
+        apiCert.auditEntity(this.certId, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后,初始化数据,变成修改
             this.initDatas()
@@ -549,18 +518,22 @@
               type: 'success',
               message: res.data.message
             });
-
           } else {
             this.$message({
               type: 'warning',
               message: res.data.message
             });
           }
+          this.applyLoading = false
+
         }).catch(err => {
           console.error(err)
         });
       },
 
+      nexStepCB() {
+        this.formData.Step += 1
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

+ 33 - 207
src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/index.vue

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/oilsupplier/annuaudit' }">年审申请表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/annualaudit' }">年审申请表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
@@ -39,39 +39,36 @@
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
         <el-table-column label="操作" min-width="180" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/oilsupplier/annuaudit/' + scope.row.Id + '/operation'">
+            <router-link :to="'/oilsupplier/annualaudit/' + scope.row.SupplierId + '/operation?certid=' + scope.row.CerId +'&WorkflowId='+scope.row.WorkflowId">
               <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
             </router-link>
-            <!-- <el-popover placement="top" title="提示">
-              <el-alert
-                title=""
-                description="确认要删除吗?"
-                type="warning"
-                :closable="false">
-              </el-alert>
-              <br/>
-              <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
-              </div>
-              <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
-            </el-popover> -->
             <el-dropdown @command="MoreCmdClick">
               <el-button size="mini" type="primary" plain style="margin-left:5px;">
                 更多<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <!--<el-dropdown-item :command="GetCommand('JiaoHe', scope.row)" v-if="scope.row.CheckStatus == 1">数据校核</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('ShenHe', scope.row)" v-if="scope.row.CheckStatus == 2">数据审核</el-dropdown-item>-->
                 <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
-                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>删除数据</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>
+                  删除数据</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </template>
         </el-table-column>
 
-        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
-          :label="column.label" align="center" show-overflow-tooltip>
+        <el-table-column prop="RecUnitId" label="推荐单位编码" sortable min-width="130" align="center" show-overflow-tooltip>
         </el-table-column>
+        <el-table-column prop="AccessCardNo" label="准入证号" sortable min-width="110" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column prop="SupplierTypeName" label="准入类别" sortable min-width="110" align="center"
+          show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ checkSupplierTypeName(scope.row.SupplierTypeName) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="SupplierName" label="企业名称" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <!-- <el-table-column prop="OrganCode" label="组织机构代码" sortable min-width="130" align="center" show-overflow-tooltip>
+        </el-table-column> -->
         <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
           <template slot-scope="scope">
             <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
@@ -94,12 +91,12 @@
             </el-alert>
           </template>
         </el-table-column>
-        <el-table-column prop="ApplyTime" sortable min-width="100" label="年审日期" align="center" show-overflow-tooltip>
+        <el-table-column prop="ApplyTime" sortable min-width="130" label="年审日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.ApplyTime+'') }}
           </template>
         </el-table-column>
-        <el-table-column prop="CreateOn" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
+        <el-table-column prop="CreateOn" sortable min-width="130" label="申请日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.CreateOn+'') }}
           </template>
@@ -115,19 +112,6 @@
       <el-form ref="searchForm" label-width="110px">
         <el-row>
 
-          <!-- <el-col :span="12">
-            <el-form-item label="生成时间">
-              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-            </el-form-item>
-          </el-col> -->
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="">
-              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
           <el-col :span="12">
             <el-form-item label="推荐单位编码">
               <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
@@ -153,67 +137,6 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="工程项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="履约执行情况">
-              <el-input size="mini" v-model="searchForm.Performance" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="准入范围">
-              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="施工队伍名称">
-              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="审核状态">
-              <el-select size="mini" v-model="searchform.Status" style="width:100%" placeholder="请选择">
-                <el-option label="已申请" value="0"></el-option>
-                <el-option label="初审通过" value="1"></el-option>
-                <el-option label="初审未通过" value="2"></el-option>
-                <el-option label="专业审核通过" value="3"></el-option>
-                <el-option label="审核未通过" value="4"></el-option>
-                <el-option label="已交费" value="5"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="录入员">
-              <el-input size="mini" v-model="searchForm.EnterUserName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="年审日期">
-              <el-input size="mini" v-model="searchForm.ApplyTime" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="审核日期">
-              <el-input size="mini" v-model="searchForm.AuditDate" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="退回原因">
-              <el-input size="mini" v-model="searchForm.BackReason" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -279,10 +202,10 @@
 
     data() {
       return {
-        historyVisible:false,
+        historyVisible: false,
         addshow: false,
         dialogVisible: false,
-        delevisble:false,
+        delevisble: false,
         //列表数据
         selectsupplierlist: [],
         entityList: [],
@@ -344,113 +267,6 @@
           ModifiedBy: '',
 
         },
-        tableColumns: [
-
-          {
-            prop: "RecUnitId",
-            label: '推荐单位编码',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "AccessCardNo",
-            label: '准入证号',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SupplierTypeName",
-            label: '准入类别',
-            width: 100,
-            sort: true
-          },
-
-          {
-            prop: "SupplierName",
-            label: '企业名称',
-            width: 100,
-            sort: true
-          },
-
-          // {
-          //   prop: "ProjectName",
-          //   label: '工程项目名称',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "Performance",
-          //   label: '履约执行情况',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "WorkRange",
-          //   label: '准入范围',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "Status",
-          //   label: '状态标识',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          {
-            prop: "OrganCode",
-            label: '组织机构代码',
-            width: 100,
-            sort: true
-          },
-
-          // {
-          //   prop: "ApplyTime",
-          //   label: '年审日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "CreateOn",
-          //   label: '申请日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "AuditDate",
-          //   label: '审核日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "EnterUserName",
-          //   label: '录入员',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "EnterUserTel",
-          //   label: '录入员电话',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "BackReason",
-          //   label: '退回原因',
-          //   width: 100,
-          //   sort: true
-          // }
-        ],
       }
     },
     created() {
@@ -484,6 +300,7 @@
         //访问接口
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
+          console.log("---this.entityList ----",this.entityList )
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
@@ -548,6 +365,15 @@
           console.error(err)
         })
       },
+      checkSupplierTypeName(val) {
+        if (val == '01') {
+          return '物资类'
+        } else if (val == '02') {
+          return '基建类'
+        } else if (val == '03') {
+          return '技术服务类'
+        }
+      },
 
       searchCommand(command) {
         if (command == 'search') {
@@ -613,10 +439,10 @@
       },
 
       MoreCmdClick(cmd) {
-        if(cmd.Command == 'History') {
+        if (cmd.Command == 'History') {
           this.getvalues(cmd.row)
 
-        } else if(cmd.Command == 'Delete') {
+        } else if (cmd.Command == 'Delete') {
           this.deleteEntity(cmd.row)
         }
       },

+ 492 - 336
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/_opera/operation.vue

@@ -11,323 +11,458 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          <el-button type="primary" size="mini" @click="submitInfoChange">提交申请</el-button>
           <router-link :to="'/oilsupplier/infochange'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>
         </span>
       </div>
       <el-form label-width="240px" ref="EntityForm" :model="formData">
-            <div slot="header" class="clearfix">
-              <span>供方基本信息表</span>
-              <span style="float: right;">
-                <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
-              </span>
-            </div>
-            <el-form label-width="140px" ref="EntityForm" :model="formData">
-              <el-row>
-                <!--<el-col :span="8">
-                  <el-form-item label="DEMO">
-                    <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
-                      <el-option
-                        v-for="item in wellNoOptions"
-                        :key="item.Id"
-                        :label="item.Value"
-                        :value="item.Id">
-                      </el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="16">
-                  <el-form-item label="供方名称" required>
-                    <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="单位关系">
-                    <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable 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="统一社会信用代码" required>
-                    <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="税务登记证编号" required>
-                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="组织机构代码" required>
-                    <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <!--<el-col :span="8">
-                  <el-form-item label="税务登记证地税编号">
-                    <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-                <el-col :span="16">
-                  <el-form-item label="注册地址" required>
-                    <el-row>
-                      <el-col :span="8">
-                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
-                        </el-cascader>
-                      </el-col>
-                      <el-col :span="16">
-                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
-                      </el-col>
-                    </el-row>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="邮编" required>
-                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="16">
-                  <el-form-item label="通信地址" required>
-                    <el-row>
-                      <el-col :span="8">
-                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
-                        </el-cascader>
-                      </el-col>
-                      <el-col :span="16">
-                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
-                      </el-col>
-                    </el-row>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="邮编" required>
-                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <!--<el-col :span="8">
-                  <el-form-item label="省直辖市">
-                    <el-input v-model="formData.Province" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="地市区县">
-                    <el-input v-model="formData.City" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="街道">
-                    <el-input v-model="formData.Street" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="门牌号">
-                    <el-input v-model="formData.HouseNo" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-
-
-              </el-row>
-            </el-form>
-
-            <el-form label-width="140px" ref="EntityFormLic" :model="formData">
-              <el-row>
-                <!--<el-col :span="8">
-                  <el-form-item label="产品质量认证情况及认证机构">
-                    <el-input v-model="formData.ProductQualityCert" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="生产制造许可证获证情况及编号">
-                    <el-input v-model="formData.MaunLicense" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-                <!--<el-col :span="8">
-                  <el-form-item label="外地企业进津备案通知书">
-                    <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="法定代表人姓名">
-                    <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <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-form-item label="行业类别名称">
-                    <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-
-                <el-col :span="8">
-                  <el-form-item label="注册资本">
-                    <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="联系人姓名">
-                    <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="币种">
-                    <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="公司类型">
-                    <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="成立时间">
-                    <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="开户银行">
-                    <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="银行账号">
-                    <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="移动电话">
-                    <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="固定电话">
-                    <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="传真">
-                    <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="公司电话">
-                    <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="电子邮箱">
-                    <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="QQ号码">
-                    <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="银行信用等级">
-                    <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="公司网址">
-                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="HSE审查培训">
-                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-              </el-row>
-            </el-form>
-
-            <el-form label-position="top" ref="EntityFormCert" :model="formData">
-              <el-row :gutter="60">
-                <el-col :span="8">
-                  <el-form-item label="质量管理体系认证情况">
-                    <el-input v-model="formData.QualitySystemCert" 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.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
+        <div slot="header" class="clearfix">
+          <span>供方基本信息表</span>
+          <span style="float: right;">
+            <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          </span>
+        </div>
+        <el-form label-width="140px" ref="EntityForm" :model="formData">
+          <el-row>
+
+            <el-col :span="12">
+              <el-form-item label="曾用供方名称">
+                <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="单位关系">
+                <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable placeholder="请选择"
+                  style="width: 100%" :disabled = "true">
+                  <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="12">
+              <el-form-item label="现变更为:">
+                <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable 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="12">
+              <el-form-item label="统一社会信用代码">
+                <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="税务登记证编号">
+                <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="组织机构代码">
+                <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="注册地址" prop="Province">
+                <el-row>
+                  <el-col :span="10">
+                    <el-cascader :options="countryoptions" :props="countryprops" maxlength="20" placeholder="省市区"
+                      v-model="CityAry" style="width: 100%" @change="handleAreaChange" :disabled = "true">
+                    </el-cascader>
+                  </el-col>
+                  <el-col :span="14">
+                    <el-input v-model="formData.Address" maxlength="500" :disabled = "true"
+                      placeholder="详细地址" style="width: 100%">
                     </el-input>
-                  </el-form-item>
-                </el-col>
-                <!--<el-col :span="12">
-                  <el-form-item label="企业资质证书级别">
-                    <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>-->
-                <el-col :span="8">
-                  <el-form-item label="安全生产许可证">
-                    <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%">
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:" prop="Province">
+                <el-row>
+                  <el-col :span="10">
+                    <el-cascader :options="countryoptions" :props="countryprops" maxlength="20" 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>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="行业特殊要求的认证证书">
-                    <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%">
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="邮编" prop="ZipCode">
+                <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入" :disabled = "true"
+                  style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:" prop="ZipCode">
+                <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入"
+                  style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="通信地址" prop="LinkProvince">
+                <el-row>
+                  <el-col :span="10">
+                    <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="LinkCityAry"
+                       maxlength="20" style="width: 100%" @change="handleLinkAreaChange" :disabled = "true">
+                    </el-cascader>
+                  </el-col>
+                  <el-col :span="14">
+                    <el-input v-model="formData.LinkAddress" maxlength="500" :disabled = "true"
+                      placeholder="详细地址" style="width: 100%">
                     </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="16">
-                  <el-form-item label="营业范围">
-                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
-                      style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="备注">
-                    <el-input v-model="formData.Remark" placeholder="请输入" type="textarea" style="width: 100%">
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="现变更为:" prop="LinkProvince">
+                <el-row>
+                  <el-col :span="10">
+                    <el-cascader :options="countryoptions" :props="countryprops" 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>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-            </el-form>
+                  </el-col>
+                </el-row>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="邮编" prop="LinkZipCode">
+                <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入" :disabled = "true"
+                  style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="现变更为:" prop="LinkZipCode">
+                <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入"
+                  style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+
+
+          </el-row>
+        </el-form>
+
+        <el-form label-width="140px" ref="EntityFormLic" :model="formData">
+          <el-row>
+
+            <el-col :span="12">
+              <el-form-item label="法定代表人姓名">
+                <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="行业类别">
+                <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="注册资本">
+                <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系人姓名">
+                <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="币种">
+                <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="公司类型">
+                <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="成立时间">
+                <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="开户银行">
+                <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="银行账号">
+                <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="移动电话">
+                <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="固定电话">
+                <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="传真">
+                <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="公司电话">
+                <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="电子邮箱">
+                <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="QQ号码">
+                <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="银行信用等级">
+                <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="公司网址">
+                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="HSE审查培训">
+                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%" :disabled = "true"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+
+        <el-form label-position="top" ref="EntityFormCert" :model="formData">
+          <el-row :gutter="60">
+            <el-col :span="12">
+              <el-form-item label="质量管理体系认证情况">
+                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业资质证书(编号  级别)">
+                <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="安全生产许可证">
+                <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="12">
+              <el-form-item label="行业特殊要求的认证证书">
+                <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="营业范围">
+                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%" :disabled = "true">
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="现变更为:">
+                <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea" style="width: 100%">
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+        </el-form>
       </el-form>
-          </el-card>
+    </el-card>
 
   </div>
 </template>
@@ -357,10 +492,11 @@
           children: 'districts'
         },
         CityAry: [],
+        LinkCityAry: [],
         serviceId: '',
         certId: '',
         classId: '03',
-       formData: {
+        formData: {
           Id: '',
           SupplierName: '',
           OilCertificateNo: '',
@@ -453,7 +589,7 @@
       this.serviceId = this.$route.params.opera;
       this.getDictOptions();
       console.log(this.serviceId);
-      if(this.serviceId != 'add' && this.serviceId>0) {
+      if (this.serviceId != 'add' && this.serviceId > 0) {
         this.formData.Id = this.serviceId;
         this.initDatas();
       } else {
@@ -461,29 +597,37 @@
       }
     },
     methods: {
+      getDictOptions() {
+        supplierapi.getDictList(this.$axios).then(res => {
+          this.dictData = res.data.items
+          // if (this.dictData) {
+          //   this.UnitRelationOptions = this.dictData['UnitRelation']
+          //   this.getCityList(this.dictData['GaodeMapChinaAreas'])
+          //   this.CompanyTypeOptions = this.dictData['CompanyType']
+          //   let suppliers = this.dictData['CompanyNames']
+          //   for (let idx in suppliers) {
+          //     suppliers[idx]['value'] = suppliers[idx].SupplierName
+          //     this.companynames.push(suppliers[idx])
+          //   }
+          //   if (this.authUser && this.authUser.Profile.IsCompanyUser === 1 && this.companynames.length > 0) {
+          //     if (!this.formData.Id) {
+          //       this.formData.SupplierName = ''
+          //     }
+          //     this.companyReadonly = true
+          //   }
+          // }
+          this.UnitRelationOptions = res.data.items['UnitRelation']
+          this.getCityList(res.data.items['GaodeMapChinaAreas'])
+          this.CompanyTypeOptions = res.data.items['CompanyType']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
       initDatas() {
-        console.log("----this.formData.Id---",this.formData.Id)
-       if (this.formData.Id) {
+        console.log("----this.formData.Id---", this.formData.Id)
+        if (this.formData.Id) {
           supplierapi.getEntityAndCert(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data
-            // this.formDataCert.WorkerTotal = this.formData.WorkerTotal
-            // this.formDataCert.ContractNum = this.formData.ContractNum
-            // this.formDataCert.UniversityNum = this.formData.UniversityNum
-            // this.formDataCert.TechnicalNum = this.formData.TechnicalNum
-            // this.formDataCert.AboveProfNum = this.formData.AboveProfNum
-            // this.formDataCert.MiddleProfNum = this.formData.MiddleProfNum
-            // this.formDataCert.NationalRegNum = this.formData.NationalRegNum
-            // this.formDataCert.NationalCertTotal = this.formData.NationalCertTotal
-            // this.formDataCert.DesignerTotal = this.formData.DesignerTotal
-            // this.formDataCert.SkillerTotal = this.formData.SkillerTotal
-            // this.formDataCert.Status = this.formData.Status
-            // this.formDataCert.WorkflowId = this.formData.WorkflowId
-
-            //this.entrydetail.business = this.certId
-            // this.entrydetail.instance = this.formDataCert.WorkflowId
-            // if (this.certId && this.formDataCert.WorkflowId) {
-            //   this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
-            // }
 
           }).catch(err => {
             console.error(err)
@@ -492,10 +636,7 @@
       },
 
       getDictOptions() {
-        api.getDictList(this.$axios).then(res => {
-          //this.wellNoOptions = res.data.items['WellNo']
-          //this.supervisersOptions = res.data.items['Supervisers']
-        }).catch(err => {
+        api.getDictList(this.$axios).then(res => {}).catch(err => {
           console.error(err)
         })
       },
@@ -504,8 +645,6 @@
       saveEntity() {
         this.$refs['EntityForm'].validate((valid) => {
           if (valid) {
-            //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
-
             if (!this.formData.Id) {
               this.addEntity();
             } else {
@@ -560,7 +699,24 @@
           console.error(err)
         });
       },
-
+      handleAreaChange(value) {
+        this.formData.Province = value[0]
+        this.formData.City = value[1]
+        this.formData.Street = value[2]
+        //this.formData.ZipCode = value[2]
+      },
+      handleLinkAreaChange (value) {
+        this.formData.LinkProvince = value[0]
+        this.formData.LinkCity = value[1]
+        this.formData.LinkStreet = value[2]
+        //this.formData.LinkZipCode = value[2]
+      },
+      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)
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'
@@ -587,5 +743,5 @@
       }
     }
   }
-</script>
 
+</script>

+ 38 - 38
src/dashoo.cn/frontend_web/src/pages/oilsupplier/infochange/index.vue

@@ -37,7 +37,7 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="120" align="center" fixed>
+        <el-table-column label="操作" min-width="90" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/operation'">
               <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
@@ -241,51 +241,51 @@
           {
             prop: "OilCertificateNo",
             label: '中石油供应商证书号',
-            width: 130,
+            width: 200,
             sort: true
           },
 
-          {
-            prop: "Grade",
-            label: '级别',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: "Grade",
+          //   label: '级别',
+          //   width: 100,
+          //   sort: true
+          // },
 
           
-          {
-            prop: "MgrUnit",
-            label: '管理单位',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: "MgrUnit",
+          //   label: '管理单位',
+          //   width: 100,
+          //   sort: true
+          // },
 
-          {
-            prop: "OperType",
-            label: '经营方式',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: "OperType",
+          //   label: '经营方式',
+          //   width: 100,
+          //   sort: true
+          // },
 
-          {
-            prop: "Country",
-            label: '国家',
-            width: 100,
-            sort: true
-          },
-          {
-            prop: "MaunAgent",
-            label: '所代理制造商名称',
-            width: 130,
-            sort: true
-          },
+          // {
+          //   prop: "Country",
+          //   label: '国家',
+          //   width: 100,
+          //   sort: true
+          // },
+          // {
+          //   prop: "MaunAgent",
+          //   label: '所代理制造商名称',
+          //   width: 200,
+          //   sort: true
+          // },
 
-          {
-            prop: "ConstructTeam",
-            label: '施工队伍名称',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: "ConstructTeam",
+          //   label: '施工队伍名称',
+          //   width: 100,
+          //   sort: true
+          // },
 
           {
             prop: "CommercialNo",

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/_opera/operation.vue

@@ -11,7 +11,7 @@
           <i class="icon icon-table2"></i> 编辑
         </span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          <el-button type="primary" size="mini" @click="submitqualChange">提交申请</el-button>
           <router-link :to="'/oilsupplier/qualchange'">
             <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
           </router-link>

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/qualchange/index.vue

@@ -37,7 +37,7 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="120" align="center" fixed>
+        <el-table-column label="操作" min-width="90" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/qualchange/' + scope.row.Id + '/operation'">
               <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>