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

config/dev.env.js

@@ -7,8 +7,8 @@ module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
-  BASE_API: '"http://api.xt.test.sgjyun.com"',
-  // BASE_API: '"http://localhost:9531"',
+  // BASE_API: '"http://api.xt.test.sgjyun.com"',
+  BASE_API: '"http://localhost:9531"',
   SSO_HOST: '"http://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
   XT_HOST: '"http://xt.test.sgjyun.com"',

config/index.js

@@ -27,10 +27,10 @@ module.exports = {
     // can be overwritten by process.env.HOST
     // if you want dev by ip, please set host: '0.0.0.0'
 
-    host: 'xt.test.sgjyun.com',
+    // host: 'xt.test.sgjyun.com',
     //  host: 'xt.kuyicloud.com',
    // host: 'xt.test.sgjyun.com',
-  //  host: 'localhost',
+    host: 'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

package.json

@@ -56,7 +56,7 @@
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "4.14.1",
+    "node-sass": "^8.0.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",

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',
@@ -347,6 +347,30 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/fiftyone',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyone'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_fiftyone',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/fiftythree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftythree'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_fiftythree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/fiftynine',
       component: () =>
@@ -383,6 +407,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/sixtyTwo',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_sixtyTwo',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/seven',
       component: () =>
@@ -503,18 +539,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_fortyThree.vue

@@ -328,7 +328,7 @@
                         <td width="60" style="height:20px;line-height:20px">静脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">动脉压<br />mmHg</td>
                         <td width="60" style="height:20px;line-height:20px">跨膜压<br />mmHg</td>
-                        <td width="60" style="height:20px;line-height:20px">温度<br />°C</td>
+                        <!-- <td width="60" style="height:20px;line-height:20px">温度<br />°C</td> -->
                         <td width="60" style="height:20px;line-height:20px">超滤率<br />ml/h</td>
                         <td width="60" style="height:20px;line-height:20px">超滤量<br />ml</td>
 <!--                        <td width="60" style="height:20px;line-height:20px" v-if="record.prescription.mode_id == 2">置换率<br /><br />ml/h</td>-->
@@ -352,7 +352,7 @@
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.arterial_pressure ? monitor.arterial_pressure : "/" }}</span></td>
 
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "/" }}</span></td>
-                        <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td>
+                        <!-- <td>&nbsp;<span v-if="monitor.operate_time">{{monitor.dialysate_temperature ? monitor.dialysate_temperature : '/'}}</span></td> -->
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : '/'}}</span></td>
                         <td>&nbsp;<span v-if="monitor.operate_time">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "/" }}</span></td>
 <!--                        <td v-if="record.prescription.mode_id == 2">&nbsp;<span v-if="monitor.operate_time">{{ monitor.replacement_rate ? monitor.replacement_rate : '/'}}</span></td>-->
@@ -716,6 +716,7 @@ export default {
       .then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
+          this.loading = false
           this.org_template_info = resp.data.templateInfo
 
           this.records = this.records.concat(resp.data.schedules)
@@ -887,7 +888,7 @@ export default {
           this.adminSign = name
           console.log('name是', name)
           console.log('记录', this.records)
-          this.loading = false
+          
         } else {
           this.loading = false
           this.$message.error(resp.msg)

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/details/assessmentAfter.vue

@@ -17,7 +17,7 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && ((this.$store.getters.xt_user.template_info.template_id == 6 &&this.$store.getters.xt_user.template_info.org_id != 10447) || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
           <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445"  >L</span>
         </li>
         <li v-if="isShow('导管')">

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
+              v-if=" (this.template_id == 6 && this.$store.getters.xt_user.template_info.org_id != 10447) || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1560,7 +1560,7 @@ export default {
         }
       }
       
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340){
+      if( this.$store.getters.xt_user.org.id == 0 || this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10447){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -189,13 +189,14 @@
                     <el-row :gutter="20"> -->
 
                     <el-col :span="8" v-if="isShows('抗凝剂')">
+                     
                         <el-form-item label="抗凝剂：">
                             <el-select v-model="dialysisPrescription.anticoagulant" placeholder="请选择"
                                        style="width:100%;"
                                        @change="changeThisAnticoagulant">
                                 <el-option :key="0" label="请选择" :value="0"></el-option>
-                                <el-option v-if="dialysisPrescription.anticoagulant ==3" :key="3" label="低分子肝素"
-                                           :value="3"></el-option>
+                                <!-- <el-option v-if="dialysisPrescription.anticoagulant ==3" :key="3" label="低分子肝素"
+                                           :value="3"></el-option> -->
                                 <el-option v-for="(item, index) in anticoagulantsConfit" :label="item.name"
                                            :key="index + 'e'"
                                            :value="item.id"></el-option>
@@ -205,6 +206,7 @@
 
 
                     <el-col :span="8" v-if="isShows('抗凝剂商品名称')">
+                      
                         <el-form-item label="抗凝剂商品名称：">
                             <el-input
                                     v-model="dialysisPrescription.antioxidant_commodity_name"
@@ -245,7 +247,7 @@
                                           v-model="dialysisPrescription.add_amount"></el-input>
                             </el-form-item>
 
-                            <el-form-item v-else :label="'追加肝素量(' + anticoagulant.shouji_unit + ') : '">
+                            <el-form-item v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 1" :label="'追加肝素量(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.add_amount"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -262,7 +264,7 @@
                                           v-model="dialysisPrescription.reduce_amount"></el-input>
                             </el-form-item>
 
-                            <el-form-item v-else :label="'减肝素量(' + anticoagulant.shouji_unit + ') : '">
+                            <el-form-item v-if="dialysisPrescription.anticoagulant != 2 && dialysisPrescription.anticoagulant != 1" :label="'减肝素量(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.reduce_amount"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -270,11 +272,11 @@
                             </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="anticoagulant.shouji != -1 && isShows('首剂')">
+                    <el-col :span="8" v-if="anticoagulant!=undefined && anticoagulant.shouji != -1 && isShows('首剂')  && dialysisPrescription.anticoagulant!=1 && dialysisPrescription.anticoagulant!=12">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.template_id!=54  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id!=9990'
+                                    v-if='dialysisPrescription.anticoagulant != 1 &&this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.org_id!=9990'
                                     :label="'首剂(' + anticoagulant.shouji_unit + ') : '">
 
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -291,7 +293,7 @@
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
-                           <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant!=7" :label="'首剂(iu):'"> 
+                           <el-form-item v-if="this.$store.getters.xt_user.template_info.org_id == 9990 && dialysisPrescription.anticoagulant!=7 && this.$store.getters.xt_user.template_info.template_id!=6" :label="'首剂(iu):'"> 
                                <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
 
@@ -299,9 +301,11 @@
                                           v-model="dialysisPrescription.no_anticoagulant_shouji"></el-input>
                             </el-form-item>
 
+                          
+
 
                             <el-form-item
-                                    v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 && dialysisPrescription.anticoagulant == 2'
+                                    v-if='dialysisPrescription.anticoagulant == 2 && this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387'
                                     :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -330,6 +334,7 @@
                         </div>
 
                         <div v-else>
+                            
                             <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'首剂(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
                                           v-model="dialysisPrescription.anticoagulant_shouji"></el-input>
@@ -350,7 +355,7 @@
                     </el-col>
 
 
-                    <el-col :span="8" v-if="anticoagulant.weichi != -1 && isShows('维持')">
+                    <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 ">
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
@@ -414,7 +419,7 @@
 
 
 
-                    <el-col :span="8" v-if="anticoagulant.zongliang != -1 && isShows('总量')">
+                    <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
                         <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432">
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387">
                             <el-form-item
@@ -1716,7 +1721,8 @@
         )
         // this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
 
-        var anticoagulantsConfitOne = this.$store.getters.anticoagulants_confit
+        this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
+        console.log("抗凝剂",this.anticoagulantsConfit)
 
         // for (let i = 0; i < anticoagulantsConfitOne.length; i++) {
         //   console.log('anticoagulantsConfitOne', anticoagulantsConfitOne[i].name)
@@ -1730,15 +1736,15 @@
         // var arrthree = {}
         // arrthree = { ...arr }
         // console.log('arrthree', arrthree)
-        const arrFour = []
-        Object.keys(anticoagulantsConfitOne).map((item, index) => {
-          arrFour.push(anticoagulantsConfitOne[item])
-          // if (index != 2) {
-          //   arrFour.push(anticoagulantsConfitOne[item])
-          // }
-        })
-
-        this.anticoagulantsConfit = arrFour
+        // const arrFour = []
+        // Object.keys(anticoagulantsConfitOne).map((item, index) => {
+        //   arrFour.push(anticoagulantsConfitOne[item])
+        //   // if (index != 2) {
+        //   //   arrFour.push(anticoagulantsConfitOne[item])
+        //   // }
+        // })
+        // console.log("arrFour0-0000000000000wo",arrFour)
+        // this.anticoagulantsConfit = arrFour
         this.dialysisList = this.devices
 
         this.body_fluid_option = this.$store.getters.body_fluid
@@ -2246,6 +2252,14 @@
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10447){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            }
            } else {
             if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '07:00'
@@ -2313,6 +2327,9 @@
               this.dialysisPrescription.bicarbonate = 31.1
               this.dialysisPrescription.dialysate_flow = 500
             }
+            if(this.$store.getters.xt_user.org.id == 10447){
+              this.dialysisPrescription.dialysate_flow = 500
+            }
         }
         if (this.predialysis == null || this.predialysis.id == 0) {
           
@@ -2374,12 +2391,20 @@
         if (isNaN(thismode) || thismode <= 0) {
           return false
         }
-        if (val <= 2) {
-          this.anticoagulant = this.anticoagulantsConfit[thismode - 1]
-        }
-        if (val > 2) {
-          this.anticoagulant = this.anticoagulantsConfit[thismode - 2]
+        // if (val != 12 && val!=1) {
+        //   this.anticoagulant = this.anticoagulantsConfit[thismode - 1]
+        // }
+        // if (val == 12 || val == 1) {
+        //   this.anticoagulant = this.anticoagulantsConfit[thismode - 2]
+        //   console.log("抗凝剂",this.anticoagulant)
+        // }
+       if (
+          typeof this.anticoagulantsConfit[thismode] === 'undefined' ||
+          this.anticoagulantsConfit[thismode] == null
+        ) {
+          return false
         }
+        this.anticoagulant = this.anticoagulantsConfit[thismode]
         if ((this.$store.getters.xt_user.template_info.template_id == 13 || this.$store.getters.xt_user.template_info.template_id == 41 || this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 47) && val == 2) {
            if(val == 2){
              this.anticoagulant.shouji_unit = 'mg'
@@ -3524,6 +3549,7 @@
           this.dialysisPrescription.displace_liqui_value = ""
           this.dialysisPrescription.displace_liqui_part = ""
         }
+        
         const ParamsQuery = {}
         ParamsQuery['patient_id'] = this.$route.query.patient_id
         ParamsQuery['mode_id'] = id
@@ -3658,6 +3684,12 @@
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
+
+          //针对新化博翔
+          if(this.$store.getters.xt_user.template_info.org_id ==10447){
+             this.dialysisPrescription.displace_liqui_part = 1
+             this.dialysisPrescription.displace_liqui_value = 35
+          }
         }
 
       },
@@ -4040,7 +4072,7 @@
               this.dialysisPrescription['dialysate_temperature'] = ''
             }
             if (this.prescription['anticoagulant_shouji'] == 0) {
-              this.dialysisPrescription['anticoagulant_shouji'] = 0
+              this.dialysisPrescription['anticoagulant_'] = 0
             }
             if (this.prescription['anticoagulant_weichi'] == 0) {
               this.dialysisPrescription['anticoagulant_weichi'] = 0

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -594,7 +594,7 @@
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
-            label="电导度(mS/m)"
+            label="电导度(mS/cm)"
             width="100"
             v-if="isShow('电导度')"
           >
@@ -1322,7 +1322,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('电导度')">
-            <el-form-item label="电导度(mS/m)：">
+            <el-form-item label="电导度(mS/cm)：">
               <el-input v-model="form.conductivity"></el-input>
             </el-form-item>
           </el-col>
@@ -1917,6 +1917,8 @@ export default {
           this.form.breathing_rated = "20"
         }else if(this.org_id == 10340){
          this.form.breathing_rated = "20"
+        }else if(this.org_id == 10447){
+          this.form.breathing_rated = "20"
         } else {
           this.form.breathing_rated = "";
         }
@@ -1962,7 +1964,13 @@ export default {
         this.form.symptom = resp.monitor.symptom ? resp.monitor.symptom : ""; // this.last_monitor_record.symptom;
        // this.form.dispose = resp.monitor.dispose ? resp.monitor.dispose : ""; // this.last_monitor_record.dispose;
         this.form.result = resp.monitor.result ? resp.monitor.result : ""; // this.last_monitor_record.result;
-        this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation? resp.monitor.blood_oxygen_saturation: "";
+        //电导度
+        if(this.org_id == 9671 || this.org_id == 10447){
+           this.form.blood_oxygen_saturation = "99"
+        }else{
+           this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation? resp.monitor.blood_oxygen_saturation: "";
+        }
+       
        //针对长沙南雅医院
        if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 9675){
           this.form.blood_oxygen_saturation = "/"
@@ -1974,7 +1982,7 @@ export default {
         this.form.sodium_concentration = resp.monitor.sodium_concentration
           ? resp.monitor.sodium_concentration
           : "";
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10447){
           this.form.conductivity = 14
         }else{
            this.form.conductivity = resp.monitor.conductivity? resp.monitor.conductivity: "";
@@ -2009,7 +2017,7 @@ export default {
         this.form.heparin_amount = resp.monitor.heparin_amount
           ? resp.monitor.heparin_amount
           : "";
-         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+         if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 10447){
             this.form.dialysate_temperature = 36.5
             
          }

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -26,7 +26,7 @@
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
-          <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
+          <th v-if="isShow('电导度')" width="92px">电导度(mS/cm)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>

src/xt_pages/dialysis/schedualPatient.vue

@@ -184,6 +184,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           {value: 1,label: '待开处方'},
           {value: 2,label: '待开小结'},
           {value: 3,label: '待医嘱核对'},
+          {value:4,label:'待消毒'},
         ],
         treatStateVal: 0,
         allPatient:[],
@@ -825,6 +826,18 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             }
           }
           arr2 = arr
+        }else if(this.treatStateVal == 4){
+         let arr = []
+          arr = JSON.parse(JSON.stringify(arr1))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].device_information != null)) {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          arr2 = arr
         }
 
 

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyFour.vue

@@ -3,7 +3,21 @@
     <div class="dialysis-print-order">
       <div class="order-yy-name">{{ orgname }}</div>
       <div class="order-title">血液透析（滤过）记录表单</div>
-      <div class="order-name">姓 名:&nbsp;{{ patientInfo.name }}</div>
+      <div style="display:flex;justify-content: space-between;">
+        <div class="order-name" style="margin: 0;">姓 名:&nbsp;{{ patientInfo.name }}</div>
+            <div class="order-name" style="margin: 0;">门诊/住院号:&nbsp;
+            <span v-if="receiverTreatmentAccess.admission_number">
+              {{ receiverTreatmentAccess.admission_number }}
+            </span>
+            <span v-else-if="patientInfo.admission_number">
+              {{ patientInfo.admission_number }}
+            </span>
+            <span v-else>
+              {{ "/" }}
+            </span>
+            </div>
+          </div>
+      
       <table class="print-table" border="1">
         <tbody>
           <tr>
@@ -837,13 +851,25 @@
             <td v-if="advice_index === 2">{{ predialysis.dry_weight }}kg</td>
             <td v-if="advice_index === 3">较干体重增加量:</td>
             <td v-if="advice_index === 3">
-              {{
+              <span v-if="org_id==10345">
+                {{
+                predialysis.weight_before == 0
+                  ? 0
+                  : (
+                      predialysis.weight_before - predialysis.dry_weight
+                    ).toFixed(2)
+              }}kg
+              </span>
+              <span v-else>
+                {{
                 afterdialysis.weight_after == 0
                   ? 0
                   : (
                       afterdialysis.weight_after - predialysis.dry_weight
                     ).toFixed(2)
               }}kg
+              </span>
+              
             </td>
             <td v-if="advice_index === 4">净脱水量:</td>
             <td v-if="advice_index === 4">

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -100,19 +100,6 @@
                       class="under_line"
                       style="width: 50px; text-align: center"
                     >
-                      <!-- <span>{{
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          dialysisOrder.DeviceNumber &&
-                          dialysisOrder.DeviceNumber.number.length > 0) ||
-                        (dialysisOrder &&
-                          dialysisOrder != null &&
-                          receiverTreatmentAccess.condition &&
-                          receiverTreatmentAccess.condition != 1)
-                          ? patientInfo.DialysisSchedule.device_number.number
-                          : dialysisOrder.DeviceNumber.number
-                      }}</span> -->
-
                       <span
                         v-if="
                           dialysisOrder == null ||
@@ -1156,6 +1143,15 @@
                                     : "/"
                                 }}
                               </div>
+                               <span v-if="prescription.anticoagulant == 7"
+                                >iu</span
+                              >
+                               <span v-if="prescription.anticoagulant == 6"
+                                >iu</span
+                              >
+                               <span v-if="prescription.anticoagulant == 5"
+                                >ml</span
+                              >
                               <span v-if="prescription.anticoagulant == 4"
                                 >mg</span
                               >
@@ -1193,6 +1189,12 @@
                                     : "0"
                                 }}
                               </div>
+                              <span v-if="prescription.anticoagulant == 7"
+                                >iu/h</span
+                              >
+                              <span v-if="prescription.anticoagulant == 6"
+                                >iu/h</span
+                              >
                               <span v-if="prescription.anticoagulant == 5"
                                 >ml/h</span
                               >
@@ -1260,6 +1262,15 @@
                                     : "/"
                                 }}
                               </div>
+                              <span v-if="prescription.anticoagulant == 7"
+                                >iu</span
+                              >
+                              <span v-if="prescription.anticoagulant == 6"
+                                >iu</span
+                              >
+                              <span v-if="prescription.anticoagulant == 5"
+                                >ml</span
+                              >
                               <span v-if="prescription.anticoagulant == 4"
                                 >mg</span
                               >
@@ -1424,17 +1435,6 @@
                                 </td>
                                 <td width="200">病情变化及处理</td>
 
-                                <!-- <td width="100">时间</td>
-                    <td width="30">T<br>C°</td>
-                    <td width="30">P<br/>次/分</td>
-                    <td width="30">R<br/>次/分</td>
-                    <td width="100">BP<br/>mmHg</td>
-                    <td width="60">静脉压/动脉压<br/>mmHg</td>
-                    <td width="80">血流量<br/>ml/min</td>
-                    <td width="90">超滤量累计L</td>
-                    <td width="80">钠浓度<br/>mmol/L</td>
-                    <td width="240">病情特殊情况处理<br/>及专科护理措施记录</td>
-                    <td  width="100">护士签名</td> -->
                               </tr>
 
                               <tr
@@ -3379,7 +3379,7 @@ export default {
         var leftAdvice = [];
         var rightAdvice = [];
         var adlen = advices.length;
-
+        console.log("adlen----------------------",adlen)
         var halfLen = adlen % 2 == 0 ? adlen / 2 : (adlen + 1) / 2;
         for (var i = 0; i < halfLen; i++) {
           leftAdvice.push(advices[i]);
@@ -3404,8 +3404,8 @@ export default {
           this.advices.push(item);
         }
         this.loading = false;
-        this.doctor_advices =
-          response.data.data.advices == null ? [] : response.data.data.advices;
+        this.doctor_advices =response.data.data.advices == null ? [] : response.data.data.advices;
+        console.log("zhonguog---------------------------------",this.doctor_advices)
         for (let index = 0; index < this.doctor_advices.length; index++) {
           this.doctor_advices[index]["isShow"] = 2;
         }
@@ -3505,12 +3505,15 @@ export default {
         }
 
         this.totollength = this.doctor_advices.length + this.monitors.length;
-        if (this.totollength > 18) {
+        console.log("totalpath-------------------------------",this.totollength)
+        if (this.totollength > 58) {
           var temp_advice_length = 17 - this.monitors.length;
+          console.log("temp_advice_length-----------",temp_advice_length)
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
           for (let index = 0; index < this.doctor_advices.length; index++) {
             const element = this.doctor_advices[index];
+
             if (temp_advice_length > index) {
               doctor_advices_1.push(element);
             } else {
@@ -3520,6 +3523,7 @@ export default {
           this.doctor_advices = doctor_advices_1;
           this.doctor_advices_2 = doctor_advices_2;
         }
+        console.log("doctor_advice----------",this.doctor_advices)
 
         this.patientInfo.name = this.nameSplit(this.patientInfo.name);
       } else {

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

@@ -586,10 +586,13 @@
                         </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.project&&advice.project.project_name">{{ advice.project.project_name }}</span>
+                          <span v-else>{{ advice.advice_name }}</span>
+                          <span v-if="advice.project&&advice.count">{{ advice.count }}{{ advice.unit }}</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.single_dose != 0&&!advice.project">{{ 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>
@@ -1398,12 +1401,27 @@ export default {
           ].name
           this.AlPanel = this.anticoagulantsConfit[thisALID]
         }
-
+        // this.advices = response.data.data.projects
         this.advices = response.data.data.advices
         console.log("医嘱数据2222222222",this.advices)
-
-        var doctorAdevieInfo = JSON.parse(JSON.stringify(response.data.data.advices))
+        let doctorAdevieInfo = []
+        let ad_arr = JSON.parse(JSON.stringify(response.data.data.projects))
+        ad_arr.forEach(el => {
+          if(el.project&&el.project.project_name!=""){
+            doctorAdevieInfo.push(el)
+          }
+        });
+        let ad_arr2= JSON.parse(JSON.stringify(response.data.data.advices))
+        ad_arr2.forEach(el => {
+          doctorAdevieInfo.push(el)
+        });
+        console.log(doctorAdevieInfo,'doctorAdevieInfo')
+        // doctorAdevieInfo.push(JSON.parse(JSON.stringify(response.data.data.advices)))
         this.tableAdvice = doctorAdevieInfo;
+        // console.log(this.tableAdvice,'this.tableAdvice')
+        // if(!this.tableAdvice[0].advice_name){
+        //   console.log("不存在")
+        // }
         if (this.tableAdvice.length < 7) {
           var nl = 6 - this.tableAdvice.length;
           for (let index = 0; index < nl; index++) {
@@ -1524,6 +1542,7 @@ export default {
           this.doctor_advices[index]['isShow'] = 2
         }
 
+
         // if (this.doctor_advices.length > 0) {
         //   var group = this.newAdviceGroupObject()
         //   var initGroupBlock = function(group, advice) {

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

@@ -59,7 +59,7 @@
           <div class="inline_block">
             病区：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414">{{
+              <span v-if="org_id == 10121||org_id == 10138||org_id == 10414 ||org_id == 10447">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -70,7 +70,7 @@
           <div class="inline_block">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -86,7 +86,7 @@
               {{ patientInfo.dialysis_no }}
             </div>
           </div>
-          <div class="inline_block" style="margin-left: 5px;">
+          <div class="inline_block" style="margin-left: 5px;" v-if="org_id!=9675 && org_id!=10447">
             住院号/门诊号：
             <div class="under_line" style="width: 70px;text-align: left" v-if="receiverTreatmentAccess.admission_number">
               {{ receiverTreatmentAccess.admission_number }}
@@ -369,7 +369,7 @@
                         {{ predialysis.blood_access_part_opera_name }}
                       </div>
                     </div>
-                    <div class="inline_block" style="margin-left: 10px">
+                    <div class="inline_block" style="margin-left: 10px" v-if="org_id!=9675 && org_id!=10447">
                       内瘘：
                       <div
                         class="under_line"
@@ -390,6 +390,7 @@
                     <div
                       class="inline_block"
                       style="margin-left: 10px; flex: 1.4"
+                      v-if="org_id!=9675 && org_id!=10447"
                     >
                       导管：
                       <div
@@ -891,7 +892,7 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 ">{{
                           lastafterdialysis.weight_after
                         }}</span>
                         <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
@@ -909,7 +910,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
-                        {{
+                      <span v-if="org_id !=10447 && org_id != 9675">{{
                           predialysis.weight_before
                             ? parseFloat(
                                 predialysis.weight_before -
@@ -917,6 +918,17 @@
                               ).toFixed(1)
                             : "/"
                         }}
+                      </span>
+                       <span v-if="org_id==10447 || org_id == 9675">
+                        {{
+                          predialysis.weight_before
+                            ? parseFloat(
+                                predialysis.weight_before -
+                                  predialysis.additional_weight
+                              ).toFixed(1)
+                            : "未称重"
+                        }}
+                       </span>
                       </div>
                       kg
                     </div>
@@ -1039,10 +1051,28 @@
                             : "/"
                         }}
                       </div>
+                     
+                     <span v-if="org_id!=9675 && org_id!=10447">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                    </span>
+
+                    <span v-if="org_id==9675 || org_id==10447">
+                      <span v-if="prescription.anticoagulant == 4">iu</span>
+                      <span v-if="prescription.anticoagulant == 3">iu</span>
+                      <span v-if="prescription.anticoagulant == 2">mg</span>
+                      <span v-if="prescription.anticoagulant == 5">ml</span>
+                      <span v-if="prescription.anticoagulant == 6">iu</span>
+                     <span v-if="prescription.anticoagulant == 7">iu</span>
+                     <span v-if="prescription.anticoagulant == 8">iu</span>
+                     <span v-if="prescription.anticoagulant == 9">iu</span>
+                     <span v-if="prescription.anticoagulant == 10">iu</span>
+                     <span v-if="prescription.anticoagulant == 11">iu</span>
+                     <span v-if="prescription.anticoagulant == 13">iu</span>
+                    
+                    </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
                       维持：
@@ -1068,11 +1098,27 @@
                             : "0"
                         }}
                       </div>
-                      <span v-if="prescription.anticoagulant == 5">ml/h</span>
-                      <span v-if="prescription.anticoagulant == 4">mg/h</span>
-                      <span v-if="prescription.anticoagulant == 3">iu/h</span>
-                      <span v-if="prescription.anticoagulant == 2">iu/h</span>
-                      <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                      <span v-if="org_id!=9675 && org_id!=10447">
+
+                        <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                          <span v-if="prescription.anticoagulant == 4">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 3">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 2">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 1">mg/h</span>
+                      </span>
+                      <span v-if="org_id==9675 || org_id==10447">
+                        <span v-if="prescription.anticoagulant == 2">mg/h</span>
+                          <span v-if="prescription.anticoagulant == 3">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 4">ml</span>
+                          <span v-if="prescription.anticoagulant == 5">ml/h</span>
+                          <span v-if="prescription.anticoagulant == 6">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 7">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 8">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 9">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 10">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 11">iu/h</span>
+                          <span v-if="prescription.anticoagulant == 13">iu/h</span>
+                      </span>
                     </div>
                     <div
                       class="inline_block"
@@ -1125,12 +1171,27 @@
                             : "/"
                         }}
                       </div>
+                      <span v-if="org_id!=9675 && org_id!=10447">
                       <span v-if="prescription.anticoagulant == 4">mg</span>
                       <span v-if="prescription.anticoagulant == 3">iu</span>
                       <span v-if="prescription.anticoagulant == 2">iu</span>
                       <span v-if="prescription.anticoagulant == 1">mg</span>
+                     </span>
+                    <span v-if="org_id==9675 || org_id==10447">
+                       <span v-if="prescription.anticoagulant == 2">mg</span>
+                       <span v-if="prescription.anticoagulant == 3">iu</span>
+                       <span v-if="prescription.anticoagulant == 4">ml</span>
+                       <span v-if="prescription.anticoagulant == 5">ml</span>
+                       <span v-if="prescription.anticoagulant == 6">iu</span>
+                       <span v-if="prescription.anticoagulant == 7">iu</span>
+                       <span v-if="prescription.anticoagulant == 8">iu</span>
+                       <span v-if="prescription.anticoagulant == 9">iu</span>
+                       <span v-if="prescription.anticoagulant == 10">iu</span>
+                      <span v-if="prescription.anticoagulant == 11">iu</span>
+                      <span v-if="prescription.anticoagulant == 13">iu</span>
+                    </span>
                     </div>
-                    <div class="inline_block" style="margin-left: 20px">
+                    <div class="inline_block" style="margin-left: 20px" v-if="org_id!=9675 && org_id!=10447">
                       透析机号：
                       <div
                         class="under_line"
@@ -1154,6 +1215,7 @@
                     <div
                       class="inline_block"
                       style="flex: 1; display: inline-block"
+                      v-if="org_id!=9675 && org_id!=10447"
                     >
                       备注：
                       <div
@@ -1645,7 +1707,7 @@
             <div class="inline_block">
               病区：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10138">{{
+              <span v-if="org_id == 10121||org_id == 10138 || org_id == 9675 || org_id == 10447">{{
                 patientInfo.DialysisSchedule.device_zone.name
                   ? patientInfo.DialysisSchedule.device_zone.name
                   : ""
@@ -1656,7 +1718,7 @@
             <div class="inline_block">
               床号：
               <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121">{{
+              <span v-if="org_id == 10121 || org_id == 9675 || org_id == 10447">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -1672,7 +1734,8 @@
                 {{ patientInfo.dialysis_no }}
               </div>
             </div>
-            <div class="inline_block" style="margin-left: 5px">
+            <div class="inline_block" style="margin-left: 5px"
+            v-if="org_id!=9675 && org_id!=10447">
             住院号/门诊号：
             <div
               class="under_line"
@@ -2066,7 +2129,8 @@
                         {{ afterdialysis.cruor ? afterdialysis.cruor : "/" }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 2">
+                    <div class="inline_block" style="flex: 2"
+                    v-if="org_id!=9675 && org_id!=10447">
                       内瘘：
                       <div
                         class="under_line"
@@ -2083,7 +2147,8 @@
                         }}
                       </div>
                     </div>
-                    <div class="inline_block" style="flex: 4">
+                    <div class="inline_block" style="flex: 4"
+                    v-if="org_id!=9675 && org_id!=10447">
                       导管：
                       <div
                         class="under_line"
@@ -2106,6 +2171,7 @@
                         class="under_line"
                         style="width: 70px; text-align: center"
                       >
+                      <span v-if="org_id!=9675&&org_id!=10447">
                         {{
                           afterdialysis.weight_after
                             ? parseFloat(
@@ -2114,6 +2180,18 @@
                               ).toFixed(1)
                             : "/"
                         }}
+                      </span>
+                      <span v-if="org_id ==9675 || org_id==10447">
+                        {{
+                          afterdialysis.weight_after
+                            ? parseFloat(
+                                afterdialysis.weight_after -
+                                  afterdialysis.additional_weight
+                              ).toFixed(1)
+                            : "未称重"
+                        }}
+                      </span>
+                       
                       </div>
                       kg
                     </div>
@@ -2164,7 +2242,8 @@
                             : "/"
                         }}
                       </div>
-                      ml
+                      <span v-if="org_id!=9675&&org_id!=10447"> ml</span>
+                      <span v-if="org_id ==9675||org_id==10447">L</span>
                     </div>
                   </div>
                   <div
@@ -2303,11 +2382,12 @@
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
-                    v-if="org_id != 10223"
+                    v-if="org_id != 10223&&org_id!=9538&&org_id!=9675"
                   >
                     <div
                       class="inline_block"
                       style="flex: 1; display: inline-block"
+                      v-if="org_id!=9675 && org_id!=10447"
                     >
                       备注：
                       <div
@@ -2325,6 +2405,43 @@
                       </div>
                     </div>
                   </div>
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                    v-if="org_id == 9538||org_id == 9675"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      中心静脉导管封管：A端<div
+                        class="under_line"
+                        style="
+                          width: 60px;
+                          line-height: 25px;
+                          text-align: center;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{ lastafterdialysis.cvc_a ? lastafterdialysis.cvc_a : "/" }}
+                      </div>ml,V端<div
+                        class="under_line"
+                        style="
+                          width: 60px;
+                          line-height: 25px;
+                          text-align: center;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{ lastafterdialysis.cvc_v ? lastafterdialysis.cvc_v : "/" }}
+                      </div>ml
+                      
+                    </div>
+                  </div>
                 </td>
               </tr>
               <tr>
@@ -3594,7 +3711,7 @@ export default {
       "vascular_access_desc"
     );
     this.org_id = this.$store.getters.xt_user.org.id;
-
+    console.log("org_id-----------------------------------------",this.org_id)
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
 
     var bloodAccessParOpera = getDataConfig(

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

@@ -872,7 +872,7 @@
             </td>
           </tr>
 
-          <tr>
+          <!-- <tr>
             <td style="text-align: left" colspan="8">
               <span style="display: inline-block; margin-left: 15px"
                 >出血影响因素:</span
@@ -925,7 +925,7 @@
               >其他:
               <span>{{ predialysis.hemorrhage_other }}</span>
             </td>
-          </tr>
+          </tr> -->
         </table>
 
         <table class="print-table" border="1" style="line-height: 30px">
@@ -959,10 +959,10 @@
               超滤率
               <br />ml/h
             </td>
-            <td style="min-width: 60px">
+            <!-- <td style="min-width: 60px">
               超滤量
               <br />ml
-            </td>
+            </td> -->
             <td style="min-width: 60px">
               电导度
               <br />
@@ -990,12 +990,10 @@
             <td>{{ monitor.pulse_frequency }}</td>
             <td>{{ monitor.blood_flow_volume }}</td>
             <td>{{ monitor.venous_pressure }}</td>
-            <td>
-              {{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
-            </td>
+            <td>{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
             <td>{{ monitor.transmembrane_pressure }}</td>
             <td>{{ monitor.ultrafiltration_rate }}</td>
-            <td>{{ monitor.ultrafiltration_volume }}</td>
+            <!-- <td>{{ monitor.ultrafiltration_volume }}</td> -->
             <td>{{ monitor.conductivity ? monitor.conductivity : "" }}</td>
             <td>
               <span style="line-height: 18px; display: block">
@@ -1033,7 +1031,7 @@
               >
             </td>
           </tr>
-          <tr>
+          <!-- <tr>
             <td style="text-align: left" colspan="12">
               <span style="display: inline-block; margin-left: 15px">
                 透后评估: 透析过程:
@@ -1054,7 +1052,7 @@
                 }}
               </span>
             </td>
-          </tr>
+          </tr> -->
           <tr>
             <td style="text-align: left" colspan="2">
               <span style="display: inline-block; margin-left: 15px"
@@ -1086,7 +1084,15 @@
                   :isChecked="afterdialysis.cruor.indexOf('透析器-3级') > -1"
                 ></label-box
                 >&nbsp;&nbsp;
-                {{ getCruor(afterdialysis.cruor) }}
+                <label-box
+                  showValue="无"
+                  :isChecked="afterdialysis.cruor.indexOf('透析器-0度') <= 0&&
+                  afterdialysis.cruor.indexOf('透析器-Ⅲ度') <= 0&&
+                  afterdialysis.cruor.indexOf('透析器-Ⅰ度') <= 0&&
+                  afterdialysis.cruor.indexOf('透析器-Ⅱ度') <= 0"
+                ></label-box
+                >
+                <!-- {{ getCruor(afterdialysis.cruor) }} -->
               </span>
             </td>
           </tr>
@@ -1299,6 +1305,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/outpatientCharges/statementPrint.vue

@@ -42,7 +42,7 @@
       <!--      <print-other :info="info" v-if="org_id == 9919"></print-other>-->
       <!--      <printOne :info=" info" v-if="org_id == 10215 && this.paramsObj.balance_accounts_type == 2"></printOne>-->
       <printFive
-          v-if="org_id == 0  || org_id == 10191"
+          v-if="org_id == 0"
           :info="info"
           :paramsObj="paramsObj"
           :balanceAccounts="balanceAccounts"
@@ -271,8 +271,8 @@ export default {
             scanStyles: false,
           });
         } else if (
-            this.$store.getters.xt_user.org_id == 0 ||
-            this.$store.getters.xt_user.org_id == 10191
+            this.$store.getters.xt_user.org_id == 0
+
         ) {
           const style =
               "@media print {.statementTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 40px;font-size: 14px;border-color: #000;} .statementTable thead{font-size: 28px;text-align: center;font-weight: bold;margin-bottom: 10px;} .statementTable tbody{text-align:left;} .statementTable tbody .view_tr{text-align:center;border: 1px solid;} tbody .dashed_tr{border: 1px dashed;text-align:center} .list_table{width: 100%;margin-bottom: 100px;} tbody tr td div{height:25px;}}";

src/xt_pages/outpatientCharges/summary.vue

@@ -5,7 +5,11 @@
     </div>
     <div class="app-container">
       <div
-          style="display: flex; justify-content: space-between;margin-bottom: 10px;"
+          style="
+          display: flex;
+          justify-content: space-between;
+          margin-bottom: 10px;
+        "
       >
         <div>
           <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
@@ -105,7 +109,7 @@
           </el-button
           >
           <el-button v-if="$store.getters.xt_user.org_id == 10106 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten">报表下载2</el-button>
-          <el-button v-if="$store.getters.xt_user.org_id == 10318 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="export_detail_ten_two">报表下载2</el-button>
+
           <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
           <!--          >报表下载2-->
           <!--          </el-button-->
@@ -114,8 +118,10 @@
           <!--                    <el-button size="small" type="primary" @click="export_detail_three">报表下载2</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-<!--                    <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+          <!--          <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
           <!--          <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
+
+
         </div>
       </div>
       <el-table
@@ -349,7 +355,7 @@ import {jsGetAge, uParseTime} from "@/utils/tools";
 
 import {getHisDataFive, getHisDataSix, getHisDataThree, getHisDataTwo,getAllOrders} from "../../api/his/his";
 
-import {handleData10106,handleData10318} from "../../api/his/his_export";
+import {handleData10106} from "../../api/his/his_export";
 
 export default {
   name: "OutpatientChargesSummary",
@@ -1214,7 +1220,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "周期": "2022年第四季度",
+              "周期": "2022年第三季度",
               "类别": "门诊",
               "医保目录编码": list[i].code,
               "医保目录名称": list[i].name,
@@ -1625,107 +1631,7 @@ export default {
       });
 
     },
-    export_detail_ten_two(){
-      let params = {
-        start_time:this.start_time,
-        end_time:this.end_time
-      };
-      handleData10318(params).then((response) => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          let list = [];
-          for (let i = 0; i < response.data.data.order.length; i++) {
-            let order = response.data.data.order[i];
-
-
-            let obj = {
-              姓名: order.patient.name,
-              身份证: order.patient.id_card_no,
-              西药费:0,
-              化验费:0,
-              检查费:0,
-              治疗费:0,
-              材料费:0,
-              中成药费:0,
-              备注: "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay,
-            }
-            let xiyaoPrice = 0
-            let huaYanPrice = 0
-            let jianChaPrice = 0
-            let zhiLiaoPrice = 0
-            let cailiaoPrice = 0
-            let zhongchengyaoPrice = 0
-
-              for (let b = 0; b < order.info.length; b++) {
-                if(order.info[b].med_chrgitm_type ==  '09'){
-                  xiyaoPrice = xiyaoPrice + order.info[b].det_item_fee_sumamt
-                }
-                if(order.info[b].med_chrgitm_type ==  '04'){
-                  huaYanPrice = huaYanPrice + order.info[b].det_item_fee_sumamt
-                }
-                if(order.info[b].med_chrgitm_type ==  '03'){
-                  jianChaPrice = jianChaPrice + order.info[b].det_item_fee_sumamt
-                }
-                if(order.info[b].med_chrgitm_type ==  '05'){
-                  zhiLiaoPrice = zhiLiaoPrice + order.info[b].det_item_fee_sumamt
-                }
-                if(order.info[b].med_chrgitm_type ==  '08'){
-                  cailiaoPrice = cailiaoPrice + order.info[b].det_item_fee_sumamt
-                }
-                if(order.info[b].med_chrgitm_type ==  '11'){
-                  zhongchengyaoPrice = zhongchengyaoPrice + order.info[b].det_item_fee_sumamt
-                }
-              }
-            obj.西药费 = xiyaoPrice
-            obj.化验费 = huaYanPrice
-            obj.检查费 = jianChaPrice
-            obj.治疗费 = zhiLiaoPrice
-            obj.材料费 = cailiaoPrice
-            obj.中成药费 = zhongchengyaoPrice
-
-
-            list.push(obj)
-          }
-
-          import("@/vendor/Export2Excel").then((excel) => {
-            const tHeader = [
-              "姓名",
-              "身份证",
-              "西药费",
-              "化验费",
-              "检查费",
-              "治疗费",
-              "材料费",
-              "中成药费",
-              "备注",
-            ];
-            const filterVal = [
-              "姓名",
-              "身份证",
-              "西药费",
-              "化验费",
-              "检查费",
-              "治疗费",
-              "材料费",
-              "中成药费",
-              "备注",
-            ];
-            const data = this.formatJson(filterVal, list);
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: "消费明细",
-            });
-          });
-
-
-        }
-      });
-
 
-    },
     GetGoodName(id) {
       switch (id) {
         case 254:
@@ -1918,47 +1824,39 @@ export default {
 
             } else if (order.his_patient.insuplc_admdvs == "440704"){
 
-              insuplc_admdvs_name = "蓬江区"
+              insuplc_admdvs_name = "江海区"
 
 
             } else if (order.his_patient.insuplc_admdvs == "440705"){
 
-              insuplc_admdvs_name = "蓬江区"
+              insuplc_admdvs_name = "新会区"
 
 
             }else if (order.his_patient.insuplc_admdvs == "440781"){
 
-              insuplc_admdvs_name = "蓬江区"
-
+              insuplc_admdvs_name = "台山市"
 
             }else if (order.his_patient.insuplc_admdvs == "440783"){
-
-              insuplc_admdvs_name = "蓬江区"
-
+              insuplc_admdvs_name = "开平市"
 
             }else if (order.his_patient.insuplc_admdvs == "440784"){
-
-
+              insuplc_admdvs_name = "鹤山市"
 
             }else if (order.his_patient.insuplc_admdvs == "440785"){
-
-
+              insuplc_admdvs_name = "恩平市"
 
             }else if (order.his_patient.insuplc_admdvs == "440799"){
-
-
-
+              insuplc_admdvs_name = "市直"
             }
 
-
-
             let obj = {
               就诊号: order.mdtrt_id,
               患者姓名: name,
               开处时间: time,
               险种类型: insutypeName,
               参保所属医保区划: order.his_patient.insuplc_admdvs,
-              属地名称: order.his_patient.insuplc_admdvs,
+              参保号:order.his_patient.id_card_no,
+              属地名称: insuplc_admdvs_name,
               应收金额: order.medfee_sumamt,
               实收金额: order.medfee_sumamt,
               医保统筹金额: order.hifp_pay,
@@ -1992,6 +1890,9 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
+              "参保所属医保区划",
+              "参保号",
+             "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",
@@ -2021,6 +1922,9 @@ export default {
               "患者姓名",
               "开处时间",
               "险种类型",
+              "参保所属医保区划",
+              "参保号",
+              "属地名称",
               "应收金额",
               "实收金额",
               "医保统筹金额",

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -508,6 +508,7 @@
       additions: Array,
       patientInfo: Object,
       hisPatientInfo: Object,
+      goodOutOpen:Object,
       prescriptions: Array,
       record_date: String,
       search_keyword: '',
@@ -2547,7 +2548,7 @@
                           }
                         }
                       }
-                      console.log("new233223322323",newArr)
+                     // console.log("new233223322323",newArr)
                       if(newArr.length > 0){
                         for(let i=0;i<newArr.length;i++){
                           if(newArr[i].is_user!=1){
@@ -2565,8 +2566,9 @@
                     }
                   }
                 }
-
-               if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 9679){
+               
+              //  console.log("good_isopen--------------------",this.goodOutOpen)
+               if(this.goodOutOpen.is_open == 1){
                   var project_arr = []
                   //耗材
                   for(let i=0;i<this.prescriptions.length;i++){

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -165,7 +165,7 @@
                            :org_id="org_id"
                            ref="prescriptions" :prescriptions="prescriptions" :patientInfo="patientInfo"
                            v-on:getSunziValue = "getSunziValue"
-                           :hisPatientInfo="hisPatientInfo" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
+                           :hisPatientInfo="hisPatientInfo" :goodOutOpen="goodOutOpen" @event1="changetwo($event)" @editKeepLoad="editKeepLoad"
                            v-if="titleType == '电子处方'" style="flex:1;"></desk-prescription>
 
 
@@ -607,6 +607,7 @@ export default {
       printList:[],
       printDate:'',
       anticoagulants_confit:null,
+      goodOutOpen:{}
     }
   },
 
@@ -1433,6 +1434,10 @@ export default {
           this.sick = response.data.data.sick
           this.diagnoses = response.data.data.diagnose
           this.additions = response.data.data.additions
+          
+          var goodOutOpen = response.data.data.goodOutOpen
+          console.log("goodOutOpen----------------------",goodOutOpen)
+          this.goodOutOpen = goodOutOpen
 
         }
       })

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -127,8 +127,9 @@
           <div style="text-align: center">(以下空白)</div>
         </div>
         <div class="doctorBox" v-if="org_id != 10188">
-          <p v-if="org_id == 10217 || org_id == 0">
+          <p>
             医师：
+            <!-- {{ item.doctor ? item.doctor : "" }} -->
             <span
               style="width: 100px; display: inline-block"
               v-if="item.creator == ''"
@@ -142,16 +143,13 @@
               {{ doc_name }}
             </span>
             <img
-              style="height: 50px;"
+              style="height: 50px"
               :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""
-
+              v-else
             />
           </p>
-          <p v-else>
-            医师： {{ item.doctor ? item.doctor : "" }}
-          </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
         </div>
         <div class="doctorBox" v-else>
@@ -236,11 +234,6 @@ export default {
   methods: {
     // 电子签名
     setAdminUserES(id,name) {
-      console.log(id)
-      console.log(name)
-      console.log(this.operatorMaps)
-
-
       if (id == 0) {
         return "";
       }

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

@@ -460,10 +460,12 @@ export default {
     handleSizeChange(val) {
       this.limit = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     handleCurrentChange(val) {
       this.page = val;
       this.GetCancelStock();
+      this.getGoodDetailPrintList()
     },
     startTimeChange(val) {
 
@@ -474,6 +476,7 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getPrintStockGood()
 
       }
     },
@@ -485,6 +488,7 @@ export default {
       } else {
 
         this.GetCancelStock();
+        this.getPrintStockGood()
       }
     },
     getTimestamp(time) {
@@ -636,9 +640,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 +657,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 = {
@@ -773,8 +791,8 @@ export default {
       },
 
     exportList(){
-      console.log("shij232333",this.tableOut)
-     
+      
+       console.log("到处数据------------------------",this.tableOut)
        for(let i=0;i<this.tableOut.length;i++){
         this.tableOut[i].index = i+1
         this.tableOut[i].good_name = this.tableOut[i].good_name
@@ -802,6 +820,8 @@ export default {
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else if(this.orgId == 10188){
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
+        }else if(this.orgId == 10402){
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
@@ -810,11 +830,13 @@ export default {
 
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
+        //手动自动出库
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 10402){
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
           console.log("out_count232233232332",this.tableOut[i].out_count)
         }
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919){
+        //自动出库
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919  && this.orgId!=10402){
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
         }
        }

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/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 10387">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

src/xt_pages/stock/query/goodNewQuery.vue

@@ -681,11 +681,10 @@ export default {
        if(response.data.state == 1){
          this.dialogVisible = true
          var list = response.data.data.list
+         console.log("list2332323232wo",list)
          this.tableData = list
          this.totalone = response.data.data.total
       
-        //  this.flushList =  response.data.data.flushList
-        
        }
      })
    

src/xt_pages/stock/stockFlow.vue

@@ -131,6 +131,8 @@
              <span > {{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
+
+     
        </el-table>
        
       <el-pagination

src/xt_pages/user/courseOfDisease.vue

@@ -57,6 +57,7 @@
                 <el-table-column label="记录时间" align="center">
                   <template slot-scope="scope">
                     {{ recordTime(scope.row.record_time) }}
+                   
                   </template>
                 </el-table-column>
                 <el-table-column label="记录医生" align="center">
@@ -86,8 +87,8 @@
               <label class="title"><span class="name">病程日期</span> : </label>
               <el-date-picker v-model="course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 200px;"
-                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
-                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
+                              type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didSelectTemplate">
@@ -132,8 +133,8 @@
               <el-date-picker v-model="edit_course_of_disease_time" prefix-icon="el-icon-date" :editable="false"
                               style="width: 200px;"
                               type="datetime"
-                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm"
-                              value-format="yyyy-MM-dd HH:mm"></el-date-picker>
+                              placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
+                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
 
               <label class="title"><span class="name">日常病程</span> : </label>
               <el-select v-model="select_template" placeholder="可选择病程模板" @change="didEditSelectTemplate">
@@ -185,7 +186,9 @@
     modifyCourseOfDiseaseRecord,
     GetCoursePrintData
   } from '@/api/patient'
-  import { parseTime } from '@/utils'
+  import { parseTime, } from '@/utils'
+  import { uParseTime } from '@/utils/tools'
+
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
   export default {
@@ -285,8 +288,15 @@
         this.current_select_record = record
       },
       recordTime: function(timestamp) {
-        var time = new Date(timestamp * 1000)
-        return parseTime(time, '{y}-{m}-{d} {h}:{m}')
+       
+        if(timestamp < 0){
+           return ""
+         }
+         if(timestamp == ""){
+          return ""
+         }else {
+          return uParseTime(timestamp, '{y}-{m}-{d} {h}:{i}:{s}')
+         }
       },
       doctorName: function(doctor_id) {
         for (let index = 0; index < this.doctors.length; index++) {

src/xt_pages/user/dialysisSolution.vue

@@ -312,6 +312,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShows('抗凝剂')">
+            
             <el-form-item label="抗凝剂:" prop="anticoagulant">
               <el-select
                 v-model="addPlan.anticoagulant"
@@ -2535,7 +2536,7 @@
       this.anticoagulantsSet = this.$store.getters.anticoagulants_set
       this.replacementWays = this.$store.getters.replacement_ways
       this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit
-
+      console.log("抗凝剂22333223wo",this.anticoagulantsConfit)
       this.blood_filters = this.$store.getters.blood_filters
       this.perfusion_apparatus = this.$store.getters.perfusion_apparatus
       this.hemodialysis_machines = this.$store.getters.hemodialysis_machines

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

@@ -221,24 +221,16 @@
             </el-table-column>
             <el-table-column label="透析器/灌流器" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <!-- <span v-if="org_id!=9987&&org_id!=10131&&org_id!=10215 &&org_id!=10233 && org_id!=10290">
-                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">
-                        <span>{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
-                      </span>
-
-                      <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.id > 0 && scope.row.prescription.dialysis_dialyszers == ''">{{scope.row.dialysissolution.dialysis_dialyszers}}</span>
-                    </span> -->
-
-                    <!-- <span v-if="org_id==10131 || org_id == 10215 || org_id == 10233">{{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}</span> -->
                     
-                      <!-- {{scope.row.prescription.dialysis_dialyszers}} -->
                     <span v-if="scope.row.prescription.dialysis_dialyszers =='' ">
                        {{scope.row.dialysissolution.dialysis_dialyszers}}
                     </span>
                     <span v-if="scope.row.prescription.dialysis_dialyszers !=''">{{scope.row.prescription.dialysis_dialyszers}}</span>
+
                     <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' ">
                        {{scope.row.dialysissolution.dialyzer_perfusion_apparatus}}
                     </span>
+
                     <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus !=''">{{scope.row.prescription.dialyzer_perfusion_apparatus}}</span>
   
                     <span v-if="scope.row.prescription.dialysis_irrigation==''">/{{scope.row.dialysissolution.dialysis_irrigation}}</span>

src/xt_pages/workforce/printOne.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="main-contain">
     <div class="position">
-      <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <bread-crumb :crumbs="crumbs" style="flex:1;"></bread-crumb>
+      <el-row style="float: right;margin-right: 20px;">
+        <el-col :span="24">
+          <el-button
+            size="small"
+            type="success"
+            @click="hiddenBtn"
+            >{{hiddenText}}</el-button
+          >
+        </el-col>
+      </el-row>
       <el-row style="float: right">
         <el-col :span="24">
           <el-button
@@ -85,6 +95,8 @@ export default {
       td_4_width: '20%',
 
       month: 1,
+      hiddenFlag: false,
+      hiddenText: '隐藏备注',
       begin_day: 1,
 
       schedules: [
@@ -419,6 +431,15 @@ export default {
     this.getlist()
   },
   methods: {
+    hiddenBtn() {
+      if (this.hiddenFlag) {
+        this.hiddenFlag = false
+        this.hiddenText = '隐藏备注'
+      } else {
+        this.hiddenFlag = true
+        this.hiddenText = '显示备注'
+      }
+    },
     getAllZone() {
       GetAllZone().then((response) => {
         if (response.data.state == 0) {
@@ -616,7 +637,11 @@ export default {
       if (arr.length > 0) {
         for (let i = 0; i < arr.length; i++) {
           arr[i].name = this.nameSplit(arr[i].name)
-          str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '上机备注:' + arr[i].order.order_remark + ')<br/>'
+          if (this.hiddenFlag) {
+            str += arr[i].name + '&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp '
+          } else {
+            str += arr[i].name + '(' + '上次床位:' + arr[i].order.DeviceNumber.zone.name + '-' + arr[i].order.DeviceNumber.number + '  ' + '血管通路:' + this.getBloodAccess(arr[i].order.blood_access_id) + '  ' + '上机备注:' + arr[i].order.order_remark + ')<br/>'
+          }
         }
       }
       console.log(str, 'strstrstr')

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -20,9 +20,8 @@
           <div class="table_panel">
             <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':''">
              
-
               <div class="signPrint" style="font-size:16px;">
-                <div>姓名:
+                <div style="font-size:24px;font-weight: 400;">姓名:
                   <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
                   <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
                   <span v-if="type ==1 && printObj.name == 1">（{{ main_collection.patient.dialysis_no }}，
@@ -33,37 +32,14 @@
                     {{getNewAge(main_collection.id_card_no) }}岁）</span> 
                   
                 </div>
-                <div class="printCell">身份证:
-                    <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
-                    <span v-if="type ==2">{{main_collection.id_card_no}} </span>
-                </div>
-                <div class="printCell">电话号码:
-                    <span v-if="type ==1">{{main_collection.patient.phone}} </span>
-                    <span v-if="type ==2">{{main_collection.phone}} </span>
-                </div>
                 <div class="printCell">
                   透析模式:
                     <span>{{getModeId(main_collection.mode_id)}}</span>
                   
                 </div>
-                <div class="printCell">
-                  <span>
-                    分区/床号
-                    <span  style="width:auto;">{{main_collection.zone.name}}/</span>
-                    {{ main_collection.number.number }}
-                    <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span> -->
-                  </span>
-                 
-                </div>
-                <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
-                    <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
-                </div>
                 <div class="printCell">
                   <span>抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
                 </div>
-             
                 <div class="printCell">
                  首剂：<span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
                   <span v-if="main_collection.dialysissolution.anticoagulant == 2">
@@ -173,7 +149,20 @@
                    </span>
           
                 </div>
-           
+                <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
+                    <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
+                </div>
+                <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
+                    <span>上次透析时长：<span v-if="main_collection.lastafterweight!=null">{{ main_collection.lastafterweight.actual_treatment_hour?main_collection.lastafterweight.actual_treatment_hour:"" }}小时{{ main_collection.lastafterweight.actual_treatment_minute?main_collection.lastafterweight.actual_treatment_minute:"" }}分钟</span></span>
+                </div>
+                <div class="printCell">身份证:
+                    <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
+                    <span v-if="type ==2">{{main_collection.id_card_no}} </span>
+                </div>
+                <div class="printCell">电话号码:
+                    <span v-if="type ==1">{{main_collection.patient.phone}} </span>
+                    <span v-if="type ==2">{{main_collection.phone}} </span>
+                </div>
                 <div class="printCell">
                    透析器:
                     <span v-if="type ==1">{{main_collection.dialysis_order.dialysis_dialyszers}} </span>
@@ -190,6 +179,18 @@
                     <span v-if="type ==1">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
                     <span v-if="type ==2">{{getBloodAccess(main_collection.dialysis_order.blood_access_id)}} </span>
                 </div>
+                
+                <div class="printCell">
+                  <span>
+                    分区/床号
+                    <span  style="width:auto;">{{main_collection.zone.name}}/</span>
+                    {{ main_collection.number.number }}
+                    <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span> -->
+                  </span>
+                 
+                </div>
               
               </div>
            </div>
@@ -234,7 +235,8 @@
         pre_status: 0,
         printObj: {},
         type: 1,
-        printDate: ''
+        printDate: '',
+        loading: false
       }
     },
     components: {
@@ -261,11 +263,20 @@
           week_time: this.week_time,
           zone: this.zone
         }
-        console.log('params', params)
+
+      const loading = this.$loading({
+        lock: true,
+        text: "Loading",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0.7)",
+      });
+  
+       
         getScheduleList(params).then(response => {
           if (response.data.state == 1) {
             var list = response.data.data.list
-  
+            loading.close();
+          
             for (let i = 0; i < list.length; i++) {
               list[i].sort = list[i].number.sort
             }
@@ -305,6 +316,7 @@
             }
             var str = year + '年' + month + '月' + day + '日  ' + days
             this.currentDate = str
+            
           }
         })
 
@@ -364,9 +376,9 @@
         }
       },
       printAction: function() {
-        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
-        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
-        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 200px;} @page {margin-top:10px;}}'
+        const style = '@media print {.signPrint{margin-left:30px;} .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
+        const style1 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
+        const style2 = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .page-break-after{page-break-after:always;}.signPrint{width:40%;float: left;margin-left: 5%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset; margin-bottom: 20px;padding: 20px 10px;} .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } .printCell span{display: inline-block;width: 220px;} @page {margin-top:10px;}}'
         if (this.org_id == 9671 || this.org_id == 10340) {
           printJS({
             printable: 'print_content',
@@ -479,6 +491,12 @@
         })
       },
       getNextScheduleWeekDay() {
+       const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         const start = moment().weekday(1).format('YYYY-MM-DD') // 本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
         var zone = this.zone
@@ -496,13 +514,11 @@
         // }
         var now_time = parseInt(this.week_type) * 86400 + this.start_time
 
-       let weekOfDay = parseInt(moment().format('E'))
-        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
-        console.log("卡 is h2323233232",this.toStamp(next_monday))
-        let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
-        console.log("下周日",this.toStamp(next_sunday))
-
-      
+        const weekOfDay = parseInt(moment().format('E'))
+        const next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD')
+        console.log('卡 is h2323233232', this.toStamp(next_monday))
+        const next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
+        console.log('下周日', this.toStamp(next_sunday))
 
         const params = {
           start_time: this.toStamp(next_monday),
@@ -522,6 +538,7 @@
         getNextScheduleWeekDayOne(params).then(response => {
           this.scheduleData = []
           if (response.data.state == 1) {
+            loading.close()
             var scheduleData = response.data.data.schedule
 
             for (let i = 0; i < scheduleData.length; i++) {
@@ -711,10 +728,10 @@
         return name
       },
       toStamp(date) {
-        const myDate = new Date(date).getTime()/1000 - 28800
+        const myDate = new Date(date).getTime() / 1000 - 28800
         // const stmapEg = Date.parse(myDate) / 1000
-       return myDate
-      },
+        return myDate
+      }
 
     }
   }
@@ -799,7 +816,7 @@
 .printCell{
   span{
     display: inline-block;
-    width: 180px;
+    width: 220px;
   }
 }
 </style>

src/xt_pages/workforce/template.vue

@@ -4231,6 +4231,12 @@ export default {
 
     },
     submitAction() {
+     const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       var template
       if (this.form.firstWeek == 1) {
         template = this.first_template
@@ -4260,6 +4266,7 @@ export default {
       }
       synchroSchedule(params).then(response => {
         if (response.data.state == 1) {
+          loading.close()
           var msg = response.data.data.msg
           this.$message.success("同步成功!")
           this.newVisible = false

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))