动态表头

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

@@ -266,7 +266,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' 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 SortCode asc, Id asc"
 	list, _ = svc.DBE.QueryString(sql)
 	fmt.Println(list)
 	var datainfo DataInfo

src/dashoo.cn/frontend_web/nuxt.config.ignore.js

@@ -160,12 +160,12 @@ module.exports = {
     /* --------Nuxt Start发版用 END-------------- */
   },
   ignore: [
-    'pages/oilsupplier/addtionaudit/*.*',
-    'pages/oilsupplier/annualaudit/*.*',
-    'pages/oilsupplier/badrecord/*.*',
-    'pages/oilsupplier/basisbuild/*.*',
-    'pages/oilsupplier/compayaudit/*.*',
-    'pages/oilsupplier/goodsaptitude/*.*',
+    // 'pages/oilsupplier/addtionaudit/*.*',
+    // 'pages/oilsupplier/annualaudit/*.*',
+    // 'pages/oilsupplier/badrecord/*.*',
+    // 'pages/oilsupplier/basisbuild/*.*',
+    // 'pages/oilsupplier/compayaudit/*.*',
+    // 'pages/oilsupplier/goodsaptitude/*.*',
     'pages/oilsupplier/infochange/*.*',
     'pages/oilsupplier/infochangech/*.*',
     // 'pages/oilsupplier/supplier/*.*',

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

@@ -62,13 +62,36 @@
         </el-table-column>
 
         <!--动态显示的表头-->
-        <el-table-column v-for="column in dynamicTableColumns" :prop="column.prop" sortable :width="320"
-          :key="column.Id" :label="column.label" align="center" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ transferStr(scope.row[column.prop]) }}
+        <template v-for="column in dynamicTableColumns">
+          <el-table-column :prop="column.prop" sortable :width="80"
+            :key="column.Id" :label="column.label" align="center" v-if="column.IsManuf=='0'" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ transferStr(scope.row[column.prop]) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <el-table-column label="贸易产品">
+          <template v-for="column in dynamicTableColumns">
+            <el-table-column :prop="column.prop" sortable :width="80"
+              :key="column.Id" :label="column.label" align="center" v-if="column.IsManuf=='2'" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ transferStr(scope.row[column.prop]) }}
+              </template>
+            </el-table-column>
           </template>
         </el-table-column>
 
+        <el-table-column label="制造产品">
+          <template v-for="column in dynamicTableColumns">
+            <el-table-column :prop="column.prop" sortable :width="80"
+              :key="column.Id" :label="column.label" align="center" v-if="column.IsManuf=='1'" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{ transferStr(scope.row[column.prop]) }}
+              </template>
+            </el-table-column>
+          </template>
+        </el-table-column>
         <!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ jstimehandle(scope.row.CreateOn+'') }}