Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -1705,7 +1705,7 @@
           }
         }
 
-        return total.toFixed(24)
+        return total.toFixed(2)
       },
       createFilter(queryString) {
         return (restaurant) => {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -461,8 +461,8 @@
             scanStyles: false
           })
         }
-        
-        
+
+
         this.innerVisible = false
         // this.$nextTick(() => {
         //   this.$refs.print.printThisPage()

src/xt_pages/outpatientDoctorStation/prescriptionTemplate.vue

@@ -179,6 +179,7 @@
         this.limit = 10
         this.patient_id = val.id
         this.patient_name = val.name
+
         let params = {
           patient_id: val.id,
           page: this.page,

src/xt_pages/outpatientTool/components/settle.vue

@@ -1,127 +1,127 @@
 <template>
   <div>
-    <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
-      <div>
-        <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-        <!--@click="Action">-->
-        <!--导出-->
-        <!--</el-button>-->
-        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
-                  @keyup.enter.native='searchAction'
-                  placeholder="请输入患者姓名"
-
-                  class="filter-item"/>
-        <el-select size="small" v-model="item_type" placeholder="请选择"
-                   style="width:150px;margin-left:10px;" @change="changeItem">
-          <el-option
-            label="全部"
-            value="0">
-          </el-option>
-          <el-option
-            v-for="item,index in items"
-            :key="index"
-            :label="item.name"
-            :value="item.id">
-          </el-option>
-        </el-select>
-        <el-date-picker
-          v-model="chargeDate"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-          range-separator="至"
-          start-placeholder="开始日期"
-          @change="changeDate"
-          end-placeholder="结束日期">
-        </el-date-picker>
-        <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
-        <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+      <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
+          <div>
+              <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
+              <!--@click="Action">-->
+              <!--导出-->
+              <!--</el-button>-->
+              <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"
+                        @keyup.enter.native='searchAction'
+                        placeholder="请输入患者姓名"
+
+                        class="filter-item"/>
+              <el-select size="small" v-model="item_type" placeholder="请选择"
+                          style="width:150px;margin-left:10px;" @change="changeItem">
+                  <el-option
+                          label="全部"
+                          value="0">
+                  </el-option>
+                  <el-option
+                          v-for="item,index in items"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                  </el-option>
+              </el-select>
+              <el-date-picker
+                      v-model="chargeDate"
+                      type="daterange"
+                      value-format="yyyy-MM-dd"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      @change="changeDate"
+                      end-placeholder="结束日期">
+              </el-date-picker>
+              <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
+              <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
+          </div>
+          <div>
+              <!-- <el-popover
+                placement="bottom"
+                width="210"
+                trigger="click">
+                <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
+                <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
+                <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
+
+              </el-popover> -->
+              <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
+          </div>
       </div>
-      <div>
-        <!-- <el-popover
-          placement="bottom"
-          width="210"
-          trigger="click">
-          <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-          <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-          <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-        </el-popover> -->
-        <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
-      </div>
-    </div>
-    <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="report-table"
-              :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
-              show-summary
-              v-loading="settle_loading"
-              max-height="600"
-              :span-method="merge"
-              :summary-method="getTotal"
-              highlight-current-row>
-
-      <el-table-column align="center" prop="name" label="患者名字">
-        <template slot-scope="scope">{{ scope.row.other_name }}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="结算日期">
-        <template slot-scope="scope">
-          {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="item_name" label="结算类型">
-        <template slot-scope="scope">
-          <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
-          <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="处方类型">
-        <template slot-scope="scope">
-          <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
-          <div v-if="scope.row.med_type == '11'">普通门诊</div>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="医疗费总额">
-        <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="基金支付金额">
-        <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="个人账户支付金额">
-        <template slot-scope="scope">{{scope.row.acct_pay.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="个人支付金额">
-        <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(2)}}</template>
-      </el-table-column>
-      <el-table-column align="center" prop="item_name" label="基金统筹金额">
-        <template slot-scope="scope">{{scope.row.hifp_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="item_name" label="大额基金支付">
-        <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-
-      <el-table-column align="center" prop="item_name" label="医疗救助基金">
-        <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-      <el-table-column align="center" prop="item_name" label="企业补充医疗保险基金支出">
-        <template slot-scope="scope">{{scope.row.hifes_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-
-      <el-table-column align="center" prop="item_name" label="居民大病保险资金支出">
-        <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
-      </el-table-column>
-
-
-
-      <el-table-column align="center" prop="total" label="费用总额">
-        <template slot-scope="scope">
-          <div>{{scope.row.total.toFixed(2)}}</div>
-        </template>
-      </el-table-column>
-
-    </el-table>
+      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="report-table"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+                show-summary
+                v-loading="settle_loading"
+                max-height="600"
+                :span-method="merge"
+                :summary-method="getTotal"
+                highlight-current-row>
+
+          <el-table-column align="center" prop="name" label="患者名字">
+              <template slot-scope="scope">{{ scope.row.other_name }}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="结算日期">
+              <template slot-scope="scope">
+                  {{scope.row.setl_time?scope.row.setl_time.split(" ")[0]:getTimes(scope.row.settle_accounts_date)}}
+              </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="item_name" label="结算类型">
+              <template slot-scope="scope">
+                  <div v-if="scope.row.is_medicine_insurance == 0">自费</div>
+                  <div v-if="scope.row.is_medicine_insurance == 1">医保</div>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="处方类型">
+              <template slot-scope="scope">
+                  <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
+                  <div v-if="scope.row.med_type == '11'">普通门诊</div>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="医疗费总额">
+              <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(2)}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="基金支付金额">
+              <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(2)}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="个人账户支付金额">
+              <template slot-scope="scope">{{scope.row.acct_pay.toFixed(2)}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="个人支付金额">
+              <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(2)}}</template>
+          </el-table-column>
+          <el-table-column align="center" prop="item_name" label="基金统筹金额">
+              <template slot-scope="scope">{{scope.row.hifp_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="item_name" label="大额基金支付">
+              <template slot-scope="scope">{{scope.row.hifob_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+
+          <el-table-column align="center" prop="item_name" label="医疗救助基金">
+              <template slot-scope="scope">{{scope.row.maf_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="item_name" label="企业补充医疗保险基金支出">
+              <template slot-scope="scope">{{scope.row.hifes_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+
+          <el-table-column align="center" prop="item_name" label="居民大病保险资金支出">
+              <template slot-scope="scope">{{scope.row.hifmi_pay.toFixed(2)}}</template>
+          </el-table-column>
+
+
+
+          <el-table-column align="center" prop="total" label="费用总额">
+              <template slot-scope="scope">
+                  <div>{{scope.row.total.toFixed(2)}}</div>
+              </template>
+          </el-table-column>
+
+      </el-table>
   </div>
 </template>
 

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -155,7 +155,7 @@
                 <span v-if="getTotalCount(scope.row.admin_user_id)!=''">({{getTotalCount(scope.row.admin_user_id)}})</span>
               </template>
             </el-table-column>
-            
+
              <el-table-column label="下机" align="center">
               <template slot-scope="scope">
                 {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
@@ -164,7 +164,7 @@
 
             <el-table-column label="冲管" align="center">
               <template slot-scope="scope">
-                {{scope.row.finish_nuser_count?scope.row.finish_nuser_count:''}}
+                {{scope.row.washpipe_nuser_count?scope.row.washpipe_nuser_count:''}}
               </template>
             </el-table-column>