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/allListPrint.vue

               if (new_drug_ids[i].id == details[a].advice.drug_id && new_drug_ids[i].price == details[a].advice.price) {
                 obj['name'] = details[a].advice.advice_name
                 obj['spec'] = details[a].advice.drug.drug_spec
+                obj['unit'] = details[a].advice.drug.max_unit
+
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
               if (new_project_ids[i].id == details[a].project.project_id && new_project_ids[i].price == details[a].project.price) {
                 obj['name'] = details[a].project.project.project_name
                 obj['spec'] = '1'
+                obj['unit'] = details[a].project.project.unit
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
                 obj['is_total'] = 2
       printThisPage() {
 
         const style =
-          '@media print {.allListTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+          '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
         printJS({
           printable: 'allList-print',
           type: 'html',

src/xt_pages/outpatientCharges/allListTemplate/printOne.vue

 <template>
     <div id="allList-print" class="allList-print">
         <div v-for='(i,index) in pageArr.length' :key="index">
-            <div class="allListTitle">翁源沅胜透析中心费用汇总</div>
+            <div class="allListTitle">{{$store.getters.xt_user.org.org_name}}费用汇总</div>
             <div class="allListInfo">
             <div>患者姓名：{{patient.name}}</div>
             <div>透析号：{{patient.dialysis_no}}</div>
                     <td style="width:10%">数量</td>
                     <td style="width:10%">金额(元)</td>
                 </tr>
-                <template v-for='item in list.slice(index * 13,(index * 14) + pageArr[index])'>
+                <template v-for='item in list.slice(index * 13,(index * 13) + 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.count}}{{item.unit}}</td>
                         <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
                     </tr>
                     <tr>
         }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++){ 
+            for (var i=0;i<this.page;i++){
                 this.pageArr.push(13)
             }
             if(num != 0){
     padding:20px 10px;
 }
 .allListTitle{
-    font-size: 28px;
+    font-size: 24px;
     text-align: center;
     font-weight: bold;
     margin-bottom: 10px;
     text-align: center;
     border-collapse: collapse;
     line-height: 40px;
-    font-size: 16px;
+    font-size: 14px;
     border-color: #000;
     text-align: left;
 }

src/xt_pages/outpatientCharges/listPrint.vue

                 obj['p_time'] = this.getTimes(infos.project.prescription.ctime)
                 obj['name'] = infos.project.project.project_name
                 obj['spec'] = 1
+                obj['unit'] = infos.project.project.unit
+
               }
 
               if (infos.advice && infos.advice.id > 0 && infos.project && infos.project.id == 0) {
                 obj['p_time'] = this.getTimes(infos.advice.prescription.ctime)
                 obj['name'] = infos.advice.advice_name
                 obj['spec'] = infos.advice.drug.drug_spec
+                obj['unit'] = infos.advice.drug.max_unit
+
               }
               this.list.push(obj)
               this.list.sort(function(a, b) {
       printThisPage() {
 
         const style =
-          '@media print {.listTitle{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 16px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
+          '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
         printJS({
           printable: 'list-print',
           type: 'html',

src/xt_pages/outpatientCharges/listTemplate/printOne.vue

 <template>
     <div id="list-print" class="list-print">
         <div v-for='(i,index) in pageArr.length' :key="index">
-        <div class="listTitle">翁源沅胜透析中心费用清单</div>
+        <div class="listTitle">{{$store.getters.xt_user.org.org_name}}费用清单</div>
         <div class="listInfo">
 
             <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-if="order.settle_type == 1">收费日期：{{getTimes(order.settle_accounts_date)}}</div>
+          <div v-if="order.settle_type == 2">收费日期：{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
+
 
         </div>
         <table class="listTable" border="1">
                 <td style="width:6%">数量</td>
                 <td style="width:10%">金额(元)</td>
             </tr>
-            <tr v-for="item in list.slice(index * 13,(index * 14) + pageArr[index])">
+            <tr v-for="item in list.slice(index * 13,(index * 13) + pageArr[index])">
                 <td style="width:19%">{{item.p_time}}</td>
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
                 <td style="width:31%">{{item.name}}</td>
                 <td style="width:14%">{{item.spec}}</td>
                 <td style="width:10%">{{(item.price).toFixed(2)}}</td>
-                <td style="width:6%">{{item.count}}</td>
+                <td style="width:6%">{{item.count}}{{item.unit}}</td>
                 <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
             </tr>
         </table>
     padding:20px 10px;
 }
 .listTitle{
-    font-size: 28px;
+    font-size: 24px;
     text-align: center;
     font-weight: bold;
     margin-bottom: 10px;
     text-align: center;
     border-collapse: collapse;
     line-height: 40px;
-    font-size: 16px;
+    font-size: 14px;
     border-color: #000;
     text-align: left;
 }

src/xt_pages/outpatientRegistration/registrationHistory.vue

                 </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.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" :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.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" @click="open(scope.row)">详情</el-button>