seo

src/components/doctorCheck/CheckItemList.vue

@@ -924,6 +924,7 @@ export default {
           LastModificationTime: "",
           completeFlag: "",
         };
+        this.gridData = [] // 清空历次明细
         return;
       }
       console.log(
@@ -964,6 +965,7 @@ export default {
             });
             //console.log('this.doctorCheck.checkItemList',res.data)
             this.doctorCheck.checkItemList = res.data;
+            
 
             this.doctorCheck.checkItemList.forEach((e, i) => {
               if (this.doctorCheck.RegisterCheckEdit.completeFlag == "0") {
@@ -978,6 +980,11 @@ export default {
                   e.class = this.resultStatus[lfind].tooltips;
                 }
               }
+
+              // 刷新历次明细显示
+              if(i == 0){
+                this.itemRowClick(e)
+              }
             });
 
             // 光标定位第一个输入框

src/components/patientRegister/PatientRegisterEdit.vue

@@ -2562,7 +2562,7 @@ export default {
       }
       this.$peisAPI.photoGrah()
         .then(res => {
-          // console.log('this.$peisAPI.photoGrah 原始返回结果', res)
+          console.log('this.$peisAPI.photoGrah 拍照控件原始返回结果', res)
           let lres = JSON.parse(res)
           if (lres.code > -1) {
             let uploadPhoto = {

src/components/patientRegister/PatientRegisterItem.vue

@@ -138,7 +138,7 @@
           </el-table-column>
           <el-table-column prop="total" label="应收金额" min-width="70" align="center" />
           <el-table-column prop="standTotal" label="标准金额" min-width="70" v-if="false" />
-          <el-table-column label="支付方式" prop="payTypeFlag" width="80" align="center" >
+          <el-table-column label="支付方式" prop="payTypeFlag" width="80" align="center">
             <template slot-scope="scope">
               <el-select v-model="scope.row.payTypeFlag" size="small">
                 <el-option v-for="item in dict.payType" :key="item.id" :label="item.displayName" :value="item.id" />
@@ -384,7 +384,7 @@ export default {
       }) // 如果已经检查，则可以重新选进来（复查）
 
       arrayReduce(asbItemAll, choosedAsb, "id=asbitemId");
-      if(Array.isArray(this.itemTypeIds) && this.itemTypeIds.length > 0) this.changeItemType(this.itemTypeIds);  
+      if (Array.isArray(this.itemTypeIds) && this.itemTypeIds.length > 0) this.changeItemType(this.itemTypeIds);
       this.asbItemQuick = deepCopy(asbItemAll);
       this.quickAsb = deepCopy(asbItemAll);
     },
@@ -601,13 +601,13 @@ export default {
           discount: 100,
           amount: 1,
           total: asbItemChoosed[i].price,
-          isDiscount:asbItemChoosed[i].isDiscount
+          isDiscount: asbItemChoosed[i].isDiscount
         }
         // 优化加最上面
         //this.dataTransOpts.tableM.register_check_asbitem.push(pojo)
         this.dataTransOpts.tableM.register_check_asbitem.splice(0, 0, pojo)
-        let lfind = arrayExistObj(this.dataTransOpts.copyGroup.asbItem,'id',asbItemChoosed[i].id)
-        if(lfind > -1) this.dataTransOpts.copyGroup.asbItem.splice(lfind,1)
+        let lfind = arrayExistObj(this.dataTransOpts.copyGroup.asbItem, 'id', asbItemChoosed[i].id)
+        if (lfind > -1) this.dataTransOpts.copyGroup.asbItem.splice(lfind, 1)
       }
       // 刷新未选组合项目
       this.refreshAsbitem()
@@ -754,11 +754,11 @@ export default {
           lfind = arrayExistObj(this.dataTransOpts.tableM.register_check_asbitem, 'asbitemId', e.asbitemId)
           if (lfind > -1) {
             tempRd = this.dataTransOpts.tableM.register_check_asbitem.splice(lfind, 1)[0]
-            console.log('tempRd',tempRd,this.dataTransOpts.copyGroup.itemTypeIds)
-            if(!(Array.isArray(this.itemTypeIds) && this.itemTypeIds.length > 0)){
+            console.log('tempRd', tempRd, this.dataTransOpts.copyGroup.itemTypeIds)
+            if (!(Array.isArray(this.itemTypeIds) && this.itemTypeIds.length > 0)) {
               console.log(22222)
               let lfind2 = arrayExistObj(this.dataTransOpts.copyGroup.asbItemAll, 'id', e.asbitemId)
-              if(lfind2 > -1) this.dataTransOpts.copyGroup.asbItem.push(this.dataTransOpts.copyGroup.asbItemAll[lfind2])              
+              if (lfind2 > -1) this.dataTransOpts.copyGroup.asbItem.push(this.dataTransOpts.copyGroup.asbItemAll[lfind2])
             }
           }
         }
@@ -880,7 +880,7 @@ export default {
             payTypeFlag,
             isCharge: "N",
             discount: e.discount,
-            isDiscount:e.isDiscount,
+            isDiscount: e.isDiscount,
             amount: e.customerOrgGroupDetailAmount,
             total: Math.round(e.customerOrgGroupDetailAmount * e.customerOrgGroupDetailPrice * 100) / 100
           }
@@ -1120,7 +1120,7 @@ export default {
     //自定义计算列
     getSummaries(param) {
       const { columns, data } = param;
-      const sumCol = [1, 5,6]  //需合计的列
+      const sumCol = [1, 5, 6]  //需合计的列
       const sums = [];
 
       //console.log('columns, data',columns, data)
@@ -1152,25 +1152,25 @@ export default {
             // } else {
             //   sums[index] += e[column.property]
             // }
-            if (index == 1) { 
+            if (index == 1) {
               sums[index] += e[column.property] * e['amount']
-            }else if(index == 6){
-              if(e['payTypeFlag'] == '0') sums[index] += e['total']
-            }else{
-              sums[index] += e[column.property]
+            } else if (index == 6) {
+              if (e['payTypeFlag'] == '0') sums[index] += e['total']
+            } else {
+              sums[index] += e['payTypeFlag'] == '2' ? 0:e[column.property]
             }
           }
         })
         sums[index] = Math.round(sums[index] * 100) / 100 //+ ' 元';
 
-        
+
       });
       this.totalStand = sums[1];
       //console.log('this.totalFoucs/this.discountFoucs',this.totalFoucs,this.discountFoucs)
       if (!this.totalFoucs) this.total = sums[5];
       if (!this.discountFoucs) this.discount = Math.round(this.total * 10000 / this.totalStand) / 100;
 
-      
+
 
       return sums;
     },

src/components/patientRegister/patientRegisterAsbItem.vue

@@ -259,6 +259,7 @@ export default {
     //自定义计算列
     getSummaries(param) {
       const { columns, data } = param;
+      console.log('columns, data',columns, data)
       const sumCol = [2, 5]; //需合计的列
       const sums = [];
       columns.forEach((column, index) => {
@@ -274,12 +275,21 @@ export default {
           return;
         }
 
-        const values = data.map((item) => Number(item[column.property]));
+        // 应收不合计赠送的费用
+        // const values = data.map((item) => Number(item[column.property]));
+        const values = data.map((item) => {
+          if(index == 5 && item.payTypeFlag == '2'){
+            return 0
+          }else{
+            return Number(item[column.property])
+          }          
+        });
+        console.log('values',values)
         if (!values.every((value) => isNaN(value))) {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr);
             if (!isNaN(value)) {
-              return prev + curr;
+              return prev + value;
             } else {
               return prev;
             }

src/components/report/TurnoverReport.vue

@@ -186,7 +186,7 @@ export default {
       getapi("/api/app/customer-org/parent-all").then((res) => {
         if (res.code != -1) {
           this.customerOrgAll = res.data;
-          this.customerOrg = deepCopy(this.customerOrgAll);
+          this.customerOrg = deepCopy(this.customerOrgAll).slice(0,100);
         }
       });
 
@@ -229,17 +229,19 @@ export default {
     filterMethod(keyWords) {
       if (keyWords) {
         this.customerOrg = [];
+        let customerOrgFilter = []
         this.customerOrgAll.forEach((item) => {
           if (
             item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
             item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
             // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
           ) {
-            this.customerOrg.push(item);
+            customerOrgFilter.push(item);
           }
         });
+        this.customerOrg = customerOrgFilter.slice(0,100)
       } else {
-        this.customerOrg = deepCopy(this.customerOrgAll);
+        this.customerOrg = deepCopy(this.customerOrgAll).slice(0,100);
       }
     },
 

src/components/report/TurnoverReportReal.vue

@@ -212,7 +212,7 @@ export default {
       getapi("/api/app/customer-org/parent-all").then((res) => {
         if (res.code != -1) {
           this.customerOrgAll = res.data;
-          this.customerOrg = deepCopy(this.customerOrgAll);
+          this.customerOrg = deepCopy(this.customerOrgAll).slice(0, 100)
         }
       });
 
@@ -272,17 +272,19 @@ export default {
     filterMethod(keyWords) {
       if (keyWords) {
         this.customerOrg = [];
+        let customerOrgFilter = []
         this.customerOrgAll.forEach((item) => {
           if (
             item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
             item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
             // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
           ) {
-            this.customerOrg.push(item);
+            customerOrgFilter.push(item);
           }
         });
+        this.customerOrg = customerOrgFilter.slice(0,100)
       } else {
-        this.customerOrg = deepCopy(this.customerOrgAll);
+        this.customerOrg = deepCopy(this.customerOrgAll).slice(0,100);
       }
     },
 

src/views/charge/invoiceReg.vue

@@ -42,7 +42,7 @@
             </el-select>
             -->
             <el-cascader v-model="query.customerOrgIds" :options="customerOrgAll"
-              style="width:400px;" filterable popper-class="example"
+              style="width:500px;" filterable popper-class="example" 
               :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, leaf: 'isLeaf' }"
               size="small">
             </el-cascader>
@@ -390,6 +390,7 @@ import {
 } from "@/utlis/proFunc";
 import ElProgressOCX from "../../components/report/ElProgressOCX.vue";
 import { setDBCom, getDBCom } from "../../utlis/indexedDB";
+import { filterTreeNode, getTreePids } from "../../utlis/tree";
 
 
 export default {
@@ -410,7 +411,7 @@ export default {
         mobileTelephone: "",
       }, //查询条件
 
-      customerOrg: [],
+      customerOrgDisp: [],
       customerOrgAll: [],
       dictSalesman: [],
 
@@ -573,81 +574,7 @@ export default {
     dddw,
     moment,
 
-    // 获取单位数据，并存入缓存
-    getOrgDatas() {
-      return new Promise((resolve, reject) => {
-        console.log('getOrgDatas', this.orgDatas.length)
-        let url = '/api/app/CustomerOrg/GetSimpleByCodeAll'
-        if (this.LocalConfig.patientRegister.dispCustomerOrgCode == 'Y') {
-          url = "/api/app/customerorg/getbycodeall"
-          getapi(url)
-            .then((res) => {
-              if (res.code > -1) {
-                this.orgDatas = res.data
-                setDBCom('orgDatas', res.data) //存本地
-                resolve()
-              } else {
-                reject(res.message)
-              }
-            })
-            .catch(err => {
-              reject(err)
-            })
-        } else {
-          postapi(url)
-            .then((res) => {
-              if (res.code > -1) {
-                this.orgDatas = res.data
-                setDBCom('orgDatas', res.data)
-                resolve()
-              } else {
-                reject(res.message)
-              }
-            })
-            .catch(err => {
-              reject(err)
-            })
-        }
-
-      })
-    },
-
-    // 先从缓存处拿数据，拿不到再从数据库拉取
-    getCustomerOrgAll() {
-      return new Promise((resolve, reject) => {
-        getDBCom('orgDatas')
-          .then(localData => {
-            let now = Date.now()
-            // 24小时 = 86400000 毫秒
-            if (localData?.createdat && now - 43200000 < localData.createdat) {
-              this.orgDatas = localData.data
-            }
-            // console.log('this.orgDatas.length',this.orgDatas.length)
-            if (this.orgDatas.length > 0) {
-              let treeData = reMadeOrgTree(deepCopy(this.orgDatas), this.LocalConfig.patientRegister.dispCustomerOrgCode);
-              this.cusQuery.times += 1
-              //console.log('getCustomerOrgAll.treeData', treeData)
-              //console.log('getTreeNode', getTreeNode(treeData, "treeChildren", 'id', '3a1d3736-d7c6-a9fb-c165-675335dc0e9b').treeChildren)
-              this.cusQuery.treeDataAll = treeData
-              resolve(treeData)
-            } else {
-              this.getOrgDatas()
-                .then(() => {
-                  let treeData = reMadeOrgTree(deepCopy(this.orgDatas), this.LocalConfig.patientRegister.dispCustomerOrgCode);
-                  this.cusQuery.times += 1
-                  //console.log('getCustomerOrgAll.treeData', treeData)
-                  //console.log('getTreeNode', getTreeNode(treeData, "treeChildren", 'id', '3a1d3736-d7c6-a9fb-c165-675335dc0e9b').treeChildren)
-                  this.cusQuery.treeDataAll = treeData
-                  resolve(treeData)
-                })
-                .catch(err => {
-                  reject(err)
-                })
-            }
-          })
-      })
-    },
-
+      
     //初始化字典数据
     dictInit() {
       let today = moment(new Date()).format("YYYY-MM-DD")
@@ -655,10 +582,10 @@ export default {
       this.query.endDate = today
 
       //获取单位列表
-      getapi("/api/app/customer-org/parent-all").then((res) => {
+      postapi("/api/app/CustomerOrg/GetSimpleByCodeAll").then((res) => {
         if (res.code != -1) {
-          this.customerOrgAll = res.data;
-          this.customerOrg = deepCopy(this.customerOrgAll);
+          this.customerOrgAll = reMadeOrgTree(deepCopy(res.data), 'N')
+          //this.customerOrgDisp = deepCopy(this.customerOrgAll).slice(0,10);
         }
       });
 
@@ -671,24 +598,22 @@ export default {
         })
     },
 
-    // 单位过滤
-    filterMethod(keyWords) {
-      if (keyWords) {
-        this.customerOrg = [];
-        this.customerOrgAll.forEach((item) => {
-          if (
-            item.displayName.toLowerCase().indexOf(keyWords.toLowerCase()) > -1 ||
-            item.simpleCode.toLowerCase().indexOf(keyWords.toLowerCase()) > -1
-            // || item.shortName.toLowerCase().indexOf(keyWords.toLowerCase()) > - 1
-          ) {
-            this.customerOrg.push(item);
-          }
-        });
+    // 单位过滤 ()
+    filterMethod(node,value) {      
+      let org = []
+      if (value) {
+        console.log('filterMethod.value',node,value)
+        // org = this.customerOrgTreeAll.filter(e => {
+        //   return e.label.indexOf(value) > -1 || e.simpleCode.indexOf(value.toUpperCase()) > -1
+        // })
+        org = filterTreeNode(this.customerOrgAll, "treeChildren", ['label', 'simpleCode'], [value, value.toUpperCase()])
+        this.customerOrgDisp = org.slice(0, 10)
       } else {
-        this.customerOrg = deepCopy(this.customerOrgAll);
+        this.customerOrgDisp = this.customerOrgAll.slice(0, 10)
       }
     },
 
+
     btnExport(elId) {
       let tableDatas = deepCopy(this.dataList);
       tableDatas.forEach((e, index) => {