前后:hse成绩基建和服务类判断;增项提交审核自动保存

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

@@ -102,6 +102,65 @@ func (this *HSEScoreController) GetList() {
 
 }
 
+// @Title 获取本公司列表
+// @Description GetList
+// @Success 200 {object}
+// @router /getSupplierHSEList [get]
+func (this *HSEScoreController) GetSupplierHSEList() {
+	//获取分页信息
+	ApplyTime := this.GetString("ApplyTime")
+	SupplierName := this.GetString("SupplierName")
+	SupplierId := this.GetString("SupplierId")
+	CommercialNo := this.GetString("CommercialNo")
+	AccessCardNo := this.GetString("AccessCardNo")
+	Name := this.GetString("Name")
+	IsThree := this.GetString("IsThree")
+	where := " 1=1"
+
+	if SupplierName != "" {
+		where = where + " and a.SupplierName like '%" + SupplierName + "%'"
+	}
+	if SupplierId != "" {
+		where = where + " and a.SupplierId = " + SupplierId
+	}
+	if AccessCardNo != "" {
+		where = where + " and c.AccessCardNo like '%" + AccessCardNo + "%'"
+	}
+	if CommercialNo != "" {
+		where = where + " and b.CommercialNo like '%" + CommercialNo + "%'"
+	}
+	if ApplyTime != "" {
+		where = where + " and a.ApplyTime = '" + ApplyTime + "'"
+	}
+	if Name != "" {
+		where = where + " and a.Name like '%" + Name + "%'"
+	}
+	orderby := "Id"
+	size := 100
+
+	if IsThree != "" {
+		orderby = "Score"
+		size = 3
+	}
+
+	//企业用户必须加创建人条件
+	if this.User.IsCompanyUser == 1 {
+		where = where + " and a.SupplierName = '" + this.User.Realname + "'"
+	}
+
+	svc := hsescore.GetHSEScoreService(utils.DBE) //获得数据库引擎
+	var list []hsescore.HSEScore
+	total := svc.GetMyPagingEntitiesWithOrderBytbl("HSEScore", 1, int64(size), orderby, true, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = 100
+	datainfo.ItemsPerPage = 1
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+
+}
+
 // @Title get 导入excel
 // @Description 导入excel
 // @Success 200 {object} controllers.Request
@@ -430,4 +489,29 @@ func (this *HSEScoreController) DeleteHSEScore() {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	}
+}
+
+// @Title 服务类查询准入范围是否需要安全资质审查
+// @Description
+// @Success 200 {object} ErrorInfo
+// @Failure 403 :id 为空
+// @router /selectNeedSecure/:Id [get]
+func (this *HSEScoreController) SelectNeedSecure() {
+	Id := this.Ctx.Input.Param(":Id")
+	var errinfo ErrorInfo
+	if Id == "" {
+		errinfo.Message = "操作失败！请求信息不完整"
+		errinfo.Code = -2
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+		return
+	}
+	svc := hsescore.GetHSEScoreService(utils.DBE)
+	need := 0
+	sql := "select max(c.F53) from OilSupplierCertSub a left join OilTechnologyService c on c.ClassId = a.SubClassId where a.SupplierId = " + Id + " and a.SupplierTypeCode = '03'"
+	svc.DBE.SQL(sql).Get(&need)
+
+	errinfo.Code = 0
+	this.Data["json"] = &need
+	this.ServeJSON()
 }

src/dashoo.cn/frontend_web/src/api/hsescore/hsescore.js

@@ -15,6 +15,21 @@ export default {
       params: params
     })
   },
+  // 企业自己的成绩列表
+  getSupplierHSEList (params, myAxios) {
+    return myAxios({
+      url: '/hse/getSupplierHSEList',
+      method: 'GET',
+      params: params
+    })
+  },
+  // 服务类是否需要安全资质审查
+  selectNeedSecure (id, myAxios) {
+    return myAxios({
+      url: '/hse/selectNeedSecure/' + id,
+      method: 'GET'
+    })
+  },
   // 企业列表
   getSupplierList (myAxios) {
     return myAxios({

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

@@ -348,8 +348,7 @@
         <el-col :span="8">
           <el-form-item label="HSE审查培训">
             <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-            <el-select v-model="formData.HseTraining" :disabled="this.formData.Status > '0'" placeholder="请选择"
-                       style="width: 100%;">
+            <el-select v-model="formData.HseTraining" disabled placeholder="请选择" style="width: 100%;">
               <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                          style="width: 100%">
               </el-option>

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

@@ -349,7 +349,7 @@
         <el-col :span="8">
           <el-form-item label="HSE审查培训">
             <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-            <el-select v-model="formData.HseTraining" placeholder="请选择" style="width: 100%;" :disabled="!canUpdateSupplier">
+            <el-select v-model="formData.HseTraining" placeholder="请选择" style="width: 100%;" :disabled="!canUpdateSupplier || hseTrainingStatus">
               <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                          style="width: 100%">
               </el-option>
@@ -439,6 +439,10 @@
         type: Boolean,
         default: true
       },
+      hseTrainingStatus: {
+        type: Boolean,
+        default: false
+      },
       appendStatus: {
         type: Boolean,
         default: false

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

@@ -132,6 +132,10 @@
       status: {
         type: String,
         default: ''
+      },
+      selectNeedSecure: {
+        type: Function,
+        default: null
       }
     },
     computed: {
@@ -256,6 +260,8 @@
           .then(res => {
             _this.techList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
+            // 准入范围需不需要安全资质审查
+            _this.selectNeedSecure()
             _this.$emit('close')
           })
           .catch(err => {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/addtionaudit/_opera/basisdataopera.vue

@@ -299,7 +299,6 @@
 
               </el-row>
             </el-form>
-
             <el-form class="formDataInfo" label-position="top" ref="EntityFormCert" :model="supplierData">
               <el-row :gutter="60">
                 <el-col :span="8">
@@ -369,6 +368,34 @@
               </el-row>
 
             </el-form>
+            <el-card class="box-card" v-if="supplierData.HseTraining === '1'">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-tab-pane>
           <el-tab-pane label="企业情况">
             <el-card class="box-card">
@@ -883,6 +910,7 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
+  import hseApi from '@/api/hsescore/hsescore'
   // v-viewer
   import Vue from 'vue'
   import Viewer from 'v-viewer'
@@ -930,6 +958,7 @@
         }
       }
       return {
+        HSEList: [],
         is_todo: '0',
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
@@ -1271,6 +1300,19 @@
       // this.changeOrgUnit(this.selectDept)
     },
     methods: {
+      // hse成绩
+      hseList() {
+        if (this.formData.SupplierId) {
+          let params = {
+            SupplierId: this.formData.SupplierId
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       initDatas () {
         if (this.formData.Id) {
           suppapi.getEntityAndCert(this.formData.SupplierCertId, this.$axios).then(res => {
@@ -1347,6 +1389,7 @@
           this.isAccess()
           this.getSupplierData()
           this.initDatas()
+          this.hseList()
           // 显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
         }).catch(err => {

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

@@ -90,6 +90,7 @@
                   <el-form-item label="单位关系">
                     <el-select ref="SpecType" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
                                 v-model="formData.SpecTypeCode"
+                                :disabled="true"
                                 placeholder="请选择"
                                 style="width: 100%">
                       <el-option v-for="item in UnitRelationOptions"
@@ -392,7 +393,7 @@
                 <el-col :span="8">
                     <el-form-item label="HSE审查培训">
                       <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                      <el-select v-model="formData.HseTraining" placeholder="请选择"
+                      <el-select v-model="formData.HseTraining" placeholder="请选择" :disabled="true"
                         :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
                         <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                           style="width: 100%">
@@ -466,6 +467,34 @@
             </el-form>
           </div>
           </el-card>
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
 
         <el-tab-pane label="企业情况">
@@ -922,6 +951,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
+  import hseApi from '@/api/hsescore/hsescore'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
   import PerformanceList from '@/components/oilsupplier/performancelist'
@@ -1070,6 +1100,7 @@
         is_todo: '0',
         backRemark: '',
         firOptions: [],
+        HSEList: [],
         btnLoading: false,
         loading: false,
         dialogVisibleBack: false,
@@ -1463,8 +1494,22 @@
       // this.getorgtreelistbydeptid()
       // this.orgtreeChange(this.majorDept)
       this.getsubfile()
+      this.hseList()
     },
     methods: {
+      // hse成绩
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       imgFormat (val, index) {
         if (val != null && val != undefined && val != '') {
           let fileurlall = val.split('$')[index]

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

@@ -55,422 +55,449 @@
             <!-- <basis-info ref="BasisInfo" :formData.sync="formData" :dictData.sync="dictData" :authUser="authUser"
               :disabled="savebtn" :canUpdateSupplier="canUpdateSupplier" :appendStatus = "true" @selectcompany="changeFormData" @inputcompany="inputCompany">
             </basis-info> -->
-      <div>
-        <el-form class="formDataInfo" label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform">
-          <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="供方名称"
-                                  prop="SupplierName">
-                      <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" v-model="formData.SupplierName"
-                                :maxlength="255"
-                                placeholder="请输入"
-                                :readonly="!canUpdateSupplier"
+            <div>
+              <el-form class="formDataInfo" label-width="135px" ref="EntityForm" :model="formData" :rules="rulesform">
+                <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="供方名称"
+                                        prop="SupplierName">
+                            <el-input :class="changedForm['SupplierName'] ? 'modified-form-input' : ''" v-model="formData.SupplierName"
+                                      :maxlength="255"
+                                      placeholder="请输入"
+                                      :readonly="!canUpdateSupplier"
+                                      style="width: 100%">
+                            </el-input>
+                          </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="准入编码">
+                      <el-input v-model="formDataOther.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" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
+                                  v-model="formData.SpecTypeCode"
+                                  placeholder="请选择"
+                                  :disabled="!canUpdateSupplier"
+                                  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="formDataOther.InStyle" :disabled="!canUpdateSupplier"
+                                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" placeholder="请选择" :disabled="!canUpdateSupplier"  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" :readonly="true" maxlength="50" placeholder="请输入"
                                 style="width: 100%">
                       </el-input>
                     </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="准入编码">
-                <el-input v-model="formDataOther.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" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
-                            v-model="formData.SpecTypeCode"
-                            placeholder="请选择"
-                            :disabled="!canUpdateSupplier"
-                            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="formDataOther.InStyle" :disabled="!canUpdateSupplier"
-                          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" placeholder="请选择" :disabled="!canUpdateSupplier"  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" :readonly="true" maxlength="50" placeholder="请输入"
+                  </el-col>
+
+                  <el-col :span="8">
+                      <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
+                        <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier"
+                          :class="changedForm['CountryTaxNo'] ? 'modified-form-input' : ''" placeholder="请输入"
                           style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-                <el-form-item label="税务登记证编号" prop="CountryTaxNo" v-if="showorhidflag=='show'">
-                  <el-input v-model="formData.CountryTaxNo" maxlength="50" :readonly="!canUpdateSupplier"
-                    :class="changedForm['CountryTaxNo'] ? 'modified-form-input' : ''" placeholder="请输入"
-                    style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-                <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
-                  <el-input v-model="formData.OrganCode" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['OrganCode'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <!--<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="注册地址" prop="Province">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                      <el-form-item label="组织机构代码" prop="OrganCode" v-if="showorhidflag=='show'">
+                        <el-input v-model="formData.OrganCode" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['OrganCode'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <!--<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="注册地址" prop="Province">
+                      <el-row>
+                        <el-col :span="10">
+                            <el-cascader ref="cascaderAdd" :options="countryoptions" :props="countryprops" maxlength="20" filterable
+                              :class="changedForm['Province'] || changedForm['City'] || changedForm['Street'] ? 'modified-form-input' : ''"
+                              :disabled="!canUpdateSupplier" placeholder="省市区" v-model="CityAry" style="width: 100%" @change="handleAreaChange">
+                            </el-cascader>
+                        </el-col>
+                        <el-col :span="14">
+                            <el-input v-model="formData.Address" maxlength="500" placeholder="详细地址" style="width: 100%" :readonly="!canUpdateSupplier"
+                              :class="changedForm['Address'] ? 'modified-form-input' : ''">
+                            </el-input>
+                        </el-col>
+                      </el-row>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="邮编" prop="ZipCode">
+                        <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['ZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+
+                  <el-col :span="16">
+                      <el-form-item label="通信地址" prop="LinkProvince">
+                        <el-row>
+                          <el-col :span="10">
+                            <el-cascader ref="cascaderAddrLink" :options="countryoptions" :props="countryprops" :disabled="!canUpdateSupplier"
+                              :class="changedForm['LinkProvince'] || changedForm['LinkCity'] || changedForm['LinkStreet'] ? 'modified-form-input' : ''"
+                              placeholder="省市区" v-model="LinkCityAry" maxlength="20" style="width: 100%" filterable
+                              @change="handleLinkAreaChange">
+                            </el-cascader>
+                          </el-col>
+                          <el-col :span="14">
+                            <el-input v-model="formData.LinkAddress" maxlength="500" placeholder="详细地址" style="width: 100%" :readonly="!canUpdateSupplier"
+                              :class="changedForm['LinkAddress'] ? 'modified-form-input' : ''">
+                            </el-input>
+                          </el-col>
+                        </el-row>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="邮编" prop="LinkZipCode">
+                        <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['LinkZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+
+                  <!--<el-col :span="8">
+                    <el-form-item label="省直辖市">
+                      <el-input v-model="formData.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-row>
-                  <el-col :span="10">
-                      <el-cascader ref="cascaderAdd" :options="countryoptions" :props="countryprops" maxlength="20" filterable
-                        :class="changedForm['Province'] || changedForm['City'] || changedForm['Street'] ? 'modified-form-input' : ''"
-                        :disabled="!canUpdateSupplier" placeholder="省市区" v-model="CityAry" style="width: 100%" @change="handleAreaChange">
-                      </el-cascader>
+                  <!--<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="法定代表人姓名" prop="LegalPerson">
+                        <el-input v-model="formData.LegalPerson" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['LegalPerson'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                      <el-form-item label="公司类型" prop="CompanyType">
+                        <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
+                        <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create
+                          :class="changedForm['CompanyType'] ? 'modified-form-input' : ''" :disabled="!canUpdateSupplier"
+                          placeholder="请选择" style="width: 100%;">
+                          <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
+                            style="width: 100%">
+                          </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="!canUpdateSupplier"
+                          :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
+                          value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
+                        </el-date-picker>
+                      </el-form-item>
                   </el-col>
-                  <el-col :span="14">
-                      <el-input v-model="formData.Address" maxlength="500" placeholder="详细地址" style="width: 100%" :readonly="!canUpdateSupplier"
-                        :class="changedForm['Address'] ? 'modified-form-input' : ''">
+
+                  <!--<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-row>
+                <el-row>
+                  <el-col :span="8">
+                    <el-form-item label="注册资本" prop="RegCapital">
+                      <el-input type="number" v-model="formData.RegCapital" :readonly="!canUpdateSupplier"
+                        :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
+                        style="width: 100%">
+                        <template slot="append">万元</template>
                       </el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="币种">
+                      <el-select v-model="formData.Currency"
+                                 :disabled="!canUpdateSupplier"
+                                 :class="changedForm['Currency'] ? 'modified-form-input' : ''"
+                                 placeholder="请选择"
+                                 style="width: 100%;">
+                        <el-option v-for="item in CurrencyOptions"
+                                    :key="item.Value"
+                                    :label="item.Key"
+                                    :value="item.Value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="开户银行" prop="DepositBank">
+                      <el-input v-model="formData.DepositBank" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
+                        :class="changedForm['DepositBank'] ? 'modified-form-input' : ''" style="width: 100%">
+                      </el-input>
+                    </el-form-item>
                   </el-col>
                 </el-row>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-                <el-form-item label="邮编" prop="ZipCode">
-                  <el-input v-model="formData.ZipCode" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['ZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-
-            <el-col :span="16">
-                <el-form-item label="通信地址" prop="LinkProvince">
-                  <el-row>
-                    <el-col :span="10">
-                      <el-cascader ref="cascaderAddrLink" :options="countryoptions" :props="countryprops" :disabled="!canUpdateSupplier"
-                        :class="changedForm['LinkProvince'] || changedForm['LinkCity'] || changedForm['LinkStreet'] ? 'modified-form-input' : ''"
-                        placeholder="省市区" v-model="LinkCityAry" maxlength="20" style="width: 100%" filterable
-                        @change="handleLinkAreaChange">
-                      </el-cascader>
+                <el-row>
+                    <el-col :span="8">
+                      <el-form-item label="联系人姓名" prop="ContactName">
+                        <el-input v-model="formData.ContactName" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['ContactName'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
                     </el-col>
-                    <el-col :span="14">
-                      <el-input v-model="formData.LinkAddress" maxlength="500" placeholder="详细地址" style="width: 100%" :readonly="!canUpdateSupplier"
-                        :class="changedForm['LinkAddress'] ? 'modified-form-input' : ''">
-                      </el-input>
+
+                    <el-col :span="8">
+                      <el-form-item label="移动电话" prop="Mobile">
+                        <el-input v-model="formData.Mobile" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['Mobile'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8">
+                      <el-form-item label="银行账号" prop="BankAccount">
+                        <el-input v-model="formData.BankAccount" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['BankAccount'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
                     </el-col>
                   </el-row>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8">
-                <el-form-item label="邮编" prop="LinkZipCode">
-                  <el-input v-model="formData.LinkZipCode" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['LinkZipCode'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-
-            <!--<el-col :span="8">
-              <el-form-item label="省直辖市">
-                <el-input v-model="formData.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-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="法定代表人姓名" prop="LegalPerson">
-                  <el-input v-model="formData.LegalPerson" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['LegalPerson'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-                <el-form-item label="公司类型" prop="CompanyType">
-                  <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
-                  <el-select v-model="formData.CompanyType" maxlength="50" filterable allow-create
-                    :class="changedForm['CompanyType'] ? 'modified-form-input' : ''" :disabled="!canUpdateSupplier"
-                    placeholder="请选择" style="width: 100%;">
-                    <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value"
-                      style="width: 100%">
-                    </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="!canUpdateSupplier"
-                    :class="changedForm['SetupTime'] ? 'modified-form-input' : ''" format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%">
-                  </el-date-picker>
-                </el-form-item>
-            </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-row>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="注册资本" prop="RegCapital">
-                  <el-input type="number" v-model="formData.RegCapital" :readonly="!canUpdateSupplier"
-                    :class="changedForm['RegCapital'] ? 'modified-form-input' : ''" placeholder="请输入"
-                    style="width: 100%">
-                    <template slot="append">万元</template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="币种">
-                  <el-select v-model="formData.Currency"
-                             :disabled="!canUpdateSupplier"
-                             :class="changedForm['Currency'] ? 'modified-form-input' : ''"
-                             placeholder="请选择"
-                             style="width: 100%;">
-                    <el-option v-for="item in CurrencyOptions"
-                                :key="item.Value"
-                                :label="item.Key"
-                                :value="item.Value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="开户银行" prop="DepositBank">
-                  <el-input v-model="formData.DepositBank" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['DepositBank'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="8">
-                <el-form-item label="联系人姓名" prop="ContactName">
-                  <el-input v-model="formData.ContactName" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['ContactName'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="移动电话" prop="Mobile">
-                  <el-input v-model="formData.Mobile" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['Mobile'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item label="银行账号" prop="BankAccount">
-                  <el-input v-model="formData.BankAccount" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['BankAccount'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-          <el-row>
-            <el-col :span="8">
-                <el-form-item label="固定电话" prop="Telphone">
-                  <el-input v-model="formData.Telphone" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['Telphone'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-                <el-form-item label="传真" prop="Fax">
-                  <el-input v-model="formData.Fax" maxlength="20" placeholder="区号-0000000" :readonly="!canUpdateSupplier"
-                    :class="changedForm['Fax'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
-                </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-                <el-form-item label="财务电话" prop="CompanyTel">
-                  <el-input v-model="formData.CompanyTel" placeholder="区号-0000000" maxlength="20" :readonly="!canUpdateSupplier"
-                    :class="changedForm['CompanyTel'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8">
-                <el-form-item label="电子邮箱" prop="EMail">
-                  <el-input v-model="formData.EMail" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
-                    :class="changedForm['EMail'] ? 'modified-form-input' : ''" 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" maxlength="10" :readonly="!canUpdateSupplier"
-                    :class="changedForm['BankCreditRating'] ? 'modified-form-input' : ''" 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.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                  <el-select v-model="formData.HseTraining" placeholder="请选择" :disabled="!canUpdateSupplier"
-                    :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
-                    <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
-                      style="width: 100%">
-                    </el-option>
-                  </el-select>
-
-                </el-form-item>
-            </el-col>
-
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="进津备案通知书">
-                <el-input v-model="formData.TjinNotify"  :readonly="!canUpdateSupplier" placeholder="请输入"
-                          :class="changedForm['TjinNotify'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <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="质量管理体系认证情况及认证机构">
-                  <el-input v-model="formData.QualitySystemCert" maxlength="200" placeholder="请输入" type="textarea" :readonly="!canUpdateSupplier"
-                    :class="changedForm['QualitySystemCert'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="企业资质证书(编号  级别)">
-                <el-input v-model="formData.QualifCert" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
-                          :class="changedForm['QualifCert'] ? 'modified-form-input' : ''" 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" :readonly="!canUpdateSupplier" maxlength="200" placeholder="请输入" type="textarea"
-                          :class="changedForm['SafetyLicense'] ? 'modified-form-input' : ''" style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="8">
-              <el-form-item label="行业特殊要求的认证证书编号">
-                <el-input v-model="formData.SpecIndustryCert" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
-                          :class="changedForm['SpecIndustryCert'] ? 'modified-form-input' : ''" style="width: 100%">
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <el-form-item label="营业范围" prop="BusinessScope">
-                <el-input v-model="formData.BusinessScope" maxlength="200" :readonly="!canUpdateSupplier" placeholder="营业执照上的信息" type="textarea"
-                          :class="changedForm['BusinessScope'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-                <el-form-item label="备注">
-                  <el-input v-model="formData.Remark" maxlength="500" placeholder="请输入" type="textarea" :readonly="!canUpdateSupplier"
-                    :class="changedForm['Remark'] ? 'modified-form-input' : ''" style="width: 100%">
-                  </el-input>
-                </el-form-item>
-            </el-col>
-          </el-row>
-
-        </el-form>
-      </div>
+                <el-row>
+                  <el-col :span="8">
+                      <el-form-item label="固定电话" prop="Telphone">
+                        <el-input v-model="formData.Telphone" maxlength="20" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['Telphone'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                      <el-form-item label="传真" prop="Fax">
+                        <el-input v-model="formData.Fax" maxlength="20" placeholder="区号-0000000" :readonly="!canUpdateSupplier"
+                          :class="changedForm['Fax'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                      </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                      <el-form-item label="财务电话" prop="CompanyTel">
+                        <el-input v-model="formData.CompanyTel" placeholder="区号-0000000" maxlength="20" :readonly="!canUpdateSupplier"
+                          :class="changedForm['CompanyTel'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                      <el-form-item label="电子邮箱" prop="EMail">
+                        <el-input v-model="formData.EMail" maxlength="50" placeholder="请输入" :readonly="!canUpdateSupplier"
+                          :class="changedForm['EMail'] ? 'modified-form-input' : ''" 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" maxlength="10" :readonly="!canUpdateSupplier"
+                          :class="changedForm['BankCreditRating'] ? 'modified-form-input' : ''" 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.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
+                        <el-select v-model="formData.HseTraining" placeholder="请选择" disabled
+                          :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
+                          <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
+                            style="width: 100%">
+                          </el-option>
+                        </el-select>
+
+                      </el-form-item>
+                  </el-col>
+
+                </el-row>
+                <el-row>
+                  <el-col :span="8">
+                    <el-form-item label="进津备案通知书">
+                      <el-input v-model="formData.TjinNotify"  :readonly="!canUpdateSupplier" placeholder="请输入"
+                                :class="changedForm['TjinNotify'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </el-form>
+              <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="质量管理体系认证情况及认证机构">
+                        <el-input v-model="formData.QualitySystemCert" maxlength="200" placeholder="请输入" type="textarea" :readonly="!canUpdateSupplier"
+                          :class="changedForm['QualitySystemCert'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="企业资质证书(编号  级别)">
+                      <el-input v-model="formData.QualifCert" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
+                                :class="changedForm['QualifCert'] ? 'modified-form-input' : ''" 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" :readonly="!canUpdateSupplier" maxlength="200" placeholder="请输入" type="textarea"
+                                :class="changedForm['SafetyLicense'] ? 'modified-form-input' : ''" style="width: 100%">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+
+                  <el-col :span="8">
+                    <el-form-item label="行业特殊要求的认证证书编号">
+                      <el-input v-model="formData.SpecIndustryCert" :readonly="!canUpdateSupplier" placeholder="请输入" maxlength="200" type="textarea"
+                                :class="changedForm['SpecIndustryCert'] ? 'modified-form-input' : ''" style="width: 100%">
+                      </el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="16">
+                    <el-form-item label="营业范围" prop="BusinessScope">
+                      <el-input v-model="formData.BusinessScope" maxlength="200" :readonly="!canUpdateSupplier" placeholder="营业执照上的信息" type="textarea"
+                                :class="changedForm['BusinessScope'] ? 'modified-form-input' : ''" style="width: 100%"></el-input>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                      <el-form-item label="备注">
+                        <el-input v-model="formData.Remark" maxlength="500" placeholder="请输入" type="textarea" :readonly="!canUpdateSupplier"
+                          :class="changedForm['Remark'] ? 'modified-form-input' : ''" style="width: 100%">
+                        </el-input>
+                      </el-form-item>
+                  </el-col>
+                </el-row>
+
+              </el-form>
+            </div>
+          </el-card>
+          <el-card class="box-card">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
           </el-card>
         </el-tab-pane>
 
@@ -982,10 +1009,11 @@
   import uploadajax from '@/assets/js//uploadajax.js'
   import setapi from '@/api/oilsupplier/oilclassorgset'
   import CheckFile from '@/components/oilsupplier/checkFile'
+  import hseApi from '@/api/hsescore/hsescore'
 
   // v-viewer
   import Vue from 'vue'
-import Viewer from 'v-viewer'
+  import Viewer from 'v-viewer'
   import 'viewerjs/dist/viewer.css'
   Vue.use(Viewer)
   Viewer.setDefaults({
@@ -1159,6 +1187,7 @@ import Viewer from 'v-viewer'
         }
       }
       return {
+        HSEList: [],
         auditBtn: false,
         firOptions: [],
         newVisible: false,
@@ -1555,7 +1584,7 @@ import Viewer from 'v-viewer'
           SupplierTypeCode: '',
           SupplierTypeName: '',
           Step: 0,
-          HseTraining: '0',
+          HseTraining: '1',
           AuditIndex: 0,
           PACNumber: ''
         },
@@ -1672,6 +1701,19 @@ import Viewer from 'v-viewer'
       this.isAccess()
     },
     methods: {
+      // hse成绩
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       checkFileList () {
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.type = 4
@@ -2708,6 +2750,7 @@ import Viewer from 'v-viewer'
         this.formData.QQ = fdata.QQ
         this.formData.CompanyUrl = fdata.CompanyUrl
         this.formData.HseTraining = fdata.HseTraining
+        console.log(this.formData.HseTraining, '3333333')
         this.formData.SpecTypeCode = fdata.SpecTypeCode
 
         // this.$refs['BasisInfo'].CityAry = []
@@ -2786,6 +2829,8 @@ import Viewer from 'v-viewer'
         annualapi.GetChangeEntity(Id, params, this.$axios).then(res => {
           this.copyformdata = _.cloneDeep(res.data[0])
           this.formData = res.data[1]
+          this.formData.HseTraining = '1' // 基建类HSE培训只能选是
+          this.hseList()
           this.CityAry = []
           this.CityAry.push(this.formData.Province)
           this.CityAry.push(this.formData.City)
@@ -3109,7 +3154,7 @@ import Viewer from 'v-viewer'
             }).catch(err => {
               console.error(err)
             })
-            return true
+            return resolve(true)
           } else {
             this.saveLoading = false
             return resolve(false)

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

@@ -315,7 +315,7 @@
                     <el-form-item label="HSE审查培训">
                       <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
                       <el-select :class="changedForm['HseTraining'] ? 'modified-form-input' : ''"
-                                 v-model="formData.HseTraining" placeholder="请选择" style="width: 100%;" :disabled="!canUpdateSupplier">
+                                 v-model="formData.HseTraining" placeholder="请选择" style="width: 100%;" :disabled="!canUpdateSupplier || hseTrainingStatus">
                         <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                                    style="width: 100%">
                         </el-option>
@@ -381,6 +381,34 @@
               </el-form>
             </div>
           </el-card>
+          <el-card class="box-card" v-if="formData.HseTraining === '1'">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
 
         <el-tab-pane label="企业情况">
@@ -882,7 +910,7 @@
   import SupplierFileTable from '@/pages/oilsupplier/supplierfile/table.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
-
+  import hseApi from '@/api/hsescore/hsescore'
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
@@ -1078,6 +1106,8 @@ import Viewer from 'v-viewer'
         }
       }
       return {
+        HSEList: [],
+        hseTrainingStatus: false,
         auditBtn: false,
         saveLoading: false,
         firOptions: [],
@@ -1588,6 +1618,34 @@ import Viewer from 'v-viewer'
       this.isAccess()
     },
     methods: {
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      selectNeedSecure() {
+        console.log(this.formData.Id, 'this.formData.Id')
+        if (this.formData.Id) {
+          hseApi.selectNeedSecure(this.formData.Id, this.$axios).then(res => {
+            if (res.data === 1) {
+              this.formData.HseTraining = '1'
+              this.hseTrainingStatus = true
+            } else {
+              this.hseTrainingStatus = false
+            }
+            this.hseList()
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       checkFileList () {
         this.$refs.checkFile.checkFileListShow = true
         this.$refs.checkFile.type = 4
@@ -2652,7 +2710,8 @@ import Viewer from 'v-viewer'
         this.formData.CompanyTel = fdata.CompanyTel
         this.formData.QQ = fdata.QQ
         this.formData.CompanyUrl = fdata.CompanyUrl
-        this.formData.HseTraining = fdata.HseTraining
+        this.formData.HseTraining = this.formData.HseTraining === '1' ? '1' : fdata.HseTraining
+        console.log(this.formData.HseTraining, 'this.formData.HseTraining1')
         this.formData.SpecTypeCode = fdata.SpecTypeCode
 
         // this.$refs['TechInfo'].CityAry = []
@@ -2736,6 +2795,7 @@ import Viewer from 'v-viewer'
         annualapi.GetChangeEntity(Id, params, this.$axios).then(res => {
           this.copyformdata = _.cloneDeep(res.data[0])
           this.formData = res.data[1]
+          this.selectNeedSecure()
           this.CityAry = []
           this.CityAry.push(this.formData.Province)
           this.CityAry.push(this.formData.City)

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

@@ -73,7 +73,7 @@
                   <el-col :span="8">
                     <el-form-item label="单位关系">
                       <el-select ref="SpecType" v-model="formData.SpecTypeCode" :class="changedForm['SpecTypeCode'] ? 'modified-form-input' : ''"
-                                 placeholder="请选择" style="width: 100%">
+                                 placeholder="请选择" :disabled="true" style="width: 100%">
                         <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
                                    :value="item.Value">
                         </el-option>
@@ -309,7 +309,7 @@
                   <el-col :span="8">
                     <el-form-item label="HSE审查培训">
                       <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                      <el-select :class="changedForm['HseTraining'] ? 'modified-form-input' : ''"
+                      <el-select :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" :disabled="true"
                                  v-model="formData.HseTraining" placeholder="请选择" style="width: 100%;">
                         <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                                    style="width: 100%">
@@ -376,6 +376,34 @@
               </el-form>
             </div>
           </el-card>
+          <el-card class="box-card" v-if="formData.HseTraining === '1'">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
 
         <el-tab-pane label="企业情况">
@@ -851,6 +879,7 @@
   // import SubfileList from '@/components/oilsupplier/subfilelist2'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
+  import hseApi from '@/api/hsescore/hsescore'
   import _ from 'lodash'
 
   // v-viewer
@@ -993,6 +1022,7 @@
         }
       }
       return {
+        HSEList: [],
         is_todo: '0',
         backRemark: '',
         dialogVisibleBack: false,
@@ -1470,9 +1500,23 @@
       // this.getorgtreelistbydeptid()
       // this.orgtreeChange(this.majorDept)
       this.getsubfile()
+      this.hseList()
     },
     methods: {
       // ======
+      // hse成绩
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       fileurlcut (val, index) {
         let fileurlall = val.split('$')[index]
         let fileurl = fileurlall.split('|')

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

@@ -322,7 +322,7 @@
               <el-col :span="8" v-if="(accessedType.length === 1 && !accessedType.includes('01')) || accessedType.length > 1">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                  <el-select v-model="formData.HseTraining" :readonly="true" placeholder="请选择"
+                  <el-select v-model="formData.HseTraining" :disabled="true" placeholder="请选择"
                     :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
                     <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                       style="width: 100%">
@@ -428,6 +428,34 @@
                                height="360px"
                                style="margin-top: 20px"></manufacturer-list>
           </el-card>
+          <el-card class="box-card" v-if="formData.HseTraining === '1'">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="物资类企业情况" v-if="accessedType.includes('01')">
           <el-card class="box-card">
@@ -1182,6 +1210,7 @@
   import apiCert from '@/api/oilsupplier/suppliercert'
   import supplierapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/infochange'
+  import hseApi from '@/api/hsescore/hsescore'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -1223,6 +1252,8 @@
     },
     data () {
       return {
+        hseTrainingStatus: false,
+        HSEList: [],
         is_todo: '0',
         equipmentList: [], // 企业主要设备
         performanceList: [], // 近三年主要业绩
@@ -1588,8 +1619,36 @@
       this.getfilelist3()
       this.getSupplierCert()
       this.getAccessCardNo()
+      this.selectNeedSecure()
     },
     methods: {
+      hseList() {
+        if (this.SuppId) {
+          let params = {
+            SupplierId: this.SuppId
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      selectNeedSecure() {
+        if (this.SuppId) {
+          hseApi.selectNeedSecure(this.SuppId, this.$axios).then(res => {
+            if (res.data === 1) {
+              this.formData.HseTraining = '1'
+              this.hseTrainingStatus = true
+            } else {
+              this.hseTrainingStatus = false
+            }
+            this.hseList()
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       equipmentdialog (code) {
         if (code === '01') {
           this.$refs['equipmentList1'].showDialog()

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

@@ -331,7 +331,7 @@
               <el-col :span="8" v-if="(accessedType && accessedType.length === 1 && !accessedType.includes('01')) || (accessedType && accessedType.length > 1)">
                 <el-form-item label="HSE审查培训">
                   <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                  <el-select v-model="formData.HseTraining" placeholder="请选择" :disabled="InfoStatus > 0 || butnab"
+                  <el-select v-model="formData.HseTraining" placeholder="请选择" :disabled="InfoStatus > 0 || butnab || hseTrainingStatus"
                     :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
                     <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                       style="width: 100%">
@@ -442,6 +442,34 @@
                                height="360px"
                                style="margin-top: 20px"></manufacturer-list>
           </el-card>
+          <el-card class="box-card" v-if="formData.HseTraining === '1'">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="物资类企业情况" v-if="accessedType && accessedType.includes('01')">
           <el-card class="box-card">
@@ -1335,6 +1363,7 @@
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import fileapi from '@/api/oilsupplier/supplierfile'
+  import hseApi from '@/api/hsescore/hsescore'
   import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import setapi from '@/api/oilsupplier/oilclassorgset'
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
@@ -1535,6 +1564,8 @@
         }
       }
       return {
+        hseTrainingStatus: false,
+        HSEList: [],
         rulesnum: {
           WorkerTotal: [{
             required: true,
@@ -2076,6 +2107,7 @@
       this.getFileDictOptions()
       this.initTableHeader()
       this.getSupplierCert()
+      this.selectNeedSecure()
       // this.getAccessCardNo()
     },
     methods: {
@@ -2357,6 +2389,33 @@
             })
         }
       },
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      selectNeedSecure() {
+        if (this.supplierId) {
+          hseApi.selectNeedSecure(this.supplierId, this.$axios).then(res => {
+            if (res.data === 1) {
+              this.formData.HseTraining = '1'
+              this.hseTrainingStatus = true
+            } else {
+              this.hseTrainingStatus = false
+            }
+            this.hseList()
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       lineheight (list) {
         return list * 23 + ''
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -91,6 +91,34 @@
                         @selectcompany="changeFormData"
                         @inputcompany="inputCompany">
             </basis-info>
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-card>
         </el-tab-pane>
 
@@ -564,7 +592,7 @@ import BusinessList from '@/components/oilsupplier/businesslist'
 import SubfileList from '@/components/oilsupplier/subfilelist2'
 import BasisInfo from '@/components/oilsupplier/basisinfo'
 import Badrecord from '@/components/oilsupplier/badrecord.vue'
-
+import hseApi from '@/api/hsescore/hsescore'
 import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 // import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 import FloatImgBtn from '@/components/floatButton/index'
@@ -629,6 +657,7 @@ export default {
       }
     }
     return {
+      HSEList: [],
       recallApplyVisible: false, // 撤回申请弹出框
       recallApplyBtn: false,
       needPayAmount: 0,
@@ -769,7 +798,7 @@ export default {
         SupplierTypeCode: '02',
         SupplierTypeName: '基建类',
         Step: 0,
-        HseTraining: '0',
+        HseTraining: '1',
         AuditIndex: 0,
         JSAccessCardNo: ''
       },
@@ -1187,7 +1216,8 @@ export default {
       this.formData.QQ = fdata.QQ
       this.formData.CompanyUrl = fdata.CompanyUrl
       if (fdata.HseTraining != null && fdata.HseTraining != '') {
-        this.formData.HseTraining = fdata.HseTraining
+        // this.formData.HseTraining = fdata.HseTraining
+        this.formData.HseTraining = '1'
       }
       if (fdata.SpecTypeCode != null && fdata.SpecTypeCode != '') {
         this.formData.SpecTypeCode = fdata.SpecTypeCode
@@ -1237,12 +1267,27 @@ export default {
     winningdialog () {
       this.$refs['winningList'].showDialog()
     },
-
+    // hse成绩
+    hseList() {
+      if (this.formData.Id) {
+        let params = {
+          SupplierId: this.formData.Id
+        }
+        hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+          this.HSEList = res.data.items
+        }).catch(err => {
+          console.error(err)
+        })
+      }
+    },
     initDatas () {
       if (this.formData.Id) {
         this.isCanUpdateSupplier(this.formData.Id)
         api.getEntityAndCert(this.certId, this.$axios).then(res => {
           this.formData = res.data
+          this.formData.HseTraining = '1'
+          console.log(this.formData.HseTraining, 'HseTraining')
+          this.hseList()
           this.formDataCert.WorkerTotal = this.formData.WorkerTotal
           this.WorkerTotal = this.formData.WorkerTotal
           this.formDataCert.ContractNum = this.formData.ContractNum

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -85,9 +85,38 @@
                        :dictData.sync="dictData"
                        :authUser="authUser"
                        :canUpdateSupplier="canUpdateSupplier"
+                       :hseTrainingStatus="hseTrainingStatus"
                        @selectcompany="changeFormData"
                        @inputcompany="inputCompany">
             </tech-info>
+            <el-card class="box-card" v-if="formData.HseTraining === '1'">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-card>
         </el-tab-pane>
 
@@ -319,6 +348,7 @@
                      :canadd="add_flat"
                      :candelete="delete_flat"
                      :status="formData.Status"
+                     :selectNeedSecure="selectNeedSecure"
                      :needPayAmount="needPayAmount"
                      height="360px"></tech-list>
         </el-tab-pane>
@@ -553,7 +583,7 @@ import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
 import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
 import dataapi from '@/api/oilsupplier/dataentry'
-
+import hseApi from '@/api/hsescore/hsescore'
 import EquipmentList from '@/components/oilsupplier/equipmentlist'
 import PerformanceList from '@/components/oilsupplier/performancelist'
 import PatentList from '@/components/oilsupplier/patentlist'
@@ -626,6 +656,8 @@ export default {
       }
     }
     return {
+      HSEList: [],
+      hseTrainingStatus: false,
       recallApplyVisible: false, // 撤回申请弹出框
       recallApplyBtn: false,
       needPayAmount: 0,
@@ -910,6 +942,35 @@ export default {
     // this.changeOrgUnit(this.selectDept)
   },
   methods: {
+    // hse成绩
+    hseList() {
+      if (this.formData.Id) {
+        let params = {
+          SupplierId: this.formData.Id
+        }
+        hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+          this.HSEList = res.data.items
+        }).catch(err => {
+          console.error(err)
+        })
+      }
+    },
+    selectNeedSecure() {
+      console.log(this.formData.Id, 'this.formData.Id')
+      if (this.formData.Id) {
+        hseApi.selectNeedSecure(this.formData.Id, this.$axios).then(res => {
+          if (res.data === 1) {
+            this.formData.HseTraining = '1'
+            this.hseTrainingStatus = true
+          } else {
+            this.hseTrainingStatus = false
+          }
+          this.hseList()
+        }).catch(err => {
+          console.error(err)
+        })
+      }
+    },
     annaudit () {
       this.annentityForm.supplierId = parseInt(this.serviceId)
       this.annentityForm.SupplierName = this.formData.SupplierName
@@ -1755,23 +1816,28 @@ export default {
       this.chooseAuditorVisible = true
     },
     commitAudit () {
-      // this.saveEntity(1)
-      // this.updateNumberEntityNoInfo()
-      apiCert.checkSupplierCertCanSubmit(this.certId, this.$axios)
-        .then(res => {
+      if (this.saveEntity(1)) {
+        apiCert.checkSupplierCertCanSubmit(this.certId, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.selectAuditOrg()
           } else {
             this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+              duration: 10000,
+              type: 'warning',
+              message: res.data.message
+            })
           }
-        })
-        .catch(err => {
+        }).catch(err => {
           console.error(err)
         })
+      } else {
+        this.$message({
+          duration: 10000,
+          type: 'warning',
+          message: '请完善企业基本信息'
+        })
+      }
+      // this.updateNumberEntityNoInfo()
     },
     setAuditer (val, name) {
       this.auditer = val

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/basisdataopera.vue

@@ -45,9 +45,7 @@
         </span>
       </div>
       <div>
-        <el-tabs tab-position="top"
-                 v-model="activeName"
-                 style="margin-top: -10px">
+        <el-tabs tab-position="top" v-model="activeName" style="margin-top: -10px">
           <el-tab-pane label="企业信息">
             <el-form class="formDataInfo" label-width="135px" ref="supplierData" :model="supplierData" :rules="rulesform" :disabled="disabled">
               <el-row>
@@ -312,7 +310,7 @@
                 <el-col :span="8">
                   <el-form-item label="HSE审查培训">
                     <!--<el-input v-model="supplierData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" :disabled="currentStatus > 0"
+                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" disabled
                                :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
                       <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                                  style="width: 100%">
@@ -331,7 +329,6 @@
                 </el-col>
               </el-row>
             </el-form>
-
             <el-form class="formDataInfo" label-position="top" ref="EntityFormCert" :rules="rulesform" :model="supplierData">
               <el-row :gutter="60">
                 <el-col :span="8">
@@ -399,6 +396,34 @@
                 </el-col>
               </el-row>
             </el-form>
+            <el-card class="box-card" v-if="supplierData.HseTraining === '1'">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-tab-pane>
           <el-tab-pane label="企业情况">
             <el-card class="box-card">
@@ -1059,6 +1084,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import CheckFile from '@/components/oilsupplier/checkFile'
+  import hseApi from '@/api/hsescore/hsescore'
 
   // v-viewer
   import Vue from 'vue'
@@ -1226,6 +1252,7 @@
         }
       }
       return {
+        HSEList: [],
         rulesnum: {
           WorkerTotal: [{
             required: true,
@@ -1504,7 +1531,7 @@
           SupplierTypeCode: '',
           SupplierTypeName: '',
           Step: 0,
-          HseTraining: '0',
+          HseTraining: '1',
           AuditIndex: 0,
           PACNumber: ''
         },
@@ -1784,6 +1811,20 @@
       //this.getsubfile()
     },
     methods: {
+      // hse成绩
+      hseList() {
+        console.log(this.supplierId, this.formData.supplierId, 'this.supplierId')
+        if (this.supplierId) {
+          let params = {
+            SupplierId: this.supplierId
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
@@ -1799,6 +1840,7 @@
       initDatas () {
         console.log(this.formData.Id,'+++++',this.formData.SupplierCertId, '-------- --')
         if (this.formData.Id) {
+          this.hseList()
           suppapi.getEntityAndCert(this.formData.SupplierCertId, this.$axios).then(res => {
             this.AccessCardNo = res.data.AccessCardNo
             this.InStyle = res.data.InStyle
@@ -2265,15 +2307,56 @@
         this.saveEntity('auto')
         this.dialogComSubmitToSeparateUnitVisible = true
       },
+      // 提交审核保存信息
+      saveInfoChange (val) {
+        return new Promise((resolve, reject) => {
+          if (this.formData.InStyle == '4' && !(this.subfileList1[0]['OldFileUrl'] != '' || this.subfileList1[0]['FileUrl'] != '')) {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: '战略合作准入企业资质不能为空！'
+            })
+            return resolve(false)
+          }
+          let valid1 = false
+          let valid2 = false
+          // 企业基本情况
+          this.$refs['supplierData'].validate((valid) => {
+            valid1 = valid
+          })
+          // 企业基本情况
+          this.$refs['EntityFormCert'].validate((valid) => {
+            valid2 = valid
+          })
+          if (valid1 && valid2) {
+            suppapi.checkBack(this.supplierData.BankAccount, this.supplierData.Id, this.$axios).then(res => {
+              if (res.data.item) {
+                this.$message({
+                  duration: 10000,
+                  type: 'warning',
+                  message: '该银行账号与其他公司重复'
+                })
+                return resolve(false)
+              } else {
+                this.addInfoChangeItemCh(val)
+              }
+            }).catch(err => {
+              console.error(err)
+            })
+            return resolve(true)
+          } else {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: '请完善企业基本信息！'
+            })
+            return resolve(false)
+          }
+        })
+      },
       // 二级单位代为申请, 提交按钮
       separateUnitSubmitClick () {
-        this.saveinfochange(1)
         console.log('二级单位代为申请, 点击提交')
-        // if ([2, 4, 6].includes(parseInt(this.formData.InStyle))) {
-        //   this.allowpre = false
-        // } else {
-        //   this.allowpre = true
-        // }
         this.changeOrgUnit(this.selectDept)
         this.getFirAuditerByDept()
         this.dialogSeparateUnitAuditVisible = true
@@ -2281,40 +2364,46 @@
       // 二级分办单位提交审批
       separateUnitSubmitAuditMakeSure () {
         console.log('二级分办单位，确认提交审批')
-        this.saveinfochange(1)
+        // this.saveinfochange(1)
         let checkRes = this.separateUnitSubmitAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.btnloading = true
-        this.checkFile().then(val => {
-          if (val) {
-            let params = {
-              firstAudit: this.auditer,
-              SecondAudit: this.fushenauditer,
-              ThirdAudit: this.selectDept,
-              AuditRemark: this.auditform.AuditRemark
-            }
-            api2.separateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                // 保存成功后，初始化数据，变成修改
-                this.getEntityById()
-                this.dialogSeparateUnitAuditVisible = false
-                this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+        this.saveInfoChange(1).then(res => {
+          if (res) {
+            this.checkFile().then(val => {
+              if (val) {
+                let params = {
+                  firstAudit: this.auditer,
+                  SecondAudit: this.fushenauditer,
+                  ThirdAudit: this.selectDept,
+                  AuditRemark: this.auditform.AuditRemark
+                }
+                api2.separateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+                  if (res.data.code === 0) {
+                    // 保存成功后，初始化数据，变成修改
+                    this.getEntityById()
+                    this.dialogSeparateUnitAuditVisible = false
+                    this.$message({
+                      duration: 10000,
+                      type: 'success',
+                      message: res.data.message
+                    })
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: res.data.message
+                    })
+                  }
+                  this.btnloading = false
+                }).catch(err => {
+                  console.error(err)
+                })
               } else {
-                this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                this.btnloading = false
               }
-              this.btnloading = false
-            }).catch(err => {
-              console.error(err)
             })
           } else {
             this.btnloading = false
@@ -2410,35 +2499,41 @@
           return false
         }
         this.btnloading = true
-        this.checkFile().then(val => {
-          if (val) {
-            let params = {
-              UnitId: this.UnitOrg,
-              AuditRemark: this.auditform.AuditRemark
-            }
-            api2.companyAuditEntity(this.formData.Id, params, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                // 保存成功后，初始化数据，变成修改
-                this.getEntityById()
-                if (this.$refs['WfHistory']) {
-                  this.$refs['WfHistory'].getHistoryTask()
+        this.saveInfoChange(1).then(res => {
+          if (res) {
+            this.checkFile().then(val => {
+              if (val) {
+                let params = {
+                  UnitId: this.UnitOrg,
+                  AuditRemark: this.auditform.AuditRemark
                 }
-                this.dialogComSubmitToSeparateUnitVisible = false
-                this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                api2.companyAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+                  if (res.data.code === 0) {
+                    // 保存成功后，初始化数据，变成修改
+                    this.getEntityById()
+                    if (this.$refs['WfHistory']) {
+                      this.$refs['WfHistory'].getHistoryTask()
+                    }
+                    this.dialogComSubmitToSeparateUnitVisible = false
+                    this.$message({
+                      duration: 10000,
+                      type: 'success',
+                      message: res.data.message
+                    })
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: res.data.message
+                    })
+                  }
+                  this.btnloading = false
+                }).catch(err => {
+                  console.error(err)
+                })
               } else {
-                this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                this.btnloading = false
               }
-              this.btnloading = false
-            }).catch(err => {
-              console.error(err)
             })
           } else {
             this.btnloading = false
@@ -2973,6 +3068,7 @@
             .then(res => {
               this.copyformdata = _.cloneDeep(res.data[0])
               this.supplierData = res.data[1]
+              this.supplierData.HseTraining = '1'
               this.Grade = this.supplierData.Grade
               this.CityAry = []
               this.CityAry.push(this.supplierData.Province)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/goodsdataopera.vue

@@ -2624,6 +2624,53 @@
       itemsshow () {
         this.myitemsshow = true
       },
+      // 提交审核保存信息
+      saveInfoChange (val) {
+        return new Promise((resolve, reject) => {
+          if (this.formData.InStyle == '4' && !(this.subfileList1[0]['OldFileUrl'] != '' || this.subfileList1[0]['FileUrl'] != '')) {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: '战略合作准入企业资质不能为空！'
+            })
+            return resolve(false)
+          }
+          let valid1 = false
+          let valid2 = false
+          // 企业基本情况
+          this.$refs['supplierData'].validate((valid) => {
+            valid1 = valid
+          })
+          // 企业基本情况
+          this.$refs['EntityFormCert'].validate((valid) => {
+            valid2 = valid
+          })
+          if (valid1 && valid2) {
+            suppapi.checkBack(this.supplierData.BankAccount, this.supplierData.Id, this.$axios).then(res => {
+              if (res.data.item) {
+                this.$message({
+                  duration: 10000,
+                  type: 'warning',
+                  message: '该银行账号与其他公司重复'
+                })
+                return resolve(false)
+              } else {
+                this.addInfoChangeItemCh(val)
+              }
+            }).catch(err => {
+              console.error(err)
+            })
+            return resolve(true)
+          } else {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: '请完善企业基本信息！'
+            })
+            return resolve(false)
+          }
+        })
+      },
       // 保存信息变更数据
       saveinfochange (val) {
         this.$refs['supplierData'].validate((valid) => {
@@ -3667,43 +3714,48 @@
       // 二级分办单位提交审批
       separateUnitSubmitAuditMakeSure () {
         console.log('二级分办单位，确认提交审批')
-        this.saveinfochange(1)
         let checkRes = this.separateUnitSubmitAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.btnloading = true
-        this.checkFile().then(val => {
-          if (val) {
-            let params = {
-              firstAudit: this.auditer,
-              SecondAudit: this.fushenauditer,
-              ThirdAudit: this.selectDept,
-              AuditRemark: this.auditform.AuditRemark
-            }
-            api2.separateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                // 保存成功后，初始化数据，变成修改
-                this.getEntityById()
-                if (this.$refs['WfHistory']) {
-                  this.$refs['WfHistory'].getHistoryTask()
+        this.saveInfoChange(1).then(res => {
+          if (res) {
+            this.checkFile().then(val => {
+              if (val) {
+                let params = {
+                  firstAudit: this.auditer,
+                  SecondAudit: this.fushenauditer,
+                  ThirdAudit: this.selectDept,
+                  AuditRemark: this.auditform.AuditRemark
                 }
-                this.dialogSeparateUnitAuditVisible = false
-                this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                api2.separateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+                  if (res.data.code === 0) {
+                    // 保存成功后，初始化数据，变成修改
+                    this.getEntityById()
+                    if (this.$refs['WfHistory']) {
+                      this.$refs['WfHistory'].getHistoryTask()
+                    }
+                    this.dialogSeparateUnitAuditVisible = false
+                    this.$message({
+                      duration: 10000,
+                      type: 'success',
+                      message: res.data.message
+                    })
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: res.data.message
+                    })
+                  }
+                  this.btnloading = false
+                }).catch(err => {
+                  console.error(err)
+                })
               } else {
-                this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                this.btnloading = false
               }
-              this.btnloading = false
-            }).catch(err => {
-              console.error(err)
             })
           } else {
             this.btnloading = false
@@ -3800,37 +3852,43 @@
           return false
         }
         this.btnloading = true
-        this.checkFile().then(val => {
-          if (val) {
-            let params = {
-              UnitId: this.UnitOrg,
-              AuditRemark: this.auditform.AuditRemark
-            }
-            console.log('提交增项申请的参数', params)
-            console.log('实际的增项申请id', this.dialogFormData.SupplierCertAppendId, this.formData.id)
-            api2.companyAuditEntity(this.formData.Id, params, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                // 保存成功后，初始化数据，变成修改
-                this.getEntityById()
-                if (this.$refs['WfHistory']) {
-                  this.$refs['WfHistory'].getHistoryTask()
+        this.saveInfoChange(1).then(res => {
+          if (res) {
+            this.checkFile().then(val => {
+              if (val) {
+                let params = {
+                  UnitId: this.UnitOrg,
+                  AuditRemark: this.auditform.AuditRemark
                 }
-                this.dialogComSubmitToSeparateUnitVisible = false
-                this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                console.log('提交增项申请的参数', params)
+                console.log('实际的增项申请id', this.dialogFormData.SupplierCertAppendId, this.formData.id)
+                api2.companyAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+                  if (res.data.code === 0) {
+                    // 保存成功后，初始化数据，变成修改
+                    this.getEntityById()
+                    if (this.$refs['WfHistory']) {
+                      this.$refs['WfHistory'].getHistoryTask()
+                    }
+                    this.dialogComSubmitToSeparateUnitVisible = false
+                    this.$message({
+                      duration: 10000,
+                      type: 'success',
+                      message: res.data.message
+                    })
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: res.data.message
+                    })
+                  }
+                  this.btnloading = false
+                }).catch(err => {
+                  console.error(err)
+                })
               } else {
-                this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                this.btnloading = false
               }
-              this.btnloading = false
-            }).catch(err => {
-              console.error(err)
             })
           } else {
             this.btnloading = false

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/_opera/techdataopera.vue

@@ -314,7 +314,7 @@
                 <el-col :span="8">
                   <el-form-item label="HSE审查培训">
                     <!--<el-input v-model="supplierData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
-                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" :disabled="currentStatus > 0"
+                    <el-select v-model="supplierData.HseTraining" placeholder="请选择" :disabled="currentStatus > 0 || hseTrainingStatus"
                                :class="changedForm['HseTraining'] ? 'modified-form-input' : ''" style="width: 100%;">
                       <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value"
                                  style="width: 100%">
@@ -395,6 +395,34 @@
                 </el-col>
               </el-row>
             </el-form>
+            <el-card class="box-card" v-if="supplierData.HseTraining === '1'">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-tab-pane>
           <el-tab-pane label="企业情况">
             <el-card class="box-card">
@@ -1047,6 +1075,7 @@
   } from 'vuex'
   import axios from 'axios'
   import _ from 'lodash'
+  import hseApi from '@/api/hsescore/hsescore'
   import suppapi from '@/api/oilsupplier/supplier'
   import uploadajax from '@/assets/js//uploadajax.js'
   import api from '@/api/oilsupplier/supplierappendsub'
@@ -1232,6 +1261,8 @@
         }
       }
       return {
+        HSEList: [],
+        hseTrainingStatus: false,
         rulesnum: {
           WorkerTotal: [{
             required: true,
@@ -1792,6 +1823,35 @@
       // this.getsubfile()
     },
     methods: {
+      // hse成绩
+      hseList() {
+        if (this.formData.SupplierId) {
+          let params = {
+            SupplierId: this.formData.SupplierId
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      selectNeedSecure() {
+        if (this.formData.SupplierId) {
+          hseApi.selectNeedSecure(this.formData.SupplierId, this.$axios).then(res => {
+            if (res.data === 1) {
+              console.log(this.formData.SupplierId, res.data, 'this.formData.SupplierId')
+              this.supplierData.HseTraining = '1'
+              this.hseTrainingStatus = true
+            } else {
+              this.hseTrainingStatus = false
+            }
+            this.hseList()
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       equipmentdialog () {
         this.$refs['equipmentList'].showDialog()
       },
@@ -1835,44 +1895,42 @@
       updateNumberEntity () {
         if (this.formDataCert.TechnicalNum > this.formDataCert.WorkerTotal) {
           this.$message({
-                    duration: 10000,
-                    type: 'warning',
+            duration: 10000,
+            type: 'warning',
             message: '技术、管理人员数量不能大于员工总数！'
           })
           return
         }
         if (this.formDataCert.SkillerTotal > this.formDataCert.WorkerTotal) {
           this.$message({
-                    duration: 10000,
-                    type: 'warning',
+            duration: 10000,
+            type: 'warning',
             message: '技术工人总数不能大于员工总数！'
           })
           return
         }
         this.$refs['EntityFormNumber'].validate((valid) => {
           if (valid) {
-            // if (!this.CheckCompanyBase()) {
-            //   return false
-            // }
             this.formDataCert.InStyle = this.formData.InStyle
-            suppapi.updateNumberEntity(this.formData.Id + '_' + this.formData.SupplierCertId, this.formDataCert, this.$axios).then(
-              res => {
-                if (res.data.code === 0) {
-                  // 保存成功后，初始化数据，变成修改
-                  this.initDatas()
-                  this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
-                } else {
-                  this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
-                }
-              }).catch(err => {
+            suppapi.updateNumberEntity(this.formData.Id + '_' + this.formData.SupplierCertId, this.formDataCert, this.$axios).then(res => {
+              if (res.data.code === 0) {
+                // 保存成功后，初始化数据，变成修改
+                this.initDatas()
+                this.$message({
+                  duration: 10000,
+                  type: 'success',
+                  message: res.data.message
+                })
+                return true
+              } else {
+                this.$message({
+                  duration: 10000,
+                  type: 'warning',
+                  message: res.data.message
+                })
+                return false
+              }
+            }).catch(err => {
               console.error(err)
             })
           } else {
@@ -2355,12 +2413,59 @@
         this.$refs.checkFile.type = 1
         this.$refs.checkFile.getValue(this.formData.SupplierId, this.formData.SupplierCertId, this.supplierData.OperType === '制造商' ? 1 : 2)
       },
+      // 提交审核保存信息
+      saveInfoChange (val) {
+        return new Promise((resolve, reject) => {
+          if (this.formData.InStyle == '4' && !(this.subfileList1[0]['OldFileUrl'] != '' || this.subfileList1[0]['FileUrl'] != '')) {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: '战略合作准入企业资质不能为空！'
+            })
+            return resolve(false)
+          }
+          let valid1 = false
+          let valid2 = false
+          // 企业基本情况
+          this.$refs['supplierData'].validate((valid) => {
+            valid1 = valid
+          })
+          // 企业基本情况
+          this.$refs['EntityFormCert'].validate((valid) => {
+            valid2 = valid
+          })
+          if (valid1 && valid2) {
+            suppapi.checkBack(this.supplierData.BankAccount, this.supplierData.Id, this.$axios).then(res => {
+              if (res.data.item) {
+                this.$message({
+                  duration: 10000,
+                  type: 'warning',
+                  message: '该银行账号与其他公司重复'
+                })
+                return resolve(false)
+              } else {
+                this.addInfoChangeItemCh(val)
+              }
+            }).catch(err => {
+              console.error(err)
+            })
+            return resolve(true)
+          } else {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: '请完善企业基本信息！'
+            })
+            return resolve(false)
+          }
+        })
+      },
       // 保存信息变更数据
       saveinfochange (val) {
         if (this.formData.InStyle == '4' && !(this.subfileList1[0]['OldFileUrl'] != '' || this.subfileList1[0]['FileUrl'] != '')) {
           this.$message({
-                    duration: 10000,
-                    type: 'warning',
+            duration: 10000,
+            type: 'warning',
             message: '战略合作准入企业资质不能为空！'
           })
         }
@@ -2369,20 +2474,75 @@
             suppapi.checkBack(this.supplierData.BankAccount, this.supplierData.Id, this.$axios).then(res => {
               if (res.data.item) {
                 this.$message({
-                    duration: 10000,
-                    type: 'warning',
+                  duration: 10000,
+                  type: 'warning',
                   message: '该银行账号与其他公司重复'
                 })
               } else {
                 this.$refs['EntityFormCert'].validate((valid) => {
                   if (valid) {
                     this.addInfoChangeItemCh(val)
+                    if (val) {
+                      let checkRes = this.separateUnitSubmitAuditParamsCheck()
+                      if (!checkRes) {
+                        return false
+                      }
+                      this.btnloading = true
+                      this.checkFile().then(val => {
+                        if (val) {
+                          let params = {
+                            firstAudit: this.auditer,
+                            SecondAudit: this.fushenauditer,
+                            ThirdAudit: this.selectDept,
+                            AuditRemark: this.auditform.AuditRemark
+                          }
+                          api2.separateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+                            if (res.data.code === 0) {
+                              // 保存成功后，初始化数据，变成修改
+                              this.getEntityById()
+                              if (this.$refs['WfHistory']) {
+                                this.$refs['WfHistory'].getHistoryTask()
+                              }
+                              this.dialogSeparateUnitAuditVisible = false
+                              this.$message({
+                                duration: 10000,
+                                type: 'success',
+                                message: res.data.message
+                              })
+                            } else {
+                              this.$message({
+                                duration: 10000,
+                                type: 'warning',
+                                message: res.data.message
+                              })
+                            }
+                            this.btnloading = false
+                          }).catch(err => {
+                            console.error(err)
+                          })
+                        } else {
+                          this.btnloading = false
+                        }
+                      })
+                    }
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: '请完善企业基本信息！'
+                    })
                   }
                 })
               }
             }).catch(err => {
               console.error(err)
             })
+          } else {
+            this.$message({
+              duration: 10000,
+              type: 'warning',
+              message: '请完善企业基本信息！'
+            })
           }
         })
       },
@@ -2805,13 +2965,7 @@
       },
       // 二级单位代为申请, 提交按钮
       separateUnitSubmitClick () {
-        this.saveinfochange(1)
         console.log('二级单位代为申请, 点击提交')
-        // if ([2, 4, 6].includes(parseInt(this.formData.InStyle))) {
-        //   this.allowpre = false
-        // } else {
-        //   this.allowpre = true
-        // }
         this.changeOrgUnit(this.selectDept)
         this.getFirAuditerByDept()
         this.dialogSeparateUnitAuditVisible = true
@@ -2819,43 +2973,48 @@
       // 二级分办单位提交审批
       separateUnitSubmitAuditMakeSure () {
         console.log('二级分办单位，确认提交审批')
-        this.saveinfochange(1)
         let checkRes = this.separateUnitSubmitAuditParamsCheck()
         if (!checkRes) {
           return false
         }
         this.btnloading = true
-        this.checkFile().then(val => {
-          if (val) {
-            let params = {
-              firstAudit: this.auditer,
-              SecondAudit: this.fushenauditer,
-              ThirdAudit: this.selectDept,
-              AuditRemark: this.auditform.AuditRemark
-            }
-            api2.separateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                // 保存成功后，初始化数据，变成修改
-                this.getEntityById()
-                if (this.$refs['WfHistory']) {
-                  this.$refs['WfHistory'].getHistoryTask()
+        this.saveInfoChange(1).then(res => {
+          if (res) {
+            this.checkFile().then(val => {
+              if (val) {
+                let params = {
+                  firstAudit: this.auditer,
+                  SecondAudit: this.fushenauditer,
+                  ThirdAudit: this.selectDept,
+                  AuditRemark: this.auditform.AuditRemark
                 }
-                this.dialogSeparateUnitAuditVisible = false
-                this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                api2.separateUnitAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+                  if (res.data.code === 0) {
+                    // 保存成功后，初始化数据，变成修改
+                    this.getEntityById()
+                    if (this.$refs['WfHistory']) {
+                      this.$refs['WfHistory'].getHistoryTask()
+                    }
+                    this.dialogSeparateUnitAuditVisible = false
+                    this.$message({
+                      duration: 10000,
+                      type: 'success',
+                      message: res.data.message
+                    })
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: res.data.message
+                    })
+                  }
+                  this.btnloading = false
+                }).catch(err => {
+                  console.error(err)
+                })
               } else {
-                this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                this.btnloading = false
               }
-              this.btnloading = false
-            }).catch(err => {
-              console.error(err)
             })
           } else {
             this.btnloading = false
@@ -2951,35 +3110,41 @@
           return false
         }
         this.btnloading = true
-        this.checkFile().then(val => {
-          if (val) {
-            let params = {
-              UnitId: this.UnitOrg,
-              AuditRemark: this.auditform.AuditRemark
-            }
-            api2.companyAuditEntity(this.formData.Id, params, this.$axios).then(res => {
-              if (res.data.code === 0) {
-                // 保存成功后，初始化数据，变成修改
-                this.getEntityById()
-                if (this.$refs['WfHistory']) {
-                  this.$refs['WfHistory'].getHistoryTask()
+        this.saveInfoChange(1).then(res => {
+          if (res) {
+            this.checkFile().then(val => {
+              if (val) {
+                let params = {
+                  UnitId: this.UnitOrg,
+                  AuditRemark: this.auditform.AuditRemark
                 }
-                this.dialogComSubmitToSeparateUnitVisible = false
-                this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                api2.companyAuditEntity(this.formData.Id, params, this.$axios).then(res => {
+                  if (res.data.code === 0) {
+                    // 保存成功后，初始化数据，变成修改
+                    this.getEntityById()
+                    if (this.$refs['WfHistory']) {
+                      this.$refs['WfHistory'].getHistoryTask()
+                    }
+                    this.dialogComSubmitToSeparateUnitVisible = false
+                    this.$message({
+                      duration: 10000,
+                      type: 'success',
+                      message: res.data.message
+                    })
+                  } else {
+                    this.$message({
+                      duration: 10000,
+                      type: 'warning',
+                      message: res.data.message
+                    })
+                  }
+                  this.btnloading = false
+                }).catch(err => {
+                  console.error(err)
+                })
               } else {
-                this.$message({
-                duration: 10000,
-                type: 'warning',
-                message: res.data.message
-              })
+                this.btnloading = false
               }
-              this.btnloading = false
-            }).catch(err => {
-              console.error(err)
             })
           } else {
             this.btnloading = false
@@ -3209,6 +3374,7 @@
             } else {
               _this.addAppend(val)
             }
+            return true
           } else {
             return false
           }
@@ -3283,6 +3449,7 @@
         api.getMyList(params, this.$axios).then(res => {
           this.myentityList = res.data.items
           this.currentItemCountAddAccess = res.data.currentItemCount
+          this.selectNeedSecure()
         }).catch(err => {
           console.error(err)
         })
@@ -3346,7 +3513,6 @@
       // 确定
       ensureOption () {
         this.dialogloading = true
-        let arr = []
         let val = this.$refs.orgmanagetree.getCheckedNodes()
         this.checkList = []
         for (var i = 0; i < val.length; i++) {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierappend/basislist.vue

@@ -193,8 +193,7 @@
                 <el-select ref="suppselect" :disabled="IsCompanyUser == 1" filterable v-model="appendformData.SupplierName"
                            :rules="[{ required: true, message: '请选择供应商公司', trigger: 'blur' },]"
                            @change="getInfo" placeholder="请选择供应商公司" style="width: 100%">
-                  <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName"
-                             :value="item.SupplierId">
+                  <el-option v-for="item in supplierList" :key="item.SupplierId" :label="item.SupplierName" :value="item.SupplierId">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -404,23 +403,24 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
                 message: '请选择供应商公司'
               })
             }
-            _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData)
-              .then(res => {
+            _this.$axios.post('/suppliercertappend/addappend/', _this.appendformData).then(res => {
                 if (res.data.code === 0) {
                   // this.entityList = res.data.item
                   let AppendId = res.data.info
+                  console.log(res.data, this.appendformData.SupplierId, 'res.data-----')
                   this.$router.push({
                     path: `/oilsupplier/supplierappend/2/basisdataopera`,
                     query: {
                       Id: AppendId,
-                      editFlag: 1 // 编辑标记： 1 修改，0 不修改
+                      editFlag: 1, // 编辑标记： 1 修改，0 不修改
+                      sId: _this.appendformData.SupplierId
                     }
                   })
                   _this.$message({
-                duration: 10000,
-                type: 'success',
-                message: res.data.message
-              })
+                    duration: 10000,
+                    type: 'success',
+                    message: res.data.message
+                  })
                   _this.addLoading = false
                   _this.addshow = false
                 } else {

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/basisedit.vue

@@ -34,8 +34,35 @@
             <div slot="header" class="clearfix">
               <span>供方基本信息表</span>
             </div>
-            <basis-info ref="BasisInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true">
-            </basis-info>
+            <basis-info ref="BasisInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true"></basis-info>
+            <el-card class="box-card">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-card>
         </el-tab-pane>
 
@@ -441,7 +468,7 @@
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
-
+  import hseApi from '@/api/hsescore/hsescore'
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
@@ -668,10 +695,23 @@
       this.getAccessApplyIsNeedPay()
       this.initDatas()
       this.changeOrgUnit(this.selectDept)
+      this.hseList()
       // this.getorgtreelist()
       // this.getorgtreelistbydeptid()
     },
     methods: {
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       selectAuditOrg () {
         if (this.selectDept) {
           this.changeOrgUnit(this.selectDept)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplieraudit/_opera/techedit.vue

@@ -33,6 +33,34 @@
               <span>供方基本信息表</span>
             </div>
             <tech-info ref="TechInfo" :formData.sync="formData" :dictData.sync="dictData" :disabled="true"></tech-info>
+            <el-card class="box-card" v-if="formData.HseTraining === '1'">
+              <div slot="header" class="clearfix">
+                <span>HSE培训成绩</span>
+              </div>
+              <div>
+                <el-table size="mini" :data="HSEList" border>
+                  <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                  <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                  <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                  <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.ApplyTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                  <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.StartTime+'') }}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                    <template slot-scope="scope">
+                      {{ jstimehandle(scope.row.EndTime+'') }}
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </div>
+            </el-card>
           </el-card>
         </el-tab-pane>
 
@@ -399,6 +427,7 @@
   import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
   import WfMultiHistory from '@/components/workflow/wfmultihistory.vue'
   import SupplierCertEdit from '@/components/oilsupplier/suppliercertedit.vue'
+  import hseApi from '@/api/hsescore/hsescore'
 
   import EquipmentList from '@/components/oilsupplier/equipmentlist'
   import PerformanceList from '@/components/oilsupplier/performancelist'
@@ -435,6 +464,7 @@
 
     data () {
       return {
+        HSEList: [],
         is_todo: '0',
         needPayAmount: 0,
         firOptions: [],
@@ -619,12 +649,25 @@
       this.getAccessApplyIsNeedPay()
       this.getDictOptions()
       this.initDatas()
+      this.hseList()
       // this.changeOrgUnit(this.selectDept)
       // this.getpreorgtreelist()
       // this.getorgtreelist()
       // this.getorgtreelistbydeptid()
     },
     methods: {
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       radioChange () {
         if (this.formData.Status == '5') {
           if (this.shenheForm.SuccessStatus === 1) {

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

@@ -41,6 +41,34 @@
           <goods-info ref="GoodsInfo" v-if="SupplierTypeCode == '01'" :formData.sync="formData" :dictData.sync="dictData" :canUpdateSupplier="false" @initFDatas="initDatas"></goods-info>
           <basis-info ref="BasisInfo" v-if="SupplierTypeCode == '02'" :formData.sync="formData" :dictData.sync="dictData" :canUpdateSupplier="false" @initFDatas="initDatas"></basis-info>
           <tech-info ref="TechInfo" v-if="SupplierTypeCode == '03'" :formData.sync="formData" :dictData.sync="dictData" :canUpdateSupplier="false" @initFDatas="initDatas"></tech-info>
+          <el-card class="box-card" v-if="SupplierTypeCode === '02' || (SupplierTypeCode === '03' && hseTrainingStatus)">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="企业情况" ref="tabPaneRef" name="222">
           <el-card class="box-card mycard">
@@ -783,6 +811,34 @@
                                :canadd="false"
                                ></manufacturer-list>
           </el-card>
+          <el-card class="box-card" v-if="SupplierTypeCode === '02' || (SupplierTypeCode === '03' && hseTrainingStatus)">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="企业情况" ref="tabPaneRef" name="222">
           <el-card class="box-card mycard">
@@ -989,7 +1045,7 @@
             </el-table-column>
             <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ jstimehandle(scope.row.OldEffectDate+'') }}
+                {{ jstimehandle2(scope.row.OldEffectDate+'') }}
               </template>
             </el-table-column>
             <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
@@ -1016,7 +1072,7 @@
             </el-table-column>
             <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
               <template slot-scope="scope">
-                {{ jstimehandle(scope.row.EffectDate+'') }}
+                {{ jstimehandle2(scope.row.EffectDate+'') }}
               </template>
             </el-table-column>
             <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
@@ -1458,7 +1514,6 @@
               </el-col>
             </el-row>
           </el-form>
-
           <el-form class="formDataInfo" label-position="top" ref="EntityFormCert"  :model="formData">
             <el-row :gutter="60">
               <el-col :span="8">
@@ -1521,7 +1576,34 @@
                                :canadd="false"
             ></manufacturer-list>
           </el-card>
-
+          <el-card class="box-card" v-if="SupplierTypeCode === '02' || (SupplierTypeCode === '03' && hseTrainingStatus)">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="物资类企业情况" v-if="accessedType.includes('01')">
           <el-card class="box-card">
@@ -1882,7 +1964,7 @@
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
+                  {{ jstimehandle2(scope.row.OldEffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
@@ -1907,7 +1989,7 @@
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.EffectDate+'') }}
+                  {{ jstimehandle2(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
@@ -1940,7 +2022,7 @@
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
+                  {{ jstimehandle2(scope.row.OldEffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
@@ -1965,7 +2047,7 @@
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.EffectDate+'') }}
+                  {{ jstimehandle2(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
@@ -1998,7 +2080,7 @@
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
+                  {{ jstimehandle2(scope.row.OldEffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
@@ -2023,7 +2105,7 @@
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.EffectDate+'') }}
+                  {{ jstimehandle2(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip></el-table-column>
@@ -2405,7 +2487,6 @@
               </el-col>
             </el-row>
           </el-form>
-
           <el-form class="formDataInfo" label-position="top" ref="EntityFormCert"  :model="formData">
             <el-row :gutter="60">
               <el-col :span="8">
@@ -2458,6 +2539,34 @@
             </el-row>
 
           </el-form>
+          <el-card class="box-card" v-if="SupplierTypeCode === '02' || (SupplierTypeCode === '03' && hseTrainingStatus)">
+            <div slot="header" class="clearfix">
+              <span>HSE培训成绩</span>
+            </div>
+            <div>
+              <el-table size="mini" :data="HSEList" border>
+                <el-table-column label="序号" width="150" align="center" type="index"></el-table-column>
+                <el-table-column label="企业名称" min-width="300px" prop="SupplierName" sortable align="center"></el-table-column>
+                <el-table-column label="姓名" width="120px" prop="Name" sortable align="center"></el-table-column>
+                <el-table-column label="有效期" width="120px" prop="ApplyTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.ApplyTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="考试成绩" width="120px" prop="Score" sortable align="center"></el-table-column>
+                <el-table-column label="培训开始日期" width="120px" prop="StartTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.StartTime+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="培训结束日期" width="120px" prop="EndTime" sortable align="center">
+                  <template slot-scope="scope">
+                    {{ jstimehandle2(scope.row.EndTime+'') }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </div>
+          </el-card>
         </el-tab-pane>
         <el-tab-pane label="企业情况" ref="tabPaneRef" name="444">
           <el-card class="box-card mycard">
@@ -2703,7 +2812,7 @@
               </el-table-column>
               <el-table-column prop="OldEffectDate" label="原有效日期" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.OldEffectDate+'') }}
+                  {{ jstimehandle2(scope.row.OldEffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
@@ -2728,7 +2837,7 @@
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
                 <template slot-scope="scope">
-                  {{ jstimehandle(scope.row.EffectDate+'') }}
+                  {{ jstimehandle2(scope.row.EffectDate+'') }}
                 </template>
               </el-table-column>
               <el-table-column prop="Remark" label="描述" show-overflow-tooltip>
@@ -2809,6 +2918,7 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
+  import hseApi from '@/api/hsescore/hsescore'
   import ManufacturerList from '@/components/oilsupplier/manufacturerlist'
   import _ from 'lodash'
 
@@ -2875,6 +2985,8 @@
     },
     data () {
       return {
+        HSEList: [],
+        hseTrainingStatus: false,
         accessedType: [], // 已准入的类别：物资类、服务类、基建类
         certList: [],
         CertId1: 0,
@@ -3181,6 +3293,35 @@
       }
     },
     methods: {
+      // hse成绩
+      hseList() {
+        if (this.formData.Id) {
+          let params = {
+            SupplierId: this.formData.Id
+          }
+          hseApi.getSupplierHSEList(params, this.$axios).then(res => {
+            this.HSEList = res.data.items
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
+      selectNeedSecure() {
+        console.log(this.formData.Id, 'this.formData.Id')
+        if (this.formData.Id) {
+          hseApi.selectNeedSecure(this.formData.Id, this.$axios).then(res => {
+            if (res.data === 1) {
+              this.formData.HseTraining = '1'
+              this.hseTrainingStatus = true
+            } else {
+              this.hseTrainingStatus = false
+            }
+            this.hseList()
+          }).catch(err => {
+            console.error(err)
+          })
+        }
+      },
       manufacturerdialog () {
         this.$refs['manufacturerList'].showDialog()
       },
@@ -3646,10 +3787,29 @@
           return val.substring(0, 19)
         }
       },
+      jstimehandle2 (val) {
+        if (val === '' || val === 0 || val === '0001-01-01T08:05:43+08:05') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else if (val === '1970-01-01 8:0:0') {
+          return '----'
+        } else if (val === '1970-01-1 8:0:0') {
+          return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          return '----'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
       initDatas () {
         if (this.certId) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
+            this.selectNeedSecure()
             this.AccessCardNo = res.data.AccessCardNo
             this.InStyle = res.data.InStyle
             if (this.$refs['TechInfo']) {