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/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;}@media print {html {zoom: 49%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 49%;}}}';
             const style2 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 52%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 52%;}}}';
             const style3 =
-            '@media print {#prescription-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 55%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 58%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 61%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 66%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 71%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 75%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 80%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 90%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 91%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@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;}@media print {html {zoom: 91%;}}}';
+            '@media print {#prescription-print{font-size:16px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}table td {padding: 10px 5px;}@media print {html {zoom: 91%;}}}';
             if(this.num >= 13){
               printJS({
                 printable: "prescription-print",
@@ -378,13 +378,18 @@
                         }
                       }
                       that.info.new_detail_list.push(obj)
-                      let num = 0
-                      that.info.new_detail_list.map(item => {
-                        num++
-                      })
-                      that.num = num
-                      console.log('this.num222',that.num)
+                      
                     }
+                    let num = 0
+                    that.info.new_detail_list.map(item => {
+                      if(item.details.length > 0){
+                        item.details.map(it => {
+                          num++
+                        })
+                      }
+                    })
+                    that.num = num
+                    console.log('this.num222',that.num)
 
                   }
                 }

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

@@ -24,9 +24,9 @@
                   <tr>
                       <td width="70">类别</td>
                       <td>项目</td>
-                      <td width="180">规格</td>
-                      <td width="50">单位</td>
-                      <td width="50">数量</td>
+                      <td min-width="180" style="min-width:60px;">规格</td>
+                      <td width="40">单位</td>
+                      <td width="40">数量</td>
                       <td width="60">单价</td>
                       <td width="70">总额</td>
                       <td width="130">小计</td>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -122,13 +122,16 @@
                 :rules="tableRules.warehousing_count"
                 style="padding-top: 20px"
               >
+              <div style="display:flex;">
                 <el-input
                   placeholder="请输入入库数量"
                   type="number"
                   v-model="scope.row.warehousing_count"
                 ></el-input>
-                {{scope.row.max_unit}}
+                 {{scope.row.max_unit}}
+              </div>
               </el-form-item>
+             
             </template>
           </el-table-column>