Selaa lähdekoodia

12.预订舱 ETD选不了
13.预订舱 列表页隐藏不必要的字段
14.海运出口 新加默认值
15.预订舱 修改字段

Qukatie 7 kuukautta sitten
vanhempi
commit
e0ff76f9a3

+ 8 - 1
src/api/approval/processConfig.js

@@ -92,4 +92,11 @@ export function selectListLos(roles) {
     }
   })
 }
-
+// 根据角色查询用户
+export function selectListLos2(data) {
+  return request({
+    url: '/api/blade-user/selectListLos',
+    method: 'get',
+    params:data
+  })
+}

+ 0 - 1
src/views/boxManagement/boxPoolDynamics/components/importModule.vue

@@ -155,7 +155,6 @@ export default {
         },
         //文件上传失败时的钩子
         onError(err, file, fileList) {
-
             let errorMsg = err.toString();
             errorMsg = errorMsg.replace('Error:', '')
             errorMsg = JSON.parse(errorMsg)

+ 2 - 0
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -546,6 +546,7 @@ export default {
                 serviceTerms: 'CY-CY', // 服务方式
                 polFreeBoxUseDays: '7',
                 podFreeBoxUseDays: '14',
+                boxBelongsTo:'SOC',
                 filesList: [], // 文件中心
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付
@@ -591,6 +592,7 @@ export default {
                 serviceTerms: 'CY-CY', // 服务方式
                 polFreeBoxUseDays: '7',
                 podFreeBoxUseDays: '14',
+                boxBelongsTo:'SOC',
                 filesList: [], // 文件中心
                 feeCenterListD: [], // 收
                 feeCenterListC: [], // 付

+ 1 - 1
src/views/iosBasicData/bcorps/detailsPage.vue

@@ -1146,7 +1146,7 @@ import { getDeptLazyTree } from "@/api/system/dept";
 import { getBcorpslistByType } from "@/api/iosBasicData/bcorps";
 import { blinesList } from "@/api/iosBasicData/blines";
 import blines from "@/views/iosBasicData/blines/index.vue";
-import { selectListLos } from "@/api/approval/processConfig";
+import { selectListLosz } from "@/api/approval/processConfig";
 import losaudit from "@/views/wel/components/losAssembly/losaudit.vue";
 import dicSelect from "@/components/dicSelect/main";
 export default {

+ 1 - 1
src/views/iosBasicData/businessCenter/bookingCabin/detailsPage.vue

@@ -352,7 +352,7 @@ export default {
             disabled: false,
             type: "date",
             format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd 00:00:00",
+            valueFormat: "yyyy-MM-dd",
             rules: [{
               required: true,
               message: " ",

+ 13 - 13
src/views/iosBasicData/businessCenter/bookingCabin/index.vue

@@ -93,7 +93,7 @@ export default {
                     },
                     {
                         label: '预定舱单号',
-                        prop: "temporaryNo",
+                        prop: "billNo",
                         width: "100",
                         search: true,
                         overHidden: true,
@@ -104,12 +104,12 @@ export default {
                         width: "100",
                         overHidden: true,
                     },
-                    {
-                        label: '客服',
-                        prop: "customerServiceName",
-                        width: "100",
-                        overHidden: true,
-                    },
+                    // {
+                    //     label: '客服',
+                    //     prop: "customerServiceName",
+                    //     width: "100",
+                    //     overHidden: true,
+                    // },
                     {
                         label: '承运人',
                         prop: "actualShippingCompanyCname",
@@ -151,7 +151,7 @@ export default {
                     },
                     {
                         label: "起运港",
-                        prop: "polCnName",
+                        prop: "polEnName",
                         width: "80",
                         overHidden: true,
                         search: true,
@@ -160,15 +160,15 @@ export default {
                         remote: true,
                         dicUrl: "/api/blade-los/bports/list?current=1&size=5&cnName={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'enName',
+                            value: 'enName',
                             desc: 'code',
                             res: 'data.records'
                         },
                     },
                     {
                         label: "卸货港",
-                        prop: "podCnName",
+                        prop: "podEnName",
                         width: "80",
                         overHidden: true,
                         search: true,
@@ -177,8 +177,8 @@ export default {
                         remote: true,
                         dicUrl: "/api/blade-los/bports/list?current=1&size=5&cnName={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'enName',
+                            value: 'enName',
                             desc: 'code',
                             res: 'data.records'
                         },