提交审批的检查，移到后台

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

@@ -447,4 +447,28 @@ type OilSupplierInte struct {
 const (
 	// 管理单位
 	MGRUNIT string = "大港油田分公司"
+	BIDDING_BOOK_NAME string = "中标通知书"
+
+	// 企业信息-级别
+	GRADE_1 string = "一级"
+	// 企业信息-级别
+	GRADE_2 string = "二级"
+
+	// 准入物资-级别
+	GOODS_LEVEL_1 string = "1"
+	// 准入物资-级别
+	GOODS_LEVEL_2 string = "2"
+
+	// 准入方式
+	IN_STYPE_REVIEW string = "1" // 评审准入
+	IN_STYPE_GOODS_LEVEL_1 string = "2" // 一级物资备案准入
+	IN_STYPE_GOODS_LEVEL_2 string = "3" // 二级物资备案准入
+	IN_STYPE_STRATEGIC string = "4" // 战略合作准入
+	IN_STYPE_PLURALISM string = "5" // 内部多元准入
+	IN_STYPE_BIDDING string = "6" // 招标准入
+
+	//准入类型 SupplierTypeCode
+	SUPPLIER_TYPE_GOODS string = "01" // 物资类
+	SUPPLIER_TYPE_BASIC string = "02" // 基建类
+	SUPPLIER_TYPE_TECHNOLOGY string = "03" // 技术服务类
 )

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertService.go

@@ -1,6 +1,10 @@
 package suppliercert
 
 import (
+	"dashoo.cn/backend/api/business/oilsupplier/supplier"
+	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
+	"dashoo.cn/backend/api/business/oilsupplier/supplierscenefile"
+	baseparameter "dashoo.cn/business2/parameter"
 	"strconv"
 	"strings"
 
@@ -154,3 +158,72 @@ func (s *OilSupplierCertService) GetAuditUserByNoLogin(organizeId string, entiti
 	s.DBE.SQL(sql).Find(entitiesPtr)
 	return
 }
+
+
+func (s *OilSupplierCertService) IsSupplierCertCanSubmit (supplierId, supplierCertId string) bool {
+	//获取主表信息
+	var supplierEntity supplier.OilSupplier
+	supplierService := supplier.GetOilSupplierService(s.DBE)
+	supplierService.GetEntityById(supplierId, &supplierEntity)
+	//获取准入信息表
+	var supplierCertEntity OilSupplierCert
+	s.GetEntityById(supplierCertId, &supplierCertEntity)
+
+	//对准入范围的判断
+	var certSubList []suppliercertsub.OilSupplierCertSub
+	certsubService := suppliercertsub.GetOilSupplierCertSubService(s.DBE)
+	certsubService.GetListByCertId(supplierCertId, &certSubList)
+
+	if len(certSubList) <= 0 {
+		panic("准入范围不能为空！")
+	}
+
+	if supplierEntity.Grade == supplier.GRADE_2 {
+		for _, certSubItem := range certSubList {
+			if certSubItem.GoodsLevel == supplier.GOODS_LEVEL_1 {
+				panic("二级供应商不能准入一级物资！")
+			}
+		}
+	}
+
+	//请上传现场考察报告
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	isInvestigate := paramSvc.GetBaseparameterMessage("GFGL1", "paramset", "isInvestigate")
+	if isInvestigate == "true" &&
+		supplierCertEntity.Type == supplier.SUPPLIER_TYPE_GOODS &&  //当前只有物资类才可上传现场考察报告
+		supplierEntity.OperType == "代理商" &&
+		supplierCertEntity.InStyle != supplier.IN_STYPE_GOODS_LEVEL_1 {
+
+		scenefileService := supplierscenefile.GetSupplierScenefileService(utils.DBE)
+		scenefileEntity := scenefileService.GetSceneFileList( strconv.Itoa(supplierEntity.Id) )
+		if len(scenefileEntity.FileUrl) <= 0 {
+			panic("请上传现场考察报告！")
+		}
+	}
+
+	//对准入资质的判断
+	supplierFileService := supplierfile.GetSupplierfileService(utils.DBE)
+	supplierFiles := supplierFileService.GetListBySupplierId( strconv.Itoa(supplierEntity.Id) )
+	needBiddingBook := false
+	hasBiddingBook := false
+	if supplierCertEntity.InStyle == supplier.IN_STYPE_BIDDING {
+		needBiddingBook = true // 招标准入需提供中标通知书
+	}
+	for _, fileItem := range supplierFiles {
+		/* if fileItem.FileType == "1" { // 1:必须上传的文件, 0:非必须上传
+		} */
+		if fileItem.NeedFileType == supplier.BIDDING_BOOK_NAME {
+			hasBiddingBook = true
+		}
+		if len(fileItem.FileUrl) <= 0 {
+			panic("请上传文件 [" + fileItem.NeedFileType + "] ！")
+		}
+	}
+
+	//其它判断
+	if needBiddingBook && !hasBiddingBook {
+		panic("招标准入需提供中标通知书 ！")
+	}
+
+	return true
+}

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

@@ -84,4 +84,9 @@ func (s *OilSupplierCertSubService) GetWaitAuditBusinesslist(pageIndex, itemsPer
 		}
 	}
 	return total, List
+}
+
+func (s *OilSupplierCertSubService) GetListByCertId (certId string, supplierCertSubs *[]OilSupplierCertSub) {
+	queryWhere := "SupplierCertId='" + certId + "'"
+	s.GetEntitysByWhere("OilSupplierCertSub", queryWhere, supplierCertSubs)
 }

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

@@ -111,4 +111,10 @@ func (s *SupplierfileService) CheckIsManuf(id string) (IsManufacturer string) {
 	IsManufacturer = strconv.Itoa(entity.IsManufacturer)
 
 	return IsManufacturer
+}
+//查看是否为制造商
+func (s *SupplierfileService) GetListBySupplierId(SupplierId string) (entitys []OilSupplierFile) {
+	queryWhere := "SupplierId='" + SupplierId + "'"
+	s.GetEntityByWhere("OilSupplierFile", queryWhere, entitys)
+	return entitys
 }

src/dashoo.cn/backend/api/business/oilsupplier/supplierscenefile/supplierscenefileService.go

@@ -13,4 +13,10 @@ func GetSupplierScenefileService(xormEngine *xorm.Engine) *SupplierScenefileServ
 	s := new(SupplierScenefileService)
 	s.DBE = xormEngine
 	return s
+}
+
+func (s *SupplierScenefileService) GetSceneFileList(supplierId string) (model OilSupplierSceneFile) {
+	where := "SupplierId=" + supplierId
+	s.GetEntity(&model, where)
+	return  model
 }

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

@@ -599,6 +599,34 @@ func (this *OilSupplierCertController) DeleteEntity() {
 		this.ServeJSON()
 	}
 }
+// @Title 启动工作流前，检查准入申请填入的项目是否完整，是否可提交
+// @Description 检查准入申请填入的项目是否完整
+// @Success	200	{object} ErrorDataInfo
+// @router /check-suppliercert-submit/:id [post]
+func (this *OilSupplierCertController) CheckSupplierCertCanSubmit() {
+	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)
+	var supplierCertEntity suppliercert.OilSupplierCert
+	certSrv.GetEntityById(certId, &supplierCertEntity)
+	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.Id), certId)
+}
 
 // @Title 企业用户提交按钮  --启动工作流
 // @Description 企业用户提交按钮
@@ -633,10 +661,12 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, &supplierCertEntity)
+	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.Id), certId)
 
 	//取出企业主表
 	supplierSvc := supplier.GetOilSupplierService(utils.DBE)
 	var supplierEntity supplier.OilSupplier
+	//检查是否可提交
 	supplierSvc.GetEntityById(supplierCertEntity.SupplierId, &supplierEntity)
 
 	status, _ := strconv.Atoi(supplierCertEntity.Status)
@@ -722,20 +752,12 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
 	certSrv.GetEntityById(certId, &supplierCertEntity)
+	//检查是否可提交
+	certSrv.IsSupplierCertCanSubmit(strconv.Itoa(supplierCertEntity.Id), certId)
 	//取出企业主表
 	supplierSvc := supplier.GetOilSupplierService(utils.DBE)
 	var supplierEntity supplier.OilSupplier
 	supplierSvc.GetEntityById(supplierCertEntity.SupplierId, &supplierEntity)
-	// 取准入范围列表
-
-	//certSubSrv := suppliercertsub.GetOilSupplierCertSubService(utils.DBE)
-	//var supplierCertSubList []suppliercertsub.OilSupplierCertSub
-	//where := "SupplierCertId='" + strconv.Itoa(supplierCertEntity.Id) + "'"
-	//certSubSrv.GetEntity(&supplierCertSubList, where)
-	//if len(supplierCertSubList) <= 0 {
-	//	panic("准入范围不能为空！")
-	//}
-
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	//启动工作流

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

@@ -148,7 +148,6 @@ func (this *SupplierfileController) FileList() {
 		where=where +" and NeedFileType in ("+str[0:len(str)-1]+")"
 	}
 
-
 	total := svc.GetPagingEntitiesWithoutAccCode(page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list

src/dashoo.cn/frontend_web/src/api/oilsupplier/suppliercert.js

@@ -51,6 +51,12 @@ export default {
       method: 'delete'
     })
   },
+  checkSupplierCertCanSubmit (entityId, myAxios) {
+    return myAxios({
+      url: '/suppliercert/check-suppliercert-submit/' + entityId,
+      method: 'post'
+    })
+  },
   firstAuditEntity (entityId, params, myAxios) {
     return myAxios({
       url: '/suppliercert/company-audit/' + entityId,

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

@@ -4,10 +4,6 @@
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()"
-                     v-if="canadd && IsCompanyUser == 0">
-          提交审批
-          </el-button>
            <el-button style="float: right; padding: 3px 0px" type="text" @click="deletedata()" v-if="candelete">删除</el-button>
           <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加
           </el-button>
@@ -244,12 +240,9 @@
         } else {
         }
       },
-      commitAudit () {
-        this.$emit('commitAudit')
-      },
       handleSelectionChange (val) {
         this.Ids = []
-        for (var i = 0; i < val.length; i++) {
+        for (let i = 0; i < val.length; i++) {
           this.Ids.push(val[i].Id)
         }
       },

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

@@ -1,787 +0,0 @@
-<template>
-  <div>
-    <el-card class="box-card">
-      <div slot="header"
-           class="clearfix">
-        <span style="font-weight: bold">准入范围</span>
-        <span style="float: right;">
-          <el-button style="float: right; padding: 3px 0px"
-                     type="text"
-                     @click="deletedata()"
-                     v-if="candelete">删除</el-button>
-          <el-button style="float: right; padding: 3px 25px"
-                     type="text"
-                     @click="showDialog"
-                     v-if="canadd || newcanadd">添加</el-button>
-          <!-- <el-button style="float: right; padding: 3px 0px"
-                     type="text"
-                     @click="setManufacturer(2)"
-                     >设置制造商1</el-button>
-          <el-button style="float: right; padding: 3px 25px"
-                     type="text"
-                     @click="setManufacturer(1)"
-                     >设置非制造商</el-button> -->
-
-        </span>
-      </div>
-      <el-table :data="goodsList"
-                v-loading="tableloading"
-                element-loading-text="正在更改请稍后..."
-                border
-                size="mini"
-                height="calc(100vh - 445px)"
-                @selection-change="handleSelectionChange">
-        <el-table-column type="selection"
-                         width="55">
-        </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="GoodsLevel"
-                         label="级别" width="80px"
-                         show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="scope.row.GoodsLevel=='1'">一级</span>
-            <span v-if="scope.row.GoodsLevel=='2'">二级</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="right" width="245">
-          <template slot="header" slot-scope="scope">
-          <!-- <el-input v-model="search" size="mini" placeholder="输入关键字搜索"/> -->
-            <el-button-group :disabled="isDisabledBtn()">
-              <el-button type="primary" size="mini" @click="setManufacturer(1)">制造商</el-button>
-              <el-button type="primary" size="mini" @click="setManufacturer(2)">非制造商</el-button>
-            </el-button-group>
-          </template>
-
-          <template slot-scope="scope">
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">非制造商</el-button>
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">制造商</el-button>
-          </template>
-        </el-table-column>
-        <!-- <el-table-column label="是否为制造商" width="105">
-          <template slot-scope="scope">
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">非制造商</el-button>
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">制造商</el-button>
-          </template>
-        </el-table-column> -->
-        <el-table-column prop="CertSubStatus"
-                         label="状态"
-                         show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="scope.row.CertSubStatus=='1'"
-                  style="color:#67C23A">准入</span>
-            <span v-else-if="scope.row.CertSubStatus>'1'"
-                  style="color:#E6A23C">暂停</span>
-            <span v-else>——</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="Remark"
-                         label="备注"
-                         show-overflow-tooltip></el-table-column>
-
-        <el-table-column label="操作"
-                         width="90"
-                         align="center"
-                         fixed>
-          <template slot-scope="scope">
-            <el-button type="primary"
-                       plain
-                       size="mini"
-                       title="删除"
-                       style="margin-left:3px"
-                       @click="deletedata(scope.row)"
-                       :disabled="!candelete">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-        <el-pagination @size-change="handleSizeChange"
-                     @current-change="handleCurrentChange"
-                     :current-page="currentPage"
-                     :page-sizes="[10, 50, 100, 200, 400]"
-                     :page-size="size"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     :total="currentItemCount">
-      </el-pagination>
-    </el-card>
-
-    <el-dialog v-loading="loading"
-               element-loading-text="正在添加请稍后..."
-               title="物资类业务列表"
-               :visible.sync="goodsDialog"
-               @open="opendialog"
-               top="5vh">
-      <el-tabs v-model="tabIdx"
-               style="margin-top: -30px;">
-        <el-tab-pane label="准入编码"
-                     name="1">
-          <el-row>
-            <el-col :span="12">
-              <el-input v-if="!switchstatus"
-                        v-model="filterText"
-                        placeholder="请输入名称或代码"
-                        size="mini"
-                        style="width: 250px;"></el-input>
-              <el-input v-if="switchstatus"
-                        v-model="searchText"
-                        placeholder="请输入名称或代码"
-                        size="mini"
-                        style="width: 250px;"></el-input>
-              <el-button style="float: right;"
-                         type="primary"
-                         size="mini"
-                         @click="getsectreelist()"
-                         :disabled="!switchstatus">查询</el-button>
-              <el-switch v-model="switchstatus"
-                         size="mini"></el-switch>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-row :gutter="20"
-                      style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
-                <el-col :span="20">
-                  <el-tree v-show="!switchstatus"
-                           highlight-current
-                           :expand-on-click-node="true"
-                           node-key="CodeName"
-                           :data="orgtreelist"
-                           :props="orgtreeprops"
-                           ref="orgmanagetree"
-                           check-on-click-node
-                           show-checkbox
-                           lazy
-                           :load="getChildrens"
-                           :filter-node-method="filterNode">
-                  </el-tree>
-                  <el-tree v-show="switchstatus"
-                           ref="secmanagetree"
-                           :data="sectreelist"
-                           show-checkbox
-                           check-on-click-node
-                           node-key="CodeName"
-                           :props="sectreeprops">
-                  </el-tree>
-                </el-col>
-              </el-row>
-              <el-row style="margin-top: 30px">
-                备注信息：
-                <el-col :span="24">
-                  <el-input v-model="Remark"
-                            type="textarea"
-                            :rows=3
-                            placeholder="请输入备注信息"></el-input>
-                </el-col>
-              </el-row>
-            </el-col>
-            <el-col :span="12">
-              <el-table
-                :data="tableData"
-                border
-                size="mini"
-                style="width: 100%">
-                <el-table-column
-                  prop="name"
-                  label="准入编码">
-                </el-table-column>
-                <el-table-column
-                  prop="address"
-                  label="缺少的资质">
-                </el-table-column>
-              </el-table>
-            </el-col>
-          </el-row>
-
-
-        </el-tab-pane>
-
-        <!--<el-tab-pane label="顶级编码"-->
-                     <!--name="2">-->
-          <!--<el-form ref="form"-->
-                   <!--:inline="true"-->
-                   <!--style="float: left;margin-top:-7px">-->
-            <!--<el-form-item label="">-->
-              <!--<el-input size="mini"-->
-                        <!--style="width: 245px;"-->
-                        <!--v-model="keyword"-->
-                        <!--placeholder="请输入名称或代码"></el-input>-->
-            <!--</el-form-item>-->
-          <!--</el-form>-->
-          <!--<span style="float: left">-->
-            <!--<el-button type="primary"-->
-                       <!--size="mini"-->
-                       <!--style="margin-left:10px;"-->
-                       <!--@click="initData2019()">查询-->
-            <!--</el-button>-->
-            <!--<el-button type="primary"-->
-                       <!--size="mini"-->
-                       <!--style="margin-left:10px;"-->
-                       <!--@click="goodsDialog = false">-->
-              <!--取消</el-button>-->
-          <!--</span>-->
-
-          <!--<el-table :data="goodsList2019"-->
-                    <!--border-->
-                    <!--size="mini"-->
-                    <!--@selection-change="handleSelectionChangeCert">-->
-            <!--<el-table-column type="selection"-->
-                             <!--width="55">-->
-            <!--</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>-->
-          <!--<el-pagination @size-change="handleSizeChangeCert"-->
-                         <!--@current-change="handleCurrentChangeCert"-->
-                         <!--:current-page="currentPageCert"-->
-                         <!--:page-sizes="[10, 15, 20, 25]"-->
-                         <!--:page-size="sizeCert"-->
-                         <!--layout="total, sizes, prev, pager, next, jumper"-->
-                         <!--:total="currentItemCountCert">-->
-          <!--</el-pagination>-->
-          <!--<el-form label-width="80px"-->
-                   <!--label-position="top">-->
-            <!--<el-form-item label="备注信息">-->
-              <!--<el-input size="mini"-->
-                        <!--type="textarea"-->
-                        <!--style="width:100%"-->
-                        <!--v-model="Remark1"></el-input>-->
-            <!--</el-form-item>-->
-
-          <!--</el-form>-->
-
-        <!--</el-tab-pane>-->
-      </el-tabs>
-      <div slot="footer"
-           class="dialog-footer"
-           v-if="tabIdx==1">
-        <!--<el-button size="mini" @click="visible = false">取 消</el-button>-->
-        <el-button type="primary"
-                   size="mini"
-                   @click="getChecklist()">确 定</el-button>
-      </div>
-       <!--<div slot="footer"-->
-           <!--class="dialog-footer"-->
-           <!--v-if="tabIdx==2">-->
-        <!--<el-button type="primary"-->
-                   <!--size="mini"-->
-                   <!--@click="addBusiness1()">确 定</el-button>-->
-      <!--</div>-->
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  mapGetters
-} from 'vuex'
-
-export default {
-  name: 'GoodsList',
-  components: {},
-  props: {
-    operType: {
-      type: String,
-      default: ''
-    },
-    canadd: {
-      type: Boolean,
-      default: false
-    },
-    newcanadd: {
-      type: Boolean,
-      default: false
-    },
-    candelete: {
-      type: Boolean,
-      default: false
-    },
-    Grade: {
-      type: String,
-      default: ''
-    }
-  },
-  created () {
-    this.initData2019()
-  },
-  /*
-  computed: {
-    ...mapGetters({
-      session: 'session'
-    })
-  }, */
-  watch: {
-    filterText (val) {
-      this.$refs.orgmanagetree.filter(val)
-    }
-  },
-  data () {
-    return {
-      loading: false,
-      tableloading: false,
-      keyword: '',
-      Ids: [],
-      SupplierId: 0,
-      SupplierTypeCode: '',
-      SupplierCertId: 0,
-      tabIdx: '1',
-      sectionCert: [],
-      goodsList2019: [],
-      goodsList: [],
-      goodsDialog: false,
-      switchstatus: false,
-      orgtreelist: [],
-      sectreelist: [],
-      orgtreeprops: {
-        value: 'Id',
-        label: 'CodeName',
-        GoodsLevel: 'GoodsLevel',
-        children: 'children',
-        isLeaf: 'Leaf',
-        disabled: 'disabled'
-      },
-      sectreeprops: {
-        children: 'children',
-        label: 'CodeName',
-        disabled: 'disabled'
-      },
-      checkList: [],
-      Remark: '',
-      Remark1: '',
-
-      filterText: '',
-      searchText: '',
-      visible: false,
-      selfVisible: this.visible, // 避免vue双向绑定警告
-      currentPage: 1, // 分页
-      size: 10,
-      currentItemCount: 0,
-      currentPageCert: 1, // 分页
-      sizeCert: 10,
-      currentItemCountCert: 0,
-      flagId: 0, // 标记是否第一次点击
-      isFirstOpen: true,
-      node_had: {},
-      resolve_had: {},
-      tableData: [{
-        name: '06010101普通合页',
-        address: '生产许可证'
-      }, {
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1517 弄'
-      }, {
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1519 弄'
-      }, {
-        name: '王小虎',
-        address: '上海市普陀区金沙江路 1516 弄'
-      }]
-    }
-  },
-  methods: {
-    isDisabledBtn () {
-      if (this.operType !== '制造商') {
-        return true
-      } else {
-        if (this.canadd || this.newcanadd) {
-          return false
-        } else {
-          return true
-        }
-      }
-    },
-    opendialog () {
-      if (!this.isFirstOpen) {
-        this.node_had.childNodes = []
-        this.getChildrens(this.node_had, this.resolve_had)
-      }
-    },
-    initData2019 () {
-      let params = {
-        _currentPage: this.currentPageCert,
-        _size: this.sizeCert,
-        Name: this.keyword
-      }
-      this.$axios.get('suppliercertsub/listCert2019', { params })
-        .then(res => {
-          this.goodsList2019 = res.data.items
-          this.currentItemCountCert = res.data.currentItemCount
-        })
-        .catch(err => {
-          console.error(err)
-        })
-    },
-    type_change (val, canadd, newcanadd) {
-      if (canadd == true || newcanadd == true) {
-        if (val.IsManufacturer == 2) {
-          this.tableloading = true
-          let IsManufacturer = 2
-          this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.Id) + '/' + parseInt(val.SupplierId) + '/' + IsManufacturer + '', {}).then(res => {
-            if (res.data.code === 0) {
-              this.$message({
-                type: 'success',
-                message: '更改成功'
-              })
-              this.initData()
-              this.tableloading = false
-            } else if (res.data.code === -2) {
-              this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-              this.initData()
-              this.tableloading = false
-            }
-          })
-            .catch(err => {
-              console.error(err)
-            })
-        } else if (val.IsManufacturer == 1) { // ---------------转换供应商与非供应商
-          this.tableloading = true
-          let IsManufacturer = 1
-          this.$axios.get('suppliercertsub/updatemanufacturer/' + parseInt(val.Id) + '/' + parseInt(val.SupplierId) + '/' + IsManufacturer + '', {}).then(res => {
-            if (res.data.code === 0) {
-              this.$message({
-                type: 'success',
-                message: '更改成功'
-              })
-              this.initData()
-              this.tableloading = false
-            } else if (res.data.code === -2) {
-              this.$message({
-                type: 'warning',
-                message: res.data.message
-              })
-              this.initData()
-              this.tableloading = false
-            }
-          })
-            .catch(err => {
-              console.error(err)
-            })
-        }
-      }
-    },
-    changeCertSubStatus (row, column, cell, event) {
-      if (this.newcanadd && column.property === 'CertSubStatus') {
-        this.$confirm('确定更改此准入范围状态吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then((res) => {
-          this.$axios.get('suppliercertsub/updatestatus/' + row.Id + '/' + row.CertSubStatus + '', {}).then(res => {
-            if (res.data.code === 0) {
-              this.$message({
-                type: 'success',
-                message: '更改成功'
-              })
-              this.initData()
-            }
-          }).catch(err => {
-            console.error(err)
-          })
-        }).catch(() => {
-        })
-      } else {
-      }
-    },
-    handleSelectionChange (val) {
-      this.Ids = []
-      for (var i = 0; i < val.length; i++) {
-        this.Ids.push(val[i].Id)
-      }
-    },
-    handleSelectionChangeCert (val) {
-      this.sectionCert = val
-    },
-    getvalue (SupplierId, SupplierTypeCode, certId) {
-      console.log('走的这个value')
-      this.SupplierId = SupplierId
-      this.SupplierTypeCode = SupplierTypeCode
-      this.SupplierCertId = certId
-      this.initData()
-    },
-    initData () {
-      let _this = this
-      const params = {
-        SupplierCertId: this.SupplierCertId,
-        SupplierTypeCode: this.SupplierTypeCode,
-        _currentPage: this.currentPage,
-        _size: this.size
-      }
-      this.$axios.get('suppliercertsub/list', {
-        params
-      })
-        .then(res => {
-          _this.goodsList = res.data.items
-          _this.currentItemCount = res.data.currentItemCount
-          _this.$emit('close')
-        })
-        .catch(err => {
-          console.error(err)
-        })
-    },
-    getChecklist () {
-      let val1 = this.$refs.orgmanagetree.getCheckedNodes()
-      let val2 = this.$refs.secmanagetree.getCheckedNodes()
-      this.checkList = []
-      for (let i = 0; i < val1.length; i++) {
-        if (val1[i].Code.length == 8) {
-          this.checkList.push(val1[i])
-        }
-      }
-      for (let i = 0; i < val2.length; i++) {
-        if (val2[i].Code.length == 8) {
-          this.checkList.push(val2[i])
-        }
-      }
-      this.addBusiness()
-      this.switchstatus = false
-    },
-    addBusiness () {
-      let _this = this
-      let params = {
-        SupplierId: parseInt(_this.SupplierId),
-        SupplierCertId: parseInt(_this.SupplierCertId),
-        SupplierTypeCode: '01',
-        Type: '1',
-        IsManufacturer: 2,
-        CertSubStatus: '-1',
-        Remark: _this.Remark
-      }
-      if (_this.checkList.length > 0) {
-        params = Object.assign(params, {
-          CheckList: _this.checkList
-        })
-      } else {
-        _this.$message({
-          type: 'warning',
-          message: '名称不能为空，请选择分类！'
-        })
-        return
-      }
-      _this.loading = true
-      _this.$axios.post('/suppliercertsub/add-goods-certsub-filter', params)
-        .then(res => {
-          if (res.data.code === 0) {
-            _this.$message({
-              type: 'success',
-              message: res.data.message
-            })
-            _this.goodsDialog = false
-            _this.loading = false
-            _this.initData()
-          } else {
-            _this.loading = false
-            _this.$message({
-              type: 'warning',
-              message: '操作失败！'
-            })
-          }
-        })
-        .catch(err => {
-          console.error(err)
-        })
-      this.$refs.orgmanagetree.setCheckedKeys([])
-      this.$refs.secmanagetree.setCheckedKeys([])
-      this.filterText = ''
-      this.searchText = ''
-    },
-    deletedata (val) {
-      if (val != null && val != '') {
-        this.Ids = []
-        this.Ids.push(val.Id)
-      }
-
-      if (this.Ids.length == 0) {
-        this.$message({
-          type: 'warning',
-          message: '请先选择删除条目'
-        })
-        return
-      }
-
-      let _this = this
-      _this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          const delload = this.$loading({
-            lock: true,
-            text: '正在删除请稍后...'
-          })
-            let params = {
-              SupplierId: parseInt(_this.SupplierId),
-              SupplierTypeCode: '01'
-            }
-          _this.$axios.delete('suppliercertsub/businessdelete/' + this.Ids.join(), {params})
-            .then(function (response) {
-              if (response.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: response.data.message
-                })
-                delload.close()
-                _this.Ids = []
-                _this.initData()
-              } else {
-                delload.close()
-                _this.Ids = []
-                _this.$message({
-                  type: 'warning',
-                  message: response.data.message
-                })
-              }
-            })
-            .catch(function (error) {
-              console.log(error)
-            })
-        })
-        .catch(() => {
-          _this.Ids = []
-        })
-    },
-    setManufacturer (index) {
-      if (this.Ids.length == 0) {
-        this.$message({
-          type: 'warning',
-          message: '请先选择设置的条目'
-        })
-        return
-      }
-      let _this = this
-      _this.$confirm('是否确定此操作, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          const delload = this.$loading({
-            lock: true,
-            text: '正在设置请稍后...'
-          })
-          let postData = {
-            CertSubIdList: [],
-            SupplierId: parseInt(this.SupplierId),
-            SupplierCertId: parseInt(this.SupplierCertId),
-            IsManufacturer: index
-          }
-          _this.$axios.post('suppliercertsub/modify-manufacturer/' + this.Ids.join(), postData)
-            .then(function (response) {
-              if (response.data.code === 0) {
-                _this.$message({
-                  type: 'success',
-                  message: response.data.message
-                })
-                delload.close()
-                _this.Ids = []
-                _this.initData()
-              } else {
-                delload.close()
-                _this.Ids = []
-                _this.$message({
-                  type: 'warning',
-                  message: response.data.message
-                })
-              }
-            })
-            .catch(function (error) {
-              console.log(error)
-            })
-        })
-        .catch((ex) => {
-          console.error(ex)
-          _this.Ids = []
-        })
-    },
-    showDialog () {
-      // this.getorgtreelist()
-      this.goodsDialog = true
-    },
-    getsectreelist () {
-      let _this = this
-      let name = _this.searchText
-      this.$axios.get('goodsaptitude/goodsparentlist/' + name)
-        .then(res => {
-          _this.sectreelist = window.toolfun_gettreejson(res.data.items, 'Id', 'ParentId', 'Id,Code,Name,CodeName,GoodsLevel')
-        })
-        .catch(err => {
-          console.error(err)
-        })
-    },
-    // 获取下一级所有分类
-    getChildrens (val, resolve) {
-      if (this.isFirstOpen) {
-        this.node_had = val
-        this.resolve_had = resolve
-        this.isFirstOpen = false
-      }
-
-      let Id = 0
-      if (val.level === 0) {
-        Id = 0
-      } else {
-        Id = val.data.Id
-      }
-      let params = {
-        GoodsLevel: this.Grade
-      }
-      this.$axios.get('goodsaptitude/goodschildlistbypid/' + Id, {params})
-        .then(res => {
-          if (!res.data.items || res.data.items.length <= 0) {
-            val.isLeaf = true
-            return resolve([])
-          }
-          for (let idx in res.data.items) {
-            if (res.data.items[idx].Code.length <= 4) {
-              res.data.items[idx].disabled = true
-            }
-            res.data.items[idx].Leaf = res.data.items[idx].Leaf === '1'
-          }
-          return resolve(res.data.items)
-        })
-        .catch(err => {
-          console.error(err)
-        })
-    },
-    filterNode (value, data) {
-      if (!value) return true
-      return data.CodeName.indexOf(value) !== -1
-    },
-    handleSizeChange (value) {
-      this.size = value
-      this.currentPage = 1
-      this.initData()
-    },
-    handleCurrentChange (value) {
-      this.currentPage = value
-      this.initData()
-    },
-    handleSizeChangeCert (value) {
-      this.sizeCert = value
-      this.currentPageCert = 1
-      this.initData2019()
-    },
-    handleCurrentChangeCert (value) {
-      this.currentPageCert = value
-      this.initData2019()
-    }
-  }
-}
-</script>
-
-<style>
-  .el-pagination {
-    margin: 1rem 0 2rem;
-    text-align: right;
-  }
-</style>

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

@@ -500,9 +500,6 @@
         } else {
         }
       },
-      commitAudit () {
-        this.$emit('commitAudit')
-      },
       handleSelectionChange (val) {
         this.Ids = []
         for (var i = 0; i < val.length; i++) {

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

@@ -1,918 +0,0 @@
-<template>
-  <div>
-    <!--<el-card class="box-card" style="margin-top: 10px;">-->
-      <!--<div slot="header" class="clearfix">-->
-        <!--<span style="font-weight: bold">准入范围</span>-->
-        <!--<el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"-->
-          <!--v-if="canadd && IsCompanyUser == 0">-->
-          <!--提交审批-->
-        <!--</el-button>-->
-        <!--&lt;!&ndash; <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"-->
-          <!--v-if="canadd && IsCompanyUser == 1">-->
-          <!--提交-->
-        <!--</el-button> &ndash;&gt;-->
-      <!--</div>-->
-      <!--<el-table :data="businessList" size="mini" border bordertooltip-effect="dark" height="calc(100vh - 435px)" @selection-change="handleSelectionChange">-->
-        <!--<el-table-column type="selection" width="55"></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="GoodsLevel" label="级别" width="80px" show-overflow-tooltip>-->
-          <!--<template slot-scope="scope">-->
-            <!--<span v-if="scope.row.GoodsLevel=='1'">一级</span>-->
-            <!--<span v-if="scope.row.GoodsLevel=='2'">二级</span>-->
-          <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column-->
-                  <!--label="是否为制造商" width="100" v-if="SupplierTypeCode == '01'">-->
-                  <!--<template slot-scope="scope">-->
-                    <!--<el-tag type="info" v-if="scope.row.IsManufacturer == 2">非制造商</el-tag>-->
-                    <!--<el-tag type="success" v-else-if="scope.row.IsManufacturer == 1">制造商</el-tag>-->
-                    <!--<span v-else>——</span>-->
-                  <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column prop="CertSubStatus" label="状态" show-overflow-tooltip>-->
-            <!--<template slot-scope="scope">-->
-            <!--<span v-if="scope.row.CertSubStatus=='1'"-->
-                  <!--style="color:#67C23A">准入</span>-->
-            <!--<span v-else-if="scope.row.CertSubStatus>'1'"-->
-                  <!--style="color:#E6A23C">暂停</span>-->
-            <!--<span v-else>——</span>-->
-          <!--</template>-->
-        <!--</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, 50, 100, 200, 400]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"-->
-        <!--:total="currentItem_Count">-->
-      <!--</el-pagination>-->
-    <!--</el-card>-->
-
-    <el-card class="box-card" style="margin-top: 10px;">
-      <div slot="header" class="clearfix">
-        <span style="font-weight: bold"> 企业资质</span>
-        <el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
-                   v-if="canadd && IsCompanyUser == 0">
-          提交审批
-        </el-button>
-        <el-button style="float: right; padding: 6px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
-      </div>
-      <el-table :data="subfileList" border size="mini">
-        <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)" :disabled="!canadd && !newcanadd">上传
-            </el-button>
-            <el-button type="primary" plain size="mini" title="删除" style="margin-left:3px"
-              :disabled="(scope.row.FileType == '1' || !canadd) && !newcanadd" @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 label="贸易/制造" v-if="SupplierTypeCode == '01'" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="scope.row.IsManuf=='1'">制造商</span>
-            <span v-else-if="scope.row.IsManuf=='2'">贸易商</span>
-            <span v-else>通用</span>
-        </template>
-        </el-table-column>
-        <el-table-column prop="FileUrlList" label="资质文件" show-overflow-tooltip>
-          <template slot-scope="scope" >
-            <!-- <div v-for="(tmpUrl, index) in scope.row.FileUrlList" :key="index" class="pgotoStyle"> -->
-              <!-- <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary">
-                {{scope.row.FileName.split('$')[index]}}</el-link> -->
-            <viewer :images="scope.row.FileUrlList">
-              <div  v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-
-                <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                  v-if="imgFormat(scope.row.FileUrl, index)"
-                >
-                {{scope.row.FileName.split('$')[index]}}</el-link>
-
-                <img
-                  v-else
-                  class="photoStyle" alt=""
-                  :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
-                  :key="index"
-                 >
-              </div>
-            </viewer>
-          </template>
-        </el-table-column>
-        <el-table-column prop="EffectDate" label="有效日期" show-overflow-tooltip>
-          <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>
-    </el-card>
-
-    <el-dialog :title="Title" :visible.sync="visible" top="5vh" width="900px">
-      <el-form ref="subfileForm" :model="SubfileForm" :rules="rules" label-width="100px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="资质名称" prop="NeedFileType">
-              <!-- <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型"></el-input> -->
-              <el-select v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" :disabled="IsMust">
-                <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="有效日期" prop="EffectDate">
-              <el-date-picker style="width: 100%" v-model="SubfileForm.EffectDate" type="date" placeholder="请选择有效日期" @change="pickerchange">
-              </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="12">
-            <el-form-item label="资质文件">
-             <!-- <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
-                 :on-remove="filremove" :http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload" :file-list="fileList">
-                <i class="el-icon-plus attach-uploader-icon"></i>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">请上传图片（大小为512KB-5MB），可上传多张图片
-                </div>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType ==yasuoname">请上传压缩文件
-                </div>
-              </el-upload>  -->
-              <el-upload
-                :multiple="false" style="margin-top: 10px;" class="attach-uploader"
-                action=""
-                :before-upload="beforeAvatarUpload"
-                :on-preview="handlePictureCardPreview"
-                list-type="picture-card"
-                ref="refuploadattach"
-                :file-list="fileList"
-                :on-remove="filremove"
-                :http-request="uploadrequest"
-                limit = "5"
-                :on-exceed="uploadExceed">
-                <i class="el-icon-plus"></i>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">请上传图片（大小为512KB-5MB），最多可上传五张图片
-                </div>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType ==yasuoname">请上传压缩文件
-                </div>
-              </el-upload>
-            <el-dialog :visible.sync="dialogVisible" :modal="false">
-          <img width="100%" style="z-index:9999" :src="dialogImageUrl" alt="">
-        </el-dialog>
-      </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'
-  import BusinessList from '../../components/oilsupplier/businesslist'
-  import setapi from '@/api/oilsupplier/oilclassorgset'
-  import api from '@/api/oilsupplier/supplierfile'
-  // v-viewer
-  import Vue from 'vue';
-  import Viewer from 'v-viewer'
-  import 'viewerjs/dist/viewer.css'
-  Vue.use(Viewer)
-  Viewer.setDefaults({
-    Options: { 'inline': true, 'button': true, 'navbar': true, 'title': true, 'toolbar': true, 'tooltip': true, 'movable': true, 'zoomable': true, 'rotatable': true, 'scalable': true, 'transition': true, 'fullscreen': true, 'keyboard': true, 'url': 'data-source' }
-  })
-
-  export default {
-    name: 'SubfileList',
-    components: {
-      BusinessList // 准入范围
-    },
-    props: {
-      canadd: {
-        type: Boolean,
-        default: false
-      },
-      newcanadd: {
-        type: Boolean,
-        default: false
-      },
-      flag: {
-        type: String
-      },
-      Grade: {
-        type: String,
-        default: ''
-      },
-      InStyle: {
-        type: String,
-        default: ''
-      },
-      OperType: {
-        type: String,
-        default: ''
-      },
-      isInvestigate: {
-        type: Boolean,
-        default: false
-      }
-    },
-    computed: {
-      ...mapGetters({
-        session: 'session',
-        authUser: 'authUser'
-      }),
-
-
-    },
-    data () {
-      var effectDate = (rule, value, callback) => {
-        if (!value) {
-          callback(new Error('请选择有效日期'))
-        } else {
-          let date = new Date()
-          let nowdata = new Date(date.getFullYear(), date.getMonth(), date.getDate())
-          if (value < nowdata) {
-            callback(new Error('有效日期不能小于当前日期'))
-          } else {
-            callback()
-          }
-        }
-      }
-
-      return {
-        dialogImageUrl: '',
-        dialogVisible: false,
-
-        size: 10,
-        currentPage: 1,
-        currentItem_Count: 0,
-        yasuoname: '',
-        SupplierId: 0,
-        SupplierTypeCode: '',
-        SubClassIds: [],
-        SupplierCertId: 0,
-        IsMust: false,
-        businessList: [],
-        subfileList: [],
-        techList: [],
-        techTreeList: [],
-        fileList: [],
-        orgtreeprops: {
-          value: 'id',
-          label: 'Name',
-          children: 'children'
-        },
-        selectedorg: [],
-
-        Title: '',
-        SubfileForm: {
-          Id: '',
-          SupplierId: '',
-          SupplierTypeCode: '',
-          SupplierCertSubId: '',
-          CertSubName: '',
-          NeedFileType: '',
-          NeedFileCode: '',
-          FileType: '',
-          FileExt: '',
-          FileName: '',
-          EffectDate: new Date(),
-          FileUrl: '',
-          OtherRemark: '',
-          Remark: '',
-          IsDelete: 0,
-          FileUrlList: []
-        },
-        scenefile: {
-          Id: '',
-          SupplierId: '',
-          NeedFileType: '',
-          NeedFileCode: '',
-          FileUrl: '',
-          FileName: '',
-          FileExt: ''
-        },
-        visible: false,
-        selfVisible: this.visible, // 避免vue双向绑定警告
-
-        waituploads: [], // 等待上传的附件列表
-        doclist: [],
-        dynamicTableColumns: [],
-        IsCompanyUser: '',
-        rules: {
-          NeedFileType: [
-            {required: true, message: '资质名称不能为空', trigger: 'blur'}
-          ],
-          EffectDate:
-            [{ required: true, validator: effectDate, trigger: 'change' }]
-        }
-      }
-    },
-    created () {
-      this.getDictOptions()
-      this.initTableHeader()
-      this.IsCompanyUser = this.authUser.Profile.IsCompanyUser
-    },
-    methods: {
-      // 上传超过限制数
-      uploadExceed (files, fileList) {
-        if (fileList.length >= 5) {
-          this.$alert('超出上传照片数，禁止上传', '提示', {
-            confirmButtonText: '确定'
-          })
-        }
-      },
-       handleRemove(file) {
-        console.log(file);
-      },
-      handlePictureCardPreview(file) {
-        this.dialogImageUrl = file.url;
-        this.dialogVisible = true;
-      },
-      handleDownload(file) {
-        console.log(file);
-      },
-
-      pickerchange () {
-        console.log(this.SubfileForm.EffectDate)
-      },
-      getSupplierSceneFile () {
-        let params = {
-          SupplierId: this.SupplierId
-        }
-        this.$axios.get('/supplier/getscenefilelist', {params}).then(res => {
-          this.scenefile = res.data.item
-        })
-      },
-      handleSelectionChange (val) {
-        this.SubClassIds = []
-        for (var i = 0; i < val.length; i++) {
-          this.SubClassIds.push(val[i].SubClassId)
-        }
-        this.initData()
-      },
-      initTableHeader () {
-        if (this.flag == '01') {
-          setapi.initGoodTableHeader(this.$axios).then(res => {
-            this.dynamicTableColumns = res.data.items
-          })
-        } else if (this.flag == '02') {
-          setapi.initBbTableHeader(this.$axios).then(res => {
-            this.dynamicTableColumns = res.data.items
-          })
-        } else {
-          setapi.initTsTableHeader(this.$axios).then(res => {
-            this.dynamicTableColumns = res.data.items
-          })
-        }
-      },
-      getvalue (SupplierId, SupplierTypeCode, certId, inStyle) {
-        this.SupplierId = SupplierId
-        this.SupplierTypeCode = SupplierTypeCode
-        this.SupplierCertId = certId
-        this.InStyle = inStyle
-        this.initData()
-        this.getbusList()
-      },
-      initData () {
-        let _this = this
-        const params = {
-          InStyle: this.InStyle,
-          SupplierId: this.SupplierId,
-          SupplierTypeCode: this.SupplierTypeCode,
-          SubClassIds: this.SubClassIds.join(),
-          _currentPage: 1,
-          _size: 10000
-        }
-        _this.$axios.get('supplierfile/filelist', {
-          params
-        })
-          .then(res => {
-            _this.subfileList = res.data.items
-            _this.currentItemCount = res.data.currentItemCount
-            for (let idx in _this.subfileList) {
-              // _this.subfileList[idx].FileUrlList = _this.subfileList[idx].FileUrl.split('$')
-
-              var urlList = _this.subfileList[idx].FileUrl.split('$')
-              // var img = urlList.find(fileurlall=>{
-              //   let fileurl = fileurlall.split('|')
-              //   let retUrl = fileurl[0]
-              //   let Format  = fileurl[1].split(".")
-              //   let pictureFormat = Format[1];
-              //   if("jpg"== pictureFormat ){
-              //       return true;
-              //   }
-              //   return false;
-              // })
-              // if(img != null && img != undefined){
-              //   urlList = urlList.filter(n=>n!=img)
-              //   urlList.unshift(img)
-              // }
-
-              _this.subfileList[idx].FileUrlList = urlList
-            }
-
-            this.getSupplierSceneFile()
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-      getbusList () {
-        let _this = this
-        const params = {
-          SupplierCertId: this.SupplierCertId,
-          SupplierTypeCode: this.SupplierTypeCode,
-          _currentPage: this.currentPage,
-          _size: this.size
-        }
-        this.$axios.get('suppliercertsub/list', {
-          params
-        })
-          .then(res => {
-            _this.businessList = res.data.items
-            _this.currentItem_Count = res.data.currentItemCount
-          })
-          .catch(err => {
-            console.error(err)
-          })
-      },
-      makesure () {
-        let _this = this
-        _this.$refs['subfileForm'].validate((valid) => {
-          if (valid) {
-            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.$message({
-                  type: 'warning',
-                  message: '请上传文件！'
-                })
-              }
-            }
-          }
-        })
-      },
-      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.uploadFiles = []
-            } 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.uploadFiles = []
-            } 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) {
-                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(() => {})
-      },
-      nextStep () {
-        if (this.businessList && this.businessList.length > 0) {
-          if (this.Grade === '2') {
-            for (let idx in this.businessList) {
-              if (this.businessList[idx].GoodsLevel === '1') {
-                this.$message({
-                  type: 'warning',
-                  message: '二级供应商不能准入一级物资！'
-                })
-                return
-              }
-            }
-          }
-          if ((this.isInvestigate) && (this.InStyle != '2')) { // (this.OperType == '代理商')
-            // 准入方式除“一级”以外的选项都需要上传现场考察报告
-            if (this.scenefile.Id == '' || this.scenefile.Id == '0') {
-              this.$message({
-                type: 'warning',
-                message: '请上传现场考察报告！'
-              })
-              return
-            }
-          }
-          if (this.subfileList && this.subfileList.length > 0) {
-            for (var i = 0; i < this.subfileList.length; i++) {
-              if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-                this.$message({
-                  type: 'warning',
-                  message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-                })
-                return
-              }
-            }
-            this.$emit('close')
-          } else {
-            this.$emit('close')
-          }
-        } else {
-          this.$message({
-            type: 'warning',
-            message: '请选择准入范围!'
-          })
-        }
-      },
-      getDictOptions () {
-        api.getDictList(this.$axios).then(res => {
-          this.yasuoname = res.data.items['YaSuoName']
-        }).catch(err => {
-          console.error(err)
-        })
-      },
-      showDialog () {
-        // this.doclist = []
-        this.fileList = []
-        this.IsMust = false
-        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.FileType = ''
-        this.SubfileForm.FileName = ''
-        this.SubfileForm.EffectDate = null
-        this.SubfileForm.FileUrl = ''
-        this.SubfileForm.OtherRemark = ''
-        this.SubfileForm.Remark = ''
-        this.SubfileForm.IsDelete = 0
-        this.visible = true
-      },
-      openDialog (val) {
-        this.IsMust = true
-        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.FileType = val.FileType
-        this.SubfileForm.FileName = val.FileName
-        this.SubfileForm.EffectDate = (this.jsEffectDate(val.EffectDate))
-        this.SubfileForm.FileUrl = val.FileUrl
-        this.fileList = []
-        if (val.FileUrl !== '') {
-          this.getwendanginfo(val.FileUrl)
-        }
-        this.SubfileForm.OtherRemark = val.OtherRemark
-        this.SubfileForm.Remark = val.Remark
-        this.SubfileForm.IsDelete = val.IsDelete
-        this.visible = true
-      },
-      // 文档列表
-      getwendanginfo (iUrl) {
-        let _this = this
-        _this.doclist = []
-        let urlArr = iUrl.split('$')
-        for (let idx in urlArr) {
-          let exArr = urlArr[idx].split('|')
-          let params = {
-            name: exArr[1],
-            url: exArr[0]
-          }
-          _this.doclist.push(params)
-          _this.fileList.push(params)
-        }
-      },
-      filremove (file, files) {
-        this.fileList = files
-      },
-      beforeAvatarUpload (file) {
-        console.log(file, '=====')
-        let isLt512K = file.size / 1024 < 512
-        if (isLt512K) {
-          this.$message.error('上传文件大小不能小于 512KB!')
-          return false
-        }
-
-        if (this.SubfileForm.NeedFileType != this.yasuoname) {
-          if (file.type.indexOf('image') < 0) {
-            this.$message.error('上传图片!')
-            return false
-          }
-          let isLt50m = file.size / 1024 / 1024 / 5 < 1
-          if (!isLt50m) {
-            this.$message.error('上传文件大小不能超过 5MB!')
-            return false
-          }
-          return true
-        } else {
-          if (file.name.indexOf('.rar') < 0 && file.name.indexOf('.zip') < 0) {
-            this.$message.error('文件格式必须为rar或zip')
-            return false
-          }
-          return true
-        }
-      },
-      uploadrequest (option) {
-        let _this = this
-        if (process.client) {
-          const myDomain = window.location.host
-          axios.post(process.env.upfilehost, {})
-            .then(function (res) {
-              if (res.data && res.data.fid && res.data.fid !== '') {
-                if (res.data.publicUrl.indexOf('/upfile') === 0) {
-                  option.action = `http://${myDomain}/${res.data.publicUrl}/${res.data.fid}`
-                } else {
-                  option.action = `http://${res.data.publicUrl}/${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 = ''
-        this.SubfileForm.FileName = ''
-        if (this.fileList != null && this.fileList.length > 0) {
-          for (let idx in this.fileList) {
-            this.SubfileForm.FileName += this.fileList[idx].name + '$'
-            this.SubfileForm.FileUrl += this.fileList[idx].url + '|' + this.fileList[idx].name + '$'
-          }
-        }
-        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()
-      },
-
-      imgFormat(val,index){
-        if(val !=null && val != undefined && val !=''){
-          let fileurlall = val.split('$')[index]
-          let fileurl = fileurlall.split('|')
-          if(fileurl[1] != null && fileurl[1] !='' && fileurl[1] != undefined){
-            let Format  = fileurl[1].split(".")
-            if(Format[1]!=null && Format[1] !='' && Format[1] != undefined){
-               let pictureFormat = Format[1];
-              if("jpg"== pictureFormat || "bmp" ==pictureFormat || "png" ==pictureFormat || "gif" ==pictureFormat|| "jpeg" ==pictureFormat){
-                return false;
-              }
-            }
-          }
-          return true;
-        }
-      },
-
-      fileurlcut (val, index) {
-        let fileurlall = val.split('$')[index]
-        let fileurl = fileurlall.split('|')
-        let retUrl = fileurl[0]
-        // 内网服务器专用
-        if (process.client && retUrl.indexOf('/upfile') === 0) {
-          const myDomain = window.location.host
-          retUrl = myDomain + '/' + retUrl
-        }
-        return retUrl;
-      },
-      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)
-        }
-      },
-      jsEffectDate (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 {
-          return val
-        }
-      },
-      handleCurrentChange (value) {
-        this.currentPage = value
-        this.getbusList()
-      },
-      handleSizeChange (value) {
-        this.size = value
-        this.currentPage = 1
-        this.getbusList()
-      }
-    }
-  }
-</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
-    margin-top: 0px;
-    margin-left: 0px
-  }
-
-  .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;
-  }
-
-  .photoStyle{
-    margin-top:6px;
-    width:140px;
-    height: 60px;
-  }
-</style>

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

@@ -3,10 +3,6 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>企业资质</span>
-        <!--<el-button type="primary" size="mini" style="float: right;margin-right: 3px" @click="nextStep()"
-                   v-if="canadd && IsCompanyUser == 0">
-          提交审批
-        </el-button>-->
         <el-button style="float: right; padding: 6px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
       </div>
       <el-table :data="subfileList" border size="mini">
@@ -64,7 +60,7 @@
           <el-col :span="12">
             <el-form-item label="资质名称" prop="NeedFileType">
               <!-- <el-input v-model="SubfileForm.NeedFileType" placeholder="请输文件类型"></el-input> -->
-              <el-select v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" :disabled="IsMust">
+              <el-select style="width: 100%;" v-model="SubfileForm.NeedFileType" placeholder="请输文件类型" size="medium" filterable :disabled="IsMust">
                 <el-option v-for="item in dynamicTableColumns" :key="item.prop" :label="item.label" :value="item.label">
                 </el-option>
               </el-select>
@@ -84,14 +80,6 @@
 
           <el-col :span="12">
             <el-form-item label="资质文件">
-             <!-- <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
-                 :on-remove="filremove" :http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload" :file-list="fileList">
-                <i class="el-icon-plus attach-uploader-icon"></i>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">请上传图片（大小为512KB-5MB），可上传多张图片
-                </div>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType ==yasuoname">请上传压缩文件
-                </div>
-              </el-upload>  -->
               <el-upload
                 :multiple="false" style="margin-top: 10px;" class="attach-uploader"
                 action=""
@@ -110,25 +98,8 @@
                 <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType ==yasuoname">请上传压缩文件
                 </div>
               </el-upload>
-            <el-dialog :visible.sync="dialogVisible" :modal="false">
-          <img width="100%" style="z-index:9999" :src="dialogImageUrl" alt="">
-        </el-dialog>
-      </el-form-item>
-    </el-col>
-
-
-          <!-- <el-col :span="12">
-            <el-form-item label="资质文件">
-              <el-upload multiple style="margin-top: 10px;" action="" ref="refuploadattach"
-                         :on-remove="filremove" :http-request="uploadrequest" class="attach-uploader" :before-upload="beforeAvatarUpload" :file-list="fileList">
-                <i class="el-icon-plus attach-uploader-icon"></i>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType !=yasuoname">123请上传图片（大小为512KB-5MB），可上传多张图片
-                </div>
-                <div slot="tip" class="el-upload__tip" v-if="SubfileForm.NeedFileType ==yasuoname">请上传压缩文件
-                </div>
-              </el-upload>
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" style="margin-top:-30px;">
@@ -136,6 +107,11 @@
         <el-button type="primary" @click="makesure()">确 定</el-button>
       </div>
     </el-dialog>
+
+    <el-dialog :visible.sync="dialogVisible" :modal="false">
+      <img width="100%" style="z-index:9999" :src="dialogImageUrl" alt="">
+    </el-dialog>
+
   </div>
 
 </template>
@@ -524,52 +500,6 @@
           })
           .catch(() => {})
       },
-      nextStep () {
-        if (this.businessList && this.businessList.length > 0) {
-          if (this.Grade === '2') {
-            for (let idx in this.businessList) {
-              if (this.businessList[idx].GoodsLevel === '1') {
-                this.$message({
-                  type: 'warning',
-                  message: '二级供应商不能准入一级物资！'
-                })
-                return
-              }
-            }
-          }
-          if ((this.isInvestigate) && (this.InStyle != '2') && (this.OperType == '代理商')) {
-            if (this.scenefile.Id == '' || this.scenefile.Id == '0') {
-              this.$message({
-                type: 'warning',
-                message: '请上传现场考察报告！'
-              })
-              return
-            }
-          }
-          if (this.subfileList && this.subfileList.length > 0) {
-            for (var i = 0; i < this.subfileList.length; i++) {
-              if (this.subfileList[i].FileType === 1 && this.subfileList[i].FileUrl === '') {
-                this.$message({
-                  type: 'warning',
-                  message: '请上传文件' + this.subfileList[i].NeedFileType + '!'
-                })
-                return
-              }
-            }
-            console.log('提交审批01')
-            this.$emit('close')
-          } else {
-            console.log('提交审批02')
-            this.$emit('close')
-          }
-        } else {
-          console.log('提交审批03')
-          this.$message({
-            type: 'warning',
-            message: '请选择准入范围!'
-          })
-        }
-      },
       getDictOptions () {
         api.getDictList(this.$axios).then(res => {
           this.yasuoname = res.data.items['YaSuoName']

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

@@ -4,8 +4,6 @@
       <div slot="header" class="clearfix">
         <span style="font-weight: bold">准入范围</span>
         <span style="float: right;">
-          <el-button type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()"
-                     v-if="canadd && IsCompanyUser == 0">提交审批</el-button>
           <el-button style="float: right; padding: 3px 0px" type="text" @click="deletedata()" v-if="candelete">删除</el-button>
           <el-button style="float: right; padding: 3px 25px" type="text" @click="showDialog" v-if="canadd || newcanadd">添加</el-button>
         </span>
@@ -191,9 +189,6 @@
         } else {
         }
       },
-      commitAudit () {
-        this.$emit('commitAudit')
-      },
       handleSelectionChange (val) {
         this.Ids = []
         for (var i = 0; i < val.length; i++) {

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

@@ -703,13 +703,13 @@
                         </div> -->
                   <viewer :images="scope.row.OldFileUrlList">
                     <div  v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    
+
                       <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
-                        v-if="scope.row.OldFileUrl==''?false:imgFormat(scope.row.OldFileUrl, index)" 
+                        v-if="scope.row.OldFileUrl==''?false:imgFormat(scope.row.OldFileUrl, index)"
                       >
                       {{scope.row.FileName.split('$')[index]}}</el-link>
-                    
-                      <img 
+
+                      <img
                         v-if="scope.row.OldFileUrl==''?false:!imgFormat(scope.row.OldFileUrl, index)"
                         class="photoStyle" alt=""
                         :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
@@ -726,20 +726,20 @@
               </el-table-column>
               <el-table-column prop="FileUrlList" label="变更后文件" show-overflow-tooltip>
                 <template slot-scope="scope">
-                  
+
                   <!-- <div v-for="(tmpUrl, index) in scope.row.FileUrlList" :key="index">
                     <a :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank"
                        class="buttonText">{{scope.row.FileName.split('$')[index]}}</a>
                   </div> -->
                    <viewer :images="scope.row.FileUrlList">
                     <div  v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    
+
                       <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                        v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)" 
+                        v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)"
                       >
                       {{scope.row.FileName.split('$')[index]}}</el-link>
-                    
-                      <img 
+
+                      <img
                         v-if="scope.row.FileUrl==''?false:!imgFormat(scope.row.FileUrl, index)"
                         class="photoStyle" alt=""
                         :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
@@ -946,7 +946,7 @@
   import BusinessList from '@/components/oilsupplier/businesslist'
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
-  // import SubfileList from '@/components/oilsupplier/subfilelist'
+  // import SubfileList from '@/components/oilsupplier/subfilelist2'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import _ from 'lodash'

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

@@ -622,13 +622,13 @@
 
                   <viewer :images="scope.row.OldFileUrlList">
                     <div  v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    
+
                       <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
-                        v-if="scope.row.OldFileUrl==''?false:imgFormat(scope.row.OldFileUrl, index)" 
+                        v-if="scope.row.OldFileUrl==''?false:imgFormat(scope.row.OldFileUrl, index)"
                       >
                       {{scope.row.FileName.split('$')[index]}}</el-link>
-                    
-                      <img 
+
+                      <img
                         v-if="scope.row.OldFileUrl==''?false:!imgFormat(scope.row.OldFileUrl, index)"
                         class="photoStyle" alt=""
                         :src="'http://'+fileurlcut(scope.row.OldFileUrl, index)"
@@ -652,13 +652,13 @@
                   </div> -->
                   <viewer :images="scope.row.FileUrlList">
                     <div  v-for="(tmpUrl,index) in scope.row.FileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
-                    
+
                       <el-link :href="'http://'+fileurlcut(scope.row.FileUrl, index)" target="_blank" type="primary"
-                        v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)" 
+                        v-if="scope.row.FileUrl==''?false:imgFormat(scope.row.FileUrl, index)"
                       >
                       {{scope.row.FileName.split('$')[index]}}</el-link>
-                    
-                      <img 
+
+                      <img
                         v-if="scope.row.FileUrl==''?false:!imgFormat(scope.row.FileUrl, index)"
                         class="photoStyle" alt=""
                         :src="'http://'+fileurlcut(scope.row.FileUrl, index)"
@@ -839,7 +839,7 @@
   import BusinessList from '@/components/oilsupplier/businesslist'
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
-  // import SubfileList from '@/components/oilsupplier/subfilelist'
+  // import SubfileList from '@/components/oilsupplier/subfilelist2'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import _ from 'lodash'
@@ -2209,5 +2209,5 @@
     margin-top:6px;
     width:140px;
     height: 80px;
-  }  
+  }
 </style>

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

@@ -681,8 +681,8 @@
                     </el-col>
                   </el-row>
                 -->
-               
-               
+
+
                 </template>
               </el-table-column>
               <el-table-column prop="EffectDate" label="变更后有效日期" show-overflow-tooltip >
@@ -968,7 +968,7 @@ import apiCert from '@/api/oilsupplier/suppliercert'
   import BasisInfo from '@/components/oilsupplier/basisinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import _ from 'lodash'
   import axios from 'axios'

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

@@ -752,8 +752,8 @@
 
 
 
-                    
-                 
+
+
 
 
 
@@ -1052,11 +1052,11 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
-  import GoodsList from '@/components/oilsupplier/goodslist'
+  import GoodsList from '@/components/oilsupplier/goodslist2'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  // import SubfileList from '@/components/oilsupplier/subfilelist'
+  // import SubfileList from '@/components/oilsupplier/subfilelist2'
   import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import _ from 'lodash'
   import axios from 'axios'

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

@@ -535,7 +535,7 @@
               <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
 
-                  
+
                   <viewer :images="scope.row.OldFileUrlList">
                     <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
                       <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
@@ -883,7 +883,7 @@
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
   import _ from 'lodash'
   import axios from 'axios'

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

@@ -528,7 +528,7 @@
               <el-table-column prop="OldFileUrlList" label="原文件" show-overflow-tooltip>
                 <template slot-scope="scope">
 
-                  
+
                   <viewer :images="scope.row.OldFileUrlList">
                     <div v-for="(tmpUrl,index) in scope.row.OldFileUrlList" :key="index" style="vertical-align: middle;	text-align: center;">
                       <el-link :href="'http://'+fileurlcut(scope.row.OldFileUrl, index)" target="_blank" type="primary"
@@ -753,7 +753,7 @@
   import BusinessList from '@/components/oilsupplier/businesslist'
   import TechInfo from '@/components/oilsupplier/techinfo'
   import AuditbusList from '@/components/oilsupplier/auditbuslist'
-  // import SubfileList from '@/components/oilsupplier/subfilelist'
+  // import SubfileList from '@/components/oilsupplier/subfilelist2'
   import WfHistory from '@/components/workflow/wfmultihistory.vue'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
   import _ from 'lodash'

src/dashoo.cn/frontend_web/src/pages/oilsupplier/oilcatalog/income.vue

@@ -285,7 +285,7 @@
       this.formData.CatalogType = parseInt(this.$route.query.catalogType)
       if (this.$route.query.catalogType === '6') {
         this.cardTitle = '外部市场'
-      } else if (this.$route.query.catalogType === '6') {
+      } else if (this.$route.query.catalogType === '7') {
         this.cardTitle = '收入业务'
       }
       this.isAccess()

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

@@ -52,27 +52,16 @@
                      :disabled="formData.Status == 0">表单下载</el-button>
           <el-button type="primary"
                      size="mini"
-                     @click="nextStep()"
-                     v-if="add_flat && IsCompanyUser == 1 && parseInt(activeName)==3">
+                     @click="commitAudit()"
+                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3">
             提交
           </el-button>
-          <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->
-          <!--<router-link :to="'/oilsupplier/supplier/basislist'">-->
-          <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
-          <!--</el-button>-->
-          <!--</router-link>-->
+          <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0) " type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+            提交审批
+          </el-button>
         </span>
       </div>
 
-      <!-- <el-steps :active="formData.Step" simple align-center finish-status="success">
-        <el-step title="填信息"></el-step>
-        <el-step title="待审批"></el-step>
-        <el-step title="已审批"></el-step>
-        <el-step title="待交费"></el-step>
-        <el-step title="待入库"></el-step>
-        <el-step title="完成"></el-step>
-      </el-steps> -->
-
       <el-tabs tab-position="top"
                v-model="activeName"
                style="margin-top: -10px">
@@ -302,7 +291,6 @@
                         :data.sync="subfileList"
                         :canadd="add_flat"
                         :flag="flag"
-                        @close="selectAuditOrg"
                         height="360px"></subfile-list>
         </el-tab-pane>
 
@@ -313,7 +301,6 @@
                          @close="getbuslist"
                          :canadd="add_flat"
                          :candelete="delete_flat"
-                         @commitAudit="commitAudit"
                          height="360px"></business-list>
         </el-tab-pane>
 
@@ -323,11 +310,6 @@
             <div slot="header"
                  class="clearfix">
               <span>审批流程</span>
-              <!-- <span style="float: right;">
-                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading"
-                  @click="AuditEntity">提交审批
-                </el-button>
-              </span> -->
             </div>
             <wf-multi-history ref="WfHistory"
                               :entryinfo="entrydetail"></wf-multi-history>
@@ -396,14 +378,6 @@
                            :value="item.Id">
                 </el-option>
               </el-select>
-              <!--<el-input ref="selectAuditer"-->
-                        <!--readonly-->
-                        <!--v-model="auditerName"-->
-                        <!--placeholder="请选择初审人">-->
-                <!--<el-button slot="append"-->
-                           <!--icon="el-icon-search"-->
-                           <!--@click="chooseAuditorShow"></el-button>-->
-              <!--</el-input>-->
             </el-form-item>
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer"
@@ -420,11 +394,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室"
-                          v-if="allowpre">
-              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
-              <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">-->
-              <!--</el-cascader>-->
+            <el-form-item label="专业处室">
               <el-select v-model="selectDept"
                          filterable
                          disabled
@@ -465,11 +435,6 @@
                label-width="100px">
         <el-row>
           <el-col :span="24">
-            <!--<el-form-item label="分办人员">-->
-            <!--<el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">-->
-            <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>-->
-            <!--</el-input>-->
-            <!--</el-form-item>-->
             <el-form-item label="分办单位">
               <el-select filterable
                          v-model="UnitOrg"
@@ -843,9 +808,6 @@ export default {
     // this.changeOrgUnit(this.selectDept)
   },
   methods: {
-    nextStep () {
-      this.$refs['subfileList'].nextStep()
-    },
     annaudit () {
       this.annentityForm.supplierId = parseInt(this.serviceId)
       this.annentityForm.SupplierName = this.formData.SupplierName
@@ -1212,9 +1174,9 @@ export default {
           this.$refs['winningList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           this.$refs['businessList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId)
           this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this.formDataCert.InStyle)
-          if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
+          /*if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
             this.allowpre = false
-          }
+          }*/
         }).catch(err => {
           console.error(err)
         })
@@ -1535,7 +1497,9 @@ export default {
     },
     selectAuditOrg () {
       this.getFirAuditerByDept()
-      this.changeOrgUnit(this.selectDept)
+      if (this.selectDept) {
+        this.changeOrgUnit(this.selectDept)
+      }
       if (this.IsCompanyUser === 0) {
         this.dialogVisible = true
       } else if (this.IsCompanyUser === 1) {
@@ -1547,7 +1511,21 @@ export default {
       this.chooseAuditorVisible = true
     },
     commitAudit () {
-      this.$refs['subfileList'].nextStep()
+      console.log(this.formData)
+      apiCert.checkSupplierCertCanSubmit(this.formData.Id, this.$axios)
+        .then(res => {
+          if (res.data.code === 0) {
+            this.selectAuditOrg()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+        .catch(err => {
+          console.error(err)
+        })
     },
     setAuditer (val, name) {
       this.auditer = val
@@ -1565,45 +1543,44 @@ export default {
       this.chooseAuditorVisibleFen = false
     },
     AuditEntity (val) {
-      if (this.auditer === '') {
+      if (!this.auditer) {
         this.$message({
           type: 'warning',
-          message: '请选择初审人！'
+          message: '请选择审批人！'
         })
-        return
+        return false
       }
-      if (this.fushenauditer === '') {
+      if (!this.fushenauditer) {
         this.$message({
           type: 'warning',
           message: '请选择复审人！'
         })
-        return
+        return false
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
-        if (this.selectDept === 0 || this.selectDept == '') {
-          this.$message({
-            type: 'warning',
-            message: '请选择专业处室！'
-          })
-          return
-        }
+      if (!this.selectDept) {
+        this.$message({
+          type: 'warning',
+          message: '请选择专业处室！'
+        })
+        return false
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人！'
-          })
-          return
-        }
+      if (!this.userOptions || this.userOptions.length === 0) {
+        this.$message({
+          type: 'warning',
+          message: '该专业科室未配置接收人！'
+        })
+        return false
       }
-      this.applyLoading = true
-      this.auditform.FirstAuditName = this.auditer
-      this.auditform.CertId = this.certId
-      this.auditform.SecondAudit = this.fushenauditer
-      this.auditform.ThirdAudit = this.selectDept // this.majorDept[this.majorDept.length - 1]
       this.loading = true
-      apiCert.auditEntity(this.certId, this.auditform, this.$axios).then(res => {
+      this.applyLoading = true
+      let params = {
+        'FirstAudit': this.auditer,
+        'SecondAudit': this.fushenauditer,
+        'ThirdAudit': this.selectDept, // this.majorDept[this.majorDept.length - 1] 专业处室部门id
+        'AuditRemark': this.auditform.AuditRemark
+      }
+      console.log(params)
+      apiCert.unitAuditEntity(this.certId, params, this.$axios).then(res => {
         if (res.data.code === 0) {
           // 保存成功后，初始化数据，变成修改
           this.initDatas()
@@ -1639,12 +1616,11 @@ export default {
       //   })
       //   return
       // }
-      this.loading = true
       this.applyLoading = true
-      this.auditform.FirstAuditName = this.UnitOrg
+      this.auditform.UnitId = this.UnitOrg
       this.auditform.CertId = this.certId
-      apiCert
-        .auditEntity(this.certId, this.auditform, this.$axios)
+      this.loading = true
+      apiCert.firstAuditEntity(this.certId, this.auditform, this.$axios)
         .then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

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

@@ -51,7 +51,7 @@
                      :disabled="formData.Status == 0">表单下载</el-button>
           <el-button type="primary"
                      size="mini"
-                     @click="nextStep()"
+                     @click="commitAudit()"
                      v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3">
             提交
           </el-button>
@@ -301,8 +301,7 @@
                         :Grade="formData.Grade"
                         :InStyle="formData.InStyle"
                         :OperType="formData.OperType"
-                        :isInvestigate="isInvestigate"
-                        @close="selectAuditOrg"></subfile-list2>
+                        :isInvestigate="isInvestigate"></subfile-list2>
         </el-tab-pane>
 
         <el-tab-pane label="准入范围"
@@ -325,11 +324,6 @@
             <div slot="header"
                  class="clearfix">
               <span>审批流程</span>
-              <!-- <span style="float: right;">
-                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading"
-                  @click="AuditEntity">提交审批
-                </el-button>
-              </span>-->
             </div>
             <wf-history ref="WfHistory"
                               :entryinfo="entrydetail"></wf-history>
@@ -873,20 +867,6 @@ export default {
       //   return
       // }
     },
-    nextStep () {
-      if (this.formDataCert.InStyle != '2' && this.formDataCert.InStyle != '3' ) {
-        // 准入方式，除一级二级外其他需要考察报告
-        if (this.$refs['GoodsInfo'].scenefile.FileUrl.length <= 0) {
-          this.$notify({
-            title: '提示',
-            message: '请上传现场考察报告！',
-            type: 'warning'
-          })
-          return false
-        }
-      }
-      this.$refs['subfileList'].nextStep()
-    },
     annaudit () {
       this.annentityForm.supplierId = parseInt(this.serviceId)
       this.annentityForm.SupplierName = this.formData.SupplierName
@@ -1297,9 +1277,9 @@ export default {
               this.certId,
               this.formDataCert.InStyle
             )
-            if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
+            /*if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
               this.allowpre = false
-            }
+            }*/
           })
           .catch(err => {
             console.error(err)
@@ -1703,7 +1683,9 @@ export default {
     },
     selectAuditOrg () {
       this.getFirAuditerByDept()
-      this.changeOrgUnit(this.selectDept)
+      if (this.selectDept) {
+        this.changeOrgUnit(this.selectDept)
+      }
       if (this.IsCompanyUser === 0) {
         this.dialogVisible = true
       } else if (this.IsCompanyUser === 1) {
@@ -1712,25 +1694,23 @@ export default {
     },
     commitAudit () {
       console.log('提交审批')
-      if (this.formDataCert.InStyle != '2' && this.formDataCert.InStyle != '3') {
-        // 准入方式，除一级二级外其他需要考察报告
-        if (this.$refs['GoodsInfo'].scenefile.FileUrl.length <= 0) {
-          this.$notify({
-            title: '提示',
-            message: '请上传现场考察报告！',
-            type: 'warning'
-          })
-          return false
-        }
-      }
-      this.$refs['subfileList'].nextStep()
+      console.log(this.formData)
+      apiCert.checkSupplierCertCanSubmit(this.formData.Id, this.$axios)
+        .then(res => {
+          if (res.data.code === 0) {
+            this.selectAuditOrg()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+        .catch(err => {
+          console.error(err)
+        })
     },
-    // chooseAuditorShow () {
-    //   this.$refs['chooseAuditor'].getorgtreelist(
-    //     this.formData.SupplierTypeCode
-    //   )
-    //   this.chooseAuditorVisible = true
-    // },
+
     setAuditer (val, name) {
       this.auditer = val
       this.auditerName = name
@@ -1747,37 +1727,26 @@ export default {
       this.chooseAuditorVisibleFen = false
     },
     AuditEntity (val) {
-      if (this.auditer === '') {
+      if (!this.auditer) {
         this.$message({
           type: 'warning',
-          message: '请选择初审人！'
+          message: '请选择审批人！'
         })
-        return
+        return false
       }
-      if (this.fushenauditer === '') {
+      if (!this.fushenauditer) {
         this.$message({
           type: 'warning',
           message: '请选择复审人！'
         })
-        return
-      }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
-        if (this.selectDept === 0 || this.selectDept == '') {
-          this.$message({
-            type: 'warning',
-            message: '请选择专业处室！'
-          })
-          return
-        }
+        return false
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人！'
-          })
-          return
-        }
+      if (!this.selectDept) {
+        this.$message({
+          type: 'warning',
+          message: '请选择专业处室！'
+        })
+        return false
       }
       this.applyLoading = true
       this.auditform.UnitId = this.auditer
@@ -1811,26 +1780,33 @@ export default {
         })
     },
     secondaryUnitSubmitApply (val) {
-      if (this.auditer === '') {
+      if (!this.auditer) {
         this.$message({
           type: 'warning',
-          message: '请选择初审人！'
+          message: '请选择审批人！'
         })
-        return
+        return false
       }
-      if (this.fushenauditer === '') {
+      if (!this.fushenauditer) {
         this.$message({
           type: 'warning',
           message: '请选择复审人！'
         })
-        return
+        return false
       }
-      if (this.selectDept === 0 || this.selectDept == '') {
+      if (!this.selectDept) {
         this.$message({
           type: 'warning',
           message: '请选择专业处室！'
         })
-        return
+        return false
+      }
+      if (!this.userOptions || this.userOptions.length === 0) {
+        this.$message({
+          type: 'warning',
+          message: '该专业科室未配置接收人！'
+        })
+        return false
       }
       this.loading = true
       this.applyLoading = true
@@ -1870,13 +1846,6 @@ export default {
         })
         return
       }
-      // if (this.auditer === "") {
-      //   this.$message({
-      //     type: "warning",
-      //     message: "请选择分办人！"
-      //   })
-      //   return
-      // }
       this.applyLoading = true
       this.auditform.UnitId = this.UnitOrg
       this.auditform.CertId = this.certId

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

@@ -53,15 +53,13 @@
                      :disabled="formData.Status == 0">表单下载</el-button>
           <el-button type="primary"
                      size="mini"
-                     @click="nextStep()"
-                     v-if="add_flat && IsCompanyUser == 1 && parseInt(activeName)==3">
+                     @click="commitAudit()"
+                     v-if="add_flat && parseInt(IsCompanyUser) === 1 && parseInt(activeName) === 3">
             提交
           </el-button>
-          <!--<el-button type="primary" @click="toPdf" size="mini" :disabled="formData.Status == 0">准入范围</el-button>-->
-          <!--<router-link :to="'/oilsupplier/supplier/techlist'">-->
-          <!--<el-button type="primary" size="mini" style="margin-left: 8px" v-if="showReturn">返回-->
-          <!--</el-button>-->
-          <!--</router-link>-->
+          <el-button v-if="parseInt(IsCompanyUser) !== 1 && (this.formData.Status == '' || parseInt(this.formData.Status) === 0) " type="primary" size="mini" style="float: right;margin-left: 25px" @click="commitAudit()">
+            提交审批
+          </el-button>
         </span>
       </div>
 
@@ -301,7 +299,6 @@
                         :data.sync="subfileList"
                         :canadd="add_flat"
                         :flag="flag"
-                        @close="selectAuditOrg"
                         height="360px"></subfile-list>
         </el-tab-pane>
         <el-tab-pane label="准入范围"
@@ -311,8 +308,7 @@
                      @close="getbuslist"
                      :canadd="add_flat"
                      :candelete="delete_flat"
-                     height="360px"
-                     @commitAudit="commitAudit"></tech-list>
+                     height="360px"></tech-list>
         </el-tab-pane>
 
         <el-tab-pane label="审批流程"
@@ -321,11 +317,6 @@
             <div slot="header"
                  class="clearfix">
               <span>审批流程</span>
-              <!-- <span style="float: right;">
-                <el-button type="primary" size="mini" :disabled="formDataCert.Status > 0" :loading="applyLoading"
-                  @click="AuditEntity">提交审批
-                </el-button>
-              </span> -->
             </div>
             <wf-multi-history ref="WfHistory"
                               :entryinfo="entrydetail"></wf-multi-history>
@@ -417,11 +408,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="专业处室"
-                          v-if="allowpre">
-              <!--<el-cascader :options="orgtreelist" :props="orgtreeprops" :show-all-levels="false" filterable-->
-              <!--style="width: 100%" v-model="majorDept" placeholder="请选择专业处室" @change="orgtreeChange">-->
-              <!--</el-cascader>-->
+            <el-form-item label="专业处室">
               <el-select v-model="selectDept"
                          filterable
                          placeholder="请选择"
@@ -461,11 +448,6 @@
                label-width="100px">
         <el-row>
           <el-col :span="24">
-            <!--<el-form-item label="分办人员">-->
-            <!--<el-input ref="selectAuditerFen" readonly v-model="auditerName" placeholder="请选择分办人">-->
-            <!--<el-button slot="append" icon="el-icon-search" @click="chooseAuditorShowFen"></el-button>-->
-            <!--</el-input>-->
-            <!--</el-form-item>-->
             <el-form-item label="分办单位">
               <el-select filterable
                          v-model="UnitOrg"
@@ -502,10 +484,6 @@
       </span>
     </el-dialog>
 
-    <!--<choose-auditor ref="chooseAuditor"-->
-                    <!--@close="setAuditer"-->
-                    <!--@hideChooseAuditer="chooseAuditorVisible=false"-->
-                    <!--:visible="chooseAuditorVisible"></choose-auditor>-->
     <choose-auditor-fen ref="chooseAuditorFen"
                         @close="setAuditerFen"
                         @hideChooseAuditer="chooseAuditorVisibleFen=false"
@@ -838,9 +816,6 @@ export default {
     // this.changeOrgUnit(this.selectDept)
   },
   methods: {
-    nextStep () {
-      this.$refs['subfileList'].nextStep()
-    },
     annaudit () {
       this.annentityForm.supplierId = parseInt(this.serviceId)
       this.annentityForm.SupplierName = this.formData.SupplierName
@@ -1209,9 +1184,9 @@ export default {
             this.$refs['subfileList'].getvalue(this.formData.Id, this.formData.SupplierTypeCode, this.certId, this
               .formDataCert.InStyle)
 
-            if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
+            /*if (this.formData.InStyle == '2' || this.formData.InStyle == '6' || this.formData.InStyle == '4') {
               this.allowpre = false
-            }
+            }*/
           }).catch(err => {
             console.error(err)
           })
@@ -1529,7 +1504,9 @@ export default {
     },
     selectAuditOrg () {
       this.getFirAuditerByDept()
-      this.changeOrgUnit(this.selectDept)
+      if (this.selectDept) {
+        this.changeOrgUnit(this.selectDept)
+      }
       if (this.IsCompanyUser === 0) {
         this.dialogVisible = true
       } else if (this.IsCompanyUser === 1) {
@@ -1541,7 +1518,21 @@ export default {
       this.chooseAuditorVisible = true
     },
     commitAudit () {
-      this.$refs['subfileList'].nextStep()
+      console.log(this.formData)
+      apiCert.checkSupplierCertCanSubmit(this.formData.Id, this.$axios)
+        .then(res => {
+          if (res.data.code === 0) {
+            this.selectAuditOrg()
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+          }
+        })
+        .catch(err => {
+          console.error(err)
+        })
     },
     setAuditer (val, name) {
       this.auditer = val
@@ -1559,46 +1550,44 @@ export default {
       this.chooseAuditorVisibleFen = false
     },
     AuditEntity () {
-      // this.auditer = val
-      if (this.auditer === '') {
+      if (!this.auditer) {
         this.$message({
           type: 'warning',
           message: '请选择审批人！'
         })
-        return
+        return false
       }
-      if (this.fushenauditer === '') {
+      if (!this.fushenauditer) {
         this.$message({
           type: 'warning',
           message: '请选择复审人！'
         })
-        return
+        return false
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
-        if (this.selectDept === 0 || this.selectDept == '') {
-          this.$message({
-            type: 'warning',
-            message: '请选择专业处室！'
-          })
-          return
-        }
+      if (!this.selectDept) {
+        this.$message({
+          type: 'warning',
+          message: '请选择专业处室！'
+        })
+        return false
       }
-      if (this.formData.InStyle != '2' && this.formData.InStyle != '6' && this.formData.InStyle != '4') {
-        if (this.userOptions == null || this.userOptions.length === 0) {
-          this.$message({
-            type: 'warning',
-            message: '该专业科室未配置接收人！'
-          })
-          return
-        }
+      if (!this.userOptions || this.userOptions.length === 0) {
+        this.$message({
+          type: 'warning',
+          message: '该专业科室未配置接收人！'
+        })
+        return false
       }
-      this.applyLoading = true
-      this.auditform.FirstAuditName = this.auditer
-      this.auditform.CertId = this.certId
-      this.auditform.SecondAudit = this.fushenauditer
-      this.auditform.ThirdAudit = this.selectDept // this.majorDept[this.majorDept.length - 1]
       this.loading = true
-      apiCert.auditEntity(this.certId, this.auditform, this.$axios).then(res => {
+      this.applyLoading = true
+      let params = {
+        'FirstAudit': this.auditer,
+        'SecondAudit': this.fushenauditer,
+        'ThirdAudit': this.selectDept, // this.majorDept[this.majorDept.length - 1] 专业处室部门id
+        'AuditRemark': this.auditform.AuditRemark
+      }
+      console.log(params)
+      apiCert.unitAuditEntity(this.certId, params, this.$axios).then(res => {
         if (res.data.code === 0) {
           // 保存成功后，初始化数据，变成修改
           this.initDatas()
@@ -1634,12 +1623,11 @@ export default {
       //   })
       //   return
       // }
-      this.loading = true
       this.applyLoading = true
-      this.auditform.FirstAuditName = this.UnitOrg
+      this.auditform.UnitId = this.UnitOrg
       this.auditform.CertId = this.certId
-      apiCert
-        .auditEntity(this.certId, this.auditform, this.$axios)
+      this.loading = true
+      apiCert.firstAuditEntity(this.certId, this.auditform, this.$axios)
         .then(res => {
           if (res.data.code === 0) {
             // 保存成功后，初始化数据，变成修改

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

@@ -556,7 +556,7 @@
         } else if (val === '5') {
           return '内部多元准入'
         } else if (val === '6') {
-          return '外部市场准入'
+          return '招标准入'
         }
       },
       jstimehandle(val) {

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

@@ -558,7 +558,7 @@
         } else if (val === '5') {
           return '内部多元准入'
         } else if (val === '6') {
-          return '外部市场准入'
+          return '招标准入'
         }
       },
       jstimehandle(val) {

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

@@ -505,7 +505,7 @@ import WfHistory from '@/components/workflow/wfhistory.vue'
         } else if (val === '5') {
           return '内部多元准入'
         } else if (val === '6') {
-          return '外部市场准入'
+          return '招标准入'
         }
       },
       jstimehandle (val) {

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

@@ -560,7 +560,7 @@
         } else if (val === '5') {
           return '内部多元准入'
         } else if (val === '6') {
-          return '外部市场准入'
+          return '招标准入'
         }
       },
       jstimehandle(val) {

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

@@ -259,7 +259,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import BasisInfo from '@/components/oilsupplier/basisinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -214,8 +214,8 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
-  import GoodsList from '@/components/oilsupplier/goodslist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import GoodsList from '@/components/oilsupplier/goodslist2'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -264,7 +264,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import TechList from '@/components/oilsupplier/techlist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import TechInfo from '@/components/oilsupplier/techinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -286,7 +286,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import BasisInfo from '@/components/oilsupplier/basisinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -286,8 +286,8 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
-  import GoodsList from '@/components/oilsupplier/goodslist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import GoodsList from '@/components/oilsupplier/goodslist2'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -294,7 +294,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import TechList from '@/components/oilsupplier/techlist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import TechInfo from '@/components/oilsupplier/techinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -318,7 +318,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import BusinessList from '@/components/oilsupplier/businesslist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import BasisInfo from '@/components/oilsupplier/basisinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -295,8 +295,8 @@
   import PerformanceList from '@/components/oilsupplier/performancelist'
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
-  import GoodsList from '@/components/oilsupplier/goodslist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import GoodsList from '@/components/oilsupplier/goodslist2'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import GoodsInfo from '@/components/oilsupplier/goodsinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'

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

@@ -326,7 +326,7 @@
   import PatentList from '@/components/oilsupplier/patentlist'
   import WinningList from '@/components/oilsupplier/winninglist'
   import TechList from '@/components/oilsupplier/techlist'
-  import SubfileList from '@/components/oilsupplier/subfilelist'
+  import SubfileList from '@/components/oilsupplier/subfilelist2'
   import TechInfo from '@/components/oilsupplier/techinfo'
 
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'