前后:资质下拉排序

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

@@ -288,10 +288,14 @@ func (this *TableHeaderController) Deletebyid() {
 // @Success 200 {object}
 // @router /listgoodtableheader [get]
 func (this *TableHeaderController) ListGoodTableHeader() {
-
+	ShowSort := this.GetString("sort")
 	svc := tableheader.GetTableHeaderService(utils.DBE) //获得数据库引擎
 	var list []map[string]string
-	sql := "select Name as label,Code as prop,'270' as width,'true' as sort,IsManuf as IsManuf from " + BaseTableHeader + " where " + "1=1 and CategoryCode='01' order by SortCode asc, Id asc"
+	sql := "select Name as label,Code as prop,'270' as width,'true' as sort,IsManuf as IsManuf from " + BaseTableHeader + " where " + "1=1 and CategoryCode='01' order by ShowSort asc"
+	if ShowSort != "" {
+		sql = "select Name as label,Code as prop,'270' as width,'true' as sort,IsManuf as IsManuf 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

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

@@ -53,9 +53,9 @@ export default {
       data: formData
     })
   },
-  initGoodTableHeader (myAxios) {
+  initGoodTableHeader (sort, myAxios) {
     return myAxios({
-      url: '/tableheader/listgoodtableheader',
+      url: '/tableheader/listgoodtableheader?sort=' + sort,
       method: 'get'
     })
   },

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

@@ -344,7 +344,7 @@
       initTableHeader () {
         console.log(this.typeCode, 'this.typeCode')
         if (this.typeCode == '01') {
-          setapi.initGoodTableHeader(this.$axios).then(res => {
+          setapi.initGoodTableHeader('',this.$axios).then(res => {
             this.dynamicTableColumns = res.data.items
           })
         } else if (this.typeCode == '02') {

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

@@ -1911,7 +1911,7 @@
       },
       // 添加资质
       initTableHeader () {
-        setapi.initGoodTableHeader(this.$axios).then(res => {
+        setapi.initGoodTableHeader('',this.$axios).then(res => {
           this.dynamicTableColumns = res.data.items
         })
       },

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

@@ -292,7 +292,7 @@
       },
       initTableHeader() {
 
-        setapi.initGoodTableHeader(this.$axios).then(res => {
+        setapi.initGoodTableHeader('ShowSort',this.$axios).then(res => {
 
           this.dynamicTableColumns = res.data.items
           let count = Math.ceil(this.dynamicTableColumns.length/4)      //  (向上取整)

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

@@ -1144,7 +1144,7 @@
         })
       },
       initTableHeader () {
-        setapi.initGoodTableHeader(this.$axios).then(res => {
+        setapi.initGoodTableHeader('',this.$axios).then(res => {
           this.dynamicTableColumns = res.data.items
         })
       },

src/dashoo.cn/frontend_web/src/pages/oilsupplier/goodsaptitude/tmpclasscheck.vue

@@ -382,7 +382,7 @@
         this.getCertSub()
       },
       initTableHeader () {
-        setapi.initGoodTableHeader(this.$axios).then(res => {
+        setapi.initGoodTableHeader('',this.$axios).then(res => {
           this.dynamicTableColumns = res.data.items
         })
       },

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

@@ -144,7 +144,7 @@ export default {
   },
   methods: {
     initTableHeader () {
-      setapi.initGoodTableHeader(this.$axios).then(res => {
+      setapi.initGoodTableHeader('',this.$axios).then(res => {
         this.dynamicTableColumns = res.data.items
       })
     },

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

@@ -270,7 +270,7 @@ export default {
       })
     },
     initTableHeader () {
-      setapi.initGoodTableHeader(this.$axios).then(res => {
+      setapi.initGoodTableHeader('',this.$axios).then(res => {
         this.dynamicTableColumns = res.data.items
       })
     },

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

@@ -3083,7 +3083,7 @@
       },
       initTableHeader (code) {
         if (code === '01') {
-          setapi.initGoodTableHeader(this.$axios).then(res => {
+          setapi.initGoodTableHeader('',this.$axios).then(res => {
             this.dynamicTableColumns = res.data.items
           })
         } else if (code === '02') {

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

@@ -2274,7 +2274,7 @@
         })
       },
       initTableHeader () {
-        setapi.initGoodTableHeader(this.$axios).then(res => {
+        setapi.initGoodTableHeader('',this.$axios).then(res => {
           this.dynamicTableColumns = res.data.items
         })
       },

src/dashoo.cn/frontend_web/src/pages/select/aptitude/goods/_opera/operation.vue

@@ -156,7 +156,7 @@
         }
       },
       initTableHeader () {
-        setapi.initGoodTableHeader(this.$axios).then(res => {
+        setapi.initGoodTableHeader('',this.$axios).then(res => {
           this.dynamicTableColumns = res.data.items
         })
       },

src/dashoo.cn/frontend_web/src/pages/select/aptitude/goods/index.vue

@@ -674,7 +674,7 @@
         })
       },
       initTableHeader () {
-        setapi.initGoodTableHeader(this.$axios).then(res => {
+        setapi.initGoodTableHeader('ShowSort',this.$axios).then(res => {
           this.dynamicTableColumns = res.data.items
           let count = Math.ceil(this.dynamicTableColumns.length/4)      //  (向上取整)
           this.dynamicTableColumnsCount = this.dynamicTableColumns.slice(0,count + 1)