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

修改问题

Browse Source
master
sunzehua 5 months ago
parent 995b903d34
commit b2be4d9bb0
6 changed files with 72 additions and 37 deletions
Show Stats Download Patch File Download Diff File

12
.env
Unescape Escape View File

@ -1,9 +1,9 @@
NODE_ENV=production NODE_ENV=production
VUE_APP_PREVIEW=true VUE_APP_PREVIEW=true
# VUE_APP_TYPE = 'customer' # VUE_APP_TYPE = 'customer'
VUE_APP_TYPE = 'hechuan' # VUE_APP_TYPE = 'hechuan'
# VUE_APP_TYPE = 'yunyingduan' # VUE_APP_TYPE = 'yunyingduan'
# VUE_APP_TYPE = 'gangjie' VUE_APP_TYPE = 'gangjie'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端djy # 打包部署的三个端 客户端customer 和川端hechuan 运营端djy
# 和川大简云正式 # 和川大简云正式
@ -11,8 +11,8 @@ VUE_APP_TYPE = 'hechuan'
# VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345 # VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试 # 和川大简云测试
VUE_APP_API_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_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试 # 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813
@ -23,8 +23,8 @@ VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:35100
# VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814 # VUE_APP_SOCKET_BASE_URL=http://60.209.125.238:30814
# 港捷 # 港捷
# VUE_APP_API_BASE_URL=http://118.190.144.189:5001 VUE_APP_API_BASE_URL=http://118.190.144.189:5001
# VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001 VUE_APP_SOCKET_BASE_URL=http://118.190.144.189:5001
# 客户端正式 # 客户端正式
# VUE_APP_API_BASE_URL=http://118.190.144.189:6001 # VUE_APP_API_BASE_URL=http://118.190.144.189:6001

8
.env.development
Unescape Escape View File

@ -7,12 +7,12 @@ VUE_APP_TYPE = 'hechuan'
# 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan # 打包部署的三个端 客户端customer 和川端hechuan 运营端yunyingduan
# 和川大简云正式 # 和川大简云正式
# 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_SOCKET_BASE_URL=http://47.104.85.216:12345 VUE_APP_SOCKET_BASE_URL=http://47.104.85.216:12345
# 和川大简云测试 # 和川大简云测试
VUE_APP_API_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_SOCKET_BASE_URL=http://60.209.125.238:35100
# 客户端测试 # 客户端测试
# VUE_APP_API_BASE_URL=http://60.209.125.238:30813 # VUE_APP_API_BASE_URL=http://60.209.125.238:30813

56
src/components/generation/index.vue
Unescape Escape View File

@ -2,14 +2,14 @@
<a-modal v-model="SlotVisible" title="生成方式选择" @ok="handleOk1" width="40%"> <a-modal v-model="SlotVisible" title="生成方式选择" @ok="handleOk1" width="40%">
<a-spin :spinning="spinning"> <a-spin :spinning="spinning">
<a-form class="Editing"> <a-form class="Editing">
<a-row v-if="type == 'B'"> <a-row v-if="type == 'cabin'">
<a-col :span="16"> <a-col :span="16">
<a-form-item label="订舱编号" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3"> <a-form-item label="订舱编号" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3">
{{ slotEdit.sloT_BOOKING_NO }} {{ slotEdit.sloT_BOOKING_NO }}
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-radio-group v-model="CreateData.generateMethod" v-if="type == 'A'"> <a-radio-group v-model="CreateData.generateMethod" v-if="type == 'BCModify' || type == 'BC'">
<a-radio value="UPD_BOOKING"> <a-radio value="UPD_BOOKING">
更新订舱 更新订舱
</a-radio> </a-radio>
@ -26,7 +26,7 @@
匹配已有订舱 匹配已有订舱
</a-radio> </a-radio>
</a-radio-group> </a-radio-group>
<!-- <a-checkbox style="margin-top: 10px;" v-model="CreateData.isDirectSend">是否直接发送邮件给订舱联系人</a-checkbox> --> <a-checkbox v-if="type == 'BC'" style="margin-top: 10px;" v-model="CreateData.isDirectSend">是否直接发送邮件给订舱联系人</a-checkbox>
<a-row> <a-row>
<a-col :span="16"> <a-col :span="16">
<a-form-item label="委托单位：" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3"> <a-form-item label="委托单位：" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3">
@ -185,9 +185,12 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-if="type==='B'"> <a-row v-if="type === 'cabin'">
<a-col :span="8"> <a-col :span="8">
<a-form-item label="SHIPPER" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2"> <a-form-item
label="SHIPPER"
:label-col="formItemLayout.labelCol2"
:wrapper-col="formItemLayout.wrapperCol2">
<a-input v-model="CreateData.SHIPPER"></a-input> <a-input v-model="CreateData.SHIPPER"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
@ -198,7 +201,7 @@
</a-col> </a-col>
</a-row> </a-row>
<a-row> <a-row>
<a-col :span="8" v-if="type==='B'"> <a-col :span="8" v-if="type === 'cabin'">
<a-form-item label="销售日期" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2"> <a-form-item label="销售日期" :label-col="formItemLayout.labelCol2" :wrapper-col="formItemLayout.wrapperCol2">
<a-date-picker style="width: 100%;" v-model="CreateData.SALE_TIME" /> <a-date-picker style="width: 100%;" v-model="CreateData.SALE_TIME" />
</a-form-item> </a-form-item>
@ -283,13 +286,14 @@
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
<a-row v-if="type==='B'"> <a-row v-if="type === 'cabin'">
<a-col :span="16"> <a-col :span="16">
<a-form-item label="选择" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3"> <a-form-item label="选择" :label-col="formItemLayout.labelCol3" :wrapper-col="formItemLayout.wrapperCol3">
<div class="tear-list"> <div class="tear-list">
<div class="item" v-for="item in CreateData.CtnList" :key="item.gid"> <div class="item" v-for="item in CreateData.CtnList" :key="item.gid">
<span class="item-left">{{ item.ctnall }}</span> <span class="item-left">{{ item.ctnall }}</span>
<a-input-number style="width:50px;" :max="item.maxnum" v-model="item.ctnnum" :min="0"> </a-input-number> <a-input-number style="width:50px;" :max="item.maxnum" v-model="item.ctnnum" :min="0">
</a-input-number>
</div> </div>
</div> </div>
<div style="line-height: 20px"> <div style="line-height: 20px">
@ -424,7 +428,7 @@ export default {
}, },
methods: { methods: {
handleOk1() { handleOk1() {
if (this.type == 'A') { if (this.type == 'BCModify' || this.type == 'BC') {
this.handleOkA() this.handleOkA()
} else { } else {
const projectList = [] const projectList = []
@ -481,13 +485,13 @@ export default {
this.CreateData.opName = item.name this.CreateData.opName = item.name
} }
}) })
this.type = 'A' this.type = 'BC'
this.userInfoList = [] this.userInfoList = []
this.$forceUpdate() this.$forceUpdate()
this.SlotVisible = true this.SlotVisible = true
}, },
init(row) { init(row) {
this.type = 'B' this.type = 'cabin'
this.userInfoList = [] this.userInfoList = []
this.$forceUpdate() this.$forceUpdate()
this.CreateData = {} this.CreateData = {}
@ -530,7 +534,7 @@ export default {
this.spinning = true this.spinning = true
this.userInfoList = [] this.userInfoList = []
this.$forceUpdate() this.$forceUpdate()
this.type = 'A' this.type = 'BCModify'
GetBookingOrder({ taskPkId: this.$route.query.taskPKId }).then(res => { GetBookingOrder({ taskPkId: this.$route.query.taskPKId }).then(res => {
if (res.data.ext) { if (res.data.ext) {
this.CreateData = { this.CreateData = {
@ -539,6 +543,33 @@ export default {
isDirectSend: false, isDirectSend: false,
...res.data.ext ...res.data.ext
} }
if (this.CreateData.customerId) {
const arr = []
this.CustomerList.forEach(item => {
if (item.id === this.CreateData.customerId) {
arr.push(1)
}
})
if (arr.length === 0) {
this.CustomerList.push({
id: this.CreateData.customerId,
shortName: this.CreateData.customerName
})
}
setTimeout(() => {
this.fetching = true
DjyCustomerdetail({ id: this.CreateData.customerId }).then(res => {
if (res.success) {
this.customerByList = res.data.contacts
this.$forceUpdate()
} else {
this.$message.error(res.message)
}
this.fetching = false
})
}, 100)
}
} else { } else {
this.CreateData = { this.CreateData = {
generateMethod: 'UPD_BOOKING', generateMethod: 'UPD_BOOKING',
@ -778,6 +809,7 @@ export default {
/deep/ .ant-form-item { /deep/ .ant-form-item {
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
.tear-list { .tear-list {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;

9
src/components/mskBookingOrder/index.vue
Unescape Escape View File

@ -249,7 +249,7 @@
<a-row> <a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-model-item prop="commodityName" label="商品名称"> <a-form-model-item prop="commodityName" label="商品名称">
<a-input disabled v-model="form.commodityName" style="width: 75%;" size="small" /> <a-input disabled ref="commodityName" v-model="form.commodityName" style="width: 75%;" size="small" />
<span @click="handleOpenSP" style="color: #02A7F0;cursor: pointer;margin-left: 15px;">检索商品</span> <span @click="handleOpenSP" style="color: #02A7F0;cursor: pointer;margin-left: 15px;">检索商品</span>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
@ -540,7 +540,7 @@ export default {
cargoType: [{ required: true, message: '请选择货物标志', trigger: 'blur' }], cargoType: [{ required: true, message: '请选择货物标志', trigger: 'blur' }],
totalCargoWeight: [{ required: true, message: '请填写总重', trigger: 'blur' }], totalCargoWeight: [{ required: true, message: '请填写总重', trigger: 'blur' }],
commodityCodeType: [{ required: true, message: '请选择商品编码类型', trigger: 'blur' }], commodityCodeType: [{ required: true, message: '请选择商品编码类型', trigger: 'blur' }],
commodityName: [{ required: true, message: '请选择商品', trigger: 'blur' }], commodityName: [{ required: true, message: '请选择商品', trigger: 'change' }],
importServiceMode: [{ required: true, message: '请选择目的地运输条款', trigger: 'blur' }], importServiceMode: [{ required: true, message: '请选择目的地运输条款', trigger: 'blur' }],
exportServiceMode: [{ required: true, message: '请选择始发地服务模式', trigger: 'blur' }], exportServiceMode: [{ required: true, message: '请选择始发地服务模式', trigger: 'blur' }],
sfcarrierGeoID: [{ required: true, message: '请选择始发地', trigger: 'blur' }], sfcarrierGeoID: [{ required: true, message: '请选择始发地', trigger: 'blur' }],
@ -973,8 +973,9 @@ export default {
}, },
handleSelectGoods(item) { handleSelectGoods(item) {
this.goodsFlag = false this.goodsFlag = false
this.form.commodityCode = item.commodityCode this.$set(this.form, 'commodityCode', item.commodityCode)
this.form.commodityName = item.commodityName this.$set(this.form, 'commodityName', item.commodityName)
this.$refs.form.validateField('commodityName');
}, },
handleDeleteCtn(index) { handleDeleteCtn(index) {
this.form.ctns.splice(index, 1) this.form.ctns.splice(index, 1)

10
src/views/main/BookingLedger/detail/modules/goodsTable.vue
Unescape Escape View File

@ -921,7 +921,7 @@ export default {
this.totalCbm = num + '0' this.totalCbm = num + '0'
} else { } else {
this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
this.totalCbm = this.totalCbm.toFixed(2) this.totalCbm = this.totalCbm.toFixed(3)
} }
} }
if (column.field === 'kgs' || column.field === 'tareweight') { if (column.field === 'kgs' || column.field === 'tareweight') {
@ -1207,7 +1207,7 @@ export default {
this.totalCbm = num + '0' this.totalCbm = num + '0'
} else { } else {
this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
this.totalCbm = this.totalCbm.toFixed(2) this.totalCbm = this.totalCbm.toFixed(3)
} }
} }
if (selectionRangeKeys.endColKey === 'kgs' || selectionRangeKeys.endColKey === 'tareweight') { if (selectionRangeKeys.endColKey === 'kgs' || selectionRangeKeys.endColKey === 'tareweight') {
@ -1496,7 +1496,7 @@ export default {
this.totalCbm = onum + '0' this.totalCbm = onum + '0'
} else { } else {
this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
this.totalCbm = this.totalCbm.toFixed(2) this.totalCbm = this.totalCbm.toFixed(3)
} }
} }
}) })
@ -1561,7 +1561,7 @@ export default {
this.totalCbm = onum + '0' this.totalCbm = onum + '0'
} else { } else {
this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5)) this.totalCbm = Number(pNum[0] + '.' + pNum[1].substr(0, 5))
this.totalCbm = this.totalCbm.toFixed(2) this.totalCbm = this.totalCbm.toFixed(3)
} }
} }
}) })
@ -2002,7 +2002,7 @@ export default {
}) })
this.totalPkgs = totalPkgs this.totalPkgs = totalPkgs
this.totalKgs = totalKgs.toFixed(2) this.totalKgs = totalKgs.toFixed(2)
this.totalCbm = totalCbm.toFixed(2) this.totalCbm = totalCbm.toFixed(3)
this.$emit('changeTotal', { type: 'totalKgs', val: this.totalKgs }) this.$emit('changeTotal', { type: 'totalKgs', val: this.totalKgs })
this.$emit('changeTotal', { type: 'totalPkgs', val: this.totalPkgs }) this.$emit('changeTotal', { type: 'totalPkgs', val: this.totalPkgs })
this.$emit('changeTotal', { type: 'totalCbm', val: this.totalCbm }) this.$emit('changeTotal', { type: 'totalCbm', val: this.totalCbm })

2
src/views/main/Taskmanage/TaskmanageList/index.vue
Unescape Escape View File

@ -1224,6 +1224,7 @@ export default {
this.activeTreeKey = selectedKeys this.activeTreeKey = selectedKeys
if (selectedKeys.length === 0) { if (selectedKeys.length === 0) {
this.gridOptions.loading = true this.gridOptions.loading = true
this.formRes.taskType = ''
this.init() this.init()
return false return false
} }
@ -1281,6 +1282,7 @@ export default {
this.activeTreeKey = [] this.activeTreeKey = []
}, },
init(queryParam = {}) { init(queryParam = {}) {
console.log(queryParam)
this.gridOptions.pagerConfig = { this.gridOptions.pagerConfig = {
total: 0, total: 0,
currentPage: 1, currentPage: 1,

Write Preview
Loading…
Cancel
Save