whm
/
BookingHeChuanFront
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改问题

Browse Source
master
sunzehua 11 months ago
parent b3a2449d81
commit b19116a5af
8 changed files with 118 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
.env
Unescape Escape View File

@ -4,10 +4,10 @@ VUE_APP_PREVIEW=true
# VUE_APP_API_BASE_URL=http://127.0.0.1:5000
# VUE_APP_API_BASE_URL=http://60.209.125.238:25805
# 和川大简云正式
VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_API_BASE_URL=http://localhost:5010
# 和川大简云测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
VUE_APP_API_BASE_URL=http://60.209.125.238:35100
# 大简云
# VUE_APP_API_BASE_URL=http://47.104.222.4:5020

8
.env.development
Unescape Escape View File

@ -7,11 +7,11 @@ VUE_APP_PREVIEW=true
# process.env.VUE_APP_API_BASE_URL
# 和川大简云正式
VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api
# 和川大简云测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
VUE_APP_API_BASE_URL=http://60.209.125.238:35100
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# # 大简云
# VUE_APP_API_BASE_URL=http://47.104.222.4:5020
# VUE_APP_SOCKET_BASE_URL=http://47.104.222.4:5020

8
.env.preview
Unescape Escape View File

@ -3,13 +3,13 @@ VUE_APP_PREVIEW=true
# VUE_APP_API_BASE_URL=http://60.209.125.238:25805
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:25805
# 和川大简云正式
VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_API_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345/api
# VUE_APP_API_BASE_URL=http://localhost:5010
# VUE_APP_SOCKET_BASE_URL=http://localhost:5010
# 和川大简云测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:35100
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
VUE_APP_API_BASE_URL=http://60.209.125.238:35100
VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# 大简云
# VUE_APP_API_BASE_URL=http://47.104.222.4:5020
# VUE_APP_SOCKET_BASE_URL=http://47.104.222.4:5020

BIN
dist.zip
View File

Binary file not shown.

1
src/store/modules/user.js
Unescape Escape View File

@ -178,6 +178,7 @@ const user = {
Vue.ls.remove(ALL_APPS_MENU)
Vue.ls.remove(DICT_TYPE_TREE_DATA)
Vue.ls.remove('FIRSTFLAG')
localStorage.removeItem('formTableData');
})
})
},

2
src/views/main/BookingLedger/detail/modules/basicInfo.vue
Unescape Escape View File

@ -275,7 +275,7 @@
</a-form-model-item>
</a-col>
</template>
<template v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL'].includes(details.carrierid)">
<template v-if="['VOLTA', 'WHL', 'CSL', 'MSC', 'VOL','MSCFD'].includes(details.carrierid)">
<a-col :xs="12" :sm="12" :md="12" :lg="{ span: '4-8' }" :xl="{ span: '4-8' }">
<a-form-model-item
class="from-label"

67
src/views/main/BookingLedger/list/indexTest.vue
Unescape Escape View File

@ -1267,7 +1267,6 @@ import formLabel from './modules/formLabel'
import importBc from './modules/importBc'
import importBcMore from './modules/importBcMore'
import {
PageDataByBooking,
SendTrace,
getVesselInfoService,
GetPortlist,
@ -1394,7 +1393,7 @@ export default {
pageSize: 20,
pageSizes: [10, 20, 50, 100, 200, 500]
},
columns: JSON.parse(JSON.stringify(initData.columns)),
columns: [],
data: []
},
formTableData: JSON.parse(JSON.stringify(initData.columns)),
@ -1448,7 +1447,7 @@ export default {
txxpFlag: false,
formatPdf: '',
formatFlag: false,
showLabel:[]
showLabel: []
}
},
computed: {
@ -1502,6 +1501,11 @@ export default {
},
created() {
this.createdInit()
if (localStorage.getItem('formTableData')) {
this.gridOptions.columns = JSON.parse(localStorage.getItem('formTableData'));
} else {
this.gridOptions.columns = JSON.parse(JSON.stringify(initData.columns))
}
},
mounted() {
this.onresize()
@ -1563,7 +1567,13 @@ export default {
this.bcObj = {}
},
getListByone(listId, listIndex) {
PageDataByBooking({ id: listId }).then(res => {
const showArr = []
this.showLabel.forEach(item => {
if (item.field) {
showArr.push(item.field)
}
})
PageDataNew({ id: listId, showColumns: showArr }).then(res => {
const item = res.data.items[0]
const bookstatus = [
{ staCode: 'sta_cangdan', isChecked: false },
@ -1689,7 +1699,13 @@ export default {
SaveServiceStatusByList(data).then(res => {
if (res.code === 200) {
this.$message.success(res.data.msg)
PageDataByBooking({ id: row.id }).then(ress => {
const showArr = []
this.showLabel.forEach(item => {
if (item.field) {
showArr.push(item.field)
}
})
PageDataNew({ id: row.id, showColumns: showArr }).then(ress => {
const itme = ress.data.items[0]
row.bsstatusname = itme.bsstatusname
row.serviceLoad = false
@ -1709,7 +1725,13 @@ export default {
CancelServiceStatusByList(data).then(res => {
if (res.code === 200) {
this.$message.success(res.data.msg)
PageDataByBooking({ id: row.id }).then(ress => {
const showArr = []
this.showLabel.forEach(item => {
if (item.field) {
showArr.push(item.field)
}
})
PageDataNew({ id: row.id, showColumns: showArr }).then(ress => {
const itme = ress.data.items[0]
row.bsstatusname = itme.bsstatusname
row.serviceLoad = false
@ -1731,7 +1753,13 @@ export default {
SaveServiceStatusByList(data).then(res => {
if (res.code === 200) {
this.$message.success(res.data.msg)
PageDataByBooking({ id: this.editRow.id }).then(ress => {
const showArr = []
this.showLabel.forEach(item => {
if (item.field) {
showArr.push(item.field)
}
})
PageDataNew({ id: this.editRow.id, showColumns: showArr }).then(ress => {
const itme = ress.data.items[0]
this.editRow.bsstatusname = itme.bsstatusname
})
@ -1750,7 +1778,13 @@ export default {
CancelServiceStatusByList(data).then(res => {
if (res.code === 200) {
this.$message.success(res.data.msg)
PageDataByBooking({ id: this.editRow.id }).then(ress => {
const showArr = []
this.showLabel.forEach(item => {
if (item.field) {
showArr.push(item.field)
}
})
PageDataNew({ id: this.editRow.id, showColumns: showArr }).then(ress => {
const itme = ress.data.items[0]
this.editRow.bsstatusname = itme.bsstatusname
})
@ -2045,7 +2079,13 @@ export default {
row.refshYzitemLoad = true
RefreshBillTrace('ids=' + row.id).then(res => {
if (res.success) {
PageDataByBooking({ id: row.id }).then(ress => {
const showArr = []
this.showLabel.forEach(item => {
if (item.field) {
showArr.push(item.field)
}
})
PageDataNew({ id: row.id, showColumns: showArr }).then(ress => {
const item = ress.data.items[0]
row.refshYzitemLoad = false
const bookstatus = [
@ -2614,6 +2654,7 @@ export default {
submitTableForm(data) {
this.showLabel = JSON.parse(JSON.stringify(data))
this.gridOptions.columns = JSON.parse(JSON.stringify(data))
localStorage.setItem('formTableData', JSON.stringify(data));
this.$refs.setTableForm.handleCancel()
this.editColumnsSave(this.gridOptions.columns)
},
@ -3411,7 +3452,13 @@ export default {
this.TaskShippingOrderCompareData = res.data.extra
this.TaskShippingOrderCompareData.total = res.data.total
this.TaskShippingOrderCompareVisible = true
PageDataByBooking({ id: data.id }).then(ress => {
const showArr = []
this.showLabel.forEach(item => {
if (item.field) {
showArr.push(item.field)
}
})
PageDataNew({ id: data.id, showColumns: showArr }).then(ress => {
const itme = ress.data.items[0]
this.spinning = false
data.lstShipOrderCompareRlt = itme.lstShipOrderCompareRlt

50
src/views/userLoginReg/Login.vue
Unescape Escape View File

@ -107,7 +107,7 @@
</a-form-item>
<a-form-item>
<!-- <Verify
<!-- <Verify
@success="verifySuccess"
:mode="'pop'"
:captchaType="'clickWord'"
@ -155,8 +155,10 @@
import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
import { mapActions } from 'vuex'
import { getSmsCaptcha, getCaptchaOpen } from '@/api/modular/system/loginManage'
import { DjyUserConfigMulti } from '@/api/modular/main/BookingLedger'
import { ACCESS_TOKEN, ALL_APPS_MENU, DICT_TYPE_TREE_DATA } from '@/store/mutation-types'
import UpdPwd from './updPwd.vue'
import initData from '@/views/main/BookingLedger/list/modules/initData'
import Verify from '@/components/verifition/Verify'
export default {
components: {
@ -345,6 +347,52 @@ export default {
this.isLoginError = false
// 加载字典所有字典到缓存中
this.dictTypeData().then(res => { })
const query = {
typeArr: ['booking_list_column']
}
DjyUserConfigMulti(this.$qs.stringify(query)).then(res => {
if (res.data.length > 0) {
const labelData = JSON.parse(res.data[0].configJson)
labelData.forEach(item => {
if (!item.slots && item.field === 'bsstatusname') {
item.slots = { default: 'bsstatusname' }
}
if (item.field === 'zhanCangFlag') {
item.width = 35
}
if (item.field === 'custno') {
item.slots = { default: 'custno' }
}
if (item.field === 'shenQingXiangShi') {
item.slots = { default: 'shenQingXiangShi' }
}
if (item.field === 'pono') {
item.slots = { default: 'pono' }
}
if (item.label === 'LINENAME') {
item.field = 'lineName'
}
if (item.label === 'ETA') {
item.title = '目的港ETA'
}
if (item.label === 'isVGM') {
item.title = 'VGM'
item.width = 60
}
if (item.label === 'IsZZFX') {
item.title = '装载'
item.width = 50
}
if (item.label === 'IsCanDan') {
item.title = '舱单'
item.width = 50
}
})
localStorage.setItem('formTableData', JSON.stringify(labelData));
} else {
localStorage.setItem('formTableData', JSON.stringify(initData.columns));
}
})
},
requestFailed(err) {
this.accountLoginErrMsg = err

Write Preview
Loading…
Cancel
Save