Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 2022-10-17_vue_schedule_branch

src/api/stock.js

@@ -1072,3 +1072,19 @@ export function getwarehouseinfolist(params) {
     params: params
   })
 }
+
+export function getNewGoodWarehouseInfo(params) {
+  return request({
+    url: '/api/stock/getnewgoodwarehouseinfo',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getNewWarehouseOutInfoList(params) {
+  return request({
+    url: '/api/stock/getnewwarehouseoutinfolist',
+    method: 'Get',
+    params: params
+  })
+}

src/router/modules/dialysis.js

@@ -68,17 +68,17 @@ export default {
       }
     },
 
-    {
-      path: '/dialysis/doctorAdviceStaticPrint',
-      component: () => import('@/xt_pages/dialysis/doctorAdviceStaticPrint'),
-      name: '透析医嘱统计打印',
-      hidden: true,
-      is_menu: false,
-      meta: {
-        title: '透析医嘱统计打印',
-        noCache: true
-      }
-    },
+    // {
+    //   path: '/dialysis/doctorAdviceStaticPrint',
+    //   component: () => import('@/xt_pages/dialysis/doctorAdviceStaticPrint'),
+    //   name: '透析医嘱统计打印',
+    //   hidden: true,
+    //   is_menu: false,
+    //   meta: {
+    //     title: '透析医嘱统计打印',
+    //     noCache: true
+    //   }
+    // },
 
     {
       path: '/dialysis/signPrint',
@@ -503,18 +503,18 @@ export default {
         noCache: true
       }
     },
-    // {
-    //   path: '/dialysis/print/batch/twentySeven',
-    //   component: () =>
-    //   import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
-    //   hidden: true,
-    //   is_menu: false,
-    //   name: 'dialysis_batch_twentySeven',
-    //   meta: {
-    //     title: '批量打印',
-    //     noCache: true
-    //   }
-    // },
+    {
+      path: '/dialysis/print/batch/twentySeven',
+      component: () =>
+      import('@/xt_pages/dialysis/batch_print/batch_print_order_twentySeven'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentySeven',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twentyEight',
       component: () =>

src/router/modules/stock.js

@@ -259,6 +259,28 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/stock/print/one',
+      component: () => import('@/xt_pages/stock/detail/printOne'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print_one',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/stock/print/two',
+      component: () => import('@/xt_pages/stock/detail/printTwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'stock_print_two',
+      meta: {
+        title: '库存打印',
+        noCache: true
+      }
+    },
     {
       path: '/stock/user/detail',
       component: () => import('@/xt_pages/stock/stockUserDetail'),

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1503,7 +1503,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr>
+                <tr v-if="org_id!=10402">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1650,6 +1650,151 @@
                     </table>
                   </td>
                 </tr>
+
+                 <tr v-if="org_id == 10402">
+                  <td style="padding: 0; position: relative" colspan="2">
+                    <table class="inside_table">
+                      <tbody>
+                        <tr style="line-height: 35px; padding: 8px 5px">
+                          <td
+                            colspan="7"
+                            style="
+                              letter-spacing: 5px;
+                              text-align: center;
+                              font-weight: 520;
+                              font-size: 16px;
+                              padding: 6px 8px;
+                              line-height: 30px;
+                            "
+                          >
+                            医嘱内容
+                          </td>
+                        </tr>
+                        <!-- <tr style="line-height:35px;padding:8px 5px;">
+                                            <td colspan="4" style="font-size: 16px">开医嘱</td>
+                                            <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
+                            </tr> -->
+                        <tr style="line-height: 35px; padding: 8px 5px">
+                          <td style="font-size: 16px" width="10%">时间</td>
+                          <td style="font-size: 16px" colspan="2" width="45%">
+                            医嘱内容
+                          </td>
+                          <td style="font-size: 16px" width="10%">医生签名</td>
+                          <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
+                          <td style="font-size: 16px" width="10%">
+                            执行人签名
+                          </td>
+                          <td style="font-size: 16px" width="10%">时间</td>
+                        </tr>
+                        <!-- <template v-for="group in doctor_advices" > -->
+
+                        <template v-if="record.advices">
+                          <tr
+                            v-for="(advice, advice_index) in record.his_advices"
+                            :key="advice_index"
+                          >
+                            <td height="35px">
+                              <span v-if="advice.start_time">
+                                {{ getTime(advice.start_time, "{h}:{i}") }}
+                              </span>
+                            </td>
+
+                            <td
+                              height="35px"
+                              colspan="2"
+                              class="advice-name"
+                              style="padding-left: 7px"
+                            >
+                              <span v-if="advice.parent_id > 0">---></span>
+                              <span>{{ advice.advice_name }}</span>
+
+                              <span
+                               v-if="advice && advice.advice_desc"
+                              >
+                                ({{ advice.advice_desc
+                                }}{{ advice.drug_spec_unit }} )
+                              </span>
+
+                              <span v-if="advice.prescribing_number"
+                                >&nbsp;&nbsp; {{ advice.prescribing_number
+                                }}{{ advice.prescribing_number_unit }}</span
+                              >
+                              <span v-if="advice.single_dose != 0">
+                                {{ advice.single_dose
+                                }}{{ advice.single_dose_unit }}</span
+                              >
+
+                              <span v-if="advice.parent_id == 0">{{
+                                advice.delivery_way
+                              }}</span>
+                              <span v-if="advice.parent_id == 0">{{
+                                advice.execution_frequency
+                              }}</span>
+                              <span
+                                v-if="
+                                  advice.parent_id == 0 &&
+                                  advice.remark.length > 0
+                                "
+                                >({{ advice.remark }})</span
+                              >
+                            </td>
+
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(advice, 'advice_doctor') ==
+                                  ''
+                                "
+                                >{{
+                                  getAdminUser(advice, "advice_doctor")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice, 'advice_doctor')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
+
+                            <td height="35px">
+                              <span
+                                v-if="
+                                  setAdminUserES(
+                                    advice,
+                                    'execution_staff'
+                                  ) == ''
+                                "
+                                >{{
+                                  getAdminUser(advice, "execution_staff")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice, 'execution_staff')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
+                            <td height="35px">
+                              <span v-if="advice.execution_time">{{
+                                getTime(advice.execution_time, " {h}:{i}")
+                              }}</span>
+                            </td>
+                          </tr>
+                        </template>
+                      </tbody>
+                    </table>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>
@@ -1740,6 +1885,7 @@
                 </div>
               </div>
             </div>
+            
             <div class="row">
               <div class="inline_block">
                 入科方式：

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyOne.vue

@@ -1377,7 +1377,7 @@
                                     monitor_record.operate_time ==
                                       record.dialysis_order.start_time
                                   "
-                                  >【开始透析】</template
+                                  >【开始透析】引血100ml/min</template
                                 >
                                 <template
                                   v-if="

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -11,7 +11,7 @@
           @click="batchPrintAction"
           type="primary"
           >打印</el-button
-        >
+        > 
       </template>
       <template v-if="this.template_id == 2 || this.template_id == 0 || this.template_id == 33">
         <div>
@@ -219,7 +219,7 @@
           >批量打印</el-button
         >
       </template>
-      <template v-if="this.template_id == 27">
+      <!-- <template v-if="this.template_id == 27">
         <el-button
           size="small"
           icon="el-icon-printer"
@@ -228,7 +228,7 @@
           type="primary"
           >批量打印</el-button
         >
-      </template>
+      </template> -->
       <template v-if="this.template_id == 28">
         <el-button
           size="small"

src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue

@@ -353,15 +353,23 @@
                        
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="颈内静脉"></label-box>
                       &nbsp;
-                      （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : false" showValue="左"></label-box>
+                      <!-- （<label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') > -1 ? true : false" showValue="左"></label-box>
                       &nbsp;
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') > -1 ? true : false" showValue="右"></label-box>）
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="股静脉"></label-box>
                       &nbsp;
                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('锁骨下') > -1 ? true : false" showValue="锁骨下"></label-box>
+                      &nbsp; -->
+                    </div>
+                  </td>
+                  <td width="50">其它</td>
+                  <td width="150">
+                    <div class="under-line">
                       &nbsp;
+                      <span v-if="predialysis.blood_access_part_opera_name.indexOf('自体内瘘') <= -1&&predialysis.blood_access_part_opera_name.indexOf('人造血管') <= -1&&predialysis.blood_access_part_opera_name.indexOf('直穿') <= -1&&predialysis.blood_access_part_opera_name.indexOf('颈内静脉-左') <= -1&&predialysis.blood_access_part_opera_name.indexOf('颈内静脉-右') <= -1">{{ predialysis.blood_access_part_opera_name }}</span>
                     </div>
                   </td>
+                  <td width="250"></td>
                 </tr>
                 </tbody>
               </table>

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -101,9 +101,7 @@
               > 
               <label-box
                 :isChecked="
-                  prescription.mode_id == 3
-                    ? true
-                    : prescription.mode_id == 4
+                  prescription.mode_id == 4
                     ? true
                     : false
                 "
@@ -111,11 +109,99 @@
               ></label-box
               >&nbsp;
               <!-- <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp; -->
-              <label-box
+              <!-- <label-box
                 :isChecked="prescription.mode_id == 5 ? true : false"
                 showValue="HF"
               ></label-box
-              >&nbsp;
+              >&nbsp; -->
+                  &nbsp;
+                  <span>其他：  <span v-if="prescription.mode_id==3">HD+HP</span>
+                                <span v-if="prescription.mode_id == 5">
+                                HF
+                                </span>
+                                <span v-if="prescription.mode_id == 6">
+                                SCUF
+                                </span>
+                                <span v-if="prescription.mode_id == 7">
+                                IUF
+                                </span>
+                                <span v-if="prescription.mode_id == 8">
+                                HFHD
+                                </span>
+                                <span v-if="prescription.mode_id == 9">
+                                HFHD+HP
+                                </span>
+                                <span v-if="prescription.mode_id == 10">
+                                PHF
+                                </span>
+                                <span v-if="prescription.mode_id == 11">
+                                HFR
+                                </span>
+                                <span v-if="prescription.mode_id == 12">
+                                HDF+HP
+                                </span>
+                                <span v-if="prescription.mode_id == 13">
+                                CRRT
+                                </span>
+                                <span v-if="prescription.mode_id == 14">
+                                腹水回输
+                                </span>
+                                <span v-if="prescription.mode_id == 15">
+                                HD前置换
+                                </span>
+                                <span v-if="prescription.mode_id == 16">
+                                HD后置换
+                                </span>
+                                <span v-if="prescription.mode_id == 17">
+                                HDF前置换
+                                </span>
+                                <span v-if="prescription.mode_id == 18">
+                                HDF后置换
+                                </span>
+                                <span v-if="prescription.mode_id == 19">
+                                IUF+HD
+                                </span>
+                                <span v-if="prescription.mode_id == 20">
+                                UF
+                                </span>
+                                <span v-if="prescription.mode_id == 21">
+                                HD+
+                                </span>
+                                <span v-if="prescription.mode_id == 22">
+                                血浆胆红素吸附+HDF
+                                </span>
+                                <span v-if="prescription.mode_id == 23">
+                                血浆胆红素吸附
+                                </span>
+                                <span v-if="prescription.mode_id == 24">
+                                  I-HDF
+                                </span>
+                                <span v-if="prescription.mode_id == 25">
+                                  HD高通
+                                </span>
+                                <span v-if="prescription.mode_id == 26">
+                                  CVVH
+                                </span>
+                                <span v-if="prescription.mode_id == 27">
+                                  CVVHD
+                                </span>
+                                <span v-if="prescription.mode_id == 28">
+                                  CVVHDF
+                                </span>
+                                <span v-if="prescription.mode_id == 29">
+                                  PE
+                                </span>
+                               <span v-if="prescription.mode_id == 30">
+                                血浆胆红素吸附+HP
+                                </span>
+                                <span v-if="prescription.mode_id == 31">
+                                HPD
+                                </span>
+                                <span v-if="prescription.mode_id == 32">
+                                HDP
+                                </span>
+                                </span>
+                
             </td>
             <td style="text-align: left" colspan="5">
               <span

src/xt_pages/dialysis/template/DialysisPrintOrderFortyFour.vue

@@ -568,11 +568,21 @@
                         </td>
                         <td height="30px" colspan="2" class="advice-name" style="padding:4px 5px;">
                           <span v-if="advice.parent_id > 0">---></span>
-                          <span>{{ advice.advice_name }}</span>
+                          <span v-if="advice.advice_name">{{ advice.advice_name }}</span>
+                          <span
+                            v-else-if="
+                              advice.project && advice.project.project_name
+                            "
+                            >{{ advice.project.project_name }}</span
+                          >
+
                           <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{ advice.remark }})</span>
                           <span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
                           <span v-if="advice.prescribing_number">&nbsp;&nbsp; {{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</span>
                           <span v-if="advice.single_dose != 0">{{ advice.single_dose }}{{ advice.single_dose_unit }}</span>
+                          <span v-if="advice && advice.project">{{
+                            advice.project.unit
+                          }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.delivery_way }}</span>
                           <span v-if="advice.parent_id == 0">{{ advice.execution_frequency }}</span>
                           
@@ -685,7 +695,7 @@
                         {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
                       </div>
                       min
-                    </div>
+                    </div> 
                   </div>
                   <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                     <div class="inline_block" style="flex:1">
@@ -1389,13 +1399,31 @@ export default {
 
         var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
         this.tableAdvice = doctorAdevieInfo;
+
+
+        let project_arr = response.data.data.projects
+        // console.log(project_arr,'ppooo')
+        // if(project_arr.length > 0){
+        //   this.tableAdvice.concat(project_arr)
+        //  }
+      let flag = this.tableAdvice.findIndex(o => {
+        return !o.advice_name
+      })
+        console.log(flag,'flag')
+        for(let i=0;i<project_arr.length;i++){
+          this.tableAdvice.splice(flag, 0, project_arr[i]);
+          flag++
+        }
+        
+        console.log(this.tableAdvice,'新的心得')
+
         if (this.tableAdvice.length < 7) {
           var nl = 6 - this.tableAdvice.length;
           for (let index = 0; index < nl; index++) {
             this.tableAdvice.push([]);
           }
         }
-         
+        // console.log(project_arr,'project_arr')
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1493,7 +1493,8 @@
                                 advice.prescribing_number_unit
                               "
                               >{{ advice.prescribing_number
-                              }}{{ advice.prescribing_number_unit }}</span
+                              }}{{ advice.prescribing_number_unit }}
+                              </span
                             >
                             <span v-if="advice.single_dose"
                               ><span v-if="!advice.project">单次用量</span>

src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue

@@ -25,7 +25,7 @@
               font-weight: 600;
               font-size: 22px;
               display: inline-block;
-            "
+            " 
           >
             血液净化治疗记录单
           </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyOne.vue

@@ -1402,7 +1402,7 @@
                                 v-if="
                                   (dialysisOrder &&
                                   monitor.operate_time ==
-                                    dialysisOrder.start_time)&&(org_id!=10414)
+                                    dialysisOrder.start_time)
                                 "
                                 >【开始透析】引血100ml/min
                                 </template>

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -1033,7 +1033,7 @@
               >
             </td>
           </tr>
-          <tr>
+          <!-- <tr>
             <td style="text-align: left" colspan="12">
               <span style="display: inline-block; margin-left: 15px">
                 透后评估: 透析过程:
@@ -1054,7 +1054,7 @@
                 }}
               </span>
             </td>
-          </tr>
+          </tr> -->
           <tr>
             <td style="text-align: left" colspan="2">
               <span style="display: inline-block; margin-left: 15px"
@@ -1299,6 +1299,13 @@
               >
             </td>
           </tr>
+          <tr>
+            <td style="text-align: left" colspan="6">
+              <span style="display: inline-block; margin-left: 15px"
+                >透析小结:{{ dialysis_summary ? dialysis_summary : "" }}
+              </span>
+            </td>
+          </tr>
           <!-- <tr>
             <td style="text-align:left;" colspan="3">
               <span style="display:inline-block;margin-left:15px;">医生签名:</span>

src/xt_pages/stock/detail/printOne.vue

@@ -0,0 +1,415 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title" v-if="type == 1">入库单</div>
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="200">耗材名称</td>
+              <td style="line-height: 50px" width="200">规格型号</td>
+              <td style="line-height: 50px" width="200">仓库名称</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height: 50px" width="50">单位</td>
+
+              <td style="line-height:50px" width="80">
+                进货价
+              </td>
+              <td style="line-height: 50px" width="80">总价</td>
+             
+            </tr>
+
+            <tr v-for="(item,index) in stockDatas" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                {{item.good_name}}
+              </td>
+              <td style="line-height: 50px">
+                {{item.specification_name}}
+              </td>
+             <td style="line-height: 50px" width="200">
+               {{getStorehouseId(item.storehouse_id)}}
+             </td>
+              <td style="line-height: 50px">
+                {{getCount(item.child)}}
+              </td>
+              <td style="line-height: 50px">
+                 {{item.packing_unit}}
+              </td>
+              <td style="line-height:50px">
+                {{item.price}}
+              </td>
+              <td style="line-height:50px">
+               {{(getCount(item.child)*item.price).toFixed(2)}}
+              </td>
+              
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1">
+            <tr>
+              <td style="line-height: 50px"  width="50">合计</td>
+              <td style="line-height: 50px"  width="200"></td>
+              <td style="line-height: 50px"  width="200"></td>
+              <td style="line-height: 50px"  width="80"></td>
+              <td style="line-height: 50px"  width="50"></td>
+              <td style="line-height: 50px"   width="80"></td>
+              <td style="line-height: 50px"  width="80">
+               
+              </td>
+              <td style="line-height: 50px" width="80">
+                 {{getSum()}}
+              </td>
+            </tr>
+          </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getNewGoodWarehouseInfo } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',
+        queryParams: {
+          start_time: this.$route.query.start_time,
+          end_time: this.$route.query.end_time,
+          type: this.$route.query.type,
+          limit:this.$route.query.limit,
+          page:this.$route.query.page,
+          storehouse_id:this.$route.query.storehouse_id,
+          keywords:this.$route.query.keywords
+        },
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        type: this.$route.query.type,
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+        stockTotal:[],
+        wareOutInfo:[],
+        org_id:this.$store.getters.xt_user.org.id,
+        informationList:[],
+        wareOutList:[],
+        storeHouseList:[],
+      }
+    },
+    methods:{
+      getDateOne(){
+
+        return "入库日期: "+this.start_time +"~"+this.end_time
+        
+
+      },
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      getlist(){
+        console.log("query23323223wo",this.queryParams)
+        getNewGoodWarehouseInfo(this.queryParams).then(response=>{
+           if(response.data.state == 1){
+             var list = response.data.data.list
+             console.log("list列表",list)
+
+             if(list!=null && list.length >0){
+              for(let i=0;i<list.length;i++){
+                list[i].good_store_id = list[i].good_id+list[i].storehouse_id
+               }
+             }
+             console.log("list23323223wo",list)
+
+             let dataInfo = {}
+              list.forEach((item, index) => {
+                let { good_store_id } = item
+                if (!dataInfo[good_store_id]) {
+                  dataInfo[good_store_id] = {
+                    good_store_id,
+                    child: [],
+                    good_name:item.GoodInfo.good_name,
+                    specification_name:item.GoodInfo.specification_name,
+                    price:item.price,
+                    packing_unit:item.GoodInfo.packing_unit,
+                    storehouse_id:item.storehouse_id,
+                    remark:item.remark,
+                  }
+                }
+              })
+             let arr = Object.values(dataInfo)
+           
+             for(let j=0;j<arr.length;j++){
+              for(let i=0;i<list.length;i++){
+                if(arr[j].good_store_id == list[i].good_store_id){
+                   arr[j].child.push(list[i])   
+                 }
+               }
+             }
+            
+             console.log("arr2333232wo",arr)
+             this.stockDatas = arr
+             var manufacturerList = response.data.data.manufacturerList
+             var dealerList = response.data.data.dealerList
+             this.storeHouseList = response.data.data.storeHouseList
+           }
+        })
+      },
+      getCount(val){
+        var total = 0
+        if(val!=null && val.length >0){
+          for(let i=0;i<val.length;i++){
+            total +=val[i].warehousing_count
+          }
+        }
+        return total
+      },
+      getStorehouseId(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.storeHouseList.length;i++){
+          if(id == this.storeHouseList[i].id){
+             storehouse_name = this.storeHouseList[i].storehouse_name
+          }
+        }
+        return storehouse_name
+      },
+      getSum(){
+        var sum = 0
+        for(let i=0;i<this.stockDatas.length;i++){
+         for(let j=0;j<this.stockDatas[i].child.length;j++){
+            sum += this.stockDatas[i].child[j].warehousing_count * this.stockDatas[i].child[j].price
+         }
+        }
+        if (sum > 0) {
+          return sum.toFixed(2)
+        }else{
+          return ""
+        }
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.goodUnit = this.$store.getters.good_unit
+      this.getlist()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/detail/printTwo.vue

@@ -0,0 +1,415 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button :loading="loading" size="small" icon="el-icon-printer" @click="printThisPage" type="primary">打印
+      </el-button>
+    </div>
+    <div class="app-container ">
+      <div id="dialysis-print-box">
+        <div class="dialysis-print-order">
+          <div class="order-yy-name">{{orgname}}</div>
+          <div class="order-title" v-if="type == 1">入库单</div>
+
+          <div class="order-title" v-if="type == 2">出库单</div>
+          <div class="order-title" v-if="type == 4">退库单</div>
+
+          <div style="float: left;margin-bottom: 10px;">{{getDateOne()}}</div>
+          <div style="float: right;margin-bottom: 10px;">{{getDateTwo()}}</div>
+
+
+
+          <table class="print-table" border="1">
+            <tbody>
+            <tr>
+              <td style="line-height: 50px" width="50">序号</td>
+              <td style="line-height: 50px" width="200">耗材名称</td>
+              <td style="line-height: 50px" width="200">规格型号</td>
+             <td style="line-height: 50px" width="200">仓库名称</td>
+              <td style="line-height: 50px" width="80">数量</td>
+              <td style="line-height: 50px" width="50">单位</td>
+
+              <td style="line-height:50px" width="80">
+                 出货价
+              </td>
+              <td style="line-height: 50px" width="80">总价</td>
+            </tr>
+
+            <tr v-for="(item,index) in stockDatas" :key="item.id">
+              <td style="line-height: 50px">&nbsp;
+                {{index+1}}
+              </td>
+              <td style="line-height: 50px">
+                {{item.good_name}}
+              </td>
+              <td style="line-height: 50px">
+                 {{item.specification_name}}
+              </td>
+              <td style="line-height: 50px" width="200">
+                {{getStorehouseId(item.storehouse_id)}}
+              </td>
+              <td style="line-height: 50px">
+                 {{getCount(item.child)}}
+              </td>
+              <td style="line-height: 50px">
+                {{item.packing_unit}}
+              </td>
+              <td style="line-height:50px">
+                {{item.price}}
+              </td>
+              <td style="line-height:50px">
+                 {{(getCount(item.child)*item.price).toFixed(2)}}
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <table class="print-table" border="1">
+            <tr>
+              <td style="line-height: 50px"  width="50">合计</td>
+              <td style="line-height: 50px"  width="200"></td>
+              <td style="line-height: 50px"  width="200"></td>
+              <td style="line-height: 50px"  width="80"></td>
+              <td style="line-height: 50px"  width="50"></td>
+              <td style="line-height: 50px"   width="80"></td>
+              <td style="line-height: 50px"  width="80">
+              
+              </td>
+              <td style="line-height: 50px" width="80">
+                {{getSum()}}
+              </td>
+            </tr>
+          </table>
+
+          <div style="display:flex;margin-top:20px;float:right;">
+            <div style="width:50px;">审批：</div><div style="width:100px;"></div>
+            <div style="width:80px;">药材主任：</div><div style="width:100px;"></div>
+            <div style="width:50px;">会计：</div><div style="width:100px;"></div>
+            <div style="width:50px;">审核：</div><div style="width:100px;"></div>
+            <div style="width:70px;">制单人：</div><div style="width:100px;"></div>
+          </div>
+
+        </div>
+
+      </div>
+
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { getNewWarehouseOutInfoList } from '@/api/stock'
+  import { getDataConfig } from '@/utils/data'
+  import { jsGetAge, uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import print from 'print-js'
+
+  export default {
+    name: 'dialysisPrintOrder',
+    components: {
+      BreadCrumb
+
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '出入库明细' },
+          { path: false, name: '打印单' }
+        ],
+        loading: false,
+        orgname: '',
+        queryParams: {
+          start_time: this.$route.query.start_time,
+          end_time: this.$route.query.end_time,
+          type: this.$route.query.type,
+          limit:this.$route.query.limit,
+          page:this.$route.query.page,
+          storehouse_id:this.$route.query.storehouse_id,
+          keyword:this.$route.query.keyword,
+        },
+        totalPrice: 0,
+        stockDatas: [],
+        goodUnit: [],
+        type: this.$route.query.type,
+        start_time: this.$route.query.start_time,
+        end_time: this.$route.query.end_time,
+        stockTotal:[],
+        wareOutInfo:[],
+        org_id:this.$store.getters.xt_user.org.id,
+        informationList:[],
+        wareOutList:[],
+        storeHouseList:[],
+      }
+    },
+    methods: {
+      getDateOne(){
+       
+       return "出库日期: "+this.start_time +"~"+this.end_time
+       
+      },
+      getDateTwo(){
+        var ptime = Math.round(new Date().getTime() / 1000)
+        return "打印单日期："+uParseTime(ptime, '{y}-{m}-{d}')
+      },
+      getTime(value, temp) {
+        if (value == 0) {
+          return ''
+        }
+        if (value != undefined) {
+          return uParseTime(value, temp)
+        }
+        return ''
+      },
+      printThisPage() {
+        var ptime = Math.round(new Date().getTime() / 1000)
+        this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
+        const style = '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}'
+        printJS({
+          printable: 'dialysis-print-box',
+          type: 'html',
+          style: style,
+          scanStyles: false
+        })
+      },
+      getlist(){
+        getNewWarehouseOutInfoList(this.queryParams).then(response=>{
+           if(response.data.state == 1){
+             var list =  response.data.data.list
+             console.log("list列表",list)
+           
+             if(list!=null && list.length >0){
+              for(let i=0;i<list.length;i++){
+                list[i].good_store_id = list[i].good_id+list[i].storehouse_id
+               }
+             }
+             console.log("list23323223wo",list)
+
+             let dataInfo = {}
+              list.forEach((item, index) => {
+                let { good_store_id } = item
+                if (!dataInfo[good_store_id]) {
+                  dataInfo[good_store_id] = {
+                    good_store_id,
+                    child: [],
+                    good_name:item.GoodInfo.good_name,
+                    specification_name:item.GoodInfo.specification_name,
+                    price:item.price,
+                    packing_unit:item.GoodInfo.packing_unit,
+                    storehouse_id:item.storehouse_id,
+                    remark:item.remark,
+                  }
+                }
+              })
+             let arr = Object.values(dataInfo)
+           
+             for(let j=0;j<arr.length;j++){
+              for(let i=0;i<list.length;i++){
+                if(arr[j].good_store_id == list[i].good_store_id){
+                   arr[j].child.push(list[i])   
+                 }
+               }
+             }
+            
+             console.log("arr2333232wo",arr)
+             this.stockDatas = arr
+             var manufacturerList = response.data.data.manufacturerList
+             var dealerList = response.data.data.dealerList
+             this.storeHouseList = response.data.data.storeHouseList
+           }
+        })
+      },
+      getStorehouseId(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.storeHouseList.length;i++){
+          if(id == this.storeHouseList[i].id){
+             storehouse_name = this.storeHouseList[i].storehouse_name
+          }
+        }
+        return storehouse_name
+      },
+     getCount(val){
+        var total = 0
+        if(val!=null && val.length >0){
+          for(let i=0;i<val.length;i++){
+            total +=val[i].count
+          }
+        }
+        return total
+      },
+      getSum(){
+        var sum = 0
+        for(let i=0;i<this.stockDatas.length;i++){
+         for(let j=0;j<this.stockDatas[i].child.length;j++){
+            sum += this.stockDatas[i].child[j].count * this.stockDatas[i].child[j].price
+         }
+        }
+        if (sum > 0) {
+          return sum.toFixed(2)
+        }else{
+          return ""
+        }
+      },
+    },
+    created() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      this.goodUnit = this.$store.getters.good_unit
+      this.getlist()
+    }
+
+  }
+</script>
+
+<style>
+  .dialysis-print-order {
+    width: 960px;
+    margin: 0 auto
+  }
+
+  .dialysis-print-order .order-yy-name {
+    margin: auto;
+    text-align: center;
+    font-size: 20px;
+    letter-spacing: 5px;
+  }
+
+  .dialysis-print-order .order-title {
+    margin: auto;
+    font-weight: 600;
+    text-align: center;
+    font-size: 22px;
+    padding: 10px 20px 20px 20px;
+  }
+
+  .dialysis-print-order .table-box {
+
+    width: 100%;
+    line-height: 23px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    line-height: 40px;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .print-table-no {
+    width: 100%;
+    text-align: center;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+
+  .dialysis-print-order .under-line {
+    border-bottom: 1px solid #999;
+    width: 95%;
+    text-align: center;
+    margin-left: 2px;
+
+
+  }
+
+  .dialysis-print-order .title-box {
+    text-align: center;
+    font-size: 16px;
+  }
+
+  .dialysis-print-order .radio-lebel-box {
+    font-weight: 400;
+    cursor: pointer;
+  }
+
+  .dialysis-print-order .radio-no {
+    opacity: 0;
+    outline: none;
+    position: absolute;
+    margin: 0;
+    width: 0;
+    height: 0;
+    z-index: -1;
+  }
+
+  .dialysis-print-order .radio-inner {
+    white-space: nowrap;
+    cursor: pointer;
+    outline: none;
+    display: inline-block;
+    line-height: 1;
+    position: relative;
+    vertical-align: middle;
+  }
+
+  .dialysis-print-order .radio-fang {
+    display: inline-block;
+    position: relative;
+    border: 1px solid #000;
+    box-sizing: border-box;
+    width: 14px;
+    height: 14px;
+    background-color: #fff;
+    z-index: 1;
+    transition: border-color .25s cubic-bezier(.71, -.46, .29, 1.46), background-color .25s cubic-bezier(.71, -.46, .29, 1.46);
+  }
+
+  .dialysis-print-order .is-checked-radio::after {
+    content: "√";
+    font-size: 15px;
+  }
+
+
+  .dialysis-print-order .print-table-no tr td {
+    padding: 8px 5px;
+    line-height: 25px;
+  }
+
+  .dialysis-print-order .print-table tr td {
+    padding: 1px 1px;
+    /*line-height: 25px;*/
+  }
+
+  .es-img {
+    height: 25px;
+  }
+
+  .advice-name {
+    text-align: left;
+  }
+
+  .advice-children {
+    display: flex;
+  }
+
+  .title-box-pro {
+    border: 0 #fff;
+    line-height: 25px;
+    height: 25px;
+    text-align: left;
+    padding-left: 10px !important;
+  }
+
+  .title-box-pro-tr {
+    border: 0 #fff;
+  }
+
+  .text-align-left {
+    text-align: left !important;
+    padding-left: 10px !important;
+    font-size: 14px !important;
+    line-height: 25px;
+  }
+
+  .print-table-tr-new td {
+    line-height: 20px !important;
+  }
+
+  .border-top-solid {
+    border: solid 1px #000;
+  }
+
+  .print-template-two tr {
+    line-height: 30px;
+  }
+</style>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -636,9 +636,13 @@ export default {
       return (r1 * r2) / Math.pow(10, m);
     },
     PrintAction: function() {
+
+      
       window.sessionStorage.setItem('start_time',this.start_time)
       window.sessionStorage.setItem('end_time',this.end_time)
-      this.$router.push({
+
+      if(this.org_id!=9671){
+        this.$router.push({
         path: "/stock/print",
         query: {
           type: 1,
@@ -649,6 +653,24 @@ export default {
           keywords:this.$router.keywords,
         }
       });
+      }
+      if(this.org_id == 9671){
+       
+        this.$router.push({
+        path: "/stock/print/one",
+        query: {
+          type: 1,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          limit:this.limit,
+          page:this.page,
+          keywords:this.searchKey,
+          storehouse_id:this.storehouse_id,
+          
+        }
+       });
+      }
+     
     },
    getPrintStockGood(){
      const params = {

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -659,16 +659,34 @@ export default {
     PrintAction: function() {
       window.sessionStorage.setItem('start',this.start_time)
       window.sessionStorage.setItem('end',this.end_time)
-      this.$router.push({
-        path: "/stock/print",
-        query: {
-          type: 2,
-          start_time: this.start_time,
-          end_time: this.end_time,
-          limit:this.limit,
-          page:this.page,
-        }
-      });
+     
+      if(this.orgId != 9671){
+        this.$router.push({
+          path: "/stock/print",
+          query: {
+            type: 2,
+            start_time: this.start_time,
+            end_time: this.end_time,
+            limit:this.limit,
+            page:this.page,
+          }
+        });
+      }
+      if(this.orgId == 9671){
+         this.$router.push({
+          path: "/stock/print/two",
+          query: {
+            type: 2,
+            start_time: this.start_time,
+            end_time: this.end_time,
+            limit:this.limit,
+            page:this.page,
+            storehouse_id:this.storehouse_id,
+            keyword:this.searchKey,
+          }
+        });
+      }
+    
     },
     // getPrintStockGood(){
     //   const params = {

src/xt_pages/stock/drugs/components/drugPatientQuery.vue

@@ -190,7 +190,7 @@ export default {
     },
     handleCurrentChangeOne(val) {
       this.page = val;
-      console.log("val3232232323",val)
+      
       this.getDrugWarehouseOutDetailByPatientId()
     },
     startTimeChange(){

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -88,6 +88,7 @@
        </el-select>
     </div>
     <el-table
+      v-loading="loading"
       :row-style="{ color: '#303133' }"
       :data="scheduleData"
       border
@@ -304,7 +305,8 @@ export default {
       zone:"",
       // zoneList:[{id:0,name:"全部"}],
       zoneList:[],
-      start_time:moment().week(moment().week() + 1).startOf('week').unix()
+      start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+      loading:false,
     };
   },
   watch: {
@@ -343,6 +345,7 @@ export default {
       }
      },
     getNextScheduleWeekDay() {
+       this.loading = true
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
         // console.log("start",moment(start).unix())
@@ -375,6 +378,7 @@ export default {
         //   zone:str,
         //   record_date:this.getTime(now_time)
         // }
+
        const params = {
           start_time:next_monday,
           end_time:next_sunday,
@@ -387,6 +391,7 @@ export default {
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
+          this.loading = false
           var scheduleData = response.data.data.schedule;
           if(this.pre_status == 0){
               for(let i=0;i<scheduleData.length;i++){

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -17,7 +17,7 @@
     <div class="app-container" style="background-color: white;">
       <div id="print_content">
         <div class="print_main_content">
-          <div class="table_panel">
+          <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
             <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''">
              
 
@@ -236,7 +236,8 @@
         pre_status: 0,
         printObj: {},
         type: 1,
-        printDate: ''
+        printDate: '',
+        loading:false,
       }
     },
     components: {
@@ -263,11 +264,12 @@
           week_time: this.week_time,
           zone: this.zone
         }
-        console.log('params', params)
+      
+        this.loading = true
         getScheduleList(params).then(response => {
           if (response.data.state == 1) {
             var list = response.data.data.list
-  
+            this.loading = false
             for (let i = 0; i < list.length; i++) {
               list[i].sort = list[i].number.sort
             }