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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -29,8 +29,7 @@
           </el-radio-group>
         </div>
         <div class="mainCell" style="margin-bottom:10px;">
-          <el-input size="small" v-model="key" class="filter-item"/>
-
+          <!--<el-input size="small" v-model="key" class="filter-item"/>-->
           <el-input size="small" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
           <el-button size="small" style="margin-left:10px;" class="filter-item" type="primary" @click="searchAction">
             搜索
@@ -87,20 +86,20 @@
           <!--&gt;退号-->
           <!--</el-button>-->
 
-          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
-                     size="small" @click="open(11)" type="primary"
-          >撤销明细
-          </el-button>
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
+                     <!--size="small" @click="open(11)" type="primary"-->
+          <!--&gt;撤销明细-->
+          <!--</el-button>-->
 
 
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->
           <!--&gt;查编码-->
           <!--</el-button>-->
 
-          <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
-                     size="small" @click="open(13)" type="primary"
-          >查待遇
-          </el-button>
+          <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"-->
+                     <!--size="small" @click="open(13)" type="primary"-->
+          <!--&gt;查待遇-->
+          <!--</el-button>-->
 
 
         </div>
@@ -179,61 +178,61 @@
                 </div>
               </div>
             </el-tab-pane>
-            <!--<el-tab-pane label="月结" name="second">-->
-            <!--<div style="display:flex;height:100%;">-->
-            <!--<div class="centerLeft">-->
-            <!--<div class="tabsBox">-->
-            <!--&lt;!&ndash;<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>&ndash;&gt;-->
-            <!--<el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>-->
-
-            <!--<el-tab-pane-->
-            <!--v-for="(item, index) in month_prescriptions"-->
-            <!--:key="index"-->
-            <!--:label="item.name"-->
-            <!--:name="item.name"-->
-            <!--&gt;-->
-            <!--</el-tab-pane>-->
-
-            <!--<div class="RP">-->
-            <!--Rp-->
-            <!--<el-date-picker-->
-            <!--v-model="other_start_time"-->
-            <!--prefix-icon="el-icon-date"-->
-            <!--@change="changeTime"-->
-            <!--:editable="false"-->
-            <!--style="width: 150px;"-->
-            <!--type="date"-->
-            <!--:picker-options="pickerOptions"-->
-            <!--placeholder="选择开始时间"-->
-            <!--align="right"-->
-            <!--format="yyyy-MM-dd"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--&gt;</el-date-picker>-->
-            <!--<span class>-</span>-->
-            <!--<el-date-picker-->
-            <!--v-model="other_end_time"-->
-            <!--prefix-icon="el-icon-date"-->
-            <!--@change="changeEndTime"-->
-            <!--:editable="false"-->
-            <!--style="width: 150px;"-->
-            <!--type="date"-->
-            <!--placeholder="选择结束时间"-->
-            <!--align="right"-->
-            <!--format="yyyy-MM-dd"-->
-            <!--value-format="yyyy-MM-dd"-->
-            <!--&gt;</el-date-picker>-->
-            <!--</div>-->
-            <!--&lt;!&ndash;<prescription-table :preTableData='preTableData'></prescription-table>&ndash;&gt;-->
-            <!--</el-tabs>-->
+            <el-tab-pane label="月结" name="second">
+            <div style="display:flex;height:100%;">
+            <div class="centerLeft">
+            <div class="tabsBox">
+            <!--<el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button>-->
+            <el-tabs class="preTabs" v-model="editableTabsValue" type="card" closable>
+
+            <el-tab-pane
+            v-for="(item, index) in month_prescriptions"
+            :key="index"
+            :label="item.name"
+            :name="item.name"
+            >
+            </el-tab-pane>
 
+            <div class="RP">
+            Rp
+            <el-date-picker
+            v-model="other_start_time"
+            prefix-icon="el-icon-date"
+            @change="changeTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            :picker-options="pickerOptions"
+            placeholder="选择开始时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            ></el-date-picker>
+            <span class>-</span>
+            <el-date-picker
+            v-model="other_end_time"
+            prefix-icon="el-icon-date"
+            @change="changeEndTime"
+            :editable="false"
+            style="width: 150px;"
+            type="date"
+            placeholder="选择结束时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            ></el-date-picker>
+            </div>
+            <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
+            </el-tabs>
+
+            </div>
+            <!--<div class="costBox">-->
+            <!--<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>-->
+            <!--<span>{{ state }}</span>-->
             <!--</div>-->
-            <!--&lt;!&ndash;<div class="costBox">&ndash;&gt;-->
-            <!--&lt;!&ndash;<span>当前处方总费用：<span style="color:red;">{{ total }}元</span></span>&ndash;&gt;-->
-            <!--&lt;!&ndash;<span>{{ state }}</span>&ndash;&gt;-->
-            <!--&lt;!&ndash;</div>&ndash;&gt;-->
-            <!--</div>-->
-            <!--</div>-->
-            <!--</el-tab-pane>-->
+            </div>
+            </div>
+            </el-tab-pane>
           </el-tabs>
 
 

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -150,7 +150,7 @@ export default {
 
     },
     getInfo(order_id) {
-      if (this.$store.getters.xt_user.org_id == 4) {
+      if (this.$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919) {
 
         var that = this
 

src/xt_pages/outpatientCharges/statementTemplate/printOne.vue

@@ -186,9 +186,9 @@
             </tr>
             <tr>
                 <td>合计</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_total + info.operation_cost_total + info.other_cost_total + info.material_cost_total + info.western_medicine_cost_total + info.chinese_traditional_medicine_cost_total + info.check_cost_total + info.laboratory_cost_total + info.treat_cost_total}}</td>
-                <td style="text-align:right;padding-right:10px;">{{info.bed_cost_self_total + info.operation_cost_self_total + info.other_cost_self_total + info.material_cost_self_total + info.western_medicine_cost_self_total + info.chinese_traditional_medicine_cost_self_total + info.check_cost_self_total + info.laboratory_cost_self_total + info.treat_cost_self_total}}</td>
-                <td colspan="2" style="text-align:right;padding-right:10px;">{{info.bed_cost_part_self_total + info.operation_cost_part_self_total + info.other_cost_part_self_total + info.material_cost_part_self_total + info.western_medicine_cost_part_self_total + info.chinese_traditional_medicine_cost_part_self_total + info.check_cost_part_self_total + info.laboratory_cost_part_self_total + info.treat_cost_part_self_total}}</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_total + info.operation_cost_total + info.other_cost_total + info.material_cost_total + info.western_medicine_cost_total + info.chinese_traditional_medicine_cost_total + info.check_cost_total + info.laboratory_cost_total + info.treat_cost_total) * 100 /100 }}</td>
+                <td style="text-align:right;padding-right:10px;">{{(info.bed_cost_self_total + info.operation_cost_self_total + info.other_cost_self_total + info.material_cost_self_total + info.western_medicine_cost_self_total + info.chinese_traditional_medicine_cost_self_total + info.check_cost_self_total + info.laboratory_cost_self_total + info.treat_cost_self_total)*100/100}}</td>
+                <td colspan="2" style="text-align:right;padding-right:10px;">{{(info.bed_cost_part_self_total + info.operation_cost_part_self_total + info.other_cost_part_self_total + info.material_cost_part_self_total + info.western_medicine_cost_part_self_total + info.chinese_traditional_medicine_cost_part_self_total + info.check_cost_part_self_total + info.laboratory_cost_part_self_total + info.treat_cost_part_self_total)*100/100}}</td>
                 <td style="text-align:right;padding-right:10px;"></td>
                 <td colspan="2" style="text-align:right;padding-right:10px;"></td>
                 <td style="text-align:right;padding-right:10px;"></td>

src/xt_pages/outpatientDoctorStation/components/callPrescription.vue

@@ -276,7 +276,7 @@
                 delivery_way: prescription.project[b].delivery_way,
                 execution_frequency: prescription.project[b].execution_frequency,
                 number_days: prescription.project[b].day,
-                total:prescription.project[b].count.toString(),
+                total:prescription.project[b].count,
                 price:prescription.project[b].price,
                 remark:prescription.project[b].remark,
                 medical_code:prescription.project[b].project.medical_code,
@@ -288,6 +288,7 @@
               advices: tempAdvice,
               project: tempProject,
               addition:tempAddition,
+              type:prescription.type,
               order_status:0,
             }
             prescriptions.push(obj)

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -85,8 +85,8 @@
                 v-model="item.pre_time"
                 type="datetime"
                 :clearable="false"
-                format="yyyy-MM-dd hh:mm"
-                value-format="yyyy-MM-dd hh:mm"
+                format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm"
                 placeholder="选择日期">
               </el-date-picker>
               <div style="float: right;margin-bottom:5px;margin-right:1%;">
@@ -105,12 +105,12 @@
                 </el-button>
               </div>
             </div>
-              
+
 
             </el-tab-pane>
             <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
             </el-tab-pane>
-            
+
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
           </el-tabs>