|
@@ -28,7 +28,7 @@
|
|
<div style="flex-basis:35%">交货方式:{{ detail.handoverTypeDictValue||'--' }}</div>
|
|
<div style="flex-basis:35%">交货方式:{{ detail.handoverTypeDictValue||'--' }}</div>
|
|
<div style="flex-basis:30%">运费合计:{{ detail.totalSendAmount }}</div>
|
|
<div style="flex-basis:30%">运费合计:{{ detail.totalSendAmount }}</div>
|
|
<div style="flex-basis:100%">发货备注:{{ detail.sendRemark||'--' }}</div>
|
|
<div style="flex-basis:100%">发货备注:{{ detail.sendRemark||'--' }}</div>
|
|
- <div style="flex-basis:35%" class="requerd">物流情况:
|
|
|
|
|
|
+ <div style="flex-basis:35%" :class="type==0?'requerd':''">物流情况:
|
|
<v-select
|
|
<v-select
|
|
v-model="form.transportState"
|
|
v-model="form.transportState"
|
|
ref="transportState"
|
|
ref="transportState"
|
|
@@ -38,16 +38,16 @@
|
|
allowClear></v-select>
|
|
allowClear></v-select>
|
|
<span v-else>{{ detail.transportStateDictValue||'--' }}</span>
|
|
<span v-else>{{ detail.transportStateDictValue||'--' }}</span>
|
|
</div>
|
|
</div>
|
|
- <div style="flex-basis:35%" class="requerd">
|
|
|
|
|
|
+ <div style="flex-basis:35%" :class="type==0?'requerd':''">
|
|
是否收货:
|
|
是否收货:
|
|
<div>
|
|
<div>
|
|
- <a-checkbox v-model="form.receiveFlag" v-if="type==0">已收货</a-checkbox>
|
|
|
|
|
|
+ <a-checkbox v-model="form.receiveFlag" @change="receiveFlagChange" v-if="type==0">已收货</a-checkbox>
|
|
<span v-else>{{ detail.receiveFlag == 1?'是':'否' }}</span>
|
|
<span v-else>{{ detail.receiveFlag == 1?'是':'否' }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <div style="flex-basis:30%" class="requerd">
|
|
|
|
|
|
+ <div style="flex-basis:30%" :class="type==0&&form.receiveFlag?'requerd':''">
|
|
收货时间:
|
|
收货时间:
|
|
- <a-date-picker inputReadOnly :allowClear="false" format="YYYY-MM-DD" v-model="form.receiveDate" v-if="type==0"/>
|
|
|
|
|
|
+ <a-date-picker inputReadOnly format="YYYY-MM-DD" v-model="form.receiveDate" v-if="type==0"/>
|
|
<span v-else>{{ detail.receiveDate||'--' }}</span>
|
|
<span v-else>{{ detail.receiveDate||'--' }}</span>
|
|
</div>
|
|
</div>
|
|
<div style="flex-basis:100%">
|
|
<div style="flex-basis:100%">
|
|
@@ -141,6 +141,11 @@ export default {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
|
|
+ receiveFlagChange (e) {
|
|
|
|
+ console.log(e)
|
|
|
|
+ const v = e.target.checked
|
|
|
|
+ this.form.receiveDate = v ? moment() : ''
|
|
|
|
+ },
|
|
// 打印
|
|
// 打印
|
|
printOrder () {
|
|
printOrder () {
|
|
this.$refs.printModel.printDom()
|
|
this.$refs.printModel.printDom()
|
|
@@ -187,7 +192,7 @@ export default {
|
|
handleCommonOk () {
|
|
handleCommonOk () {
|
|
const params = {
|
|
const params = {
|
|
sendBillSn: this.sendBillSn,
|
|
sendBillSn: this.sendBillSn,
|
|
- receiveDate: this.form.receiveDate.format('YYYY-MM-DD'),
|
|
|
|
|
|
+ receiveDate: this.form.receiveDate ? this.form.receiveDate.format('YYYY-MM-DD') : '',
|
|
receiveFlag: this.form.receiveFlag ? 1 : 0,
|
|
receiveFlag: this.form.receiveFlag ? 1 : 0,
|
|
transportState: this.form.transportState,
|
|
transportState: this.form.transportState,
|
|
transportRemark: this.form.transportRemark || ''
|
|
transportRemark: this.form.transportRemark || ''
|