信息变更页面添加

src/dashoo.cn/backend/api/business/oilsupplier/annualaudit/annualauditService.go

@@ -1,9 +1,17 @@
 package annualaudit
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
+	"dashoo.cn/backend/api/business/oilsupplier/classorgsetting"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
+	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
+	"dashoo.cn/backend/api/business/workflow"
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
 	"github.com/go-xorm/xorm"
+	"strconv"
+	"strings"
 )
 
 type OilAnnualAuditService struct {
@@ -24,4 +32,81 @@ func (s *OilAnnualAuditService) GetSupplierList(supname, auditname string) []Sup
 	List := make([]Suppliername, 0)
 	utils.DBE.Sql(sql).Find(&List)
 	return List
+}
+
+//通用多部门多实例审核方法
+func (s *OilAnnualAuditService) SubmitOrgAudit(workflowid, certId, wfName, wfNodeCode, userId, result, remarks, OilSupplierCertSubName, OilClassOrgSettingName string) (processInstanceId string) {
+	//取出审批列表
+	var supplierCert suppliercert.OilSupplierCert
+	s.GetEntityById(certId, &supplierCert)
+
+	//取出准入分类列表
+	var subList []suppliercertsub.OilSupplierCertSub
+	certSubSrv := suppliercertsub.GetOilSupplierCertSubService(s.DBE)
+	subWhere := " 1=1 "
+	subWhere += " and SupplierCertId='" + certId + "'"
+	certSubSrv.GetEntitysByWhere(OilSupplierCertSubName, subWhere, &subList)
+	var subClassIds string
+	for _, certSub := range subList {
+		subClassIds += strconv.Itoa(certSub.SubClassId) + ","
+	}
+	subClassIds = strings.Trim(subClassIds, ",")
+	if len(subClassIds) <= 0 {
+		panic("没有选择准入分类")
+	}
+
+	//取出审核部门
+	classorgSrv := classorgsetting.GetOilClassOrgSettingService(s.DBE)
+	var list []classorgsetting.OilClassOrgSetting
+	var orgListStr string
+	var where string
+	where += " 1=1 "
+	subWhere += " and SupplierTypeCode='" + supplierCert.SupplierTypeCode + "'"
+	where += " and ClassId in (" + subClassIds + ")"
+	where += " and AuditStepCode = '" + wfNodeCode + "'"
+	classorgSrv.GetEntitysByWhere(OilClassOrgSettingName, where, &list)
+	if len(list) <= 0 {
+		panic("未配置准入分类审批部门")
+	}
+
+	subClassIdsCheck := subClassIds + ","
+	//拼接工作流的需要审批的部门及部门相关的审核人员信息
+	var orgAudits []workflow.MultiOrgAuditVM
+	userSvc := userRole.GetUserService(s.DBE)
+	auditSrv := auditsetting.GetOilAuditSettingService(s.DBE)
+	for _, certsetting := range list {
+		var auditSetting auditsetting.Base_OilAuditSetting
+		var orgAudit workflow.MultiOrgAuditVM
+		orgAudit.OrgId = strconv.Itoa(certsetting.OrganizeId)
+		orgAudit.OrgName = certsetting.OrganizeName
+
+		auditWhere := " 1=1 "
+		auditWhere += " and OrganizeId = '" + strconv.Itoa(certsetting.OrganizeId) + "'"
+		auditWhere += " and AuditStepCode = '" + wfNodeCode + "'"
+		auditSrv.GetEntity(&auditSetting, auditWhere)
+		userIds := userSvc.GetUserIdsByRoleId(strconv.Itoa(auditSetting.RoleId))
+		tempstr := strings.Join(userIds, ",")
+		orgAudit.UserIds = strings.Replace(tempstr, "uid_", "", -1)
+		orgAudits = append(orgAudits, orgAudit)
+
+		orgListStr += "org_" + strconv.Itoa(certsetting.OrganizeId) + ","
+		//排除未设置部门的分类
+		subClassIdsCheck = strings.Replace(subClassIdsCheck, strconv.Itoa(certsetting.ClassId)+",", "", 1)
+	}
+	orgListStr = strings.Trim(orgListStr, ",")
+	if len(subClassIdsCheck) > 0 {
+		panic("存在准入分类 " + subClassIdsCheck + " 未设置审核部门")
+	}
+	if len(orgListStr) <= 0 {
+		panic("未找到审核部门")
+	}
+	//多实例工作流
+	svcActiviti := workflow.GetActivitiService(s.DBE)
+	if workflowid == "0" || len(workflowid) <= 0 {
+		//启动工作流
+		processInstanceId = svcActiviti.StartProcess(wfName, certId, userId)
+	}
+	//多实例提交给下一步
+	svcActiviti.MultiTaskComplete(wfName, certId, "", orgAudits, userId, result, remarks)
+	return processInstanceId
 }

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

@@ -3,7 +3,6 @@ package oilsupplier
 import (
 	"dashoo.cn/backend/api/business/oilsupplier/annualaudit"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
-	"dashoo.cn/backend/api/business/oilsupplier/suppliercert"
 	"dashoo.cn/backend/api/business/workflow"
 	"encoding/json"
 	"strings"
@@ -184,15 +183,14 @@ func (this *AnnualAuditController) AddEntity() {
 	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
 	annualId := model.Id
 	//工作流开始
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	processInstanceId := certSrv.SubmitOrgAudit(utils.ToStr(model.CerId), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id ,"1","提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+	processInstanceId := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id ,"1","提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	cols := []string{
 		"Id",
 		"WorkflowId",
 	}
-	certSrv.UpdateEntityByIdCols(annualId, auditmodel, cols)
+	svc.UpdateEntityByIdCols(annualId, auditmodel, cols)
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -26,8 +26,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="margin-top:10px; text-align: center;">
-      <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance " v-if="entryinfo.instance">
+    <div style="margin-top:5px; text-align: center;">
+      <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance " v-if="entryinfo.instance" style="width:900px">
     </div>
   </div>
 </template>

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

@@ -0,0 +1,591 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/annuaudit' }">年审基本信息表</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 编辑
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          <router-link :to="'/oilsupplier/annuaudit'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+      </div>
+      <el-form label-width="240px" ref="EntityForm" :model="formData">
+            <div slot="header" class="clearfix">
+              <span>年审基本信息表</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+              </span>
+            </div>
+            <el-form label-width="140px" ref="EntityForm" :model="formData">
+              <el-row>
+                <!--<el-col :span="8">
+                  <el-form-item label="DEMO">
+                    <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
+                      <el-option
+                        v-for="item in wellNoOptions"
+                        :key="item.Id"
+                        :label="item.Value"
+                        :value="item.Id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="16">
+                  <el-form-item label="供方名称" required>
+                    <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="单位关系">
+                    <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable placeholder="请选择"
+                      style="width: 100%">
+                      <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                        :value="item.Value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="统一社会信用代码" required>
+                    <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="税务登记证编号" required>
+                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="组织机构代码" required>
+                    <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="税务登记证地税编号">
+                    <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <el-col :span="16">
+                  <el-form-item label="注册地址" required>
+                    <el-row>
+                      <el-col :span="8">
+                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
+                        </el-cascader>
+                      </el-col>
+                      <el-col :span="16">
+                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
+                      </el-col>
+                    </el-row>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="邮编" required>
+                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="16">
+                  <el-form-item label="通信地址" required>
+                    <el-row>
+                      <el-col :span="8">
+                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
+                        </el-cascader>
+                      </el-col>
+                      <el-col :span="16">
+                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
+                      </el-col>
+                    </el-row>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="邮编" required>
+                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="省直辖市">
+                    <el-input v-model="formData.Province" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="地市区县">
+                    <el-input v-model="formData.City" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="街道">
+                    <el-input v-model="formData.Street" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="门牌号">
+                    <el-input v-model="formData.HouseNo" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+
+
+              </el-row>
+            </el-form>
+
+            <el-form label-width="140px" ref="EntityFormLic" :model="formData">
+              <el-row>
+                <!--<el-col :span="8">
+                  <el-form-item label="产品质量认证情况及认证机构">
+                    <el-input v-model="formData.ProductQualityCert" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="生产制造许可证获证情况及编号">
+                    <el-input v-model="formData.MaunLicense" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <!--<el-col :span="8">
+                  <el-form-item label="外地企业进津备案通知书">
+                    <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="法定代表人姓名">
+                    <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="行业类别">
+                    <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="行业类别名称">
+                    <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="注册资本">
+                    <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系人姓名">
+                    <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="币种">
+                    <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司类型">
+                    <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="成立时间">
+                    <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="开户银行">
+                    <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="银行账号">
+                    <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="移动电话">
+                    <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="固定电话">
+                    <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="传真">
+                    <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司电话">
+                    <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="电子邮箱">
+                    <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="QQ号码">
+                    <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="银行信用等级">
+                    <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司网址">
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="HSE审查培训">
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+              </el-row>
+            </el-form>
+
+            <el-form label-position="top" ref="EntityFormCert" :model="formData">
+              <el-row :gutter="60">
+                <el-col :span="8">
+                  <el-form-item label="质量管理体系认证情况">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
+                      style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="企业资质证书(编号  级别)">
+                    <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <!--<el-col :span="12">
+                  <el-form-item label="企业资质证书级别">
+                    <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <el-col :span="8">
+                  <el-form-item label="安全生产许可证">
+                    <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="行业特殊要求的认证证书">
+                    <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="16">
+                  <el-form-item label="营业范围">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
+                      style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input v-model="formData.Remark" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+            </el-form>
+      </el-form>
+          </el-card>
+
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import supplierapi from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/technologyservice';
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oiltechnologyserviceEdit',
+
+    data() {
+      return {
+        UnitRelationOptions: [],
+        UnitRelationAry: [],
+        countryoptions: [],
+        countryprops: {
+          value: 'adcode',
+          label: 'name',
+          children: 'districts'
+        },
+        CityAry: [],
+        serviceId: '',
+        certId: '',
+        classId: '03',
+       formData: {
+          Id: '',
+          SupplierName: '',
+          OilCertificateNo: '',
+          Grade: '',
+          MgrUnit: '',
+          OperType: '',
+          Country: '',
+          MaunAgent: '',
+          ConstructTeam: '',
+          CommercialNo: '',
+          OrganCode: '',
+          CountryTaxNo: '',
+          LocalTaxNo: '',
+          Address: '',
+          Province: '',
+          City: '',
+          Street: '',
+          HouseNo: '',
+          ZipCode: '',
+          QualitySystemCert: '',
+          ProductQualityCert: '',
+          MaunLicense: '',
+          QualifCert: '',
+          QualifCertLevel: '',
+          SafetyLicense: '',
+          TechServiceLic: '',
+          TJInNotify: '',
+          SpecIndustryCert: '',
+          LegalPerson: '',
+          CategoryCode: '',
+          CategoryName: '',
+          RegCapital: '',
+          Currency: '',
+          ContactName: '',
+          CompanyType: '',
+          SetupTime: '',
+          DepositBank: '',
+          BankAccount: '',
+          EMail: '',
+          BankCreditRating: '',
+          Mobile: '',
+          Telphone: '',
+          Fax: '',
+          CompanyTel: '',
+          QQ: '',
+          CompanyUrl: '',
+          SpecSupplier: '',
+          SpecTypeCode: '',
+          SpecTypeName: '',
+          WorkerTotal: 0,
+          ContractNum: 0,
+          UniversityNum: 0,
+          TechnicalNum: 0,
+          AboveProfNum: 0,
+          MiddleProfNum: 0,
+          NationalRegNum: 0,
+          NationalCertTotal: 0,
+          DesignerTotal: 0,
+          SkillerTotal: 0,
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+          CertId: 0,
+          SupplierTypeCode: '',
+          SupplierTypeName: '',
+          Step: 0
+        },
+        formDataCert: {
+          WorkerTotal: 0,
+          ContractNum: 0,
+          UniversityNum: 0,
+          TechnicalNum: 0,
+          AboveProfNum: 0,
+          MiddleProfNum: 0,
+          NationalRegNum: 0,
+          NationalCertTotal: 0,
+          DesignerTotal: 0,
+          SkillerTotal: 0,
+          Status: 0,
+          WorkflowId: ''
+        },
+      }
+    },
+    created() {
+      this.serviceId = this.$route.params.opera;
+      this.getDictOptions();
+      console.log(this.serviceId);
+      if(this.serviceId != 'add' && this.serviceId>0) {
+        this.formData.Id = this.serviceId;
+        this.initDatas();
+      } else {
+        this.formData.Id = 0;
+      }
+    },
+    methods: {
+      initDatas() {
+        console.log("----this.formData.Id---",this.formData.Id)
+       if (this.formData.Id) {
+          supplierapi.getEntityAndCert(this.formData.Id, this.$axios).then(res => {
+            this.formData = res.data
+            // this.formDataCert.WorkerTotal = this.formData.WorkerTotal
+            // this.formDataCert.ContractNum = this.formData.ContractNum
+            // this.formDataCert.UniversityNum = this.formData.UniversityNum
+            // this.formDataCert.TechnicalNum = this.formData.TechnicalNum
+            // this.formDataCert.AboveProfNum = this.formData.AboveProfNum
+            // this.formDataCert.MiddleProfNum = this.formData.MiddleProfNum
+            // this.formDataCert.NationalRegNum = this.formData.NationalRegNum
+            // this.formDataCert.NationalCertTotal = this.formData.NationalCertTotal
+            // this.formDataCert.DesignerTotal = this.formData.DesignerTotal
+            // this.formDataCert.SkillerTotal = this.formData.SkillerTotal
+            // this.formDataCert.Status = this.formData.Status
+            // this.formDataCert.WorkflowId = this.formData.WorkflowId
+
+            //this.entrydetail.business = this.certId
+            // this.entrydetail.instance = this.formDataCert.WorkflowId
+            // if (this.certId && this.formDataCert.WorkflowId) {
+            //   this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
+            // }
+
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.wellNoOptions = res.data.items['WellNo']
+          //this.supervisersOptions = res.data.items['Supervisers']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      //保存信息
+      saveEntity() {
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+
+            if (!this.formData.Id) {
+              this.addEntity();
+            } else {
+              this.updateEntity();
+            }
+
+          } else {
+            return false
+          }
+        })
+      },
+
+      addEntity() {
+        supplierapi.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item;
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+</script>
+

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

@@ -37,9 +37,12 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="150" align="center" fixed>
+        <el-table-column label="操作" min-width="180" align="center" fixed>
           <template slot-scope="scope">
-            <el-popover placement="top" title="提示">
+            <router-link :to="'/oilsupplier/annuaudit/' + scope.row.Id + '/operation'">
+              <el-button type="primary" plain title="查看详情" size="mini">打开</el-button>
+            </router-link>
+            <!-- <el-popover placement="top" title="提示">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -51,7 +54,18 @@
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
               <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
-            </el-popover>
+            </el-popover> -->
+            <el-dropdown @command="MoreCmdClick">
+              <el-button size="mini" type="primary" plain style="margin-left:5px;">
+                更多<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <!--<el-dropdown-item :command="GetCommand('JiaoHe', scope.row)" v-if="scope.row.CheckStatus == 1">数据校核</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('ShenHe', scope.row)" v-if="scope.row.CheckStatus == 2">数据审核</el-dropdown-item>-->
+                <el-dropdown-item :command="GetCommand('History', scope.row)">审批历史</el-dropdown-item>
+                <el-dropdown-item :command="GetCommand('Delete', scope.row)" :disabled="scope.row.Status != 0" divided>删除数据</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
           </template>
         </el-table-column>
 
@@ -239,16 +253,23 @@
       </span>
       <br>
     </el-dialog>
+    <el-dialog title="审核历史查看" :visible.sync="historyVisible" width="900px">
+      <wf-history ref="WfHistory" :entryinfo="entrydetail"></wf-history>
+    </el-dialog>
   </div>
 </template>
 <script>
   import {
     mapGetters
   } from 'vuex';
+  import WfHistory from '@/components/workflow/wfhistory.vue'
   import supplierapi from '@/api/oilsupplier/supplier';
   import api from '@/api/oilsupplier/annualaudit';
 
   export default {
+    components: {
+      WfHistory,
+    },
     computed: {
       ...mapGetters({
         authUser: 'authUser'
@@ -258,6 +279,7 @@
 
     data() {
       return {
+        historyVisible:false,
         addshow: false,
         dialogVisible: false,
         delevisble:false,
@@ -273,6 +295,12 @@
           Order: '',
           Prop: ''
         },
+        //工作流
+        entrydetail: {
+          process: 'oil_audit_apply',
+          business: '',
+          instance: ''
+        },
         //查询时间
         CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
         //查询项
@@ -578,6 +606,28 @@
         });
       },
 
+      getvalues(val) {
+        this.entrydetail.business = val.Id
+        this.entrydetail.instance = val.WorkflowId
+        this.historyVisible = true
+      },
+
+      MoreCmdClick(cmd) {
+        if(cmd.Command == 'History') {
+          this.getvalues(cmd.row)
+
+        } else if(cmd.Command == 'Delete') {
+          this.deleteEntity(cmd.row)
+        }
+      },
+
+      GetCommand(cmdType, row) {
+        let cmd = {}
+        cmd.Command = cmdType
+        cmd.row = row
+        return cmd
+      },
+
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -0,0 +1,591 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/infochange' }">供方基本信息表</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 编辑
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          <router-link :to="'/oilsupplier/infochange'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+      </div>
+      <el-form label-width="240px" ref="EntityForm" :model="formData">
+            <div slot="header" class="clearfix">
+              <span>供方基本信息表</span>
+              <span style="float: right;">
+                <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+              </span>
+            </div>
+            <el-form label-width="140px" ref="EntityForm" :model="formData">
+              <el-row>
+                <!--<el-col :span="8">
+                  <el-form-item label="DEMO">
+                    <el-select ref="selectWellNo" v-model="formData.WellNoId" filterable placeholder="请选择" style="width: 100%">
+                      <el-option
+                        v-for="item in wellNoOptions"
+                        :key="item.Id"
+                        :label="item.Value"
+                        :value="item.Id">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="16">
+                  <el-form-item label="供方名称" required>
+                    <el-input v-model="formData.SupplierName" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="单位关系">
+                    <el-select ref="SpecType" multiple v-model="UnitRelationAry" filterable placeholder="请选择"
+                      style="width: 100%">
+                      <el-option v-for="item in UnitRelationOptions" :key="item.Id" :label="item.Key"
+                        :value="item.Value">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="统一社会信用代码" required>
+                    <el-input v-model="formData.CommercialNo" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="税务登记证编号" required>
+                    <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="组织机构代码" required>
+                    <el-input v-model="formData.OrganCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="税务登记证地税编号">
+                    <el-input v-model="formData.LocalTaxNo" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <el-col :span="16">
+                  <el-form-item label="注册地址" required>
+                    <el-row>
+                      <el-col :span="8">
+                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
+                        </el-cascader>
+                      </el-col>
+                      <el-col :span="16">
+                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
+                      </el-col>
+                    </el-row>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="邮编" required>
+                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="16">
+                  <el-form-item label="通信地址" required>
+                    <el-row>
+                      <el-col :span="8">
+                        <el-cascader :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%">
+                        </el-cascader>
+                      </el-col>
+                      <el-col :span="16">
+                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
+                      </el-col>
+                    </el-row>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="邮编" required>
+                    <el-input v-model="formData.ZipCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="省直辖市">
+                    <el-input v-model="formData.Province" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="地市区县">
+                    <el-input v-model="formData.City" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="街道">
+                    <el-input v-model="formData.Street" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="门牌号">
+                    <el-input v-model="formData.HouseNo" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+
+
+              </el-row>
+            </el-form>
+
+            <el-form label-width="140px" ref="EntityFormLic" :model="formData">
+              <el-row>
+                <!--<el-col :span="8">
+                  <el-form-item label="产品质量认证情况及认证机构">
+                    <el-input v-model="formData.ProductQualityCert" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="生产制造许可证获证情况及编号">
+                    <el-input v-model="formData.MaunLicense" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <!--<el-col :span="8">
+                  <el-form-item label="外地企业进津备案通知书">
+                    <el-input v-model="formData.TJInNotify" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="法定代表人姓名">
+                    <el-input v-model="formData.LegalPerson" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="行业类别">
+                    <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
+                  <el-form-item label="行业类别名称">
+                    <el-input v-model="formData.CategoryName" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+
+                <el-col :span="8">
+                  <el-form-item label="注册资本">
+                    <el-input v-model="formData.RegCapital" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系人姓名">
+                    <el-input v-model="formData.ContactName" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="币种">
+                    <el-input v-model="formData.Currency" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司类型">
+                    <el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="成立时间">
+                    <el-input v-model="formData.SetupTime" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="开户银行">
+                    <el-input v-model="formData.DepositBank" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="银行账号">
+                    <el-input v-model="formData.BankAccount" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="移动电话">
+                    <el-input v-model="formData.Mobile" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="固定电话">
+                    <el-input v-model="formData.Telphone" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="传真">
+                    <el-input v-model="formData.Fax" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司电话">
+                    <el-input v-model="formData.CompanyTel" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="电子邮箱">
+                    <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="QQ号码">
+                    <el-input v-model="formData.QQ" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="银行信用等级">
+                    <el-input v-model="formData.BankCreditRating" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="公司网址">
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="HSE审查培训">
+                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+
+              </el-row>
+            </el-form>
+
+            <el-form label-position="top" ref="EntityFormCert" :model="formData">
+              <el-row :gutter="60">
+                <el-col :span="8">
+                  <el-form-item label="质量管理体系认证情况">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
+                      style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="企业资质证书(编号  级别)">
+                    <el-input v-model="formData.QualifCert" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <!--<el-col :span="12">
+                  <el-form-item label="企业资质证书级别">
+                    <el-input v-model="formData.QualifCertLevel" placeholder="请输入"  style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>-->
+                <el-col :span="8">
+                  <el-form-item label="安全生产许可证">
+                    <el-input v-model="formData.SafetyLicense" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+
+                <el-col :span="8">
+                  <el-form-item label="行业特殊要求的认证证书">
+                    <el-input v-model="formData.SpecIndustryCert" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="16">
+                  <el-form-item label="营业范围">
+                    <el-input v-model="formData.QualitySystemCert" placeholder="请输入" type="textarea"
+                      style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input v-model="formData.Remark" placeholder="请输入" type="textarea" style="width: 100%">
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+            </el-form>
+      </el-form>
+          </el-card>
+
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import supplierapi from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/technologyservice';
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oiltechnologyserviceEdit',
+
+    data() {
+      return {
+        UnitRelationOptions: [],
+        UnitRelationAry: [],
+        countryoptions: [],
+        countryprops: {
+          value: 'adcode',
+          label: 'name',
+          children: 'districts'
+        },
+        CityAry: [],
+        serviceId: '',
+        certId: '',
+        classId: '03',
+       formData: {
+          Id: '',
+          SupplierName: '',
+          OilCertificateNo: '',
+          Grade: '',
+          MgrUnit: '',
+          OperType: '',
+          Country: '',
+          MaunAgent: '',
+          ConstructTeam: '',
+          CommercialNo: '',
+          OrganCode: '',
+          CountryTaxNo: '',
+          LocalTaxNo: '',
+          Address: '',
+          Province: '',
+          City: '',
+          Street: '',
+          HouseNo: '',
+          ZipCode: '',
+          QualitySystemCert: '',
+          ProductQualityCert: '',
+          MaunLicense: '',
+          QualifCert: '',
+          QualifCertLevel: '',
+          SafetyLicense: '',
+          TechServiceLic: '',
+          TJInNotify: '',
+          SpecIndustryCert: '',
+          LegalPerson: '',
+          CategoryCode: '',
+          CategoryName: '',
+          RegCapital: '',
+          Currency: '',
+          ContactName: '',
+          CompanyType: '',
+          SetupTime: '',
+          DepositBank: '',
+          BankAccount: '',
+          EMail: '',
+          BankCreditRating: '',
+          Mobile: '',
+          Telphone: '',
+          Fax: '',
+          CompanyTel: '',
+          QQ: '',
+          CompanyUrl: '',
+          SpecSupplier: '',
+          SpecTypeCode: '',
+          SpecTypeName: '',
+          WorkerTotal: 0,
+          ContractNum: 0,
+          UniversityNum: 0,
+          TechnicalNum: 0,
+          AboveProfNum: 0,
+          MiddleProfNum: 0,
+          NationalRegNum: 0,
+          NationalCertTotal: 0,
+          DesignerTotal: 0,
+          SkillerTotal: 0,
+          Remark: '',
+          IsDelete: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+          CertId: 0,
+          SupplierTypeCode: '',
+          SupplierTypeName: '',
+          Step: 0
+        },
+        formDataCert: {
+          WorkerTotal: 0,
+          ContractNum: 0,
+          UniversityNum: 0,
+          TechnicalNum: 0,
+          AboveProfNum: 0,
+          MiddleProfNum: 0,
+          NationalRegNum: 0,
+          NationalCertTotal: 0,
+          DesignerTotal: 0,
+          SkillerTotal: 0,
+          Status: 0,
+          WorkflowId: ''
+        },
+      }
+    },
+    created() {
+      this.serviceId = this.$route.params.opera;
+      this.getDictOptions();
+      console.log(this.serviceId);
+      if(this.serviceId != 'add' && this.serviceId>0) {
+        this.formData.Id = this.serviceId;
+        this.initDatas();
+      } else {
+        this.formData.Id = 0;
+      }
+    },
+    methods: {
+      initDatas() {
+        console.log("----this.formData.Id---",this.formData.Id)
+       if (this.formData.Id) {
+          supplierapi.getEntityAndCert(this.formData.Id, this.$axios).then(res => {
+            this.formData = res.data
+            // this.formDataCert.WorkerTotal = this.formData.WorkerTotal
+            // this.formDataCert.ContractNum = this.formData.ContractNum
+            // this.formDataCert.UniversityNum = this.formData.UniversityNum
+            // this.formDataCert.TechnicalNum = this.formData.TechnicalNum
+            // this.formDataCert.AboveProfNum = this.formData.AboveProfNum
+            // this.formDataCert.MiddleProfNum = this.formData.MiddleProfNum
+            // this.formDataCert.NationalRegNum = this.formData.NationalRegNum
+            // this.formDataCert.NationalCertTotal = this.formData.NationalCertTotal
+            // this.formDataCert.DesignerTotal = this.formData.DesignerTotal
+            // this.formDataCert.SkillerTotal = this.formData.SkillerTotal
+            // this.formDataCert.Status = this.formData.Status
+            // this.formDataCert.WorkflowId = this.formData.WorkflowId
+
+            //this.entrydetail.business = this.certId
+            // this.entrydetail.instance = this.formDataCert.WorkflowId
+            // if (this.certId && this.formDataCert.WorkflowId) {
+            //   this.$refs['WfHistory'].getHistoryTask() /*刷新工作流*/
+            // }
+
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.wellNoOptions = res.data.items['WellNo']
+          //this.supervisersOptions = res.data.items['Supervisers']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      //保存信息
+      saveEntity() {
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+
+            if (!this.formData.Id) {
+              this.addEntity();
+            } else {
+              this.updateEntity();
+            }
+
+          } else {
+            return false
+          }
+        })
+      },
+
+      addEntity() {
+        supplierapi.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item;
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+</script>
+

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

@@ -37,12 +37,12 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="150" align="center" fixed>
+        <el-table-column label="操作" min-width="120" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/infochange/' + scope.row.Id + '/operation'">
               <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
             </router-link>
-            <el-popover placement="top" title="提示">
+            <!-- <el-popover placement="top" title="提示">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -54,7 +54,7 @@
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
               <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
-            </el-popover>
+            </el-popover> -->
           </template>
         </el-table-column>
 
@@ -83,11 +83,6 @@
             </el-alert>
           </template>
         </el-table-column>
-        <el-table-column prop="ApplyTime" sortable min-width="100" label="年审日期" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ jstimehandle(scope.row.ApplyTime+'') }}
-          </template>
-        </el-table-column>
         <el-table-column prop="CreateOn" sortable min-width="100" label="申请日期" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.CreateOn+'') }}
@@ -142,67 +137,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="工程项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="履约执行情况">
-              <el-input size="mini" v-model="searchForm.Performance" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="准入范围">
-              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="施工队伍名称">
-              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="审核状态">
-              <el-select size="mini" v-model="searchform.Status" style="width:100%" placeholder="请选择">
-                <el-option label="已申请" value="0"></el-option>
-                <el-option label="初审通过" value="1"></el-option>
-                <el-option label="初审未通过" value="2"></el-option>
-                <el-option label="专业审核通过" value="3"></el-option>
-                <el-option label="审核未通过" value="4"></el-option>
-                <el-option label="已交费" value="5"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="录入员">
-              <el-input size="mini" v-model="searchForm.EnterUserName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="年审日期">
-              <el-input size="mini" v-model="searchForm.ApplyTime" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="审核日期">
-              <el-input size="mini" v-model="searchForm.AuditDate" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="退回原因">
-              <el-input size="mini" v-model="searchForm.BackReason" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
+         
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -210,38 +145,7 @@
         <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称">
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId"
-                placeholder="请选择" @change="supplierchange" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="准入类别">
-              <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
-                style="width: 100%">
-                <el-option label="物资类" value="01"></el-option>
-                <el-option label="技术服务类" value="03"></el-option>
-                <el-option label="基建类" value="02"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addUserShow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
+   
   </div>
 </template>
 <script>
@@ -321,110 +225,75 @@
         },
         tableColumns: [
 
+          // {
+          //   prop: "RecUnitId",
+          //   label: '推荐单位编码',
+          //   width: 100,
+          //   sort: true
+          // },
           {
-            prop: "RecUnitId",
-            label: '推荐单位编码',
+            prop: "SupplierName",
+            label: '企业名称',
             width: 100,
             sort: true
           },
 
           {
-            prop: "AccessCardNo",
-            label: '准入证号',
-            width: 100,
+            prop: "OilCertificateNo",
+            label: '中石油供应商证书号',
+            width: 130,
             sort: true
           },
 
           {
-            prop: "SupplierTypeName",
-            label: '准入类别',
+            prop: "Grade",
+            label: '级别',
             width: 100,
             sort: true
           },
 
+          
           {
-            prop: "SupplierName",
-            label: '企业名称',
+            prop: "MgrUnit",
+            label: '管理单位',
             width: 100,
             sort: true
           },
 
-          // {
-          //   prop: "ProjectName",
-          //   label: '工程项目名称',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "Performance",
-          //   label: '履约执行情况',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "WorkRange",
-          //   label: '准入范围',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "Status",
-          //   label: '状态标识',
-          //   width: 100,
-          //   sort: true
-          // },
-
           {
-            prop: "OrganCode",
-            label: '组织机构代码',
+            prop: "OperType",
+            label: '经营方式',
             width: 100,
             sort: true
           },
 
-          // {
-          //   prop: "ApplyTime",
-          //   label: '年审日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "CreateOn",
-          //   label: '申请日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "AuditDate",
-          //   label: '审核日期',
-          //   width: 100,
-          //   sort: true
-          // },
+          {
+            prop: "Country",
+            label: '国家',
+            width: 100,
+            sort: true
+          },
+          {
+            prop: "MaunAgent",
+            label: '所代理制造商名称',
+            width: 130,
+            sort: true
+          },
 
-          // {
-          //   prop: "EnterUserName",
-          //   label: '录入员',
-          //   width: 100,
-          //   sort: true
-          // },
+          {
+            prop: "ConstructTeam",
+            label: '施工队伍名称',
+            width: 100,
+            sort: true
+          },
 
-          // {
-          //   prop: "EnterUserTel",
-          //   label: '录入员电话',
-          //   width: 100,
-          //   sort: true
-          // },
+          {
+            prop: "CommercialNo",
+            label: '工商注册号',
+            width: 100,
+            sort: true
+          },
 
-          // {
-          //   prop: "BackReason",
-          //   label: '退回原因',
-          //   width: 100,
-          //   sort: true
-          // }
         ],
       }
     },
@@ -433,7 +302,6 @@
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
       this.initDatas()
-      this.getselectsupplier()
       //this.getDictOptions()
     },
     methods: {
@@ -457,62 +325,13 @@
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        supplierapi.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
         })
       },
-      supplierchange(value) {
-        let obj = {};
-        obj = this.selectsupplierlist.find((item) => {
-          return item.Id === value;
-        });
-        this.entityForm.SupplierName = obj.Realname
-      },
-      addAnnualAudit() {
-        console.log("----this.entityForm--", this.entityForm)
-        api.addEntity(this.entityForm, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            console.log("--------res.data----", res.data)
-            //保存成功后，初始化数据，变成修改
-            this.entityForm.Id = res.data.item;
-            this.initDatas();
-            this.addshow = false
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
-        }).catch(err => {
-          console.error(err)
-        });
-      },
-      addaudit() {
-        this.addshow = true
-      },
-
-      getselectsupplier() {
-        api.getSupList(this.$axios).then(res => {
-          if (res.data.items.length != 0) {
-            for (var i = 0; i < res.data.items.length; i++) {
-              this.selectsupplierlist.push({
-                Id: res.data.items[i].Id,
-                Realname: res.data.items[i].SupplierName
-              })
-            }
-          }
-        }).catch(err => {
-          console.error(err)
-        })
-      },
 
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {

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

@@ -0,0 +1,591 @@
+<template>
+  <div>
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/qualchange' }">技术服务类资质对照表</el-breadcrumb-item>
+      <el-breadcrumb-item>编辑</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-card class="box-card">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 编辑
+        </span>
+        <span style="float: right;">
+          <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
+          <router-link :to="'/oilsupplier/qualchange'">
+            <el-button type="primary" size="mini" style="margin-left: 8px">返回</el-button>
+          </router-link>
+        </span>
+      </div>
+      <el-form label-width="240px" ref="EntityForm" :model="formData">
+         <el-row>
+           <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label="编码" label-width="110px">
+              <el-input v-model="formData.Code" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label="名称" label-width="110px">
+              <el-input v-model="formData.Name" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+           <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="一级编码">
+              <el-input v-model="formData.Code1" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="一级名称">
+              <el-input v-model="formData.Name1" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="二级编码">
+              <el-input v-model="formData.Code2" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="二级名称">
+              <el-input v-model="formData.Name2" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="三级编码">
+              <el-input v-model="formData.Code3" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="三级名称">
+              <el-input v-model="formData.Name3" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="四级编码">
+              <el-input v-model="formData.Code4" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="四级名称">
+              <el-input v-model="formData.Name4" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item v-if="serviceId == 'add'" label-width="110px" label="部门ID">
+              <el-input v-model="formData.OrgId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="营业执照">
+              <el-switch v-model="formData.F01" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="组织机构代码证">
+              <el-switch v-model="formData.F02" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="税务登记证">
+              <el-switch v-model="formData.F03" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="银行开户许可证">
+              <el-switch v-model="formData.F04" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="质量管理体系认证证书">
+              <el-switch v-model="formData.F05" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="环境管理体系认证证书">
+              <el-switch v-model="formData.F06" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="职业健康安全管理体系认证证书">
+              <el-switch v-model="formData.F07" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="软件企业认定证书">
+              <el-switch v-model="formData.F08" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="安全生产许可证">
+              <el-switch v-model="formData.F09" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="陆上石油天然气安全生产许可证">
+              <el-switch v-model="formData.F10" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="海洋石油作业安全生产许可证">
+              <el-switch v-model="formData.F11" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="辐射安全许可证">
+              <el-switch v-model="formData.F12" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="石油工程技术服务企业资质证书">
+              <el-switch v-model="formData.F13" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="物业服务企业资质证书">
+              <el-switch v-model="formData.F14" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="工业清洗企业资质证书">
+              <el-switch v-model="formData.F15" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="建设项目环境影响评价资格证书">
+              <el-switch v-model="formData.F16" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="消防设施维护保养资质证书">
+              <el-switch v-model="formData.F17" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="安全评价机构资质证书">
+              <el-switch v-model="formData.F18" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="工程咨询招标代理机构资质证书">
+              <el-switch v-model="formData.F19" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="工程监督资质证书">
+              <el-switch v-model="formData.F20" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="土地开发资格证">
+              <el-switch v-model="formData.F21" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="房屋预售资格证">
+              <el-switch v-model="formData.F22" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="保安服务许可证">
+              <el-switch v-model="formData.F23" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="道路运输经营许可证">
+              <el-switch v-model="formData.F24" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="机动车维修经营许可证">
+              <el-switch v-model="formData.F25" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="道路危险货物运输许可证">
+              <el-switch v-model="formData.F26" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="特种设备安装改造维修许可证">
+              <el-switch v-model="formData.F27" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="建筑安全许可证">
+              <el-switch v-model="formData.F28" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="防火许可证">
+              <el-switch v-model="formData.F29" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="印刷经营许可证">
+              <el-switch v-model="formData.F30" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="餐饮服务许可证">
+              <el-switch v-model="formData.F31" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="劳务派遣经营许可证">
+              <el-switch v-model="formData.F32" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="人力资源服务许可证">
+              <el-switch v-model="formData.F33" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="国家实验室认可证书">
+              <el-switch v-model="formData.F34" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="海洋石油专业设备检验检测机构证书">
+              <el-switch v-model="formData.F35" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="安全生产检验检测证书">
+              <el-switch v-model="formData.F36" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="液化气钢瓶检验证书">
+              <el-switch v-model="formData.F37" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="国家电网承试承装承修许可证">
+              <el-switch v-model="formData.F38" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="建筑企业资质证书">
+              <el-switch v-model="formData.F39" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="中油集团监造许可">
+              <el-switch v-model="formData.F40" active-value="1" inactive-value="0">
+              </el-switch>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import api from '@/api/oilsupplier/technologyservice';
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'oiltechnologyserviceEdit',
+
+    data() {
+      return {
+        serviceId: '',
+        formData: {
+          Id: '',
+          Code: '',
+          Name: '',
+          Code1: '',
+          Name1: '',
+          Code2: '',
+          Name2: '',
+          Code3: '',
+          Name3: '',
+          Code4: '',
+          Name4: '',
+          OrgId: '',
+          OrgName: '',
+          F01: '',
+          F02: '',
+          F03: '',
+          F04: '',
+          F05: '',
+          F06: '',
+          F07: '',
+          F08: '',
+          F09: '',
+          F10: '',
+          F11: '',
+          F12: '',
+          F13: '',
+          F14: '',
+          F15: '',
+          F16: '',
+          F17: '',
+          F18: '',
+          F19: '',
+          F20: '',
+          F21: '',
+          F22: '',
+          F23: '',
+          F24: '',
+          F25: '',
+          F26: '',
+          F27: '',
+          F28: '',
+          F29: '',
+          F30: '',
+          F31: '',
+          F32: '',
+          F33: '',
+          F34: '',
+          F35: '',
+          F36: '',
+          F37: '',
+          F38: '',
+          F39: '',
+          F40: '',
+          F41: '',
+          F42: '',
+          F43: '',
+          F44: '',
+          F45: '',
+          F46: '',
+          F47: '',
+          F48: '',
+          F49: '',
+          F50: '',
+          F51: '',
+          F52: '',
+          Remark: '',
+          DeletionStateCode: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+
+        //下拉选择项
+        //wellNoOptions: [],
+        //supervisersOptions: [],
+
+      }
+    },
+    created() {
+      this.serviceId = this.$route.params.opera;
+      this.getDictOptions();
+      console.log(this.serviceId);
+      if(this.serviceId != 'add' && this.serviceId>0) {
+        this.formData.Id = this.serviceId;
+        this.initDatas();
+      } else {
+        this.formData.Id = 0;
+      }
+    },
+    methods: {
+      initDatas() {
+        if(this.formData.Id) {
+          api.getEntity(this.formData.Id, this.$axios).then(res => {
+            this.formData = res.data;
+          }).catch(err => {
+            console.error(err)
+          });
+        }
+      },
+
+      getDictOptions() {
+        api.getDictList(this.$axios).then(res => {
+          //this.wellNoOptions = res.data.items['WellNo']
+          //this.supervisersOptions = res.data.items['Supervisers']
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      //保存信息
+      saveEntity() {
+        this.$refs['EntityForm'].validate((valid) => {
+          if (valid) {
+            //this.formData.WellNo = this.$refs.selectWellNo.selectedLabel + '';
+
+            if (!this.formData.Id) {
+              this.addEntity();
+            } else {
+              this.updateEntity();
+            }
+
+          } else {
+            return false
+          }
+        })
+      },
+
+      addEntity() {
+        api.addEntity(this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.formData.Id = res.data.item;
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      updateEntity() {
+        api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            //保存成功后，初始化数据，变成修改
+            this.initDatas();
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
+      },
+
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T08:00:00+08:00') {
+          return '----'
+        } else if (val === '5000-01-01T23:59:59+08:00') {
+          return '永久'
+        } else {
+          val = val.replace('T', ' ')
+          return val.substring(0, 10)
+        }
+      },
+
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      }
+    }
+  }
+</script>
+

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

@@ -37,12 +37,12 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="150" align="center" fixed>
+        <el-table-column label="操作" min-width="120" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/qualchange/' + scope.row.Id + '/operation'">
               <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
             </router-link>
-            <el-popover placement="top" title="提示">
+            <!-- <el-popover placement="top" title="提示">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -54,7 +54,7 @@
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
               <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
-            </el-popover>
+            </el-popover> -->
           </template>
         </el-table-column>
 
@@ -142,67 +142,7 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="工程项目名称">
-              <el-input size="mini" v-model="searchForm.ProjectName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="履约执行情况">
-              <el-input size="mini" v-model="searchForm.Performance" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="准入范围">
-              <el-input size="mini" v-model="searchForm.WorkRange" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="施工队伍名称">
-              <el-input size="mini" v-model="searchForm.ConstructTeam" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="审核状态">
-              <el-select size="mini" v-model="searchform.Status" style="width:100%" placeholder="请选择">
-                <el-option label="已申请" value="0"></el-option>
-                <el-option label="初审通过" value="1"></el-option>
-                <el-option label="初审未通过" value="2"></el-option>
-                <el-option label="专业审核通过" value="3"></el-option>
-                <el-option label="审核未通过" value="4"></el-option>
-                <el-option label="已交费" value="5"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="录入员">
-              <el-input size="mini" v-model="searchForm.EnterUserName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="年审日期">
-              <el-input size="mini" v-model="searchForm.ApplyTime" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-
-          <!-- <el-col :span="12">
-            <el-form-item label="审核日期">
-              <el-input size="mini" v-model="searchForm.AuditDate" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
-          <!-- 
-          <el-col :span="12">
-            <el-form-item label="退回原因">
-              <el-input size="mini" v-model="searchForm.BackReason" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col> -->
+         
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -210,38 +150,6 @@
         <el-button size="mini" type="primary" @click="handleSearch">查 询</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="年审申请添加" :visible.sync="addshow" width="360px">
-      <el-form label-width="90px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="企业名称">
-              <el-select filterable default-first-option ref="supselect" v-model="entityForm.SupplierId"
-                placeholder="请选择" @change="supplierchange" style="width: 100%">
-                <el-option v-for="item in selectsupplierlist" :key="item.Id" :label="item.Realname" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="准入类别">
-              <el-select filterable default-first-option v-model="entityForm.SupplierTypeName" placeholder="请选择"
-                style="width: 100%">
-                <el-option label="物资类" value="01"></el-option>
-                <el-option label="技术服务类" value="03"></el-option>
-                <el-option label="基建类" value="02"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <span style="float: right;margin-top:-10px;">
-        <el-button size="small" @click="addUserShow = false">取 消</el-button>
-        <el-button type="primary" size="small" @click="addAnnualAudit()">确 定</el-button>
-      </span>
-      <br>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -321,12 +229,12 @@
         },
         tableColumns: [
 
-          {
-            prop: "RecUnitId",
-            label: '推荐单位编码',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: "RecUnitId",
+          //   label: '推荐单位编码',
+          //   width: 100,
+          //   sort: true
+          // },
 
           {
             prop: "AccessCardNo",
@@ -349,82 +257,6 @@
             sort: true
           },
 
-          // {
-          //   prop: "ProjectName",
-          //   label: '工程项目名称',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "Performance",
-          //   label: '履约执行情况',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "WorkRange",
-          //   label: '准入范围',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "Status",
-          //   label: '状态标识',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          {
-            prop: "OrganCode",
-            label: '组织机构代码',
-            width: 100,
-            sort: true
-          },
-
-          // {
-          //   prop: "ApplyTime",
-          //   label: '年审日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "CreateOn",
-          //   label: '申请日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "AuditDate",
-          //   label: '审核日期',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "EnterUserName",
-          //   label: '录入员',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "EnterUserTel",
-          //   label: '录入员电话',
-          //   width: 100,
-          //   sort: true
-          // },
-
-          // {
-          //   prop: "BackReason",
-          //   label: '退回原因',
-          //   width: 100,
-          //   sort: true
-          // }
         ],
       }
     },
@@ -433,7 +265,6 @@
       Object.assign(this.searchFormReset, this.searchForm)
       //查询列表
       this.initDatas()
-      this.getselectsupplier()
       //this.getDictOptions()
     },
     methods: {
@@ -457,63 +288,14 @@
         //查询条件
         Object.assign(params, this.searchForm)
         //访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        supplierapi.getCertList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)
         })
       },
-      supplierchange(value) {
-        let obj = {};
-        obj = this.selectsupplierlist.find((item) => {
-          return item.Id === value;
-        });
-        this.entityForm.SupplierName = obj.Realname
-      },
-      addAnnualAudit() {
-        console.log("----this.entityForm--", this.entityForm)
-        api.addEntity(this.entityForm, this.$axios).then(res => {
-          if (res.data.code === 0) {
-            console.log("--------res.data----", res.data)
-            //保存成功后，初始化数据，变成修改
-            this.entityForm.Id = res.data.item;
-            this.initDatas();
-            this.addshow = false
-            this.$message({
-              type: 'success',
-              message: res.data.message
-            });
-
-          } else {
-            this.$message({
-              type: 'warning',
-              message: res.data.message
-            });
-          }
-        }).catch(err => {
-          console.error(err)
-        });
-      },
-      addaudit() {
-        this.addshow = true
-      },
-
-      getselectsupplier() {
-        api.getSupList(this.$axios).then(res => {
-          if (res.data.items.length != 0) {
-            for (var i = 0; i < res.data.items.length; i++) {
-              this.selectsupplierlist.push({
-                Id: res.data.items[i].Id,
-                Realname: res.data.items[i].SupplierName
-              })
-            }
-          }
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-
+     
       getDictOptions() {
         api.getDictList(this.$axios).then(res => {
           //this.dictOptions.customerList = res.data.items['customerList']