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

src/api/modular/main/TenantConfig.js

@@ -33,11 +33,11 @@ export function DjyTenantConfigEdit(parameter) {
 /**
  * 删除
  */
-export function DjyTenantConfigDelete(parameter) {
+export function DjyTenantConfigDelete(data) {
   return axios({
     url: '/DjyTenantConfig/delete',
-    method: 'get',
+    method: 'post',
-    params: parameter
+    data: data
   })
 }
 /**

src/views/main/TenantConfig/addForm.vue

@@ -1,5 +1,6 @@
 <template>
   <a-modal
+    class="CsModal"
     title="新增配置"
     :width="1100"
     :visible="visible"
@@ -10,7 +11,7 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="类型" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-select
                 placeholder="请选择类型"
@@ -26,11 +27,14 @@
                 </a-select-option>
               </a-select>
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="必填项" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-checkbox-group v-decorator="['WebData']" style="width: 100%">
+              <a-checkbox-group v-decorator="['WebData']" :style="{ width: '100%', marginTop: '-10px' }">
                 <a-row v-for="item in Data" :key="item.title">
+                  <a-divider orientation="left">
+                    {{ item.title }}
+                  </a-divider>
                   <a-col :span="6" v-for="item2 in item.children" :key="item2.code">
                     <a-checkbox :value="item2.code">{{ item2.name }}</a-checkbox>
                   </a-col>
@@ -69,14 +73,10 @@ export default {
       Data,
       visible: false,
       confirmLoading: false,
-      form: this.$form.createForm(this),
+      form: this.$form.createForm(this)
-      TypeData: []
     }
   },
-  mounted() {
+  mounted() {},
-    this.TypeData = this.$options.filters['dictData']('customer_config_type')
-    console.log(this.TypeData)
-  },
   methods: {
     // 初始化方法
     add(record) {
@@ -101,7 +101,8 @@ export default {
               values[key] = JSON.stringify(values[key])
             }
           }
-          DjyTenantConfigAdd(values)
+          values.configJson = values.WebData
+          DjyTenantConfigAdd({ ...values, type: 'booking_form_col' })
             .then(res => {
               if (res.success) {
                 this.$message.success('新增成功')
@@ -127,3 +128,12 @@ export default {
   }
 }
 </script>
+<style lang="less">
+.CsModal {
+  height: 40vh;
+  .ant-modal-body {
+    height: 600px;
+    overflow-y: auto;
+  }
+}
+</style>

src/views/main/TenantConfig/editForm.vue

@@ -1,5 +1,6 @@
 <template>
   <a-modal
+    class="CsModal"
     title="编辑配置"
     :width="1100"
     :visible="visible"
@@ -10,165 +11,18 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
-          <a-col :span="12">
+          <a-col :span="24">
-            <a-form-item label="租户" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="必填项" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-select
+              <a-checkbox-group v-decorator="['WebData']" :style="{ width: '100%', marginTop: '10px' }">
-                placeholder="请选择租户"
+                <a-row v-for="item in Data" :key="item.title">
-                v-decorator="['tenantId', { rules: [{ required: true, message: '请选择租户！' }] }]"
+                  <a-divider orientation="left">
-                show-search
+                    {{ item.title }}
-                :default-active-first-option="false"
+                  </a-divider>
-                :show-arrow="false"
+                  <a-col :span="6" v-for="item2 in item.children" :key="item2.code">
-                :filter-option="false"
+                    <a-checkbox :value="item2.code">{{ item2.name }}</a-checkbox>
-                :not-found-content="null"
+                  </a-col>
-              >
+                </a-row>
-                <a-select-option v-for="item in tenantData" :key="item.id" :value="item.id">
+              </a-checkbox-group>
-                  {{ item.name }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="船名" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入船名"
-                v-decorator="['vessel', { rules: [{ required: true, message: '请输入船名！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入航次"
-                v-decorator="['voyno', { rules: [{ required: true, message: '请输入航次！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="装货港" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择装货港"
-                v-decorator="['portLoadingId', { rules: [{ required: true, message: '请选择装货港！' }] }]"
-                show-search
-                :default-active-first-option="false"
-                :show-arrow="false"
-                :filter-option="false"
-                :not-found-content="null"
-              >
-                <a-select-option v-for="item in portLoadingData" :key="item.code" :value="item.code">
-                  {{ item.enName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="中转港" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择中转港"
-                v-decorator="['portTransitId', { rules: [{ required: true, message: '请选择中转港！' }] }]"
-                show-search
-                :default-active-first-option="false"
-                :show-arrow="false"
-                :filter-option="false"
-                :not-found-content="null"
-              >
-                <a-select-option v-for="item in portTransitData" :key="item.code" :value="item.code">
-                  {{ item.enName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="卸货港" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择卸货港"
-                v-decorator="['portDischargeId', { rules: [{ required: true, message: '请选择卸货港！' }] }]"
-                show-search
-                :default-active-first-option="false"
-                :show-arrow="false"
-                :filter-option="false"
-                :not-found-content="null"
-              >
-                <a-select-option v-for="item in portDischargeData" :key="item.code" :value="item.code">
-                  {{ item.enName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="开船日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-date-picker
-                show-time
-                :style="{ width: '100%' }"
-                placeholder="请选择开船日期"
-                v-decorator="['etd', { rules: [{ required: true, message: '请选择开船日期！' }] }]"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="截港日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-date-picker
-                show-time
-                :style="{ width: '100%' }"
-                placeholder="请选择截港日期"
-                v-decorator="['closingDate', { rules: [{ required: true, message: '请选择截港日期！' }] }]"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="预抵日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-date-picker
-                show-time
-                :style="{ width: '100%' }"
-                placeholder="请选择预抵日期"
-                v-decorator="['eta', { rules: [{ required: true, message: '请选择预抵日期！' }] }]"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="默认码头" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入默认码头"
-                v-decorator="['wharf', { rules: [{ required: true, message: '请输入默认码头！' }] }]"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="实际离港日期" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-date-picker
-                show-time
-                :style="{ width: '100%' }"
-                placeholder="请选择实际离港日期"
-                v-decorator="['atd', { rules: [{ required: true, message: '请选择实际离港日期！' }] }]"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="船公司" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-select
-                placeholder="请选择船公司"
-                v-decorator="['carrierid', { rules: [{ required: true, message: '请选择船公司！' }] }]"
-                show-search
-                :default-active-first-option="false"
-                :show-arrow="false"
-                :filter-option="false"
-                :not-found-content="null"
-              >
-                <a-select-option v-for="item in carrierData" :key="item.code" :value="item.code">
-                  {{ item.cnName }}
-                </a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="内部航次" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-input
-                placeholder="请输入内部航次"
-                v-decorator="['voynoInside', { rules: [{ required: true, message: '请输入内部航次！' }] }]"
-              />
             </a-form-item>
           </a-col>
         </a-row>
@@ -179,21 +33,22 @@
 
 <script>
 import { DjyTenantConfigEdit } from '@/api/modular/main/TenantConfig'
+import Data from './Data.json'
 export default {
   data() {
     return {
       TypeData: [],
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 6 }
+        sm: { span: 3 }
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 16 }
+        sm: { span: 20 }
       },
       labelCol2: {
         xs: { span: 24 },
-        sm: { span: 5 }
+        sm: { span: 6 }
       },
       wrapperCol2: {
         xs: { span: 24 },
@@ -202,11 +57,7 @@ export default {
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
-      tenantData: [],
+      Data
-      portLoadingData: [],
-      portTransitData: [],
-      portDischargeData: [],
-      carrierData: []
     }
   },
   mounted() {},
@@ -218,21 +69,8 @@ export default {
       this.visible = true
       setTimeout(() => {
         this.form.setFieldsValue({
-          tenantId: record.tenantId,
+          WebData: JSON.parse(record.configJson)
-          vessel: record.vessel,
-          voyno: record.voyno,
-          portLoadingId: record.portLoadingId,
-          portTransitId: record.portTransitId,
-          portDischargeId: record.portDischargeId,
-          etd: record.etd,
-          closingDate: record.closingDate,
-          eta: record.eta,
-          wharf: record.wharf,
-          atd: record.atd,
-          carrierid: record.carrierid,
-          voynoInside: record.voynoInside
         })
-        console.log(this.form.getFieldsValue())
       }, 100)
     },
     handleSubmit() {
@@ -241,18 +79,15 @@ export default {
       } = this
       this.confirmLoading = true
       validateFields((errors, values) => {
-        console.log(errors, values)
         if (!errors) {
           for (const key in values) {
-            console.log(key, 1)
             if (typeof values[key] === 'object' && !(values[key] === null)) {
               values[key] = JSON.stringify(values[key])
             }
           }
-          console.log(this.form, values.gid)
           values.id = this.data.id
-          console.log(values)
+          values.configJson = values.WebData
-          DjyTenantConfigEdit(values)
+          DjyTenantConfigEdit({ ...values, type: 'booking_form_col' })
             .then(res => {
               if (res.success) {
                 this.$message.success('编辑成功')
@@ -278,3 +113,12 @@ export default {
   }
 }
 </script>
+<style lang="less">
+.CsModal {
+  height: 40vh;
+  .ant-modal-body {
+    height: 600px;
+    overflow-y: auto;
+  }
+}
+</style>

src/views/main/TenantConfig/index.vue

@@ -1,14 +1,18 @@
 <template>
   <div>
-    <a-card :bordered="false" :bodyStyle="tstyle">
+    <!-- <a-card :bordered="false" :bodyStyle="tstyle">
       <div class="table-page-search-wrapper" :class="advanced ? 'Open' : 'Close'">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
                 <a-col :md="8" :sm="24">
-                  <a-form-item label="关键词：">
+                  <a-form-item label="租户：">
-                    <a-input placeholder="请输入关键词" v-model="queryParam.KeyWord" />
+                    <a-select v-model="queryParam.tenantId">
+                      <a-select-option v-for="item in TenantData" :key="item.id" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -17,16 +21,16 @@
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="FnGetData">查询</a-button>
                 <a-button style="margin-left: 8px" @click="init">重置</a-button>
-                <!-- <a @click="toggleAdvanced" style="margin-left: 8px">
+                <a @click="toggleAdvanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'" />
-                </a> -->
+                </a>
               </span>
             </a-col>
           </a-row>
         </a-form>
       </div>
-    </a-card>
+    </a-card> -->
     <a-card :bordered="false">
       <vxe-toolbar>
         <template #buttons>
@@ -35,9 +39,9 @@
           </a-button>
         </template>
       </vxe-toolbar>
-      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+      <vxe-table :data="loadData" border :loading="loading" height="670px" empty-text="没有更多数据了！">
         <vxe-column type="seq" width="50" fixed="left"></vxe-column>
-        <vxe-column
+        <!-- <vxe-column
           v-for="item in columns"
           :key="item.dataIndex"
           :field="item.dataIndex"
@@ -46,6 +50,16 @@
           :align="item.align"
           :show-overflow="true"
         >
+        </vxe-column> -->
+        <vxe-column title="租户" align="center" width="150">
+          <template #default="{ row }">
+            {{ FnRtenant(row.tenantId) }}
+          </template>
+        </vxe-column>
+        <vxe-column title="必填项" align="center">
+          <template #default="{ row }">
+            {{ FnRjson(row.configJson) }}
+          </template>
         </vxe-column>
         <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
@@ -62,9 +76,10 @@
   </div>
 </template>
 <script>
-import { DjyTenantConfigPage, DjyTenantConfigDelete } from '@/api/modular/main/TenantConfig'
+import { DjyTenantConfigPage, DjyTenantConfigDelete, SysTenantPage } from '@/api/modular/main/TenantConfig'
 import addForm from './addForm.vue'
 import editForm from './editForm.vue'
+import Data from './Data.json'
 export default {
   components: {
     addForm,
@@ -72,26 +87,23 @@ export default {
   },
   data() {
     return {
-      TypeData: [],
       // 高级搜索 展开/关闭
       advanced: false,
       loading: false,
       setVisible: false,
       setVisible1: false,
       queryParam: {
-        // currentPage: 1,
+        Type: 'booking_form_col'
-        // pageSize: 10,
-        // totalResult: 1
       },
       ColumnsQuery: [],
       columns: [
         {
-          title: '租户Id',
+          title: '租户',
           align: 'center',
-          dataIndex: 'type'
+          dataIndex: 'tenantId'
         },
         {
-          title: '船名',
+          title: '必填项',
           align: 'center',
           dataIndex: 'configJson'
         }
@@ -103,7 +115,9 @@ export default {
       WCodeData: [],
       ModulesData: [],
       carrierCodeData: [],
-      UserList: []
+      UserList: [],
+      TenantData: [],
+      Data
     }
   },
   created() {},
@@ -111,11 +125,34 @@ export default {
     this.init()
   },
   methods: {
+    FnRtenant(id) {
+      let RData = '-'
+      this.TenantData.forEach(item => {
+        if (item.id == id) {
+          RData = item.name
+        }
+      })
+      return RData
+    },
+    FnRjson(data) {
+      let Rdata = ''
+      JSON.parse(data).forEach(item => {
+        console.log(item)
+        Data.forEach(ele => {
+          ele.children.forEach(e => {
+            if (item == e.code) {
+              Rdata ? (Rdata = `${Rdata},${e.name}`) : (Rdata = e.name)
+            }
+          })
+        })
+      })
+      return Rdata
+    },
     confirm(e) {
       this.FnDel(e)
     },
     FnDel(data) {
-      DjyTenantConfigDelete({ Ids: data.id }).then(res => {
+      DjyTenantConfigDelete({ id: data.id }).then(res => {
         this.$message.success('删除成功')
         this.FnGetData()
       })
@@ -127,6 +164,9 @@ export default {
       Object.assign(this.$data, this.$options.data())
       this.ColumnsQuery = this.columns
       this.FnGetData()
+      SysTenantPage().then(res => {
+        this.TenantData = res.data.rows
+      })
     },
     FnGetData() {
       this.loading = true