Merge remote-tracking branch 'origin/master'

src/views/financial-management/payment-management/components/settlement-modle.vue

@@ -22,7 +22,7 @@
         <el-col :span="8">
           <el-form-item label="标准价格">
             <div style="display: flex;align-items: center;">
-              <el-input v-model="settlementForm.standardAmountShow" placeholder="0.00" disabled />
+              <el-input v-model="settlementForm.standardAmountShow" placeholder="-" disabled />
               <span class="unit-text">元</span>
             </div>
           </el-form-item>

src/views/financial-management/payment-management/payment-detail.vue

@@ -370,7 +370,7 @@ color: #333333;"
                       <!--挂号时间-->
                       <el-form-item label="标准价格">
                         <div style="display: flex;align-items: center;">
-                          <el-input v-model="rowData.payAmountShow" placeholder="0" disabled />
+                          <el-input v-model="rowData.payAmountShow" placeholder="-" disabled />
                           <span class="unit-text">元</span>
                         </div>
                       </el-form-item>
@@ -544,7 +544,7 @@ color: #333333;"
                     </el-table-column>
                     <el-table-column align="left" label="标准价格" prop="standardAmount" show-overflow-tooltip>
                       <template slot-scope="scope">
-                        {{ scope.row.standardAmount ? (moneyFormat(scope.row.standardAmount) + ' 元') : '0.00 元' }}
+                        {{ scope.row.standardAmount || scope.row.standardAmount === 0  ? (moneyFormat(scope.row.standardAmount) + ' 元') : '-' }}
                       </template>
                     </el-table-column>
                     <el-table-column align="left" label="支付金额" prop="paymentAmount" show-overflow-tooltip>

src/views/financial-management/payment-management/payment-single-detail.vue

@@ -379,7 +379,7 @@ color: #333333;"
                     <!--挂号时间-->
                     <el-form-item label="标准价格">
                       <div style="display: flex;align-items: center;">
-                        <el-input v-model="singleData.standardAmountShow" placeholder="0.00" disabled />
+                        <el-input v-model="singleData.standardAmountShow" placeholder="-" disabled />
                         <span class="unit-text">元</span>
                       </div>
                     </el-form-item>

src/views/financial-management/revenue-management/components/refund-modle.vue

@@ -41,7 +41,7 @@
           <el-col v-if="deptLevel === '2'" :span="8">
             <el-form-item label="标准价格">
               <div style="display: flex;align-items: center;">
-                <el-input v-model="refundForm.standardAmountShow" placeholder="0.00" disabled />
+                <el-input v-model="refundForm.standardAmountShow" placeholder="-" disabled />
                 <span class="unit-text">元</span>
               </div>
             </el-form-item>
@@ -219,6 +219,12 @@ export default {
       this.refundForm['refundAmountShow'] = moneyFormat(this.refundForm.paymentAmount) // 默认是支付金额 住院押金取最后一条
       this.refundForm['amountAfterTradeShow'] = moneyFormat(this.refundForm.amountAfterTrade)
       this.refundForm['numberShow'] = this.refundForm.number ? `x${this.refundForm.number}` : '-'
+      if (val.tradeType === '10') {
+        //  医院预储值的退费，退费金额，支付金额与医院余额（currentBalance）相比较，余额大于支付金额取支付金额，余额小于支付金额取余额，方式现结，退费后余额是所属医院的账户的余额-退费金额（前端计算）
+        const temp = this.refundForm.paymentAmount > this.refundForm.currentBalance ? this.refundForm.currentBalance : this.refundForm.paymentAmount
+        this.refundForm['refundAmountShow'] = moneyFormat(temp) // 默认是支付金额 住院押金取最后一条
+        this.refundForm['amountAfterTradeShow'] = moneyFormat(this.refundForm.currentBalance - temp)
+      }
       if (val.tradeType === '7') {
         // 住院押金显示列表 且 应退金额为列表最后一条数据的amountAfterTrade
         // 押金列表
@@ -239,6 +245,11 @@ export default {
         }).catch(err => {
           console.log('押金列表返回值Err', err)
         })
+      } else if (val.tradeType === '10') {
+        //  医院预储值的退费，退费金额，支付金额与医院余额（currentBalance）相比较，余额大于支付金额取支付金额，余额小于支付金额取余额，方式现结，退费后余额是所属医院的账户的余额-退费金额（前端计算）
+        const temp = this.refundForm.paymentAmount > this.refundForm.currentBalance ? this.refundForm.currentBalance : this.refundForm.paymentAmount
+        this.refundForm['refundAmountShow'] = moneyFormat(temp) // 默认是支付金额 住院押金取最后一条
+        this.refundForm['amountAfterTradeShow'] = moneyFormat(this.refundForm.currentBalance - temp)
       } else {
         this.refundForm['refundAmount'] = val.paymentAmount
       }

src/views/financial-management/revenue-management/revenue-detail.vue

@@ -69,7 +69,7 @@ color: #333333;"
                     <el-col v-if="deptLevel === '2'" :span="8">
                       <el-form-item label="标准价格">
                         <div style="display: flex;align-items: center;">
-                          <el-input v-model="rowData.standardAmountShow" placeholder="0.00" disabled />
+                          <el-input v-model="rowData.standardAmountShow" placeholder="-" disabled />
                           <div :class="['unit-text', showPlus ]">元{{ rowData.standardAmountExport }}</div>
                         </div>
                       </el-form-item>

src/views/financial-management/revenue-management/revenue-management.vue

@@ -127,7 +127,7 @@
         </el-table-column>
         <el-table-column v-if="deptLevel === '2'" align="left" label="标准价格" min-width="70" prop="standardAmountExport" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span>{{ scope.row.standardAmount ? moneyFormat(scope.row.standardAmount)+ ' 元'+ scope.row.standardAmountExport : '0.00 元' }}</span>
+            <span>{{ scope.row.standardAmount || scope.row.standardAmount ===0 ? moneyFormat(scope.row.standardAmount)+ ' 元'+ scope.row.standardAmountExport : '-' }}</span>
           </template>
         </el-table-column>
         <el-table-column align="left" label="支付金额" min-width="70" prop="paymentAmount" show-overflow-tooltip>

src/views/inventory-management/drug-delivery-management/drug-delivery-management.vue

@@ -68,13 +68,13 @@
           <svg-icon style="margin-right: 1px" icon-class="shaixuan_icon_daochu" />
           批量导出
         </el-button>
-        <el-button
-          class="fourWordsBtn"
-          icon="el-icon-plus"
-          :disabled="multiple"
-          @click="bulkDelivery"
-        >办理出库
-        </el-button>
+<!--        <el-button-->
+<!--          class="fourWordsBtn"-->
+<!--          icon="el-icon-plus"-->
+<!--          :disabled="multiple"-->
+<!--          @click="bulkDelivery"-->
+<!--        >办理出库-->
+<!--        </el-button>-->
       </el-col>
       <el-col :span="12" style="padding-bottom: 20px;text-align: end;">
         <el-button class="queryBtn" icon="el-icon-search" @click="handleQuery">查询</el-button>