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

src/views/main/BookingTemplate/addForm.vue

@@ -1,23 +1,38 @@
 <template>
   <a-modal
-    title="新增订舱模板"
+    title="新增收发通模板"
     :width="900"
     :visible="visible"
     :confirmLoading="confirmLoading"
     @ok="handleSubmit"
-    @cancel="handleCancel">
+    @cancel="handleCancel"
+  >
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="请输入标题" v-decorator="['title', {rules: [{required: true, message: '请输入标题！'}]}]" />
+          <a-input
+            placeholder="请输入代码"
+            v-decorator="['title', { rules: [{ required: true, message: '请输入代码！' }] }]"
+          />
         </a-form-item>
         <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select style="width: 100%" placeholder="请选择类型" v-decorator="['type', {rules: [{ required: true, message: '请选择类型！' }]}]">
+          <a-select
-            <a-select-option v-for="(item,index) in  typeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+            mode="multiple"
+            style="width: 100%"
+            placeholder="请选择类型"
+            v-decorator="['type', { rules: [{ required: true, message: '请选择类型！' }] }]"
+          >
+            <a-select-option v-for="(item, index) in typeData" :key="index" :value="item.code">
+              {{ item.name }}
+            </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="模板内容" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-textarea placeholder="请输入模板内容" v-decorator="['content', {rules: [{required: true, message: '请输入模板内容！'}]}]" />
+          <a-textarea
+            placeholder="请输入模板内容"
+            :auto-size="{ minRows: 3, maxRows: 5 }"
+            v-decorator="['content', { rules: [{ required: true, message: '请输入模板内容！' }] }]"
+          />
         </a-form-item>
         <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="请输入备注" v-decorator="['remark']" />
@@ -28,79 +43,97 @@
 </template>
 
 <script>
-  import {
+import { BookingTemplateAdd } from '@/api/modular/main/BookingTemplateManage'
-    BookingTemplateAdd
-  } from '@/api/modular/main/BookingTemplateManage'
 
-  export default {
+export default {
-    data () {
+  data() {
-      return {
+    return {
-        labelCol: {
+      labelCol: {
-          xs: { span: 24 },
+        xs: { span: 24 },
-          sm: { span: 5 }
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      typeData: [],
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  methods: {
+    // 初始化方法
+    add(record) {
+      this.visible = true
+      this.typeData = [
+        {
+          code: '10',
+          name: '收货人'
         },
-        wrapperCol: {
+        {
-          xs: { span: 24 },
+          code: '20',
-          sm: { span: 15 }
+          name: '发货人'
         },
-        typeData: [],
+        {
-        visible: false,
+          code: '30',
-        confirmLoading: false,
+          name: '通知人'
-        form: this.$form.createForm(this)
+        },
-      }
+        {
+          code: '40',
+          name: '第二通知人'
+        }
+      ]
     },
-    methods: {
+    /**
-      // 初始化方法
+     * 提交表单
-      add (record) {
+     */
-        this.visible = true
+    handleSubmit() {
-        this.typeData = [{
+      const {
-          code:10,
+        form: { validateFields }
-          name:'收货人'
+      } = this
-        },{
+      this.confirmLoading = true
-          code:20,
+      validateFields((errors, values) => {
-          name:'发货人'
+        if (!errors) {
-        },{
+          for (const key in values) {
-          code:30,
+            if (key == 'type') {
-          name:'通知人'
+              let Wtype = ''
-        },{
+              values[key].forEach((item, index) => {
-          code:40,
+                if (index == 0) {
-          name:'第二通知人'
+                  Wtype = item
-        }]
+                } else {
-      },
+                  Wtype = `${Wtype},${item}`
-      /**
+                }
-       * 提交表单
+              })
-       */
+              values[key] = Wtype
-      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])
-              }
             }
-            BookingTemplateAdd(values).then((res) => {
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
+              values[key] = JSON.stringify(values[key])
+            }
+          }
+          BookingTemplateAdd(values)
+            .then(res => {
               if (res.success) {
                 this.$message.success('新增成功')
                 this.confirmLoading = false
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('新增失败')// + res.message
+                this.$message.error('新增失败') // + res.message
               }
-            }).finally((res) => {
+            })
+            .finally(res => {
               this.confirmLoading = false
             })
-          } else {
+        } else {
-            this.confirmLoading = false
+          this.confirmLoading = false
-          }
+        }
-        })
+      })
-      },
+    },
-      handleCancel () {
+    handleCancel() {
-        this.form.resetFields()
+      this.form.resetFields()
-        this.visible = false
+      this.visible = false
-      }
     }
   }
+}
 </script>

src/views/main/BookingTemplate/editForm.vue

@@ -1,24 +1,39 @@
 <template>
   <a-modal
-    title="编辑订舱模板"
+    title="编辑收发通模板"
     :width="900"
     :visible="visible"
     :confirmLoading="confirmLoading"
     @ok="handleSubmit"
-    @cancel="handleCancel">
+    @cancel="handleCancel"
+  >
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item v-show="false"><a-input v-decorator="['id']" /></a-form-item>
+        <a-form-item v-show="false"><a-input v-decorator="['id']"/></a-form-item>
-        <a-form-item label="标题" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+        <a-form-item label="代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-input placeholder="请输入标题" v-decorator="['title', {rules: [{required: true, message: '请输入标题！'}]}]" />
+          <a-input
+            placeholder="请输入代码"
+            v-decorator="['title', { rules: [{ required: true, message: '请输入代码！' }] }]"
+          />
         </a-form-item>
         <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select style="width: 100%" placeholder="请选择类型" v-decorator="['type', {rules: [{ required: true, message: '请选择类型！' }]}]">
+          <a-select
-            <a-select-option v-for="(item,index) in typeData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
+            mode="multiple"
+            style="width: 100%"
+            placeholder="请选择类型"
+            v-decorator="['type', { rules: [{ required: true, message: '请选择类型！' }] }]"
+          >
+            <a-select-option v-for="(item, index) in typeData" :key="index" :value="item.code">
+              {{ item.name }}
+            </a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="模板内容" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-          <a-textarea placeholder="请输入模板内容" v-decorator="['content', {rules: [{required: true, message: '请输入模板内容！'}]}]" />
+          <a-textarea
+            placeholder="请输入模板内容"
+            :auto-size="{ minRows: 3, maxRows: 5 }"
+            v-decorator="['content', { rules: [{ required: true, message: '请输入模板内容！' }] }]"
+          />
         </a-form-item>
         <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
           <a-input placeholder="请输入备注" v-decorator="['remark']" />
@@ -29,75 +44,93 @@
 </template>
 
 <script>
-  import {
+import { BookingTemplateEdit } from '@/api/modular/main/BookingTemplateManage'
-    BookingTemplateEdit
+export default {
-  } from '@/api/modular/main/BookingTemplateManage'
+  data() {
-  export default {
+    return {
-    data () {
+      labelCol: {
-      return {
+        xs: { span: 24 },
-        labelCol: {
+        sm: { span: 5 }
-          xs: { span: 24 },
+      },
-          sm: { span: 5 }
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 15 }
+      },
+      typeData: [],
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this)
+    }
+  },
+  methods: {
+    // 初始化方法
+    edit(record) {
+      this.visible = true
+      this.typeData = [
+        {
+          code: '10',
+          name: '收货人'
+        },
+        {
+          code: '20',
+          name: '发货人'
         },
-        wrapperCol: {
+        {
-          xs: { span: 24 },
+          code: '30',
-          sm: { span: 15 }
+          name: '通知人'
         },
-        typeData: [],
+        {
-        visible: false,
+          code: '40',
-        confirmLoading: false,
+          name: '第二通知人'
-        form: this.$form.createForm(this)
+        }
-      }
+      ]
+      // const typeOption = this.$options
+      // this.typeData = typeOption.filters['dictData']('edi_type')
+      setTimeout(() => {
+        this.form.setFieldsValue({
+          id: record.id,
+          title: record.title,
+          type: record.type.toString().split(','),
+          content: record.content,
+          remark: record.remark
+        })
+      }, 100)
     },
-    methods: {
+    handleSubmit() {
-      // 初始化方法
+      const {
-      edit (record) {
+        form: { validateFields }
-        this.visible = true
+      } = this
-        const typeOption = this.$options
+      this.confirmLoading = true
-        this.typeData = typeOption.filters['dictData']('edi_type')
+      validateFields((errors, values) => {
-        setTimeout(() => {
+        if (!errors) {
-          this.form.setFieldsValue(
+          for (const key in values) {
-            {
+            if (typeof values[key] === 'object' && !(values[key] === null)) {
-              id: record.id,
+              values[key] = JSON.stringify(values[key])
-              title: record.title,
-              type: record.type,
-              content: record.content,
-              remark: record.remark
-            }
-          )
-        }, 100)
-      },
-      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])
-              }
             }
-            BookingTemplateEdit(values).then((res) => {
+          }
+          BookingTemplateEdit(values)
+            .then(res => {
               if (res.success) {
                 this.$message.success('编辑成功')
                 this.confirmLoading = false
                 this.$emit('ok', values)
                 this.handleCancel()
               } else {
-                this.$message.error('编辑失败')//  + res.message
+                this.$message.error('编辑失败') //  + res.message
               }
-            }).finally((res) => {
+            })
+            .finally(res => {
               this.confirmLoading = false
             })
-          } else {
+        } else {
-            this.confirmLoading = false
+          this.confirmLoading = false
-          }
+        }
-        })
+      })
-      },
+    },
-      handleCancel () {
+    handleCancel() {
-        this.form.resetFields()
+      this.form.resetFields()
-        this.visible = false
+      this.visible = false
-      }
     }
   }
+}
 </script>

src/views/main/BookingTemplate/index.vue

@@ -1,19 +1,19 @@
 <template>
   <div>
     <a-card :bordered="false" :bodyStyle="tstyle">
-
       <div class="table-page-search-wrapper">
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
-              <a-form-item label="标题">
+              <a-form-item label="代码">
-                <a-input v-model="queryParam.title" allow-clear placeholder="请输入标题" />
+                <a-input v-model="queryParam.title" allow-clear placeholder="请输入代码" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
               <a-form-item label="类型">
                 <a-select style="width: 100%" v-model="queryParam.type" placeholder="请选择类型">
-                  <a-select-option v-for="(item, index) in typeData" :key="index" :value="item.code">{{ item.name }}
+                  <a-select-option v-for="(item, index) in typeData" :key="index" :value="item.code"
+                    >{{ item.name }}
                   </a-select-option>
                 </a-select>
               </a-form-item>
@@ -21,20 +21,24 @@
             <a-col :md="8" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+                <a-button style="margin-left: 8px" @click="() => (queryParam = {})">重置</a-button>
               </span>
             </a-col>
-
           </a-row>
         </a-form>
       </div>
     </a-card>
     <a-card :bordered="false">
-      <s-table ref="table" :columns="columns" :data="loadData" :alert="true" :rowKey="(record) => record.id"
+      <s-table
-        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+        ref="table"
+        :columns="columns"
+        :data="loadData"
+        :alert="true"
+        :rowKey="record => record.id"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+      >
         <template class="table-operator" slot="operator">
-          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">新增订舱模板
+          <a-button type="primary" icon="plus" @click="$refs.addForm.add()">新增收发通模板 </a-button>
-          </a-button>
         </template>
         <span slot="typescopedSlots" slot-scope="text">
           {{ showType(text) }}
@@ -68,7 +72,7 @@ export default {
       queryParam: {},
       columns: [
         {
-          title: '标题',
+          title: '代码',
           align: 'center',
           dataIndex: 'title'
         },
@@ -97,12 +101,12 @@ export default {
           title: '修改时间',
           align: 'center',
           dataIndex: 'updatedTime'
-        },
+        }
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        return BookingTemplatePage(Object.assign(parameter, this.queryParam)).then((res) => {
+        return BookingTemplatePage(Object.assign(parameter, this.queryParam)).then(res => {
           return res.data
         })
       },
@@ -119,19 +123,24 @@ export default {
       scopedSlots: { customRender: 'action' }
     })
 
-    this.typeData = [{
+    this.typeData = [
-      code: 10,
+      {
-      name: '收货人'
+        code: 10,
-    }, {
+        name: '收货人'
-      code: 20,
+      },
-      name: '发货人'
+      {
-    }, {
+        code: 20,
-      code: 30,
+        name: '发货人'
-      name: '通知人'
+      },
-    }, {
+      {
-      code: 40,
+        code: 30,
-      name: '第二通知人'
+        name: '通知人'
-    }]
+      },
+      {
+        code: 40,
+        name: '第二通知人'
+      }
+    ]
   },
   methods: {
     /**
@@ -142,7 +151,7 @@ export default {
       return obj
     },
     BookingTemplateDelete(record) {
-      BookingTemplateDelete(record).then((res) => {
+      BookingTemplateDelete(record).then(res => {
         if (res.success) {
           this.$message.success('删除成功')
           this.$refs.table.refresh()

src/views/main/CommondbFrtlist/index.vue

@@ -10,51 +10,14 @@
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                <a-col :md="8" :sm="24">
-                  <a-form-item
+                  <a-form-item label="关键字：">
-                    :label="item.title"
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
-                    v-if="
-                      item.title != '备注' && item.title != '船公司' && item.title != '付费方式' && item.title != '模块'
-                    "
-                  >
-                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
                   </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '付费方式'">
+                </a-col>
-                    <a-select
+                <a-col :md="8" :sm="24">
-                      allow-clear
+                  <a-form-item label="模块">
-                      show-search
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
-                      placeholder="请选择付费方式"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in WCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '船公司'">
-                    <a-select
-                      allow-clear
-                      show-search
-                      placeholder="请选择船公司"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in carrierCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '模块'">
-                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
                       <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
                         {{ item.name }}
                       </a-select-option>

src/views/main/CommondbPackage/index.vue

@@ -10,51 +10,14 @@
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                <a-col :md="8" :sm="24">
-                  <a-form-item
+                  <a-form-item label="关键字：">
-                    :label="item.title"
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
-                    v-if="
-                      item.title != '备注' && item.title != '船公司' && item.title != '包装' && item.title != '模块'
-                    "
-                  >
-                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
                   </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '包装'">
+                </a-col>
-                    <a-select
+                <a-col :md="8" :sm="24">
-                      allow-clear
+                  <a-form-item label="模块">
-                      show-search
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
-                      placeholder="请选择包装"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in WCodeData" :key="item.code" :value="item.code">
-                        {{ item.name }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '船公司'">
-                    <a-select
-                      allow-clear
-                      show-search
-                      placeholder="请选择船公司"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in carrierCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '模块'">
-                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
                       <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
                         {{ item.name }}
                       </a-select-option>

src/views/main/CommondbPortlist/index.vue

@@ -10,51 +10,14 @@
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                <a-col :md="8" :sm="24">
-                  <a-form-item
+                  <a-form-item label="关键字：">
-                    :label="item.title"
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
-                    v-if="
-                      item.title != '备注' && item.title != '船公司' && item.title != '目的港' && item.title != '模块'
-                    "
-                  >
-                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
                   </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '目的港'">
+                </a-col>
-                    <a-select
+                <a-col :md="8" :sm="24">
-                      allow-clear
+                  <a-form-item label="模块">
-                      show-search
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
-                      placeholder="请选择目的港"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in WCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '船公司'">
-                    <a-select
-                      allow-clear
-                      show-search
-                      placeholder="请选择船公司"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in carrierCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '模块'">
-                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
                       <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
                         {{ item.name }}
                       </a-select-option>

src/views/main/CommondbPortloadlist/index.vue

@@ -10,51 +10,14 @@
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                <a-col :md="8" :sm="24">
-                  <a-form-item
+                  <a-form-item label="关键字：">
-                    :label="item.title"
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
-                    v-if="
-                      item.title != '备注' && item.title != '船公司' && item.title != '起始港' && item.title != '模块'
-                    "
-                  >
-                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
                   </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '起始港'">
+                </a-col>
-                    <a-select
+                <a-col :md="8" :sm="24">
-                      allow-clear
+                  <a-form-item label="模块">
-                      show-search
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
-                      placeholder="请选择起始港"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in WCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '船公司'">
-                    <a-select
-                      allow-clear
-                      show-search
-                      placeholder="请选择船公司"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in carrierCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '模块'">
-                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
                       <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
                         {{ item.name }}
                       </a-select-option>

src/views/main/CommondbService/index.vue

@@ -10,51 +10,14 @@
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                <a-col :md="8" :sm="24">
-                  <a-form-item
+                  <a-form-item label="关键字：">
-                    :label="item.title"
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
-                    v-if="
-                      item.title != '备注' && item.title != '船公司' && item.title != '运输条件' && item.title != '模块'
-                    "
-                  >
-                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
                   </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '运输条件'">
+                </a-col>
-                    <a-select
+                <a-col :md="8" :sm="24">
-                      allow-clear
+                  <a-form-item label="模块">
-                      show-search
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
-                      placeholder="请选择运输条件"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in WCodeData" :key="item.code" :value="item.code">
-                        {{ item.name }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '船公司'">
-                    <a-select
-                      allow-clear
-                      show-search
-                      placeholder="请选择船公司"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in carrierCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '模块'">
-                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
                       <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
                         {{ item.name }}
                       </a-select-option>

src/views/main/Customer/addForm.vue

@@ -104,6 +104,68 @@
         </a-form-item>
       </a-col>
     </a-row>
+    <a-row class="from-box3" :gutter="10">
+      <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+        <a-form-item class="from-label" label="销售人员" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <auto-complete
+            :allowClear="true"
+            class="customer-input"
+            v-model="details.sale"
+            :data-source="saleUserListArr"
+            :dropdown-match-select-width="false"
+            :dropdown-style="{ width: '200px' }"
+            @select="saleSelect"
+            @change="saleChange"
+            @focus="saleChange"
+          />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+        <a-form-item class="from-label" label="操作人员" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <auto-complete
+            :allowClear="true"
+            class="customer-input"
+            v-model="details.op"
+            :data-source="opUserListArr"
+            :dropdown-match-select-width="false"
+            :dropdown-style="{ width: '200px' }"
+            @select="opSelect"
+            @change="opChange"
+            @focus="opChange"
+          />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+        <a-form-item class="from-label" label="单证人员" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <auto-complete
+            :allowClear="true"
+            class="customer-input"
+            v-model="details.doc"
+            :data-source="docUserListArr"
+            :dropdown-match-select-width="false"
+            :dropdown-style="{ width: '200px' }"
+            @select="docSelect"
+            @change="docChange"
+            @focus="docChange"
+          />
+        </a-form-item>
+      </a-col>
+      <a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="6">
+        <a-form-item class="from-label" label="客服人员" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+          <auto-complete
+            :allowClear="true"
+            class="customer-input"
+            v-model="details.custservice"
+            :data-source="custserviceUserListArr"
+            :dropdown-match-select-width="false"
+            :dropdown-style="{ width: '200px' }"
+            @select="custserviceSelect"
+            @change="custserviceChange"
+            @focus="custserviceChange"
+          />
+        </a-form-item>
+      </a-col>
+    </a-row>
     <p class="CsFormTitle">
       <span><i class="iconfont icon-tuandui"></i>联系人信息</span>
     </p>

src/views/main/ShippingCompanyMapping/index.vue

@@ -10,32 +10,14 @@
           <a-row :gutter="48">
             <a-col :md="18">
               <a-row :gutter="48">
-                <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
+                <a-col :md="8" :sm="24">
-                  <a-form-item
+                  <a-form-item label="关键字：">
-                    :label="item.title"
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
-                    v-if="item.title != '备注' && item.title != '船公司' && item.title != '模块'"
-                  >
-                    <a-input v-model="queryParam[item.dataIndex]" allow-clear :placeholder="`请输入${item.title}`" />
                   </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '船公司'">
+                </a-col>
-                    <a-select
+                <a-col :md="8" :sm="24">
-                      allow-clear
+                  <a-form-item label="模块">
-                      show-search
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
-                      placeholder="请选择船公司"
-                      v-model="queryParam[item.dataIndex]"
-                      :default-active-first-option="false"
-                      :show-arrow="false"
-                      :filter-option="false"
-                      :not-found-content="null"
-                      @search="handleSearch"
-                    >
-                      <a-select-option v-for="item in WCodeData" :key="item.code" :value="item.code">
-                        {{ item.cnName }}
-                      </a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item :label="item.title" v-if="item.title == '模块'">
-                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam[item.dataIndex]">
                       <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
                         {{ item.name }}
                       </a-select-option>