海运出口详情bug

src/api/common/index.ts

@@ -85,6 +85,17 @@ enum Api {
   GetUnitSelectInfo = '/mainApi/ClientCommon/GetUnitSelectInfo',
   // 根据付费方式获取数量信息
   GetClientFrtSelectList = '/mainApi/Common/GetClientFrtSelectList',
+  // 委托单位下拉
+  GetControllerClientList = '/mainApi/ClientCommon/GetControllerClientListByKey',
+}
+
+// 委托单位下拉数据
+export function GetControllerClientList(params) {
+  return request<DataResult>({
+    url: Api.GetControllerClientList,
+    method: 'get',
+    params
+  })
 }
 
 // 船名下拉数据列表

src/views/operation/seaexport/api/BookingLedger.js

@@ -164,6 +164,16 @@ export function GetVouchingClerkList(parameter) {
     params: parameter,
   })
 }
+
+// 获取航线列表
+export function GetLaneUserList(parameter) {
+  return request({
+    url: '/mainApi/ClientCommon/GetLaneUserList',
+    method: 'get',
+    params: parameter,
+  })
+}
+
 // 获取客服列表 (Auth)
 export function GetCustomerServiceList(parameter) {
   return request({

src/views/operation/seaexport/detail/modules/baseInfo.tsx

@@ -5,7 +5,7 @@ import { ref, unref } from 'vue'
 import { BasicColumn, FormSchema } from '/@/components/Table'
 import { getDictOption } from '/@/utils/dictUtil'
 // 下拉框数据接口
-import { GetClientListByCode, GetCarrierSelectList } from '/@/api/common'
+import { GetClientListByCode, GetCarrierSelectList, GetControllerClientList } from '/@/api/common'
 import {
   GetPackageSelectList,
   GetOrderContactListByClientId,
@@ -22,7 +22,8 @@ import {
   GetDeptList,
   GetSaleList,
   GetCustomerServiceList,
-  GetVouchingClerkList
+  GetVouchingClerkList,
+  GetLaneUserList
 } from '/@/views/operation/seaexport/api/BookingLedger'
 import { useOptionsStore } from '/@/store/modules/options'
 const optionsStore = useOptionsStore()
@@ -98,8 +99,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     colProps: { span: 5 },
     componentProps: ({ formModel, formActionType }) => {
       return {
-        api: GetClientListByCode,
-        params: { code: 'controller' },
+        api: GetControllerClientList,
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'shortName',
@@ -108,7 +108,7 @@ export const basicInfoFormSchema: FormSchema[] = [
         onChange: (e, obj) => {
           if (e && obj) {
             setTimeout(() => {
-              formActionType ? formActionType.linkageForm(obj) : null
+              formActionType ? formActionType.linkageForm({ key: 'customerName', value: obj}) : null
             }, 10)
             formModel.customerId = obj.id
           }
@@ -2174,33 +2174,66 @@ export const otherInfoFormSchema: FormSchema[] = [
     show: false,
   },
   {
-    label: '航线',
+    label: '',
     field: 'laneId',
+    component: 'Input',
+    show: false,
+    required: false,
+    // dynamicDisabled: false,
+    // colProps: { span: 12 },
+    // componentProps: ({ formModel }) => {
+    //   return {
+    //     option: optionsStore.getOptionsByCode('GetClientLanesSelectList'),
+    //     labelField: 'laneName',
+    //     valueField: 'id',
+    //     filterOption: (input: string, option: any) => {
+    //       return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    //     },
+    //     onChange: (e, obj) => {
+    //       if (e && obj) {
+    //         formModel.lane = obj.label
+    //         formModel.laneCode = obj.ediCode
+    //       }
+    //       if (!e && !obj) {
+    //         formModel.lane = null
+    //         formModel.laneCode = null
+    //       }
+    //     }
+    //   }
+    // }
+  },
+  {
+    label: '航线',
+    field: 'laner',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
-        option: optionsStore.getOptionsByCode('GetClientLanesSelectList'),
-        labelField: 'laneName',
-        valueField: 'id',
-        filterOption: (input: string, option: any) => {
-          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        },
+        api: GetLaneUserList,
+        labelField: 'pinYinCode',
+        valueField: 'userName',
+        showName: 'userName',
+        immediate: false,
+        resultField: 'data',
         onChange: (e, obj) => {
           if (e && obj) {
-            formModel.lane = obj.label
-            formModel.laneCode = obj.ediCode
+            formModel.lanerId = obj.id
           }
           if (!e && !obj) {
-            formModel.lane = null
-            formModel.laneCode = null
+            formModel.lanerId = null
           }
         }
       }
     }
   },
+  {
+    label: '',
+    field: 'lanerId',
+    component: 'Input',
+    show: false
+  },
   {
     label: '单证',
     field: 'docName',
@@ -2215,8 +2248,6 @@ export const otherInfoFormSchema: FormSchema[] = [
         labelField: 'pinYinCode',
         valueField: 'userName',
         showName: 'userName',
-        allowClear: true,
-        showSearch: true,
         immediate: false,
         resultField: 'data',
         onChange: (e, obj) => {

src/views/operation/seaexport/detail/modules/basicInfo.vue

@@ -163,9 +163,13 @@
   // 5.自动带出所属分部和所属部门
   // 6.自动带出服务项目。
   const linkageForm = async (item) => {
+    console.log(item)
     if (item.key == 'contractNo') {
       // 修改合约号增加备注
       emitter.emit('seaAddNotes', item.value)
+    } else if (item.key == 'customerName') {
+      // 修改委托单位带出值
+      emitter.emit('customerBack', item.value)
     }
   }
   watch(

src/views/operation/seaexport/detail/modules/cargoInfo.vue

@@ -65,6 +65,7 @@
                   >
                   </a-select>
                   <div style="width: 30px"></div>
+                  <a-input-number v-model:value="item.ctn" size="small" :min="0" :max="999999999" placeholder="箱量" />
                   <a-input-number v-model:value="item.quotePrice" size="small" :min="0" :max="999999999" placeholder="报价" />
                   <a-input-number v-model:value="item.guidePrice" size="small" :min="0" :max="999999999" placeholder="指导价" />
                   <a-input-number v-model:value="item.floorPrice" size="small" :min="0" :max="999999999" placeholder="底价" />

src/views/operation/seaexport/detail/modules/otherInfo.vue

@@ -136,6 +136,14 @@
         })
       }
     })
+    emitter.on('customerBack', (v) => {
+      console.log(v)
+      if (v.laneId) {
+        setFieldsValue({
+          ...v
+        })
+      }
+    })
   })
   defineExpose({
     // RefbasicFrom,

src/views/system/user/UserModal.vue

@@ -39,6 +39,12 @@
             />
             <span class="s-txt" :class="{ 's-active': model.isVouchingClerk }">{{ model.isVouchingClerk ? '是' : '否'}}</span>
           </template>
+          <template #isLaner="{ model }">
+            <a-switch
+              v-model:checked="model.isLaner"
+            />
+            <span class="s-txt" :class="{ 's-active': model.isLaner }">{{ model.isLaner ? '是' : '否'}}</span>
+          </template>
           <template #isSale="{ model }">
             <a-switch
               v-model:checked="model.isSale"

src/views/system/user/columns.tsx

@@ -270,6 +270,13 @@ export const formSchema: FormSchema[] = [
     component: 'Switch',
     colProps: { span: 6 },
   },
+  {
+    field: 'isLaner',
+    slot: 'isLaner',
+    label: '是否航线',
+    component: 'Switch',
+    colProps: { span: 6 },
+  },
   {
     field: 'isSale',
     slot: 'isSale',
@@ -338,6 +345,12 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'userNumber',
+    component: 'Input',
+    label: '',
+    show: false
+  },
   {
     field: 'divider-selects',
     component: 'Divider',