Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuanFront

src/views/main/CommondbCtnlist/index.vue

@@ -177,7 +177,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: [],
@@ -228,7 +228,7 @@ export default {
       this.advanced = !this.advanced
     },
     init() {
-      console.log(123)
+      
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()

src/views/main/CommondbFrtlist/index.vue

@@ -177,7 +177,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: [],
@@ -228,7 +228,6 @@ export default {
       this.advanced = !this.advanced
     },
     init() {
-      console.log(123)
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()

src/views/main/CommondbPackage/index.vue

@@ -177,7 +177,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: [],
@@ -228,7 +228,6 @@ export default {
       this.advanced = !this.advanced
     },
     init() {
-      console.log(123)
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()

src/views/main/CommondbPortlist/index.vue

@@ -177,7 +177,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: [],
@@ -228,7 +228,6 @@ export default {
       this.advanced = !this.advanced
     },
     init() {
-      console.log(123)
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()

src/views/main/CommondbPortloadlist/index.vue

@@ -177,7 +177,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: [],
@@ -228,7 +228,6 @@ export default {
       this.advanced = !this.advanced
     },
     init() {
-      console.log(123)
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()

src/views/main/CommondbService/index.vue

@@ -177,7 +177,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: [],
@@ -228,7 +228,6 @@ export default {
       this.advanced = !this.advanced
     },
     init() {
-      console.log(123)
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()

src/views/main/CommondbVessellist/index.vue

@@ -145,7 +145,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: []

src/views/main/CommondbYardlist/index.vue

@@ -151,7 +151,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: []
@@ -190,7 +190,6 @@ export default {
       this.advanced = !this.advanced
     },
     init() {
-      console.log(123)
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()

src/views/main/Customer/addForm.vue

@@ -118,7 +118,7 @@
             v-decorator="['WpropString', { rules: [{ required: true, message: '请选择客户属性！' }] }]"
           >
             <a-select-option v-for="item in propStringData" :key="item.id" :value="item.code">{{
-              item.value
+              item.name
             }}</a-select-option>
           </a-select>
         </a-form-item>
@@ -165,7 +165,7 @@
         </template>
         <template #edit="{ row }">
           <vxe-select v-model="row.roleCode" transfer>
-            <vxe-option v-for="item in TypeData" :key="item.code" :value="item.code" :label="item.value"></vxe-option>
+            <vxe-option v-for="item in TypeData" :key="item.code" :value="item.code" :label="item.name"></vxe-option>
           </vxe-select>
         </template>
       </vxe-column>
@@ -265,7 +265,6 @@
 
 <script>
 import { DjyCustomerAdd } from '@/api/modular/main/CustomerInformationManagement'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -308,12 +307,8 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346103538081861' }).then(res => {
-      this.TypeData = res.data.rows
-    })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346100897906757' }).then(res => {
-      this.propStringData = res.data.rows
-    })
+    this.TypeData = this.$options.filters['dictData']('djy_cust_contact_role')
+    this.propStringData = this.$options.filters['dictData']('djy_cust_prop')
   },
   methods: {
     removeCheckboxRow() {
@@ -341,7 +336,7 @@ export default {
       if (value) {
         this.TypeData.forEach(item => {
           if (item.code == value) {
-            RData = item.value
+            RData = item.name
           }
         })
       }

src/views/main/Customer/editForm.vue

@@ -118,7 +118,7 @@
             v-decorator="['WpropString', { rules: [{ required: true, message: '请选择客户属性！' }] }]"
           >
             <a-select-option v-for="item in propStringData" :key="item.id" :value="item.code">{{
-              item.value
+              item.name
             }}</a-select-option>
           </a-select>
         </a-form-item>
@@ -165,7 +165,7 @@
         </template>
         <template #edit="{ row }">
           <vxe-select v-model="row.roleCode" transfer>
-            <vxe-option v-for="item in TypeData" :key="item.code" :value="item.code" :label="item.value"></vxe-option>
+            <vxe-option v-for="item in TypeData" :key="item.code" :value="item.code" :label="item.name"></vxe-option>
           </vxe-select>
         </template>
       </vxe-column>
@@ -265,7 +265,6 @@
 
 <script>
 import { DjyCustomerEdit, DjyCustomerDetail } from '@/api/modular/main/CustomerInformationManagement'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -329,12 +328,8 @@ export default {
         WpropString
       })
     })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346103538081861' }).then(res => {
-      this.TypeData = res.data.rows
-    })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346100897906757' }).then(res => {
-      this.propStringData = res.data.rows
-    })
+    this.TypeData = this.$options.filters['dictData']('djy_cust_contact_role')
+    this.propStringData = this.$options.filters['dictData']('djy_cust_prop')
   },
   methods: {
     removeCheckboxRow() {
@@ -363,7 +358,7 @@ export default {
       if (value) {
         this.TypeData.forEach(item => {
           if (item.code == value) {
-            RData = item.value
+            RData = item.name
           }
         })
       }

src/views/main/Customer/index.vue

@@ -4,11 +4,7 @@
     <!-- <a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title" :closable="pane.key == 0 ? false : true"> -->
     <!-- <div v-if="pane.title == '客户信息'"> -->
     <a-card :bordered="false" :bodyStyle="tstyle">
-      <div
-        class="table-page-search-wrapper"
-        v-if="hasPerm('BookingTemplate:page')"
-        :class="advanced ? 'Open' : 'Close'"
-      >
+      <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="18">
@@ -285,7 +281,7 @@ export default {
       TableColumns: [],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       ColumnsQueryL: 0
     }
   },
@@ -311,7 +307,6 @@ export default {
               : (propString = `${propString},${item.split('[')[1]}`)
           }
         })
-        console.log(propString)
       }
       return propString
     },
@@ -319,7 +314,6 @@ export default {
       this.TabsEdit(row)
     },
     onEdit(targetKey, action) {
-      console.log(targetKey, action)
       this[action](targetKey)
     },
     remove(targetKey) {
@@ -342,7 +336,6 @@ export default {
       //     activeKey = panes[0].key
       //   }
       // }
-      console.log(panes, activeKey)
       this.panes = panes
       this.activeKey = activeKey
     },
@@ -448,34 +441,37 @@ export default {
         this.$forceUpdate()
       })
       DjyCustomerGet({ type: 'customer_cond_cfg' }).then(res => {
-        this.ColumnsQueryL = JSON.parse(res.data.configJson).length
-        if (JSON.parse(res.data.configJson).length) {
-          this.ColumnsQuery = []
-          columns.forEach(item => {
-            this.ColumnsQuery.push({ ...item, checked: false })
-          })
-          let Arr = []
-          JSON.parse(res.data.configJson).forEach(item => {
-            this.ColumnsQuery.forEach(item2 => {
-              if (item == item2.dataIndex) {
-                item2.checked = true
-                Arr.push(item2)
-              }
+        if (res.data) {
+          this.ColumnsQueryL = JSON.parse(res.data.configJson).length
+          if (JSON.parse(res.data.configJson).length) {
+            this.ColumnsQuery = []
+            columns.forEach(item => {
+              this.ColumnsQuery.push({ ...item, checked: false })
             })
-          })
-          this.ColumnsQuery.forEach(item => {
-            let type = true
-            Arr.forEach(item2 => {
-              if (item.dataIndex == item2.dataIndex) {
-                type = false
+            let Arr = []
+            JSON.parse(res.data.configJson).forEach(item => {
+              this.ColumnsQuery.forEach(item2 => {
+                if (item == item2.dataIndex) {
+                  item2.checked = true
+                  Arr.push(item2)
+                }
+              })
+            })
+            this.ColumnsQuery.forEach(item => {
+              let type = true
+              Arr.forEach(item2 => {
+                if (item.dataIndex == item2.dataIndex) {
+                  type = false
+                }
+              })
+              if (type) {
+                Arr.push(item)
               }
             })
-            if (type) {
-              Arr.push(item)
-            }
-          })
-          this.ColumnsQuery = Arr
+            this.ColumnsQuery = Arr
+          }
         }
+
         this.$forceUpdate()
       })
     },

src/views/main/DJYTenantParam/addForm.vue

@@ -17,7 +17,7 @@
                 v-decorator="['type', { rules: [{ required: true, message: '请输入业务大类！' }] }]"
               >
                 <a-select-option v-for="item in TypeData" :key="item.id" :value="item.code">
-                  {{ item.value }}
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -56,7 +56,6 @@
 
 <script>
 import { DJYTenantParamAdd } from '@/api/modular/main/DJYTenantParam'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -84,10 +83,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '353559512399941' }).then(res => {
-      this.TypeData = res.data.rows
-      console.log(this.TypeData)
-    })
+    this.TypeData = this.$options.filters['dictData']('tenant_param_group')
   },
   methods: {
     // 初始化方法

src/views/main/DJYTenantParam/addItemForm.vue

@@ -101,7 +101,6 @@ import {
   SysTenantPage,
   DJYTenantParamGetParamItem
 } from '@/api/modular/main/DJYTenantParam'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -155,9 +154,7 @@ export default {
       })
       this.WTypeData = data
     })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '353559512399941' }).then(res => {
-      this.YWData = res.data.rows
-    })
+    this.YWData = this.$options.filters['dictData']('tenant_param_group')
     SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
       this.TenantData = res.data.rows
     })
@@ -167,7 +164,7 @@ export default {
       let Rdata = ''
       this.YWData.forEach(item => {
         if (item.code == data) {
-          Rdata = item.value
+          Rdata = item.name
         }
       })
       return Rdata

src/views/main/DJYTenantParam/editForm.vue

@@ -17,7 +17,7 @@
                 v-decorator="['type', { rules: [{ required: true, message: '请输入业务大类！' }] }]"
               >
                 <a-select-option v-for="item in TypeData" :key="item.id" :value="item.code">
-                  {{ item.value }}
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -56,7 +56,6 @@
 
 <script>
 import { DJYTenantParamEdit } from '@/api/modular/main/DJYTenantParam'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -85,10 +84,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '353559512399941' }).then(res => {
-      this.TypeData = res.data.rows
-      console.log(this.TypeData)
-    })
+    this.TypeData = this.$options.filters['dictData']('tenant_param_group')
   },
   methods: {
     // 初始化方法

src/views/main/DJYTenantParam/editItemForm.vue

@@ -100,7 +100,6 @@ import {
   SysTenantPage,
   DJYTenantParamGetParamItem
 } from '@/api/modular/main/DJYTenantParam'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -155,9 +154,7 @@ export default {
       })
       this.WTypeData = data
     })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '353559512399941' }).then(res => {
-      this.YWData = res.data.rows
-    })
+    this.YWData = this.$options.filters['dictData']('tenant_param_group')
     SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
       this.TenantData = res.data.rows
     })
@@ -167,7 +164,7 @@ export default {
       let Rdata = ''
       this.YWData.forEach(item => {
         if (item.code == data) {
-          Rdata = item.value
+          Rdata = item.name
         }
       })
       return Rdata

src/views/main/DJYTenantParam/index.vue

@@ -24,7 +24,7 @@
                   <a-form-item label="业务大类">
                     <a-select placeholder="请选择业务大类" v-model="queryParam.type" allow-clear>
                       <a-select-option v-for="item in TypeData" :key="item.id" :value="item.code">
-                        {{ item.value }}
+                        {{ item.name }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -103,7 +103,6 @@
 </template>
 <script>
 import { DJYTenantParamGet, DJYTenantParamDelete } from '@/api/modular/main/DJYTenantParam'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 import editItemForm from './itemEditForm.vue'
@@ -157,7 +156,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {}
+      loadData: []
     }
   },
   created() {},
@@ -174,7 +173,7 @@ export default {
       let Rdata = ''
       this.TypeData.forEach(item => {
         if (item.code == data) {
-          Rdata = item.value
+          Rdata = item.name
         }
       })
       return Rdata
@@ -186,9 +185,7 @@ export default {
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()
-      sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '353559512399941' }).then(res => {
-        this.TypeData = res.data.rows
-      })
+      this.TypeData = this.$options.filters['dictData']('tenant_param_group')
     },
     handlePageChange({ currentPage, pageSize }) {
       this.queryParam.pageNo = currentPage

src/views/main/DJYTenantParam/indexItem.vue

@@ -144,7 +144,6 @@ import {
   DJYTenantParamGet,
   DJYTenantParamDeleteParamValue
 } from '@/api/modular/main/DJYTenantParam'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import addForm from './addItemForm.vue'
 import editForm from './editItemForm.vue'
 import columnSetting from '@/components/tableColumnSetting'
@@ -198,7 +197,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       TenantData: [],
       YWData: []
     }
@@ -233,7 +232,7 @@ export default {
       let Rdata = ''
       this.YWData.forEach(item => {
         if (item.code == data) {
-          Rdata = item.value
+          Rdata = item.name
         }
       })
       return Rdata
@@ -245,9 +244,7 @@ export default {
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()
-      sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '353559512399941' }).then(res => {
-        this.YWData = res.data.rows
-      })
+      this.YWData = this.$options.filters['dictData']('tenant_param_group')
       DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
         this.TypeData = res.data
         let data = []

src/views/main/DJYTenantParam/itemEditForm.vue

@@ -88,7 +88,6 @@ import {
   DJYTenantParamDeleteParamItem,
   DJYTenantParamEdit
 } from '@/api/modular/main/DJYTenantParam'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import VXETable from 'vxe-table'
 export default {
   data() {

src/views/main/EDI/addForm.vue

@@ -17,7 +17,7 @@
                 v-decorator="['edicode', { rules: [{ required: true, message: '请输入EDI类型！' }] }]"
               >
                 <a-select-option v-for="item in EdiNameData" :key="item.id" :value="item.code">{{
-                  item.value
+                  item.name
                 }}</a-select-option>
               </a-select>
             </a-form-item>
@@ -151,7 +151,6 @@
 
 <script>
 import { DjyEdiSettingAdd } from '@/api/modular/main/EDIParameterSettingService'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import { SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
 import { commondbCarrierlist } from '@/api/modular/main/CommondbPortloadlist'
 export default {
@@ -175,9 +174,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346564507062341' }).then(res => {
-      this.EdiNameData = res.data.rows
-    })
+    this.EdiNameData = this.$options.filters['dictData']('edi_type')
     SysTenantPage().then(res => {
       this.SysTenantData = res.data.rows
     })

src/views/main/EDI/editForm.vue

@@ -17,7 +17,7 @@
                 v-decorator="['edicode', { rules: [{ required: true, message: '请输入EDI类型！' }] }]"
               >
                 <a-select-option v-for="item in EdiNameData" :key="item.id" :value="item.code">{{
-                  item.value
+                  item.name
                 }}</a-select-option>
               </a-select>
             </a-form-item>
@@ -151,7 +151,6 @@
 
 <script>
 import { DjyEdiSettingEdit } from '@/api/modular/main/EDIParameterSettingService'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import { SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
 import { commondbCarrierlist } from '@/api/modular/main/CommondbPortloadlist'
 export default {
@@ -176,9 +175,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346564507062341' }).then(res => {
-      this.EdiNameData = res.data.rows
-    })
+    this.EdiNameData = this.$options.filters['dictData']('edi_type')
     SysTenantPage().then(res => {
       this.SysTenantData = res.data.rows
     })

src/views/main/EDI/index.vue

@@ -20,7 +20,7 @@
                   <a-form-item :label="item.title" v-if="item.title == 'EDI类型'">
                     <a-select v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请选择${item.title}`">
                       <a-select-option v-for="item in EdiNameData" :key="item.id" :value="item.code">{{
-                        item.value
+                        item.name
                       }}</a-select-option>
                     </a-select>
                   </a-form-item>
@@ -108,7 +108,6 @@
 </template>
 <script>
 import { DjyEdiSettingPage, DjyEdiSettingDelete } from '@/api/modular/main/EDIParameterSettingService'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import { SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
@@ -246,20 +245,18 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
-      EdiNameData: []
+      loadData: [],
+      EdiNameData: [],
+      CodeData: []
     }
   },
   created() {},
   mounted() {
     this.init()
     SysTenantPage().then(res => {
-      console.log(res.data)
       this.SysTenantData = res.data.rows
     })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '346564507062341' }).then(res => {
-      this.EdiNameData = res.data.rows
-    })
+    this.EdiNameData = this.$options.filters['dictData']('edi_type')
     commondbCarrierlist().then(res => {
       this.CodeData = res.data
     })

src/views/main/Printing/addForm.vue

@@ -17,7 +17,7 @@
                 v-decorator="['typeCode', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
               >
                 <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
-                  {{ item.value }}
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -56,7 +56,6 @@
 
 <script>
 import { BookingPrintTemplateAdd, SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 // booking_template_type
 export default {
   data() {
@@ -83,10 +82,7 @@ export default {
       console.log(res.data)
       this.SysTenantData = res.data.rows
     })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '348569545515077' }).then(res => {
-      this.TypeData = res.data.rows
-      console.log(this.TypeData, 11111)
-    })
+    this.TypeData = this.$options.filters['dictData']('booking_template_type')
   },
   methods: {
     customRequest(data) {
@@ -122,7 +118,7 @@ export default {
           })
           this.TypeData.forEach(item => {
             if (values.typeCode == item.code) {
-              values.TypeName = item.value
+              values.TypeName = item.name
             }
           })
           console.log(values)

src/views/main/Printing/editForm.vue

@@ -17,7 +17,7 @@
                 v-decorator="['typeCode', { rules: [{ required: true, message: '请输入类型名称！' }] }]"
               >
                 <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
-                  {{ item.value }}
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -56,7 +56,6 @@
 
 <script>
 import { BookingPrintTemplateEdit, SysTenantPage } from '@/api/modular/main/bookingprinttemplate'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -83,10 +82,7 @@ export default {
       console.log(res.data)
       this.SysTenantData = res.data.rows
     })
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '348569545515077' }).then(res => {
-      this.TypeData = res.data.rows
-      console.log(this.TypeData, 11111)
-    })
+    this.TypeData = this.$options.filters['dictData']('booking_template_type')
   },
   methods: {
     customRequest(data) {
@@ -138,7 +134,7 @@ export default {
           this.TypeData.forEach(item => {
             if (values.typeCode == item.code) {
               console.log(item)
-              values.TypeName = item.value
+              values.TypeName = item.name
             }
           })
 

src/views/main/Printing/index.vue

@@ -154,7 +154,7 @@ export default {
       TableColumns: [],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {}
+      loadData: []
     }
   },
   created() {},

src/views/main/ShippingCompanyMapping/index.vue

@@ -156,7 +156,7 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {},
+      loadData: [],
       CodeData: [],
       WCodeData: [],
       ModulesData: []

src/views/main/UserEmail/addForm.vue

@@ -104,7 +104,6 @@
 
 <script>
 import { DjyUserMailAccountAdd } from '@/api/modular/main/UserEmail'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -133,9 +132,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
-      this.TypeData = res.data.rows
-    })
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
   },
   methods: {
     FnChangeSmtp(value) {

src/views/main/UserEmail/editForm.vue

@@ -104,7 +104,6 @@
 
 <script>
 import { DjyUserMailAccountEdit } from '@/api/modular/main/UserEmail'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -134,9 +133,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
-      this.TypeData = res.data.rows
-    })
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
   },
   methods: {
     FnChangeSmtp(value) {

src/views/main/UserEmail/index.vue

@@ -92,7 +92,6 @@
 </template>
 <script>
 import { DjyUserMailAccountPage, DjyUserMailAccountDelete } from '@/api/modular/main/UserEmail'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 import columnSetting from '@/components/tableColumnSetting'
@@ -177,15 +176,13 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {}
+      loadData: []
     }
   },
   created() {},
   mounted() {
     this.init()
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
-      this.TypeData = res.data.rows
-    })
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
   },
   methods: {
     FnBD(data) {

src/views/main/WebSiteaccount/addForm.vue

@@ -21,7 +21,7 @@
                 v-decorator="['typeCode', { rules: [{ required: true, message: '请选择类型！' }] }]"
               >
                 <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
-                  {{ item.value }}
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -55,7 +55,6 @@
 
 <script>
 import { DjyWebsiteAccountConfigAdd } from '@/api/modular/main/WebSiteaccount'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -83,10 +82,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
-      this.TypeData = res.data.rows
-      console.log(this.TypeData)
-    })
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
   },
   methods: {
     // 初始化方法

src/views/main/WebSiteaccount/editForm.vue

@@ -17,7 +17,7 @@
                 v-decorator="['typeCode', { rules: [{ required: true, message: '请选择类型！' }] }]"
               >
                 <a-select-option v-for="item in TypeData" :key="item.code" :value="item.code">
-                  {{ item.value }}
+                  {{ item.name }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -51,7 +51,6 @@
 
 <script>
 import { DjyWebsiteAccountConfigEdit } from '@/api/modular/main/WebSiteaccount'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 export default {
   data() {
     return {
@@ -80,10 +79,7 @@ export default {
     }
   },
   mounted() {
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
-      this.TypeData = res.data.rows
-      console.log(this.TypeData)
-    })
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
   },
   methods: {
     // 初始化方法

src/views/main/WebSiteaccount/index.vue

@@ -87,7 +87,6 @@
 </template>
 <script>
 import { DjyWebsiteAccountConfigPage, DjyWebsiteAccountConfigDelete } from '@/api/modular/main/WebSiteaccount'
-import { sysDictDataPage } from '@/api/modular/system/dictDataManage'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
 import columnSetting from '@/components/tableColumnSetting'
@@ -139,23 +138,20 @@ export default {
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
-      loadData: {}
+      loadData: []
     }
   },
   created() {},
   mounted() {
     this.init()
-    sysDictDataPage({ pageNo: 1, pageSize: 999, typeId: '349716496130117' }).then(res => {
-      this.TypeData = res.data.rows
-      console.log(this.TypeData)
-    })
+    this.TypeData = this.$options.filters['dictData']('website_account_type')
   },
   methods: {
     FnTurnD(data) {
       let Rdata = ''
       this.TypeData.forEach(item => {
         if (item.code == data) {
-          Rdata = item.value
+          Rdata = item.name
         }
       })
       return Rdata