seo

src/components/doctorCheck/ButtonList.vue

@@ -16,13 +16,13 @@
             <el-button type="primary" class="btnClass" @click="delItem">删除项目</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary" class="btnClass" >历次结果</el-button>
+            <el-button type="primary" class="btnClass">历次结果</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary" class="btnClass" >体检报告</el-button>
+            <el-button type="primary" class="btnClass">体检报告</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary" class="btnClass" >生成小结</el-button>
+            <el-button type="primary" class="btnClass">生成小结</el-button>
         </div>
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="toSumDoctorCheck">总检</el-button>
@@ -34,14 +34,14 @@
             <el-button type="primary" class="btnClass" @click="unAudit">取消审核</el-button>
         </div>
         <div class="listBtn">
-            <el-button type="primary" class="btnClass" >排队</el-button>
+            <el-button type="primary" class="btnClass">排队</el-button>
         </div>
         <div class="listBtn">
             <el-button type="primary" class="btnClass" @click="addSummary">新增小结</el-button>
         </div>
         <!-- 人员档案列表 -->
-        <el-dialog title="人员档案列表" :visible.sync="doctorCheck.doctorCheckDialogVisible" width="1000px" >
-            <PatientRegisterList win="doctorCheck"/>
+        <el-dialog title="人员档案列表" :visible.sync="doctorCheck.doctorCheckDialogVisible" width="1000px">
+            <PatientRegisterList win="doctorCheck" />
         </el-dialog>
     </div>
 </template>
@@ -76,40 +76,40 @@ export default {
     methods: {
         ...mapActions(["getCustomerOrgGroup"]),
 
-        prList(){
-            console.log('this.doctorCheck.doctorCheckDialogVisible',this.doctorCheck.doctorCheckDialogVisible)
+        prList() {
+            console.log('this.doctorCheck.doctorCheckDialogVisible', this.doctorCheck.doctorCheckDialogVisible)
             this.doctorCheck.doctorCheckDialogVisible = true
-            console.log('this.doctorCheck.doctorCheckDialogVisible2',this.doctorCheck.doctorCheckDialogVisible) 
+            console.log('this.doctorCheck.doctorCheckDialogVisible2', this.doctorCheck.doctorCheckDialogVisible)
         },
 
         //操作判断
-        optGrant(optType){    
+        optGrant(optType) {
             let ret = ''
             if (!this.doctorCheck.RegisterCheckEdit.id) return '请选择组合项目'
             if (this.doctorCheck.RegisterCheckEdit.isLock == 'Y') return '组合项目已锁定，不可执行此操作'
             if (this.doctorCheck.RegisterCheckEdit.completeFlag == '2') return '组合项目已弃检，不可执行此操作'
-            if(optType == 'save'){
+            if (optType == 'save') {
                 if (!this.doctorCheck.RegisterCheckEdit.checkDoctorId) return "请选择检查医生"
                 if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
                 if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
             }
-            if(optType == 'edit'){
+            if (optType == 'edit') {
                 if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
                 if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
             }
-            if(optType == 'del'){
+            if (optType == 'del') {
                 if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
                 if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return '组合项目已审核，请先取消审核，方可执行此操作！'
             }
-            if(optType == 'audit'){
+            if (optType == 'audit') {
                 if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
                 if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，无需再执行此操作"
             }
-            if(optType == 'unAudit'){
+            if (optType == 'unAudit') {
                 if (this.doctorCheck.RegisterCheckEdit.completeFlag == '0') return "该检查项目尚未保存，无需执行此操作"
                 if (this.doctorCheck.RegisterCheckEdit.isAudit == 'N') return "该检查项目尚未审核，无需执行此操作"
             }
-            if(optType == 'delItem'){
+            if (optType == 'delItem') {
                 if (this.doctorCheck.RegisterCheckEdit.completeFlag == '1') return "该项目项目已保存，不可再执行此操作，如需操作请点【修改结果】"
                 if (this.doctorCheck.RegisterCheckEdit.isAudit == 'Y') return "该检查项目已审核，请先取消审核"
             }
@@ -120,7 +120,7 @@ export default {
         //保存数据
         save() {
             let ret = this.optGrant('save')
-            if(ret){
+            if (ret) {
                 alert(ret)
                 return
             }
@@ -139,9 +139,9 @@ export default {
         },
 
         //修改结果
-        edit(){
+        edit() {
             let ret = this.optGrant('edit')
-            if(ret){
+            if (ret) {
                 alert(ret)
                 return
             }
@@ -149,41 +149,39 @@ export default {
         },
 
         //删除结果
-        del(){
+        del() {
             let ret = this.optGrant('del')
-            if(ret){
+            if (ret) {
                 alert(ret)
                 return
             }
-            console.log(`/api/app/registercheck/updatecomplete?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&CompleteFlag=0`)
-            postapi(`/api/app/registercheck/updatecomplete?RegisterCheckId=${this.doctorCheck.RegisterCheckEdit.id}&CompleteFlag=0`)
+
+            postapi('/api/app/registercheck/updatecompletemany', [{ registerCheckId: this.doctorCheck.RegisterCheckEdit.id, completeFlag: '0' }])
                 .then((res) => {
                     console.log("del", res.data);
                     if (res.code != -1) {
                         this.doctorCheck.RegisterCheckEdit.completeFlag = '0';
+                        this.$message.success("操作成功！");
                     }
-                })
-                .catch((err) => {
-                    this.$message({ type: "error", message: `组合项目删除失败，原因：${err}` });
                 });
         },
 
         //删除明细项目
-        delItem(){
+        delItem() {
             let ret = this.optGrant('delItem')
-            if(ret){
+            if (ret) {
                 alert(ret)
                 return
             }
-            let lfind =  arrayExistObj(this.doctorCheck.CheckItemList,'itemId',this.doctorCheck.checkItem.itemId)
-            if(lfind == -1) return
+            let lfind = arrayExistObj(this.doctorCheck.CheckItemList, 'itemId', this.doctorCheck.checkItem.itemId)
+            if (lfind == -1) return
 
             console.log(`/api/app/registercheckitem/deleteregistercheckitem?RegisterCheckId=${this.doctorCheck.checkItem.registerCheckId}&ItemId=${this.doctorCheck.checkItem.itemId}`)
             postapi(`/api/app/registercheckitem/deleteregistercheckitem?RegisterCheckId=${this.doctorCheck.checkItem.registerCheckId}&ItemId=${this.doctorCheck.checkItem.itemId}`)
                 .then((res) => {
                     console.log("delItem", res.data);
                     if (res.code != -1) {
-                        this.doctorCheck.CheckItemList.splice(lfind,1);
+                        this.doctorCheck.CheckItemList.splice(lfind, 1);
                         this.doctorCheck.checkItem.itemId = ''
                     }
                 })
@@ -193,20 +191,20 @@ export default {
         },
 
         //审核
-        audit(){
+        audit() {
             let ret = this.optGrant('audit')
-            if(ret){
+            if (ret) {
                 alert(ret)
                 return
             }
-            let body ={
+            let body = {
                 registerCheckId: this.doctorCheck.RegisterCheckEdit.id,
                 //auditorUserId: "3fa85f64-5717-4562-b3fc-2c963f66afa6", 
                 //auditTime: "string" 不传时，取当前时间
             }
 
-            console.log(`/api/app/registercheck/updateauditordoctor`,body)
-            postapi(`/api/app/registercheck/updateauditordoctor`,body)
+            console.log(`/api/app/registercheck/updateauditordoctor`, body)
+            postapi(`/api/app/registercheck/updateauditordoctor`, body)
                 .then((res) => {
                     console.log("audit", res.data);
                     if (res.code != -1) {
@@ -220,9 +218,9 @@ export default {
         },
 
         //取消审核
-        unAudit(){
+        unAudit() {
             let ret = this.optGrant('unAudit')
-            if(ret){
+            if (ret) {
                 alert(ret)
                 return
             }
@@ -242,7 +240,7 @@ export default {
         },
 
         //总检
-        toSumDoctorCheck(){
+        toSumDoctorCheck() {
             this.$router.push({ path: "/sumDoctorCheck" });
         },
 
@@ -341,7 +339,7 @@ export default {
 
         },
 
-        addSummary(){
+        addSummary() {
             if (!this.doctorCheck.RegisterCheckEdit.id) {
                 alert("请选择检查项目")
                 return
@@ -380,7 +378,8 @@ export default {
     margin-top: 5px;
     text-align: center;
 }
-.btnClass{
-  width:110px;
+
+.btnClass {
+    width: 110px;
 }
 </style>

src/components/patientRegister/PatientRegisterRecoverList.vue

@@ -266,7 +266,9 @@ export default {
       console.log('/api/app/patientregister/getlistinfilter', body)
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
-          this.dataList = res.data;
+          if(res.code != - 1){
+            this.dataList = res.data.items;
+          }
         });
     },
   },

src/components/patientRegister/PatientRegisterRefuseList.vue

@@ -390,7 +390,9 @@ export default {
       console.log('/api/app/patientregister/getlistinfilter', body)
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
-          this.dataList = res.data;
+          if(res.code != - 1){
+            this.dataList = res.data.items;
+          }
         });
     },
   },

src/components/patientRegister/PatientRegisterSignList.vue

@@ -271,7 +271,9 @@ export default {
       console.log('/api/app/patientregister/getlistinfilter', body)
       postapi('/api/app/patientregister/getlistinfilter', body)
         .then((res) => {
-          this.dataList = res.data;
+          if(res.code != - 1){
+            this.dataList = res.data.items;
+          }
         });
     },
   },

src/components/sumDoctorCheck/SumAsbItemStatus.vue

@@ -3,25 +3,25 @@
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:7px;color: #409EFF;">未检组合项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">        
-        <el-tag style="margin-left: 5px;" v-for="item in unCheckAsb" :key="item" size="mini">{{item}}</el-tag>                    
+        <el-tag style="margin-left: 5px;" v-for="item in data.unCheckedAsbitem" :key="item" size="mini">{{item}}</el-tag>                    
       </div>
     </div>
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:7px;color: #909399;">弃检组合项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag type="info" style="margin-left: 5px;" v-for="item in refuseAsb" :key="item" size="mini">{{item}}</el-tag>        
+        <el-tag type="info" style="margin-left: 5px;" v-for="item in data.checkedAsbitem" :key="item" size="mini">{{item}}</el-tag>        
       </div>
     </div>
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:7px;color: #F56C6C;">组合项目已检但无值的明细项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag type="danger" style="margin-left: 5px;" v-for="item in noResultItem" :key="item" size="mini">{{item}}</el-tag>        
+        <el-tag type="danger" style="margin-left: 5px;" v-for="item in data.checkedNullValueItem" :key="item" size="mini">{{item}}</el-tag>        
       </div>
     </div>
     <div class="asbitemListClass">
       <div style="margin-top:2px;font-size:7px;color: #E6A23C;">组合项目已检但弃检的明细项目：</div>
       <div style="display: flex; flex-wrap: wrap; height:68px;width:100%; margin-top:2px;border: 1px solid;">
-        <el-tag type="warning" style="margin-left: 5px;" v-for="item in refuseItem" :key="item" size="mini">{{item}}</el-tag>        
+        <el-tag type="warning" style="margin-left: 5px;" v-for="item in data.checkedGiveUpItem" :key="item" size="mini">{{item}}</el-tag>        
       </div>
     </div>
   </div>
@@ -33,29 +33,51 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 
 export default {
   components: {},
+  props:['patientRegisterId'],
   data() {
     return {
-      unCheckAsb:['未检项目1','未检项目2','未检项目3','未检项目4','未检项目5','未检项目6','未检项目7','未检项目8'],
-      refuseAsb:['弃检1','弃检2'],
-      noResultItem:['无果1','无果2'],
-      refuseItem:['弃检明细1','弃检明细2'],
+      data:{
+        unCheckedAsbitem:['未检项目1','未检项目2','未检项目3','未检项目4','未检项目5','未检项目6','未检项目7','未检项目8'],
+        checkedAsbitem:['弃检1','弃检2'],
+        checkedNullValueItem:['无果1','无果2'],
+        checkedGiveUpItem:['弃检明细1','弃检明细2'],
+      }     
     };
   },
 
   created() {},
 
   //挂载完成
-  mounted() {},
+  mounted() {
+    if(this.patientRegisterId){
+      this.getSumAsbItemStatus(this.patientRegisterId);
+    }
+  },
 
   computed: {
     ...mapState(["dict", "doctorCheck","sumDoctorCheck"]),    
   },
   methods: {      
+    getSumAsbItemStatus(PatientRegisterId){
+      getapi(`/api/app/patientregister/getpatientregisteritemstatus?PatientRegisterId=${PatientRegisterId}`).then(res =>{
+        if(res.code != -1){
+          this.data = res.data;
+        }
+      });
+    }
+  },
 
-    lmoment(date, forMat) {
-      return moment(new Date(date)).format(forMat);
+  //监听事件
+  watch: {
+    //检查项目切换
+    "patientRegisterId"(newVal, oldVal) {
+      console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal);
+      if (newVal != oldVal && newVal != '') {
+        this.getSumAsbItemStatus(newVal);     
+      }
     },
   },
+
 };
 </script>
 <style scoped>

src/views/doctorCheck/sumDoctorCheck.vue

@@ -12,7 +12,7 @@
                 <div>
                   <SumSug/>
                   <SumPREdit/>
-                  <SumAsbItemStatus/>
+                  <SumAsbItemStatus :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
                 </div>
               </el-tab-pane>
               <el-tab-pane label="明细结果" name="2">
@@ -82,7 +82,7 @@ export default {
   },
 
   computed: {
-    ...mapState(["window","dict", "patientRegister", "customerOrg"]),
+    ...mapState(["window","dict", "patientRegister", "customerOrg","sumDoctorCheck"]),
   },
 
   methods: {

src/views/fee-settings/cardRegister.vue

@@ -37,7 +37,7 @@
               <el-input placeholder="手机号" v-model="query.mobileTelephone" size="small" clearable style="width: 150px" />
             </div>
           </div>
-          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 370 : window.pageHeight - 230"
+          <el-table :data="dataList" border width="100%" :height="window.pageHeight < 600 ? 200 : window.pageHeight - 400"
             row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
             @row-click="rowClick">
             <el-table-column prop="cardTypeId" label="卡类别" width="100">
@@ -81,7 +81,40 @@
               </template>
             </el-table-column>
           </el-table>
-
+          <el-table :data="cardBillList" border width="100%" height="170"
+            row-key="id" size="small" highlight-current-row ref="dataList" @selection-change="handleSelectionChange"
+            @row-click="rowClick">            
+            <el-table-column prop="cardNo" label="会员卡号" width="150" />            
+            <el-table-column prop="customerName" label="卡主姓名" width="80" />            
+            <el-table-column prop="mobileTelephone" label="手机号" width="150" />
+            <el-table-column prop="payModeId" label="支付方式" width="100">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.payMode, "id", scope.row.payModeId, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billMoney" label="记账金额" width="80" />
+            <el-table-column prop="billFlag" label="记账标志" width="100">
+              <template slot-scope="scope">
+                <div>{{ dddw(dict.billFlag, "id", scope.row.billFlag, "displayName") }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="creatorId" label="创建人员" width="100" />
+            <el-table-column prop="creationTime" label="创建日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.creationTime">
+                  {{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="lastModifierId" label="修改人员" width="100" />
+            <el-table-column prop="lastModificationTime" label="修改日期" width="150">
+              <template slot-scope="scope">
+                <div v-if="scope.row.lastModificationTime">
+                  {{ moment(scope.row.lastModificationTime).format("yyyy-MM-DD") }}
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
         <div style=" margin-left: 10px;width:110px;">
           <div class="listBtn">
@@ -213,6 +246,7 @@ export default {
         dateType:'createDate',
       },  //查询条件
       dataList: [], //列表数据
+      cardBillList:[], //卡记账数据
       multipleSelection: [], //选中的数据列表
       dialogVisible: false,
       form: {