增项流程修改

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappend.go

@@ -21,6 +21,7 @@ type OilSupplierCertAppend struct {
 	WorkFlowId     string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
 	AuditIndex     int       `xorm:"default 0 comment('审批次数') INT(11)"`
 	BusinessKey    string    `xorm:"VARCHAR(255)"`
+	ProcessKey     string    `xorm:"VARCHAR(255)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	Step           int       `xorm:"comment('页面上第几步') INT(10)"`
@@ -52,6 +53,7 @@ type OilSupplierCertAppendTodo struct {
 	WorkFlowId     string    `xorm:"default '0' comment('工作流的ID') VARCHAR(255)"`
 	AuditIndex     int       `xorm:"default 0 comment('审批次数') INT(11)"`
 	BusinessKey    string    `xorm:"VARCHAR(255)"`
+	ProcessKey     string    `xorm:"VARCHAR(255)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
 	IsDelete       int       `xorm:"default 0 comment('删除状态，0正常，1已删除') INT(10)"`
 	Step           int       `xorm:"comment('页面上第几步') INT(10)"`

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

@@ -879,10 +879,14 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		//certSrv.GetAuditUser(strconv.Itoa(supplierCertEntity.ThirdAudit), workflow.PROF_RECE, &users)
 
 
-		for _, tmpUser := range userlist {
-			userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
+			for _, tmpUser := range userlist {
+				userIds += strconv.Itoa(tmpUser.Id) + "," //strconv.FormatInt(tmpUser.Id, 10) + ","
+			}
+			userIds = strings.Trim(userIds, ",")
 		}
-		userIds = strings.Trim(userIds, ",")
+		step = 2
+		backstatus = suppliercert.NO_SECOND_TRIAL_STATUS
+
 	} else if supplierCertEntity.Status == suppliercert.THIRD_TRIAL_STATUS {
 		userIds = auditer
 		status = suppliercert.PROF_AUDIT_STATUS
@@ -922,6 +926,7 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 
 			userIds = strings.Trim(userIds, ",")
 		}
+
 	} else if supplierCertEntity.Status == suppliercert.CENT_AUDIT_STATUS {
 		userIds = auditer
 		status = suppliercert.PAYING_AUDIT_STATUS
@@ -1016,7 +1021,6 @@ func (this *OilSupplierCertController) AuditEntityFir() {
 		receiveVal := svcActiviti.TaskComplete(ActiComplete)
 
 		if receiveVal == "true" {
-
 			// 审批历史
 			var audithistoryentity audithistory.Base_AuditHistory
 			audithistoryentity.EntityId = supplierCertEntity.Id

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

@@ -562,6 +562,7 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	model.ThirdAudit, _ = strconv.Atoi(ThirdAudit)
 	model.AuditIndex = supplierCertAppendEntity.AuditIndex
 	model.BusinessKey = businessKey
+	model.ProcessKey = ActiComplete.ProcessKey
 	cols := []string{
 		"Id",
 		"WorkFlowId",
@@ -571,6 +572,7 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 		"ThirdAudit",
 		"AuditIndex",
 		"BusinessKey",
+		"ProcessKey",
 	}
 	certSrv.UpdateEntityByIdCols(certappendId, model, cols)
 }
@@ -694,14 +696,7 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
-	if supplierCertAppendEntity.InStyle == "2" {
-		ActiComplete.ProcessKey = workflow.OIL_FIRST_SUPPLIER_APPLY
-	}else if  supplierCertAppendEntity.InStyle == "3" {
-		ActiComplete.ProcessKey = workflow.OIL_SECOND_SUPPLIER_APPLY
-	}else{
-		ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
-	}
-
+	ActiComplete.ProcessKey = supplierCertAppendEntity.ProcessKey
 	ActiComplete.BusinessKey = supplierCertAppendEntity.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id

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

@@ -143,6 +143,7 @@ func (this *TodoListController) GetMyTaskEntityList() {
 			}
 		}
 		appendIdList = strings.Join(appendIdarr, ",")
+		appendIdList = strings.Trim(appendIdList, ",")
 		var listapp []suppliercertappend.OilSupplierCertAppendTodo
 		svcapp := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 		if appendIdList != "" {

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

@@ -22,7 +22,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
           <router-link :to="'/oilsupplier/addtionaudit/techlist'">
@@ -89,7 +89,7 @@
       </div>
     </el-card>
 
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
       <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
     </el-dialog>
 
@@ -99,7 +99,7 @@
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in auditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -153,7 +153,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -177,11 +177,11 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
 
   export default {
     components: {
-      WfBackHistory,
+      WfMultiHistory,
     },
     computed: {
       ...mapGetters({
@@ -256,10 +256,10 @@
           AppendType: '', //增项类别(1 物资类，2 基建类，3 技术服务类)
           Remark: '', //备注
         },
-        backhistroy: {
-          certId: '',
-          classId: '02',
-          workflowId: ''
+        entrydetail: {
+          process: "",
+          business: "",
+          instance: ""
         },
         dialogVisible: false, //增项分类dialog
         dialogTitle: '',
@@ -336,8 +336,9 @@
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
-          this.backhistroy.certId = _this.AppendId
-          this.backhistroy.workflowId = _this.formData.WorkFlowId
+          this.entrydetail.process = this.formData.ProcessKey
+          this.entrydetail.business = this.formData.BusinessKey
+          this.entrydetail.instance = this.formData.WorkFlowId;
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -504,13 +505,13 @@
         } else {
           return
         }
-        let deplist = []
-        deplist = this.companyid.split(",")
-        let deptid = deplist[deplist.length - 1]
-        console.log(deptid)
-        this.auditerOptions = []
-        this.auditer = ''
-        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+        // let deplist = []
+        // deplist = this.companyid.split(",")
+        // let deptid = deplist[deplist.length - 1]
+        // console.log(deptid)
+        // this.auditerOptions = []
+        // this.auditer = ''
+        suppapi.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
           this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
@@ -520,7 +521,7 @@
       makeSure() {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '2' && this.formData.Status !== '4' &&
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' && this.formData.Status !== '4' &&
             this.formData.Status !== '5') {
             this.$message({
               type: 'warning',

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

@@ -22,7 +22,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
           <router-link :to="'/oilsupplier/addtionaudit/techlist'">
@@ -92,8 +92,8 @@
       </div>
     </el-card>
 
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+      <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
@@ -102,7 +102,7 @@
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in auditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -158,7 +158,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -183,11 +183,11 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
 
   export default {
     components: {
-      WfBackHistory,
+      WfMultiHistory,
     },
     computed: {
       ...mapGetters({
@@ -240,6 +240,11 @@
           label: 'name',
           children: 'children'
         },
+        entrydetail: {
+          process: "",
+          business: "",
+          instance: ""
+        },
         auditBtn: false,
         auditstepcode: '',
         dictData: null,
@@ -342,8 +347,9 @@
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
-          this.backhistroy.certId = _this.AppendId
-          this.backhistroy.workflowId = _this.formData.WorkFlowId
+          this.entrydetail.process = this.formData.ProcessKey
+          this.entrydetail.business = this.formData.BusinessKey
+          this.entrydetail.instance = this.formData.WorkFlowId;
           if (this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -512,13 +518,13 @@
         } else {
           return
         }
-        let deplist = []
-        deplist = this.companyid.split(",")
-        let deptid = deplist[deplist.length - 1]
-        console.log(deptid)
-        this.auditerOptions = []
-        this.auditer = ''
-        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+        // let deplist = []
+        // deplist = this.companyid.split(",")
+        // let deptid = deplist[deplist.length - 1]
+        // console.log(deptid)
+        // this.auditerOptions = []
+        // this.auditer = ''
+        suppapi.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
           this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
@@ -528,7 +534,7 @@
       makeSure() {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '2' && this.formData.Status !== '4' &&
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1'&& this.formData.Status !== '2' && this.formData.Status !== '4' &&
             this.formData.Status !== '5') {
             this.$message({
               type: 'warning',

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

@@ -22,7 +22,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-left: 8px" @click="AuditEntity"
             v-if="auditBtn && this.formData.Status != '6'">{{auditTitle}}</el-button>
           <router-link :to="'/oilsupplier/supplierappend/techlist'">
@@ -89,8 +89,8 @@
       </div>
     </el-card>
 
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+      <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
 
     <el-dialog title="审核" :visible.sync="dialogMakeSure">
@@ -99,7 +99,7 @@
           v-if="this.formData.Status != '2' && this.formData.Status != '4' && this.formData.Status !== '5' ">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in auditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in auditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -154,7 +154,7 @@
         <el-form-item label="审批人">
           <el-select ref="selectAuditer" v-model="auditer" placeholder="请选择" style="width: 100%" filterable allow-create
             default-first-option>
-            <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+            <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
             </el-option>
           </el-select>
         </el-form-item>
@@ -179,11 +179,11 @@
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
 
   export default {
     components: {
-      WfBackHistory,
+      WfMultiHistory,
     },
     computed: {
       ...mapGetters({
@@ -259,10 +259,10 @@
           label: 'Fullname',
           children: 'children'
         },
-        backhistroy: {
-          certId: '',
-          classId: '03',
-          workflowId: ''
+        entrydetail: {
+          process: "",
+          business: "",
+          instance: ""
         },
         organizeform: {
           IsInnerOrganize: 1,
@@ -276,6 +276,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          ProcessKey: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -359,8 +360,9 @@
         let _this = this
         api2.getEntityById(_this.AppendId, _this.$axios).then(res => {
           _this.formData = res.data
-          this.backhistroy.certId = _this.AppendId
-          this.backhistroy.workflowId = _this.formData.WorkFlowId
+          this.entrydetail.process = this.formData.ProcessKey
+          this.entrydetail.business = this.formData.BusinessKey
+          this.entrydetail.instance = this.formData.WorkFlowId;
           if (_this.formData.Status === '1') {
             this.aduitlabel = '复审人员'
             this.auditTitle = '初审'
@@ -528,13 +530,13 @@
         } else {
           return
         }
-        let deplist = []
-        deplist = this.companyid.split(",")
-        let deptid = deplist[deplist.length - 1]
-        console.log(deptid)
-        this.auditerOptions = []
-        this.auditer = ''
-        suppapi.getAuditerByDept(deptid, auditstepcode, this.$axios).then(res => {
+        // let deplist = []
+        // deplist = this.companyid.split(",")
+        // let deptid = deplist[deplist.length - 1]
+        // console.log(deptid)
+        // this.auditerOptions = []
+        // this.auditer = ''
+        suppapi.getAuditerByDept(this.authUser.Profile.DepartmentId, auditstepcode, this.$axios).then(res => {
           this.secauditerOptions = res.data.item
         }).catch(err => {
           console.error(err)
@@ -544,7 +546,7 @@
       makeSure() {
         console.log(this.auditer)
         if (this.shenheForm.SuccessStatus === 1) {
-          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '2' && this.formData.Status !== '4' &&
+          if ((!this.auditer || this.auditer === 0) && this.formData.Status !== '1' && this.formData.Status !== '2' && this.formData.Status !== '4' &&
             this.formData.Status !== '5') {
             this.$message({
               type: 'warning',

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

@@ -22,7 +22,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
           </el-button>
@@ -59,22 +59,22 @@
             </el-row>
           </el-form>
         </el-card>
-        <!-- 增项分类列表 -->
+       <!-- 增项分类列表 -->
         <el-row :gutter="2">
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 增项分类</span>
-                <el-button style="float: right; padding: 3px 0" type="text"
-                  v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
+                <span><i class="icon icon-table2"></i> 全部准入范围</span>
+                <!-- <el-button style="float: right; padding: 3px 0" type="text"
+                  v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button> -->
               </div>
               <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
-                <el-table-column label="操作" min-width="100" align="center" fixed>
+                <!-- <el-table-column label="操作" min-width="100" align="center" fixed>
                   <template slot-scope="scope">
                     <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
                       :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></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>
@@ -87,20 +87,21 @@
             </el-card>
           </el-col>
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;">
+            <!-- <goods-list ref="goodsList" :data.sync="myentityList" :canadd="add_flat"
+            :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 增项分类</span>
+                <span><i class="icon icon-table2"></i> 新增准入范围</span>
                 <el-button style="float: right; padding: 3px 0" type="text"
                   v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
               </div>
-              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="myentityList" size="mini" border style="width: 100%" @sort-change="orderby">
                 <el-table-column label="操作" min-width="100" align="center" fixed>
                   <template slot-scope="scope">
                     <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
                       :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
                   </template>
                 </el-table-column>
-                <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column> -->
                 <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
@@ -119,8 +120,8 @@
           <el-table :data="subfileList" size="mini" border>
             <el-table-column label="操作" width="150" align="center" fixed>
               <template slot-scope="scope">
-                <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)"
-                  :disabled="scope.row.SupType != 2||formData.Status > 0">编辑
+                <el-button type="primary" plain size="mini" title="上传" @click="openDialog(scope.row)"
+                  :disabled="scope.row.SupType != 2||formData.Status > 0">上传
                 </el-button>
               </template>
             </el-table-column>
@@ -236,8 +237,8 @@
       </el-pagination>
     </el-dialog>
 
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+      <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
 
     <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
@@ -252,7 +253,7 @@
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
                 allow-create default-first-option>
-                <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -291,12 +292,12 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import uploadajax from '@/assets/js//uploadajax.js'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
   import fileapi from '@/api/oilsupplier/supplierfile'
 
   export default {
     components: {
-      WfBackHistory,
+      WfMultiHistory,
       ChooseAuditor,
     },
     computed: {
@@ -322,6 +323,9 @@
         }
       }
       return {
+        filterText: '',
+        searchText: '',
+        switchstatus: false,
         yasuoname: '',
         auditbusList: [],
         audithistoryshow: false,
@@ -337,10 +341,10 @@
           label: 'name',
           children: 'children'
         },
-        backhistroy: {
-          certId: '',
-          classId: '02',
-          workflowId: ''
+        entrydetail: {
+          process: "",
+          business: "",
+          instance: ""
         },
         SupplierId: 0,
         SupplierTypeCode: '',
@@ -405,6 +409,7 @@
           Step: 1,
           Type: '',
           Status: '',
+          ProcessKey: '',
           SupplierName: '',
           SupplierId: 0,
           SupplierCertId: 0,
@@ -429,6 +434,7 @@
         },
         //列表数据
         entityList: [],
+        myentityList: [],
         //分页参数
         size: 10,
         currentPage: 1,
@@ -784,6 +790,7 @@
           //显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
           _this.getSortList()
+          _this.getMySortList()
         }).catch(err => {
           console.error(err)
         })
@@ -849,6 +856,29 @@
         })
       },
 
+      //获取增项分类表
+      getMySortList() {
+        //分页及列表条件
+        let params = {
+          // _currentPage: this.currentPage,
+          // _size: this.size,
+          // Order: this.Column.Order,
+          // Prop: this.Column.Prop,
+          SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
+          SupCertId: this.formData.SupplierCertId,
+          SupTypeCode: this.formData.AppendType,
+        };
+
+        //访问接口
+        api.getMyList(params, this.$axios).then(res => {
+          this.myentityList = res.data.item
+          console.log("------res.entityList==--", this.entityList)
+          // this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
+
       //添加增项信息
       addAppend() {
         this.formData.AppendType = '02'

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

@@ -22,7 +22,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
           </el-button>
@@ -72,7 +72,7 @@
           <el-col :span="12">
             <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 所有增项分类</span>
+                <span><i class="icon icon-table2"></i> 全部准入范围</span>
                 <!-- <el-button style="float: right; padding: 3px 0" type="text"
                   v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button> -->
               </div>
@@ -95,9 +95,11 @@
             </el-card>
           </el-col>
           <el-col :span="12">
+            <!-- <goods-list ref="goodsList" :data.sync="myentityList" :canadd="add_flat"
+            :candelete="delete_flat" height="360px" style="margin-top: 20px"></goods-list> -->
             <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 新增增项分类</span>
+                <span><i class="icon icon-table2"></i> 新增准入范围</span>
                 <el-button style="float: right; padding: 3px 0" type="text"
                   v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
               </div>
@@ -108,7 +110,6 @@
                       :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
                   </template>
                 </el-table-column>
-                <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column> -->
                 <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
@@ -127,8 +128,8 @@
           <el-table :data="subfileList" size="mini" border>
             <el-table-column label="操作" width="150" align="center" fixed>
               <template slot-scope="scope">
-                <el-button type="primary" plain size="mini" title="编辑" @click="openDialog(scope.row)"
-                  :disabled="scope.row.SupType != 2||formData.Status > 0">编辑
+                <el-button type="primary" plain size="mini" title="上传" @click="openDialog(scope.row)"
+                  :disabled="scope.row.SupType != 2||formData.Status > 0">上传
                 </el-button>
               </template>
             </el-table-column>
@@ -151,7 +152,7 @@
         </el-card>
       </div>
     </el-card>
-    <el-dialog title="编辑文件" :visible.sync="visible" top="5vh">
+    <el-dialog title="上传文件" :visible.sync="visible" top="5vh">
       <el-form :model="SubfileForm" size="mini" label-width="100px">
         <el-row>
           <el-col :span="12">
@@ -196,15 +197,23 @@
       <el-form label-width="150px" ref="dialogFormData" :rules="sortEntityFormRules" :model="dialogFormData">
         <el-row style="margin-top: -10px">
           <el-col :span="12">
-            <el-input v-model="filterText" placeholder="请输入名称或代码" size="mini" style="width: 250px;"></el-input>
-            <!-- <el-button style="float: right;" type="primary" size="mini" @click="getorgtreelist()">查询</el-button> -->
+            <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 :gutter="20" style="height: calc(100vh - 450px); overflow: auto; margin-top:20px">
           <el-col :span="20">
-            <el-tree highlight-current :expand-on-click-node="true" node-key="CodeName" :data="orgtreelist"
-              :props="orgtreeprops" ref="orgmanagetree" show-checkbox lazy :load="getChildrens"
-              :filter-node-method="filterNode">
+            <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>
@@ -222,14 +231,14 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+      <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
 
     <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
       <el-form ref="searchForm" label-width="110px">
         <el-row>
-         <el-col :span="24">
+          <el-col :span="24">
             <el-form-item label="初审人员">
               <el-input ref="selectAuditer" readonly v-model="auditerName" placeholder="请选择初审人">
                 <el-button slot="append" icon="el-icon-search" @click="chooseAuditorShow"></el-button>
@@ -238,7 +247,7 @@
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
                 allow-create default-first-option>
-                <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -272,16 +281,16 @@
     mapGetters
   } from 'vuex'
   import axios from 'axios'
+  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
   import uploadajax from '@/assets/js//uploadajax.js'
   import suppapi from '@/api/oilsupplier/supplier'
   import api from '@/api/oilsupplier/supplierappendsub'
   import api2 from '@/api/oilsupplier/supplierappend'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
 
   export default {
     components: {
-      WfBackHistory,
+      WfMultiHistory,
       ChooseAuditor
     },
     computed: {
@@ -319,8 +328,12 @@
         }
       }
       return {
+        filterText: '',
+        searchText: '',
+        switchstatus: false,
         audithistoryshow: false,
         chooseAuditorVisible: false,
+        sectreelist: [],
         orgtreelist: [], //二级单位
         preorgtreelist: [],
         secauditerOptions: [],
@@ -334,17 +347,23 @@
           value: 'Id',
           label: 'CodeName',
           children: 'children',
-          isLeaf: 'Leaf'
+          isLeaf: 'Leaf',
+          disabled: 'disabled'
+        },
+        sectreeprops: {
+          children: 'children',
+          label: 'CodeName',
+          disabled: 'disabled'
         },
         preorgtreeprops: {
           value: 'id',
           label: 'name',
           children: 'children'
         },
-        backhistroy: {
-          certId: '',
-          classId: '01',
-          workflowId: ''
+        entrydetail: {
+          process: "",
+          business: "",
+          instance: ""
         },
         auditform: {
           FirstAuditName: '',
@@ -416,6 +435,7 @@
           Id: '',
           Step: 1,
           Status: '',
+          ProcessKey: '',
           SupplierId: 0,
           SupplierCertId: 0,
           RecUnitFlag: '', //推荐单位的级联Id标记
@@ -549,7 +569,7 @@
       //     })
       // },
 
-      //获取下一级所有分类
+       //获取下一级所有分类
       getChildrens(val, resolve) {
         let Id = 0
         if (val.level === 0) {
@@ -564,6 +584,9 @@
               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' ? true : false
             }
             return resolve(res.data.items)
@@ -572,11 +595,10 @@
             console.error(err)
           })
       },
-      filterNode(value, data) {
-        if (!value) return true;
-        return data.CodeName.indexOf(value) !== -1;
+      filterNode (value, data) {
+        if (!value) return true
+        return data.CodeName.indexOf(value) !== -1
       },
-
       //获取分类级联Id
       getCode(item) {
         let sortFlagStr = item.toString()
@@ -623,8 +645,9 @@
         api2.getEntityById(_this.Id, _this.$axios).then(res => {
           _this.formData = res.data
           console.log("---this.formData---", _this.formData)
-          this.backhistroy.certId = _this.Id
-          this.backhistroy.workflowId = _this.formData.WorkFlowId
+          this.entrydetail.process = this.formData.ProcessKey
+          this.entrydetail.business = this.formData.BusinessKey
+          this.entrydetail.instance = this.formData.WorkFlowId;
           this.getFileList()
           //显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
@@ -989,17 +1012,36 @@
       ensureOption() {
         let _this = this
         let arr = []
-        let val = this.$refs.orgmanagetree.getCheckedNodes()
+        let val1 = this.$refs.orgmanagetree.getCheckedNodes()
+        let val2 = this.$refs.secmanagetree.getCheckedNodes()
         this.checkList = []
-        for (var i = 0; i < val.length; i++) {
-          if (!val[i].children || val[i].children.length <= 0) {
-            this.checkList.push(val[i])
+        for (var i = 0; i < val1.length; i++) {
+          if (val1[i].Code.length == 8) {
+            this.checkList.push(val1[i])
+          }
+        }
+        for (var i = 0; i < val2.length; i++) {
+          if (val2[i].Code.length == 8) {
+            this.checkList.push(val2[i])
           }
         }
         _this.dialogFormData.SupplierId = _this.formData.SupplierId
         _this.dialogFormData.SupplierCertId = _this.formData.SupplierCertId
         _this.dialogFormData.SupplierCertAppendId = parseInt(_this.dialogFormData.SupplierCertAppendId)
         _this.addSortAppend()
+        _this.switchstatus = false
+      },
+
+      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')
+          })
+          .catch(err => {
+            console.error(err)
+          })
       },
 
       //判断是否保存了增项信息
@@ -1035,6 +1077,7 @@
           })
           return
         }
+        console.log("parmas", params)
         _this.$axios.post('/suppliercertappendsub/addgoodsbus/', params)
           .then(res => {
             if (res.data.code === 0) {
@@ -1057,6 +1100,10 @@
           .catch(err => {
             console.error(err)
           })
+        this.$refs.orgmanagetree.setCheckedKeys([])
+        this.$refs.secmanagetree.setCheckedKeys([])
+        this.filterText = ''
+        this.searchText = ''
       },
 
       //删除增项分类信息

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

@@ -22,7 +22,7 @@
             </el-steps>
             <el-button slot="reference" plain size="mini" style="margin-right: 8px">查看进度</el-button>
           </el-popover>
-          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批历史</el-button>
+          <el-button type="primary" size="mini" style="margin-left: 8px" @click="auhistory">审批流程</el-button>
           <el-button type="primary" size="mini" style="margin-right: 8px" @click="AuditdialogShow = true"
             v-if="formData.Id !='' && formData.Status <= 0 && formData.Status != -5">提交审批
           </el-button>
@@ -70,57 +70,38 @@
             </el-row>
           </el-form>
         </el-card>
-        <!-- 增项分类列表 -->
-        <!-- 增项分类列表 -->
+         <!-- 增项分类列表 -->
         <el-row :gutter="2">
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 增项分类</span>
-                <el-button style="float: right; padding: 3px 0" type="text"
-                  v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
+                <span><i class="icon icon-table2"></i> 全部准入范围</span>
               </div>
               <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
-                <el-table-column label="操作" min-width="100" align="center" fixed>
-                  <template slot-scope="scope">
-                    <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
-                      :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
-                  </template>
-                </el-table-column>
-                <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column> -->
                 <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
               </el-table>
-              <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination> -->
             </el-card>
           </el-col>
           <el-col :span="12">
-            <el-card class="box-card" style="margin-top: 10px;">
+            <el-card class="box-card" style="margin-top: 10px;height: calc(100vh - 353px);overflow: auto">
               <div slot="header">
-                <span><i class="icon icon-table2"></i> 增项分类</span>
+                <span><i class="icon icon-table2"></i> 新增准入范围</span>
                 <el-button style="float: right; padding: 3px 0" type="text"
                   v-if="formData.Status <= 0 && formData.Status != -5" @click="addSortData()">添加</el-button>
               </div>
-              <el-table :data="entityList" size="mini" border style="width: 100%" @sort-change="orderby">
+              <el-table :data="myentityList" size="mini" border style="width: 100%" @sort-change="orderby">
                 <el-table-column label="操作" min-width="100" align="center" fixed>
                   <template slot-scope="scope">
                     <el-button type="primary" title="删除" size="mini" plain @click="deleteData(scope.row.Id)"
                       :disabled="scope.row.Type == '1'||formData.Status > 0">删除</el-button>
                   </template>
                 </el-table-column>
-                <!-- <el-table-column prop="SortFlag" label="分类标记" v-if="1==2" show-overflow-tooltip></el-table-column> -->
                 <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
                 <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
               </el-table>
-              <!-- <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-            :current-page="currentPage" :page-sizes="[10, 15, 20, 25]" :page-size="size"
-            layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
-          </el-pagination> -->
             </el-card>
           </el-col>
         </el-row>
@@ -225,8 +206,8 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="审批历史" :visible.sync="audithistoryshow" width="1200px">
-      <wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>
+    <el-dialog title="审批流程" :visible.sync="audithistoryshow" width="1200px">
+       <wf-multi-history ref="WfHistory" :entryinfo="entrydetail"></wf-multi-history>
     </el-dialog>
 
     <el-dialog title="提交初审" :visible.sync="AuditdialogShow" width="520px">
@@ -241,7 +222,7 @@
             <el-form-item label="复审人员">
               <el-select ref="selectAuditer" v-model="fushenauditer" placeholder="请选择复审人" style="width: 100%" filterable
                 allow-create default-first-option>
-                <el-option v-for="item in secauditerOptions" :key="item.id" :label="item.realname" :value="item.id">
+                <el-option v-for="item in secauditerOptions" :key="item.Id" :label="item.Realname" :value="item.Id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -282,11 +263,11 @@
   import api2 from '@/api/oilsupplier/supplierappend'
   import apiCert from '@/api/oilsupplier/suppliercert'
   import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
-  import WfBackHistory from '@/components/workflow/wfbackhistory.vue'
+  import WfMultiHistory from "@/components/workflow/wfmultihistory.vue";
 
   export default {
     components: {
-      WfBackHistory,
+      WfMultiHistory,
       ChooseAuditor
     },
     computed: {
@@ -339,10 +320,10 @@
           label: 'name',
           children: 'children'
         },
-        backhistroy: {
-          certId: '',
-          classId: '03',
-          workflowId: ''
+        entrydetail: {
+          process: "",
+          business: "",
+          instance: ""
         },
         auditform: {
           FirstAuditName: '',
@@ -477,7 +458,6 @@
       if (this.editFlag == '1' && this.Id !== '') {
         this.getEntityById()
         this.dialogFormData.SupplierCertAppendId = this.Id
-        this.getSortList()
       }
       this.getOrgTreeList() //获取推荐单位层级列表
       //this.getTechTreeList() //获取技术服务类层级列表
@@ -594,12 +574,14 @@
         api2.getEntityById(_this.Id, _this.$axios).then(res => {
           _this.formData = res.data
           console.log("---this.formData---", _this.formData)
-          this.backhistroy.certId = _this.Id
-          this.backhistroy.workflowId = _this.formData.WorkFlowId
+          this.entrydetail.process = this.formData.ProcessKey
+          this.entrydetail.business = this.formData.BusinessKey
+          this.entrydetail.instance = this.formData.WorkFlowId;
           this.getFileList()
           //显示公司名
           _this.supplierOptions = _this.formData.SupplierId.toString()
           _this.getSortList()
+          _this.getMySortList()
         }).catch(err => {
           console.error(err)
         })
@@ -838,6 +820,28 @@
           console.error(err)
         })
       },
+      //获取增项分类表
+      getMySortList() {
+        //分页及列表条件
+        let params = {
+          // _currentPage: this.currentPage,
+          // _size: this.size,
+          // Order: this.Column.Order,
+          // Prop: this.Column.Prop,
+          SupplierCertAppendId: this.dialogFormData.SupplierCertAppendId,
+          SupCertId: this.formData.SupplierCertId,
+          SupTypeCode: this.formData.AppendType,
+        };
+
+        //访问接口
+        api.getMyList(params, this.$axios).then(res => {
+          this.myentityList = res.data.item
+          console.log("------res.entityList==--", this.entityList)
+          // this.currentItemCount = res.data.currentItemCount
+        }).catch(err => {
+          console.error(err)
+        })
+      },
 
       //添加增项信息
       addAppend() {