产品以及产品类别修改

src/views/product/components/index.vue

@@ -35,7 +35,7 @@
       </el-header>
       <el-main>
         <div style="height: 100%;" v-loading="loading">
-          <component :is="componentType" v-bind="$attrs" :tableData="tableData" :queryParams="queryParams" :searchOption="searchOption" :handleMessage="handleMessage"  @options="handleOption" @on-sort="handleSort" @optionsSon="handleOption2" @chooseItem="chooseItem"></component>
+          <component :is="componentType" v-bind="$attrs" :tableData="tableData"  :queryParams="queryParams" :searchOption="searchOption" :handleMessage="handleMessage"  @options="handleOption" @on-sort="handleSort" @optionsSon="handleOption2" @chooseItem="chooseItem"></component>
         </div>
       </el-main>
       <el-footer class="pagination">
@@ -76,6 +76,7 @@ export default {
       componentType: 'categoryTable',
       //显示的栏位
       columnList:[],
+      column:[],
       //检索字段
       searchFiled: [
         {
@@ -119,7 +120,7 @@ export default {
       //排序
       sort:[
         {
-          "orderBy": "createTime",
+          "orderBy": "category_createTime",
           "orderType": 1
         }
       ],
@@ -134,7 +135,8 @@ export default {
       handleMessage:'',
     }
   },
-  mounted() {
+  async mounted() {
+    // this.column = await this.$commonJS.getCustomField('product')
     //获取产品类别数据
     this.getList()
     //获取检索字段以及分组字段

src/views/product/components/view/categoryTable.vue

@@ -10,7 +10,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-for="item in column" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" align="center" sortable="custom">
+      <el-table-column v-for="item in column" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.field" :label="item.name" align="center" sortable="custom">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
             <el-link @click="handleItem(scope.row, '1')" type="primary">
@@ -76,26 +76,31 @@ export default {
         return [
           {
             value:'name',
+            field:'category_name',
             type:'String',
             name:'产品类别名称'
           },
           {
             value:'licenseRate',
+            field:'category_licenseRate',
             type:'String',
             name:'许可费率'
           },
           {
             value:'description',
+            field:'category_description',
             type:'String',
             name:'产品类别描述'
           },
           {
             value:'createName',
+            field:'category_createName',
             type:'String',
             name:'创建人'
           },
           {
             value:'createTime',
+            field:'category_createTime',
             type:'DataTime',
             name:'创建时间'
           },

src/views/product/components/view/productTable.vue

@@ -14,7 +14,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column v-for="item in column" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.value" :label="item.name" align="center" sortable="custom">
+      <el-table-column v-for="item in column" :render-header=" $commonJS.renderHeaderMethods" :key="item.value" :prop="item.field" :label="item.name" align="center" sortable="custom">
         <template slot-scope="scope">
           <div v-if="['name'].includes(item.value)">
             <el-link @click="handleItem(scope.row, '2')" type="primary">
@@ -82,36 +82,43 @@ export default {
         return [
           {
             value:'name',
+            field:'product_name',
             type:'String',
             name:'产品名称'
           },
           {
             value:'marketTime',
+            field:'product_marketTime',
             type:'DateTime',
             name:'上市时间'
           },
           {
             value:'companyName',
+            field:'product_companyName',
             type:'String',
             name:'所属公司'
           },
           {
             value:'licenseRate',
+            field:'product_licenseRate',
             type:'String',
             name:'许可费率'
           },
           {
             value:'description',
+            field:'product_description',
             type:'String',
             name:'产品说明'
           },
           {
             value:'createName',
+            field:'product_createName',
             type:'String',
             name:'创建人'
           },
           {
             value:'createTime',
+            field:'product_createTime',
             type:'DataTime',
             name:'创建时间'
           },
@@ -131,7 +138,7 @@ export default {
       // 排序数组
       sort: [
         {
-          "orderBy": "createTime",
+          "orderBy": "product_createTime",
           "orderType": 1
         }
       ],