doctor-admin-components 1.0.13-beta.86 → 1.0.13-beta.88
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
CHANGED
|
@@ -558,8 +558,10 @@ export default {
|
|
|
558
558
|
// this.reset()
|
|
559
559
|
// getBizDealRecordByAskId(askId).then((response) => {
|
|
560
560
|
// this.form = response.data
|
|
561
|
-
if (this.form.buyerCompanyBillGoods
|
|
562
|
-
this.form.buyerCompanyBillGoods
|
|
561
|
+
if (this.form.buyerCompanyBillGoods) {
|
|
562
|
+
if (typeof this.form.buyerCompanyBillGoods === 'string') {
|
|
563
|
+
this.form.buyerCompanyBillGoods = JSON.parse(this.form.buyerCompanyBillGoods)
|
|
564
|
+
}
|
|
563
565
|
} else {
|
|
564
566
|
this.form.buyerCompanyBillGoods = []
|
|
565
567
|
this.addBillGoods()
|
|
@@ -101,7 +101,8 @@
|
|
|
101
101
|
<el-form-item :label="$t('contractDetail.paymentType')">{{ dealRecord.paymentType }}</el-form-item>
|
|
102
102
|
</el-col>
|
|
103
103
|
<el-col :span="8">
|
|
104
|
-
<el-form-item :label="$t('contractDetail.destination')">{{ dealRecord.buyerDestination }}</el-form-item>
|
|
104
|
+
<el-form-item v-if="dealRecord.paymentType != 'EXW'" :label="$t('contractDetail.destination')">{{ dealRecord.buyerDestination }}</el-form-item>
|
|
105
|
+
<el-form-item v-else label="EXW">{{ dealRecord.exw }}</el-form-item>
|
|
105
106
|
</el-col>
|
|
106
107
|
</el-row>
|
|
107
108
|
<el-row>
|
|
@@ -338,10 +339,9 @@
|
|
|
338
339
|
>
|
|
339
340
|
<!-- v-if="channel == 'official-website' && scope.row.showFallbackQuality" -->
|
|
340
341
|
<el-button
|
|
341
|
-
v-if="
|
|
342
|
-
channel == 'official-website'"
|
|
342
|
+
v-if="channel == 'official-website'"
|
|
343
343
|
size="mini"
|
|
344
|
-
:type="scope.row.showFallbackQuality ? 'primary': 'info'"
|
|
344
|
+
:type="scope.row.showFallbackQuality ? 'primary' : 'info'"
|
|
345
345
|
style="padding-left: 5px; padding-right: 5px"
|
|
346
346
|
@click.stop="qualityFeedback(scope.row)"
|
|
347
347
|
>{{ $t('contract.Quality_Feedback') }}</el-button
|
|
@@ -552,10 +552,10 @@ export default {
|
|
|
552
552
|
* @return {*}
|
|
553
553
|
*/
|
|
554
554
|
qualityFeedback(row) {
|
|
555
|
-
this.$buryingPoint({ data: { funcKey: 'click_feedback' } })
|
|
556
|
-
if(!row.showFallbackQuality) {
|
|
557
|
-
this.$message.warning(this.$t('contract.No_quality_feedback'))
|
|
558
|
-
return
|
|
555
|
+
this.$buryingPoint({ data: { funcKey: 'click_feedback' } })
|
|
556
|
+
if (!row.showFallbackQuality) {
|
|
557
|
+
this.$message.warning(this.$t('contract.No_quality_feedback'))
|
|
558
|
+
return
|
|
559
559
|
}
|
|
560
560
|
|
|
561
561
|
this.$store.commit('setBillNoInfo', {
|