diff --git a/src/components/company/BusinessSelect.vue b/src/components/company/BusinessSelect.vue
index 2673b49..1154699 100644
--- a/src/components/company/BusinessSelect.vue
+++ b/src/components/company/BusinessSelect.vue
@@ -161,15 +161,14 @@ export default {
this.close()
},
close() {
+ this.onClearSelected()
this.visible = false
this.selectedCompany = {}
if (this.isMultiple) {
this.selectedCompany = []
}
- this.onClearSelected()
},
onSelectChange(selectedRowKeys, selectionRows) {
- console.log('---this.selectedCompany----', selectedRowKeys, selectionRows)
if(!this.isMultiple) {
this.selectedCompany = selectionRows[0]
} else {
diff --git a/src/components/company/CompanySelect.vue b/src/components/company/CompanySelect.vue
index 9ff4d4c..2f89a91 100644
--- a/src/components/company/CompanySelect.vue
+++ b/src/components/company/CompanySelect.vue
@@ -2,7 +2,11 @@
-
+
+ {{ value[valueKey] }}
+
+
+
@@ -70,7 +74,18 @@ export default {
this.$refs.businessSelect.isLimit = this.isLimit
this.$refs.businessSelect.searchReset()
this.$refs.businessSelect.visible = true
- this.$refs.businessSelect.selectedRowKeys[0] = this.value.id
+ if (!this.isMultiple) {
+ this.$refs.businessSelect.selectedRowKeys[0] = this.value.id
+ } else {
+ // 很重要 内部的删除像没有作用一样
+ if(this.value.id) {
+ this.$refs.businessSelect.selectedRowKeys = this.value.id.split(',')
+ this.$refs.businessSelect.selectedCompany = this.multipleData || []
+ } else {
+ this.$refs.businessSelect.selectedRowKeys = []
+ this.$refs.businessSelect.selectedCompany = []
+ }
+ }
},
/**
* 选中后抛出企业信息(id, companyName)
@@ -90,6 +105,8 @@ export default {
company.id = ids.join()
company.companyName= nameArr.join()
}
+ // 存储上次选中的信息,用于回显
+ this.multipleData = value
} else {
company.id = value.id
company.companyName= value.companyName
diff --git a/src/views/contractManagement/revenueContract/RevenueContractList.vue b/src/views/contractManagement/revenueContract/RevenueContractList.vue
index 599bade..bda5b67 100644
--- a/src/views/contractManagement/revenueContract/RevenueContractList.vue
+++ b/src/views/contractManagement/revenueContract/RevenueContractList.vue
@@ -157,12 +157,14 @@
作废
查看邮寄详情
+ 修改合同编号
+
@@ -176,10 +178,11 @@ import { RangeDateMixin } from '../../../mixins/RangeDateMixin'
import { archiveRevenueContract, cancellationContract } from '../../../api/incomePaymentsApi'
import JYearDate from '../../../components/jero/JYearDate'
import MailDetailModal from '../modules/MailDetailModal'
+import RevenueContractEditNum from './modules/RevenueContractEditNum'
export default {
name: 'RevenueContractList',
- components: { PageHeaderTitle, RevenueContractAduitModule, JDate, JYearDate, MailDetailModal },
+ components: { PageHeaderTitle, RevenueContractAduitModule, JDate, JYearDate, MailDetailModal, RevenueContractEditNum },
mixins: [JeroListMixin, RangeDateMixin],
data() {
return {
@@ -282,7 +285,7 @@ export default {
dataIndex: 'action',
align: 'center',
fixed: 'right',
- width: 220,
+ width: 320,
scopedSlots: { customRender: 'action' }
}
],
@@ -415,6 +418,16 @@ export default {
*/
handleReviewMailDetail(record) {
this.$refs.mailDetail.open(record)
+ },
+ /**
+ * 编辑合同编号
+ * @param record
+ */
+ handleEditContractNum(record) {
+ this.$refs.revenueContractEditNum.open(record)
+ },
+ contractEditNumOk() {
+ this.loadData()
}
}
}
diff --git a/src/views/contractManagement/revenueContract/modules/RevenueContractEditNum.vue b/src/views/contractManagement/revenueContract/modules/RevenueContractEditNum.vue
new file mode 100644
index 0000000..4623c76
--- /dev/null
+++ b/src/views/contractManagement/revenueContract/modules/RevenueContractEditNum.vue
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+ {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+
+
+ 关闭
+ 确定
+
+
+
+
+
+
+
\ No newline at end of file