修改问题

master
sunzehua 1 year ago
parent 12f5087dfd
commit f0337e79a1

@ -1151,3 +1151,11 @@ export function GetEnableProjectDictTreeList (parameter) {
method: 'get'
})
}
export function ReadAutoYardImport (parameter) {
return axios({
url: '/BookingOrder/ReadAutoYardImport',
method: 'get',
params: parameter
})
}

@ -100,8 +100,8 @@
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
prop="voyno">
<span>{{ details.voyno }}</span>
prop="contractno">
<span>{{ details.contractno }}</span>
</a-form-model-item>
</a-col>
<a-col :span="'4-8'">

@ -10,6 +10,7 @@
:defaultActiveFirstOption="false"
:dropdown-style="dropdownStyle"
:backfill="false"
:disabled="disabled"
:notFoundContent="inLoading ? '加载中...' : '暂无数据'"
@select="handleSelect"
@change="debounce(handleChange, 0, $event)"
@ -89,6 +90,10 @@ export default {
type: String,
default: ''
},
disabled: {
type: Boolean,
default: false
},
searchQuery: {
type: Object,
default: () => {

@ -9,6 +9,7 @@
v-model="value"
:open="open"
:show-time="showTime"
:disabled="disabled"
@change="changeDate"
@openChange="handleOpenChange"
@focus="onFocus">
@ -34,6 +35,10 @@ export default {
},
showTime: {
type: Boolean,
default: false
},
disabled: {
type: Boolean,
default: false
}
},

@ -46,6 +46,7 @@
:details="bookingDetails"
:rules="basicRules"
:inPageLoading="inPageLoading"
:isLockBooking="isLockBooking"
isParent="parent"
@changeDetail="changeDetailFun"
></basicInfo>
@ -53,6 +54,7 @@
ref="mailingInfo"
:details="bookingDetails"
:rules="mailingRules"
:isLockBooking="isLockBooking"
isParent="parent"
@changeDetail="changeDetailFun"
@spliceMore="spliceMorefun"
@ -65,6 +67,7 @@
:rules="cargoRules"
:moreStr="moreStr"
isParent="parent"
:isLockBooking="isLockBooking"
@pkgsEnCapital="pkgsEnCapitalFun"
@changeDetail="changeDetailFun"></cargoInfo>
<!-- <billInfo
@ -84,6 +87,7 @@
:details="bookingDetails"
:rules="tableRules"
isParent="parent"
:isLockBooking="isLockBooking"
@changectnall="changectnall"
@changeDetail="changeDetailFun"
@changeTotal="changeTotalFun"
@ -321,7 +325,11 @@ const initDetail = {
file: [],
log: [],
item: [],
statuslog: []
statuslog: [],
extendState: {
isLockBooking: false
},
autoYardImport: {}
}
const bookingEDIExt = {
weiTuoFang: '',
@ -413,6 +421,7 @@ export default {
detailsLoadOver: false,
inGoodsSave: false,
ctnDefaultData: {},
isLockBooking: false,
defaultData: {}
}
},
@ -429,11 +438,6 @@ export default {
document.querySelector('#tab1').checked = false
}
}
},
'$route.query': {
deep: true,
handler(nVal, oVal) {
}
}
},
computed: {
@ -657,6 +661,7 @@ export default {
this.checkSaveFun({ type: 'hbList', hasChange: hbListChange })
this.inChildLoading = false
}, 500)
this.isLockBooking = false
this.$forceUpdate()
} else if (
Object.keys(this.historyData).includes(`add-${this.$route.query.addNum}`) &&
@ -702,6 +707,7 @@ export default {
this.checkSaveFun({ type: 'hbList', hasChange: hbListChange })
this.inChildLoading = false
}, 500)
this.isLockBooking = false
this.$forceUpdate()
} else if (Object.keys(this.historyData).includes(newId)) {
this.id = this.$route.query.id
@ -777,6 +783,11 @@ export default {
this.inChildLoading = false
}, 1300);
}, 500)
if (!this.bookingDetails.extendState) {
this.isLockBooking = false
} else {
this.isLockBooking = this.bookingDetails.extendState.isLockBooking
}
this.$forceUpdate()
} else {
this.id = this.$route.query.id
@ -819,6 +830,7 @@ export default {
this.detailsLoadOver = false
this.bookingDetails.carrierid = this.type
this.bookingDetails.carrier = this.type
this.isLockBooking = false
this.getDefaultVal()
setTimeout(() => {
if (Object.keys(this.$refs).includes('sedOrder')) {
@ -1103,6 +1115,12 @@ export default {
if (res.data.cargoid != 'R') {
this.cargoRules['goodsname'][0].required = false
}
if (!res.data.extendState) {
this.isLockBooking = false
} else {
this.isLockBooking = res.data.extendState.isLockBooking
}
if (res.data.ctnInputs.length > 0) {
res.data.ctnInputs.map((item, index) => {
if (item.weightype === '累加') {
@ -1163,6 +1181,7 @@ export default {
}
const $BookingEDIExt = { ...JSON.parse(JSON.stringify(bookingEDIExt)), ...res.data.bookingEDIExt }
this.$set(this, 'bookingDetails', { ...this.bookingDetails, ...newData, ...{ bookingEDIExt: $BookingEDIExt } })
console.log(this.bookingDetails)
if (this.$route.query.isCopy && this.$route.query.copyId) {
const hisData = {
bookingDetails: this.bookingDetails,
@ -1853,3 +1872,4 @@ export default {
}
}
</style>

@ -28,6 +28,7 @@
:searchQuery="{ keyword: '', type: 'consignor' }"
:showLabel="['shortName']"
:openSearch="true"
:disabled="BookingLockOrder['CUSTOMERNAME'] && isLockBooking"
:isCopy="true"
@change="getSelectViewRes"
style="flex: 1; margin-top: -4px"
@ -57,6 +58,7 @@
searchApi="DjyCustomerSuggest"
:searchQuery="{ keyword: '', type: 'consignor' }"
:showLabel="['shortName']"
:disabled="BookingLockOrder['thirdPay'] && isLockBooking"
:openSearch="true"
:isCopy="true"
@change="getSelectViewRes"
@ -74,7 +76,7 @@
has-feedback
prop="pono"
>
<inputView type="pono" :parentVal="details.pono" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['pono'] && isLockBooking" type="pono" :parentVal="details.pono" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
<a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
@ -93,6 +95,7 @@
searchApi="GetCarrierlist"
:searchQuery="{ keyword: '', type: 'consignor' }"
:showLabel="['cnName', 'code']"
:disabled="BookingLockOrder['carrier'] && isLockBooking"
:openSearch="false"
@change="getSelectViewRes"
style="flex: 1; margin-top: -4px"
@ -113,7 +116,7 @@
prop="zhanCangFlag"
>
<div class="date-box">
<a-radio-group size="small" v-model="details.zhanCangFlag">
<a-radio-group :disabled="BookingLockOrder['zhanCangFlag'] && isLockBooking" size="small" v-model="details.zhanCangFlag">
<a-radio size="small" value="是"> </a-radio>
<a-radio size="small" value="否"> </a-radio>
</a-radio-group>
@ -129,7 +132,7 @@
has-feedback
prop="custno"
>
<inputView type="custno" :parentVal="details.custno" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['custno'] && isLockBooking" type="custno" :parentVal="details.custno" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
<a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
@ -141,7 +144,7 @@
:wrapperCol="wrapperCol2"
has-feedback
>
<inputView type="mblno" :parentVal="details.mblno" :ishd="ishd" @getInputChange="inputChange" />
<inputView type="mblno" :parentVal="details.mblno" :ishd="ishd || (BookingLockOrder['mblno'] && isLockBooking)" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
<a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
@ -153,7 +156,7 @@
has-feedback
prop="hblno"
>
<inputView type="hblno" :parentVal="details.hblno" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['hblno'] && isLockBooking" type="hblno" :parentVal="details.hblno" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
<a-col :xs="12" :sm="12" :md="12" :lg="{span: '4-8'}" :xl="{span: '4-8'}">
@ -169,6 +172,7 @@
type="forwarder"
:defaultVal="details.forwarder"
searchApi="DjyCustomerSuggest"
:disabled="BookingLockOrder['forwarder'] && isLockBooking"
:searchQuery="{ keyword: '', type: 'booking_agent' }"
:showLabel="['shortName']"
:openSearch="true"
@ -200,6 +204,7 @@
<autoView
class="copy-input"
type="contractno"
:disabled="BookingLockOrder['contractno'] && isLockBooking"
:defaultVal="details.contractno"
:dropdownStyle="{ width: '300px' }"
searchApi="getContractno"
@ -236,6 +241,7 @@
class="copy-input"
type="contractno"
:defaultVal="details.contractno"
:disabled="BookingLockOrder['contractno'] && isLockBooking"
:dropdownStyle="{ width: '300px' }"
searchApi="getContractno"
:searchQuery="{ queryItem: '', top: 50, laneCName: this.details.lineName,carrier: this.details.carrierid,pod: this.details.destinationid }"
@ -257,7 +263,7 @@
has-feedback
prop="epCode"
>
<inputView type="epCode" :parentVal="details.epCode" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['epCode'] && isLockBooking" type="epCode" :parentVal="details.epCode" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -271,7 +277,7 @@
has-feedback
prop="tmblno"
>
<inputView type="tmblno" :parentVal="details.tmblno" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['tmblno'] && isLockBooking" type="tmblno" :parentVal="details.tmblno" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -290,6 +296,7 @@
<div class="date-box">
<datePickerView
class="date-picker"
:disabled="BookingLockOrder['etd'] && isLockBooking"
:parentVal="details.etd"
type="etd"
format="YYYY-MM-DD"
@ -322,6 +329,7 @@
class="copy-input"
ref="vesselView"
type="vessel"
:disabled="BookingLockOrder['vessel'] && isLockBooking"
:defaultVal="details.vessel"
searchApi="getVesselInfoService"
:searchQuery="{
@ -347,7 +355,7 @@
prop="voynoinner"
>
<!-- 内部航次暂无接口 暂时改为输入框 -->
<inputView type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['voynoinner'] && isLockBooking" type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -362,7 +370,7 @@
prop="voynoinner"
>
<!-- 内部航次暂无接口 暂时改为输入框 -->
<inputView type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['voynoinner'] && isLockBooking" type="voynoinner" :parentVal="details.voynoinner" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -376,7 +384,7 @@
has-feedback
prop="voyno"
>
<inputView type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['voyno'] && isLockBooking" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -390,7 +398,7 @@
has-feedback
prop="voyno"
>
<inputView ref="voyno" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['voyno'] && isLockBooking" ref="voyno" type="voyno" :parentVal="details.voyno" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</template>
@ -404,7 +412,7 @@
prop="lanename"
>
<!-- 航线暂无接口 暂时改为输入框-->
<inputView type="lanename" :parentVal="details.lanename" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['lanename'] && isLockBooking" type="lanename" :parentVal="details.lanename" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</a-row>
@ -442,6 +450,7 @@
<selectView
type="custservice"
:defaultVal="details.custservice"
:disabled="BookingLockOrder['custservice'] && isLockBooking"
searchApi="GetSysUserPage"
:searchQuery="{ name: '' }"
:showLabel="['name']"
@ -463,6 +472,7 @@
type="op"
:defaultVal="details.op"
searchApi="GetSysUserPage"
:disabled="BookingLockOrder['op'] && isLockBooking"
:searchQuery="{ name: '' }"
:showLabel="['name']"
:openSearch="true"
@ -482,6 +492,7 @@
<selectView
type="doc"
:defaultVal="details.doc"
:disabled="BookingLockOrder['doc'] && isLockBooking"
searchApi="GetSysUserPage"
:searchQuery="{ name: '' }"
:showLabel="['name']"
@ -502,6 +513,7 @@
<selectView
type="route"
:defaultVal="details.route"
:disabled="BookingLockOrder['route'] && isLockBooking"
searchApi="GetSysUserPage"
:searchQuery="{ name: '' }"
:showLabel="['name']"
@ -523,6 +535,7 @@
<selectView
type="lineManage"
:defaultVal="details.lineManage"
:disabled="BookingLockOrder['LineManage'] && isLockBooking"
searchApi="GetSysUserPage"
:searchQuery="{ name: '' }"
:showLabel="['name']"
@ -542,7 +555,7 @@
has-feedback
prop="czRemark"
>
<inputView type="czRemark" :parentVal="details.czRemark" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['czRemark'] && isLockBooking" type="czRemark" :parentVal="details.czRemark" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="9" :md="9" :lg="9" :xl="8">
@ -554,7 +567,7 @@
has-feedback
prop="dzRemark"
>
<inputView type="dzRemark" :parentVal="details.dzRemark" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['dzRemark'] && isLockBooking" type="dzRemark" :parentVal="details.dzRemark" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
<a-col :xs="24" :sm="6" :md="6" :lg="6" :xl="8">
@ -566,7 +579,7 @@
has-feedback
prop="shenQingXiangShi"
>
<inputView type="shenQingXiangShi" :parentVal="details.shenQingXiangShi" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['shenQingXiangShi'] && isLockBooking" type="shenQingXiangShi" :parentVal="details.shenQingXiangShi" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
</a-row>
@ -664,6 +677,10 @@ export default {
isParent: {
type: String,
default: ''
},
isLockBooking: {
type: Boolean,
default: false
}
},
data() {
@ -671,6 +688,7 @@ export default {
frompre: {},
type: this.$route.query.type,
basicDetails: JSON.parse(JSON.stringify(this.details)),
BookingLockOrder: {},
labelCol: {
xs: { span: 24 },
sm: { span: 8 },
@ -1015,6 +1033,11 @@ export default {
this.etdWeek = ''
}
this.ContactType = this.$options.filters['dictData']('booking_contact_type')
const obj = {}
this.$options.filters['dictData']('BookingLockOrder').forEach(item => {
obj[item.code] = true
})
this.BookingLockOrder = obj
},
changeCustomer(type) {
@ -1142,7 +1165,7 @@ export default {
this.$forceUpdate()
},
getSelectViewRes({ type, res }) {
console.log( type, res)
console.log(type, res)
if (type === 'customername') {
this.details.customername = res.shortName || ''
this.details.customerid = Number(res.id) || ''

@ -27,6 +27,7 @@
id="marks-scroll"
:parentVal="details.marks"
type="marks"
:disabled="BookingLockOrder['marks'] && isLockBooking"
:height="100"
:openToCDB="true"
@getTextareaChange="getTextareaChange" />
@ -72,6 +73,7 @@
type="goodsname"
:defaultVal="details.goodsname"
searchApi="getGoodsname"
:disabled="BookingLockOrder['goodsname'] && isLockBooking"
:searchQuery="{ queryItem: '', top: 50 }"
:showLabel="['goodsNameEN', 'goodsCode']"
:openSearch="true"
@ -87,6 +89,7 @@
:defaultVal="details.cargoid"
searchApi="cargoData"
:searchQuery="{ name: '' }"
:disabled="BookingLockOrder['cargoid'] && isLockBooking"
:showLabel="['name']"
:openSearch="false"
@change="getSelectViewRes"
@ -97,7 +100,7 @@
<div :class="{ 'required': rules['hscode'] && rules['hscode'][0].required }" calss="tit">HS编码</div>
<a-form-model-item class="cargoid" has-feedback prop="hscode" label="" style="margin-top:-2px;">
<!-- <a-input size="small" :allowClear="true" v-model="details.hscode" /> -->
<inputView type="hscode" size="small" :parentVal="details.hscode" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['hscode'] && isLockBooking" type="hscode" size="small" :parentVal="details.hscode" @getInputChange="inputChange" />
</a-form-model-item>
</div>
</div>
@ -107,6 +110,7 @@
id="description-scroll"
class="input-box"
:parentVal="details.description"
:disabled="BookingLockOrder['description'] && isLockBooking"
type="description"
:height="100"
:openToCDB="true"
@ -133,6 +137,7 @@
<a-input
:allowClear="true"
size="small"
:disabled="BookingLockOrder['pkgs'] && isLockBooking"
v-model="details.pkgs"
type="number"
@change="changePkgs" />
@ -152,6 +157,7 @@
type="kindpkgs"
:defaultVal="details.kindpkgs"
searchApi="GetPackage"
:disabled="BookingLockOrder['kindpkgs'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['name']"
:openSearch="false"
@ -168,7 +174,7 @@
has-feedback
prop="kgs">
<div class="line-box">
<a-input size="small" :allowClear="true" v-model="details.kgs" />
<a-input :disabled="BookingLockOrder['kgs'] && isLockBooking" 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>
@ -183,7 +189,7 @@
has-feedback
prop="cbm">
<div class="line-box">
<a-input size="small" :allowClear="true" v-model="details.cbm" />
<a-input :disabled="BookingLockOrder['cbm'] && isLockBooking" 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>
@ -199,7 +205,7 @@
has-feedback
prop="tempset"
>
<inputView type="tempset" size="small" :parentVal="details.tempset" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['tempset'] && isLockBooking" type="tempset" size="small" :parentVal="details.tempset" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -211,7 +217,7 @@
has-feedback
prop="reeferf"
>
<inputView type="reeferf" size="small" :parentVal="details.reeferf" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['reeferf'] && isLockBooking" type="reeferf" size="small" :parentVal="details.reeferf" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -223,7 +229,7 @@
has-feedback
prop="tempid"
>
<a-select size="small" :default-value="details.tempid || 'C'" v-model="details.tempid">
<a-select :disabled="BookingLockOrder['tempid'] && isLockBooking" size="small" :default-value="details.tempid || 'C'" v-model="details.tempid">
<a-select-option value="C"> C摄氏 </a-select-option>
<a-select-option value="F"> F华氏 </a-select-option>
</a-select>
@ -238,7 +244,7 @@
has-feedback
prop="tempmin"
>
<inputView type="tempmin" size="small" :parentVal="details.tempmin" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['tempmin'] && isLockBooking" type="tempmin" size="small" :parentVal="details.tempmin" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -250,7 +256,7 @@
has-feedback
prop="tempmax"
>
<inputView type="tempmax" size="small" :parentVal="details.tempmax" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['tempmax'] && isLockBooking" type="tempmax" size="small" :parentVal="details.tempmax" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -261,7 +267,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="humidity">
<inputView type="humidity" size="small" :parentVal="details.humidity" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['humidity'] && isLockBooking" type="humidity" size="small" :parentVal="details.humidity" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
</template>
@ -275,7 +281,7 @@
has-feedback
prop="dclass"
>
<inputView type="dclass" size="small" :parentVal="details.dclass" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['dclass'] && isLockBooking" type="dclass" size="small" :parentVal="details.dclass" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -287,7 +293,7 @@
has-feedback
prop="dunno"
>
<inputView type="dunno" size="small" :parentVal="details.dunno" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['dunno'] && isLockBooking" type="dunno" size="small" :parentVal="details.dunno" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -299,7 +305,7 @@
has-feedback
prop="dpage"
>
<inputView type="dpage" size="small" :parentVal="details.dpage" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['dpage'] && isLockBooking" type="dpage" size="small" :parentVal="details.dpage" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -311,7 +317,7 @@
has-feedback
prop="dlabel"
>
<inputView type="dlabel" size="small" :parentVal="details.dlabel" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['dlabel'] && isLockBooking" type="dlabel" size="small" :parentVal="details.dlabel" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="12">
@ -331,7 +337,7 @@
has-feedback
prop="linkman"
>
<inputView type="linkman" size="small" :parentVal="details.linkman" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['linkman'] && isLockBooking" type="linkman" size="small" :parentVal="details.linkman" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
</template>
@ -468,6 +474,10 @@ export default {
isParent: {
type: String,
default: ''
},
isLockBooking: {
type: Boolean,
default: false
}
},
data() {
@ -503,6 +513,7 @@ export default {
notifypartY2name: '',
modelVisible: false,
modelconfirm: false,
BookingLockOrder: {},
modelName: '',
yardType: '',
yardVisible: false,
@ -562,6 +573,11 @@ export default {
document.getElementById('description-scroll-right').scrollTop = descriptionScroll.scrollTop
})
}
const obj = {}
this.$options.filters['dictData']('BookingLockOrder').forEach(item => {
obj[item.code] = true
})
this.BookingLockOrder = obj
setTimeout(() => {
this.changePkgs()
}, 2000)

@ -1,8 +1,8 @@
<template>
<div class="goods-table">
<a-card :bordered="false" :bodyStyle="{ padding: '10px 20px' }">
<div class="from-line">
<div class="left">
<div class="from-line" >
<div class="left" v-if="!isLockBooking">
<a-button class="btn btn-add" type="primary" @click="addboxLine"></a-button>
<a-button class="btn btn-delete" @click="removeLine" :style="{ marginRight: '20px' }">删除</a-button>
<a-button class="btn btn-more-name" type="primary" @click="openDialog" :disabled="tableData.length === 0">
@ -21,6 +21,10 @@
<a-icon type="arrows-alt" />展开箱量
</a-button>
</div>
<div v-if="details.autoYardImport && !details.autoYardImport.isRead" style="display: inline-block;margin-left: 10px;padding-top: 5px;">
<a-icon v-if="details.autoYardImport && details.autoYardImport.status==''" @click="handleOpen" type="check-circle" theme="filled" style="color: green;font-size: 19px;cursor: pointer;" />
<a-icon v-if="details.autoYardImport && details.autoYardImport.status==''" @click="handleOpen" type="exclamation-circle" theme="filled" style="color: rgb(197, 194, 16);font-size: 19px;cursor: pointer;" />
</div>
<div class="table-right">
<!-- <span>合计: {{ totalCtnall }}</span> -->
<span>件数: {{ totalPkgs }} {{ tableData.length > 0 ? tableData[0].kindpkgs : "" }}</span>
@ -86,10 +90,31 @@
<a-button @click="handleModelCancel"></a-button>
</template>
</a-modal>
<a-modal
title="场站数据比对"
width="80%"
:visible="comparisonFlag"
@cancel="comparisonFlag=false">
<div>
<div style="font-size: 16px;">
<span >状态:{{ yardAutoForm.status }}</span>
<span style="margin-right: 80px;margin-left: 80px;">提示:{{ yardAutoForm.content }}</span>
<span>创建时间:{{ yardAutoForm.createdTime }}</span>
</div>
<div style="font-size:16px;margin-bottom: 10px;margin-top: 15px;">场站数据</div>
<a-table :pagination="false" :columns="columnsAuto" :data-source="yardAutoForm.yardTable"></a-table>
<div style="font-size:16px;margin-bottom: 10px;margin-top: 15px;">原有数据</div>
<a-table :pagination="false" :columns="columnsAuto" :data-source="yardAutoForm.ctnTable"></a-table>
</div>
<template slot="footer">
<a-button @click="comparisonFlag=false"></a-button>
</template>
</a-modal>
</div>
</template>
<script>
import { GetYardData } from '@/api/modular/main/BookingLedger'
import { GetYardData, ReadAutoYardImport } from '@/api/modular/main/BookingLedger'
import { mapGetters } from 'vuex'
export default {
name: '',
@ -113,12 +138,17 @@ export default {
pType: {
type: String,
default: 'normal'
},
isLockBooking: {
type: Boolean,
default: false
}
},
data() {
return {
id: this.$route.query.id,
rowKeyName: 'rowKey',
BookingLockCtn: {},
cellAutofillOption: {
directionX: false,
directionY: true,
@ -141,6 +171,69 @@ export default {
// disble cell selection
enable: true
},
columnsAuto: [
{
dataIndex: 'CTNALL',
key: 'CTNALL',
title: '箱型'
},
{
dataIndex: 'CTNNUM',
key: 'CTNNUM',
title: '箱量'
},
{
dataIndex: 'CNTRNO',
key: 'CNTRNO',
title: '箱号'
},
{
dataIndex: 'SEALNO',
key: 'SEALNO',
title: '封号'
},
{
dataIndex: 'PKGS',
key: 'PKGS',
title: '件数'
},
{
dataIndex: 'KINDPKGS',
key: 'KINDPKGS',
title: '包装'
},
{
dataIndex: 'KGS',
key: 'KGS',
title: '重量'
},
{
dataIndex: 'CBM',
key: 'CBM',
title: '尺码'
},
{
dataIndex: 'TAREWEIGHT',
key: 'TAREWEIGHT',
title: '箱皮重'
},
{
dataIndex: 'WEIGHTYPE',
key: 'WEIGHTYPE',
title: '称重方式'
},
{
dataIndex: 'WEIGHKGS',
key: 'WEIGHKGS',
title: '称重重量'
},
{
dataIndex: 'WEIGHDATE',
key: 'WEIGHDATE',
title: '称重日期'
}
],
yardAutoForm: {},
columns: [
{
field: '',
@ -178,6 +271,7 @@ export default {
showSearch
ref="ctnallView"
class="ctnallView"
disabled={this.BookingLockCtn['CTNALL'] && this.isLockBooking}
allow-clear={true}
style="width: 120px"
filter-option={this.filterOption1}
@ -323,6 +417,7 @@ export default {
value={row['kindpkgs']}
option-filter-prop="children"
filter-option={this.filterOption}
disabled={this.BookingLockCtn['kindpkgs'] && this.isLockBooking}
style="width: 120px"
class="kindpkgsView"
on-change={(val) => {
@ -436,6 +531,7 @@ export default {
show-search
value={row['weightype']}
option-filter-prop="children"
disabled={this.BookingLockCtn['weightype'] && this.isLockBooking}
style="width: 80px"
on-change={(val) => {
this.tableData[rowIndex].weightype = val
@ -494,6 +590,7 @@ export default {
return (
<a-date-picker
value={row['weighdate']}
disabled={this.BookingLockCtn['weighdate'] && this.isLockBooking}
on-change={(date, dateString) => {
// console.log('== ==', dateString)
this.tableData[rowIndex].weighdate = dateString
@ -704,6 +801,17 @@ export default {
}
}
},
beforeStartCellEditing: ({ row, column, cellValue }) => {
console.log(column)
const arr = this.$options.filters['dictData']('BookingLockCtn')
let type = true
arr.forEach(item => {
if (item.code == column.field && this.isLockBooking) {
type = false
}
})
return type
},
afterCellValueChange: ({ row, column, changeValue }) => {
if (this.inTableLoad) {
return false
@ -1185,7 +1293,8 @@ export default {
ctnallViewIndex: null,
kindpkgsViewIndex: null,
inTableLoad: false,
openEdit: false
openEdit: false,
comparisonFlag: false
}
},
computed: {
@ -1394,6 +1503,11 @@ export default {
this.totalKgs = 0
this.totalCbm = 0
}
const obj = {}
this.$options.filters['dictData']('BookingLockCtn').forEach(item => {
obj[item.code] = true
})
this.BookingLockCtn = obj
},
filterOption1(input, option) {
return (
@ -1429,6 +1543,18 @@ export default {
return '内容'
}
},
handleOpen() {
this.comparisonFlag = true
this.yardAutoForm = this.details.autoYardImport
if (this.yardAutoForm.yardJson) {
this.yardAutoForm.yardTable = JSON.parse(this.yardAutoForm.yardJson)
}
if (this.yardAutoForm.ctnJson) {
this.yardAutoForm.ctnTable = JSON.parse(this.yardAutoForm.ctnJson)
}
ReadAutoYardImport({ bookId: this.$route.query.id }).then(res => {
})
},
addboxLine() {
const data = {
ctnall: '',

@ -47,6 +47,7 @@
:searchQuery="{ TemplateName: '', Type: this.enmuType('shipper') }"
:showLabel="['title']"
:openSearch="true"
:disabled="BookingLockOrder['shipper'] && isLockBooking"
@change="getSelectViewRes"
style="flex: 1"></selectView>
<a-button class="save-btn" type="link" size="small" icon="save" @click="saveModel('shipper')">
@ -65,6 +66,7 @@
:parentVal="details.shipper"
type="shipper"
:openToCDB="true"
:disabled="BookingLockOrder['shipper'] && isLockBooking"
@getTextareaChange="getTextareaChange" />
<div
class="line-count"
@ -90,6 +92,7 @@
:searchQuery="{ TemplateName: '', Type: this.enmuType('consignee') }"
:showLabel="['title']"
:openSearch="true"
:disabled="BookingLockOrder['consignee'] && isLockBooking"
@change="getSelectViewRes"
style="flex: 1"></selectView>
<a-button
@ -111,6 +114,7 @@
:parentVal="details.consignee"
type="consignee"
:openToCDB="true"
:disabled="BookingLockOrder['consignee'] && isLockBooking"
@getTextareaChange="getTextareaChange" />
<div
class="line-count"
@ -143,6 +147,7 @@
:searchQuery="{ TemplateName: '', Type: this.enmuType('notifyparty') }"
:showLabel="['title']"
:openSearch="true"
:disabled="BookingLockOrder['notifyparty'] && isLockBooking"
@change="getSelectViewRes"
style="flex: 1"></selectView>
<a-button
@ -164,6 +169,7 @@
:parentVal="details.notifyparty"
type="notifyparty"
:openToCDB="true"
:disabled="BookingLockOrder['notifyparty'] && isLockBooking"
@getTextareaChange="getTextareaChange" />
<div
class="line-count"
@ -195,6 +201,7 @@
type="placereceiptid"
:defaultVal="details.placereceiptid"
searchApi="GetPortloadlist"
:disabled="BookingLockOrder['placereceiptid'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:openSearch="true"
@ -212,6 +219,7 @@
<inputView
type="placereceipt"
size="small"
:ishd="BookingLockOrder['placereceipt'] && isLockBooking"
:parentVal="details.placereceipt"
@getInputChange="inputChange" />
</a-form-model-item>
@ -235,6 +243,7 @@
:defaultVal="details.yard"
searchApi="GetYardlist"
:searchQuery="{ keyword: '' }"
:disabled="BookingLockOrder['yard'] && isLockBooking"
:showLabel="['name', 'showCode']"
:openSearch="false"
@change="getSelectViewRes"
@ -252,7 +261,7 @@
:wrapperCol="wrapperColCode"
has-feedback
prop="feeself">
<a-radio-group size="small" v-model="details.feeself">
<a-radio-group :disabled="BookingLockOrder['feeself'] && isLockBooking" size="small" v-model="details.feeself">
<a-radio size="small" :value="true"> </a-radio>
<a-radio size="small" :value="false"> </a-radio>
</a-radio-group>
@ -273,6 +282,7 @@
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:openSearch="true"
:disabled="BookingLockOrder['portloadid'] && isLockBooking"
:isCopy="true"
@change="getSelectViewRes"></selectView>
</a-form-model-item>
@ -285,7 +295,7 @@
:wrapperCol="wrapperCol"
has-feedback
prop="portload">
<inputView type="portload" size="small" :parentVal="details.portload" @getInputChange="inputChange" />
<inputView :ishd="BookingLockOrder['portloadid'] && isLockBooking" type="portload" size="small" :parentVal="details.portload" @getInputChange="inputChange" />
</a-form-model-item>
</a-col>
<a-col :span="6">
@ -300,6 +310,7 @@
class="date-picker"
style="min-width: 100px"
:showTime="true"
:disabled="BookingLockOrder['closingdate'] && isLockBooking"
:parentVal="details.closingdate"
type="closingdate"
format="YYYY-MM-DD HH:00"
@ -320,6 +331,7 @@
type="shipagency"
:defaultVal="details.shipagency"
searchApi="GetForwarderlist"
:disabled="BookingLockOrder['shipagency'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['name', 'showCode']"
:openSearch="true"
@ -339,6 +351,7 @@
type="transportid"
:defaultVal="details.transportid"
searchApi="GetPortlist"
:disabled="BookingLockOrder['transportid'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:openSearch="true"
@ -356,6 +369,7 @@
<inputView
type="transport"
size="small"
:ishd="BookingLockOrder['transport'] && isLockBooking"
:parentVal="details.transport"
@getInputChange="inputChange" />
</a-form-model-item>
@ -372,6 +386,7 @@
class="date-picker"
style="min-width: 100px"
:showTime="true"
:disabled="BookingLockOrder['closedocdate'] && isLockBooking"
:parentVal="details.closedocdate"
type="closedocdate"
format="YYYY-MM-DD HH:00"
@ -390,6 +405,7 @@
type="customser"
:defaultVal="details.customser"
searchApi="DjyCustomerpage"
:disabled="BookingLockOrder['customser'] && isLockBooking"
:searchQuery="{ SearchValue: '', PropString: 'customs_broker' }"
:showLabel="['shortName']"
:openSearch="true"
@ -408,6 +424,7 @@
type="portdischargeid"
:defaultVal="details.portdischargeid"
searchApi="GetPortlist"
:disabled="BookingLockOrder['portdischargeid'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:openSearch="true"
@ -425,6 +442,7 @@
<inputView
type="portdischarge"
size="small"
:ishd="BookingLockOrder['portdischarge'] && isLockBooking"
:parentVal="details.portdischarge"
@getInputChange="inputChange" />
</a-form-model-item>
@ -441,6 +459,7 @@
class="date-picker"
style="min-width: 100px"
:showTime="true"
:disabled="BookingLockOrder['closevgmdate'] && isLockBooking"
:parentVal="details.closevgmdate"
type="closevgmdate"
format="YYYY-MM-DD HH:00"
@ -459,6 +478,7 @@
type="trucker"
:defaultVal="details.trucker"
searchApi="DjyCustomerpage"
:disabled="BookingLockOrder['trucker'] && isLockBooking"
:searchQuery="{ SearchValue: '', PropString: 'fleet' }"
:showLabel="['shortName']"
:openSearch="true"
@ -476,6 +496,7 @@
<selectView
type="destinationid"
:defaultVal="details.destinationid"
:disabled="BookingLockOrder['destinationid'] && isLockBooking"
searchApi="GetPortlist"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
@ -493,6 +514,7 @@
prop="destination">
<inputView
type="destination"
:ishd="BookingLockOrder['destination'] && isLockBooking"
size="small"
:parentVal="details.destination"
@getInputChange="inputChange" />
@ -512,6 +534,7 @@
:defaultVal="details.lineName"
searchApi="GetTenantLineList"
:searchQuery="{ LineName: '' }"
:disabled="BookingLockOrder['lineName'] && isLockBooking"
:showLabel="['name']"
:openSearch="false"
@change="getSelectViewRes"
@ -531,6 +554,7 @@
type="agentname"
:defaultVal="details.agentname"
searchApi="DjyCustomerpage"
:disabled="BookingLockOrder['agentname'] && isLockBooking"
:searchQuery="{ SearchValue: '', PropString: 'out_agent' }"
:showLabel="['shortName']"
:openSearch="true"
@ -557,6 +581,7 @@
type="placedeliveryid"
:defaultVal="details.placedeliveryid"
searchApi="GetPortlist"
:disabled="BookingLockOrder['placedeliveryid'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['ediCode', 'enName']"
:openSearch="true"
@ -574,6 +599,7 @@
<inputView
type="placedelivery"
size="small"
:ishd="BookingLockOrder['placedelivery'] && isLockBooking"
:parentVal="details.placedelivery"
@getInputChange="inputChange" />
<!-- <a-input :allowClear="true" v-model="details.placedelivery" /> -->
@ -591,6 +617,7 @@
type="shippingMethod"
:defaultVal="details.shippingMethod"
searchApi="ShippingMethod"
:disabled="BookingLockOrder['shippingMethod'] && isLockBooking"
:searchQuery="{ name: '' }"
:showLabel="['name']"
:openSearch="false"
@ -610,6 +637,7 @@
type="warehouse"
:defaultVal="details.warehouse"
searchApi="DjyCustomerpage"
:disabled="BookingLockOrder['warehouse'] && isLockBooking"
:searchQuery="{ SearchValue: '', PropString: 'warehouse' }"
:showLabel="['shortName']"
:openSearch="true"
@ -632,6 +660,7 @@
type="issuetype"
:defaultVal="details.issuetype"
searchApi="Codeissuetypelist"
:disabled="BookingLockOrder['issuetype'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['enName', 'cnName']"
:openSearch="false"
@ -652,6 +681,7 @@
class="date-picker"
:parentVal="details.issuedate"
type="issuedate"
:disabled="BookingLockOrder['issuedate'] && isLockBooking"
format="YYYY-MM-DD"
@dateChange="dateChangeFun"
></datePickerView>
@ -673,6 +703,7 @@
searchApi="GetPortloadlist"
:searchQuery="{ KeyWord: '' }"
:showLabel="['enName']"
:disabled="BookingLockOrder['issueplace'] && isLockBooking"
:openSearch="true"
:isCopy="true"
@change="getSelectViewRes"
@ -688,7 +719,7 @@
has-feedback
prop="issueplaceid"
>
<inputView type="issueplaceid" size="small" :parentVal="details.issueplaceid" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['issueplaceid'] && isLockBooking" type="issueplaceid" size="small" :parentVal="details.issueplaceid" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="6">
@ -706,6 +737,7 @@
searchApi="GetFrt"
:searchQuery="{ KeyWord: '' }"
:showLabel="['enName']"
:disabled="BookingLockOrder['blfrt'] && isLockBooking"
:openSearch="false"
@change="getSelectViewRes"
></selectView>
@ -727,6 +759,7 @@
:searchQuery="{ KeyWord: '' }"
:showLabel="['enName']"
:openSearch="true"
:disabled="BookingLockOrder['prepardat'] && isLockBooking"
:isCopy="true"
@change="getSelectViewRes"
></selectView>
@ -745,6 +778,7 @@
type="payableat"
:defaultVal="details.payableat"
searchApi="GetPortlist"
:disabled="BookingLockOrder['payableat'] && isLockBooking"
:searchQuery="{ KeyWord: '' }"
:showLabel="['enName']"
:openSearch="true"
@ -761,7 +795,7 @@
has-feedback
prop="thirdpayaddr"
>
<inputView type="thirdpayaddr" size="small" :parentVal="details.thirdpayaddr" @getInputChange="inputChange"/>
<inputView :ishd="BookingLockOrder['thirdpayaddr'] && isLockBooking" type="thirdpayaddr" size="small" :parentVal="details.thirdpayaddr" @getInputChange="inputChange"/>
</a-form-model-item>
</a-col>
<a-col :span="6">
@ -779,6 +813,7 @@
searchApi="GetService"
:searchQuery="{ KeyWord: '' }"
:showLabel="['name']"
:disabled="BookingLockOrder['service'] && isLockBooking"
:openSearch="true"
@change="getSelectViewRes"
></selectView>
@ -798,6 +833,7 @@
:defaultVal="details.nobill"
searchApi="nobillData"
:searchQuery="{ name: '' }"
:disabled="BookingLockOrder['nobill'] && isLockBooking"
:showLabel="['name']"
:openSearch="false"
@change="getSelectViewRes"
@ -818,6 +854,7 @@
:defaultVal="details.copynobill"
searchApi="copynobilllData"
:searchQuery="{ name: '' }"
:disabled="BookingLockOrder['copynobill'] && isLockBooking"
:showLabel="['name']"
:openSearch="false"
@change="getSelectViewRes"
@ -830,13 +867,13 @@
<a-col :span="12">
<a-form-model-item prop="soremark">
<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-textarea :disabled="BookingLockOrder['soremark'] && isLockBooking" 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 @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-textarea :disabled="BookingLockOrder['siremark'] && isLockBooking" 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-row>
@ -1157,6 +1194,10 @@ export default {
isParent: {
type: String,
default: ''
},
isLockBooking: {
type: Boolean,
default: false
}
},
@ -1165,6 +1206,7 @@ export default {
frompre: {},
visibleJW: false,
modalType: 0,
BookingLockOrder: {},
markVisible: false,
markVisible1: false,
visibleTwo: false,
@ -1251,7 +1293,7 @@ export default {
}
}
},
created() { },
created() {},
mounted() {
const shipperScroll = document.getElementById('shipper-scroll')
if (shipperScroll) {
@ -1267,6 +1309,12 @@ export default {
notifypartyScroll.addEventListener('scroll', () => {
document.getElementById('notifyparty-scroll-right').scrollTop = notifypartyScroll.scrollTop
})
const obj = {}
this.$options.filters['dictData']('BookingLockOrder').forEach(item => {
obj[item.code] = true
})
this.BookingLockOrder = obj
console.log(this.BookingLockOrder,this.details,123123123131)
setTimeout(() => {
this.changePkgs()
}, 2000)

Loading…
Cancel
Save