增项物资审批修改，供方曾用名查询页面

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

@@ -14,6 +14,7 @@ type OilSupplierCertAppend struct {
 	RecUnitId      string    `xorm:"comment('推荐单位编码') VARCHAR(50)"`
 	RecUnitName    string    `xorm:"comment('推荐单位名称') VARCHAR(200)"`
 	AppendType     string    `xorm:"comment('增项类别(1 物资类，2 基建类，3 技术服务类)') VARCHAR(10)"`
+	InStyle        string    `xorm:"default '1' comment('准入方式') VARCHAR(10)"`
 	DenyReason     string    `xorm:"comment('退回原因') VARCHAR(50)"`
 	AuditDate      time.Time `xorm:"comment('审核日期') DATETIME"`
 	Status         string    `xorm:"comment('状态标识') VARCHAR(50)"`

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -73,6 +73,11 @@ const (
 	//二级物资供方准入流程图
 	OIL_SECOND_SUPPLIER_APPLY string = "oil_second_supplier_apply"
 
+	//一级物资供方增项流程图
+	OIL_FIRST_APPEND_APPLY string = "oil_first_append_apply"
+	//二级物资供方准入流程图
+	OIL_SECOND_APPEND_APPLY string = "oil_second_append_apply"
+
 	//业务步骤编码 初审
 	FIRST_TRIAL string = "FIRST_TRIAL"
 	// 复审

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

@@ -362,6 +362,65 @@ func (this *InfoChangeController) GetSuppList() {
 	this.ServeJSON()
 }
 
+// @Title 获取列表
+// @Description get user by token
+// @Success 200 {object} []infochange.OilInfoChange
+// @router /alllist [get]
+func (this *InfoChangeController) GetAllEntityList() {
+	//获取分页信息
+	page := this.GetPageInfoForm()
+	where := " 1=1 "
+	orderby := "Id"
+	asc := false
+	Order := this.GetString("Order")
+	Prop := this.GetString("Prop")
+	if Order != "" && Prop != "" {
+		orderby = Prop
+		if Order == "asc" {
+			asc = true
+		}
+	}
+	SupplierTypeName := this.GetString("SupplierTypeName")
+	RecUnitId := this.GetString("RecUnitId")
+	AccessCardNo := this.GetString("AccessCardNo")
+	SupplierName := this.GetString("SupplierName")
+	CreateOn := this.GetString("CreateOn")
+
+	if SupplierTypeName != "" {
+		where = where + " and SupplierTypeName like '%" + SupplierTypeName + "%'"
+	}
+
+	if RecUnitId != "" {
+		where = where + " and RecUnitId like '%" + RecUnitId + "%'"
+	}
+
+	if AccessCardNo != "" {
+		where = where + " and AccessCardNo like '%" + AccessCardNo + "%'"
+	}
+
+	if SupplierName != "" {
+		where = where + " and SupplierName like '%" + SupplierName + "%'"
+	}
+
+	if CreateOn != "" {
+		dates := strings.Split(CreateOn, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and CreateOn>='" + minDate + "' and CreateOn<='" + maxDate + "'"
+		}
+	}
+	svc := infochange.GetInfoChangeService(utils.DBE)
+	var list []infochange.OilInfoChange
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
+	var datainfo DataInfo
+	datainfo.Items = list
+	datainfo.CurrentItemCount = total
+	datainfo.PageIndex = page.CurrentPage
+	datainfo.ItemsPerPage = page.Size
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}
 
 // @Title 获取列表
 // @Description get user by token

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

@@ -179,6 +179,7 @@ func (this *OilSupplierCertAppendController) AddAppend() {
 	//	return
 	//}
 	//添加增项信息
+	model.InStyle = cermodel.InStyle
 	model.ApplyDate = time.Now() //申请日期
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
@@ -467,10 +468,24 @@ func (this *OilSupplierCertAppendController) AuditEntity() {
 	if supplierCertAppendEntity.WorkFlowId == "0" || len(supplierCertAppendEntity.WorkFlowId) <= 0 {
 		//启动工作流
 		businessKey = certappendId + "-" +  strconv.Itoa(supplierCertAppendEntity.AuditIndex)
-		processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, businessKey, this.User.Id)
+		if supplierCertAppendEntity.InStyle == "2" {
+			processInstanceId = svcActiviti.StartProcess(workflow.OIL_FIRST_APPEND_APPLY, businessKey, this.User.Id)
+		}else if  supplierCertAppendEntity.InStyle == "3" {
+			processInstanceId = svcActiviti.StartProcess(workflow.OIL_SECOND_APPEND_APPLY, businessKey, this.User.Id)
+		}else {
+			processInstanceId = svcActiviti.StartProcess(workflow.OIL_APPEND_APPLY, businessKey, this.User.Id)
+		}
+
 	}
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
+	if supplierCertAppendEntity.InStyle == "2" {
+		ActiComplete.ProcessKey = workflow.OIL_FIRST_APPEND_APPLY
+	}else if  supplierCertAppendEntity.InStyle == "3" {
+		ActiComplete.ProcessKey = workflow.OIL_SECOND_APPEND_APPLY
+	}else{
+		ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
+	}
+
 	ActiComplete.BusinessKey = businessKey
 	ActiComplete.UserNames = firstAudit
 	ActiComplete.UserId = this.User.Id
@@ -558,6 +573,11 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 	status := ""
 	backstatus := "0"
 	var userIds string
+	if supplierCertAppendEntity.InStyle == "2" {
+		if supplierCertAppendEntity.Status == suppliercert.SECOND_TRIAL_STATUS{
+			supplierCertAppendEntity.Status = "4"
+		}
+	}
 	if supplierCertAppendEntity.Status == "1" {
 		userIds = utils.ToStr(dataother.Auditer)
 		status = suppliercert.SECOND_TRIAL_STATUS
@@ -611,7 +631,14 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	var ActiComplete workflow.ActiCompleteVM
-	ActiComplete.ProcessKey = workflow.OIL_APPEND_APPLY
+	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.BusinessKey = supplierCertAppendEntity.BusinessKey
 	ActiComplete.UserNames = userIds
 	ActiComplete.UserId = this.User.Id
@@ -630,16 +657,18 @@ func (this *OilSupplierCertAppendController) AuditEntityFir() {
 			}
 			certSrv.UpdateEntityByIdCols(appendId, supplierCertAppendEntity, cols)
 			if supplierCertAppendEntity.Status == "5" {
-				paysvc := paymentinfo.GetPaymentService(utils.DBE)
-				var Amount float64
-				if supplierCertAppendEntity.AppendType == "01" {
-					Amount = 6000
-				} else if supplierCertAppendEntity.AppendType == "02" {
-					Amount = 7000
-				} else if supplierCertAppendEntity.AppendType == "03" {
-					Amount = 8000
+				if supplierCertAppendEntity.InStyle == "1" {
+					paysvc := paymentinfo.GetPaymentService(utils.DBE)
+					var Amount float64
+					if supplierCertAppendEntity.AppendType == "01" {
+						Amount = 6000
+					} else if supplierCertAppendEntity.AppendType == "02" {
+						Amount = 7000
+					} else if supplierCertAppendEntity.AppendType == "03" {
+						Amount = 8000
+					}
+					paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
 				}
-				paysvc.AddPaymentinfo(supplierCertAppendEntity.SupplierId, supplierCertAppendEntity.Id, Amount, "3")
 			}
 			errinfo.Message = "提交成功！"
 			errinfo.Code = 0

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

@@ -0,0 +1,9 @@
+export default {
+  getNameList (CreateOn,params, myAxios) {
+    return myAxios({
+      url:'/infochange/alllist?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  }
+}

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

@@ -67,7 +67,7 @@
             <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>
+                  :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> -->
@@ -88,7 +88,7 @@
             <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'">编辑
+                  :disabled="scope.row.SupType != 2||formData.Status > 0">编辑
                 </el-button>
               </template>
             </el-table-column>

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

@@ -75,7 +75,7 @@
             <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>
+                  :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>
@@ -96,7 +96,7 @@
             <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'">编辑
+                  :disabled="scope.row.SupType != 2||formData.Status > 0">编辑
                 </el-button>
               </template>
             </el-table-column>
@@ -241,6 +241,11 @@
         session: 'session'
       })
     },
+    watch: {
+      filterText(val) {
+        this.$refs.orgmanagetree.filter(val);
+      }
+    },
     name: 'oilsuppliercertappendsub',
 
     data() {

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

@@ -80,7 +80,7 @@
             <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>
+                  :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>
@@ -101,7 +101,7 @@
             <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'">编辑
+                  :disabled="scope.row.SupType != 2||formData.Status > 0">编辑
                 </el-button>
               </template>
             </el-table-column>

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

@@ -262,6 +262,7 @@
         //访问接口
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
+          console.log("--this.entityList---",this.entityList)
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)

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

@@ -261,6 +261,7 @@
         //访问接口
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
+          console.log("--this.entityList---",this.entityList)
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)

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

@@ -262,6 +262,7 @@
         //访问接口
         api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
           this.entityList = res.data.items
+          console.log("--this.entityList---",this.entityList)
           this.currentItemCount = res.data.currentItemCount
         }).catch(err => {
           console.error(err)

src/dashoo.cn/frontend_web/src/pages/select/usednameselect/index.vue

@@ -0,0 +1,226 @@
+<template>
+  <div>
+    <!--顶部显示-->
+    <el-breadcrumb class="heading">
+      <el-breadcrumb-item :to="{ path: '/' }">平台首页</el-breadcrumb-item>
+      <el-breadcrumb-item>曾用名查询</el-breadcrumb-item>
+    </el-breadcrumb>
+
+    <!--内框顶部显示-->
+    <el-card class="box-card" style="height: calc(100vh - 115px);position:relative">
+      <div slot="header">
+        <span>
+          <i class="icon icon-table2"></i> 供方曾用名查询
+        </span>
+
+        <el-form :model="searchForm" ref="searchformRef" :inline="true"
+          style="float: right;position:absolute;right:15px;top:10.5px">
+          <el-form-item label="企业名称">
+            <el-input size="mini" v-model="searchForm.SupplierName" placeholder="请输入内容"></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-dropdown split-button type="primary" size="mini" @click="initDatas($event)" @command="searchCommand">
+              查询
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item command="clear">查询重置</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="mini" @click="exportExcel">导出</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+
+      <!--内框表格显示-->
+      <el-table id="rebateSetTable" :data="entityList" size="small" border height="calc(100vh - 243px)"
+        style="width: 100%" @sort-change="orderby" @cell-click="handle" @cell-mouse-enter="changeClor"
+        @cell-mouse-leave="backClor">
+        <!--内框表格剩余栏显示-->
+        <el-table-column label="企业名称" prop="SupplierName" sortable align="center"></el-table-column>
+        <el-table-column label="曾用名" prop="OldSupplierName" align="center"></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>
+  </div>
+</template>
+
+
+<script>
+  import api from "@/api/oilsupplier/usednameselect";
+  import FileSaver from "file-saver";
+  import XLSX from "xlsx";
+  export default {
+    created() {
+      // 执行初始化方法
+      this.initDatas();
+    },
+    data() {
+      return {
+        show: false,
+        // 定义列表数据
+        entityList: [],
+        // 分页参数
+        size: 10,
+        currentPage: 1,
+        currentItemCount: 0,
+        //查询时间
+        CreateOn: [new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()],
+        searchForm: {
+          SupplierName: "",
+          SupplierTypeName: ""
+        },
+        //列表排序
+        Column: {
+          Order: "",
+          Prop: ""
+        }
+      };
+    },
+
+    methods: {
+      //初始化列表方法
+      initDatas(event) {
+        console.log(event);
+        if (event != null) {
+          this.currentPage = 1;
+        }
+        let params = {
+          _size: this.size,
+          _currentPage: this.currentPage,
+          Order: this.Column.Order,
+          Prop: this.Column.Prop
+        };
+        let myCreateOn = []
+        // 解析时间
+        if (this.CreateOn.length == 2) {
+          this.CreateOn[1].setHours(23)
+          this.CreateOn[1].setMinutes(59)
+          this.CreateOn[1].setSeconds(59)
+          myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
+          myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
+        }
+        //查询条件
+        Object.assign(params, this.searchForm)
+        api.getNameList(myCreateOn,params, this.$axios)
+          .then(res => {
+            console.log(res.data.items);
+            this.entityList = res.data.items;
+            this.currentItemCount = res.data.currentItemCount;
+          })
+          .catch(err => {
+            console.error(err);
+          });
+      },
+      exportExcel() {
+        /* generate workbook object from table */
+        let wb = XLSX.utils.table_to_book(
+          document.querySelector("#rebateSetTable")
+        );
+        /* get binary string as output */
+        let wbout = XLSX.write(wb, {
+          bookType: "xlsx",
+          bookSST: true,
+          type: "array"
+        });
+        try {
+          FileSaver.saveAs(
+            new Blob([wbout], {
+              type: "application/octet-stream"
+            }),
+            "SupplierSituation.xlsx"
+          );
+        } catch (e) {
+          if (typeof console !== "undefined") console.log(e, wbout);
+        }
+        return wbout;
+      },
+      backClor(row, column, event, cell) {
+        if (column.property === "SupplierName") {
+          event.style.background = "";
+        }
+      },
+      changeClor(row, column, event, cell) {
+        if (column.property === "SupplierName") {
+          event.style.background = "#d3dce6";
+        }
+      },
+
+      //列表排序功能
+      orderby(column) {
+        if (column.order == "ascending") {
+          this.Column.Order = "asc";
+        } else if (column.order == "descending") {
+          this.Column.Order = "desc";
+        }
+        this.Column.Prop = column.prop;
+        this.initDatas();
+      },
+      jstimehandle(val) {
+        if (val === "") {
+          return "----";
+        } else if (val === "0001-01-01T08:00:00+08:00") {
+          return "----";
+        } else if (val === "0001-01-01T00:00:00Z") {
+          return "----";
+        } else if (val === "5000-01-01T23:59:59+08:00") {
+          return "永久";
+        } else {
+          val = val.replace("T", " ");
+          return val.substring(0, 10);
+        }
+      },
+
+      //分页方法
+      handleCurrentChange(value) {
+        this.currentPage = value;
+        this.initDatas();
+      },
+      handleSizeChange(value) {
+        this.size = value;
+        this.currentPage = 1;
+        this.initDatas();
+      },
+      searchCommand(command) {
+        if (command == "clear") {
+          this.clearSearch();
+        }
+      },
+      formatDateTime(date) {
+        var y = date.getFullYear();
+        var m = date.getMonth() + 1;
+        m = m < 10 ? ('0' + m) : m;
+        var d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        var h = date.getHours();
+        var minute = date.getMinutes();
+        minute = minute < 10 ? ('0' + minute) : minute;
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute;
+      },
+      clearSearch() {
+        this.searchForm.SupplierTypeName = "";
+        this.searchForm.SupplierName = "";
+        this.currentPage = 1;
+        this.initDatas();
+      }
+    }
+  };
+
+</script>
+
+<style>
+  .eldialog .el-input__inner {
+    border: none;
+  }
+
+  .eldialog .el-textarea__inner {
+    border: none;
+    resize: none;
+    height: 70px;
+  }
+
+</style>