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/allListTemplate/printOne.vue

@@ -1,41 +1,43 @@
 <template>
     <div id="allList-print" class="allList-print">
-        <div class="allListTitle">翁源沅胜透析中心费用汇总</div>
-        <div class="allListInfo">
-          <div>患者姓名：{{patient.name}}</div>
-          <div>透析号：{{patient.dialysis_no}}</div>
-          <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
-          <div>年龄：{{patient.age}}  岁</div>
-          <div>日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
+        <div v-for='(i,index) in pageArr.length' :key="index">
+            <div class="allListTitle">翁源沅胜透析中心费用汇总</div>
+            <div class="allListInfo">
+            <div>患者姓名：{{patient.name}}</div>
+            <div>透析号：{{patient.dialysis_no}}</div>
+            <div>性别：{{patient.gender == 1 ? '男': '女'}}</div>
+            <div>年龄：{{patient.age}}  岁</div>
+            <div>日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
 
-        </div>
-        <table class="allListTable" border="1">
-            <tr>
-                <td style="width:10%">类别</td>
-                <td style="width:50%">项目名称</td>
-                <td style="width:10%">规格</td>
-                <td style="width:10%">单价(元)</td>
-                <td style="width:10%">数量</td>
-                <td style="width:10%">金额(元)</td>
-            </tr>
-            <template v-for='item in list'>
-                <tr v-if="item.is_total == 2">
-                    <td style="width:10%">{{item.med_chrgitm_type}}</td>
-                    <td style="width:50%">{{item.name}}</td>
-                    <td style="width:10%">{{item.spec}}</td>
-                    <td style="width:10%">{{(item.price).toFixed(2)}}</td>
-                    <td style="width:10%">{{item.count}}</td>
-                    <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
-                </tr>
+            </div>
+            <table class="allListTable" border="1">
                 <tr>
-                    <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{item.total}}元</td>
+                    <td style="width:10%">类别</td>
+                    <td style="width:50%">项目名称</td>
+                    <td style="width:10%">规格</td>
+                    <td style="width:10%">单价(元)</td>
+                    <td style="width:10%">数量</td>
+                    <td style="width:10%">金额(元)</td>
                 </tr>
-            </template>
-        </table>
-        <div class="tableBottom">
-          <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
-          <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
-          <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+                <template v-for='item in list.slice(index * 13,(index * 14) + pageArr[index])'>
+                    <tr v-if="item.is_total == 2">
+                        <td style="width:10%">{{item.med_chrgitm_type}}</td>
+                        <td style="width:50%">{{item.name}}</td>
+                        <td style="width:10%">{{item.spec}}</td>
+                        <td style="width:10%">{{(item.price).toFixed(2)}}</td>
+                        <td style="width:10%">{{item.count}}</td>
+                        <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
+                    </tr>
+                    <tr>
+                        <td colspan="6" style="text-align:right;" v-if="item.is_total == 1">合计：{{item.total}}元</td>
+                    </tr>
+                </template>
+            </table>
+            <div class="tableBottom">
+            <div class="tableBottomOne">制表人：{{admin.user_name}}</div>
+            <div class="tableBottomOne">制表日期：{{ getNowTime()}}</div>
+            <div class="tableBottomOne">总费用：{{order.medfee_sumamt}}元</div>
+            </div>
         </div>
     </div>
 </template>
@@ -66,7 +68,14 @@
           return {};
         }
       },
-    },methods:{
+    },
+    data(){
+        return{
+            page:1,
+            pageArr:[],
+        }
+    },
+    methods:{
       getNowTime: function () {
         let dateTime
         let yy = new Date().getFullYear()
@@ -91,8 +100,31 @@
         }
         return total
 
+      },
+      getPage(){
+        if(this.list.length <= 13){
+            this.page = 1
+            this.pageArr.push(this.list.length)
+        }else if(this.list.length > 13){
+            this.page = parseInt(this.list.length / 13)
+            let num = this.list.length % 13
+            for (var i=0;i<this.page;i++){ 
+                this.pageArr.push(13)
+            }
+            if(num != 0){
+                this.pageArr.push(num)
+            }
+        }
       }
 
+    },
+    watch:{
+        list: {
+            handler(newVal) {
+                this.getPage()
+            },
+            deep: true
+        }
     }
   }
 

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -412,6 +412,8 @@
         }
         let params = {
           'id_card_type': this.form.id_card_type,
+          'admin_user_id':this.$store.getters.xt_user.user.id,
+
         }
         axios.get('http://127.0.0.1:9532/api/sscard', {
           params: params

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1897,10 +1897,7 @@
           project: projects,
           advices: [],
           addition: []
-
         }
-        console.log(this.month_prescriptions)
-        console.log(this.curMonthPrescriptions)
 
         this.month_prescriptions.push(p1)
         this.month_prescriptions.push(p2)

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -157,6 +157,8 @@ export default {
         axios.get('http://127.0.0.1:9532/api/settle/query', {
           params: {
             order_id: order_id,
+            admin_user_id:this.$store.getters.xt_user.user.id,
+
           }
         })
           .then(function (response) {

src/xt_pages/outpatientRegistration/registrationHistory.vue

@@ -102,10 +102,10 @@
                 </el-table-column>
                 <el-table-column align="center" prop="name" label="操作" width="180">
                     <template slot-scope="scope">
-                      <el-button size="mini" type="primary" v-if="scope.row.record_date < startUnix" :disabled="true">已过号</el-button> 
-                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix" @click ="toReturnPatient(scope.row.id)">退号</el-button> 
+                      <el-button size="mini" type="primary" v-if=" scope.row.order.order_status == 0 && scope.row.record_date < startUnix" :disabled="true">已过号</el-button>
+                      <el-button size="mini" type="primary" v-if="scope.row.is_return == 1 && scope.row.record_date >= startUnix && scope.row.order.order_status != 2" @click ="toReturnPatient(scope.row.id)">退号</el-button>
                       <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 2" :disabled="true">已退号</el-button>
-                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>  
+                      <el-button size="mini" type="primary" v-if="scope.row.record_date == startUnix && scope.row.is_return == 3" :disabled="true">已就诊</el-button>
                       <el-button size="mini" type="primary" @click="open(scope.row)">详情</el-button>
                     </template>
                 </el-table-column>
@@ -187,11 +187,11 @@
                     <el-form-item label="科室："  prop="department" :validate-event="is_Name">
                       <div>{{ getDepartMent(form.departments) }}</div>
                     </el-form-item>
-                    <!-- <el-form-item label="是否需要工本费："> 
+                    <!-- <el-form-item label="是否需要工本费：">
                       <div v-if="form.is_need_cost_of_production == 1">是</div>
                       <div v-else>否</div>
                     </el-form-item> -->
-                    
+
                     <el-form-item label="挂号费：">
                       <div>{{ form.register_cost }}</div>
                     </el-form-item>
@@ -297,7 +297,7 @@ export default {
               value: 6,
               label: "港澳地区身份证"
             }],
-            settlement: 
+            settlement:
             [
               {value: 1,label: '医保'},
               {value: 2,label: '自费'},
@@ -346,7 +346,7 @@ export default {
               value: 5,
               label: "专家"
             }],
-            
+
             tablePatient:[],
             creator:"",
             startUnix:'',
@@ -364,16 +364,16 @@ export default {
         //         item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
         //         arr.push(item)
         //     }
-            
+
         // })
         // this.tableData = arr
        //获取所有挂号号的患者
 
        this.creator = this.$store.getters.xt_user.user.user_name
        var today = moment().startOf('day').format('YYYY-MM-DD')
-       var todayUnix = Date.parse(today)/1000 
+       var todayUnix = Date.parse(today)/1000
        this.startUnix = todayUnix - 28800
-      
+
        this.getlist()
        this.getDictionaryDataConfig()
     },
@@ -444,7 +444,7 @@ export default {
                 this.doctorList = doctor
              }
           })
- 
+
         },
         getDepartMent(id){
           var name = ""
@@ -459,7 +459,7 @@ export default {
           var user_name = ""
           for(let i=0;i<this.doctorList.length;i++){
             if(id == this.doctorList[i].admin_user_id){
-               user_name = this.doctorList[i].user_name 
+               user_name = this.doctorList[i].user_name
             }
           }
           return user_name
@@ -504,7 +504,7 @@ export default {
           key = keyword
         }
         let searchArray = []
-       
+
         var params = {
            keyword:key
         }
@@ -519,7 +519,7 @@ export default {
         return searchArray
       },
 
-      handleSelect(val){   
+      handleSelect(val){
         this.search_input = val.name
         this.getlist()
       },
@@ -585,7 +585,7 @@ export default {
         })
         return str
       },
-      
+
       getBanlance(id){
         var label = ""
          for(let i=0;i<this.settlement.length;i++){