前:年审和信息变更加供应商类型

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

@@ -660,10 +660,8 @@
 
       </el-row>
     </el-form>
-    <el-card class="box-card mycard"
-             style="margin-top: 10px;">
-      <div slot="header"
-           class="clearfix">
+    <el-card class="box-card mycard" style="margin-top: 10px;">
+      <div slot="header" class="clearfix">
         <span style="padding:3px 20px">所代理制造商名称 </span>
         <el-button style="float: right; padding: 3px 10px"
                    type="text"
@@ -678,10 +676,8 @@
                          height="360px"
                          style="margin-top: 20px"></manufacturer-list>
     </el-card>
-    <el-card class="box-card mycard"
-             style="margin-top: 35px;">
-      <div slot="header"
-           class="clearfix">
+    <el-card class="box-card mycard" style="margin-top: 35px;">
+      <div slot="header" class="clearfix">
         <span style="padding:3px 20px">现场考察报告</span>
         <el-button :disabled="!certId || checkStatus.includes(formData.Status)" type="primary" style="margin-left: 10px;" plain size="mini" title="上传" @click="openDialog()" >上传
         </el-button>

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

@@ -36,7 +36,7 @@
 
       <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
     </el-table>
-    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+    <el-pagination style="float: right; margin-top: 10px; margin-bottom: 10px" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
                    :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
                    :total="currentItemCount">
     </el-pagination>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -72,7 +72,30 @@
                       </el-input>
                     </el-form-item>
                   </el-col>
-
+                  <el-col :span="8">
+                    <el-form-item label="准入编码">
+                      <el-input v-model="AccessCardNo" :readonly="true" placeholder="请输入" style="width: 100%">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="8">
+                    <el-form-item label="供应商类型" prop="OperType">
+                      <el-select ref="OperType"
+                                 v-model="formData.OperType"
+                                 :class="changedForm['OperType'] ? 'modified-form-input' : ''"
+                                 :disabled="true"
+                                 placeholder="请选择"
+                                 style="width: 100%">
+                        <el-option v-for="item in OperTypeOptions"
+                                   :key="item.Id"
+                                   :label="item.Key"
+                                   :value="item.Key">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="8">
                     <el-form-item label="单位关系">
                       <el-select ref="SpecType" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
@@ -87,26 +110,18 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-
                   <el-col :span="8">
-                    <el-form-item label="国家"
-                                  prop="Country">
-                      <el-select v-model="formData.Country" :class="changedForm['Country'] ? 'modified-form-input' : ''"
-                                 :disabled="true"
-                                 filterable
-                                 placeholder="请选择"
-                                 style="width: 100%">
-                        <el-option v-for="item in countryListOptions"
-                                   :key="item.key"
-                                   :label="item.value"
-                                   :value="item.value">
-                          <span style="float: left">{{ item.value }}</span>
-                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                    <el-form-item label="准入方式">
+                      <el-select ref="SpecType" v-model="InStyle" :disabled="true"
+                                 placeholder="请选择" style="width: 100%">
+                        <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key"
+                                   :value="item.Value">
                         </el-option>
                       </el-select>
                     </el-form-item>
                   </el-col>
-
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="中石油准入证编号">
                       <el-input :class="changedForm['PACNumber'] ? 'modified-form-input' : ''" v-model="formData.PACNumber"
@@ -151,7 +166,8 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-
+                </el-row>
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="证件类型">
                       <el-select v-model="formData.CredentialFlag" :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''"
@@ -405,6 +421,24 @@
                     </el-col>
                   </el-row>
 
+                  <el-col :span="8">
+                    <el-form-item label="国家"
+                                  prop="Country">
+                      <el-select v-model="formData.Country" :class="changedForm['Country'] ? 'modified-form-input' : ''"
+                                 :disabled="true"
+                                 filterable
+                                 placeholder="请选择"
+                                 style="width: 100%">
+                        <el-option v-for="item in countryListOptions"
+                                   :key="item.key"
+                                   :label="item.value"
+                                   :value="item.value">
+                          <span style="float: left">{{ item.value }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="8">
                     <el-form-item label="固定电话"
                                   prop="Telphone">
@@ -553,6 +587,18 @@
               <!--endprint1-->
             </div>
           </el-card>
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix" style="margin-top: 10px;margin-bottom: 10px;">
+              <span style="margin-left: 10px;">所代理制造商名称</span>
+            </div>
+            <manufacturer-list ref="manufacturerList"
+                               :data.sync="manufacturerList"
+                               :SupplierCertId="certId+''"
+                               :canadd="false"
+                               height="360px"
+                               style="margin-top: 20px"></manufacturer-list>
+          </el-card>
+
         </el-tab-pane>
 
         <el-tab-pane label="企业情况">
@@ -1047,6 +1093,7 @@
   import BusinessList from '@/components/oilsupplier/businesslist'
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
+  import ManufacturerList from '@/components/oilsupplier/manufacturerlist'
   // import SubfileList from '@/components/oilsupplier/subfilelist2'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
@@ -1069,6 +1116,7 @@ export default {
     components: {
       SupplierFileTable,
       WfHistory,
+      ManufacturerList,
       SupplierCertEdit,
       // SubfileList, // 选择企业资质
       EquipmentList, // 企业主要设备
@@ -1197,6 +1245,9 @@ export default {
         dialogVisibleBack: false,
         btnLoading: false,
         firOptions: [],
+        manufacturerList: [],
+        AccessCardNo: '',
+        InStyle: '',
         IsCompanyUser: 0,
         add_flat: true,
         totalTab: 3,
@@ -1589,6 +1640,9 @@ export default {
       this.setStorageRemark()
     },
     methods: {
+      manufacturerdialog () {
+        this.$refs['manufacturerList'].showDialog()
+      },
       setStorageRemark () {
         // console.log('不锐深状态', this.AnnualStatus)
         if (this.AnnualStatus === '7') {
@@ -2064,7 +2118,7 @@ export default {
         }
       },
       SetFormData (fdata) {
-        this.isCanUpdateSupplier(fdata.Id)
+        // this.isCanUpdateSupplier(fdata.Id)
         this.formData.Id = fdata.Id
         this.formData.SupplierName = fdata.SupplierName
         this.formData.OilCertificateNo = fdata.OilCertificateNo
@@ -2145,10 +2199,12 @@ export default {
         this.$refs['winningList'].showDialog()
       },
       initDatas () {
-        this.isCanUpdateSupplier(this.formData.Id)
+        // this.isCanUpdateSupplier(this.formData.Id)
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             // this.formData = res.data
+            this.AccessCardNo = res.data.AccessCardNo
+            this.InStyle = res.data.InStyle
             this.formDataCert.WorkerTotal = res.data.WorkerTotal
             this.supplierTypeCode = res.data.SupplierTypeCode
             this.formDataCert.ContractNum = res.data.ContractNum
@@ -2181,6 +2237,7 @@ export default {
             this.$refs['patentList'].getvalue(this.formData.Id, this.supplierTypeCode, this.certId)
             this.$refs['winningList'].getvalue(this.formData.Id, this.supplierTypeCode, this.certId)
             this.$refs['businessList'].getvalue(this.formData.Id, this.supplierTypeCode, this.certId)
+            this.$refs['manufacturerList'].getvalue(this.certId)
             // this.$refs['subfileList'].getvalue(this.formData.Id, this.supplierTypeCode, this.certId)
             if (this.certId && this.WorkflowId) {
               this.$refs['WfHistory'].getHistoryTask() /*  刷新工作流 */

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/goodsoperation.vue

@@ -84,6 +84,22 @@
                   </el-col>
                 </el-row>
                 <el-row>
+                  <el-col :span="8">
+                    <el-form-item label="供应商类型" prop="OperType">
+                      <el-select ref="OperType"
+                                 v-model="formData.OperType"
+                                 :class="changedForm['OperType'] ? 'modified-form-input' : ''"
+                                 :disabled="!canUpdateSupplier"
+                                 placeholder="请选择"
+                                 style="width: 100%">
+                        <el-option v-for="item in OperTypeOptions"
+                                   :key="item.Id"
+                                   :label="item.Key"
+                                   :value="item.Key">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                   <el-col :span="8">
                     <el-form-item label="单位关系">
                       <el-select ref="SpecType" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
@@ -111,15 +127,6 @@
                     </el-form-item>
                   </el-col>
 
-                  <el-col :span="8">
-                    <el-form-item label="统一社会信用代码" prop="CommercialNo">
-                      <el-input v-model="formData.CommercialNo"
-                                maxlength="50" :readonly="true"
-                                placeholder="请输入"
-                                style="width: 100%">
-                      </el-input>
-                    </el-form-item>
-                  </el-col>
                 </el-row>
                 <el-row>
 
@@ -167,7 +174,9 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+                </el-row>
 
+                <el-row>
                   <el-col :span="8">
                     <el-form-item label="证件类型">
                       <el-select v-model="formData.CredentialFlag" :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''"
@@ -184,6 +193,16 @@
                     </el-form-item>
                   </el-col>
 
+                  <el-col :span="8">
+                    <el-form-item label="统一社会信用代码" prop="CommercialNo">
+                      <el-input v-model="formData.CommercialNo"
+                                maxlength="50" :readonly="true"
+                                placeholder="请输入"
+                                style="width: 100%">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+
                   <el-col :span="8">
                     <el-form-item label="税务登记证编号"
                                   prop="CountryTaxNo"
@@ -197,25 +216,6 @@
                     </el-form-item>
                   </el-col>
 
-                  <el-col :span="8">
-                    <el-form-item label="国家"
-                                  prop="Country">
-                      <el-select v-model="formData.Country" :class="changedForm['Country'] ? 'modified-form-input' : ''"
-                                 filterable
-                                 placeholder="请选择"
-                                 :disabled="!canUpdateSupplier"
-                                 style="width: 100%">
-                        <el-option v-for="item in countryListOptions"
-                                   :key="item.key"
-                                   :label="item.value"
-                                   :value="item.value">
-                          <span style="float: left">{{ item.value }}</span>
-                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
-                        </el-option>
-                      </el-select>
-                    </el-form-item>
-                  </el-col>
-
                   <el-col :span="8">
                     <el-form-item label="组织机构代码"
                                   prop="OrganCode"
@@ -443,6 +443,24 @@
                       </el-form-item>
                     </el-col>
                   </el-row>
+                  <el-col :span="8">
+                    <el-form-item label="国家"
+                                  prop="Country">
+                      <el-select v-model="formData.Country" :class="changedForm['Country'] ? 'modified-form-input' : ''"
+                                 filterable
+                                 placeholder="请选择"
+                                 :disabled="!canUpdateSupplier"
+                                 style="width: 100%">
+                        <el-option v-for="item in countryListOptions"
+                                   :key="item.key"
+                                   :label="item.value"
+                                   :value="item.value">
+                          <span style="float: left">{{ item.value }}</span>
+                          <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
 
                   <el-col :span="8">
                     <el-form-item label="固定电话"
@@ -605,6 +623,20 @@
               <!--endprint1-->
             </div>
           </el-card>
+          <el-card class="box-card" style="margin-top: 10px;">
+            <div slot="header" class="clearfix" style="margin-top: 10px;margin-bottom: 10px;">
+              <span style="margin-left: 10px;">所代理制造商名称</span>
+              <span style="float: right;margin-right: 10px;">
+                <el-button type="primary" size="mini" @click="manufacturerdialog" v-if="Status <= 0 && formData.OperType === '代理商'">添加</el-button>
+              </span>
+            </div>
+            <manufacturer-list ref="manufacturerList"
+                               :data.sync="manufacturerList"
+                               :SupplierCertId="certId+''"
+                               :canadd="Status <= 0"
+                               height="360px"
+                               style="margin-top: 20px"></manufacturer-list>
+          </el-card>
         </el-tab-pane>
 
         <el-tab-pane label="企业情况">
@@ -1118,6 +1150,7 @@
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import ManufacturerList from '@/components/oilsupplier/manufacturerlist'
   // import SubfileList from '@/components/oilsupplier/subfilelist2'
   import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import _ from 'lodash'
@@ -1146,6 +1179,7 @@
       SupplierFileTable,
       WfHistory,
       CheckFile,
+      ManufacturerList,
       SupplierCertEdit,
       // SubfileList, // 选择企业资质
       EquipmentList, // 企业主要装备情况
@@ -1325,6 +1359,7 @@
       }
       return {
         firOptions: [],
+        manufacturerList: [],
         newVisible: false,
         auditBtn: false,
         saveLoading: false,
@@ -1845,6 +1880,9 @@
       this.isAccess()
     },
     methods: {
+      manufacturerdialog () {
+        this.$refs['manufacturerList'].showDialog()
+      },
       checkFileList () {
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.type = 4
@@ -2642,6 +2680,7 @@
               this.$refs['patentList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
               this.$refs['winningList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
               this.$refs['businessList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
+              this.$refs['manufacturerList'].getvalue(this.certId)
               // this.$refs['subfileList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
               if (this.certId && this.WorkflowId && this.$refs['WfHistory']) {
                 this.$refs['WfHistory'].getHistoryTask() /* 刷新工作流 */
@@ -3090,6 +3129,9 @@
           }
         })
       },
+      getCurrentManufactureCount1 () {
+        return this.$refs['manufacturerList'].getCurrentManufactureCount3()
+      },
       // 二级分办单位点击提交按钮
       separateUnitSubmitClick () {
         for (let idx in this.subfileList) {
@@ -3101,6 +3143,17 @@
             return
           }
         }
+        if (this.formData.OperType === '代理商') {
+          let countM = this.getCurrentManufactureCount1()
+          if (!countM && this.certId) {
+            this.$notify({
+              title: '提示',
+              type: 'warning',
+              message: '【所代理制造商名称】不能为空'
+            })
+            return false
+          }
+        }
         this.getFirAuditerByDept()
         this.dialogSeparateUnitAuditVisible = true
       },
@@ -3181,6 +3234,17 @@
             return
           }
         }
+        if (this.formData.OperType === '代理商') {
+          let countM = this.getCurrentManufactureCount1()
+          if (!countM && this.certId) {
+            this.$notify({
+              title: '提示',
+              type: 'warning',
+              message: '【所代理制造商名称】不能为空'
+            })
+            return false
+          }
+        }
         this.dialogComSubmitToSeparateUnitVisible = true
       },
       // 企业用户自行提交审批

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/basicindex.vue

@@ -357,7 +357,7 @@
       // 查询列表
       this.initDatas()
       this.getselectsupplier()
-      this.getorgtreelist()
+      // this.getorgtreelist()
       this.getDictOptions()
       this.getSupplierList()
     },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/goodsindex.vue

@@ -357,7 +357,7 @@
       // 查询列表
       this.initDatas()
       this.getselectsupplier()
-      this.getorgtreelist()
+      // this.getorgtreelist()
       this.getDictOptions()
       this.getSupplierList()
     },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/techindex.vue

@@ -355,7 +355,7 @@ import WfHistory from '@/components/workflow/wfmultihistory.vue'
       // 查询列表
       this.initDatas()
       this.getselectsupplier()
-      this.getorgtreelist()
+      // this.getorgtreelist()
       this.getDictOptions()
       this.getSupplierList()
     },

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

@@ -40,31 +40,10 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
-              <!-- <el-col :span="8">
-                <el-form-item label="准入方式">
-                  <el-select ref="inStyle" v-model="formData.InStyle" :class="getchange('SpecTypeCode') ? 'modified-form-input' : ''"
-                     placeholder="请选择" style="width: 100%"
-                    @change="InStyleChange">
-                    <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" :value="item.Value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-
-              <el-col :span="8">
-                <el-form-item label="单位关系">
-                  <el-select ref="SpecType" v-model="formData.SpecTypeCode"
-                    :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''" :disabled="true" 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" v-if="accessedType.includes('01')">
                 <el-form-item label="供应商类型" prop="OperType">
                   <el-select ref="OperType"
+                             :class="changedForm['OperType'] ? 'modified-form-input' : ''"
                              v-model="formData.OperType"
                              :disabled="true"
                              placeholder="请选择"
@@ -77,6 +56,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="8" v-if="accessedType.includes('01')">
                 <el-form-item label="中石油准入证编号">
                   <el-input v-model="formData.PACNumber" maxlength="255" :readonly="true" placeholder="请输入"
@@ -110,28 +91,18 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+            </el-row>
+            <el-row>
               <el-col :span="8">
-                <el-form-item label="国家" prop="Country">
-                  <el-select v-model="formData.Country" filterable placeholder="请选择" :disabled="true"
-                    style="width: 100%" :class="changedForm['Country'] ? 'modified-form-input' : ''">
-                    <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value"
-                      :value="item.value">
-                      <span style="float: left">{{ item.value }}</span>
-                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                <el-form-item label="单位关系">
+                  <el-select ref="SpecType" v-model="formData.SpecTypeCode"
+                             :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''" :disabled="true" 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="准入方式">
-                <el-select ref="inStyle" v-model="formData.InStyle" :disabled="true" placeholder="请选择"
-                  :class="getchange('InStyle') ? 'modified-form-input' : ''" style="width: 100%">
-                  <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" :value="item.Value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
               <el-col :span="8">
                 <el-form-item label="证件类型">
                   <el-select v-model="formData.CredentialFlag" placeholder="请选择" :disabled="true" style="width: 100%"
@@ -150,7 +121,8 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
                   <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="true"
@@ -250,7 +222,18 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
+              <el-col :span="8">
+                <el-form-item label="国家" prop="Country">
+                  <el-select v-model="formData.Country" filterable placeholder="请选择" :disabled="true"
+                             style="width: 100%" :class="changedForm['Country'] ? 'modified-form-input' : ''">
+                    <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value"
+                               :value="item.value">
+                      <span style="float: left">{{ item.value }}</span>
+                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="成立时间">
                   <el-date-picker v-model="formData.SetupTime" type="date" :readonly="true"
@@ -434,6 +417,17 @@
             </el-row>
 
           </el-form>
+          <el-card class="box-card" v-if="accessedType.includes('01')" style="margin-top: 10px;">
+            <div slot="header" class="clearfix" style="padding: 8px">
+              <span style="margin-left: 10px;">所代理制造商名称</span>
+            </div>
+            <manufacturer-list ref="manufacturerList"
+                               :data.sync="manufacturerList"
+                               :SupplierCertId="CertId1+''"
+                               :canadd="InfoStatus <= 0"
+                               height="360px"
+                               style="margin-top: 20px"></manufacturer-list>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="物资类企业情况" v-if="accessedType.includes('01')">
           <el-card class="box-card">
@@ -1194,6 +1188,7 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
+  import ManufacturerList from '@/components/oilsupplier/manufacturerlist'
   // v-viewer
   import Vue from 'vue'
   import Viewer from 'v-viewer'
@@ -1205,6 +1200,7 @@
   export default {
     components: {
       WfMultiHistory,
+      ManufacturerList,
       EquipmentList, // 企业主要设备
       PerformanceList, // 近三年主要业绩列表
       PatentList, // 专利及专有技术列表
@@ -1233,6 +1229,7 @@
         patentList: [], // 专利及专有技术
         winningList: [], // 近三年省部级及以上获奖项目
         certList: [],
+        manufacturerList: [],
         CertId1: 0,
         CertId2: 0,
         CertId3: 0,
@@ -1652,6 +1649,7 @@
                 this.$refs['performanceList1'].getvalue(0, '01', this.certList[i].Id)
                 this.$refs['patentList1'].getvalue(0, '01', this.certList[i].Id)
                 this.$refs['winningList1'].getvalue(0, '01', this.certList[i].Id)
+                this.$refs['manufacturerList'].getvalue(this.certList[i].Id)
               }
               if (this.certList[i].SupplierTypeCode == '02') {
                 this.CertId2 = this.certList[i].Id

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

@@ -32,7 +32,7 @@
 
       <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
         <el-tab-pane label="企业信息">
-          <el-form label-width="135px" ref="formData" :model="formData" :rules="rulesform" :disabled="disabled">
+          <el-form calss="formDataInfo1" label-width="135px" ref="formData" :model="formData" :rules="rulesform">
             <el-row>
 
               <el-col :span="16">
@@ -49,37 +49,10 @@
                 </el-form-item>
               </el-col>
 
-              <!-- <el-col :span="8">
-                <el-form-item label="准入编码">
-                  <el-input v-model="formData.WZAccessCardNo" :readonly="true" placeholder="请输入" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col> -->
-
-              <el-col :span="8">
-                <el-form-item label="单位关系">
-                  <el-select ref="SpecType" v-model="formData.SpecTypeCode"
-                    :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''" placeholder="请选择" :disabled="InfoStatus > 0 || butnab"
-                    style="width: 100%">
-                    <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-              <!-- <el-col :span="8">
-                <el-form-item label="准入方式">
-                  <el-select ref="inStyle" v-model="formData.InStyle" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
-                    :disabled="this.formData.Status > '0'&&!appendStatus" placeholder="请选择" style="width: 100%"
-                    @change="InStyleChange">
-                    <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" :value="item.Value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
               <el-col :span="8" v-if="accessedType.includes('01')">
                 <el-form-item label="供应商类型" prop="OperType">
                   <el-select ref="OperType"
+                             :class="changedForm['OperType'] ? 'modified-form-input' : ''"
                              v-model="formData.OperType"
                              :disabled="InfoStatus > 0"
                              placeholder="请选择"
@@ -92,6 +65,10 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+
+            </el-row>
+            <el-row>
+
               <el-col :span="8" v-if="accessedType.includes('01')">
                 <el-form-item label="中石油准入证编号">
                   <el-input v-model="formData.PACNumber" maxlength="255" placeholder="请输入" :readonly="InfoStatus > 0 || butnab"
@@ -127,15 +104,14 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-
+            </el-row>
+            <el-row>
               <el-col :span="8">
-                <el-form-item label="国家" prop="Country">
-                  <el-select v-model="formData.Country" filterable placeholder="请选择" style="width: 100%" :disabled="InfoStatus > 0 || butnab"
-                    :class="changedForm['Country'] ? 'modified-form-input' : ''">
-                    <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value"
-                      :value="item.value">
-                      <span style="float: left">{{ item.value }}</span>
-                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                <el-form-item label="单位关系">
+                  <el-select ref="SpecType" v-model="formData.SpecTypeCode"
+                             :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''" placeholder="请选择" :disabled="InfoStatus > 0 || butnab"
+                             style="width: 100%">
+                    <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key" :value="item.Value">
                     </el-option>
                   </el-select>
                 </el-form-item>
@@ -159,7 +135,8 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
                   <el-input v-model="formData.CountryTaxNo" maxlength="50"
@@ -261,7 +238,18 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
+              <el-col :span="8">
+                <el-form-item label="国家" prop="Country">
+                  <el-select v-model="formData.Country" filterable placeholder="请选择" style="width: 100%" :disabled="InfoStatus > 0 || butnab"
+                             :class="changedForm['Country'] ? 'modified-form-input' : ''">
+                    <el-option v-for="item in countryListOptions" :key="item.key" :label="item.value"
+                               :value="item.value">
+                      <span style="float: left">{{ item.value }}</span>
+                      <span style="float: right; color: #8492a6; font-size: 13px">{{ item.label }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="成立时间" prop="SetupTime">
                   <el-date-picker v-model="formData.SetupTime" type="date" :readonly="InfoStatus > 0 || butnab"
@@ -363,7 +351,7 @@
             </el-row>
           </el-form>
 
-          <el-form label-position="top" ref="EntityFormCert" :rules="rulesform" :model="formData" :disabled="disabled">
+          <el-form class="formDataInfo" label-position="top" ref="EntityFormCert" :rules="rulesform" :model="formData">
             <el-row :gutter="60">
               <el-col :span="8">
                 <el-form-item label="质量管理体系认证情况及认证机构">
@@ -440,6 +428,20 @@
             </el-row>
 
           </el-form>
+          <el-card class="box-card" v-if="accessedType.includes('01')" style="margin-top: 10px;">
+            <div slot="header" class="clearfix" style="padding: 8px">
+              <span style="margin-left: 10px;">所代理制造商名称</span>
+              <span style="float: right;margin-right: 10px;">
+                <el-button type="primary" size="mini" @click="manufacturerdialog" v-if="InfoStatus <= 0 && formData.OperType === '代理商'">添加</el-button>
+              </span>
+            </div>
+            <manufacturer-list ref="manufacturerList"
+                               :data.sync="manufacturerList"
+                               :SupplierCertId="CertId1+''"
+                               :canadd="InfoStatus <= 0"
+                               height="360px"
+                               style="margin-top: 20px"></manufacturer-list>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="物资类企业情况" v-if="accessedType.includes('01')">
           <el-card class="box-card">
@@ -1340,6 +1342,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import CheckFile from '@/components/oilsupplier/checkFile'
+  import ManufacturerList from '@/components/oilsupplier/manufacturerlist'
   // v-viewer
   import Vue from 'vue'
   import Viewer from 'v-viewer'
@@ -1352,6 +1355,7 @@
     components: {
       WfMultiHistory,
       ChooseAuditor,
+      ManufacturerList,
       CheckFile,
       EquipmentList, // 企业主要设备
       PerformanceList, // 近三年主要业绩列表
@@ -1556,6 +1560,7 @@
         CertId1: 0,
         CertId2: 0,
         CertId3: 0,
+        manufacturerList: [],
         formDataCert1: {
           WorkerTotal: 0,
           ContractNum: 0,
@@ -2074,6 +2079,9 @@
       // this.getAccessCardNo()
     },
     methods: {
+      manufacturerdialog () {
+        this.$refs['manufacturerList'].showDialog()
+      },
       checkFileList () {
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.getValue(this.formData.Id, 0, this.formData.OperType === '制造商' ? 1 : 2)
@@ -2137,6 +2145,7 @@
                   this.$refs['performanceList1'].getvalue(0, '01', this.certList[i].Id)
                   this.$refs['patentList1'].getvalue(0, '01', this.certList[i].Id)
                   this.$refs['winningList1'].getvalue(0, '01', this.certList[i].Id)
+                  this.$refs['manufacturerList'].getvalue(this.certList[i].Id)
                 }
                 if (this.certList[i].SupplierTypeCode == '02') {
                   this.CertId2 = this.certList[i].Id
@@ -3491,6 +3500,17 @@
           }
         }
         // this.commitshow = true
+        if (this.formData.OperType === '代理商' && this.accessedType.includes('01')) {
+          let countM = this.getCurrentManufactureCount1()
+          if (!countM) {
+            this.$notify({
+              title: '提示',
+              type: 'warning',
+              message: '【所代理制造商名称】不能为空'
+            })
+            return false
+          }
+        }
         this.ComAuditdialogShow = true
       },
       getFirAuditerByDept () {
@@ -3503,6 +3523,9 @@
           console.error(err)
         })
       },
+      getCurrentManufactureCount1 () {
+        return this.$refs['manufacturerList'].getCurrentManufactureCount3()
+      },
       // 二级分办单位替企业申请：
       separateUnitSubmitApplyBtn () {
         // this.saveinfochange(1)
@@ -3515,6 +3538,17 @@
             return
           }
         }
+        if (this.formData.OperType === '代理商' && this.accessedType.includes('01')) {
+          let countM = this.getCurrentManufactureCount1()
+          if (!countM) {
+            this.$notify({
+              title: '提示',
+              type: 'warning',
+              message: '【所代理制造商名称】不能为空'
+            })
+            return false
+          }
+        }
         this.getFirAuditerByDept()
         this.commitshow = true
       },
@@ -3687,9 +3721,35 @@
     text-align: center;
   }
 
+  .el-form .el-input__inner[readonly] {
+    border-color: #dcdfe6;
+  }
+
+  .el-form .el-input__inner[readonly]:focus {
+    border-color: #dcdfe6;
+  }
+
+  .el-form .el-textarea__inner[readonly] {
+    border-color: #dcdfe6;
+  }
+
+  .el-form .el-textarea__inner[readonly]:focus {
+    border-color: #dcdfe6;
+  }
   .attach-uploader-icon:hover {
     color: #228B22;
   }
+  .el-form .el-input__inner[disabled] {
+    color: #333333;
+    opacity: 1;
+    background-color: white;
+  }
+
+  .el-form .el-textarea__inner[disabled] {
+    color: #333333;
+    opacity: 1;
+    background-color: white;
+  }
 .photoStyle{
     margin-top:6px;
     width:140px;

src/dashoo.cn/frontend_web/src/pages/select/processselect/wfmultihistory.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="overflow: auto">
     <!--准入-->
-    <el-dialog :visible.sync="dialogVisible1" width="80%" style="z-index:9997">
+    <el-dialog :visible.sync="dialogVisible1" width="80%">
       <el-tabs type="border-card" v-model="activeName">
         <el-tab-pane label="审批流程" name="all">
           <el-table highlight-current-row stripe :data="historyTask" border size="mini">
@@ -238,20 +238,22 @@
             </el-table-column>
             <el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>
               <template slot-scope="scope">
-                <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                  <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                           v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)"
-                  >
-                    {{scope.row.FileName.split('$')[index]}}</el-link>
-                  <img
-                    @click="imgHover(scope.row.FileUrl, index)"
-                    width="60%"
-                    v-if="scope.row.FileUrl==''?false:!imgFormat(scope.row.FileUrl, index)"
-                    class="photoStyle" alt=""
-                    :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                    :key="index"
-                  >
-                </div>
+                <viewer :images="scope.row.FileUrlList">
+                  <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                    <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
+                             v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)"
+                    >
+                      {{scope.row.FileName.split('$')[index]}}</el-link>
+                    <img
+                      @click="imgHover(scope.row.FileUrl, index)"
+                      width="60%"
+                      v-if="scope.row.FileUrl==''?false:!imgFormat(scope.row.FileUrl, index)"
+                      class="photoStyle" alt=""
+                      :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
+                      :key="index"
+                    >
+                  </div>
+                </viewer>
               </template>
             </el-table-column>
             <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
@@ -338,7 +340,7 @@
       </el-tabs>
     </el-dialog>
     <!--年审-->
-    <el-dialog :visible.sync="dialogVisible2" width="80%" style="z-index:9997">
+    <el-dialog :visible.sync="dialogVisible2" width="80%">
       <el-tabs type="border-card" v-model="activeName2">
         <el-tab-pane label="审批流程" name="all">
           <el-table highlight-current-row stripe :data="historyTask" border size="mini">
@@ -391,7 +393,24 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
+            </el-row>
+            <el-row>
+              <el-col :span="8" v-if="SupplierTypeCode == '01'">
+                <el-form-item label="供应商类型" prop="OperType">
+                  <el-select ref="OperType"
+                             v-model="formData.OperType"
+                             :class="changedForm['OperType'] ? 'modified-form-input' : ''"
+                             :disabled="true"
+                             placeholder="请选择"
+                             style="width: 100%">
+                    <el-option v-for="item in OperTypeOptions"
+                               :key="item.Id"
+                               :label="item.Key"
+                               :value="item.Key">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="单位关系">
                   <el-select ref="SpecType" v-model="formData.SpecTypeCode" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
@@ -422,15 +441,6 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
-                <el-form-item label="证件合一">
-                  <el-select v-model="formData.CredentialFlag" :disabled="!canUpdateSupplier" placeholder="请选择" :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''" style="width: 100%">
-                    <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
             </el-row>
             <el-row v-if="SupplierTypeCode == '01'">
               <el-col :span="8">
@@ -478,7 +488,14 @@
               </el-col>
             </el-row>
             <el-row>
-
+              <el-col :span="8">
+                <el-form-item label="证件合一">
+                  <el-select v-model="formData.CredentialFlag" :disabled="!canUpdateSupplier" placeholder="请选择" :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''" style="width: 100%">
+                    <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="统一社会信用代码" prop="CommercialNo" >
                   <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="true" placeholder="请输入" style="width: 100%">
@@ -756,6 +773,16 @@
             </el-row>
 
           </el-form>
+          <el-card class="box-card mycard" style="margin-top: 10px;" v-if="SupplierTypeCode == '01'">
+            <div slot="header" class="clearfix">
+              <span style="margin-left: 10px;">所代理制造商名称</span>
+            </div>
+            <manufacturer-list ref="manufacturerList"
+                               :data.sync="manufacturerList"
+                               :SupplierCertId="certId+''"
+                               :canadd="false"
+                               ></manufacturer-list>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="企业情况" ref="tabPaneRef" name="222">
           <el-card class="box-card mycard">
@@ -942,21 +969,22 @@
             <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
             <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
               <template slot-scope="scope">
-                <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                  <div v-if="imgFormat(scope.row.OldFileUrl, index)">
-                    <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
-                      {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                  </div>
-                  <div v-else>
-                    <img
-                      @click="imgHover(scope.row.OldFileUrl, index)"
-                      width="60%"
-                      class="photoStyle" alt=""
-                      v-if="fileurlcut(scope.row.OldFileUrl, index)"
-                      :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                      :key="index">
+                <viewer :images="scope.row.OldFileUrlList">
+                  <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                    <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                    </div>
+                    <div v-else>
+                      <img
+                        width="60%"
+                        class="photoStyle" alt=""
+                        v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                        :key="index">
+                    </div>
                   </div>
-                </div>
+                </viewer>
               </template>
             </el-table-column>
             <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -967,21 +995,22 @@
             <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-row align="middle">
-                  <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    <div v-if="imgFormat(scope.row.FileUrl, index)">
-                      <el-link :href="'http://' + fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
-                        {{tmpUrl.split('|')[1]}}</el-link>
-                    </div>
-                    <div v-else>
-                      <img
-                        @click="imgHover(scope.row.FileUrl, index)"
-                        width="60%"
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.FileUrl, index)"
-                        :src="'http://' + fileurlcut(scope.row.FileUrl, index)"
-                        :key="index">
+                  <viewer :images="scope.row.FileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                      <div v-if="imgFormat(scope.row.FileUrl, index)">
+                        <el-link :href="'http://' + fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                          {{tmpUrl.split('|')[1]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          width="60%"
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.FileUrl, index)"
+                          :src="'http://' + fileurlcut(scope.row.FileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
-                  </div>
+                  </viewer>
                 </el-row>
               </template>
             </el-table-column>
@@ -1078,7 +1107,7 @@
       </el-tabs>
     </el-dialog>
     <!--信息变更-->
-    <el-dialog :visible.sync="dialogVisible3" width="80%" style="z-index:9997">
+    <el-dialog :visible.sync="dialogVisible3" width="80%">
       <el-tabs type="border-card" v-model="activeName3">
         <el-tab-pane label="审批流程" name="all">
           <el-table highlight-current-row stripe :data="historyTask" border size="mini">
@@ -1124,45 +1153,22 @@
                   </el-input>
                 </el-form-item>
               </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="准入编码">
-                  <el-input v-model="AccessCardNo" :readonly="true" placeholder="请输入" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="单位关系">
-                  <el-select ref="SpecType" v-model="formData.SpecTypeCode" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
-                             :disabled="!canUpdateSupplier" 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="准入方式">
-                  <el-select ref="SpecType" v-model="InStyle" :disabled="true"
-                             placeholder="请选择" style="width: 100%">
-                    <el-option v-for="item in InOptions" :key="item.Id" :label="item.Key" v-if="item.Value != '2' && item.Value != '3'"
-                               :value="item.Value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="证件合一">
-                  <el-select v-model="formData.CredentialFlag" :disabled="!canUpdateSupplier" placeholder="请选择" :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''" style="width: 100%">
-                    <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
+              <el-col :span="8" v-if="accessedType.length > 0 && accessedType.includes('01')">
+                <el-form-item label="供应商类型" prop="OperType">
+                  <el-select ref="OperType"
+                             v-model="formData.OperType"
+                             :class="changedForm['OperType'] ? 'modified-form-input' : ''"
+                             :disabled="true"
+                             placeholder="请选择"
+                             style="width: 100%">
+                    <el-option v-for="item in OperTypeOptions"
+                               :key="item.Id"
+                               :label="item.Key"
+                               :value="item.Key">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
-
             </el-row>
             <el-row v-if="accessedType.length > 0 && accessedType.includes('01')">
               <el-col :span="8">
@@ -1210,14 +1216,32 @@
               </el-col>
             </el-row>
             <el-row>
-
+              <el-col :span="8">
+                <el-form-item label="单位关系">
+                  <el-select ref="SpecType" v-model="formData.SpecTypeCode" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
+                             :disabled="!canUpdateSupplier" 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="证件类型">
+                  <el-select v-model="formData.CredentialFlag" :disabled="!canUpdateSupplier" placeholder="请选择" :class="changedForm['CredentialFlag'] ? 'modified-form-input' : ''" style="width: 100%">
+                    <el-option v-for="item in selectoptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="统一社会信用代码" prop="CommercialNo" >
                   <el-input v-model="formData.CommercialNo" maxlength="50" :readonly="true" placeholder="请输入" style="width: 100%">
                   </el-input>
                 </el-form-item>
               </el-col>
-
+            </el-row>
+            <el-row>
               <el-col :span="8">
                 <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'" >
                   <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier" placeholder="请输入" style="width: 100%">
@@ -1487,6 +1511,17 @@
             </el-row>
 
           </el-form>
+          <el-card class="box-card mycard" style="margin-top: 10px;">
+            <div slot="header" class="clearfix">
+              <span style="margin-left: 10px;">所代理制造商名称</span>
+            </div>
+            <manufacturer-list ref="manufacturerList"
+                               :data.sync="manufacturerList"
+                               :SupplierCertId="CertId1+''"
+                               :canadd="false"
+            ></manufacturer-list>
+          </el-card>
+
         </el-tab-pane>
         <el-tab-pane label="物资类企业情况" v-if="accessedType.includes('01')">
           <el-card class="box-card">
@@ -1827,21 +1862,22 @@
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
               <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    <div v-if="imgFormat(scope.row.OldFileUrl, index)">
-                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
-                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                    </div>
-                    <div v-else>
-                      <img
-                        @click="imgHover(scope.row.OldFileUrl, index)"
-                        width="60%"
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.OldFileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                        :key="index">
+                  <viewer :images="scope.row.OldFileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                      <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          width="60%"
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
-                  </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -1851,21 +1887,22 @@
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    <div v-if="imgFormat(scope.row.FileUrl, index)">
-                      <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
-                        {{scope.row.FileName.split('$')[index]}}</el-link>
+                  <viewer :images="scope.row.FileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                      <div v-if="imgFormat(scope.row.FileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.FileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          width="60%"
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.FileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
-                    <div v-else>
-                      <img
-                        @click="imgHover(scope.row.FileUrl, index)"
-                        width="60%"
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.FileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                        :key="index">
-                    </div>
-                  </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
@@ -1883,21 +1920,22 @@
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
               <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    <div v-if="imgFormat(scope.row.OldFileUrl, index)">
-                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
-                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                    </div>
-                    <div v-else>
-                      <img
-                        @click="imgHover(scope.row.OldFileUrl, index)"
-                        width="60%"
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.OldFileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                        :key="index">
+                  <viewer :images="scope.row.OldFileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                      <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          width="60%"
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
-                  </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -1907,21 +1945,22 @@
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    <div v-if="imgFormat(scope.row.FileUrl, index)">
-                      <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
-                        {{scope.row.FileName.split('$')[index]}}</el-link>
+                  <viewer :images="scope.row.FileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                      <div v-if="imgFormat(scope.row.FileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.FileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          width="60%"
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.FileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
-                    <div v-else>
-                      <img
-                        @click="imgHover(scope.row.FileUrl, index)"
-                        width="60%"
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.FileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                        :key="index">
-                    </div>
-                  </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
@@ -1939,21 +1978,22 @@
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
               <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    <div v-if="imgFormat(scope.row.OldFileUrl, index)">
-                      <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
-                        {{scope.row.OldFileName.split('$')[index]}}</el-link>
-                    </div>
-                    <div v-else>
-                      <img
-                        @click="imgHover(scope.row.OldFileUrl, index)"
-                        width="60%"
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.OldFileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
-                        :key="index">
+                  <viewer :images="scope.row.OldFileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                      <div v-if="imgFormat(scope.row.OldFileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.OldFileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          width="60%"
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.OldFileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
-                  </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -1963,21 +2003,22 @@
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    <div v-if="imgFormat(scope.row.FileUrl, index)">
-                      <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
-                        {{scope.row.FileName.split('$')[index]}}</el-link>
+                  <viewer :images="scope.row.FileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                      <div v-if="imgFormat(scope.row.FileUrl, index)">
+                        <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
+                          {{scope.row.FileName.split('$')[index]}}</el-link>
+                      </div>
+                      <div v-else>
+                        <img
+                          width="60%"
+                          class="photoStyle" alt=""
+                          v-if="fileurlcut(scope.row.FileUrl, index)"
+                          :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
+                          :key="index">
+                      </div>
                     </div>
-                    <div v-else>
-                      <img
-                        @click="imgHover(scope.row.FileUrl, index)"
-                        width="60%"
-                        class="photoStyle" alt=""
-                        v-if="fileurlcut(scope.row.FileUrl, index)"
-                        :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                        :key="index">
-                    </div>
-                  </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
@@ -2008,7 +2049,7 @@
       </el-tabs>
     </el-dialog>
     <!--增项-->
-    <el-dialog :visible.sync="dialogVisible4" width="80%" style="z-index:9997">
+    <el-dialog :visible.sync="dialogVisible4" width="80%">
       <el-tabs type="border-card" v-model="activeName4">
         <el-tab-pane label="审批流程" name="all">
           <el-table highlight-current-row stripe :data="historyTask" border size="mini">
@@ -2642,14 +2683,14 @@
               <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
               <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                  <viewer :images="scope.row.OldFileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
                     <div v-if="imgFormat(scope.row.OldFileUrl, index)">
                       <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary">
                         {{scope.row.OldFileName.split('$')[index]}}</el-link>
                     </div>
                     <div v-else>
                       <img
-                        @click="imgHover(scope.row.OldFileUrl, index)"
                         width="60%"
                         class="photoStyle" alt=""
                         v-if="fileurlcut(scope.row.OldFileUrl, index)"
@@ -2657,6 +2698,7 @@
                         :key="index">
                     </div>
                   </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
@@ -2666,14 +2708,14 @@
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
+                  <viewer :images="scope.row.FileUrlList">
+                    <div v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
                     <div v-if="imgFormat(scope.row.FileUrl, index)">
                       <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
                         {{scope.row.FileName.split('$')[index]}}</el-link>
                     </div>
                     <div v-else>
                       <img
-                        @click="imgHover(scope.row.FileUrl, index)"
                         width="60%"
                         class="photoStyle" alt=""
                         v-if="fileurlcut(scope.row.FileUrl, index)"
@@ -2681,6 +2723,7 @@
                         :key="index">
                     </div>
                   </div>
+                  </viewer>
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
@@ -2766,8 +2809,17 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
+  import ManufacturerList from '@/components/oilsupplier/manufacturerlist'
   import _ from 'lodash'
 
+  import Vue from 'vue'
+  import Viewer from 'v-viewer'
+  import 'viewerjs/dist/viewer.css'
+  Vue.use(Viewer)
+  Viewer.setDefaults({
+    Options: {'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
+  })
+
   export default {
     name: 'wfhistory',
     props: {
@@ -2796,6 +2848,7 @@
       GoodsInfo,
       BasisInfo,
       TechInfo,
+      ManufacturerList,
       GoodsList2,
       EquipmentList, // 企业主要设备
       PerformanceList, // 近三年主要业绩列表
@@ -2915,6 +2968,8 @@
         instance: '',
         AccessCardNo: '',
         InStyle: '',
+        manufacturerList: [],
+        OperTypeOptions: [],
         selfVisible: this.visible, // 避免vue双向绑定警告
         historyTask: [],
         goodsList: [],
@@ -3126,6 +3181,9 @@
       }
     },
     methods: {
+      manufacturerdialog () {
+        this.$refs['manufacturerList'].showDialog()
+      },
       show () {
         this.historyTask = []
         this.tmp_historyTask = []
@@ -3194,6 +3252,7 @@
                 this.$refs['performanceList1'].getvalue(0, '01', this.certList[i].Id)
                 this.$refs['patentList1'].getvalue(0, '01', this.certList[i].Id)
                 this.$refs['winningList1'].getvalue(0, '01', this.certList[i].Id)
+                this.$refs['manufacturerList'].getvalue(this.certList[i].Id)
               }
               if (this.certList[i].SupplierTypeCode == '02') {
                 this.CertId2 = this.certList[i].Id
@@ -3648,6 +3707,9 @@
             if (this.$refs['winningList']) {
               this.$refs['winningList'].getvalue(res.data.Id, this.SupplierTypeCode, this.certId)
             }
+            if (this.$refs['manufacturerList']) {
+              this.$refs['manufacturerList'].getvalue(this.certId)
+            }
             if (this.formData.Status > 0) {
               this.add_flat = false
               this.delete_flat = false
@@ -3779,6 +3841,7 @@
           SupplierId: this.SupplierId,
           SupplierTypeCode: '01',
           MInfoId: this.business,
+          SupType: this.dialogVisible3 ? '1' : '',
           _currentPage: 1,
           _size: 1000
         }
@@ -3803,6 +3866,7 @@
         const params = {
           SupplierId: this.SupplierId,
           SupplierTypeCode: '02',
+          SupType: this.dialogVisible3 ? '1' : '',
           MInfoId: this.business,
           _currentPage: 1,
           _size: 1000
@@ -3828,6 +3892,7 @@
         const params = {
           SupplierId: this.SupplierId,
           SupplierTypeCode: '02',
+          SupType: this.dialogVisible3 ? '1' : '',
           MInfoId: this.business,
           _currentPage: 1,
           _size: 1000
@@ -4117,6 +4182,12 @@
 </script>
 
 <style>
+  .viewer-container {
+    z-index: 9999 !important;
+  }
+  .el-cascader.is-disabled .el-cascader__label {
+    color: #333333;
+  }
   .mycard .el-card__header {
     padding: 8px;
   }
@@ -4124,6 +4195,12 @@
     padding: 8px 15px 0 0;
     margin-left: -2px;
   }
+  .modified-form-input .el-input__inner {
+    background-color: lightblue !important;
+  }
+  .modified-form-input .el-textarea__inner {
+    background-color: lightblue !important;
+  }
   .dialog-footer img{
     position: relative;
     width: 100%;