Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

4 months ago · 2319c4a959
5 changed files with 72 additions and 33 deletions
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@ -480,11 +480,11 @@
        <div v-show="checkPagePriv(pagePriv.privs, '复制新增')" class="btn">
          <el-button type="primary" class="commonbutton" @click="rdCopy">复制新增</el-button>
        </div>
-        
+
        <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="btn">
-          <el-button type="primary" class="commonbutton" @click="guideLabelPrint(false)"
-            :disabled="printing" style="font-size: 13px;">指引单+条码</el-button>
-        </div>       
+          <el-button type="primary" class="commonbutton" @click="guideLabelPrint(false)" :disabled="printing"
+            style="font-size: 13px;">指引单+条码</el-button>
+        </div>
        <div v-show="checkPagePriv(pagePriv.privs, '指引单打印')" class="btn">
          <el-button type="primary" class="commonbutton" @click="guidePrint('0001', false)"
            :disabled="printing">指引单打印</el-button>
@ -494,7 +494,7 @@
            :disabled="printing">条码打印</el-button>
        </div>
        <div class="btn">
-          <el-dropdown  @command="btnMoreOpr">
+          <el-dropdown @command="btnMoreOpr">
            <el-button type="primary" class="commonbutton">
              更多……<i class="el-icon-arrow-down el-icon--right"></i>
            </el-button>
@ -502,12 +502,10 @@

              <el-dropdown-item command="指引单预览" divided
                v-show="checkPagePriv(pagePriv.privs, '指引单打印')">指引单预览</el-dropdown-item>
-              <el-dropdown-item command="条码补打" 
-                v-show="checkPagePriv(pagePriv.privs, '条码补打')">条码补打</el-dropdown-item>
+              <el-dropdown-item command="条码补打" v-show="checkPagePriv(pagePriv.privs, '条码补打')">条码补打</el-dropdown-item>
              <el-dropdown-item command="检验单申请" divided
                v-show="checkPagePriv(pagePriv.privs, '检验单申请')">检验单申请</el-dropdown-item>
-              <el-dropdown-item command="条码合并" 
-                v-show="checkPagePriv(pagePriv.privs, '条码合并')">条码合并</el-dropdown-item>
+              <el-dropdown-item command="条码合并" v-show="checkPagePriv(pagePriv.privs, '条码合并')">条码合并</el-dropdown-item>
              <el-dropdown-item command="手动合并项目"
                v-show="checkPagePriv(pagePriv.privs, '手动合并项目')">手动合并项目</el-dropdown-item>

@ -636,7 +634,9 @@
        :append-to-body="true">
        <div style="height: 320px;">
          <el-cascader v-model="form.customerOrgId" :options="patientRegister.customerOrgTreeAll" style="width:400px;"
-            filterable popper-class="example" :props="{ checkStrictly: true, expandTrigger: 'hover',...customerOrg.treeprops, leaf: 'isLeaf' }" size="small">
+            filterable popper-class="example"
+            :props="{ checkStrictly: true, expandTrigger: 'hover', ...customerOrg.treeprops, leaf: 'isLeaf' }"
+            size="small">
          </el-cascader>
        </div>
        <span slot="footer" class="dialog-footer">
@ -717,10 +717,15 @@
        "creationTime": "2023-07-10T19:53:30.210553",
        "creatorId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
        "id": "3a0c51d3-2345-38df-ba0b-1862a3c3606f" -->
-          <el-table-column type="index" width="50" />
-          <el-table-column prop="displayName" label="套餐名称" width="180" />
+          <el-table-column type="index" label="序号" width="40" align="center" />
+          <el-table-column prop="isActive" label="启用" width="50" align="center" sortable>
+            <template slot-scope="scope">
+              <el-checkbox :value="scope.row.isActive == 'Y'" true-label="Y" false-label="N" />
+            </template>
+          </el-table-column>
+          <el-table-column prop="displayName" label="套餐名称" width="200" sortable />
          <el-table-column prop="price" label="价格" width="80" />
-          <el-table-column prop="forSexId" label="适用性别" width="80">
+          <el-table-column prop="forSexId" label="适用性别" width="80" align="center">
            <template slot-scope="scope">
              <div>
                {{ dddw(dict.forSex, "id", scope.row.forSexId, "displayName") }}
@ -1042,6 +1047,7 @@ export default {

      //选中套餐与分组所包含的组合项目
      curPackageId: '',
+      packageIsActive: 'Y',
      curGroupId: '',
      packageAsbitems: [],
      groupAsbitems: [],
@ -2320,7 +2326,7 @@ export default {
    },

    // 当前面点新增时，清部份信息
-    clearPerson(){
+    clearPerson() {
      this.dataTransOpts.tableS.patient_register.id = ''
      this.peoplePhoto = '/pic/Photo.jpg'
      this.patientRegister.patientRegisterId = '';
@ -2358,7 +2364,7 @@ export default {
      }
      // 当前面点新增时，清部份信息
      this.clearPerson()
-      
+

      // this.patientRegister.patientRegisterAbs.forEach(e => {
      //   e.id = '';
@ -2490,11 +2496,11 @@ export default {
    },

    // 指引单 + 条码
-    guideLabelPrint(isPreview){
-      this.guidePrint('0001',isPreview)
-      .then(() => {
-        return this.labelPrint(isPreview)
-      })
+    guideLabelPrint(isPreview) {
+      this.guidePrint('0001', isPreview)
+        .then(() => {
+          return this.labelPrint(isPreview)
+        })
    },

    // 打印指引单(isPreview)
@ -3504,11 +3510,31 @@ export default {
      this.medicalPackageVisble = true
    },

+    confirm(title) {
+      return new Promise((resolve, reject) => {
+        if (title) {
+          this.$confirm(title, "提示", {
+            confirmButtonText: "是",
+            cancelButtonText: "否",
+            type: "warning",
+          }).then(() => {
+            resolve()
+          }).catch(err => {
+            reject()
+          })
+        } else {
+          resolve()
+        }
+      })
+    },
+
    //选中套餐
    packageRowClick(row) {
      return new Promise((resolve, reject) => {
        this.curPackageId = row.id
+        this.packageIsActive = row.isActive
        this.packageAsbitems = []
+
        postapi('/api/app/medicalpackagedetail/getmedicalpackageinasbitem', { medicalPackageId: row.id })
          .then(res => {
            if (res.code > -1) {
@ -3539,8 +3565,15 @@ export default {
        return
      }
      console.log('this.packageAsbitems', this.packageAsbitems)
-      this.addAbs(deepCopy(this.packageAsbitems))
-      this.medicalPackageVisble = false
+      let confirmTitle = ''
+      if (this.packageIsActive == 'N') confirmTitle = "该套餐已停用, 是否继续选择该套餐?"
+
+      this.confirm(confirmTitle)
+        .then(() => {
+          this.addAbs(deepCopy(this.packageAsbitems))
+          this.medicalPackageVisble = false
+        })
+
    },

    // 过滤体检单位
--- a/src/components/patientRegister/PatientRegisterRecoverList.vue
+++ b/src/components/patientRegister/PatientRegisterRecoverList.vue
@ -334,7 +334,7 @@ export default {
      //     if (res.code > -1) {
      //       this.$message.success({ showClose: true, message: '操作成功！' })
      //       //let lfind = arrayExistObj()
-      //       this.recover.barcode = ''            
+      //       this.recover.barcode = '' 
      //     }
      //   });
      this.recover.barcodes = [this.recover.barcode]
--- a/src/components/report/BtnReport.vue
+++ b/src/components/report/BtnReport.vue
@ -182,10 +182,10 @@ export default {
                { label: "锁住", prop: "isLock", minWidth: 60, align: "center" },
                { label: "预约备单", prop: "isUploadAppoint", minWidth: 90, align: "center" },
                { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
-                { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
-                { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },        
-                { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
-                { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
+                // { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
+                // { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },        
+                // { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
+                // { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
            ],
        };
    },
--- a/src/components/report/PatientRegisterListNobtn.vue
+++ b/src/components/report/PatientRegisterListNobtn.vue
@ -145,10 +145,10 @@ export default {
        { label: "锁住", prop: "isLock", minWidth: 60, align: "center" },
        { label: "预约备单", prop: "isUploadAppoint", minWidth: 90, align: "center" },
        { label: "上传", prop: "isUpload", minWidth: 60, align: "center" },
-        { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
-        { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },        
-        { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
-        { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
+        // { label: "标准金额", prop: "standardAmount", minWidth: 80, align: "center" },
+        // { label: "应收金额", prop: "receivableAmount", minWidth: 80, align: "center" },        
+        // { label: "实收金额", prop: "chargeAmount", minWidth: 80, align: "center" },
+        // { label: "支付方式", prop: "chargePayMode", minWidth: 80, align: "center" },
      ],

    };
@ -492,7 +492,7 @@ export default {
      //console.log('/api/app/peisreport/getpatientregisterreport',body)
      // 带收费信息 /api/app/PeisReport/GetPatientRegisterReportWithCharge
      // 不带收费信息 /api/app/patientregister/getlistinfilter
-      postapi('/api/app/PeisReport/GetPatientRegisterReportWithCharge', body).then(res => {
+      postapi('/api/app/patientregister/getlistinfilter', body).then(res => {
        if (res.code > -1) {

          if (this.patientRegister.query.isSeries == 'Y' && this.patientRegister.query.patientRegisterNo) {
--- a/src/views/fee-settings/cardRegister.vue
+++ b/src/views/fee-settings/cardRegister.vue
@ -94,7 +94,13 @@
            </el-table-column>
            <el-table-column prop="cardNo" label="会员卡号" width="150" sortable align="center"/>
            <el-table-column prop="discount" label="折扣率" width="80" sortable align="center"/>
-            <el-table-column prop="cardBalance" label="卡余额" width="80" sortable align="center"/>
+            <el-table-column prop="cardBalance" label="卡余额" width="80" sortable align="center">
+              <template slot-scope="scope">
+                <div style="color: red;">
+                  {{ scope.row.cardBalance }}
+                </div>
+              </template>
+            </el-table-column>
            <el-table-column prop="expiryDate" label="有效期限" width="120" sortable align="center">
              <template slot-scope="scope">
                <div v-if="scope.row.expiryDate">