diff --git a/src/views/sales/salesOrder/salesOrder.vue b/src/views/sales/salesOrder/salesOrder.vue index c5d3b02..da55875 100644 --- a/src/views/sales/salesOrder/salesOrder.vue +++ b/src/views/sales/salesOrder/salesOrder.vue @@ -61,6 +61,7 @@ @@ -298,6 +299,10 @@ export default { this.viewState = 3 this.$refs['divAdd'].showEdit(row) }, + toInfo(row) { + this.viewState = 4 + this.$refs['divInfo'].showInfo(row) + }, // 删除 doDel() { if (this.sids.length === 0) { diff --git a/src/views/sales/salesOrder/salesOrderAdd.vue b/src/views/sales/salesOrder/salesOrderAdd.vue index 381d4e0..6ef8b48 100644 --- a/src/views/sales/salesOrder/salesOrderAdd.vue +++ b/src/views/sales/salesOrder/salesOrderAdd.vue @@ -63,7 +63,7 @@ -
业务员
+
快递业务员
@@ -907,17 +907,19 @@ export default { this.formobj.bankAccount = '' this.formobj.bankAccountKey = '' this.dialogVisible = true - const aa = [] - if (this.bankAccount_list.length > 0) { - this.bankAccount_list.forEach((e) => { - aa.push({ - bankAccount: e.dictValue, - bankAccountKey: e.dictKey, - amount: '' + if (this.formobj.accounts.length === 0) { + const aa = [] + if (this.bankAccount_list.length > 0) { + this.bankAccount_list.forEach((e) => { + aa.push({ + bankAccount: e.dictValue, + bankAccountKey: e.dictKey, + amount: '' + }) }) - }) + } + this.formobj.accounts = aa } - this.formobj.accounts = aa }, handleConfirm() { this.dialogVisible = false diff --git a/src/views/sales/salesOrder/salesOrderInfo.vue b/src/views/sales/salesOrder/salesOrderInfo.vue index 78e892c..22c8860 100644 --- a/src/views/sales/salesOrder/salesOrderInfo.vue +++ b/src/views/sales/salesOrder/salesOrderInfo.vue @@ -44,7 +44,7 @@ {{ formobj.logisticsName }} -
业务员
+
快递业务员
{{ formobj.salesName }}
@@ -86,56 +86,6 @@ -
客户信息
- - -
客户
- {{ formobj.customerName }} -
- -
收货人
- {{ formobj.shipperName }} -
- -
手机号
- {{ formobj.shipperMob }} -
-
- - -
详细地址
- {{ formobj.deliveryProvince }}{{ formobj.deliveryCity }}{{ formobj.deliveryCounty }}{{ formobj.deliveryAddress }} -
- -
邮编
- {{ formobj.postCode }} -
-
-
发票信息
- - -
是否开发票
- {{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }} -
- -
发票类型
- {{ formobj.invoiceType }} -
- -
开票名称
- {{ formobj.invoiceTitle }} -
-
- - -
税号
- {{ formobj.taxpayerNo }} -
- -
税率(%)
- {{ formobj.taxRate }} -
-
商品
@@ -416,18 +366,6 @@ export default { .addinputInfo { margin-left: 120px !important; } -/deep/ .el-form-item__error { - margin-left: 120px !important; -} -.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { - margin-left: 120px !important; - width: calc(100% - 115px); -} -.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group { - display: inline; - line-height: 1px; - vertical-align: middle; -} .rowStyle { border: 0; } diff --git a/src/views/sales/salesOrderReview/salesOrderReview.vue b/src/views/sales/salesOrderReview/salesOrderReview.vue index 9cc3340..d1a7224 100644 --- a/src/views/sales/salesOrderReview/salesOrderReview.vue +++ b/src/views/sales/salesOrderReview/salesOrderReview.vue @@ -60,7 +60,6 @@ - @@ -367,7 +366,16 @@ export default { tableKey: 0, list: [], sids: [], // 用于导出的时候保存已选择的SIDs - billType_list: [], + billType_list: [ + { + dictKey: '001', + dictValue: '线下订单' + }, + { + dictKey: '002', + dictValue: '预售订单' + } + ], FormLoading: false, listLoading: false, // 翻页 @@ -448,11 +456,6 @@ export default { }, methods: { init() { - typeValues({ type: 'billType' }).then((res) => { - if (res.success) { - this.billType_list = res.data - } - }) typeValues({ type: 'invoiceType' }).then((res) => { if (res.success) { this.invoiceType_list = res.data