seo

src/components/doctorCheck/RegisterCheckEdit.vue

@@ -7,39 +7,29 @@
         </el-select>
       </div>
       <div>
-        <span class="query">检查医生</span>
-        <el-select v-model="doctorCheck.RegisterCheckEdit.checkDoctorId" filterable clearable placeholder="请选择"
-          style="width: 80px" size="small" :filter-method="filterMethod">
-          <el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
+        <span class="query">检查</span>
+        <el-select v-model="doctorCheck.RegisterCheckEdit.checkDoctorId" filterable clearable placeholder="检查医生"
+          style="width: 120px" size="small" :filter-method="filterMethod">
+          <el-option v-for="item in users" :key="item.id" :label="item.userName + ' ' + item.surname" :value="item.id" />
         </el-select>
+        <el-date-picker v-model="doctorCheck.RegisterCheckEdit.checkDate" type="datetime" placeholder="检查日期" style="width: 90px" size="small" />
       </div>      
       <div>
-        <span class="query">检查日期</span>
-        <el-date-picker v-model="doctorCheck.RegisterCheckEdit.checkDate" type="datetime" style="width: 90px" size="small" />
-      </div>      
-      <div>
-        <span class="query">审核医生</span>
-        <el-select v-model="doctorCheck.RegisterCheckEdit.auditorUserId" filterable clearable placeholder="请选择"
-          style="width: 80px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" :filter-method="filterMethod">
-          <el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
+        <span class="query">审核</span>
+        <el-select v-model="doctorCheck.RegisterCheckEdit.auditorUserId" filterable clearable placeholder="审核医生"
+          style="width: 120px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" :filter-method="filterMethod">
+          <el-option v-for="item in users" :key="item.id" :label="item.userName + ' ' + item.surname" :value="item.id" />
         </el-select>
-      </div>
-      <div>
-        <span class="query">审核日期</span>
-        <el-date-picker v-model="doctorCheck.RegisterCheckEdit.auditTime" type="datetime" style="width: 90px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" />
-      </div>
-      <div>
+        <el-date-picker v-model="doctorCheck.RegisterCheckEdit.auditTime" type="datetime" placeholder="审核日期" style="width: 90px" size="small" :disabled="doctorCheck.RegisterCheckEdit.isAudit == 'Y' ? true:false" />
         <el-select v-model="doctorCheck.RegisterCheckEdit.isAudit" style="width: 60px" size="small" disabled>
           <el-option label="已审" value="Y" />
           <el-option label="未审" value="N" />
         </el-select>
       </div>
+      
       <div>
-        <span class="query">操作者</span>
+        <span class="query">操作</span>
         <el-input v-model="doctorCheck.RegisterCheckEdit.lastModifierName" size="small" style="width: 80px" disabled />
-      </div>
-      <div>
-        <span class="query">操作日期</span>
         <el-input
           :value="doctorCheck.RegisterCheckEdit.lastModificationTime ? lmoment(doctorCheck.RegisterCheckEdit.lastModificationTime, 'yyyy-MM-DD') : ''"
           style="width: 90px" size="small" disabled></el-input>

src/components/patientRegister/PatientRegisterEdit.vue

@@ -2616,9 +2616,10 @@ export default {
           preViewCanPrint: 'N',
           BusinessCode: this.form.id,
           Parameters: [
-            { Name: 'printer', Value: user },
-            { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
-            { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },
+            { Name: 'printer', Value: user },  // 打印人
+            { Name: 'hisLog', Value: 'pic/hisLog.jpg' },  // 院标
+            { Name: 'pageFooter', Value: 'pic/peisQrCode.jpg' },  //公众号
+            { Name: "picExtOne", Value: "pic/evaluate.jpg" }, // 客户评价二维码(检后评价)
           ],
         };
         console.log('this.$peisAPI.print', JSON.stringify(toOutShell))

src/components/patientRegister/PatientRegisterList.vue

@@ -1134,6 +1134,7 @@ export default {
           { Name: "printer", Value: user },
           { Name: "hisLog", Value: "pic/hisLog.jpg" },
           { Name: "pageFooter", Value: "pic/peisQrCode.jpg" },
+          { Name: "picExtOne", Value: "pic/evaluate.jpg" }, // 客户评价二维码(检后评价)
         ],
       };
       let lfind = -1;

src/components/patientRegister/patientRegisterQuery.vue

@@ -351,9 +351,8 @@ export default {
           this.query.patientName = idNos.Name
           this.query.sex = idNos.sexId
           this.query.idCardNo = idNos.IDCode
-
-          this.query.times++;
-
+          // 触发按身份证查询
+          this.btnQuery('idCardNo') 
         } else {
           this.$message.error({ showClose: true, message: lres.message })
         }

src/components/report/TurnoverReportReal.vue

@@ -75,6 +75,13 @@
               <el-option v-for="item in dictSalesman" :key="item.id" :label="item.surname" :value="item.surname" />
             </el-select>
           </div>
+          <div class="query">
+            <span>支付方式：</span>
+            <el-select v-model="query.payModeIds" placeholder="请选择" style="margin-left: 10px" filterable clearable
+              size="small" multiple collapse-tags>
+              <el-option v-for="item in dict.payMode" :key="item.id" :label="item.displayName" :value="item.id" />
+            </el-select>
+          </div>
         </div>
       </div>
       <div style="display: block;width: 110px;">
@@ -93,20 +100,22 @@
         <el-table-column prop="customerOrgName" label="单位名称" min-width="240" />
         <el-table-column v-if="query.isCustomerOrgRegister == 'Y' ? true : false" prop="medicalTimes" label="单位次数"
           min-width="80" align="center" />
-        <el-table-column label="收款" align="center" >
+        <el-table-column label="收款" align="center">
           <el-table-column prop="chargeCount" label="人数" min-width="80" align="center" />
           <el-table-column prop="chargeTotal" label="金额" min-width="80" align="center" />
         </el-table-column>
-        <el-table-column label="退款" min-width="80" align="center" >
+        <el-table-column label="退款" min-width="80" align="center">
           <el-table-column prop="refundCount" label="人数" min-width="80" align="center" />
           <el-table-column prop="refundTotal" label="金额" min-width="80" align="center" />
         </el-table-column>
-        <el-table-column label="营收金额" min-width="80" align="center" >
+        <el-table-column label="营收金额" min-width="80" align="center">
           <el-table-column prop="turnoverTotal" label="汇总" min-width="80" align="center" />
-          <el-table-column v-for="(col,index) in asyncCols" :key="index" :prop="col" :label="col" min-width="80" align="center">
+          <el-table-column v-for="(col, index) in asyncCols" :key="index" :prop="col" :label="col" min-width="80"
+            align="center">
             <template slot-scope="scope">
-              <el-tooltip class="item" :content="`收款：${scope.row[col+'_p']}  退款：${scope.row[col+'_b']}`" placement="top">
-                <div v-if="scope.row[col] !=0 ? true:false">{{ scope.row[col] }}</div>
+              <el-tooltip class="item" :content="`收款：${scope.row[col + '_p']}  退款：${scope.row[col + '_b']}`"
+                placement="top">
+                <div v-if="scope.row[col] != 0 ? true : false">{{ scope.row[col] }}</div>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -140,7 +149,6 @@ export default {
       medicalType: [],
       personnelType: [],
       dictSalesman: [],
-
       query: {
         dateType: '6',
         startDate: '',
@@ -149,6 +157,7 @@ export default {
         medicalTypeIds: [],
         personnelTypeIds: [],
         salesmans: [],
+        payModeIds: [],
         // isMedicalTypeId: 'Y',
         isPreRegistration: 'N',
         isChild: 'Y',
@@ -177,7 +186,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["pickerOptions","window", "dict", "patientRegister", "report"]),
+    ...mapState(["pickerOptions", "window", "dict", "patientRegister", "report"]),
   },
   methods: {
     //获取初始数据
@@ -218,6 +227,12 @@ export default {
           }
         })
 
+      //支付方式
+      getapi("/api/app/pay-mode").then((res) => {
+        if (res.code == 1) {
+          this.dict.payMode = res.data;
+        }
+      });
     },
 
     //通用导出
@@ -252,11 +267,9 @@ export default {
       //let body = deepCopy(this.query)
       postapi("/api/app/CustomerReport/GetCustomerOrgAmountReceivedStatistics", this.query).then(res => {
         if (res.code > -1) {
-          if (Array.isArray(res.data) && res.data.length > 0) {
           // 动态生成新的显示数据
           this.makeDispData(res.data)
         }
-        }
       })
     },
 
@@ -264,6 +277,9 @@ export default {
     makeDispData(orgData) {
       this.tableData = []
       this.asyncCols = []
+      // 没有数据返回
+      if (!(Array.isArray(orgData) && orgData.length > 0)) return
+
       orgData.forEach(e => {
         if (this.query.isChild == 'Y') {
           e.customerOrgName = (e.customerOrgName == e.departmentName ? e.customerOrgName : e.customerOrgName + '--' + e.departmentName)
@@ -273,7 +289,7 @@ export default {
         e.feeDetail.forEach(c => {
           e.chargeTotal = Number(e.chargeTotal) + Number(c.chargeMoney)
           e.refundTotal = Number(e.refundTotal) + Number(c.refundMoney)
-          if(!this.asyncCols.includes(c.payModeName)){         
+          if (!this.asyncCols.includes(c.payModeName)) {
             this.asyncCols.push(c.payModeName)
           }
           e[c.payModeName] = Math.round((Number(c.chargeMoney) + Number(c.refundMoney)) * 100) / 100
@@ -288,7 +304,7 @@ export default {
 
       this.tableData.forEach(e => {
         this.asyncCols.forEach(col => {
-          if(!e[col]){
+          if (!e[col]) {
             e[col] = 0
           }
         });
@@ -308,22 +324,22 @@ export default {
       // }
 
       const { columns, data } = param;
-      let count = 7,sumCol = []  //需合计的列      
+      let count = 7, sumCol = []  //需合计的列      
       const sums = [];
 
-      if (this.query.isCustomerOrgRegister == 'Y'){
-        sumCol = [2,3,4,5,6,7]
+      if (this.query.isCustomerOrgRegister == 'Y') {
+        sumCol = [2, 3, 4, 5, 6, 7]
         count = 8
-      }else{
-        sumCol = [2,3,4,5,6]
+      } else {
+        sumCol = [2, 3, 4, 5, 6]
       }
       this.asyncCols.forEach(() => {
         sumCol.push(count++)
       });
 
-      console.log('sumCol',sumCol)
+      console.log('sumCol', sumCol)
       columns.forEach((column, index) => {
-        console.log('column.property, index,data',column.property, index,data)
+        console.log('column.property, index,data', column.property, index, data)
         //显示合计列
         if (index === 1) {
           sums[index] = '合计';