物资类准入选择-部分

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

@@ -1,12 +1,13 @@
 package oilsupplier
 
 import (
-	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitudeclass"
 	"encoding/json"
 	"strconv"
 	"strings"
 	"time"
 
+	"dashoo.cn/backend/api/business/oilsupplier/goodsaptitudeclass"
+
 	"dashoo.cn/backend/api/business/items"
 
 	"dashoo.cn/backend/api/business/baseUser"
@@ -55,7 +56,7 @@ func (this *OilGoodsAptitudeController) GetEntityList() {
 	Standard := this.GetString("Standard")
 	CompanyType := this.GetString("CompanyType")
 
-	if Edition!="" {
+	if Edition != "" {
 		where = where + " and Edition = '" + Edition + "'"
 	}
 	if Code != "" {
@@ -122,6 +123,7 @@ func (this *OilGoodsAptitudeController) GetEntityList() {
 	this.Data["json"] = &datainfo
 	this.ServeJSON()
 }
+
 // @Title 获取列表2019版本
 // @Description
 // @Success 200 {object}
@@ -147,8 +149,7 @@ func (this *OilGoodsAptitudeController) GetEntityList_2019() {
 	Code := this.GetString("Code")
 	Name := this.GetString("Name")
 
-
-	if Edition!="" {
+	if Edition != "" {
 		where = where + " and a.Edition = '" + Edition + "'"
 	}
 	if Code != "" {
@@ -161,7 +162,7 @@ func (this *OilGoodsAptitudeController) GetEntityList_2019() {
 
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	var list []goodsaptitude.OilGoodsAptitude_2
-	total := svc.GetList_2019(OilGoodsAptitudeName,OilGoodsAptitudeClassName,page.CurrentPage, page.Size, orderby, asc, &list, where)
+	total := svc.GetList_2019(OilGoodsAptitudeName, OilGoodsAptitudeClassName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 	var datainfo DataInfo
 	datainfo.Items = list
 	datainfo.CurrentItemCount = total
@@ -171,7 +172,6 @@ func (this *OilGoodsAptitudeController) GetEntityList_2019() {
 	this.ServeJSON()
 }
 
-
 // @Title 获取字典列表
 // @Description get user by token
 // @Success 200 {object} map[string]interface{}
@@ -230,12 +230,13 @@ a.F31,a.F32,a.F33,a.F34,a.F35,a.F36,a.F37,a.F38,a.F39,a.F40,
 a.F41,a.F42,a.F43,a.F44,a.F45,a.F46,b.Code, b.Name `
 	sql += ` from ` + OilGoodsAptitudeName + ` a `
 	sql += ` left join ` + OilGoodsAptitudeClassName + " b on b.Id = a.ClassId"
-	sql += ` where a.Id='`+Id+`'`
-	tempMap,_=svc.DBE.QueryString(sql)
+	sql += ` where a.Id='` + Id + `'`
+	tempMap, _ = svc.DBE.QueryString(sql)
 
 	this.Data["json"] = &tempMap
 	this.ServeJSON()
 }
+
 // @Title 添加
 // @Description 新增
 // @Success	200	{object} controllers.Request
@@ -269,7 +270,6 @@ func (this *OilGoodsAptitudeController) AddEntity() {
 	}
 }
 
-
 // @Title 添加
 // @Description 新增
 // @Success	200	{object} controllers.Request
@@ -279,8 +279,8 @@ func (this *OilGoodsAptitudeController) AddEntity_2019() {
 	var model goodsaptitudeclass.OilGoodsAptitudeClass
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
-	model.ParentId=-1
-	model.Edition="2"
+	model.ParentId = -1
+	model.Edition = "2"
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -288,8 +288,8 @@ func (this *OilGoodsAptitudeController) AddEntity_2019() {
 
 	var model2 goodsaptitude.OilGoodsAptitude
 	json.Unmarshal(jsonBlob, &model2)
-	model2.ClassId=model.Id
-	model2.Edition="2"
+	model2.ClassId = model.Id
+	model2.Edition = "2"
 	model2.CreateOn = time.Now()
 	model2.CreateBy = this.User.Realname
 	model2.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -483,7 +483,6 @@ func (this *OilGoodsAptitudeController) UpdateEntity() {
 	}
 }
 
-
 // @Title 修改实体
 // @Description 修改实体
 // @Success	200	{object} controllers.Request
@@ -640,6 +639,7 @@ func (this *OilGoodsAptitudeController) UpdateEntity_2019() {
 		this.ServeJSON()
 	}
 }
+
 // @Title 修改实体
 // @Description 修改实体
 // @Success	200	{object} controllers.Request
@@ -668,8 +668,8 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 	colsName := []string{"Name"}
 	colsCode := []string{"Code"}
 	//svc.GetEntityById(id, &model)
-	if classall.Name1 != ""{
-		where := " Name = '" + classall.Name1 +"' and Id  <> "+utils.ToStr(classall.Id1)
+	if classall.Name1 != "" {
+		where := " Name = '" + classall.Name1 + "' and Id  <> " + utils.ToStr(classall.Id1)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "大类名称已存在，请重新添加！"
@@ -677,13 +677,13 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Name = classall.Name1
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id1, &model, colsName)
 		}
 	}
-	if classall.Name2 != ""{
-		where := " Name = '" + classall.Name2 +"' and Id  <> "+utils.ToStr(classall.Id2)
+	if classall.Name2 != "" {
+		where := " Name = '" + classall.Name2 + "' and Id  <> " + utils.ToStr(classall.Id2)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "中类名称已存在，请重新添加！"
@@ -691,13 +691,13 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Name = classall.Name2
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id2, &model, colsName)
 		}
 	}
-	if classall.Name3 != ""{
-		where := " Name = '" + classall.Name3 +"' and Id  <> "+utils.ToStr(classall.Id3)
+	if classall.Name3 != "" {
+		where := " Name = '" + classall.Name3 + "' and Id  <> " + utils.ToStr(classall.Id3)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "小类名称已存在，请重新添加！"
@@ -705,13 +705,13 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Name = classall.Name3
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id3, &model, colsName)
 		}
 	}
-	if classall.Name4 != ""{
-		where := " Name = '" + classall.Name4 + "' and Id  <> "+utils.ToStr(classall.Id4)
+	if classall.Name4 != "" {
+		where := " Name = '" + classall.Name4 + "' and Id  <> " + utils.ToStr(classall.Id4)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "品名已存在，请重新添加！"
@@ -719,13 +719,13 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Name = classall.Name4
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id4, &model, colsName)
 		}
 	}
-	if classall.Code1 != ""{
-		where := " Code = " + classall.Code1 +" and Id <> "+utils.ToStr(classall.Id1)
+	if classall.Code1 != "" {
+		where := " Code = " + classall.Code1 + " and Id <> " + utils.ToStr(classall.Id1)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "大类编码已存在，请重新添加！"
@@ -733,13 +733,13 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Code = classall.Code1
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id1, &model, colsCode)
 		}
 	}
-	if classall.Code2 != ""{
-		where := " Code = " + classall.Code2 +" and Id <> "+utils.ToStr(classall.Id2)
+	if classall.Code2 != "" {
+		where := " Code = " + classall.Code2 + " and Id <> " + utils.ToStr(classall.Id2)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "中类编码已存在，请重新添加！"
@@ -747,13 +747,13 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Code = classall.Code2
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id2, &model, colsCode)
 		}
 	}
-	if classall.Code3 != ""{
-		where := " Code = " + classall.Code3 +" and Id <> "+utils.ToStr(classall.Id3)
+	if classall.Code3 != "" {
+		where := " Code = " + classall.Code3 + " and Id <> " + utils.ToStr(classall.Id3)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "小类编码已存在，请重新添加！"
@@ -761,13 +761,13 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Code = classall.Code3
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id3, &model, colsCode)
 		}
 	}
-	if classall.Code4 != ""{
-		where := " Code = " + classall.Code4 +" and Id <> "+utils.ToStr(classall.Id4)
+	if classall.Code4 != "" {
+		where := " Code = " + classall.Code4 + " and Id <> " + utils.ToStr(classall.Id4)
 		svc.GetEntitysByWhere(OilGoodsAptitudeClassName, where, &classmodel)
 		if len(classmodel) > 0 {
 			errinfo.Message = "品名编码已存在，请重新添加！"
@@ -775,7 +775,7 @@ func (this *OilGoodsAptitudeController) UpdateCodeEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 			return
-		}else {
+		} else {
 			model.Code = classall.Code4
 			err = svc.UpdateEntityBytbl(OilGoodsAptitudeClassName, classall.Id4, &model, colsCode)
 		}
@@ -838,7 +838,7 @@ func (this *OilGoodsAptitudeController) GoodsParentList() {
 		where1 += " AND Name LIKE '%" + Name + "%' OR Code LIKE '" + Name + "%' "
 
 		sqlStr := "SELECT Id, Code, Name, concat(Code, '  ', Name) as CodeName, ParentId FROM OilGoodsAptitudeClass " +
-			"WHERE " + where1 + " AND DeletionStateCode = 0 ORDER BY Code"
+			"WHERE " + where1 + " AND Edition='1' AND DeletionStateCode = 0 ORDER BY Code"
 		list, _ := svc.DBE.QueryString(sqlStr)
 		/*
 			sql := "SELECT Id, Code, Name, concat(Code, '  ', Name) as CodeName, ParentId FROM OilGoodsAptitudeClass " +
@@ -872,7 +872,7 @@ func (this *OilGoodsAptitudeController) GoodsChildList() {
 // @router /goodschildlistbypid/:parentid [get]
 func (this *OilGoodsAptitudeController) GoodsChildLisByParentId() {
 	ParentId := this.Ctx.Input.Param(":parentid")
-	sqlStr := "SELECT Id, `Code`, `Name`, concat(Code, '  ', Name) as CodeName, ParentId, (CASE WHEN length(Code)>=8 THEN '1' ELSE '0' END) as Leaf FROM OilGoodsAptitudeClass WHERE ParentId = '" + ParentId + "' AND DeletionStateCode = 0 order by Code"
+	sqlStr := "SELECT Id, `Code`, `Name`, concat(Code, '  ', Name) as CodeName, ParentId, (CASE WHEN length(Code)>=8 THEN '1' ELSE '0' END) as Leaf FROM OilGoodsAptitudeClass WHERE ParentId = '" + ParentId + "' AND Edition='1' AND DeletionStateCode = 0 order by Code"
 	svc := goodsaptitude.GetOilGoodsAptitudeService(utils.DBE)
 	list, _ := svc.DBE.QueryString(sqlStr)
 	var datainfo DataInfo

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

@@ -14,7 +14,7 @@
           width="55">
         </el-table-column>
 
-        <el-table-column prop="Code" label="分类编码" 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="CertSubStatus" label="状态" show-overflow-tooltip>
             <template slot-scope="scope">
@@ -41,36 +41,68 @@
     </el-card>
 
     <el-dialog v-loading="loading" element-loading-text="正在添加请稍后..." title="物资类业务列表" :visible.sync="goodsDialog" top="5vh">
-      <el-row style="margin-top: -10px">
-        <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 :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>
-      <div slot="footer" class="dialog-footer">
+      <el-tabs v-model="tabIdx" style="margin-top: -30px;">
+        <el-tab-pane label="2018修正版" 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 :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-tab-pane>
+
+        <el-tab-pane label="2019版" name="2">
+          <!--<span style="float: right;" style="margin-top: 5px">
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="seachdata()">查询
+            </el-button>
+            <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;" @click="basicDialog = false">
+              取消</el-button>
+          </span>
+          <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
+            <el-form-item label="业务名称">
+              <el-input size="mini" style="width: 165px;" v-model="keyword" placeholder="请输入业务名称"></el-input>
+            </el-form-item>
+          </el-form>
+          <el-table :data="techList" border>
+            <el-table-column label="操作" width="70" align="center" fixed>
+              <template slot-scope="scope">
+                <el-button type="text" size="small" @click="getChooseCode(scope.row)">选择</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="Code" label="分类编码" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="Name" label="分类名称" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="Remark" label="备注" show-overflow-tooltip></el-table-column>
+          </el-table>
+          <el-pagination @size-change="HandleSizeChange" @current-change="HandleCurrentChange" :current-page="CurrentPage"
+                         :page-sizes="[10, 15, 20, 25]" :page-size="Size" layout="total, sizes, prev, pager, next, jumper"
+                         :total="CurrentItemCount">
+          </el-pagination>-->
+        </el-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>
@@ -120,6 +152,7 @@
         SupplierId: 0,
         SupplierTypeCode: '',
         SupplierCertId: 0,
+        tabIdx: '1',
 
         goodsList: [],
         goodsDialog: false,