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/components/prescriptionTable.vue

@@ -68,49 +68,25 @@
 
       </el-table-column>
       <el-table-column align="center" prop="delivery_way" width="80" label="用法">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.delivery_way" placeholder="" readonly></el-input>-->
-          {{scope.row.delivery_way}}
-
-        </template>
+        <template slot-scope="scope">{{scope.row.delivery_way}}</template>
       </el-table-column>
       <el-table-column align="center" prop="execution_frequency" width="80" label="频率">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.execution_frequency" placeholder="" readonly></el-input>-->
-          {{scope.row.execution_frequency}}
-
-        </template>
+        <template slot-scope="scope">{{scope.row.execution_frequency}}</template>
       </el-table-column>
       <el-table-column align="center" prop="number_days" width="50" label="天数">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.number_days" placeholder="" readonly></el-input>-->
-          {{scope.row.number_days}}天
-
-        </template>
+        <template slot-scope="scope">{{scope.row.number_days}}天</template>
 
       </el-table-column>
       <el-table-column align="center" prop="total" width="50" label="总量">
         <template slot-scope="scope">
-          <div style="display:flex;">
-            <!--<el-input v-model="scope.row.total" placeholder="" readonly></el-input>-->
-            {{scope.row.total}} {{scope.row.unit}}
-
-          </div>
+          <div>{{scope.row.total}} {{scope.row.unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
-          {{scope.row.price}}元
-
-        </template>
+        <template slot-scope="scope">{{scope.row.price}}元</template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
-        <template slot-scope="scope">
-          <!--<el-input v-model="scope.row.remark" readonly></el-input>-->
-          {{scope.row.remark}}
-
-        </template>
+        <template slot-scope="scope">{{scope.row.remark}}</template>
       </el-table-column>
     </el-table>
 

src/xt_pages/outpatientCharges/listPrint.vue

@@ -17,7 +17,7 @@
       <printOne v-if="org_id != 10106 && this.paramsObj.balance_accounts_type != 2" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
       <!--<printThree v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printThree>-->
-      <print-three v-if="org_id == 0 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
+      <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
     </div>
   </div>
 </template>
@@ -58,7 +58,7 @@
     created() {
       this.getInfo(this.paramsObj.id)
       this.org_id = this.$store.getters.xt_user.org_id
-      if(this.org_id == 0){
+      if(this.org_id == 10106){
         if(this.paramsObj.balance_accounts_type == 2){
 
           this.getInfoPrivateExpenses10106(this.paramsObj.id)

src/xt_pages/outpatientCharges/newStatementPrintTwo.vue

@@ -85,29 +85,29 @@
         if(this.$store.getters.xt_user.org_id == 10138){
           setTimeout(() => {
             const style =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 48%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 48%;}}}';
             const style2 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 51%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 51%;}}}';
             const style3 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 55%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 55%;}}}';
             const style4 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 58%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 58%;}}}';
             const style5 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 61%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 61%;}}}';
             const style6 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 66%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 66%;}}}';
             const style7 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 71%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 71%;}}}';
             const style8 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 75%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 75%;}}}';
             const style9 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 80%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 80%;}}}';
             const style10 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 90%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 90%;}}}';
             const style11 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 91%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 91%;}}}';
             const style12 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 91%;}}}';
+            '@media print {#prescription-print{font-size:14px;border:1px solid white}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;font-size:16px;}@media print {html {zoom: 91%;}}}';
             if(this.num >= 13){
               printJS({
                 printable: "prescription-print",

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -2702,7 +2702,7 @@
                   delivery_way: temp2[b].delivery_way,
                   execution_frequency: temp2[b].execution_frequency,
                   number_days: temp2[b].number_days.toString(),
-                  total: 1,
+                  total:  temp2[b].cus_total,
                   price: temp2[b].price,
                   remark: '',
                   medical_code: temp2[b].medical_code,
@@ -2754,6 +2754,7 @@
                 number_days: project[i].number_days,
                 price: project[i].price,
                 medical_code: project[i].medical_code,
+                cus_total:1,
                 unit: project[i].unit,
                 type: 2,
                 total:project[i].total
@@ -2773,6 +2774,7 @@
                 delivery_way: '',
                 execution_frequency: '',
                 number_days: 1,
+                cus_total:1,
                 price: good_info[i].packing_price,
                 medical_code: good_info[i].medical_insurance_number,
                 unit: this.getGoodUnit(good_info[i].good_unit),
@@ -2866,7 +2868,7 @@
                   delivery_way: project[i].project.delivery_way,
                   execution_frequency: project[i].project.execution_frequency,
                   number_days: project[i].project.number_days,
-                  total: project[i].number,
+                  cus_total:project[i].number,
                   price: project[i].project.price,
                   remark: '',
                   medical_code: project[i].project.medical_code,
@@ -2887,15 +2889,15 @@
                   delivery_way: '',
                   execution_frequency: '',
                   number_days: '',
-                  total: project[i].number,
+                  cus_total: project[i].number,
                   price: project[i].good_info.retail_price,
                   remark: '',
                   medical_code: project[i].good_info.medical_insurance_number,
                   unit: project[i].good_info.unit,
                   type: project[i].type
                 }
-                if (obj.total == 0 || obj.total == undefined) {
-                  obj.total = 1
+                if (obj.cus_total == 0 || obj.cus_total == undefined) {
+                  obj.cus_total = 1
                 }
                 this.teamList.push(obj)
 

src/xt_pages/outpatientDoctorStation/print.vue

@@ -78,7 +78,7 @@ export default {
       if(this.org_id == 10138){
         setTimeout(() => {
           const style =
-          '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
           printJS({
             printable: "prescriptionPrint1",
             type: "html",

src/xt_pages/outpatientDoctorStation/treatPrint.vue

@@ -68,7 +68,7 @@ export default {
       if(this.org_id == 10138){
         setTimeout(() => {
           const style =
-          '@media print {#prescription-print{font-size:14px;}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
+          '@media print {#prescription-print{font-size:14px;border:1px solid white}.prescription-print:last-child {page-break-after: auto;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;margin-bottom: 10px;}.infoTitle{display: flex;margin-top:10px;}.infoTitle div{width: 200px;}.infoMain{display: flex;flex-wrap: wrap;margin-top:10px;}.infoMain div{width: 50%;line-height: 24px;}.prescriptionBox{min-height:350px;}.Rp{font-size: 18px;font-weight: bold;}.drugsBox{padding-left: 40px;margin-bottom: 10px;}.drugsBox div{line-height: 20px;}.drugsOne{line-height: 24px;}.drugsOne span{margin-right: 20px;}.doctorBox{display: flex;justify-content: space-between;padding:0 10px;line-height: 24px;border-bottom: 2px solid #000;}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar p{width:150px;}.under_line{display: inline-block;border-bottom: 1px solid #000;flex: 1;}@media print {html {zoom: 90%;}}}';
           printJS({
             printable: "prescriptionPrint2",
             type: "html",