diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue index 913c9cd..4d91de1 100644 --- a/src/components/customerOrg/customerOrgGroupAsbitem.vue +++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue @@ -43,13 +43,7 @@
全部移除 -
-
- 保存 - -
+ @@ -83,7 +77,7 @@ + @@ -116,6 +117,9 @@
复制套餐
+
+ 保存 +
@@ -499,17 +503,39 @@ export default { }, + changeDiscount(index){ + + this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice = + (this.customerOrgGroupAsbitems[index].discount * this.customerOrgGroupAsbitems[index].price/100).toFixed(2) + + + this.customerOrgGroupAsbitems[index].customerOrgGroupDetailMoney = + (this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice * this.customerOrgGroupAsbitems[index].customerOrgGroupDetailAmount).toFixed(2) + + //this.getSummaries() + + }, + + //修改价格或数量 changePrices(index){ this.customerOrgGroupAsbitems[index].customerOrgGroupDetailMoney = (this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice * this.customerOrgGroupAsbitems[index].customerOrgGroupDetailAmount).toFixed(2) this.customerOrgGroupAsbitems[index].discount = (this.customerOrgGroupAsbitems[index].customerOrgGroupDetailPrice * 100 / this.customerOrgGroupAsbitems[index].price).toFixed(2) - this.refreshTable('tableCustomerOrgGroupAsbitems') + //this.getSummaries() }, + //合计 getSummaries(param) { console.log('getSummaries param',param) + // if(!param){ + // param = { + // columns:[{}, {}, {}, {}, {}, {}, {property: 'asbitemMoney'},{property: 'customerOrgGroupDetailMoney'}], + // data:this.customerOrgGroupAsbitems + // } + // } + const { columns, data } = param; const sumCol = [6, 7] //需合计的列 const sums = []; @@ -529,7 +555,7 @@ export default { sums[index] = 0 data.forEach(e => { - if (!isNaN(e[column.property])) sums[index] += e[column.property]// * e['amount'] + if (!isNaN(e[column.property])) sums[index] += Number(e[column.property])// * e['amount'] }) sums[index] = sums[index].toFixed(2) //+ ' 元'; @@ -542,22 +568,8 @@ export default { }, - changingprices(price) { - this.price = price; - }, - discount(index) { - console.log(index); //100标准价格 - this.personnelUnit.nogroupselected[index].price = Math.round( - (100 * Number(this.personnelUnit.nogroupselected[index].queueTime)) / - 100, - 2 - ); - }, - inputchang(row, newVal) { - this.price = row.price; - console.log(this.price); - }, + //保存按钮 btnSave() { @@ -565,17 +577,23 @@ export default { this.$message.warning("请先选中单位分组") return } - let body = [] - // [ - // { - // "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", - // "asbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", - // "price": 0, - // "amount": 0 - // } - // ] + let body = { + customerOrgGroupId:this.customerOrgGroup.id, + details:[] + } + // { + // "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + // "details": [ + // { + // "customerOrgGroupId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + // "asbitemId": "3fa85f64-5717-4562-b3fc-2c963f66afa6", + // "price": 0, + // "amount": 0 + // } + // ] + // } this.customerOrgGroupAsbitems.forEach(e =>{ - body.push({ + body.details.push({ customerOrgGroupId:this.customerOrgGroup.id, asbitemId:e.asbitemId, price:e.customerOrgGroupDetailPrice, diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue index 6e63289..b344747 100644 --- a/src/views/customerOrg/customerOrgGroup.vue +++ b/src/views/customerOrg/customerOrgGroup.vue @@ -12,7 +12,7 @@ v-model="customerOrgId" placeholder="请选择体检单位" filterable - clearable automatic-dropdown + clearable style="margin-left: 10px" @change="changeCustomerOrg" size="small" @@ -35,6 +35,7 @@ style="width: 60px; margin-left: 10px" size="small" @change="changeTimes" + value-key="id" >
置低
- 确定 + 保存排序
- +
+ @@ -266,10 +268,10 @@ export default { customerOrgRegisterId: null, //所属体检次数 displayName: "", price: 0, - forSexId: "", - maritalStatusId: "", - ageLowerLimit: null, - ageUpperLimit: null, + forSexId: "A", + maritalStatusId: "A", + ageLowerLimit: 0, + ageUpperLimit: 200, jobPost: "", jobTitle: "", remark: "", @@ -374,6 +376,19 @@ export default { } }, + //选中颜色 + handleRowClassName({ row, rowIndex }) { + // highLightBg 为 'selected'的高亮 + //console.log(rowIndex, row) + //return row.highLightBg == 'selected' ? 'high-light-bg' : ''; + if (row.choosed) { + return 'current-row'; + } else { + return ''; + } + + }, + //获取初始数据 dictInit() { //获取单位列表 @@ -420,8 +435,9 @@ export default { this.getCustomerOrgGroup(this.customerOrgRegister.id); } else { this.customerOrgRegister = {}; - this.customerOrgGroups = []; + this.customerOrgGroups = []; } + objCopy(this.formInit,this.form) } }); }, @@ -431,13 +447,9 @@ export default { this.getCustomerOrgGroup(v.id); }, - //自定义过滤 - remoteMethod(){ - - }, - + //点击分组 - rowClick(row) { + rowClick(row) { objCopy(row, this.form); }, @@ -486,6 +498,7 @@ export default { this.form.id ); if (lfind > -1) this.customerOrgGroups.splice(lfind, 1); + objCopy(this.formInit,this.form) } }) .catch((err) => { @@ -536,7 +549,8 @@ export default { if (res.code != -1) { this.$message.success("操作成功！"); this.form.id = res.data.id; - this.customerOrgGroups.push(res.data); + this.customerOrgGroups.push(deepCopy(res.data)); + this.$refs['customerOrgGroups'].setCurrentRow(this.customerOrgGroups[this.customerOrgGroups.length - 1]); this.dialogVisible = false; } });