Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

# By yuedefeng (2) and huahaiyan (1)
# Via yuedefeng
* 'develop' of http://code.dashoo.cn/dashoo/supplier_system:
  getCityList
  技术服务企业信息
  年审申请添加

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

@@ -7,6 +7,7 @@ import (
 type OilAnnualAudit struct {
 	Id               int       `xorm:"not null pk autoincr INT(10)"`
 	RecUnitId        string    `xorm:"comment('推荐单位编码') VARCHAR(10)"`
+	CerId            string    `xorm:"comment('准入ID') INT(10)"`
 	AccessCardNo     string    `xorm:"comment('准入证号') VARCHAR(50)"`
 	SupplierTypeName string    `xorm:"comment('准入类别') VARCHAR(50)"`
 	SupplierName     string    `xorm:"comment('企业名称') VARCHAR(50)"`
@@ -15,10 +16,11 @@ type OilAnnualAudit struct {
 	ProjectName      string    `xorm:"comment('工程项目名称') VARCHAR(50)"`
 	Performance      string    `xorm:"comment('履约执行情况') VARCHAR(50)"`
 	WorkRange        string    `xorm:"comment('准入范围') VARCHAR(50)"`
-	Status           string    `xorm:"comment('状态标识') VARCHAR(50)"`
+	Status           int       `xorm:"comment('状态标识') INT(10)"`
 	BackReason       string    `xorm:"comment('退回原因') VARCHAR(255)"`
 	ApplyTime        time.Time `xorm:"comment('年审日期') DATETIME"`
 	AuditDate        time.Time `xorm:"comment('审核日期') DATETIME"`
+	WorkflowId       string    `xorm:"comment('工作流ID') VARCHAR(50)"`
 	EnterUserId      int       `xorm:"comment('录入员ID') INT(10)"`
 	EnterUserName    string    `xorm:"comment('录入员') VARCHAR(50)"`
 	EnterUserTel     string    `xorm:"comment('录入员电话') VARCHAR(50)"`

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

@@ -1,8 +1,8 @@
 package annualaudit
 
 import (
-	"dashoo.cn/utils"
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/utils"
 	"github.com/go-xorm/xorm"
 )
 
@@ -24,4 +24,4 @@ func (s *OilAnnualAuditService) GetSupplierList(supname, auditname string) []Sup
 	List := make([]Suppliername, 0)
 	utils.DBE.Sql(sql).Find(&List)
 	return List
-}
+}

src/dashoo.cn/backend/api/business/oilsupplier/supplier/oilsupplier.go

@@ -18,12 +18,19 @@ type OilSupplier struct {
 	OrganCode          string  `xorm:"comment('组织机构代码') VARCHAR(50)"`
 	CountryTaxNo       string  `xorm:"comment('税务登记证国税编号') VARCHAR(50)"`
 	LocalTaxNo         string  `xorm:"comment('税务登记证地税编号') VARCHAR(50)"`
-	Address            string  `xorm:"comment('单位地址') VARCHAR(100)"`
+	Address            string  `xorm:"comment('单位地址') VARCHAR(500)"`
 	Province           string  `xorm:"comment('省直辖市') VARCHAR(20)"`
 	City               string  `xorm:"comment('地市区县') VARCHAR(20)"`
 	Street             string  `xorm:"comment('街道') VARCHAR(20)"`
 	HouseNo            string  `xorm:"comment('门牌号') VARCHAR(10)"`
 	ZipCode            string  `xorm:"comment('邮编') VARCHAR(20)"`
+	LinkAddress        string    `xorm:"comment('通信地址-单位地址') VARCHAR(500)"`
+	LinkProvince       string    `xorm:"comment('通信地址-省直辖市') VARCHAR(20)"`
+	LinkCity           string    `xorm:"comment('通信地址-地市区县') VARCHAR(20)"`
+	LinkStreet         string    `xorm:"comment('通信地址-街道') VARCHAR(20)"`
+	LinkHouseNo        string    `xorm:"comment('通信地址-门牌号') VARCHAR(10)"`
+	LinkZipCode        string    `xorm:"comment('通信地址-邮编') VARCHAR(20)"`
+	HseTraining 	   string    `xorm:"comment('是否需要进行HSE审查培训') VARCHAR(2)"`
 	QualitySystemCert  string  `xorm:"comment('质量管理体系认证情况及认证机构') VARCHAR(200)"`
 	ProductQualityCert string  `xorm:"comment('产品质量认证情况及认证机构') VARCHAR(200)"`
 	MaunLicense        string  `xorm:"comment('生产制造许可证获证情况及编号') VARCHAR(200)"`

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

@@ -3,7 +3,10 @@ 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"
 	"time"
 
 	"dashoo.cn/backend/api/business/baseUser"
@@ -36,6 +39,39 @@ func (this *AnnualAuditController) GetEntityList() {
 			asc = true
 		}
 	}
+	SupplierTypeName := this.GetString("SupplierTypeName")
+	RecUnitId := this.GetString("RecUnitId")
+	AccessCardNo := this.GetString("AccessCardNo")
+	SupplierName := this.GetString("SupplierName")
+	CreateOn := this.GetString("CreateOn")
+
+	if SupplierTypeName != "" {
+		where = where + " and SupplierTypeName like '%" + SupplierTypeName + "%'"
+	}
+
+
+	if RecUnitId != "" {
+		where = where + " and RecUnitId like '%" + RecUnitId + "%'"
+	}
+
+
+	if AccessCardNo != "" {
+		where = where + " and AccessCardNo like '%" + AccessCardNo + "%'"
+	}
+
+
+	if SupplierName != "" {
+		where = where + " and SupplierName like '%" + SupplierName + "%'"
+	}
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	}
 
 	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var list []annualaudit.OilAnnualAudit
@@ -137,16 +173,26 @@ func (this *AnnualAuditController) AddEntity() {
 	var suppliermodel supplier.OilSupplierView
 	suppliermodel = list[0]
 	model.RecUnitId = suppliermodel.RecUnitId
-	model.Status = suppliermodel.Status
+	model.CerId = suppliermodel.CertId
+	model.Status = 0
 	model.BackReason = suppliermodel.BackReason
 	//svc.GetEntitysByWhere(""+OilSupplierName, supwhere, &supplierlist)
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 	//model.OrganizeId, _ = utils.StrTo(this.User.DepartmentId).Int()
-
 	_, 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)
+	var auditmodel annualaudit.OilAnnualAudit
+	auditmodel.WorkflowId = processInstanceId
+	cols := []string{
+		"Id",
+		"WorkflowId",
+	}
+	certSrv.UpdateEntityByIdCols(annualId, auditmodel, cols)
 	if err == nil {
 		//新增
 		errinfo.Message = "添加成功！"
@@ -209,40 +255,6 @@ func (this *AnnualAuditController) UpdateEntity() {
 
 		"F07",
 
-		"F08",
-
-		"F09",
-
-		"F10",
-
-		"F11",
-
-		"F12",
-
-		"F13",
-
-		"F14",
-
-		"F15",
-
-		"F16",
-
-		"F17",
-
-		"F18",
-
-		"F19",
-
-		"F20",
-
-		"F21",
-
-		"F22",
-
-		"F23",
-
-		"F24",
-
 		"F25",
 
 		"Remark",

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

@@ -970,6 +970,7 @@ func (this *OilSupplierController) GetDictList() {
 	areaJsonSvc := areajson.GetAreaJsonService(utils.DBE)
 	//customerSvc := svccustomer.GetCustomerService(utils.DBE)
 	dictList["UnitRelation"] = dictSvc.GetKeyValueItems("UnitRelation")
+	dictList["CompanyType"] = dictSvc.GetKeyValueItems("CompanyType")
 	var userEntity userRole.Base_User
 	userSvc.GetEntityById(this.User.Id, &userEntity)
 	dictList["Supervisers"] = userSvc.GetUserListByDepartmentId(this.User.AccCode, userEntity.Departmentid)
@@ -1253,6 +1254,13 @@ func (this *OilSupplierController) UpdateEntity() {
 		"ModifiedUserId",
 
 		"ModifiedBy",
+		"LinkAddress",
+		"LinkProvince",
+		"LinkCity",
+		"LinkStreet",
+		"LinkHouseNo",
+		"LinkZipCode",
+		"HseTraining",
 	}
 	err := svc.UpdateEntityBytbl(OilSupplierName, id, &model, cols)
 	if err == nil {

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

@@ -2,7 +2,7 @@
   <div>
     <el-breadcrumb class="heading">
       <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
-      <el-breadcrumb-item :to="{ path: '/annuaudit' }">年审申请表</el-breadcrumb-item>
+      <el-breadcrumb-item :to="{ path: '/oilsupplier/annuaudit' }">年审申请表</el-breadcrumb-item>
     </el-breadcrumb>
     <el-card class="box-card" style="height: calc(100vh - 115px);">
       <div slot="header">
@@ -37,36 +37,59 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
-            <router-link :to="'/annuaudit/' + scope.row.Id + '/operation'">
-              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
-            </router-link>
-
-            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-              <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
+            <el-popover placement="top" title="提示">
+              <el-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
               </el-alert>
-              <br />
+              <br/>
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
-                @click="scope.row.deleteConfirmFlag = true">
-                <i class="el-icon-delete"></i>
-              </el-button>
+              <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
 
-        <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
-          :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
+        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
+          :label="column.label" align="center" show-overflow-tooltip>
         </el-table-column>
-
-        <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
+        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="已申请" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="已交费" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核通过" type="success">
+            </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+'') }}
           </template>
-        </el-table-column>-->
+        </el-table-column>
       </el-table>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
@@ -75,7 +98,7 @@
     </el-card>
 
     <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
-      <el-form ref="advancedsearchForm" label-width="110px">
+      <el-form ref="searchForm" label-width="110px">
         <el-row>
 
           <!-- <el-col :span="12">
@@ -116,7 +139,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>
@@ -139,37 +162,44 @@
             <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> -->
+          <!-- 
           <el-col :span="12">
-            <el-form-item label="状态标识">
-              <el-input size="mini" v-model="searchForm.Status" style="width:100%" placeholder="请输入"></el-input>
+            <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> -->
 
-          <el-col :span="12">
+          <!-- <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> -->
 
-          <el-col :span="12">
+          <!-- <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> -->
 
-          <el-col :span="12">
+          <!-- <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> -->
+          <!-- 
           <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-col> -->
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -230,6 +260,7 @@
       return {
         addshow: false,
         dialogVisible: false,
+        delevisble:false,
         //列表数据
         selectsupplierlist: [],
         entityList: [],
@@ -315,33 +346,33 @@
             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: "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",
@@ -350,42 +381,48 @@
             sort: true
           },
 
-          {
-            prop: "ApplyTime",
-            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
-          }
-
-        ]
+          // {
+          //   prop: "ApplyTime",
+          //   label: '年审日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "CreateOn",
+          //   label: '申请日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "AuditDate",
+          //   label: '审核日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "EnterUserName",
+          //   label: '录入员',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "EnterUserTel",
+          //   label: '录入员电话',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "BackReason",
+          //   label: '退回原因',
+          //   width: 100,
+          //   sort: true
+          // }
+        ],
       }
     },
     created() {
@@ -435,7 +472,7 @@
         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)
+            console.log("--------res.data----", res.data)
             //保存成功后，初始化数据，变成修改
             this.entityForm.Id = res.data.item;
             this.initDatas();
@@ -522,7 +559,6 @@
         this.initDatas()
       },
       deleteEntity(row) {
-        row.deleteConfirmFlag = false;
         api.deleteEntity(row.Id, this.$axios).then(res => {
           if (res.data.code === 0) {
             this.initDatas();

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

@@ -17,234 +17,300 @@
           </router-link>
         </span>
       </div>
-      <el-form label-width="110px" ref="EntityForm" :model="formData">
+      <el-form label-width="240px" 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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="编码">
-              <el-input v-model="formData.Code" placeholder="请输入"  style="width: 100%"></el-input>
+            <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-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-input v-model="formData.F01" placeholder="请输入" style="width: 100%"></el-input> -->
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="名称">
-              <el-input v-model="formData.Name" placeholder="请输入"  style="width: 100%"></el-input>
+          <el-col :span="6">
+            <el-form-item label="组织机构代码证">
+              <!-- <el-radio v-model="formData.F02" label="1">是</el-radio> -->
+              <el-switch v-model="formData.F02" active-value="1" inactive-value="0">
+              </el-switch>
             </el-form-item>
           </el-col>
 
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F01" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F02" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F03" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F04" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F05" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F06" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F07" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F08" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F09" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F10" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F11" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F12" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F13" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F14" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F15" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F16" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F17" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F18" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F19" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F20" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F21" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F22" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F23" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F24" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F25" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="备注">
-              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="删除状态，0正常，1已删除">
-              <el-input v-model="formData.DeletionStateCode" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>
+          <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>
 
@@ -318,6 +384,7 @@
     },
     created() {
       this.serviceId = this.$route.params.opera;
+      console.log("----this.serviceId---",this.serviceId)
       this.getDictOptions();
       console.log(this.serviceId);
       if(this.serviceId != 'add' && this.serviceId>0) {

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

@@ -9,11 +9,11 @@
         <span>
           <i class="icon icon-table2"></i> 基建类资质对照表
         </span>
-        <span style="float: right;">
+        <!-- <span style="float: right;">
           <router-link :to="'/oilsupplier/basisbuild/add/operation'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
-        </span>
+        </span> -->
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
@@ -32,23 +32,24 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/basisbuild/' + scope.row.Id + '/operation'">
-              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
+              <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
             </router-link>
 
-            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-              <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
+            <el-popover placement="top" title="提示">
+              <el-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
               </el-alert>
-              <br />
+              <br/>
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
-                @click="scope.row.deleteConfirmFlag = true">
-                <i class="el-icon-delete"></i>
-              </el-button>
+              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>

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

@@ -18,6 +18,7 @@
         </span>
       </div>
       <el-form label-width="240px" ref="EntityForm" :model="formData">
+        
         <!-- <el-row>
 
           <el-col :span="8">
@@ -84,6 +85,69 @@
             </el-form-item>
           </el-col>
         </el-row> -->
+        <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="大类名称" label-width="110px">
+              <el-input v-model="formData.BigClassName" 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.MiddleClassName" 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.SmallClassName" 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.GoodsName" 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.GoodsLevel" 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.GoodsDesc" 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.Standard" 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.CompanyType" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item v-if="serviceId == 'add'" label="备注" label-width="110px">
+              <el-input v-model="formData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="营业执照">

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

@@ -9,11 +9,11 @@
         <span>
           <i class="icon icon-table2"></i> 物资类项目与资质对照表
         </span>
-        <span style="float: right;">
+        <!-- <span style="float: right;">
           <router-link :to="'/oilsupplier/goodsaptitude/add/operation'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
-        </span>
+        </span> -->
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
@@ -32,23 +32,24 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/goodsaptitude/' + scope.row.Id + '/operation'">
-              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
+              <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
             </router-link>
 
-            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
-              <el-alert title="" description="确认要删除吗？" type="warning" :closable="false">
+            <el-popover placement="top" title="提示">
+              <el-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
               </el-alert>
-              <br />
+              <br/>
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small"
-                @click="scope.row.deleteConfirmFlag = true">
-                <i class="el-icon-delete"></i>
-              </el-button>
+              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>

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

@@ -0,0 +1,615 @@
+<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>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 企业信息表
+        </span>
+        <!-- <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+          </el-button>
+        </span> -->
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="年审日期">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="准入类别">
+            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
+              <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-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </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>
+          <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-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
+              </el-alert>
+              <br/>
+              <div style="text-align: right; margin: 0">
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              </div>
+              <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+
+        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
+          :label="column.label" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="已申请" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="已交费" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核通过" type="success">
+            </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+'') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="searchForm" label-width="110px">
+        <el-row>
+
+          <!-- <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col> -->
+          <!-- 
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col> -->
+
+          <el-col :span="12">
+            <el-form-item label="推荐单位编码">
+              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入证号">
+              <el-input size="mini" v-model="searchForm.AccessCardNo" 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.SupplierTypeName" 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.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">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <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>
+  import {
+    mapGetters
+  } from 'vuex';
+  import supplierapi from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/annualaudit';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'annualaudit',
+
+    data() {
+      return {
+        addshow: false,
+        dialogVisible: false,
+        delevisble:false,
+        //列表数据
+        selectsupplierlist: [],
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '',
+        },
+        searchForm: {
+          Id: '',
+          RecUnitId: '',
+          AccessCardNo: '',
+          SupplierTypeName: '',
+          SupplierName: '',
+          Num: '',
+          ProjectName: '',
+          Performance: '',
+          WorkRange: '',
+          Status: '',
+          BackReason: '',
+          ApplyTime: '',
+          AuditDate: '',
+          EnterUserId: '',
+          EnterUserName: '',
+          EnterUserTel: '',
+          SCR: '',
+          SCRQ: '',
+          SCYJ: '',
+          SCJG: '',
+          SPR: '',
+          SPRQ: '',
+          SPYJ: '',
+          SPJG: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+
+          {
+            prop: "RecUnitId",
+            label: '推荐单位编码',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "AccessCardNo",
+            label: '准入证号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierTypeName",
+            label: '准入类别',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierName",
+            label: '企业名称',
+            width: 100,
+            sort: true
+          },
+
+          // {
+          //   prop: "ProjectName",
+          //   label: '工程项目名称',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "Performance",
+          //   label: '履约执行情况',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "WorkRange",
+          //   label: '准入范围',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "Status",
+          //   label: '状态标识',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          {
+            prop: "OrganCode",
+            label: '组织机构代码',
+            width: 100,
+            sort: true
+          },
+
+          // {
+          //   prop: "ApplyTime",
+          //   label: '年审日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "CreateOn",
+          //   label: '申请日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "AuditDate",
+          //   label: '审核日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "EnterUserName",
+          //   label: '录入员',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "EnterUserTel",
+          //   label: '录入员电话',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "BackReason",
+          //   label: '退回原因',
+          //   width: 100,
+          //   sort: true
+          // }
+        ],
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      //查询列表
+      this.initDatas()
+      this.getselectsupplier()
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.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 => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        api.deleteEntity(row.Id, 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>
+
+<style lang="scss">
+
+</style>

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

@@ -0,0 +1,615 @@
+<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>
+    <el-card class="box-card" style="height: calc(100vh - 115px);">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 企业资质表
+        </span>
+        <!-- <span style="float: right;">
+          <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="addaudit">添加
+          </el-button>
+        </span> -->
+        <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+          <el-form-item label="年审日期">
+            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
+              start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+          </el-form-item>
+          <el-form-item label="准入类别">
+            <el-select size="mini" style="width:100px" v-model="searchForm.SupplierTypeName" placeholder="准入类别">
+              <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-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="search">高级查询</el-dropdown-item>
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+        </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>
+          <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-alert
+                title=""
+                description="确认要删除吗？"
+                type="warning"
+                :closable="false">
+              </el-alert>
+              <br/>
+              <div style="text-align: right; margin: 0">
+                <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
+              </div>
+              <el-button :disabled="scope.row.Status != 0" slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+
+        <el-table-column v-for="column in tableColumns" :key="column.Id" :prop="column.prop" sortable min-width="100"
+          :label="column.label" align="center" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column sortable min-width="110" align="center" prop="Status" label="审核状态">
+          <template slot-scope="scope">
+            <el-alert v-if="scope.row.Status=='2'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审未通过" type="warning">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='4'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="审核未通过" type="error">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='0'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="已申请" type="info">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='1'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="初审通过" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='5'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="已交费" type="success">
+            </el-alert>
+            <el-alert v-if="scope.row.Status=='3'" :closable="false" style="background:rgba(255,255,255,0.2)"
+              title="专业审核通过" type="success">
+            </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+'') }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
+        :total="currentItemCount">
+      </el-pagination>
+    </el-card>
+
+    <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
+      <el-form ref="searchForm" label-width="110px">
+        <el-row>
+
+          <!-- <el-col :span="12">
+            <el-form-item label="生成时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col> -->
+          <!-- 
+          <el-col :span="12">
+            <el-form-item label="">
+              <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col> -->
+
+          <el-col :span="12">
+            <el-form-item label="推荐单位编码">
+              <el-input size="mini" v-model="searchForm.RecUnitId" style="width:100%" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="准入证号">
+              <el-input size="mini" v-model="searchForm.AccessCardNo" 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.SupplierTypeName" 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.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">
+        <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
+        <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>
+  import {
+    mapGetters
+  } from 'vuex';
+  import supplierapi from '@/api/oilsupplier/supplier';
+  import api from '@/api/oilsupplier/annualaudit';
+
+  export default {
+    computed: {
+      ...mapGetters({
+        authUser: 'authUser'
+      })
+    },
+    name: 'annualaudit',
+
+    data() {
+      return {
+        addshow: false,
+        dialogVisible: false,
+        delevisble:false,
+        //列表数据
+        selectsupplierlist: [],
+        entityList: [],
+        //分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //列表排序
+        Column: {
+          Order: '',
+          Prop: ''
+        },
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        //查询项
+        searchFormReset: {},
+        entityForm: {
+          Id: '',
+          SupplierName: '',
+          SupplierId: '',
+          SupplierTypeName: '',
+        },
+        searchForm: {
+          Id: '',
+          RecUnitId: '',
+          AccessCardNo: '',
+          SupplierTypeName: '',
+          SupplierName: '',
+          Num: '',
+          ProjectName: '',
+          Performance: '',
+          WorkRange: '',
+          Status: '',
+          BackReason: '',
+          ApplyTime: '',
+          AuditDate: '',
+          EnterUserId: '',
+          EnterUserName: '',
+          EnterUserTel: '',
+          SCR: '',
+          SCRQ: '',
+          SCYJ: '',
+          SCJG: '',
+          SPR: '',
+          SPRQ: '',
+          SPYJ: '',
+          SPJG: '',
+          CreateOn: '',
+          CreateUserId: '',
+          CreateBy: '',
+          ModifiedOn: '',
+          ModifiedUserId: '',
+          ModifiedBy: '',
+
+        },
+        tableColumns: [
+
+          {
+            prop: "RecUnitId",
+            label: '推荐单位编码',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "AccessCardNo",
+            label: '准入证号',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierTypeName",
+            label: '准入类别',
+            width: 100,
+            sort: true
+          },
+
+          {
+            prop: "SupplierName",
+            label: '企业名称',
+            width: 100,
+            sort: true
+          },
+
+          // {
+          //   prop: "ProjectName",
+          //   label: '工程项目名称',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "Performance",
+          //   label: '履约执行情况',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "WorkRange",
+          //   label: '准入范围',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "Status",
+          //   label: '状态标识',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          {
+            prop: "OrganCode",
+            label: '组织机构代码',
+            width: 100,
+            sort: true
+          },
+
+          // {
+          //   prop: "ApplyTime",
+          //   label: '年审日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "CreateOn",
+          //   label: '申请日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "AuditDate",
+          //   label: '审核日期',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "EnterUserName",
+          //   label: '录入员',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "EnterUserTel",
+          //   label: '录入员电话',
+          //   width: 100,
+          //   sort: true
+          // },
+
+          // {
+          //   prop: "BackReason",
+          //   label: '退回原因',
+          //   width: 100,
+          //   sort: true
+          // }
+        ],
+      }
+    },
+    created() {
+      //查询条件初始值备份
+      Object.assign(this.searchFormReset, this.searchForm)
+      //查询列表
+      this.initDatas()
+      this.getselectsupplier()
+      //this.getDictOptions()
+    },
+    methods: {
+      initDatas() {
+        //分页及列表条件
+        let params = {
+          _currentPage: this.currentPage,
+          _size: this.size,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop,
+        }
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        //访问接口
+        api.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 => {
+          //this.dictOptions.customerList = res.data.items['customerList']
+          //this.dictOptions.projectList = res.data.items['projectList']
+
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
+      searchCommand(command) {
+        if (command == 'search') {
+          this.dialogVisible = true
+        } else if (command == 'clear') {
+          this.clearSearch()
+        }
+      },
+      //列表排序功能
+      orderby(column) {
+        if (column.order == 'ascending') {
+          this.Column.Order = 'asc'
+        } else if (column.order == 'descending') {
+          this.Column.Order = 'desc'
+        }
+        this.Column.Prop = column.prop
+        this.initDatas()
+      },
+      clearSearch() {
+        Object.assign(this.searchForm, this.searchFormReset);
+        //this.searchForm = this.searchFormReset;
+        this.CreateOn = ''
+        this.initDatas()
+      },
+      handleSearch() {
+        this.currentPage = 1;
+        this.dialogVisible = false;
+        this.initDatas();
+      },
+      handleCurrentChange(value) {
+        this.currentPage = value
+        this.initDatas()
+      },
+      handleSizeChange(value) {
+        this.size = value
+        this.currentPage = 1
+        this.initDatas()
+      },
+      deleteEntity(row) {
+        api.deleteEntity(row.Id, 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>
+
+<style lang="scss">
+
+</style>

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

@@ -480,7 +480,7 @@
     },
     name: 'oilsupplierEdit',
 
-    data() {
+    data () {
       return {
         equipmentList: [], //企业主要装备情况
         performanceList: [], //近三年主要工程业绩
@@ -598,7 +598,7 @@
         this.$refs["winningList"].showDialog()
       },
 
-      initDatas() {
+      initDatas () {
         if (this.formData.Id) {
           api.getEntity(this.formData.Id, this.$axios).then(res => {
             this.formData = res.data;
@@ -608,7 +608,7 @@
         }
       },
 
-      getDictOptions() {
+      getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           //this.wellNoOptions = res.data.items['WellNo']
           //this.supervisersOptions = res.data.items['Supervisers']

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

@@ -38,7 +38,7 @@
                 <el-button type="primary" size="mini" @click="saveEntity">保存基本信息</el-button>
               </span>
             </div>
-            <el-form label-width="140px" ref="EntityForm" :model="formData">
+            <el-form label-width="140px" ref="EntityForm" :model="formData" :rules="rulesform">
               <el-row>
                 <!--<el-col :span="8">
                   <el-form-item label="DEMO">
@@ -54,16 +54,18 @@
                 </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 label="供方名称" prop="SupplierName" required>
+                    <el-input v-model="formData.SupplierName" maxlength="255" 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"
+                    <el-select ref="SpecType" multiple v-model="UnitRelationAry" @change="unitRelationChange" 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>
@@ -71,13 +73,13 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="统一社会信用代码" required>
+                  <el-form-item label="统一社会信用代码" prop="CommercialNo" 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-form-item label="税务登记证编号" prop="CountryTaxNo" required>
                     <el-input v-model="formData.CountryTaxNo" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
@@ -97,7 +99,7 @@
                   <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 :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="CityAry" style="width: 100%" @change="handleAreaChange">
                         </el-cascader>
                       </el-col>
                       <el-col :span="16">
@@ -116,18 +118,18 @@
                   <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 :options="countryoptions" :props="countryprops" placeholder="省市区" v-model="LinkCityAry" style="width: 100%" @change="handleLinkAreaChange">
                         </el-cascader>
                       </el-col>
                       <el-col :span="16">
-                        <el-input v-model="formData.Address" placeholder="详细地址" style="width: 100%"></el-input>
+                        <el-input v-model="formData.LinkAddress" 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-input v-model="formData.LinkZipCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
@@ -154,13 +156,7 @@
                     <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="产品质量认证情况及认证机构">
@@ -179,16 +175,26 @@
                 </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 label="法定代表人姓名" prop="LegalPerson">
+                    <el-input v-model="formData.LegalPerson" maxlength="20" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
+                  <el-form-item label="公司类型" prop="CompanyType" required>
+                    <!--<el-input v-model="formData.CompanyType" placeholder="请输入" style="width: 100%"></el-input>-->
+                    <el-select v-model="formData.CompanyType" filterable allow-create placeholder="请选择" style="width: 100%;">
+                      <el-option v-for="item in CompanyTypeOptions" :key="item.Id" :label="item.Key" :value="item.Value" style="width: 100%">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
+
+                <!--<el-col :span="8">
                   <el-form-item label="行业类别">
                     <el-input v-model="formData.CategoryCode" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
 
                 <!--<el-col :span="8">
                   <el-form-item label="行业类别名称">
@@ -197,27 +203,16 @@
                 </el-col>-->
 
                 <el-col :span="8">
-                  <el-form-item label="注册资本">
+                  <el-form-item label="注册资本" required>
                     <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-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>-->
 
                 <el-col :span="8">
                   <el-form-item label="成立时间">
@@ -226,51 +221,57 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="开户银行">
+                  <el-form-item label="开户银行" required>
                     <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-form-item label="银行账号" required>
                     <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-form-item label="联系人姓名" required>
+                    <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="移动电话" required>
                     <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-form-item label="固定电话" required>
                     <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-form-item label="传真" required>
                     <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-form-item label="财务电话" prop="CompanyTel" required>
                     <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-form-item label="电子邮箱" prop="EMail" required>
                     <el-input v-model="formData.EMail" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+                <!--<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>-->
 
                 <el-col :span="8">
                   <el-form-item label="银行信用等级">
@@ -278,15 +279,20 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="8">
+                <!--<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>-->
 
                 <el-col :span="8">
                   <el-form-item label="HSE审查培训">
-                    <el-input v-model="formData.CompanyUrl" placeholder="请输入" style="width: 100%"></el-input>
+                    <!--<el-input v-model="formData.HseTraining" placeholder="请输入" style="width: 100%"></el-input>-->
+                    <el-select v-model="formData.HseTraining" placeholder="请选择" style="width: 100%;">
+                      <el-option v-for="item in HSEOptions" :key="item.value" :label="item.label" :value="item.value" style="width: 100%">
+                      </el-option>
+                    </el-select>
+
                   </el-form-item>
                 </el-col>
 
@@ -536,6 +542,7 @@
         winningList: [], //近三年获得省部级及以上主要技术、管理成果、获奖项目
         businessList: [], //准入业务
         UnitRelationOptions: [],
+        CompanyTypeOptions: [],
         UnitRelationAry: [],
         countryoptions: [],
         countryprops: {
@@ -544,10 +551,19 @@
           children: 'districts'
         },
         CityAry: [],
+        LinkCityAry: [],
         serviceId: '',
         certId: '',
         classId: '03',
 
+        HSEOptions: [{
+          value: '1',
+          label: '是'
+        }, {
+          value: '0',
+          label: '否'
+        }],
+
         formData: {
           Id: '',
           SupplierName: '',
@@ -568,6 +584,12 @@
           Street: '',
           HouseNo: '',
           ZipCode: '',
+          LinkAddress: '',
+          LinkProvince: '',
+          LinkCity: '',
+          LinkStreet: '',
+          LinkHouseNo: '',
+          LinkZipCode: '',
           QualitySystemCert: '',
           ProductQualityCert: '',
           MaunLicense: '',
@@ -619,7 +641,8 @@
           CertId: 0,
           SupplierTypeCode: '03',
           SupplierTypeName: '技术服务类',
-          Step: 0
+          Step: 0,
+          HseTraining: 0,
         },
 
         formDataCert: {
@@ -640,7 +663,47 @@
           process: 'oil_supplier_apply',
           business: '',
           instance: ''
-        }
+        },
+
+        checkemail: (rule, value, callback) => {
+          if (!value) {
+            callback(new Error('请输入邮箱'))
+          } else {
+            let re = /^([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|-|.|-]?)*[a-zA-Z0-9]+.[a-zA-Z]{2,3}$/
+            if (!re.test(value)) {
+              callback(new Error('请输入正确的邮箱地址'))
+            } else {
+              callback()
+            }
+          }
+        },
+
+        rulesform: {
+          SupplierName: [
+            { required: true, message: '请输入供方名称', trigger: 'change' },
+          ],
+          CommercialNo: [
+            { required: true, message: '请输入统一社会信用代码', trigger: 'change' },
+          ],
+          CountryTaxNo: [
+            { required: true, message: '请输入税务登记证编号', trigger: 'change' },
+          ],
+          CompanyType: [
+            { required: true, message: '请选择公司类型', trigger: 'change' },
+          ],
+          LegalPerson: [
+            { required: true, message: '请输入法定代表人姓名', trigger: 'change' },
+          ],
+          EMail: [
+            { required: true, message: '请输入邮箱地址', trigger: 'change' },
+            { validator: this.checkemail, trigger: 'blur' }
+          ],
+          realname: [{
+            required: true,
+            message: '用户名',
+            trigger: 'blur'
+          }]
+        },
       }
     },
     created() {
@@ -667,8 +730,23 @@
       winningdialog() {
         this.$refs["winningList"].showDialog()
       },
+      unitRelationChange (value) {
+        this.formData.SpecTypeCode = value.join(',')
+      },
+      handleAreaChange (value) {
+        this.formData.Province = value[0]
+        this.formData.City = value[1]
+        this.formData.Street = value[2]
+        //this.formData.ZipCode = value[2]
+      },
+      handleLinkAreaChange (value) {
+        this.formData.LinkProvince = value[0]
+        this.formData.LinkCity = value[1]
+        this.formData.LinkStreet = value[2]
+        //this.formData.LinkZipCode = value[2]
+      },
 
-      initDatas() {
+      initDatas () {
         if (this.formData.Id) {
           api.getEntityAndCert(this.certId, this.$axios).then(res => {
             this.formData = res.data
@@ -684,6 +762,18 @@
             this.formDataCert.SkillerTotal = this.formData.SkillerTotal
             this.formDataCert.Status = this.formData.Status
             this.formDataCert.WorkflowId = this.formData.WorkflowId
+            this.CityAry = []
+            this.CityAry.push(this.formData.Province)
+            this.CityAry.push(this.formData.City)
+            this.CityAry.push(this.formData.Street)
+            this.LinkCityAry = []
+            this.LinkCityAry.push(this.formData.LinkProvince)
+            this.LinkCityAry.push(this.formData.LinkCity)
+            this.LinkCityAry.push(this.formData.LinkStreet)
+            this.UnitRelationAry = []
+            if (this.formData.SpecTypeCode.length > 0) {
+              this.UnitRelationAry = this.formData.SpecTypeCode.split(',')
+            }
 
             this.entrydetail.business = this.certId
             this.entrydetail.instance = this.formDataCert.WorkflowId
@@ -701,17 +791,16 @@
         api.getDictList(this.$axios).then(res => {
           this.UnitRelationOptions = res.data.items['UnitRelation']
           this.getCityList(res.data.items['GaodeMapChinaAreas'])
+          this.CompanyTypeOptions = res.data.items['CompanyType']
         }).catch(err => {
           console.error(err)
         })
       },
-      getCityList() {
-        this.$axios.get('http://restapi.amap.com/v3/config/district?key=13f54664eb5a883195604db09d3fba5c&subdistrict=3')
-          .then((res) => {
-            let countstr = JSON.stringify(res.data.districts[0].districts)
-            countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
-            this.countryoptions = JSON.parse(countstr)
-          })
+      getCityList (val) {
+        let resultData = JSON.parse(val)
+        let countstr = JSON.stringify(resultData.districts[0].districts)
+        countstr = countstr.replace(/\,\"districts\"\:\[\]/g, '')
+        this.countryoptions = JSON.parse(countstr)
       },
 
       //保存信息
@@ -761,7 +850,7 @@
         });
       },
 
-      updateEntity() {
+      updateEntity () {
         api.updateEntity(this.formData.Id, this.formData, this.$axios).then(res => {
           if (res.data.code === 0) {
             //保存成功后，初始化数据，变成修改

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

@@ -17,456 +17,350 @@
           </router-link>
         </span>
       </div>
-      <el-form label-width="110px" 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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.Id" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="编码">
-              <el-input v-model="formData.Code" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="名称">
-              <el-input v-model="formData.Name" placeholder="请输入"  style="width: 100%"></el-input>
+      <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 label="一级编码">
-              <el-input v-model="formData.Code1" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="一级名称">
-              <el-input v-model="formData.Name1" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="二级编码">
-              <el-input v-model="formData.Code2" placeholder="请输入"  style="width: 100%"></el-input>
+           <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 label="二级名称">
-              <el-input v-model="formData.Name2" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="三级编码">
-              <el-input v-model="formData.Code3" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="三级名称">
-              <el-input v-model="formData.Name3" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="四级编码">
-              <el-input v-model="formData.Code4" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="四级名称">
-              <el-input v-model="formData.Name4" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="部门ID">
-              <el-input v-model="formData.OrgId" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="部门名称">
-              <el-input v-model="formData.OrgName" placeholder="请输入"  style="width: 100%"></el-input>
+            <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 label="">
-              <el-input v-model="formData.F01" placeholder="请输入"  style="width: 100%"></el-input>
+            <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-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F02" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F03" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F04" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F05" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F06" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F07" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F08" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F09" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F10" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F11" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F12" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F13" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F14" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F15" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F16" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F17" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F18" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F19" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F20" placeholder="请输入"  style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-
-          <el-col :span="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F21" placeholder="请输入"  style="width: 100%"></el-input>
+        </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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F22" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F23" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F24" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F25" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F26" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F27" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F28" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F29" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F30" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F31" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F32" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F33" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F34" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F35" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F36" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F37" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F38" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F39" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F40" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F41" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F42" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F43" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F44" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F45" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F46" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F47" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F48" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F49" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F50" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F51" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.F52" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="备注">
-              <el-input v-model="formData.Remark" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="删除状态，0正常，1已删除">
-              <el-input v-model="formData.DeletionStateCode" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.CreateOn" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.CreateUserId" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.CreateBy" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.ModifiedOn" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.ModifiedUserId" placeholder="请输入"  style="width: 100%"></el-input>
+          <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="8">
-            <el-form-item label="">
-              <el-input v-model="formData.ModifiedBy" placeholder="请输入"  style="width: 100%"></el-input>
+          <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>
 

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

@@ -9,11 +9,11 @@
         <span>
           <i class="icon icon-table2"></i> 技术服务类资质对照表
         </span>
-        <span style="float: right;">
+        <!-- <span style="float: right;">
           <router-link :to="'/oilsupplier/technologyservice/add/operation'">
             <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">添加</el-button>
           </router-link>
-        </span>
+        </span> -->
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
           <!--<el-form-item label="上报时间">
             <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
@@ -32,13 +32,13 @@
         </el-form>
       </div>
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%" @sort-change="orderby">
-        <el-table-column label="操作" min-width="100" align="center" fixed>
+        <el-table-column label="操作" min-width="150" align="center" fixed>
           <template slot-scope="scope">
             <router-link :to="'/oilsupplier/technologyservice/' + scope.row.Id + '/operation'">
-              <el-button type="text" title="编辑" size="small" icon="el-icon-edit"></el-button>
+              <el-button type="primary" plain title="编辑" size="mini">编辑</el-button>
             </router-link>
 
-            <el-popover placement="top" title="提示" v-model="scope.row.deleteConfirmFlag">
+            <el-popover placement="top" title="提示">
               <el-alert
                 title=""
                 description="确认要删除吗？"
@@ -49,9 +49,7 @@
               <div style="text-align: right; margin: 0">
                 <el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
               </div>
-              <el-button slot="reference" type="text" title="删除" style="margin-left:3px" size="small" @click="scope.row.deleteConfirmFlag = true">
-                <i class="el-icon-delete"></i>
-              </el-button>
+              <el-button slot="reference" type="primary" plain title="删除" style="margin-left:3px" size="mini">删除</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -85,11 +83,11 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="">
               <el-input size="mini" v-model="searchForm.Id" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
 
           <el-col :span="12">
             <el-form-item label="编码">