diff --git a/src/views/main/BookingCustomerLedger/detail/index.vue b/src/views/main/BookingCustomerLedger/detail/index.vue
index a3fd489..0e31bc3 100644
--- a/src/views/main/BookingCustomerLedger/detail/index.vue
+++ b/src/views/main/BookingCustomerLedger/detail/index.vue
@@ -323,9 +323,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="tempset">
-
- {{ details.tempset }}
-
+ {{ details.tempset }}
@@ -416,10 +414,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="CtrnLength">
-
- {{ details.CtrnLength }}
- CM
-
+ {{ details.CtrnLength }}CM
@@ -430,10 +425,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="CtrnWidth">
-
- {{ details.CtrnWidth }}
- CM
-
+ {{ details.CtrnWidth }}CM
@@ -444,10 +436,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="CtrnHeight">
-
- {{ details.CtrnHeight }}
- CM
-
+ {{ details.CtrnHeight }}CM
diff --git a/src/views/main/BookingLedger/detail/index.vue b/src/views/main/BookingLedger/detail/index.vue
index 7e947e2..a65ca5f 100644
--- a/src/views/main/BookingLedger/detail/index.vue
+++ b/src/views/main/BookingLedger/detail/index.vue
@@ -596,7 +596,7 @@ export default {
methods: {
frompre(data) {
this.$refs.basicInfo._data.frompre = data.data1
- this.$refs.basicInfo.refresh()
+ // this.$refs.basicInfo.refresh()
// this.$refs.goodsTable.tableData = data.data2
},
...mapActions(['setNeedSavePages', 'setBookingList', 'setBookingGridOptions', 'setInBookingDetailsSave', 'setSET_SAVEFLAG']),
diff --git a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
index aa5ffdf..b0436f8 100644
--- a/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
+++ b/src/views/main/BookingLedger/detail/modules/mailingInfo.vue
@@ -829,84 +829,16 @@
- 订舱备注
+ 订舱备注
- 截单备注
+ 截单备注
-
@@ -1070,6 +1002,16 @@
+
+
+
+
+
+
@@ -1223,6 +1165,8 @@ export default {
frompre: {},
visibleJW: false,
modalType: 0,
+ markVisible: false,
+ markVisible1: false,
visibleTwo: false,
visible: false,
modelTitle: '',
diff --git a/src/views/main/BookingLedger/detail/modules/preOrder.vue b/src/views/main/BookingLedger/detail/modules/preOrder.vue
index 618489c..1e9c11c 100644
--- a/src/views/main/BookingLedger/detail/modules/preOrder.vue
+++ b/src/views/main/BookingLedger/detail/modules/preOrder.vue
@@ -95,11 +95,11 @@
:labelCol="labelCol2"
:wrapperCol="wrapperCol2"
has-feedback>
-
-
+ :openSearch="true"
+ @change="getSelectViewRes"
+ >
@@ -1836,7 +1836,7 @@ export default {
}
this.$emit('frompre', obj)
-
+ console.log(this.details)
this.orderList = []
this.selectArr = []
this.editIndex = 0
@@ -2273,12 +2273,8 @@ export default {
this.$forceUpdate()
},
getSelectViewRes({ type, res }) {
- console.log({ type, res })
- if (['vessel'].includes(type)) {
- this.orderDetails.vessel = res.vessel || ''
- } else if (['shipagency'].includes(type)) {
+ if (['shipagency'].includes(type)) {
this.orderDetails.forwarder = res.name || ''
- // this.orderDetails.forwarderid = res.code || ''
} else if (['shippername', 'notifypartyname', 'consigneename'].includes(type)) {
this.orderDetails[type] = res.title || ''
this.orderDetails[type.replace('name', 'addR1')] = res.content || ''
@@ -2307,8 +2303,20 @@ export default {
this.orderDetails[`${name}addR1`] = res.addr || ''
this.orderDetails[`${name}countryName`] = res.country || ''
this.orderDetails[`${name}tel`] = res.tel || ''
-
- // this.orderDetails[type.replace('name', 'addR1')] = res.content || ''
+ } else if (type === 'vessel') {
+ this.orderDetails.vessel = res.vessel || ''
+ this.orderDetails.atd = res.atd || ''
+ this.orderDetails.etd = res.etd || ''
+ if (res.voyno.includes('1MA')) {
+ this.orderDetails.voyno = res.voyno.replace('1MA', '') || ''
+ } else {
+ if (res.voyno.includes('1NC')) {
+ this.orderDetails.voyno = res.voyno.replace('1NC', '') || ''
+ } else {
+ this.orderDetails.voyno = res.voyno || ''
+ }
+ }
+ this.orderDetails.voynoinner = res.voynoInside || ''
}
console.log('=== 预订舱信息 ===', this.orderDetails)
diff --git a/src/views/main/BookingLedger/list/index.vue b/src/views/main/BookingLedger/list/index.vue
index c148db3..dd67d10 100644
--- a/src/views/main/BookingLedger/list/index.vue
+++ b/src/views/main/BookingLedger/list/index.vue
@@ -1456,6 +1456,7 @@ export default {
})
}
row.bookstatus = bookstatus
+ row.statuslogs1 = item.statuslogs1
this.$message.success('操作成功')
})
} else {
diff --git a/src/views/system/user/userOrgForm.vue b/src/views/system/user/userOrgForm.vue
index 724edab..24cc536 100644
--- a/src/views/system/user/userOrgForm.vue
+++ b/src/views/system/user/userOrgForm.vue
@@ -55,6 +55,9 @@
+
+ 是否编辑
+
{
+ console.log(item,this.SelectMenuId)
+ if (item.sysMenuId == this.SelectMenuId) {
+ item.isEdit = this.isEdit
+ Type = true
+ }
+ })
+ if (!Type) {
+ this.GrantData.push({ isEdit: this.isEdit, sysMenuId: this.SelectMenuId, RightData: [] })
+ }
+ },
/**
* 获取机构树
*/
@@ -236,7 +253,7 @@ export default {
appChange(value) {
this.SelectMenu = false
this.selectValue = value
- let menuList = this.menuList.filter(f => f.appCode == value)
+ const menuList = this.menuList.filter(f => f.appCode == value)
this.menuTreeData = menuList
},
onExpand(expandedKeys) {
@@ -257,31 +274,34 @@ export default {
},
onSelectMenu(selectedKeys) {
- console.log(selectedKeys)
this.checkedKeys = []
this.SelectMenu = true
this.SelectMenuId = selectedKeys[0]
let type = ''
+ const arr = []
this.GrantData.forEach(item => {
if (item.sysMenuId == selectedKeys[0]) {
item.RightData.forEach(item2 => {
this.checkedKeys.push(item2.orgId)
})
type = `${item.dataScopeType}`
+ arr.push(item.isEdit)
}
})
+ if (arr.length > 0) {
+ this.isEdit = arr[0]
+ } else {
+ this.isEdit = false
+ }
this.handleChange(type)
this.form.setFieldsValue({
dataScopeType: type
})
- console.log(this.GrantData)
- console.log('选择菜单', this.checkedKeys)
},
onCheckMenu(checkedKeys, e) {
- let Select = []
- for (let key in checkedKeys.checked) {
+ const Select = []
+ for (const key in checkedKeys.checked) {
var stra = checkedKeys.checked[key]
- console.log(stra)
var count = 0
for (var j = 0; j < this.MeuncheckedKeys.length; j++) {
var strb = this.MeuncheckedKeys[j]
@@ -293,7 +313,6 @@ export default {
Select.push(stra)
}
}
- console.log(Select)
if (Select.length) {
this.onSelectMenu(Select)
} else {
@@ -309,21 +328,17 @@ export default {
this.confirmLoading = true
// validateFields((errors, values) => {
// if (!errors) {
- let childrens = []
- console.log(this.MeuncheckedKeys)
+ const childrens = []
this.MeuncheckedKeys.forEach(item => {
this.GrantData.forEach(item2 => {
if (item == item2.sysMenuId) {
- console.log(item2)
if (!item2.dataScopeType) {
item2.dataScopeType = this.dataScopeTypeData[0].code
- console.log('这条没有', item2)
}
childrens.push({ ...item2, menuId: item2.sysMenuId })
}
})
})
-
SysDataUserMenuGrantData({ userId: this.userEntity.id, childrens })
.then(res => {
if (res.success) {
@@ -353,10 +368,6 @@ export default {
.finally(res => {
this.confirmLoading = false
})
- // } else {
- // this.confirmLoading = false
- // }
- // })
},
handleCancel() {
this.form.resetFields()
diff --git a/src/views/userLoginReg/Login.vue b/src/views/userLoginReg/Login.vue
index a1f37c9..b80f1bf 100644
--- a/src/views/userLoginReg/Login.vue
+++ b/src/views/userLoginReg/Login.vue
@@ -109,13 +109,13 @@
-
+ > -->
@@ -189,7 +189,7 @@ export default {
}
},
created() {
- this.getCaptchaOpen()
+ // this.getCaptchaOpen()
},
methods: {
...mapActions(['Login', 'Logout', 'dictTypeData', 'getNoticReceiveList']),