新建分支dev

master
sunzehua 1 year ago
parent 6422580396
commit 5cfc430a1d

@ -323,9 +323,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="tempset">
<div class="line-box">
<span>{{ details.tempset }}</span>
</div>
<span>{{ details.tempset }}</span>
</a-form-model-item>
</a-col>
<a-col :span="8">
@ -416,10 +414,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="CtrnLength">
<div class="line-box">
{{ details.CtrnLength }}
<span class="unit">CM</span>
</div>
{{ details.CtrnLength }}CM
</a-form-model-item>
</a-col>
<a-col :span="6">
@ -430,10 +425,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="CtrnWidth">
<div class="line-box">
{{ details.CtrnWidth }}
<span class="unit">CM</span>
</div>
{{ details.CtrnWidth }}CM
</a-form-model-item>
</a-col>
<a-col :span="6">
@ -444,10 +436,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="CtrnHeight">
<div class="line-box">
{{ details.CtrnHeight }}
<span class="unit">CM</span>
</div>
{{ details.CtrnHeight }}CM
</a-form-model-item>
</a-col>
</a-row>

@ -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']),

@ -829,84 +829,16 @@
</a-col>
<a-col :span="12">
<a-form-model-item prop="soremark">
<div class="tit" :class="{'required':rules['soremark'] && rules['soremark'][0].required}"><span class="iconfont icon-bianji"></span>订舱备注</div>
<div class="tit" :class="{'required':rules['soremark'] && rules['soremark'][0].required}"><span @click="markVisible=true" style="cursor: pointer;" class="iconfont icon-bianji"></span>订舱备注</div>
<a-textarea style="height: 120px !important;line-height: 20px;" class="input-box" v-model="details.soremark" />
</a-form-model-item>
</a-col>
<a-col :span="12">
<a-form-model-item prop="siremark">
<div class="tit" :class="{'required':rules['siremark'] && rules['siremark'][0].required}"><span class="iconfont icon-bianji"></span>截单备注</div>
<div class="tit" :class="{'required':rules['siremark'] && rules['siremark'][0].required}"><span @click="markVisible1=true" style="cursor: pointer;" class="iconfont icon-bianji"></span>截单备注</div>
<a-textarea style="height: 120px !important;line-height: 20px;" class="input-box" v-model="details.siremark" data-next="box-ctnall"/>
</a-form-model-item>
</a-col>
<!-- <a-col :span="12">
<a-form-model-item
class="from-label pkgs-line-box"
label="件数"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="pkgs">
<div class="line-box">
<a-input
:allowClear="true"
size="small"
v-model="details.pkgs"
type="number"
@change="changePkgs" />
<i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('pkgs')"></i>
</div>
</a-form-model-item>
</a-col>
<a-col :span="12" style="overflow: hidden">
<a-form-model-item
class="from-label"
label="包装"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="kindpkgs">
<selectView
type="kindpkgs"
:defaultVal="details.kindpkgs"
searchApi="GetPackage"
:searchQuery="{ KeyWord: '' }"
:showLabel="['name']"
:openSearch="false"
@change="getSelectViewRes">
</selectView>
</a-form-model-item>
</a-col>
<a-col :span="12" style="overflow: hidden">
<a-form-model-item
class="from-label kgs-line-box"
label="毛重"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="kgs">
<div class="line-box">
<a-input size="small" :allowClear="true" v-model="details.kgs" />
<i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('kgs')"></i>
<span class="unit">KGS</span>
</div>
</a-form-model-item>
</a-col>
<a-col :span="12" style="overflow: hidden">
<a-form-model-item
class="from-label cbm-line-box"
label="尺寸"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="cbm">
<div class="line-box">
<a-input size="small" :allowClear="true" v-model="details.cbm" />
<i class="iconfont icon-bianji1 edit-icon" @click="editTextEntryModel('cbm')"></i>
<span class="unit">CBM</span>
</div>
</a-form-model-item>
</a-col> -->
</a-row>
</a-col>
</a-row>
@ -1070,6 +1002,16 @@
</div>
</div>
</a-modal>
<a-modal title="订舱备注" :width="950" :visible="markVisible" @ok="markVisible = false" @cancel="markVisible = false">
<div>
<a-textarea style="font-size:20px;margin-right: 10px;height: 500px;" class="input-box" v-model="details.soremark" />
</div>
</a-modal>
<a-modal title="截单备注" :width="950" :visible="markVisible1" @ok="markVisible1 = false" @cancel="markVisible1 = false">
<div>
<a-textarea style="font-size:20px;margin-right: 10px;height: 500px;" class="input-box" v-model="details.siremark" />
</div>
</a-modal>
<a-modal title="第二通知人" :width="900" :visible="visibleTwo" @ok="visibleTwo = false" @cancel="visibleTwo = false">
<div>
<a-form-model :selfUpdate="true" ref="mailingFrom" :model="details" :rules="rules">
@ -1223,6 +1165,8 @@ export default {
frompre: {},
visibleJW: false,
modalType: 0,
markVisible: false,
markVisible1: false,
visibleTwo: false,
visible: false,
modelTitle: '',

@ -95,11 +95,11 @@
:labelCol="labelCol2"
:wrapperCol="wrapperCol2"
has-feedback>
<autoView
<selectView
class="copy-input"
ref="vesselView"
type="vessel"
:defaultVal="orderDetails.vessel"
:dropdownStyle="{ width: '300px' }"
searchApi="getVesselInfoService"
:searchQuery="{
KeyWord: '',
@ -107,9 +107,9 @@
ETD: this.orderDetails.etd || ''
}"
:showLabel="['vessel']"
@select="getAutoViewRes"
@selectInput="getAutoViewResInput">
</autoView>
:openSearch="true"
@change="getSelectViewRes"
></selectView>
</a-form-model-item>
</a-col>
<a-col :xs="12" :sm="12" :md="12" :lg="8" :xl="5">
@ -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)

@ -1456,6 +1456,7 @@ export default {
})
}
row.bookstatus = bookstatus
row.statuslogs1 = item.statuslogs1
this.$message.success('操作成功')
})
} else {

@ -55,6 +55,9 @@
</a-select-option>
</a-select>
</a-form-item>
<a-checkbox v-model="isEdit" @change="handleChangeEdit" style="margin-left: 20px;" v-show="SelectMenu">
是否编辑
</a-checkbox>
<div v-show="SelectMenu && orgTreeShow">
<a-form-item label="选择机构" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-tree
@ -111,6 +114,7 @@ export default {
formLoading: true,
autoExpandParent: true,
autoExpandParentMenu: true,
isEdit: false,
selectedKeys: [],
userEntity: [],
replaceFields: {
@ -194,6 +198,19 @@ export default {
this.checkedKeys = []
}
},
handleChangeEdit() {
let Type = false
this.GrantData.forEach(item => {
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()

@ -109,13 +109,13 @@
</a-form-item>
<a-form-item>
<Verify
<!-- <Verify
@success="verifySuccess"
:mode="'pop'"
:captchaType="'clickWord'"
:imgSize="{ width: '330px', height: '155px' }"
ref="verify"
></Verify>
></Verify> -->
</a-form-item>
<a-form-item style="margin-top:24px">
@ -189,7 +189,7 @@ export default {
}
},
created() {
this.getCaptchaOpen()
// this.getCaptchaOpen()
},
methods: {
...mapActions(['Login', 'Logout', 'dictTypeData', 'getNoticReceiveList']),

Loading…
Cancel
Save