3/21

2 years ago · 8803b1cac7
parent 4a851c92bf
commit 8803b1cac7
3 changed files with 70 additions and 26 deletions
--- a/src/views/main/CommondbRelaPortCarrierLaneDto/addForm.vue
+++ b/src/views/main/CommondbRelaPortCarrierLaneDto/addForm.vue
@ -12,10 +12,18 @@
        <a-row>
          <a-col :span="12">
            <a-form-item label="航线代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <!-- <a-input
                placeholder="请输入航线代码"
                v-decorator="['laneCode', { rules: [{ required: true, message: '请输入航线代码！' }] }]"
-              />
+              /> -->
+              <a-select
+                placeholder="请选择航线代码"
+                v-decorator="['laneCode', { rules: [{ required: true, message: '请选择航线代码！' }] }]"
+              >
+                <a-select-option v-for="item in laneCodeData" :key="item.code" :value="item.code">
+                  {{ item.cnName }}
+                </a-select-option>
+              </a-select>
            </a-form-item>
          </a-col>
          <a-col :span="12">
@ -23,7 +31,7 @@
              <a-select
                show-search
                placeholder="请选择船公司"
-                v-decorator="['carrierCode', { rules: [{ required: true, message: '请选择船公司！' }] }]"
+                v-decorator="['carrierCode']"
                @search="CarrierHandleSearch"
                :default-active-first-option="false"
                :show-arrow="false"
@ -38,13 +46,21 @@
          </a-col>
          <a-col :span="12">
            <a-form-item label="港口代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
+              <!-- <a-input
                placeholder="请输入港口代码"
                v-decorator="['portCode', { rules: [{ required: true, message: '请输入港口代码！' }] }]"
-              />
+              /> -->
+              <a-select
+                placeholder="请选择港口代码"
+                v-decorator="['portCode', { rules: [{ required: true, message: '请选择港口代码！' }] }]"
+              >
+                <a-select-option v-for="item in portCodeData" :key="item.code" :value="item.code">
+                  {{ item.cnName }}
+                </a-select-option>
+              </a-select>
            </a-form-item>
          </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
            <a-form-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-select
                placeholder="请选择模块"
@ -55,7 +71,7 @@
                </a-select-option>
              </a-select>
            </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']" />
@ -68,6 +84,8 @@
 </template>

 <script>
+import { CommondbList } from '@/api/modular/main/CommondbPort'
+import { CommondbCodeLaneList } from '@/api/modular/main/CommondbCodeLane'
 import { commondbCarrierlist } from '@/api/modular/main/CommondbFrtlist'
 import { CommondbSaveRelaPortCarrierLaneDto } from '@/api/modular/main/CommondbRelaPortCarrierLaneDto'
 import { commondbModules } from '@/api/modular/main/ShippingCompanyMapping'
@ -94,6 +112,8 @@ export default {
      visible: false,
      confirmLoading: false,
      ModulesData: [],
+      portCodeData: [],
+      laneCodeData: [],
      carrierCodeData: [],
      form: this.$form.createForm(this)
    }
@ -111,6 +131,12 @@ export default {
      commondbModules().then(res => {
        this.ModulesData = res.data
      })
+      CommondbList().then(res => {
+        this.portCodeData = res.data
+      })
+      CommondbCodeLaneList().then(res => {
+        this.laneCodeData = res.data
+      })
      commondbCarrierlist().then(res => {
        this.carrierCodeData = res.data
      })
--- a/src/views/main/CommondbRelaPortCarrierLaneDto/editForm.vue
+++ b/src/views/main/CommondbRelaPortCarrierLaneDto/editForm.vue
@ -12,10 +12,14 @@
        <a-row>
          <a-col :span="12">
            <a-form-item label="航线代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入航线代码"
-                v-decorator="['laneCode', { rules: [{ required: true, message: '请输入航线代码！' }] }]"
-              />
+              <a-select
+                placeholder="请选择航线代码"
+                v-decorator="['laneCode', { rules: [{ required: true, message: '请选择航线代码！' }] }]"
+              >
+                <a-select-option v-for="item in laneCodeData" :key="item.code" :value="item.code">
+                  {{ item.cnName }}
+                </a-select-option>
+              </a-select>
            </a-form-item>
          </a-col>
          <a-col :span="12">
@ -23,7 +27,7 @@
              <a-select
                show-search
                placeholder="请选择船公司"
-                v-decorator="['carrierCode', { rules: [{ required: true, message: '请选择船公司！' }] }]"
+                v-decorator="['carrierCode']"
                @search="CarrierHandleSearch"
                :default-active-first-option="false"
                :show-arrow="false"
@ -38,13 +42,17 @@
          </a-col>
          <a-col :span="12">
            <a-form-item label="港口代码" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input
-                placeholder="请输入港口代码"
-                v-decorator="['portCode', { rules: [{ required: true, message: '请输入港口代码！' }] }]"
-              />
+              <a-select
+                placeholder="请选择港口代码"
+                v-decorator="['portCode', { rules: [{ required: true, message: '请选择港口代码！' }] }]"
+              >
+                <a-select-option v-for="item in portCodeData" :key="item.code" :value="item.code">
+                  {{ item.cnName }}
+                </a-select-option>
+              </a-select>
            </a-form-item>
          </a-col>
-          <a-col :span="12">
+          <!-- <a-col :span="12">
            <a-form-item label="模块" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
              <a-select
                placeholder="请选择模块"
@ -55,7 +63,7 @@
                </a-select-option>
              </a-select>
            </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']" />
@ -68,6 +76,8 @@
 </template>

 <script>
+import { CommondbList } from '@/api/modular/main/CommondbPort'
+import { CommondbCodeLaneList } from '@/api/modular/main/CommondbCodeLane'
 import { commondbCarrierlist } from '@/api/modular/main/CommondbFrtlist'
 import { commondbModules } from '@/api/modular/main/ShippingCompanyMapping'
 import { CommondbSaveRelaPortCarrierLaneDto } from '@/api/modular/main/CommondbRelaPortCarrierLaneDto'
@ -94,6 +104,8 @@ export default {
      visible: false,
      confirmLoading: false,
      ModulesData: [],
+      portCodeData: [],
+      laneCodeData: [],
      carrierCodeData: [],
      form: this.$form.createForm(this)
    }
@ -116,6 +128,12 @@ export default {
      commondbCarrierlist().then(res => {
        this.carrierCodeData = res.data
      })
+      CommondbList().then(res => {
+        this.portCodeData = res.data
+      })
+      CommondbCodeLaneList().then(res => {
+        this.laneCodeData = res.data
+      })
      setTimeout(() => {
        console.log(record)
        this.form.setFieldsValue({
--- a/src/views/main/CommondbRelaPortCarrierLaneDto/index.vue
+++ b/src/views/main/CommondbRelaPortCarrierLaneDto/index.vue
@ -25,11 +25,11 @@
                    <a-input v-model="queryParam.PortCode" allow-clear placeholder="请输入港口代码" />
                  </a-form-item>
                </a-col>
-                <a-col :md="8" :sm="24">
+                <!-- <a-col :md="8" :sm="24">
                  <a-form-item label="模块：">
                    <a-input v-model="queryParam.Module" allow-clear placeholder="请输入模块" />
                  </a-form-item>
-                </a-col>
+                </a-col> -->
              </a-row>
            </a-col>
            <a-col :md="6" :sm="24">
@ -129,12 +129,12 @@ export default {
          width: '80',
          dataIndex: 'portCode'
        },
-        {
-          title: '模块',
-          align: 'center',
-          width: '80',
-          dataIndex: 'module'
-        },
+        // {
+        //   title: '模块',
+        //   align: 'center',
+        //   width: '80',
+        //   dataIndex: 'module'
+        // },
        {
          title: '备注',
          align: 'center',