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

src/views/main/CommondbVessellist/addForm.vue

@@ -10,6 +10,14 @@
     <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-select
@@ -40,6 +48,24 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="场站" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select
+                show-search
+                placeholder="请选择场站"
+                v-decorator="['yardCode']"
+                @search="YardCodeSearch"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="filterOption"
+                :not-found-content="null"
+              >
+                <a-select-option v-for="item in YardCodeData" :key="item.code" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="映射名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
@@ -48,6 +74,14 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="映射代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入映射代码"
+                v-decorator="['mapCode', { rules: [{ required: true, message: '请输入映射代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
           <a-col :span="21">
             <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />
@@ -60,6 +94,7 @@
 </template>
 
 <script>
+import { commondbYardlist } from '@/api/modular/main/CommondbYardlist'
 import { CommondbAddorupdatevessel, commondbVessellist } from '@/api/modular/main/CommondbVessellist'
 import { commondbModules } from '@/api/modular/main/ShippingCompanyMapping'
 export default {
@@ -86,20 +121,33 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       CodeData: [],
-      ModulesData: []
+      ModulesData: [],
+      YardCodeData: []
     }
   },
   mounted() {},
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     handleSearch(data) {
       commondbVessellist({ KeyWord: data }).then(res => {
         this.CodeData = res.data
         console.log(this.CodeData)
       })
     },
+    YardCodeSearch(data) {
+      commondbYardlist({ KeyWord: data }).then(res => {
+        this.CodeData = res.data
+        console.log(this.CodeData)
+      })
+    },
     // 初始化方法
     add(record) {
       this.visible = true
+      commondbYardlist().then(res => {
+        this.YardCodeData = res.data
+      })
       commondbVessellist().then(res => {
         this.CodeData = res.data
       })

src/views/main/CommondbVessellist/editForm.vue

@@ -40,6 +40,24 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="场站" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-select
+                show-search
+                placeholder="请选择场站"
+                v-decorator="['yardCode']"
+                @search="YardCodeSearch"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="filterOption"
+                :not-found-content="null"
+              >
+                <a-select-option v-for="item in YardCodeData" :key="item.code" :value="item.code">
+                  {{ item.name }}
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :span="12">
             <a-form-item label="映射名称" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
               <a-input
@@ -48,6 +66,14 @@
               />
             </a-form-item>
           </a-col>
+          <a-col :span="12">
+            <a-form-item label="映射代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
+              <a-input
+                placeholder="请输入映射代码"
+                v-decorator="['mapCode', { rules: [{ required: true, message: '请输入映射代码！' }] }]"
+              />
+            </a-form-item>
+          </a-col>
           <a-col :span="21">
             <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']" />
@@ -60,6 +86,7 @@
 </template>
 
 <script>
+import { commondbYardlist } from '@/api/modular/main/CommondbYardlist'
 import { CommondbAddorupdatevessel, commondbVessellist } from '@/api/modular/main/CommondbVessellist'
 import { commondbModules } from '@/api/modular/main/ShippingCompanyMapping'
 export default {
@@ -88,17 +115,27 @@ export default {
       form: this.$form.createForm(this),
       data: {},
       CodeData: [],
-      ModulesData: []
+      ModulesData: [],
+      YardCodeData: []
     }
   },
   mounted() {},
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     handleSearch(data) {
       commondbVessellist({ KeyWord: data }).then(res => {
         this.CodeData = res.data
         console.log(this.CodeData)
       })
     },
+    YardCodeSearch(data) {
+      commondbYardlist({ KeyWord: data }).then(res => {
+        this.CodeData = res.data
+        console.log(this.CodeData)
+      })
+    },
     // 初始化方法
     edit(record) {
       this.data = record
@@ -106,6 +143,9 @@ export default {
       this.visible = true
       const typeOption = this.$options
       this.typeData = typeOption.filters['dictData']('edi_type')
+      commondbYardlist().then(res => {
+        this.YardCodeData = res.data
+      })
       commondbVessellist().then(res => {
         this.CodeData = res.data
       })
@@ -116,7 +156,9 @@ export default {
         this.form.setFieldsValue({
           name: record.name,
           module: record.module,
+          yardCode: record.yardCode,
           mapName: record.mapName,
+          mapCode: record.mapCode,
           remark: record.remark
         })
         console.log(this.form.getFieldsValue())

src/views/main/CommondbVessellist/index.vue

@@ -10,20 +10,42 @@
           <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 label="关键字：">
+                    <a-input v-model="queryParam.KeyWord" allow-clear placeholder="请输入关键字" />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="8" :sm="24">
+                  <a-form-item label="模块">
+                    <a-select allow-clear placeholder="请选择模块" v-model="queryParam.module">
+                      <a-select-option v-for="item in ModulesData" :key="item.code" :value="item.code">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+                <!-- <a-col :md="8" :sm="24" v-for="item in ColumnsQuery" :key="`${item.dataIndex}1`">
                   <a-form-item
                     :label="item.title"
-                    v-if="item.title != '备注' && item.title != '船名' && item.title != '模块'"
+                    v-if="
+                      item.title != '备注' &&
+                        item.title != '船名' &&
+                        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-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>
                   </a-select>
-                  </a-form-item>
+                </a-form-item> -->
                 <!-- <a-form-item :label="item.title" v-if="item.title == '船名'">
                     <a-select
                       allow-clear
@@ -41,7 +63,7 @@
                       </a-select-option>
                     </a-select>
                   </a-form-item> -->
-                </a-col>
+                <!-- </a-col> -->
               </a-row>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -136,6 +158,18 @@ export default {
           width: '80',
           dataIndex: 'module'
         },
+        // {
+        //   title: '代码',
+        //   align: 'center',
+        //   width: '80',
+        //   dataIndex: 'code'
+        // },
+        {
+          title: '船名',
+          align: 'center',
+          width: '100',
+          dataIndex: 'name'
+        },
         {
           title: '映射名称',
           align: 'center',
@@ -143,11 +177,18 @@ export default {
           dataIndex: 'mapName'
         },
         {
-          title: '船名',
+          title: '映射代码',
           align: 'center',
-          width: '100',
-          dataIndex: 'name'
+          width: '80',
+          dataIndex: 'mapCode'
         },
+        {
+          title: '场站代码',
+          align: 'center',
+          width: '80',
+          dataIndex: 'yardCode'
+        },
+
         {
           title: '备注',
           align: 'center',

src/views/main/Customer/editForm.vue

@@ -11,7 +11,7 @@
   <a-form :form="form" class="CsForm">
     <a-row type="flex" justify="end">
       <a-col :span="1">
-        <a-button type="primary" @click="handleSubmit">
+        <a-button type="primary" @click="handleSubmit" :loading="SaveLoading">
           保存
         </a-button>
       </a-col>
@@ -312,7 +312,8 @@ export default {
       TypeData: [],
       propStringData: [],
       saleUserList: [],
-      bookingServiceItem: []
+      bookingServiceItem: [],
+      SaveLoading: false
     }
   },
   watch: {
@@ -358,9 +359,8 @@ export default {
             }
           })
           this.ContactsData = res.data.contacts
-          console.log(WserviceItem.length)
+
           if (WserviceItem.length) {
-            console.log('进来了')
             this.form.setFieldsValue({
               ...res.data,
               WserviceItem
@@ -463,11 +463,13 @@ export default {
       this.confirmLoading = true
       validateFields((errors, values) => {
         if (!errors) {
+          this.SaveLoading = true
           for (const key in values) {
             if (typeof values[key] === 'object' && !(values[key] === null)) {
               values[key] = JSON.stringify(values[key])
             }
           }
+
           let propString = ''
           if (values.WpropString) {
             values.WpropString.split('["')[1]
@@ -478,7 +480,7 @@ export default {
               })
           }
           let serviceItem = ''
-          if (values.WserviceItem) {
+          if (values.WserviceItem && values.WserviceItem != '[]') {
             values.WserviceItem.split('["')[1]
               .split('"]')[0]
               .split('","')
@@ -486,10 +488,10 @@ export default {
                 serviceItem == '' ? (serviceItem = `[${item2}]`) : (serviceItem = `${serviceItem}[${item2}]`)
               })
           }
-
           let Arr = ['sale', 'op', 'doc', 'custservice']
           GetSysUserPage()
             .then(res => {
+              this.SaveLoading = false
               if (res.success) {
                 let saleUserList = res.data
                 Arr.forEach(item => {
@@ -523,6 +525,7 @@ export default {
               }
             })
             .catch(err => {
+              this.SaveLoading = false
               console.log(err)
             })
         } else {

src/views/main/Customer/index.vue

@@ -18,7 +18,16 @@
             </a-col>
             <a-col :md="4" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="FnGetData">查询</a-button>
+                <a-button
+                  type="primary"
+                  @click="
+                    () => {
+                      queryParam.pageNo = 1
+                      FnGetData()
+                    }
+                  "
+                  >查询</a-button
+                >
                 <a-button style="margin-left: 8px" @click="init">重置</a-button>
                 <a v-if="ColumnsQueryL > 3" @click="toggleAdvanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}

src/views/main/DJYTenantParam/addItemForm.vue

@@ -133,6 +133,14 @@ export default {
     }
   },
   mounted() {
+    this.FnDJYTenantParamGet()
+    this.YWData = this.$options.filters['dictData']('tenant_param_group')
+    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
+      this.TenantData = res.data.rows
+    })
+  },
+  methods: {
+    FnDJYTenantParamGet() {
       DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
         this.TypeData = res.data
         let data = []
@@ -154,12 +162,7 @@ export default {
         })
         this.WTypeData = data
       })
-    this.YWData = this.$options.filters['dictData']('tenant_param_group')
-    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
-      this.TenantData = res.data.rows
-    })
     },
-  methods: {
     FnTypeD(data) {
       let Rdata = ''
       this.YWData.forEach(item => {
@@ -191,6 +194,7 @@ export default {
     // 初始化方法
     add(record) {
       this.visible = true
+      this.FnDJYTenantParamGet()
       this.typeData = [
         {
           code: 10,

src/views/main/DJYTenantParam/editItemForm.vue

@@ -133,6 +133,13 @@ export default {
     }
   },
   mounted() {
+    this.YWData = this.$options.filters['dictData']('tenant_param_group')
+    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
+      this.TenantData = res.data.rows
+    })
+  },
+  methods: {
+    FnDJYTenantParamGet() {
       DJYTenantParamGet({ pageNo: 1, pageSize: 999 }).then(res => {
         this.TypeData = res.data
         let data = []
@@ -154,12 +161,7 @@ export default {
         })
         this.WTypeData = data
       })
-    this.YWData = this.$options.filters['dictData']('tenant_param_group')
-    SysTenantPage({ pageNo: 1, pageSize: 9999, name: '' }).then(res => {
-      this.TenantData = res.data.rows
-    })
     },
-  methods: {
     FnTypeD(data) {
       let Rdata = ''
       this.YWData.forEach(item => {
@@ -189,6 +191,7 @@ export default {
     },
     // 初始化方法
     edit(record) {
+      this.FnDJYTenantParamGet()
       console.log(record)
       this.FnChangeTypeCode(record.paraCode)
       this.data = record

src/views/main/DJYTenantParam/indexItem.vue

@@ -122,7 +122,8 @@
                 }
               "
             >
-              <vxe-button type="text">删除</vxe-button>
+              <a-icon type="delete" :style="{ color: '#13c2c2' }" />
+              <!-- <vxe-button type="text">删除</vxe-button> -->
             </a-popconfirm>
           </template>
         </vxe-column>

src/views/main/PrinttemplateRight/addForm.vue

@@ -18,7 +18,7 @@
                 show-search
                 :default-active-first-option="false"
                 :show-arrow="false"
-                :filter-option="false"
+                :filter-option="filterOption"
                 :not-found-content="null"
                 v-decorator="['userIdList', { rules: [{ required: true, message: '请选择用户！' }] }]"
               >
@@ -104,6 +104,9 @@ export default {
     })
   },
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     handleSearch(value) {
       console.log(value)
       let Rdata = []

src/views/main/PrinttemplateRight/index.vue

@@ -13,7 +13,20 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="用户：">
-                    <a-select placeholder="请选择用户" v-model="queryParam.userId">
+                    <!-- <a-select placeholder="请选择用户" v-model="queryParam.userId">
+                      <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
+                        {{ item.name }}
+                      </a-select-option>
+                    </a-select> -->
+                    <a-select
+                      show-search
+                      placeholder="请选择用户"
+                      v-model="queryParam.userId"
+                      :default-active-first-option="false"
+                      :show-arrow="false"
+                      :filter-option="filterOption"
+                      :not-found-content="null"
+                    >
                       <a-select-option v-for="item in UserList" :key="item.id" :value="item.id">
                         {{ item.name }}
                       </a-select-option>
@@ -171,6 +184,9 @@ export default {
     this.init()
   },
   methods: {
+    filterOption(input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     RMain(data) {
       let Text = ''
       if (data.type == 'FastReport') {

src/views/main/vesselinfo/addForm.vue

@@ -115,11 +115,11 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="实际离港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="实际开船" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择实际离港时间"
+                placeholder="请选择实际开船时间"
                 v-decorator="['atd']"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />

src/views/main/vesselinfo/editForm.vue

@@ -115,11 +115,11 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="实际离港时间" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+            <a-form-item label="实际开船" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
               <a-date-picker
                 show-time
                 :style="{ width: '100%' }"
-                placeholder="请选择实际离港时间"
+                placeholder="请选择实际开船时间"
                 v-decorator="['atd']"
                 valueFormat="YYYY-MM-DD HH:mm:ss"
               />

src/views/main/vesselinfo/index.vue

@@ -108,29 +108,29 @@ export default {
           dataIndex: 'vessel'
         },
         {
-          title: '航次',
+          title: '船公司',
           align: 'center',
-          dataIndex: 'voyno'
+          dataIndex: 'carrier'
         },
         {
-          title: '装货港',
+          title: '海关航次',
           align: 'center',
-          dataIndex: 'portLoading'
+          dataIndex: 'voyno'
         },
         {
-          title: '中转港',
+          title: '内部航次',
           align: 'center',
-          dataIndex: 'portTransit'
+          dataIndex: 'voynoInside'
         },
         {
-          title: '卸货港',
+          title: '开船日期',
           align: 'center',
-          dataIndex: 'portDischarge'
+          dataIndex: 'etd'
         },
         {
-          title: '开船日期',
+          title: '实际开船',
           align: 'center',
-          dataIndex: 'etd'
+          dataIndex: 'atd'
         },
         {
           title: '截港日期',
@@ -143,24 +143,24 @@ export default {
           dataIndex: 'eta'
         },
         {
-          title: '默认场站',
+          title: '装货港',
           align: 'center',
-          dataIndex: 'yard'
+          dataIndex: 'portLoading'
         },
         {
-          title: '实际离港日期',
+          title: '中转港',
           align: 'center',
-          dataIndex: 'atd'
+          dataIndex: 'portTransit'
         },
         {
-          title: '船公司',
+          title: '卸货港',
           align: 'center',
-          dataIndex: 'carrier'
+          dataIndex: 'portDischarge'
         },
         {
-          title: '内部航次',
+          title: '默认场站',
           align: 'center',
-          dataIndex: 'voynoInside'
+          dataIndex: 'yard'
         }
       ],
       tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },