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

src/api/modular/main/CommondbCtn.js

@@ -0,0 +1,27 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 获取箱型信息
+ *
+ * @author Myshipping
+ */
+export function CommondbList(parameter) {
+  return axios({
+    url: '/commondb/ctn',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 新增箱型
+ *
+ * @author Myshipping
+ */
+export function CommondbAdd(parameter) {
+  return axios({
+    url: '/commondb/addctn',
+    method: 'post',
+    data: parameter
+  })
+}

src/api/modular/main/CommondbPackageList.js

@@ -0,0 +1,27 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 获取包装信息
+ *
+ * @author Myshipping
+ */
+export function CommondbList(parameter) {
+  return axios({
+    url: '/commondb/package',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 新增包装信息
+ *
+ * @author Myshipping
+ */
+export function CommondbAdd(parameter) {
+  return axios({
+    url: '/commondb/addpackage',
+    method: 'post',
+    data: parameter
+  })
+}

src/api/modular/main/CommondbServiceList.js

@@ -0,0 +1,27 @@
+import { axios } from '@/utils/request'
+
+/**
+ * 获取包装信息
+ *
+ * @author Myshipping
+ */
+export function CommondbList(parameter) {
+  return axios({
+    url: '/commondb/service',
+    method: 'get',
+    params: parameter
+  })
+}
+
+/**
+ * 新增包装信息
+ *
+ * @author Myshipping
+ */
+export function CommondbAdd(parameter) {
+  return axios({
+    url: '/commondb/addservice',
+    method: 'post',
+    data: parameter
+  })
+}

src/views/main/CommondbCarrierList/addForm.vue

@@ -36,27 +36,20 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbCarrierList/editForm.vue

@@ -14,6 +14,7 @@
             <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入代码"
+                :disabled="true"
                 v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
               />
             </a-form-item>
@@ -36,27 +37,20 @@
           </a-col>
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
-                placeholder="请输入备注"
-                v-decorator="['remark', { rules: [{ required: true, message: '请输入备注！' }] }]"
-              />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
-              <a-textarea
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
-                :autosize="{ minRows: 3 }"
-                placeholder="请输入描述"
-                v-decorator="['description', { rules: [{ required: true, message: '请输入描述！' }] }]"
-              />
             </a-form-item>
           </a-col>
         </a-row>

src/views/main/CommondbCarrierList/index.vue

@@ -51,11 +51,11 @@
           :show-overflow="true"
         >
         </vxe-column>
-        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+        <vxe-column title="操作" fixed="right" width="200" align="center">
           <template #default="{ row }">
             <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
           </template>
-        </vxe-column> -->
+        </vxe-column>
       </vxe-table>
       <add-form ref="addForm" @ok="handleOk" />
       <edit-form ref="editForm" @ok="handleOk" />

src/views/main/CommondbCodeCountry/editForm.vue

@@ -14,6 +14,7 @@
             <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入中文名"
+                :disabled="true"
                 v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
               />
             </a-form-item>

src/views/main/CommondbCtn/addForm.vue

@@ -0,0 +1,154 @@
+<template>
+  <a-modal
+    title="新增配置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入代码"
+                v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入名称"
+                v-decorator="['name', { rules: [{ required: true, message: '请输入名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入尺寸"
+                v-decorator="['size', { rules: [{ required: true, message: '请输入尺寸！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="大小箱分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select
+                placeholder="请输入大小箱分类"
+                v-decorator="['ctnCategory', { rules: [{ required: true, message: '请输入大小箱分类！' }] }]"
+                @change="FnChangeCtnCategory"
+              >
+                <a-select-option value="small">
+                  小箱
+                </a-select-option>
+                <a-select-option value="big">
+                  大箱
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="12">
+            <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI代码"
+                v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { CommondbAdd } from '@/api/modular/main/CommondbCtn'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 20 }
+      },
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {},
+  methods: {
+    // 初始化方法
+    add(record) {
+      this.visible = true
+    },
+    /**
+     * 提交表单
+     */
+    FnChangeCtnCategory(e) {
+      console.log(e)
+    },
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          for (const key in values) {
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          CommondbAdd(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('新增成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`新增失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CommondbCtn/editForm.vue

@@ -0,0 +1,165 @@
+<template>
+  <a-modal
+    title="编辑配置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入代码"
+                :disabled="true"
+                v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入名称"
+                v-decorator="['name', { rules: [{ required: true, message: '请输入名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入尺寸"
+                v-decorator="['size', { rules: [{ required: true, message: '请输入尺寸！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="大小箱分类" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select
+                placeholder="请输入大小箱分类"
+                v-decorator="['ctnCategory', { rules: [{ required: true, message: '请输入大小箱分类！' }] }]"
+                @change="FnChangeCtnCategory"
+              >
+                <a-select-option value="small">
+                  小箱
+                </a-select-option>
+                <a-select-option value="big">
+                  大箱
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="12">
+            <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI代码"
+                v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { CommondbAdd } from '@/api/modular/main/CommondbCtn'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 20 }
+      },
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {},
+  methods: {
+    // 初始化方法
+    edit(record) {
+      this.data = record
+      console.log(record)
+      this.visible = true
+      setTimeout(() => {
+        this.form.setFieldsValue({
+          name: record.name,
+          ediCode: record.ediCode,
+          description: record.description,
+          remark: record.remark
+        })
+        console.log(this.form.getFieldsValue())
+      }, 100)
+    },
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = 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.gid = this.data.gid
+          console.log(values)
+          CommondbAdd(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('编辑成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`编辑失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CommondbCtn/index.vue

@@ -0,0 +1,187 @@
+<template>
+  <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div
+        class="table-page-search-wrapper"
+        v-if="hasPerm('BookingTemplate:page')"
+        :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-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <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">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'" />
+                </a> -->
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card :bordered="false">
+      <vxe-toolbar>
+        <template #buttons>
+          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">
+            新增配置
+          </a-button>
+        </template>
+      </vxe-toolbar>
+      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+        <vxe-column type="seq" width="50" fixed="left"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :align="item.align"
+          :show-overflow="true"
+        >
+        </vxe-column>
+        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+          <template #default="{ row }">
+            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+          </template>
+        </vxe-column> -->
+      </vxe-table>
+      <add-form ref="addForm" @ok="handleOk" />
+      <edit-form ref="editForm" @ok="handleOk" />
+    </a-card>
+  </div>
+</template>
+<script>
+import { CommondbList } from '@/api/modular/main/CommondbServiceList'
+import addForm from './addForm.vue'
+import editForm from './editForm.vue'
+export default {
+  components: {
+    addForm,
+    editForm
+  },
+  data() {
+    return {
+      TypeData: [],
+      // 高级搜索 展开/关闭
+      advanced: false,
+      loading: false,
+      setVisible: false,
+      setVisible1: false,
+      queryParam: {
+        // currentPage: 1,
+        // pageSize: 10,
+        // totalResult: 1
+      },
+      ColumnsQuery: [],
+      columns: [
+        {
+          title: '代码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'code'
+        },
+        {
+          title: '名称',
+          align: 'center',
+          width: '80',
+          dataIndex: 'name'
+        },
+        {
+          title: '尺寸',
+          align: 'center',
+          width: '80',
+          dataIndex: 'size'
+        },
+        {
+          title: '大小箱分类',
+          align: 'center',
+          width: '80',
+          dataIndex: 'ctnCategory'
+        },
+
+        {
+          title: '备注',
+          align: 'center',
+          width: '80',
+          dataIndex: 'remark'
+        },
+        {
+          title: 'EDI代码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'ediCode'
+        },
+        {
+          title: '描述',
+          align: 'center',
+          width: '80',
+          dataIndex: 'description'
+        }
+      ],
+      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: [],
+      CodeData: [],
+      WCodeData: [],
+      ModulesData: [],
+      carrierCodeData: []
+    }
+  },
+  created() {},
+  mounted() {
+    this.init()
+  },
+  methods: {
+    toggleAdvanced() {
+      this.advanced = !this.advanced
+    },
+    init() {
+      Object.assign(this.$data, this.$options.data())
+      this.ColumnsQuery = this.columns
+      this.FnGetData()
+    },
+    FnGetData() {
+      this.loading = true
+      CommondbList(this.queryParam).then(res => {
+        if (res.code == 200) {
+          this.loadData = res.data
+        } else {
+          this.loadData = []
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      })
+    },
+    handleOk() {
+      this.FnGetData()
+    }
+  }
+}
+</script>
+<style lang="less">
+.table-operator {
+  margin-bottom: 18px;
+}
+
+button {
+  margin-right: 8px;
+}
+.Open {
+}
+.Close {
+  height: 45px;
+  overflow: hidden;
+}
+</style>

src/views/main/CommondbForwarder/editForm.vue

@@ -14,6 +14,7 @@
             <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入代码"
+                :disabled="true"
                 v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
               />
             </a-form-item>

src/views/main/CommondbPackageList/addForm.vue

@@ -0,0 +1,127 @@
+<template>
+  <a-modal
+    title="新增配置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入代码"
+                v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入名称"
+                v-decorator="['name', { rules: [{ required: true, message: '请输入名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="12">
+            <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI代码"
+                v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { CommondbAdd } from '@/api/modular/main/CommondbPackageList'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 20 }
+      },
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {},
+  methods: {
+    // 初始化方法
+    add(record) {
+      this.visible = true
+    },
+    /**
+     * 提交表单
+     */
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          for (const key in values) {
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          CommondbAdd(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('新增成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`新增失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CommondbPackageList/editForm.vue

@@ -0,0 +1,141 @@
+<template>
+  <a-modal
+    title="编辑配置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入代码"
+                :disabled="true"
+                v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入名称"
+                v-decorator="['name', { rules: [{ required: true, message: '请输入名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="12">
+            <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI代码"
+                v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { CommondbAdd } from '@/api/modular/main/CommondbPackageList'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 20 }
+      },
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {},
+  methods: {
+    // 初始化方法
+    edit(record) {
+      this.data = record
+      console.log(record)
+      this.visible = true
+      setTimeout(() => {
+        this.form.setFieldsValue({
+          name: record.name,
+          ediCode: record.ediCode,
+          description: record.description,
+          remark: record.remark
+        })
+        console.log(this.form.getFieldsValue())
+      }, 100)
+    },
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = 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.gid = this.data.gid
+          console.log(values)
+          CommondbAdd(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('编辑成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`编辑失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CommondbPackageList/index.vue

@@ -0,0 +1,174 @@
+<template>
+  <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div
+        class="table-page-search-wrapper"
+        v-if="hasPerm('BookingTemplate:page')"
+        :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-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <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">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'" />
+                </a> -->
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card :bordered="false">
+      <vxe-toolbar>
+        <template #buttons>
+          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">
+            新增配置
+          </a-button>
+        </template>
+      </vxe-toolbar>
+      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+        <vxe-column type="seq" width="50" fixed="left"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :align="item.align"
+          :show-overflow="true"
+        >
+        </vxe-column>
+        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+          <template #default="{ row }">
+            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+          </template>
+        </vxe-column> -->
+      </vxe-table>
+      <add-form ref="addForm" @ok="handleOk" />
+      <edit-form ref="editForm" @ok="handleOk" />
+    </a-card>
+  </div>
+</template>
+<script>
+import { CommondbList } from '@/api/modular/main/CommondbPackageList'
+import addForm from './addForm.vue'
+import editForm from './editForm.vue'
+export default {
+  components: {
+    addForm,
+    editForm
+  },
+  data() {
+    return {
+      TypeData: [],
+      // 高级搜索 展开/关闭
+      advanced: false,
+      loading: false,
+      setVisible: false,
+      setVisible1: false,
+      queryParam: {
+        // currentPage: 1,
+        // pageSize: 10,
+        // totalResult: 1
+      },
+      ColumnsQuery: [],
+      columns: [
+        {
+          title: '代码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'code'
+        },
+        {
+          title: '名称',
+          align: 'center',
+          width: '80',
+          dataIndex: 'name'
+        },
+        {
+          title: '备注',
+          align: 'center',
+          width: '80',
+          dataIndex: 'remark'
+        },
+        {
+          title: 'EDI代码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'ediCode'
+        },
+        {
+          title: '描述',
+          align: 'center',
+          width: '80',
+          dataIndex: 'description'
+        }
+      ],
+      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: [],
+      CodeData: [],
+      WCodeData: [],
+      ModulesData: [],
+      carrierCodeData: []
+    }
+  },
+  created() {},
+  mounted() {
+    this.init()
+  },
+  methods: {
+    toggleAdvanced() {
+      this.advanced = !this.advanced
+    },
+    init() {
+      Object.assign(this.$data, this.$options.data())
+      this.ColumnsQuery = this.columns
+      this.FnGetData()
+    },
+    FnGetData() {
+      this.loading = true
+      CommondbList(this.queryParam).then(res => {
+        if (res.code == 200) {
+          this.loadData = res.data
+        } else {
+          this.loadData = []
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      })
+    },
+    handleOk() {
+      this.FnGetData()
+    }
+  }
+}
+</script>
+<style lang="less">
+.table-operator {
+  margin-bottom: 18px;
+}
+
+button {
+  margin-right: 8px;
+}
+.Open {
+}
+.Close {
+  height: 45px;
+  overflow: hidden;
+}
+</style>

src/views/main/CommondbPort/addForm.vue

@@ -66,14 +66,14 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />

src/views/main/CommondbPort/editForm.vue

@@ -14,6 +14,7 @@
             <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入代码"
+                :disabled="true"
                 v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
               />
             </a-form-item>

src/views/main/CommondbPortload/addForm.vue

@@ -34,14 +34,14 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="12">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />

src/views/main/CommondbPortload/editForm.vue

@@ -14,6 +14,7 @@
             <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入代码"
+                :disabled="true"
                 v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
               />
             </a-form-item>

src/views/main/CommondbServiceList/addForm.vue

@@ -0,0 +1,127 @@
+<template>
+  <a-modal
+    title="新增配置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入代码"
+                v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入名称"
+                v-decorator="['name', { rules: [{ required: true, message: '请输入名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="12">
+            <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI代码"
+                v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { CommondbAdd } from '@/api/modular/main/CommondbServiceList'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 20 }
+      },
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {},
+  methods: {
+    // 初始化方法
+    add(record) {
+      this.visible = true
+    },
+    /**
+     * 提交表单
+     */
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          for (const key in values) {
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          CommondbAdd(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('新增成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`新增失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CommondbServiceList/editForm.vue

@@ -0,0 +1,141 @@
+<template>
+  <a-modal
+    title="编辑配置"
+    :width="1100"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleSubmit"
+    @cancel="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :span="12">
+            <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入代码"
+                :disabled="true"
+                v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入名称"
+                v-decorator="['name', { rules: [{ required: true, message: '请输入名称！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="12">
+            <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入EDI代码"
+                v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col> -->
+          <a-col :span="12">
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+            </a-form-item>
+          </a-col>
+
+          <a-col :span="24">
+            <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <a-textarea :autosize="{ minRows: 3 }" placeholder="请输入描述" v-decorator="['description']" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+import { CommondbAdd } from '@/api/modular/main/CommondbServiceList'
+export default {
+  data() {
+    return {
+      TypeData: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 20 }
+      },
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  mounted() {},
+  methods: {
+    // 初始化方法
+    edit(record) {
+      this.data = record
+      console.log(record)
+      this.visible = true
+      setTimeout(() => {
+        this.form.setFieldsValue({
+          name: record.name,
+          ediCode: record.ediCode,
+          description: record.description,
+          remark: record.remark
+        })
+        console.log(this.form.getFieldsValue())
+      }, 100)
+    },
+    handleSubmit() {
+      const {
+        form: { validateFields }
+      } = 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.gid = this.data.gid
+          console.log(values)
+          CommondbAdd(values)
+            .then(res => {
+              if (res.success) {
+                this.$message.success('编辑成功')
+                this.confirmLoading = false
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error(`编辑失败,${res.message}`)
+              }
+            })
+            .finally(res => {
+              this.confirmLoading = false
+            })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.visible = false
+    }
+  }
+}
+</script>

src/views/main/CommondbServiceList/index.vue

@@ -0,0 +1,174 @@
+<template>
+  <div>
+    <a-card :bordered="false" :bodyStyle="tstyle">
+      <div
+        class="table-page-search-wrapper"
+        v-if="hasPerm('BookingTemplate:page')"
+        :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-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <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">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'" />
+                </a> -->
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+    </a-card>
+    <a-card :bordered="false">
+      <vxe-toolbar>
+        <template #buttons>
+          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">
+            新增配置
+          </a-button>
+        </template>
+      </vxe-toolbar>
+      <vxe-table :data="loadData" border :loading="loading" height="600px" empty-text="没有更多数据了！">
+        <vxe-column type="seq" width="50" fixed="left"></vxe-column>
+        <vxe-column
+          v-for="item in columns"
+          :key="`${item.dataIndex}3`"
+          :field="item.dataIndex"
+          :min-width="item.width"
+          :title="item.title"
+          :align="item.align"
+          :show-overflow="true"
+        >
+        </vxe-column>
+        <!-- <vxe-column title="操作" fixed="right" width="200" align="center">
+          <template #default="{ row }">
+            <vxe-button type="text" @click="$refs.editForm.edit(row)">编辑</vxe-button>
+          </template>
+        </vxe-column> -->
+      </vxe-table>
+      <add-form ref="addForm" @ok="handleOk" />
+      <edit-form ref="editForm" @ok="handleOk" />
+    </a-card>
+  </div>
+</template>
+<script>
+import { CommondbList } from '@/api/modular/main/CommondbServiceList'
+import addForm from './addForm.vue'
+import editForm from './editForm.vue'
+export default {
+  components: {
+    addForm,
+    editForm
+  },
+  data() {
+    return {
+      TypeData: [],
+      // 高级搜索 展开/关闭
+      advanced: false,
+      loading: false,
+      setVisible: false,
+      setVisible1: false,
+      queryParam: {
+        // currentPage: 1,
+        // pageSize: 10,
+        // totalResult: 1
+      },
+      ColumnsQuery: [],
+      columns: [
+        {
+          title: '代码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'code'
+        },
+        {
+          title: '名称',
+          align: 'center',
+          width: '80',
+          dataIndex: 'name'
+        },
+        {
+          title: '备注',
+          align: 'center',
+          width: '80',
+          dataIndex: 'remark'
+        },
+        {
+          title: 'EDI代码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'ediCode'
+        },
+        {
+          title: '描述',
+          align: 'center',
+          width: '80',
+          dataIndex: 'description'
+        }
+      ],
+      tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
+      // 加载数据方法 必须为 Promise 对象
+      loadData: [],
+      CodeData: [],
+      WCodeData: [],
+      ModulesData: [],
+      carrierCodeData: []
+    }
+  },
+  created() {},
+  mounted() {
+    this.init()
+  },
+  methods: {
+    toggleAdvanced() {
+      this.advanced = !this.advanced
+    },
+    init() {
+      Object.assign(this.$data, this.$options.data())
+      this.ColumnsQuery = this.columns
+      this.FnGetData()
+    },
+    FnGetData() {
+      this.loading = true
+      CommondbList(this.queryParam).then(res => {
+        if (res.code == 200) {
+          this.loadData = res.data
+        } else {
+          this.loadData = []
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      })
+    },
+    handleOk() {
+      this.FnGetData()
+    }
+  }
+}
+</script>
+<style lang="less">
+.table-operator {
+  margin-bottom: 18px;
+}
+
+button {
+  margin-right: 8px;
+}
+.Open {
+}
+.Close {
+  height: 45px;
+  overflow: hidden;
+}
+</style>

src/views/main/CommondbVessel/addForm.vue

@@ -26,14 +26,14 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-textarea

src/views/main/CommondbVessel/editForm.vue

@@ -26,14 +26,14 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
             <a-form-item label="EDI代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入EDI代码"
                 v-decorator="['ediCode', { rules: [{ required: true, message: '请输入EDI代码！' }] }]"
               />
             </a-form-item>
-          </a-col>
+          </a-col> -->
           <a-col :span="24">
             <a-form-item label="描述" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-textarea

src/views/main/CommondbYard/editForm.vue

@@ -14,6 +14,7 @@
             <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
                 placeholder="请输入代码"
+                :disabled="true"
                 v-decorator="['code', { rules: [{ required: true, message: '请输入代码！' }] }]"
               />
             </a-form-item>