资质排序码

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

@@ -12,6 +12,7 @@ type BaseTableheader struct {
 	Categoryname   string    `xorm:"not null comment('类别名称') VARCHAR(20)"`
 	Remark         string    `xorm:"comment('备注') VARCHAR(500)"`
 	Isdelete       int       `xorm:"default 0 comment('是否以删除（0正常，1已删除）') INT(10)"`
+	SortCode       int       `xorm:"default 0 comment('排序码') INT(10)"`
 	Createon       time.Time `xorm:"comment('创建时间') DATETIME"`
 	Createuserid   int       `xorm:"comment('创建者编号 ') INT(10)"`
 	Createby       string    `xorm:"comment('创建者') VARCHAR(50)"`

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

@@ -350,7 +350,7 @@ func (this *OilSupplierCertSubController) AddGoodsBus() {
 			for i := 0; i < len(list); i++ {
 				hasField += list[i].NeedFileType + ","
 			}
-			mustField := "营业执照,组织代码,税务登记,开户许可,银行开户许可证,承诺书,企业信息系统截图,战略合作协议扫描件,"
+			mustField := "营业执照,组织代码,税务登记,开户许可,银行开户许可证,承诺书,诚信合规承诺书,企业信息系统截图,战略合作协议扫描件,"
 			for i := 0; i < len(needList); i++ {
 				var entity supplierfile.OilSupplierFile
 				entity.SupplierId = dataother.SupplierId

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

@@ -3,6 +3,7 @@ package oilsupplier
 import (
 	"encoding/json"
 	"fmt"
+	"strconv"
 
 	"time"
 
@@ -43,7 +44,7 @@ func (this *TableHeaderController) GetTableHeaderList() {
 	if model2.SearchSupplierTypeName != "" {
 		where = where + " and CategoryCode = '" + model2.SearchSupplierTypeName + "'"
 	}
-	orderby := "Id"
+	orderby := "CategoryCode, SortCode, Id"
 	asc := true
 
 	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
@@ -75,6 +76,8 @@ func (this *TableHeaderController) AddEntity() {
 	var Name = model.Name
 
 	where := "1=1 and name='" + Name + "'"
+	where += " and CategoryCode='"+ model.Categorycode +"'"
+
 	total := svc.GetName(BaseTableHeader, where)
 	if total != 0 {
 		errinfo.Message = "已有重复数据"
@@ -149,6 +152,7 @@ func (this *TableHeaderController) Getlocations() {
 
 type SBaseTableheader struct {
 	EditName string
+	SortCode int
 }
 
 // @Title 通过id更新
@@ -179,10 +183,16 @@ func (this *TableHeaderController) UpdateById() {
 	model.Modifieduserid, _ = utils.StrTo(this.User.Id).Int()
 
 	model.Name = model1.EditName
+	model.SortCode = model1.SortCode
 
 	var Name = model.Name
 
+	var tmpModel tableheader.BaseTableheader
+	svc.GetEntityByIdBytbl(BaseTableHeader, id, &tmpModel)
+
 	where := "1=1 and name='" + Name + "'"
+	where += " and CategoryCode='"+ tmpModel.Categorycode +"'"
+	where += " and Id != '"+ strconv.Itoa(tmpModel.Id) +"'"
 	total := svc.GetName(BaseTableHeader, where)
 	if total != 0 {
 		errinfo.Message = "已有重复数据"
@@ -190,7 +200,7 @@ func (this *TableHeaderController) UpdateById() {
 		this.Data["json"] = &errinfo
 		this.ServeJSON()
 	} else {
-		cols = []string{"Name", "Modifiedon", "Modifieduserid", "Modifiedby"}
+		cols = []string{"Name", "SortCode", "Modifiedon", "Modifieduserid", "Modifiedby"}
 
 		err := svc.UpdateEntityBytbl(BaseTableHeader, id, &model, cols)
 		if err == nil {
@@ -253,7 +263,7 @@ func (this *TableHeaderController) ListGoodTableHeader() {
 
 	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
 	var list []map[string]string
-	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='01'"
+	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='01' order by SortCode asc, Id asc"
 	list, _ = svc.DBE.QueryString(sql)
 	fmt.Println(list)
 	var datainfo DataInfo
@@ -271,7 +281,7 @@ func (this *TableHeaderController) ListTsTableHeader() {
 
 	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
 	var list []map[string]string
-	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='03'"
+	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='03' order by SortCode asc, Id asc"
 	list, _ = svc.DBE.QueryString(sql)
 	fmt.Println(list)
 	var datainfo DataInfo
@@ -289,7 +299,7 @@ func (this *TableHeaderController) ListBbTableHeader() {
 
 	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
 	var list []map[string]string
-	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='02'"
+	sql := "select Name as label,Code as prop,'270' as width,'true' as sort from " + BaseTableHeader + " where " + "1=1 and CategoryCode='02' order by SortCode asc, Id asc"
 	list, _ = svc.DBE.QueryString(sql)
 	fmt.Println(list)
 	var datainfo DataInfo

src/dashoo.cn/frontend_web/src/pages/setting/qcdSettings.vue

@@ -18,7 +18,7 @@
             <el-form-item label="名称">
                 <el-input size="mini"  v-model="searchForm.SearchName" placeholder="请输入内容"></el-input>
             </el-form-item>
-          
+
             <el-form-item label="准入类别">
               <el-select size="mini" style="width:150px" v-model="searchForm.SearchSupplierTypeName" placeholder="请选择">
                 <el-option label="物资类" value="01"></el-option>
@@ -26,10 +26,10 @@
                 <el-option label="技术服务类" value="03"></el-option>
               </el-select>
             </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-menu slot="dropdown">
                   <el-dropdown-item command="clear">查询重置</el-dropdown-item>
               </el-dropdown-menu>
               </el-dropdown>
@@ -38,16 +38,17 @@
         <span style="float: right;position:relative" >
           <el-button type="primary" size="mini" @click="addaudit" style="float: right;position:absolute;right:0px">添加</el-button>
         </span>
-       
-      
+
+
       </div>
 
       <!--内框表格显示-->
       <el-table :data="entityList" border height="calc(100vh - 243px)" style="width: 100%">
-       
+
 
         <!--内框表格剩余栏显示-->
         <el-table-column label="名称" prop="Name"></el-table-column>
+        <el-table-column label="编码" prop="Code"></el-table-column>
         <el-table-column label="类别名称" prop="Categoryname"></el-table-column>
 
          <!--内框表格操作栏显示-->
@@ -119,6 +120,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="排序码" required prop="SortCode">
+              <el-input-number v-model="entityForm.SortCode" placeholder="请输入排序码" :min="0" :step="1" :step-strictly="true" style="width: 100%;"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
       <span style="float: right;margin-top:-10px;">
         <el-button size="small" @click="addshow = false">取 消</el-button>
@@ -140,7 +150,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-     
+
         <!-- 第二行 -->
         <el-row>
             <el-col :span="24">
@@ -162,7 +172,17 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="排序码" required prop="SortCode">
+              <el-input-number v-model="editForm.SortCode" placeholder="请输入排序码" :min="0" :step="1" :step-strictly="true" style="width: 100%;"></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
+
       <span style="float: right;margin-top:-10px;">
         <el-button size="small" @click="editshow = false">取 消</el-button>
         <el-button type="primary" size="small" @click="EditSubmit()">编 辑</el-button>
@@ -193,17 +213,19 @@ export default {
       addshow: false,
       editshow: false,
       entityForm: {
-        Name: "",
-        Categorycode: "",
-        Code:""
+        Name: '',
+        Categorycode: '',
+        Code: '',
+        SortCode: 0
       },
       editForm: {
-        EditName: "",
-        EditCategorycode: "",
-        EditCode:""
+        EditName: '',
+        EditCategorycode: '',
+        EditCode: '',
+        SortCode: 0
       },
       searchForm:{
-       SearchSupplierTypeName:""
+       SearchSupplierTypeName: ''
       },
 
       rules: {
@@ -248,6 +270,13 @@ export default {
             message: "请选择一个位置",
             trigger: "blur"
           }
+        ],
+        SortCode: [
+          {
+            required: true,
+            message: "请输入排序码",
+            trigger: "blur"
+          }
         ]
       },
       options: [],
@@ -267,7 +296,7 @@ export default {
         _size: this.size,
         _currentPage: this.currentPage
       };
-    
+
       setapi.getTableHeaderListBySearch(params,this.searchForm,this.$axios).then(res => {
           console.log(res.data.items);
           this.entityList = res.data.items;
@@ -321,7 +350,7 @@ export default {
       });
     },
     onchange(val) {
-      
+
       setapi.getlocations(val, this.$axios).then(res => {
           console.log(res.data.items);
           this.options = res.data.items;
@@ -370,6 +399,7 @@ export default {
         this.editForm.EditName=row.Name//反显名称
         this.editForm.EditCategorycode=row.Categorycode//返现类别名称根据value值
         this.editForm.EditCode=row.Code//返现类别名称根据value值
+      this.editForm.SortCode=row.SortCode
     },
     EditSubmit(){
         this.$refs["EditFormref"].validate(valid => {