00

src/components/patientRegister/AsbChargeRequest.vue

@@ -3,9 +3,8 @@
     <div>
       <el-tabs v-model="tabChoosed" style="margin-top: 0px;">
         <el-tab-pane label="待收费项目" name="1">
-          <el-table :data="tableData" border style="width: 100%" row-key="id"
-            height="450" highlight-current-row size="small" @selection-change="handleSelectionChange"
-            :row-style="{ height: '25px' }">
+          <el-table :data="tableData" border style="width: 100%" row-key="id" height="450" highlight-current-row
+            size="small" @selection-change="handleSelectionChange" :row-style="{ height: '25px' }">
             <el-table-column type="selection" align="center" width="40" />
             <el-table-column type="index" label="序号" align="center" width="40" />
             <el-table-column label="组合项目" min-width="150" prop="asbitemName"></el-table-column>
@@ -18,8 +17,7 @@
         </el-tab-pane>
         <el-tab-pane label="已收费项目" name="2">
           <el-table :data="dataTransOpts.tableM.register_check_asbitem" border style="width: 100%" row-key="id"
-            height="160" highlight-current-row size="small" 
-            :row-style="{ height: '25px' }">
+            height="160" highlight-current-row size="small" :row-style="{ height: '25px' }">
             <el-table-column type="index" label="序号" align="center" width="40" />
             <el-table-column label="申请单号" min-width="150" prop="asbitemName"></el-table-column>
             <el-table-column prop="total" label="金额" min-width="60" align="center" />
@@ -42,8 +40,7 @@
           </el-table>
           <div style="padding: 10px 0 5px 0;">申请单包含项目</div>
           <el-table :data="dataTransOpts.tableM.register_check_asbitem" border style="width: 100%" row-key="id"
-            height="256" highlight-current-row size="small" 
-            :row-style="{ height: '25px' }">
+            height="256" highlight-current-row size="small" :row-style="{ height: '25px' }">
             <el-table-column type="index" label="序号" align="center" width="40" />
             <el-table-column label="组合项目" min-width="150" prop="asbitemName"></el-table-column>
             <el-table-column label="标准价格" prop="standardPrice" min-width="70" align="center" />
@@ -61,7 +58,7 @@
       <div></div>
       <div style="display: flex;">
         <div style="margin-left: 10px" v-show="tabChoosed == '1'">
-          <el-button class="commonbutton" @click="dialogWin.AsbChargeRequest = false">收费申请</el-button>
+          <el-button class="commonbutton" @click="btnSubmit">收费申请</el-button>
         </div>
         <div style="margin-left: 10px">
           <el-button class="commonbutton" @click="dialogWin.AsbChargeRequest = false">关闭</el-button>
@@ -84,8 +81,8 @@ export default {
       tabChoosed: '1',
       tableData: [],        //组合项目数据 过滤后显示的数据  
       selectedData: [],    //选中的组合项目
-      hisRequestData:[],   //收费申请单
-      hisRequestDataDetails:[],   //收费申请单明细
+      hisRequestData: [],   //收费申请单
+      hisRequestDataDetails: [],   //收费申请单明细
 
     };
   },
@@ -103,11 +100,11 @@ export default {
   methods: {
 
     initData(patientRegisterId) {
-      this.tableData=[]
-      if(!patientRegisterId) return
+      this.tableData = []
+      if (!patientRegisterId) return
       postapi('/api/app/registerasbitem/GetCanChargeAsbitemsByPatientRegisterId', { patientRegisterId })
         .then(res => {
-          if(res.code > -1){
+          if (res.code > -1) {
             res.data.forEach(e => {
               e.total = Number(e.chargePrice * e.amount)
               this.tableData.push(e)
@@ -121,36 +118,27 @@ export default {
       this.selectedData = v;
     },
 
-    btnSubmit(mergeType) {
-      let registerCheckIds = [];
-      let count = (mergeType == '+') ? 2 : 1
-      if (this.selectedData.length < count) {
-        this.$message.warning({ showClose: true, message: `请至少勾选 ${count} 个以上要${mergeType == '+' ? '合并' : '取消合并'}的检查项目！` });
+    btnSubmit() {
+      if (this.selectedData.length == 0) {
+        this.$message.warning({ showClose: true, message: `请勾选要发送收费申请的检查项目！` });
         return;
       }
+      let body = {
+        patientRegisterId: this.patientRegister.id,
+        registerCheckAsbitems: []
+      }
+
       this.selectedData.forEach(e => {
-        registerCheckIds.push(e.registerCheckId)
+        body.registerCheckAsbitems.push({ registerCheckAsbitemId: e.registerCheckAsbitemId })
       });
 
-      if (mergeType == '+') {
-        postapi("/api/app/registerasbitem/MergeRegisterAsbitem", { registerCheckIds }).then(
-          (res) => {
-            if (res.code != -1) {
-              console.log("操作成功！");
-              this.getAsbItemList(this.id);
-            }
-          }
-        );
-      } else {
-        postapi("/api/app/registerasbitem/cancelmergeregisterasbitem", { registerCheckIds }).then(
-          (res) => {
-            if (res.code != -1) {
-              console.log("操作成功！");
-              this.getAsbItemList(this.id);
-            }
+      postapi("/api/app/ChargeRequest/Create", body)
+        .then(res => {
+          if (res.code > -1) {
+            this.dataTransOpts.refresh.charge.S++
           }
-        );
-      }
+        });
+
     },
 
   },

src/components/patientRegister/PatientRegisterEdit.vue

@@ -403,7 +403,7 @@
           <el-button type="primary" class="commonbutton" @click="btnPayTypeFlag('2')">全免费</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '收费')" class="btn">
-          <el-button type="success" class="commonbutton" @click="toCharge(form)" :disabled="!form.id">收费</el-button>d
+          <el-button type="success" class="commonbutton" @click="toCharge(form)" :disabled="!form.id">收费</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs, '收费申请')" class="btn">
           <el-button type="success" class="commonbutton" @click="chargeRequest(form)" :disabled="!form.id">收费申请</el-button>