Commit f56a663f authored by knight's avatar knight Committed by wux

bug208 【订单列表-修改货值】修改货值页面的问题,请看截图

parent 244750e1
...@@ -29,9 +29,9 @@ ...@@ -29,9 +29,9 @@
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> --> <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact"> <div class="contact">
<el-input v-model="form.consignorName" placeholder="" :disabled2="inWarehouse"/> <el-input v-model="form.consignorName" placeholder="" :disabled2="inWarehouse"/>
<img v-if="!updateChannel || !updateWorth" src="@/assets/svg/contacts.svg" class="phonebook" <img v-if="!(updateChannel || updateWorth)" disabled src="@/assets/svg/contacts.svg" class="phonebook"
@click="contactChooseType='consignor'"/> @click="contactChooseType='consignor'"/>
<img v-if="!updateChannel || !updateWorth" src="@/assets/svg/contact_create.svg" class="phonebook" <img v-if="!(updateChannel || updateWorth )" src="@/assets/svg/contact_create.svg" class="phonebook"
@click="quickCreateType='0'"/> @click="quickCreateType='0'"/>
</div> </div>
</el-form-item> </el-form-item>
...@@ -89,9 +89,9 @@ ...@@ -89,9 +89,9 @@
<!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> --> <!-- <customer-contact-selector v-model="form.consignorContactsId" @change="consignorContact = $event" type="1" /> -->
<div class="contact"> <div class="contact">
<el-input v-model="form.consigneeName" placeholder="" :disabled="!hasConsignee"/> <el-input v-model="form.consigneeName" placeholder="" :disabled="!hasConsignee"/>
<img v-if="(!updateChannel || !updateWorth) && hasConsignee" src="@/assets/svg/contacts.svg" class="phonebook" <img v-if="!(updateChannel || updateWorth) && hasConsignee" src="@/assets/svg/contacts.svg" class="phonebook"
@click="contactChooseType='consignee'"/> @click="contactChooseType='consignee'"/>
<img v-if="(!updateChannel || !updateWorth) && hasConsignee" src="@/assets/svg/contact_create.svg" class="phonebook" <img v-if="!(updateChannel || updateWorth) && hasConsignee" src="@/assets/svg/contact_create.svg" class="phonebook"
@click="quickCreateType='1'"/> @click="quickCreateType='1'"/>
</div> </div>
</el-form-item> </el-form-item>
...@@ -633,7 +633,7 @@ ...@@ -633,7 +633,7 @@
<div class="form-section"> <div class="form-section">
<el-form-item :label="$t('快递单号')"> <el-form-item :label="$t('快递单号')">
<el-input v-model="form.number" :placeholder="$t('请输入购买商品的快递单号')" :disabled="false"> <el-input v-model="form.number" :placeholder="$t('请输入购买商品的快递单号')" :disabled="false">
<el-button type="primary" slot="append" @click="getOrderCourierNumber" :disabled="false"> <el-button type="primary" slot="append" @click="getOrderCourierNumber" :disabled="updateWorth">
{{ $t('生成单号') }} {{ $t('生成单号') }}
</el-button> </el-button>
</el-input> </el-input>
...@@ -1279,7 +1279,7 @@ export default { ...@@ -1279,7 +1279,7 @@ export default {
}, },
// 变更渠道需要显示工作流组件 // 变更渠道需要显示工作流组件
updateChannel(updateChannel) { updateChannel(updateChannel) {
if (updateChannel) { if(updateChannel) {
this.$set(this, 'showWorkFlow', true) this.$set(this, 'showWorkFlow', true)
} }
}, },
...@@ -1546,6 +1546,7 @@ export default { ...@@ -1546,6 +1546,7 @@ export default {
// 复制订单逻辑不管审批业务 // 复制订单逻辑不管审批业务
this.showWorkFlow = false this.showWorkFlow = false
} }
// 如果是自定义付款人,则需要同步具体发货人信息 // 如果是自定义付款人,则需要同步具体发货人信息
if (this.form.drawee == 3) { if (this.form.drawee == 3) {
console.log('同步自定义付款人信息', JSON.stringify(this.customDraweeList)) console.log('同步自定义付款人信息', JSON.stringify(this.customDraweeList))
...@@ -1583,7 +1584,9 @@ export default { ...@@ -1583,7 +1584,9 @@ export default {
}) })
// 已入仓后,必填字段修改则需要显示审批流 // 已入仓后,必填字段修改则需要显示审批流
if (this.inWarehouse) { if (this.updateWorth == 1){
this.showWorkFlow = false
} else if (this.inWarehouse) {
Object.keys(this.rules).forEach(field => { Object.keys(this.rules).forEach(field => {
console.log("watch", field) console.log("watch", field)
this.$watch(`form.${field}`, () => { this.$watch(`form.${field}`, () => {
...@@ -1592,6 +1595,8 @@ export default { ...@@ -1592,6 +1595,8 @@ export default {
}) })
} }
// 在初始化结束后transportId还会发生一次变化导致目的港清关被重置,所以需要延迟一下。暂不清楚原因 // 在初始化结束后transportId还会发生一次变化导致目的港清关被重置,所以需要延迟一下。暂不清楚原因
setTimeout(() => { setTimeout(() => {
console.log('transportId', this.form.transportId) console.log('transportId', this.form.transportId)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment