审核意见

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertsub/oilsuppliercertsub.go

@@ -21,3 +21,23 @@ type OilSupplierCertSub struct {
 	ModifiedUserId   int       `xorm:"INT(10)"`
 	ModifiedBy       string    `xorm:"VARCHAR(50)"`
 }
+
+type OilSupplierOpinion struct {
+	Id                int       `xorm:"not null pk autoincr INT(10)"`
+	SupplierId        int       `xorm:"not null comment('供方基本信息表主键') INT(10)"`
+	SupplierTypeCode  string    `xorm:"not null default '' comment('准入类别代码') VARCHAR(5)"`
+	SupplierCertSubId int       `xorm:"not null comment('供方对应准入子分类表') INT(10)"`
+	CertSubName       string    `xorm:"VARCHAR(50)"`
+	Opinion           string    `xorm:"not null default '' comment('分类编码') VARCHAR(500)"`
+	Remark            string    `xorm:"comment('备注') VARCHAR(500)"`
+	AuditStatus       int       `xorm:"TINYINT(4)"`
+	AuditorId         int       `xorm:"INT(10)"`
+	AuditorName       string    `xorm:"VARCHAR(50)"`
+	IsDelete          int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
+	CreateOn          time.Time `xorm:"DATETIME created"`
+	CreateUserId      int       `xorm:"INT(10)"`
+	CreateBy          string    `xorm:"VARCHAR(50)"`
+	ModifiedOn        time.Time `xorm:"DATETIME"`
+	ModifiedUserId    int       `xorm:"INT(10)"`
+	ModifiedBy        string    `xorm:"VARCHAR(50)"`
+}

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertsub/oilsuppliercertsubService.go

@@ -1,7 +1,11 @@
 package suppliercertsub
 
 import (
+	"strconv"
+
 	. "dashoo.cn/backend/api/mydb"
+	"dashoo.cn/utils"
+	. "dashoo.cn/utils/db"
 	"github.com/go-xorm/xorm"
 )
 
@@ -14,3 +18,37 @@ func GetOilSupplierCertSubService(xormEngine *xorm.Engine) *OilSupplierCertSubSe
 	s.DBE = xormEngine
 	return s
 }
+
+//获取待审核业务列表
+func (s *OilSupplierCertSubService) GetWaitAuditBusinesslist(pageIndex, itemsPerPage int64, order string, certsub, orgsetting string, where string) (int64, []OilSupplierCertSub) {
+	var err error
+	var total int64
+	if where == "" {
+		where = " 1=1 "
+	}
+	//获取总记录数
+	sqlCount := `select count(*) from ` + certsub + ` a 
+	left join ` + orgsetting + ` b b on a.Id=b.ParentId and a.SupplierTypeCode = b.SupplierTypeCode
+	where ` + where
+	var sql string
+	sql = `select a.*
+	from ` + certsub + ` a 
+	left join ` + orgsetting + ` b on a.Id=b.ParentId and a.SupplierTypeCode = b.SupplierTypeCode
+	where ` + where + ` order by ` + order +
+		` limit ` + utils.ToStr((pageIndex-1)*itemsPerPage) + "," + utils.ToStr(itemsPerPage)
+
+	List := make([]OilSupplierCertSub, 0)
+	utils.DBE.Sql(sql).Find(&List)
+
+	resultsSlice, err := s.DBE.Query(sqlCount)
+	LogError(err)
+	if len(resultsSlice) > 0 {
+		results := resultsSlice[0]
+		for _, value := range results {
+			total, err = strconv.ParseInt(string(value), 10, 64)
+			LogError(err)
+			break
+		}
+	}
+	return total, List
+}

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

@@ -20,7 +20,7 @@ type OilSupplierFile struct {
 	OtherRemark       string    `xorm:"VARCHAR(500)"`
 	Remark            string    `xorm:"VARCHAR(500)"`
 	IsDelete          int       `xorm:"INT(10)"`
-	CreateOn          time.Time `xorm:"DATETIME"`
+	CreateOn          time.Time `xorm:"DATETIME created"`
 	CreateUserId      int       `xorm:"INT(10)"`
 	CreateBy          string    `xorm:"VARCHAR(50)"`
 	ModifiedOn        time.Time `xorm:"DATETIME"`

src/dashoo.cn/backend/api/controllers/base.go

@@ -218,29 +218,30 @@ var (
 	LimsReportSignName                       string = "LimsReportSign"              //报告签发
 	LimsReportHistoryName                    string = "LimsReportHistory"           //报告历史
 	LimsCustomerpositionName                 string = "LimsCustomerPosition"
-	LimsPressureLeakName                     string = "LimsPressureLeak"    //阻火器压力损失表
-	LimsSpecifyStandardName                  string = "LimsSpecifyStandard" //Lims规格型号标准
-	BaseUserName                             string = "Base_User"           //用户表
-	UserQualificationName                    string = "UserQualification"   //用户资质表
-	LimsInstrumentGroup                      string = "LimsInstrumentGroup" // 检测仪器关联
-	OilAuditSettingName                          string = "Base_OilAuditSetting" // 单位审批步骤自定义配置
-	OilBasisBuildName               string = "OilBasisBuild"               // 基建类资质对照表
-	OilGoodsAptitudeName            string = "OilGoodsAptitude"            // 物资类项目与资质对照表
-	OilTableFiledSettingName        string = "OilTableFiledSetting"        // 资质项目与字段对照表
-	OilTechnologyServiceName        string = "OilTechnologyService"        // 技术服务类资质对照表
-	OilSupplierName                 string = "OilSupplier"                 // 供方基本信息表
-	OilSupplierCertName             string = "OilSupplierCert"             // 供方准入证书信息表
-	OilSupplierCertSubName          string = "OilSupplierCertSub"          // 供方对应准入子分类表
-	OilSupplierFileName             string = "OilSupplierFile"             //供方准入文件表
-	OilGoodsAptitudeClassName       string = "OilGoodsAptitudeClass"       // 物资类资质分类层级表
-	OilTechnologyServiceClassName   string = "OilTechnologyServiceClass"   // 物资类资质分类层级表
-	OilEnterpriseMajorEquipmentName string = "OilEnterpriseMajorEquipment" //企业主要装备情况
-	OilThreeYearsPerformanceName    string = "OilThreeYearsPerformance"    //近三年主要工程业绩
-	OilPatentStatisticalName        string = "OilPatentStatistical"        //拥有专利、专有技术及工法
-	OilWinningProjectName           string = "OilWinningProject"           //近三年获得省部级及以上主要技术、管理成果、获奖项目
-	OilTechsrvDetailViewName        string = "oil_techsrv_detail_view"     //技术服务类视图
-	OilGoodsAptDetailViewName       string = "oil_goodsapt_detail_view"    //物資类视图
-	OilClassOrgSettingName       	string = "OilClassOrgSetting"    	   //分类部门审批配置表
+	LimsPressureLeakName                     string = "LimsPressureLeak"            //阻火器压力损失表
+	LimsSpecifyStandardName                  string = "LimsSpecifyStandard"         //Lims规格型号标准
+	BaseUserName                             string = "Base_User"                   //用户表
+	UserQualificationName                    string = "UserQualification"           //用户资质表
+	LimsInstrumentGroup                      string = "LimsInstrumentGroup"         // 检测仪器关联
+	OilAuditSettingName                      string = "Base_OilAuditSetting"        // 单位审批步骤自定义配置
+	OilBasisBuildName                        string = "OilBasisBuild"               // 基建类资质对照表
+	OilGoodsAptitudeName                     string = "OilGoodsAptitude"            // 物资类项目与资质对照表
+	OilTableFiledSettingName                 string = "OilTableFiledSetting"        // 资质项目与字段对照表
+	OilTechnologyServiceName                 string = "OilTechnologyService"        // 技术服务类资质对照表
+	OilSupplierName                          string = "OilSupplier"                 // 供方基本信息表
+	OilSupplierCertName                      string = "OilSupplierCert"             // 供方准入证书信息表
+	OilSupplierCertSubName                   string = "OilSupplierCertSub"          // 供方对应准入子分类表
+	OilSupplierOpinionName                   string = "OilSupplierOpinion"          //供方审核意见表
+	OilSupplierFileName                      string = "OilSupplierFile"             //供方准入文件表
+	OilGoodsAptitudeClassName                string = "OilGoodsAptitudeClass"       // 物资类资质分类层级表
+	OilTechnologyServiceClassName            string = "OilTechnologyServiceClass"   // 物资类资质分类层级表
+	OilEnterpriseMajorEquipmentName          string = "OilEnterpriseMajorEquipment" //企业主要装备情况
+	OilThreeYearsPerformanceName             string = "OilThreeYearsPerformance"    //近三年主要工程业绩
+	OilPatentStatisticalName                 string = "OilPatentStatistical"        //拥有专利、专有技术及工法
+	OilWinningProjectName                    string = "OilWinningProject"           //近三年获得省部级及以上主要技术、管理成果、获奖项目
+	OilTechsrvDetailViewName                 string = "oil_techsrv_detail_view"     //技术服务类视图
+	OilGoodsAptDetailViewName                string = "oil_goodsapt_detail_view"    //物資类视图
+	OilClassOrgSettingName                   string = "OilClassOrgSetting"          //分类部门审批配置表
 )
 
 //分页信息及数据

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

@@ -514,3 +514,44 @@ func (this *OilSupplierCertController) AuditEntity() {
 	}
 	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
 }
+
+//// @Title 提交二级审批
+//// @Description 提交二级审批
+//// @Param 	body body suppliercert.OilSupplierCert
+//// @Success	200	{object} controllers.Request
+//// @router /audit/:id [post]
+//func (this *OilSupplierCertController) AuditEntity() {
+//	certId := this.Ctx.Input.Param(":id")
+
+//	var errinfo ErrorDataInfo
+//	defer func() { //finally处理失败的异常
+//		if err := recover(); err != nil {
+//			errinfo.Message = "提交失败，" + err.(string)
+//			errinfo.Code = -1
+//			this.Data["json"] = &errinfo
+//			this.ServeJSON()
+//		} else {
+//			//返回正确结果
+//			errinfo.Message = "审核提交成功"
+//			errinfo.Code = 0
+//			this.Data["json"] = &errinfo
+//			this.ServeJSON()
+//		}
+//	}()
+
+//	//取出审批列表
+//	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+//	processInstanceId := certSrv.SubmitOrgAudit(certId, workflow.OIL_SUPPLIER_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+
+//	//记下workflowID(首次提交时才会记录，中间状态请忽略) 及审批状态
+//	var supplierCertEntity suppliercert.OilSupplierCert
+//	certSrv.GetEntityById(certId, supplierCertEntity)
+//	supplierCertEntity.WorkflowId = processInstanceId
+//	supplierCertEntity.Status = suppliercert.FIRST_TRIAL_STATUS //二级单位初审
+//	cols := []string{
+//		"Id",
+//		"WorkflowId",
+//		"Status",
+//	}
+//	certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
+//}

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

@@ -436,3 +436,86 @@ func (this *OilSupplierCertSubController) BusinessDelete() {
 		this.ServeJSON()
 	}
 }
+
+// @Title 获取待审核业务列表
+// @Description get user by token
+// @Success 200 {object} models.Userblood
+// @router /auditbuslist [get]
+func (this *OilSupplierCertSubController) AuditbusList() {
+	var list []suppliercertsub.OilSupplierCertSub
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
+	orderby := "CreateOn desc"
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop + " " + Order
+	}
+	where := "1 = 1"
+	SupplierCertId := this.GetString("SupplierCertId")
+	SupplierTypeCode := this.GetString("SupplierTypeCode")
+	if SupplierCertId != "" {
+		where = where + " and SupplierCertId = '" + SupplierCertId + "'"
+	}
+	if SupplierTypeCode != "" {
+		where = where + " and SupplierTypeCode = '" + SupplierTypeCode + "'"
+	}
+
+	total, list := svc.GetWaitAuditBusinesslist(page.CurrentPage, page.Size, orderby, OilSupplierCertSubName, OilClassOrgSettingName, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 获取审核意见列表
+// @Description 获取审核意见列表
+// @Success	200	{object} controllers.Request
+// @router /opinionlist [get]
+func (this *OilSupplierCertSubController) OpinionList() {
+	SupplierCertSubId := this.GetString("SupplierCertSubId")
+	var list []suppliercertsub.OilSupplierOpinion
+	where := " 1 = 1 "
+	if SupplierCertSubId != "" {
+		where = where + " and SupplierCertSubId = '" + SupplierCertSubId + "'"
+	}
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
+	svc.GetEntitysByWhere(OilSupplierOpinionName, where, &list)
+
+	var datainfo DataInfo
+	datainfo.Items = list
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
+
+// @Title 新增审核意见
+// @Description 新增审核意见
+// @Success	200	{object} controllers.Request
+// @router /addopinion [post]
+func (this *OilSupplierCertSubController) AddOpinion() {
+	var model suppliercertsub.OilSupplierOpinion
+	var jsonblob = this.Ctx.Input.RequestBody
+	json.Unmarshal(jsonblob, &model)
+	model.AuditorName = this.User.Realname
+	model.AuditorId, _ = utils.StrTo(this.User.Id).Int()
+	model.CreateBy = this.User.Realname
+	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
+	svc := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
+	_, err := svc.InsertEntityBytbl(OilSupplierOpinionName, &model)
+
+	var errinfo ErrorDataInfo
+	if err == nil {
+		errinfo.Message = "操作成功！"
+		errinfo.Code = 0
+		errinfo.Item = model.Id
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	} else {
+		errinfo.Message = "操作失败！" + utils.AlertProcess(err.Error())
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+}

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

@@ -3,13 +3,33 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">分类</span>
-        <!-- <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog">添加</el-button> -->
+        <span style="float: right;">
+          <el-button type="primary" size="mini" @click="AuditEntity">提交审批</el-button>
+        </span>
       </div>
-      <el-table :data="businessList" border>
-        <el-table-column label="操作" width="70" align="center" fixed>
+      <el-table :data="auditbusList" border>
+        <el-table-column label="操作" width="90" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="text" title="查看" size="small" icon="el-icon-edit" @click="openDialog(scope.row)">
-            </el-button>
+            <el-popover trigger="hover" width="700" placement="right" @show="getopinonList(scope.row)">
+              <el-table :data="opinionList">
+                <el-table-column width="80" property="AuditStatus" label="状态">
+                  <template slot-scope="scope">
+                    {{ transferStr(scope.row.AuditStatus+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column width="90" property="AuditorName" label="审批人"></el-table-column>
+                <el-table-column min-width="100" property="Opinion" label="审批意见"></el-table-column>
+                <el-table-column width="150" property="CreateOn" label="审批时间">
+                  <template slot-scope="scope">
+                    {{ jstimehandle(scope.row.CreateOn+'') }}
+                  </template>
+                </el-table-column>
+                <el-table-column width="120" property="Remark" label="备注信息"></el-table-column>
+              </el-table>
+              <div slot="reference" class="name-wrapper">
+                <el-button type="primary" plain size="mini" title="意见" @click="openDialog(scope.row)">意见</el-button>
+              </div>
+            </el-popover>
           </template>
         </el-table-column>
         <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
@@ -27,89 +47,38 @@
         <span style="font-weight: bold">分类文档</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="subfiledialog">添加</el-button>
       </div>
-      <subfile-list ref="subfileList" :data="subfileList" :SupplierId="SupplierId" :SupplierCertId="SupplierCertId"
-        :SupplierTypeCode="SupplierTypeCode" :businessList="businessList" :BusinessForm="BusinessForm" height="360px"
-        style="margin-top: 20px">
-      </subfile-list>
+      <auditfile-list ref="auditfileList" :data="auditfileList" :SupplierId="SupplierId"
+        :SupplierCertId="SupplierCertId" :SupplierTypeCode="SupplierTypeCode" :businessList="auditbusList"
+        :BusinessForm="BusinessForm" height="360px" style="margin-top: 20px"></auditfile-list>
     </el-card>
 
     <el-dialog :title="Title" :visible.sync="visible" top="5vh">
-      <el-form :model="BusinessForm" label-width="100px">
+      <el-form :model="AuditForm" label-width="100px">
         <el-row>
-          <el-col :span="12" v-if="SupplierTypeCode == '01' && Title == '新增准入范围'">
-            <el-form-item label="名称" required>
-              <el-select filterable default-first-option v-model="OneCode" placeholder="请选择" style="width: 100%"
-                @change="getChild()">
-                <el-option v-for="item in oneList" :key="item.Id" :label="item.Name" :value="item.Id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="SupplierTypeCode == '02' && Title == '新增准入范围'">
-            <el-form-item label="名称" required>
-              <el-input placeholder="请选择名称" v-model="BusinessForm.Name" style="width:100%">
-                <el-button type="primary" style="width:30%" @click="basicDialog = true" slot="append">选择
-                </el-button>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="SupplierTypeCode != '02' && Title == '新增准入范围'">
-            <el-form-item label="名称" required>
-              <el-cascader :options="techTreeList" :props="orgtreeprops" change-on-select :show-all-levels="false"
-                v-model="selectedorg" placeholder="请选择菜单" @change="getCode()" style="width:100%"></el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="Title == '编辑准入范围'">
-            <el-form-item label="名称">
-              <el-input v-model="BusinessForm.Name" placeholder="请输入名称" disabled></el-input>
+          <el-col :span="24">
+            <el-form-item label="审批意见">
+              <el-radio v-model="AuditForm.AuditStatus" label="1">合格</el-radio>
+              <el-radio v-model="AuditForm.AuditStatus" label="2">不合格</el-radio>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="编码" required>
-              <el-input v-model="BusinessForm.Code" placeholder="请输入编码" :disabled="Title == '编辑准入范围'"></el-input>
+          <el-col :span="24">
+            <el-form-item label="审批意见">
+              <el-input v-model="AuditForm.Opinion" type="textarea" :rows=3 placeholder="请输入审核意见"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注信息">
-              <el-input v-model="BusinessForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
+              <el-input v-model="AuditForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
         <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="savedata()">确 定</el-button>
+        <el-button type="primary" @click="addAudit()">确 定</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="基建类业务列表" :visible.sync="basicDialog" top="5vh" style="width：1000px">
-      <span style="float: right;">
-        <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="seachdata()">查询
-        </el-button>
-        <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="basicDialog = false">
-          取消</el-button>
-      </span>
-      <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-        <el-form-item label="业务名称">
-          <el-input size="mini" style="width: 165px;" v-model="keyword" placeholder="请输入业务名称"></el-input>
-        </el-form-item>
-      </el-form>
-      <el-table :data="techList" border>
-        <el-table-column label="操作" width="70" align="center" fixed>
-          <template slot-scope="scope">
-            <el-button type="text" size="small" @click="getChooseCode(scope.row)">选择</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
-      </el-table>
-      <el-pagination @size-change="HandleSizeChange" @current-change="HandleCurrentChange" :current-page="CurrentPage"
-        :page-sizes="[10, 15, 20, 25]" :page-size="Size" layout="total, sizes, prev, pager, next, jumper"
-        :total="CurrentItemCount">
-      </el-pagination>
-
-    </el-dialog>
   </div>
 </template>
 
@@ -117,12 +86,12 @@
   import {
     mapGetters
   } from 'vuex'
-  import SubfileList from '../../components/oilsupplier/subfilelist'
+  import AuditfileList from '../../components/oilsupplier/auditfilelist'
 
   export default {
-    name: 'EquipmentList',
+    name: 'AuditBusList',
     components: {
-      SubfileList, //文档
+      AuditfileList, //文档
     },
     props: {
       SupplierCertId: {
@@ -150,7 +119,7 @@
       return {
         oneList: [],
         OneCode: '',
-        businessList: [],
+        auditbusList: [],
         techList: [],
         techTreeList: [],
         orgtreeprops: {
@@ -162,14 +131,16 @@
         ClassId: '',
 
         Title: '',
-        BusinessForm: {
+        AuditForm: {
           Id: '',
           SupplierId: '',
-          SupplierCertId: '',
           SupplierTypeCode: '',
-          SubClassId: '',
-          Code: '',
-          Name: '',
+          SupplierCertSubId: '',
+          CertSubName: '',
+          Opinion: '',
+          AuditStatus: '1',
+          AuditorId: '',
+          AuditorName: '',
           Remark: '',
           IsDelete: 0
         },
@@ -178,13 +149,9 @@
         currentPage: 1, // 分页
         size: 10,
         currentItemCount: 0,
-        basicDialog: false,
-        keyword: '',
-        CurrentPage: 1, // 分页
-        Size: 10,
-        CurrentItemCount: 0,
 
-        subfileList: [], //文档
+        opinionList: [],
+        auditfileList: [], //文档
       }
     },
     methods: {
@@ -196,201 +163,115 @@
           _currentPage: this.currentPage,
           _size: this.size,
         }
-        this.$axios.get('suppliercertsub/list', {
+        this.$axios.get('suppliercertsub/auditbuslist', {
             params
           })
           .then(res => {
-            _this.businessList = res.data.items
+            _this.auditbusList = res.data.items
             _this.currentItemCount = res.data.currentItemCount
-            _this.$refs["subfileList"].initData()
+            _this.$refs["auditfileList"].initData()
           })
           .catch(err => {
             // handle error
             console.error(err)
           })
       },
-      savedata() {
-        if (this.Title == '新增准入范围') {
-          this.addBusiness()
-        } else if (this.Title == '编辑准入范围') {
-          this.editBusiness()
-        }
+      AuditEntity() {
+        this.$axios.post('/suppliercert/audit' + this.certId, {
+          params
+        }).then(res => {
+          if (res.data.code === 0) {
+            this.initData()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            });
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            });
+          }
+        }).catch(err => {
+          console.error(err)
+        });
       },
-      addBusiness() {
-        let _this = this
-        _this.BusinessForm.SupplierId = parseInt(_this.BusinessForm.SupplierId)
-        _this.BusinessForm.SupplierCertId = parseInt(_this.BusinessForm.SupplierCertId)
-        _this.BusinessForm.SubClassId = parseInt(_this.BusinessForm.SubClassId)
-        _this.$axios.post('/suppliercertsub/addbusiness/', _this.BusinessForm)
-          .then(res => {
-            if (res.data.code === 0) {
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-              _this.BusinessForm.Id = res.data.item + ''
-              _this.visible = false
-              _this.initData()
-              _this.$refs["subfileList"].initData()
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-            }
-          })
-          .catch(err => {
-            console.error(err)
+
+      addAudit() {
+        let _this = this;
+        _this.AuditForm.SupplierId = parseInt(_this.AuditForm.SupplierId)
+        _this.AuditForm.SupplierCertSubId = parseInt(_this.AuditForm.SupplierCertSubId)
+        _this.AuditForm.AuditStatus = parseInt(_this.AuditForm.AuditStatus)
+        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
           })
-      },
-      editBusiness() {
-        let _this = this
-        _this.BusinessForm.SupplierId = parseInt(_this.BusinessForm.SupplierId)
-        _this.BusinessForm.SupplierCertId = parseInt(_this.BusinessForm.SupplierCertId)
-        _this.BusinessForm.SubClassId = parseInt(_this.BusinessForm.SubClassId)
-        _this.$axios.put('/suppliercertsub/editbusiness/' + _this.BusinessForm.Id, _this.BusinessForm)
-          .then(res => {
-            if (res.data.code === 0) {
-              _this.$message({
-                type: 'success',
-                message: res.data.message,
-              })
-              this.visible = false
-              this.initData()
-            } else {
-              _this.$message({
-                type: 'warning',
-                message: res.data.message
+          .then(() => {
+            _this.$axios.post('/suppliercertsub/addopinion', _this.AuditForm, {})
+              .then(function (response) {
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: 'success',
+                    message: response.data.message,
+                  })
+                  _this.AuditForm.Id = response.data.item + ''
+                  _this.visible = false
+                } else {
+                  _this.$message({
+                    type: "warning",
+                    message: response.data.message
+                  });
+                }
               })
-            }
+              .catch(function (error) {
+                console.log(error);
+              });
           })
           .catch(err => {
             console.error(err)
           })
       },
-    //   showDialog() {
-    //     this.Title = '新增准入范围'
-    //     this.BusinessForm.Id = ''
-    //     this.BusinessForm.SupplierId = this.SupplierId
-    //     this.BusinessForm.SupplierCertId = this.SupplierCertId
-    //     this.BusinessForm.SupplierTypeCode = this.SupplierTypeCode
-    //     this.BusinessForm.SubClassId = ''
-    //     this.BusinessForm.Code = ''
-    //     this.BusinessForm.Name = ''
-    //     this.BusinessForm.Remark = ''
-    //     this.BusinessForm.IsDelete = 0
-    //     this.getbusiness()
-    //     this.visible = true
-    //   },
-      openDialog(val) {
-        this.Title = '编辑准入范围'
-        this.BusinessForm.Id = val.Id
-        this.BusinessForm.SupplierId = val.SupplierId
-        this.BusinessForm.SupplierCertId = val.SupplierCertId
-        this.BusinessForm.SupplierTypeCode = val.SupplierTypeCode
-        this.BusinessForm.SubClassId = val.SubClassId
-        this.BusinessForm.Code = val.Code
-        this.BusinessForm.Name = val.Name
-        this.BusinessForm.Remark = val.Remark
-        this.BusinessForm.IsDelete = val.IsDelete
-        this.getbusiness()
-        this.visible = true
-      },
-      getbusiness() {
-        let _this = this
-        if (_this.SupplierTypeCode == '01') { //获取物资类业务列表
-          this.$axios.get('goodsaptitude/goodsparentlist', {})
-            .then(res => {
-              _this.oneList = res.data.items
-              if (_this.Title == '编辑准入范围') {
-                for (var i = 0; i < _this.oneList.length; i++) {
-                  if (_this.BusinessForm.Code == _this.oneList[i].Code) {
-                    _this.OneCode = _this.oneList[i].Id
-                  }
-                }
-              }
-            })
-            .catch(err => {
-              console.error(err)
-            })
-        } else if (_this.SupplierTypeCode == '02') { //获取基建类业务列表
-          const params = {
-            keyword: this.keyword,
-            _currentPage: this.CurrentPage,
-            _size: this.Size,
-          }
-          this.$axios.get('basisbuild/basiclist', {
-              params
-            })
-            .then(res => {
-              _this.techList = res.data.items
-              _this.CurrentItemCount = res.data.currentItemCount
-            })
-            .catch(err => {
-              // handle error
-              console.error(err)
-            })
-        } else if (_this.SupplierTypeCode == '03') { //获取技术服务类业务列表
-          this.$axios.get('technologyservice/businesslist', {})
-            .then(res => {
-              _this.techList = res.data.items
-              _this.techTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
-            })
-            .catch(err => {
-              // handle error
-              console.error(err)
-            })
-        }
-      },
-      getCode() {
-        this.ClassId = this.selectedorg[this.selectedorg.length - 1]
-        for (var i = 0; i < this.techList.length; i++) {
-          if (this.selectedorg[this.selectedorg.length - 1] == this.techList[i].Id) {
-            this.BusinessForm.SubClassId = this.techList[i].Id
-            this.BusinessForm.Name = this.techList[i].Name
-            this.BusinessForm.Code = this.techList[i].Code
-          }
-        }
-      },
-      getChild() {
+      getopinonList(val) {
+        let _this = this;
         const params = {
-          ParentId: this.OneCode
+          SupplierCertSubId: val.Id,
         }
-        this.$axios.get('goodsaptitude/goodschildlist', {
+        _this.$axios.get('/suppliercertsub/opinionlist', {
             params
           })
-          .then(res => {
-            this.techList = res.data.items
-            if (this.techList && this.techList.length > 0) {
-              this.techTreeList = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Name')
+          .then(function (response) {
+            if (!!response.data.code) {
+              _this.$message({
+                type: 'warning',
+                message: response.data.message
+              })
             } else {
-              this.getParentCode()
+              _this.opinionList = response.data.items
             }
-          })
-          .catch(err => {
-            // handle error
+          }).catch(err => {
             console.error(err)
-          })
-      },
-      getParentCode() {
-        this.ClassId = this.OneCode
-        for (var i = 0; i < this.oneList.length; i++) {
-          if (this.OneCode == this.oneList[i].Id) {
-            this.BusinessForm.SubClassId = this.techList[i].Id
-            this.BusinessForm.Name = this.oneList[i].Name
-            this.BusinessForm.Code = this.oneList[i].Code
-          }
-        }
+          });
       },
-      getChooseCode(val) {
-        this.ClassId = val.Id
-        this.BusinessForm.Code = val.Code
-        this.BusinessForm.Name = val.Name
-        this.basicDialog = false
+
+      openDialog(val) {
+        this.Title = '新增审核意见'
+        this.AuditForm.Id = ''
+        this.AuditForm.SupplierId = this.SupplierId
+        this.AuditForm.SupplierTypeCode = this.SupplierTypeCode
+        this.AuditForm.SupplierCertSubId = val.Id
+        this.AuditForm.CertSubName = val.Name
+        this.AuditForm.Opinion = ''
+        this.AuditForm.AuditStatus = '1'
+        this.AuditForm.AuditorId = ''
+        this.AuditForm.AuditorName = ''
+        this.AuditForm.Remark = ''
+        this.AuditForm.IsDelete = 0
+        this.visible = true
       },
 
       subfiledialog() {
-        this.$refs["subfileList"].showDialog()
+        this.$refs["auditfileList"].showDialog()
       },
 
       handleSizeChange(value) {
@@ -415,6 +296,15 @@
         this.CurrentPage = -1
         this.getbusiness()
       },
+      transferStr(val) {
+        if (val === '1') {
+          return '合格'
+        } else if (val === '2') {
+          return '合格'
+        } else {
+          return '----'
+        }
+      },
       jstimehandle(val) {
         if (val === '') {
           return '----'

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

@@ -0,0 +1,492 @@
+<template>
+  <div>
+    <el-table :data="auditfileList" border>
+      <el-table-column label="操作" width="150" align="center" fixed>
+        <template slot-scope="scope">
+          <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
+          <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px" @click="deletedata(scope.row)">
+            删除</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>
+      <!-- <el-table-column prop="NeedFileCode" label="分类编码" show-overflow-tooltip></el-table-column> -->
+      <el-table-column prop="FileName" label="文件名称" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ jstimehandle(scope.row.EffectDate+'') }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="OtherRemark" label="其他信息" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="Remark" label="备注信息" show-overflow-tooltip></el-table-column>
+    </el-table>
+
+    <el-dialog :title="Title" :visible.sync="visible" top="5vh">
+      <el-form :model="SubfileForm" label-width="100px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="分类名称" required>
+              <el-select ref="refSupplierCertSub" v-model="SubfileForm.SupplierCertSubId" style="width:100%"
+                placeholder="请选择分类名称" @change="getCode()">
+                <el-option v-for="item in businessList" :label="item.Name" :value="item.Id" :key="item.Id">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文件分类" required>
+              <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件分类"></el-input>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="分类编码" required>
+              <el-input v-model="SubfileForm.NeedFileCode" placeholder="请输入编码"></el-input>
+            </el-form-item>
+          </el-col> -->
+          <el-col :span="12">
+            <el-form-item label="有效日期" required>
+              <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="其他信息">
+              <el-input v-model="SubfileForm.OtherRemark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注信息">
+              <el-input v-model="SubfileForm.Remark" type="textarea" :rows=3 placeholder="请输入备注信息"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="文档上传">
+              <el-upload style="margin-top: 10px;" multiple action="" :limit="1" ref="refuploadattach"
+                :http-request="uploadrequest" class="attach-uploader" :show-file-list="true"
+                :before-upload="beforeAvatarUpload">
+                <i class="el-icon-plus attach-uploader-icon"></i>
+              </el-upload>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item class="maintainlog" label="" label-width="120px">
+              <div style="overflow: auto;">
+                <template>
+                  <el-row>
+                    <el-col :span="24" v-for="(v,K) in doclist" :key="v">
+                      <span>
+                        <el-button size="small" type="text" icon="el-icon-delete" title="删除" @click="deletefile(K)">
+                        </el-button>
+                      </span>
+                      <a style="margin-left:10px" @click="clickachment(v.url)">{{ v.name }}</a>
+                    </el-col>
+                  </el-row>
+                </template>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
+        <el-button @click="visible = false">取 消</el-button>
+        <el-button type="primary" @click="makesure()">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+  import {
+    mapGetters
+  } from 'vuex'
+  import axios from 'axios'
+  import uploadajax from '../../assets/js/uploadajax.js'
+  export default {
+    name: 'SubfileList',
+    props: {
+      SupplierId: {
+        type: String,
+        default: '0'
+      },
+      SupplierCertId: {
+        type: String,
+        default: '0'
+      },
+      SupplierTypeCode: {
+        type: String,
+        default: '0'
+      },
+      businessList: {
+        type: Array,
+        default: []
+      },
+      BusinessForm: {}
+    },
+    created() {},
+    computed: {
+      ...mapGetters({
+        session: 'session'
+      })
+    },
+    data() {
+      return {
+        auditfileList: [],
+        techList: [],
+        techTreeList: [],
+        orgtreeprops: {
+          value: 'id',
+          label: 'Name',
+          children: 'children'
+        },
+        selectedorg: [],
+
+        Title: '',
+        SubfileForm: {
+          Id: '',
+          SupplierId: '',
+          SupplierTypeCode: '',
+          SupplierCertSubId: '',
+          CertSubName: '',
+          NeedFileType: '',
+          NeedFileCode: '',
+          FileExt: '',
+          FileSize: '',
+          FileName: '',
+          EffectDate: new Date(),
+          FileUrl: '',
+          OtherRemark: '',
+          Remark: '',
+          IsDelete: 0
+        },
+        visible: false,
+        selfVisible: this.visible, // 避免vue双向绑定警告
+
+        waituploads: [], // 等待上传的附件列表
+        doclist: [],
+      }
+    },
+    methods: {
+      initData() {
+        let _this = this
+        const params = {
+          SupplierId: this.SupplierId,
+          SupplierTypeCode: this.SupplierTypeCode,
+          _currentPage: 1,
+          _size: 1000,
+        }
+        this.$axios.get('supplierfile/filelist', {
+            params
+          })
+          .then(res => {
+            _this.auditfileList = res.data.items
+            _this.currentItemCount = res.data.currentItemCount
+          })
+          .catch(err => {
+            // handle error
+            console.error(err)
+          })
+      },
+      getCode() {
+        if (this.businessList && this.businessList.length > 0) {
+          for (var i = 0; i < this.businessList.length; i++) {
+            if (this.SubfileForm.SupplierCertSubId == this.businessList[i].Id) {
+              this.SubfileForm.CertSubName = this.businessList[i].Name
+            }
+          }
+        }
+      },
+      makesure() {
+        if (this.Title == '新增文件') {
+          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+            // 上传附件是否完成判断
+            if (!this.attachissuccess()) {
+              this.$message.error('有附件未成功上传！不能保存数据')
+              return
+            }
+            this.getattachissuccess()
+            this.addSubfile()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: '请上传文件！'
+            })
+          }
+        } else if (this.Title == '编辑文件') {
+          if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+            // 上传附件是否完成判断
+            if (!this.attachissuccess()) {
+              this.$message.error('有附件未成功上传！不能保存数据')
+              return
+            }
+            this.getattachissuccess()
+            this.editSubfile()
+          } else {
+            this.editSubfile()
+          }
+        }
+      },
+      addSubfile() {
+        let _this = this
+        _this.SubfileForm.SupplierId = parseInt(_this.SubfileForm.SupplierId)
+        _this.SubfileForm.SupplierCertSubId = parseInt(_this.SubfileForm.SupplierCertSubId)
+        _this.$axios.post('/supplierfile/addsubfile/', _this.SubfileForm)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              this.visible = false
+              this.initData()
+              this.$refs.refuploadattach = ''
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      editSubfile() {
+        let _this = this
+        _this.SubfileForm.SupplierId = parseInt(_this.SubfileForm.SupplierId)
+        _this.SubfileForm.SupplierCertSubId = parseInt(_this.SubfileForm.SupplierCertSubId)
+        _this.$axios.put('/supplierfile/editsubfile/' + _this.SubfileForm.Id, _this.SubfileForm)
+          .then(res => {
+            if (res.data.code === 0) {
+              _this.$message({
+                type: 'success',
+                message: res.data.message,
+              })
+              this.visible = false
+              this.initData()
+              this.$refs.refuploadattach = ''
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: res.data.message
+              })
+            }
+          })
+          .catch(err => {
+            console.error(err)
+          })
+      },
+      deletedata(val) {
+        let _this = this;
+        _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            _this.$axios.delete('supplierfile/subfiledelete/' + val.Id, {})
+              .then(function (response) {
+                // response
+                if (response.data.code === 0) {
+                  _this.$message({
+                    type: "success",
+                    message: response.data.message
+                  });
+                  _this.initData();
+                } else {
+                  _this.$message({
+                    type: "warning",
+                    message: response.data.message
+                  });
+                }
+              })
+              .catch(function (error) {
+                console.log(error);
+              });
+          })
+          .catch(() => {});
+      },
+      //   showDialog() {
+      //     this.Title = '新增文件'
+      //     this.SubfileForm.Id = ''
+      //     this.SubfileForm.SupplierId = this.SupplierId
+      //     this.SubfileForm.SupplierTypeCode = this.SupplierTypeCode
+      //     this.SubfileForm.SupplierCertSubId = ''
+      //     this.SubfileForm.CertSubName = ''
+      //     this.SubfileForm.NeedFileType = ''
+      //     this.SubfileForm.NeedFileCode = ''
+      //     this.SubfileForm.FileExt = ''
+      //     this.SubfileForm.FileSize = ''
+      //     this.SubfileForm.FileName = ''
+      //     this.SubfileForm.EffectDate = new Date()
+      //     this.SubfileForm.FileUrl = ''
+      //     this.SubfileForm.OtherRemark = ''
+      //     this.SubfileForm.Remark = ''
+      //     this.SubfileForm.IsDelete = 0
+      //     this.visible = true
+      //   },
+      openDialog(val) {
+        this.Title = '编辑文件'
+        this.SubfileForm.Id = val.Id
+        this.SubfileForm.SupplierId = val.SupplierId
+        this.SubfileForm.SupplierTypeCode = val.SupplierTypeCode
+        if (val.SupplierCertSubId == 0) {
+          this.SubfileForm.SupplierCertSubId = ''
+        } else {
+          this.SubfileForm.SupplierCertSubId = val.SupplierCertSubId
+        }
+        this.SubfileForm.CertSubName = val.CertSubName
+        this.SubfileForm.NeedFileType = val.NeedFileType
+        this.SubfileForm.NeedFileCode = val.NeedFileCode
+        this.SubfileForm.FileExt = val.FileExt
+        this.SubfileForm.FileSize = val.FileSize
+        this.SubfileForm.FileName = val.FileName
+        this.SubfileForm.EffectDate = new Date(val.EffectDate)
+        this.SubfileForm.FileUrl = val.FileUrl
+        this.SubfileForm.OtherRemark = val.OtherRemark
+        if (val.FileUrl != '') {
+          this.getwendanginfo(val.FileUrl)
+        }
+        this.SubfileForm.Remark = val.Remark
+        this.SubfileForm.IsDelete = val.IsDelete
+        this.visible = true
+      },
+      //文档列表
+      getwendanginfo(iUrl) {
+        let _this = this
+        _this.doclist = []
+        let exArr = iUrl.split('|')
+        let params = {
+          name: exArr[1],
+          url: exArr[0]
+        }
+        _this.doclist.push(params)
+      },
+
+      beforeAvatarUpload(file) {
+        let isLt50m = file.size / 1024 / 1024 / 50 < 1
+        if (!isLt50m) {
+          this.$message.error('上传文件大小不能超过 50MB!')
+          return false
+        }
+        return true
+      },
+      uploadrequest(option) {
+        let _this = this
+        axios.post(process.env.upfilehost, {})
+          .then(function (res) {
+            if (res.data && res.data.fid && res.data.fid !== '') {
+              option.action = `http://${res.data.url}/${res.data.fid}`
+              _this.waituploads.push({
+                uid: option.file.uid,
+                url: res.data.publicUrl,
+                fid: res.data.fid
+              })
+              uploadajax(option)
+            } else {
+              _this.$message({
+                type: 'warning',
+                message: '未上传成功！请刷新界面重新上传！'
+              })
+            }
+          })
+          .catch(function (error) {
+            _this.$message({
+              type: 'warning',
+              message: '未上传成功！请重新上传！'
+            })
+          })
+      },
+      // 判断附件是否上传成功
+      attachissuccess() {
+        if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+          for (let i = 0; i < this.$refs.refuploadattach.uploadFiles.length; i++) {
+            if (this.$refs.refuploadattach.uploadFiles[i].status !== 'success') {
+              return false
+            }
+          }
+        }
+        return true
+      },
+      getattachissuccess() {
+        this.SubfileForm.FileUrl = ''
+        if (this.$refs.refuploadattach.uploadFiles && this.$refs.refuploadattach.uploadFiles.length > 0) {
+          for (let i = 0; i < this.$refs.refuploadattach.uploadFiles.length; i++) {
+            if (this.$refs.refuploadattach.uploadFiles[i].status === 'success') {
+              for (let j = 0; j < this.waituploads.length; j++) {
+                if (this.waituploads[j].uid === this.$refs.refuploadattach.uploadFiles[i].uid) {
+                  this.SubfileForm.FileUrl =
+                    `${this.waituploads[j].url}/${this.waituploads[j].fid}|${this.$refs.refuploadattach.uploadFiles[i].name}`
+                  this.SubfileForm.FileName = `${this.$refs.refuploadattach.uploadFiles[i].name}`
+                }
+              }
+            }
+          }
+        }
+      },
+      clickachment(url, uid) {
+        window.open(`http://${url}`)
+      },
+      deletefile() {
+        let _this = this
+        _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            _this.doclist = []
+          })
+          .catch(() => {})
+      },
+
+      seachdata() {
+        this.initData()
+      },
+      jstimehandle(val) {
+        if (val === '') {
+          return '----'
+        } else if (val === '0001-01-01T00:00:00Z') {
+          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)
+        }
+      },
+    }
+  }
+
+</script>
+
+<style lang='scss'>
+  .attach-uploader .el-upload {
+    border: 1px dashed #63B8FF;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    // margin-bottom: -17px;
+    margin-top: -15px;
+    margin-left: 20px
+  }
+
+  .attach-uploader .el-upload:hover {
+    border-color: #228B22;
+  }
+
+  .attach-uploader-icon {
+    font-size: 25px;
+    color: #63B8FF;
+    width: 50px;
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+  }
+
+  .attach-uploader-icon:hover {
+    color: #228B22;
+  }
+
+</style>

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

@@ -6,12 +6,11 @@
         <el-button style="float: right; padding: 3px 0" type="text" @click="showDialog">添加</el-button>
       </div>
       <el-table :data="businessList" border>
-        <el-table-column label="操作" width="70" align="center" fixed>
+        <el-table-column label="操作" width="150" align="center" fixed>
           <template slot-scope="scope">
-            <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)">
-            </el-button>
-            <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
-              @click="deletedata(scope.row)"></el-button>
+            <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
+            <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"
+              @click="deletedata(scope.row)">删除</el-button>
           </template>
         </el-table-column>
         <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>

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

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-table :data="equipmentList" border>
-      <el-table-column label="操作" width="70" align="center" fixed>
+      <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
-          <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)"></el-button>
-          <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
-            @click="deletedata(scope.row)"></el-button>
+          <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
+            <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"
+              @click="deletedata(scope.row)">删除</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="MainEquipment" label="设备名称" show-overflow-tooltip></el-table-column>

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

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-table :data="patentList" border :stripe="true">
-      <el-table-column label="操作" width="70" align="center" fixed>
+      <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
-          <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)"></el-button>
-          <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
-            @click="deletedata(scope.row)"></el-button>
+          <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
+          <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px" @click="deletedata(scope.row)">
+            删除</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="Name" label="名称" show-overflow-tooltip>

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

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-table :data="performanceList" border>
-      <el-table-column label="操作" width="70" align="center" fixed>
+      <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
-          <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)"></el-button>
-          <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
-            @click="deletedata(scope.row)"></el-button>
+          <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
+          <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px" @click="deletedata(scope.row)">
+            删除</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="ProjectName" label="设备名称" show-overflow-tooltip></el-table-column>
@@ -207,8 +207,8 @@
             console.error(err)
           })
       },
-      deletedata(val){
-         let _this = this;
+      deletedata(val) {
+        let _this = this;
         _this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

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

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-table :data="subfileList" border>
-      <el-table-column label="操作" width="70" align="center" fixed>
+      <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
-          <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)"></el-button>
-          <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
-            @click="deletedata(scope.row)"></el-button>
+          <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
+          <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px" @click="deletedata(scope.row)">
+            删除</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="NeedFileType" label="文件分类" show-overflow-tooltip></el-table-column>

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

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-table :data="winningList" border :stripe="true">
-      <el-table-column label="操作" width="70" align="center" fixed>
+      <el-table-column label="操作" width="150" align="center" fixed>
         <template slot-scope="scope">
-          <el-button type="text" title="编辑" size="small" icon="el-icon-edit" @click="openDialog(scope.row)"></el-button>
-          <el-button size="small" type="text" style="margin-left:3px" icon="el-icon-delete" title="删除"
-            @click="deletedata(scope.row)"></el-button>
+          <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)">编辑</el-button>
+          <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px" @click="deletedata(scope.row)">
+            删除</el-button>
         </template>
       </el-table-column>
       <el-table-column prop="AwardName" label="奖项名称" show-overflow-tooltip></el-table-column>

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

@@ -455,7 +455,7 @@
 
         <el-tab-pane label="准入审批意见">
           <auditbus-list ref="auditbusList" :data="auditbusList" :SupplierCertId="certId" :SupplierId="serviceId"
-            :SubClassId="classId" height="360px" style="margin-top: 20px"></auditbus-list>
+            :SupplierTypeCode="classId" height="360px" style="margin-top: 20px"></auditbus-list>
         </el-tab-pane>
 
         <el-tab-pane label="流程查看">
@@ -516,7 +516,7 @@
 
         serviceId: '',
         certId: '',
-        classId: '2',
+        classId: '03',
 
         formData: {
           Id: '',