doctor-admin-components 1.0.13-beta.81 → 1.0.13-beta.83
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/packages/src/views/biz/contractTracing/billInfo.vue +22 -19
- package/packages/src/views/biz/contractTracing/contractPdf.vue +2 -1
- package/packages/src/views/biz/contractTracing/contractSummary.vue +5 -0
- package/packages/src/views/biz/contractTracing/editBill.vue +5 -2
package/package.json
CHANGED
|
@@ -50,9 +50,9 @@
|
|
|
50
50
|
<el-row>
|
|
51
51
|
<el-col :span="22">
|
|
52
52
|
<span class="sub-title mb20">{{ $t('contract.consigneeInfo') }}</span>
|
|
53
|
-
<span v-if="billData.blConfirmFlag == '2'" style="font-size: 16px;color: red; font-weight: bold;padding-left: 10px
|
|
53
|
+
<span v-if="billData.blConfirmFlag == '2'" style="font-size: 16px; color: red; font-weight: bold; padding-left: 10px"> 已作废 </span>
|
|
54
54
|
</el-col>
|
|
55
|
-
<el-col
|
|
55
|
+
<el-col v-if="billData.blConfirmFlag != '2'" :span="2">
|
|
56
56
|
<el-button type="text" @click="editBill">
|
|
57
57
|
{{ $t('contractDetail.edit') }}
|
|
58
58
|
</el-button>
|
|
@@ -247,7 +247,10 @@
|
|
|
247
247
|
</el-row>
|
|
248
248
|
</el-row>
|
|
249
249
|
|
|
250
|
-
<el-form-item :label="$t('contractDetail.destination') + ':'">{{
|
|
250
|
+
<el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contractDetail.destination') + ':'">{{
|
|
251
|
+
contract.destination
|
|
252
|
+
}}</el-form-item>
|
|
253
|
+
<el-form-item v-else :label="'EXW Address' + ':'">{{ contract.exw }}</el-form-item>
|
|
251
254
|
|
|
252
255
|
<el-form-item :label="$t('contract.terminal') + ':'">{{ form.terminal }}</el-form-item>
|
|
253
256
|
|
|
@@ -323,7 +326,7 @@ export default {
|
|
|
323
326
|
handler(val) {
|
|
324
327
|
this.getDealRecord(this.contract.askId)
|
|
325
328
|
},
|
|
326
|
-
immediate: true
|
|
329
|
+
immediate: true
|
|
327
330
|
}
|
|
328
331
|
},
|
|
329
332
|
data() {
|
|
@@ -552,21 +555,21 @@ export default {
|
|
|
552
555
|
// this.loading = false
|
|
553
556
|
// this.reset()
|
|
554
557
|
// getBizDealRecordByAskId(askId).then((response) => {
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
558
|
+
// this.form = response.data
|
|
559
|
+
if (this.form.buyerCompanyBillGoods && typeof this.form.buyerCompanyBillGoods === String) {
|
|
560
|
+
this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
|
|
561
|
+
} else {
|
|
562
|
+
this.form.buyerCompanyBillGoods = []
|
|
563
|
+
this.addBillGoods()
|
|
564
|
+
}
|
|
565
|
+
this.getContractCompanyList(this.form.buyerCompanyId)
|
|
566
|
+
this.getCompanyBillGoods(this.form.buyerCompanyId)
|
|
567
|
+
// this.form.dealRecordDetailList.map((item) => {
|
|
568
|
+
// if (item.imageList) {
|
|
569
|
+
// item.askCover = item.imageList.toString()
|
|
570
|
+
// }
|
|
571
|
+
// })
|
|
572
|
+
// this.loading = true
|
|
570
573
|
// })
|
|
571
574
|
},
|
|
572
575
|
/** 提交按钮 */
|
|
@@ -126,7 +126,8 @@
|
|
|
126
126
|
|
|
127
127
|
<el-descriptions-item label="Origin Country/Region">{{ contract.originCountry }}</el-descriptions-item>
|
|
128
128
|
<el-descriptions-item label="Loading Country/Region">{{ contract.loadingCountry }}</el-descriptions-item>
|
|
129
|
-
<el-descriptions-item label="Destination">{{ contract.destination }}</el-descriptions-item>
|
|
129
|
+
<el-descriptions-item v-if="contract.freightTerms != 'EXW'" label="Destination">{{ contract.destination }}</el-descriptions-item>
|
|
130
|
+
<el-descriptions-item v-else label="EXW Address">{{ contract.exw }}</el-descriptions-item>
|
|
130
131
|
<el-descriptions-item label="Special Instructions">
|
|
131
132
|
{{ contract.numberOfContainersForTwenty }}x 20' Container
|
|
132
133
|
<br />
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<!-- <div class="title">{{ $t("contract.billTip") }}</div> -->
|
|
7
7
|
<el-row>
|
|
8
8
|
<el-col :span="12" v-if="voidFlag" style="padding-bottom: 20px">
|
|
9
|
-
<span style="font-size: 16px;color: red; font-weight: bold"> 已作废 </span>
|
|
9
|
+
<span style="font-size: 16px; color: red; font-weight: bold"> 已作废 </span>
|
|
10
10
|
</el-col>
|
|
11
11
|
<el-col :span="12" v-else>
|
|
12
12
|
<div style="padding-bottom: 20px">
|
|
@@ -176,9 +176,12 @@
|
|
|
176
176
|
</el-collapse-item>
|
|
177
177
|
</el-collapse>
|
|
178
178
|
|
|
179
|
-
<el-form-item :label="$t('contract.destination') + ':'">
|
|
179
|
+
<el-form-item v-if="contract && contract.freightTerms && contract.freightTerms != 'EXW'" :label="$t('contract.destination') + ':'">
|
|
180
180
|
{{ this.contract && this.contract.destination ? this.contract.destination : '' }}
|
|
181
181
|
</el-form-item>
|
|
182
|
+
<el-form-item v-else :label="'EXW Address' + ':'">
|
|
183
|
+
{{ this.contract && this.contract.exw ? this.contract.exw : '' }}
|
|
184
|
+
</el-form-item>
|
|
182
185
|
<el-form-item :label="$t('contract.terminal') + ':'" prop="terminal">
|
|
183
186
|
<el-input v-model="form.terminal" type="textarea" autosize :placeholder="$t('contract.terminalTip')"></el-input>
|
|
184
187
|
</el-form-item>
|