diff --git a/src/components/customerOrg/customerOrgGroupAsbitem.vue b/src/components/customerOrg/customerOrgGroupAsbitem.vue
index 3d0b269..a7b732c 100644
--- a/src/components/customerOrg/customerOrgGroupAsbitem.vue
+++ b/src/components/customerOrg/customerOrgGroupAsbitem.vue
@@ -470,9 +470,12 @@ export default {
//按项目类别显示组合项目,并过滤已选择的组合项目 // 刷新快速选择数据集
refAsbItemByChoosed() {
//刷新显示 未选组合项目
+ let asbItemQuick = deepCopy(this.dict.asbItemAll)
arrayReduce(this.dict.asbItem, [...this.customerOrgGroupAsbitems], "id=asbitemId");
- arrayReduce(this.dict.asbItemQuick, [...this.customerOrgGroupAsbitems], "id=asbitemId");
- this.quickAsb = Object.assign(this.dict.asbItemQuick)
+ arrayReduce(asbItemQuick, [...this.customerOrgGroupAsbitems], "id=asbitemId");
+
+ this.dict.asbItemQuick = deepCopy(asbItemQuick)
+ this.quickAsb = deepCopy(asbItemQuick)
},
//快速选择组合项目时,调整可按拼间简码及简称查找
diff --git a/src/views/customerOrg/customerOrgGroup.vue b/src/views/customerOrg/customerOrgGroup.vue
index e354de3..efabc0a 100644
--- a/src/views/customerOrg/customerOrgGroup.vue
+++ b/src/views/customerOrg/customerOrgGroup.vue
@@ -32,16 +32,16 @@
height="258px" size="small" highlight-current-row :row-class-name="handleRowClassName"
@row-click="rowClick" id="customerOrgGroups">
-
-
+
+
-
+
{{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
-
+
{{
dddw(
@@ -54,11 +54,9 @@
-
-
- {{ scope.row.creationTime ? moment(scope.row.creationTime).format("yyyy-MM-DD HH:mm:ss") : "" }}
-
-
+
+
+
-
+ ">
体检单位:
-
-
+
+
- 查询
+ 查询
- 导出excel
+ 导出excel
- 打印
+ 打印
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ line }}
+
+
+
+
@@ -139,13 +99,8 @@
-
+
@@ -181,7 +136,7 @@ export default {
endDate: "",
femaleCount: "",
maleCount: "",
- customerOrgName:""
+ customerOrgName: ""
},
};
},
@@ -337,10 +292,10 @@ export default {
this.summary.endDate = res.data.endDate;
this.summary.femaleCount = res.data.femaleCount;
this.summary.maleCount = res.data.maleCount;
- if(this.report.dataCusOrgOCX.length>1){
- this.summary.customerOrgName=""
- }else{
- this.summary.customerOrgName=this.report.dataCusOrgOCX[0].customerOrgName
+ if (this.report.dataCusOrgOCX.length > 1) {
+ this.summary.customerOrgName = ""
+ } else {
+ this.summary.customerOrgName = this.report.dataCusOrgOCX[0].customerOrgName
}
this.$nextTick(() => {
this.$refs.dataList.doLayout();