Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/router/modules/dialysis.js

@@ -841,6 +841,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/fortyeight',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fortyeight'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_fortyeight',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/fortyOne',
       component: () =>

src/xt_pages/device/components/use_registration_pane.vue

@@ -405,7 +405,10 @@ export default {
             {value:'1',label:'0.22%季铵盐'},
             {value:'2',label:'500mg/l含氯消毒剂'},
             {value:'3',label:'1000mg/l含氯消毒剂'},
-            {value:'4',label:'1500mg/l含氯消毒剂'}
+            {value:'4',label:'1500mg/l含氯消毒剂'},
+            {value: "5", name: "消毒湿巾" },
+            {value:"6", name:"75%酒精"},
+            {value:"7",name:"2000mg/L含氯消毒剂"}
         ],
         disinfectOptions2:[
             {value:'1',label:'0.22%季铵盐'},

src/xt_pages/device/objectRegistration.vue

@@ -502,7 +502,8 @@
          { id: 3, name: "1000mg/l含氯消毒剂" },
          { id: 4, name: "1500mg/l含氯消毒剂" },
          { id: 5, name: "消毒湿巾" },
-         {  id:6, name:"75%酒精"}
+         { id:6, name:"75%酒精"},
+         { id:7,name:"2000mg/L含氯消毒剂"}
          ],
          DisinfectionMode: [
             { id: 1, name: "擦拭" },

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -91,7 +91,7 @@
           >
         </div>
       </template>
-      <template v-if="this.template_id == 6 || this.template_id == 48 || this.template_id == 0">
+      <template v-if="this.template_id == 6 || this.template_id == 0">
         <el-button
           size="small"
           icon="el-icon-printer"
@@ -328,7 +328,17 @@
           >批量打印</el-button
         >
       </template>
-        <template v-if="this.template_id == 47 && this.org_id!=10318">
+      <template v-if="this.template_id == 47 && this.org_id!=10318">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
+      <template v-if="this.template_id == 48">
         <el-button
           size="small"
           icon="el-icon-printer"
@@ -553,6 +563,8 @@
         <el-button type="primary" @click="changeSearchMode">{{
           search_mode == 1 ? "改为病人查询" : "改为日期查询"
         }}</el-button>
+        <el-button type="primary" @click="printOrder">透析并发症登记打印</el-button>
+        <el-button type="primary" @click="toExport">导出</el-button>
       </div>
       <div class="cell clearfix"  v-show="search_mode == 2">
          <label class="title">
@@ -615,11 +627,6 @@
         </div>
       </div>
 
-      <div style="margin-left: 1100px; margin-bottom: 10px;">
-        <el-button type="primary" size="small" @click="printOrder">透析并发症登记打印</el-button>
-        <el-button type="primary" size="small" @click="toExport">导出</el-button>
-      </div>
-
       <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
@@ -634,6 +641,7 @@
         @selection-change="handleSelectionChange"
         highlight-current-row
         :cell-class-name="cellStyle"
+        height="calc(100vh - 300px)"
       >
         <el-table-column
           type="selection"
@@ -1667,7 +1675,6 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total"
       ></el-pagination>
-      <!-- :page-sizes="[20, 40, 60, 80,100,300,500]" -->
     </div>
   </div>
 </template>
@@ -2693,7 +2700,7 @@ export default {
       } else if (this.template_id == 47 && this.org_id!=10318) {
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
       } else if (this.template_id == 48) {
-        this.$router.push({ path: "/dialysis/print/batch/six" });
+        this.$router.push({ path: "/dialysis/print/batch/fortyeight" });
       }else if (this.template_id == 51) {
         this.$router.push({ path: "/dialysis/print/batch/fiftyOne" });
       }else if (this.template_id == 53) {

src/xt_pages/dialysis/components/consumables.vue

@@ -258,7 +258,7 @@
               })
               this.good_types.push(res.data.good_type[a].type_name)
             }
-
+            this.arrKey = []
             this.arrKey.push(...arr)
 
             this.allGoodInfo = res.data.dialysis_goods
@@ -423,7 +423,10 @@
         })
        },
       formatJson(filterVal, jsonData) {
+       
         return jsonData.map(v => filterVal.map(j => v[j]));
+        
+       
       },
 
     }

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -24,30 +24,44 @@
     </div>
     <div class="app-container">
       <div class="filter-container">
-      <el-autocomplete
-          class="checkSearch"
-          popper-class="my-autocomplete"
-          v-model.trim="listQuery.keyword"
-          :fetch-suggestions="querySearchAsync"
-          :trigger-on-focus="false"
-          placeholder="患者姓名"
-          @select="handleSelect"
-        >
-          <i class="el-icon-search el-input__icon" slot="suffix"></i>
-          <template slot-scope="{ item }">
-            <div class="name">{{ item.name }}</div>
-          </template>
-       </el-autocomplete>
-       <el-button type="primary" @click="toSeach">搜索</el-button>
-
-
-      </div>
-      <div class="filter-container">
-      <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
-       <el-button type="primary" @click="toSeachOne">搜索</el-button>
-
-
+        <div style="display: flex;">
+          <div style="flex: 1;">
+            <el-autocomplete
+            class="checkSearch"
+            popper-class="my-autocomplete"
+            v-model.trim="listQuery.keyword"
+            :fetch-suggestions="querySearchAsync"
+            :trigger-on-focus="false"
+            placeholder="患者姓名"
+            @select="handleSelect"
+          >
+            <i class="el-icon-search el-input__icon" slot="suffix"></i>
+            <template slot-scope="{ item }">
+              <div class="name">{{ item.name }}</div>
+            </template>
+            </el-autocomplete>
+            <el-button type="primary" @click="toSeach">搜索</el-button>
+            
+            <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
+            <el-button type="primary" @click="toSeachOne">搜索</el-button>
+          </div>
+          <div style="flex: 1;text-align: right;">
+            <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=0  && org_id!=10340">药品统计</el-button>
+
+            <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 0 || org_id==10340">药品统计</el-button>
+            <el-button type="primary" size="small" @click="toStaticThree">药品月统计</el-button>
+
+            <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
+
+            <el-button type="primary" size="small" @click="toStaticFour">耗材月统计</el-button>
+          </div>
+        </div>
+        
       </div>
+      <!-- <div class="filter-container">
+        <el-input style="width:200px" placeholder="请输入药品名称" v-model="keyword"></el-input>
+        <el-button type="primary" @click="toSeachOne">搜索</el-button>
+      </div> -->
       <div class="cell clearfix">
         <label class="title">
           <span class="name">日期查询:</span>
@@ -57,16 +71,14 @@
           prefix-icon="el-icon-date"
           @change="changeTime"
           :editable="false"
-          style="width: 250px;"
+          style="width: 180px;margin-right: 10px;"
           type="date"
           placeholder="选择日期时间"
           align="right"
           format="yyyy-MM-dd"
           value-format="timestamp"
         ></el-date-picker>
-      </div>
 
-      <div class="cell clearfix">
         <label class="title">
           <span class="name">排序:</span>
         </label>
@@ -81,6 +93,21 @@
         </el-select>
       </div>
 
+      <!-- <div class="cell clearfix">
+        <label class="title">
+          <span class="name">排序:</span>
+        </label>
+        <el-select v-model="sort" placeholder="请选择" @change="selectSortType">
+          <el-option
+            v-for="item in options"
+            :key="item.name"
+            :label="item.name"
+            :value="item.id"
+            >
+          </el-option>
+        </el-select>
+      </div> -->
+
 
       <div class="cell clearfix">
         <label class="title"> <span class="name">排班班次</span> : </label>
@@ -98,7 +125,7 @@
         </div>
       </div>
      <div class="cell clearfix">
-        <label class="title"> <span class="name">收费状态</span> : </label>
+        <label class="title"><span class="name">收费状态</span> : </label>
         <div class="time">
           <ul class>
             <li
@@ -114,7 +141,7 @@
       </div>
 
       <div class="cell clearfix">
-        <label class="title"> <span class="name">分区</span> : </label>
+        <label class="title"><span class="name">分区</span> : </label>
         <div class="time">
           <ul class>
             <li
@@ -131,7 +158,7 @@
 
      <div class="cell clearfix">
         <label class="title"> <span class="name">给药途径</span> : </label>
-        <div class="time">
+        <div class="time" style="width: 90%;">
           <ul class>
             <li
               :class="item.id == delivery_way ? 'active' : ''"
@@ -147,7 +174,7 @@
 
       <div class="cell clearfix">
         <label class="title"> <span class="name">执行频率</span> : </label>
-        <div class="time">
+        <div class="time" style="width: 90%;">
           <ul class>
             <li
               :class="item.id == execution_frequency ? 'active' : ''"
@@ -182,7 +209,7 @@
         <el-button type="primary" size="small" @click="toSettle">收费</el-button>
       </div> -->
 
-      <div style="margin-top: 10px;margin-bottom:10px">
+      <!-- <div style="margin-top: 10px;margin-bottom:10px">
         <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">药品统计</el-button>
 
         <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">药品统计</el-button>
@@ -195,8 +222,7 @@
         <el-button type="primary" size="small" @click="toStaticFour">耗材月统计</el-button>
 
 
-      </div>
-
+      </div> -->
 
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChange"
@@ -269,13 +295,7 @@
             </el-dropdown>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="start_time"
-          align="center"
-          min-width="30px"
-          label="执行时间"
-          sortable
-        >
+        <el-table-column prop="start_time" min-width="30px" label="执行时间" align="center" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.execution_time != 0">
               {{scope.row.execution_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -299,13 +319,7 @@
             <span v-else>{{getXuserName(scope.row.checker)}}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="check_time"
-          align="center"
-          min-width="30px"
-          label="校对时间"
-          sortable
-        >
+        <el-table-column prop="check_time" align="center" label="校对时间" min-width="30px" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.check_time != 0  && org_id!=10460">
               {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -321,13 +335,7 @@
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="created_time"
-          align="center"
-          min-width="30px"
-          label="校对时间"
-          sortable
-        >
+        <el-table-column prop="created_time" align="center" min-width="30px" label="校对时间" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.created_time != 0 && org_id!=10460">
               {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -335,13 +343,7 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="created_time"
-          align="center"
-          min-width="30px"
-          label="收费状态"
-          sortable
-        >
+        <el-table-column prop="created_time"  align="center" min-width="30px" label="收费状态" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.is_settle == 1">
               已收费
@@ -354,7 +356,6 @@
         </el-table-column>
       </el-table>
 
-
      <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChangeOne"
         @current-change="handleCurrentChangeList"
@@ -363,7 +364,7 @@
         highlight-current-row
         :modal-append-to-body="false"
         v-show="showOne">
-        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column type="selection" width="50" align="center"></el-table-column>
         <el-table-column prop="date" label="姓名" align="center" min-width="26px">
           <template slot-scope="scope">
             <span>{{ scope.row.name }}</span>
@@ -418,13 +419,7 @@
             </el-dropdown>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="start_time"
-          align="center"
-          min-width="30px"
-          label="执行时间"
-          sortable
-        >
+        <el-table-column prop="start_time" align="center" min-width="30px" label="执行时间" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.execution_time != 0">
               {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -448,13 +443,7 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="check_time"
-          align="center"
-          min-width="30px"
-          label="校对时间"
-          sortable
-        >
+        <el-table-column prop="check_time" align="center" min-width="30px" label="校对时间" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.check_time != 0">
               {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -467,13 +456,7 @@
             <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
           </template>
         </el-table-column>
-        <el-table-column
-          prop="created_time"
-          align="center"
-          min-width="30px"
-          label="校对时间"
-          sortable
-        >
+        <el-table-column prop="created_time" align="center" min-width="30px" label="校对时间" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.created_time != 0">
               {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
@@ -482,13 +465,7 @@
           </template>
         </el-table-column>
 
-       <el-table-column
-          prop="created_time"
-          align="center"
-          min-width="30px"
-          label="收费状态"
-          sortable
-        >
+       <el-table-column prop="created_time" align="center" min-width="30px" label="收费状态" sortable>
           <template slot-scope="scope">
             <span v-if="scope.row.is_settle == 1">
               已收费
@@ -542,33 +519,40 @@
       </span>
     </el-dialog>
 
-
+    <!-- 药品统计表 -->
     <el-dialog
       title="药品统计表"
       :visible.sync="startdialogVisible"
       width="60%">
       <span>
-        <div class="cell clearfix" style="margin-bottom:10px">
-          <label class="title"> <span class="name">排班班次</span> : </label>
-           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleType" >
-            <el-option
-              v-for="item in schedulArr"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-           </el-select>
-           <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType" multiple >
-            <el-option
-              v-for="item in partitionArr"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-           </el-select>
-           <el-button size="small" icon="el-icon-printer"  @click="toPrintOne" type="primary">打印</el-button>
-           <el-button size="small"  @click="toExportListOne" type="primary">导出</el-button>
+        <div class="eldialog" style="margin-bottom:10px">
+          <div>
+            <label class="title"> <span class="name">排班班次</span> : </label>
+            <el-select v-model="schedule_type" placeholder="请选择" 
+              @change="changeScheduleType"  style="width: 120px;">
+              <el-option
+                v-for="item in schedulArr"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <label class="title"> <span class="name">病区选择</span> : </label>
+            <el-select v-model="partion_type" placeholder="请选择" 
+                  @change="changePartionType" multiple  style="width: 120px;"
+              >
+              <el-option
+                v-for="item in partitionArr"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            <el-button size="small" icon="el-icon-printer"  @click="toPrintOne" type="primary">打印</el-button>
+            <el-button size="small"  @click="toExportListOne" type="primary">导出</el-button>
+          </div>
         </div>
 
       <el-table
@@ -619,40 +603,44 @@
     </el-dialog>
 
 
-  <!-- 长沙南雅 -->
+    <!-- 长沙南雅 -->
     <el-dialog
       title="药品统计表"
       :visible.sync="startdialogVisibleOne"
       width="70%">
       <span>
-        <div class="cell clearfix" style="margin-bottom:10px">
-          <label class="title"> <span class="name">排班班次</span> : </label>
-           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleTypeOne" >
-            <el-option
-              v-for="item in schedulArr"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-           </el-select>
-           <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionTypeOne" multiple>
-            <el-option
-              v-for="item in partitionArr"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-           </el-select>
-           <el-button size="small" icon="el-icon-printer"  @click="toPrintTwo" type="primary">打印</el-button>
+        <div class="eldialog" style="margin-bottom:10px">
+          <div>
+            <label class="title"> <span class="name">排班班次</span> : </label>
+            <el-select v-model="schedule_type" placeholder="请选择"
+               @change="changeScheduleTypeOne" style="width: 120px;">
+              <el-option
+                v-for="item in schedulArr"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <label class="title"> <span class="name">病区选择</span> : </label>
+            <el-select v-model="partion_type" placeholder="请选择" 
+              @change="changePartionTypeOne" multiple style="width: 120px;">
+              <el-option
+                v-for="item in partitionArr"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            <el-button size="small" icon="el-icon-printer"  @click="toPrintTwo" type="primary">打印</el-button>
+          </div>
            <!-- <el-button size="small"  @click="toExportListOne" type="primary">导出</el-button> -->
-
            <!-- <el-button @click="toJiao()">脚本</el-button> -->
         </div>
 
       <el-table
         :data="tableDataList"
-
         border
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
@@ -664,7 +652,7 @@
           align="center"
           prop="name"
           label="序号"
-          width="100"
+          width="60"
         >
           <template slot-scope="scope" >
             <span v-if="scope.row.is_total == 1">{{scope.$index+1}}</span>
@@ -704,7 +692,7 @@
           align="center"
           prop="name"
           label="透析模式"
-          width="150"
+          width="130"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 1">
@@ -751,33 +739,39 @@
       </span>
     </el-dialog>
 
-
+    <!-- 耗材统计表 -->
     <el-dialog
       title="耗材统计表"
       :visible.sync="startdialogVisibleTwo"
       width="60%">
       <span>
-        <div class="cell clearfix" style="margin-bottom:10px">
-          <label class="title"> <span class="name">排班班次</span> : </label>
-           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleTypeTwo" >
-            <el-option
-              v-for="item in schedulArr"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-           </el-select>
-           <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionTypeTwo" multiple >
-            <el-option
-              v-for="item in partitionArr"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-           </el-select>
-           <el-button size="small" icon="el-icon-printer"  @click="toPrintThree" type="primary">打印</el-button>
-           <el-button size="small"  @click="toExportListTwo" type="primary">导出</el-button>
+        <div class="eldialog" style="margin-bottom:10px">
+          <div>
+            <label class="title"> <span class="name">排班班次</span> : </label>
+            <el-select v-model="schedule_type" placeholder="请选择" 
+              @change="changeScheduleTypeTwo" style="width: 120px;">
+              <el-option
+                v-for="item in schedulArr"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+            <label class="title"> <span class="name">病区选择</span> : </label>
+            <el-select v-model="partion_type" placeholder="请选择" 
+              @change="changePartionTypeTwo" multiple  style="width: 120px;">
+              <el-option
+                v-for="item in partitionArr"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+          <div>
+            <el-button size="small" icon="el-icon-printer"  @click="toPrintThree" type="primary">打印</el-button>
+            <el-button size="small"  @click="toExportListTwo" type="primary">导出</el-button>
+          </div>
         </div>
 
       <el-table
@@ -810,9 +804,6 @@
               {{scope.row.count}}
            </template>
         </el-table-column>
-
-
-
       </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -820,164 +811,173 @@
         <el-button type="primary" @click="startdialogVisibleTwo = false">确 定</el-button>
       </span>
     </el-dialog>
-
+    <!-- 药品月统计表 -->
     <el-dialog
       title="药品月统计表"
       :visible.sync="startMothdialogVisible"
       width="60%">
       <span>
-        <div class="cell clearfix" style="margin-bottom:10px">
-          <label class="title"> <span class="name">日期查询</span> : </label>
-          开始:
-          <el-date-picker
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 250px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-           
-        ></el-date-picker>
-          结束:
-          <el-date-picker
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 250px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
+        <div class="eldialog" style="margin-bottom:10px">
+          <div>
+            <label class="title"> <span class="name">日期查询</span> : </label>
+            
+              <el-date-picker
+                v-model="start_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              
+            ></el-date-picker>
+              <span>-</span>
+              <el-date-picker
+                v-model="end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              
+            ></el-date-picker>
+          </div>
+          <div>
+            <el-button size="small"  @click="getAllQuery" type="primary">查询</el-button>
+            <el-button size="small" icon="el-icon-printer"  @click="toPrintTen" type="primary">打印</el-button>
+            <el-button size="small"  @click="toExportListThree" type="primary">导出</el-button>
+          </div>
+          
            
-        ></el-date-picker>
-           <el-button size="small"  @click="getAllQuery" type="primary">查询</el-button>
-           <el-button size="small" icon="el-icon-printer"  @click="toPrintTen" type="primary">打印</el-button>
-           <el-button size="small"  @click="toExportListThree" type="primary">导出</el-button>
         </div>
      
-      <el-table
-        :data="tableMonthList"
-        border
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-         <el-table-column  align="center"  label="序号">
-           <template slot-scope="scope">
-              {{scope.$index+1}}
-           </template>
-        </el-table-column>
-        <el-table-column  align="center"   label="药品名称">
-         <template slot-scope="scope">
-            {{scope.row.advice_name}}
-          </template>
-        </el-table-column>
-        <el-table-column  align="center"  label="规格">
-           <template slot-scope="scope">
-             {{scope.row.specification_name}}
-           </template>
-        </el-table-column>
-
-        <el-table-column  align="center"   label="数量">
-           <template slot-scope="scope">
-             <span v-if="config.is_open!=1">{{getCount(scope.row.child)}}</span>
-             <span v-if="config.is_open ==1">{{getHisCount(scope.row.child,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
-           </template>
-        </el-table-column>
-      
-        <el-table-column align="center" label="厂家">
-           <template slot-scope="scope">
-             {{scope.row.manufacturer_name}}
-           </template>
-        </el-table-column>
-
-
-      </el-table>
+        <el-table
+          :data="tableMonthList"
+          border
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+        >
+          <el-table-column  align="center"  label="序号">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+          </el-table-column>
+          <el-table-column  align="center"   label="药品名称">
+          <template slot-scope="scope">
+              {{scope.row.advice_name}}
+            </template>
+          </el-table-column>
+          <el-table-column  align="center"  label="规格">
+            <template slot-scope="scope">
+              {{scope.row.specification_name}}
+            </template>
+          </el-table-column>
+
+          <el-table-column  align="center"   label="数量">
+            <template slot-scope="scope">
+              <span v-if="config.is_open!=1">{{getCount(scope.row.child)}}</span>
+              <span v-if="config.is_open ==1">{{getHisCount(scope.row.child,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+            </template>
+          </el-table-column>
+        
+          <el-table-column align="center" label="厂家">
+            <template slot-scope="scope">
+              {{scope.row.manufacturer_name}}
+            </template>
+          </el-table-column>
+
+
+        </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="startMothdialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="startMothdialogVisible = false">确 定</el-button>
       </span>
     </el-dialog>
-
-
+    <!-- 耗材统计表 -->
     <el-dialog
       title="耗材统计表"
       :visible.sync="startMonthdialogVisible"
       width="60%">
       <span>
-        <div class="cell clearfix" style="margin-bottom:10px">
-          <label class="title"> <span class="name">日期查询</span> : </label>
-          开始:
-          <el-date-picker
-            v-model="start_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 250px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-           
-        ></el-date-picker>
-          结束:
-          <el-date-picker
-            v-model="end_time"
-            prefix-icon="el-icon-date"
-            :editable="false"
-            style="width: 250px;"
-            type="date"
-            placeholder="选择日期时间"
-            align="right"
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-           
-        ></el-date-picker>
-           <el-button size="small"  @click="getGoodAllQuery" type="primary">查询</el-button>
-           <el-button size="small" icon="el-icon-printer"  @click="toExportListFour" type="primary">打印</el-button>
-           <el-button size="small"  @click="toExportListFour" type="primary">导出</el-button>
+        <div class="eldialog" style="margin-bottom:10px">
+          <div>
+            <label class="title"> <span class="name">日期查询</span> : </label>
+              <el-date-picker
+                v-model="start_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              
+            ></el-date-picker>
+              <span>-</span>
+              <el-date-picker
+                v-model="end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 150px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+              
+            ></el-date-picker>
+          </div>
+
+          <div>
+            <el-button size="small"  @click="getGoodAllQuery" type="primary">查询</el-button>
+            <el-button size="small" icon="el-icon-printer"  @click="toExportListFour" type="primary">打印</el-button>
+            <el-button size="small"  @click="toExportListFour" type="primary">导出</el-button>
+          </div>
         </div>
-      <el-table
-        :data="tableProjectList"
-        border
-        :row-style="{ color: '#303133' }"
-        :header-cell-style="{
-          backgroundColor: 'rgb(245, 247, 250)',
-          color: '#606266'
-        }"
-      >
-         <el-table-column  align="center"  label="序号">
-           <template slot-scope="scope">
-              {{scope.$index+1}}
-           </template>
-        </el-table-column>
-        <el-table-column  align="center"   label="耗材名称">
-         <template slot-scope="scope">
-            {{scope.row.good_name}}
-          </template>
-        </el-table-column>
-        <el-table-column  align="center"  label="规格">
-           <template slot-scope="scope">
-             {{scope.row.specification_name}}
-           </template>
-        </el-table-column>
+        <el-table
+          :data="tableProjectList"
+          border
+          :row-style="{ color: '#303133' }"
+          :header-cell-style="{
+            backgroundColor: 'rgb(245, 247, 250)',
+            color: '#606266'
+          }"
+        >
+          <el-table-column  align="center"  label="序号">
+            <template slot-scope="scope">
+                {{scope.$index+1}}
+            </template>
+          </el-table-column>
+          <el-table-column  align="center"   label="耗材名称">
+          <template slot-scope="scope">
+              {{scope.row.good_name}}
+            </template>
+          </el-table-column>
+          <el-table-column  align="center"  label="规格">
+            <template slot-scope="scope">
+              {{scope.row.specification_name}}
+            </template>
+          </el-table-column>
 
-        <el-table-column  align="center"   label="数量">
-           <template slot-scope="scope">
-              {{scope.row.count}}
-           </template>
-        </el-table-column>
+          <el-table-column  align="center"   label="数量">
+            <template slot-scope="scope">
+                {{scope.row.count}}
+            </template>
+          </el-table-column>
 
 
 
-      </el-table>
+        </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="startMonthdialogVisible = false">取 消</el-button>
@@ -986,8 +986,6 @@
     </el-dialog>
 
     </div>
-
-
   </div>
 </template>
 
@@ -2288,15 +2286,9 @@ export default {
                 this.tableDataList = newList
                 console.log("999999999999999999-------",this.tableDataList)
               }
-
-
-
              }
-
-
           }
         })
-
       },
       toStaticTwo(){
         var str = ""
@@ -2373,6 +2365,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time
         }
+        this.startMothdialogVisible = true
         getDoctorAdviceMonthList(params).then(response=>{
           if(response.data.state == 1){
             this.startMothdialogVisible = true
@@ -2705,7 +2698,7 @@ export default {
           })
       },
       getGoodAllQuery(){
-        this.toExportListThree()
+        this.toStaticFour()
       },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
@@ -3176,11 +3169,13 @@ export default {
       padding: 0 2px;
     }
   }
-
-
   .el-table td .cell{
     white-space: pre-wrap;
   }
+  .eldialog{
+    display: flex;
+    justify-content: space-between;
+  }
 }
 .el-table td,
 .el-table th.is-leaf,

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyThree.vue

@@ -1189,39 +1189,17 @@
                     >
                        
                       <span
-                        v-if="
-                          setAdminUserES(
-                            advices == null
-                              ? 0
-                              : advices[0].advice_doctor
-                              ? advices[0].advice_doctor
-                              : ''
-                          ) == ''
-                        "
+                        style="height: 20px"
+                        v-if="setAdminUserES(advices[0].advice_doctor) == ''"
                       >
-                        {{
-                          getAdminUser(
-                            advices == null
-                              ? 0
-                              : advices[0].advice_doctor
-                              ? advices[0].advice_doctor
-                              : ""
-                          )
-                        }}
+                        {{ getAdminUser(advices[0].advice_doctor) }}
                       </span>
                       <img
-                        style="height: 30px"
-                        :src="
-                          setAdminUserES(
-                            prescription == null
-                              ? 0
-                              : prescription.creater
-                              ? prescription.creater
-                              : ''
-                          )
-                        "
-                        alt=""
-                        srcset=""
+                        class="es-img"
+                        style="height: 25px"
+                        :src="setAdminUserES(advices[0].advice_doctor)"
+                        alt
+                        srcset
                         v-else
                       />
                     </span>
@@ -1456,7 +1434,6 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 // import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
 // import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from "print-js";
-
 export default {
   name: "dialysisPrintOrderFour",
   components: {

src/xt_pages/dialysis/template/DialysisPrintOrderFortyEight.vue

@@ -32,7 +32,7 @@
             <td style="text-align: center" colspan="1">
               年龄:
               <span style="display: inline-block; margin-left: 10px">
-                {{ getAge(patientInfo) }}
+                {{ patientInfo.age }}
               </span>
             </td>
             <td style="text-align: center" colspan="1">
@@ -857,8 +857,8 @@
                     ? true
                     : false
                 "
-              ></label-box
-              >其他:
+              ></label-box>&nbsp;&nbsp;
+              其他:
               <span>{{ predialysis.hemorrhage_other }}</span>
             </td>
           </tr>
@@ -871,7 +871,6 @@
                 :isChecked="prescription.special_medicine == 1 ? true : false"
                 showValue="无"
               ></label-box>
-              <!-- <label-box :isChecked="prescription.special_medicine == 2 ? true : false" showValue="有"></label-box>: -->
               有：
               <label-box
                 :isChecked="prescription.special_medicine == 2 ? true : false"
@@ -1888,6 +1887,7 @@ export default {
       this.queryParams.patient_id = parseInt(this.$route.query.patient_id)
       getDialysisRecord(this.queryParams).then((response) => {
         if (response.data.state === 1) {
+          
           this.adminUser = response.data.data.users;
           this.users = response.data.data.users;
           var patientInfo = response.data.data.patientInfo;
@@ -1898,7 +1898,7 @@ export default {
             patientInfo.gender = "女";
           }
           this.patientInfo = response.data.data.patientInfo;
-          // console.log("透析记录", this.patientInfo);
+          console.log("透析记录", this.patientInfo);
 
           this.patientInfo.birth = uParseTime(
             this.patientInfo.birthday,

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyTwo.vue

@@ -304,32 +304,8 @@
                       v-if="predialysis.internal_fistula!=''"
                     >
                       穿刺方式：
-                      <div class="under_line"
-                        style="width: 100px; text-align: center"
-                        v-if="predialysis&&predialysis.puncture_way == ''"
-                      >
-                         /
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                        v-if="predialysis&&predialysis.puncture_way.indexOf('绳梯') > -1"
-                      >
-                        绳梯
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                        v-if="predialysis&&predialysis.puncture_way.indexOf('扣眼') > -1"
-                      >
-                        扣眼
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 100px; text-align: center"
-                        v-if="predialysis&&predialysis.puncture_way.indexOf('区域') > -1"
-                      >
-                        区域
+                      <div class="under_line" style="width: 100px; text-align: center">
+                         {{ predialysis.puncture_way ? predialysis.puncture_way :'/' }}
                       </div>
                     </div>
                     <div class="inline_block" style="margin-left: 10px;"
@@ -405,281 +381,10 @@
                       <span >透析方式：</span>
                       <div class="under_line"
                         style="width: 100px;text-align: center;font-weight: 600;"
-                        v-if="!prescription.mode_id"
-                      >
-                        /
-                      </div>
-                      <div
-                        class="under_line"
-                        style="width: 100px;text-align: center;font-weight: 600;"
-                        v-if="prescription.mode_id == 1"
                       >
-                        HD
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 2"
-                      >
-                        HDF
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 3"
-                      >
-                        HD+HP
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 4"
-                      >
-                        HP
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 5"
-                      >
-                        HF
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 6"
-                      >
-                        SCUF
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 7"
-                      >
-                        IUF
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 8"
-                      >
-                        HFHD
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 9"
-                      >
-                        HFHD+HP
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 10"
-                      >
-                        PHF
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 11"
-                      >
-                        HFR
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 12"
-                      >
-                        HDF+HP
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 13"
-                      >
-                        CRRT
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 14"
-                      >
-                        腹水回输
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 15"
-                      >
-                        HD前置换
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 16"
-                      >
-                        HD后置换
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 17"
-                      >
-                        HDF前置换
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 18"
-                      >
-                        HDF后置换
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 19"
-                      >
-                        IUF+HD
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 150px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 22"
-                      >
-                        血浆胆红素吸附+HDF
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          bwidth: 150px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 23"
-                      >
-                        血浆胆红素吸附
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          bwidth: 150px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 24"
-                      >
-                       I-HDF
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          bwidth: 150px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 25"
-                      >
-                       HD高通
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 100px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 29"
-                      >
-                        PE
-                      </div>
-                      <div
-                        class="under_line"
-                        style="
-                          width: 150px;
-                          text-align: center;
-                          font-weight: 600;
-                        "
-                        v-if="prescription.mode_id == 30"
-                      >
-                        血浆胆红素吸附+HP
+                        {{ prescription.mode ? prescription.mode :'/' }}
                       </div>
+                      
                     </div>
 
                     <div
@@ -816,8 +521,7 @@
                     </div>
                   </div>
 
-                  <div
-                    class="row"
+                  <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                     <div class="inline_block" style="flex: 1">
@@ -2543,58 +2247,317 @@ export default {
     };
   },
   methods: {
+    checkData() {
+      var checkDate =[]
+      if (this.predialysis.symptom_before_dialysis == "") {
+        const obj5 = "透前症状"
+        checkDate.push(obj5)
+      } if (this.predialysis.temperature == '') {
+        const obj = "透前体温"
+        checkDate.push(obj)
+      } if (this.predialysis.pulse_frequency == "") {
+        const obj1 = "透前脉搏"
+        checkDate.push(obj1)
+      } if (this.predialysis.breathing_rate == "") {
+         const obj2 = "透前呼吸频率"
+         checkDate.push(obj2)
+      } if (
+        this.predialysis.systolic_blood_pressure == 0 ||
+        this.predialysis.diastolic_blood_pressure == 0
+      ) {
+        const obj3 = "透前血压"
+        checkDate.push(obj3)
+      } if( this.predialysis.internal_fistula!='' && 
+          this.predialysis.puncture_way == ''
+      ){
+        const obj4 = "穿刺方式"
+        checkDate.push(obj4)
+      } if( this.predialysis.internal_fistula!='' && 
+          this.predialysis.puncture_needle == ''
+      ){
+        const obj6 = "穿刺针"
+        checkDate.push(obj6)
+      } if (this.predialysis.blood_access_part_opera_name == ''){
+        const obj7 = "血管通路"
+        checkDate.push(obj7)
+      } 
+      // if (this.predialysis.internal_fistula =='') {
+      //   const obj8 = "内瘘"
+      //   checkDate.push(obj8)
+      // } if (this.predialysis.catheter == "" ) {
+      //   const obj9 = "导管"
+      //   checkDate.push(obj9)
+      // } 
+      if (this.prescription.mode == '') {
+        const obj10 = "透析方式"
+        checkDate.push(obj10)
+      } if (this.prescription.displace_liqui_part == '' &&
+            this.prescription.mode_id ==2
+      ) {
+        const obj11 = "置换方式"
+        checkDate.push(obj11)
+      } if (this.prescription.displace_liqui_value =='' &&
+            this.prescription.mode_id ==2
+      ) {
+        const obj12 = "置换量"
+        checkDate.push(obj12)
+      } if (this.prescription.blood_flow_volume == 0) {
+        const obj13 = "血流量"
+        checkDate.push(obj13)
+      } if (this.prescription.dialysis_duration_hour == '' &&
+            this.prescription.dialysis_duration_minute == ''
+      ) {
+        const obj14 = "透析时间"
+        checkDate.push(obj14)
+      } if (
+        this.prescription.dialysis_dialyszers == '' &&
+        this.prescription.dialysis_strainer == ''
+      ){
+        const obj15 = "透析(滤)器"
+        checkDate.push(obj15)
+      } if ( this.prescription.dialysis_irrigation == ''){
+        const obj16 = "灌流器"
+        checkDate.push(obj16)
+      } if ( this.predialysis.is_hemorrhage == 1 && 
+            this.predialysis.hemorrhage == ''
+      ){
+        const obj17 = "出血情况"
+        checkDate.push(obj17)
+      } if ( this.predialysis.weight_after_last_transparency == '') {
+        const obj18 = "上次透后体重"
+        checkDate.push(obj18) 
+      } if (this.predialysis.weight_before == '') {
+        const obj19 = "透前体重"
+        checkDate.push(obj19)
+      } if (this.prescription.target_ultrafiltration == '') {
+        const obj20 = "计划超滤量"
+        checkDate.push(obj20)
+      } if (this.predialysis.dry_weight == '' ) {
+        const obj21 = "干体重"
+        checkDate.push(obj21)
+      } if (this.prescription.calcium == 0) {
+        const obj22 = "钙"
+        checkDate.push(obj22)
+      } if (this.prescription.sodium == 0) {
+        const obj23 = "钠"
+        checkDate.push(obj23)
+      } if (this.prescription.kalium == 0) {
+        const obj24 = "钾"
+        checkDate.push(obj24)
+      } if (this.prescription.bicarbonate == 0) {
+        const obj25 = "碳酸氢根"
+        checkDate.push(obj25)
+      } if (this.prescription.dialysate_flow == 0) {
+        const obj26 = "透析液流量"
+        checkDate.push(obj26)
+      } if (this.prescription.anticoagulant_name =='') {
+        const obj27 = "抗凝剂"
+        checkDate.push(obj27)
+      } if (this.prescription.anticoagulant_shouji == '' &&
+        this.prescription.anticoagulant !=5 && this.prescription.anticoagulant !=''
+      ) {
+        const obj28 = "首剂"
+        checkDate.push(obj28)
+      } 
+      // if (this.prescription.anticoagulant_weichi == '') {
+      //   const obj29 = "维持"
+      //   checkDate.push(obj29)
+      // }
+      if (this.prescription.anticoagulant_zongliang == 0 &&
+         this.prescription.anticoagulant !='' && this.prescription.anticoagulant != 5
+      ) {
+        const obj30 = "总量"
+        checkDate.push(obj30)
+      } if (
+        this.prescription.anticoagulant_gaimingcheng == "" &&
+        this.prescription.anticoagulant == 5
+      ) {
+        const obj31 = "钙名称"
+        checkDate.push(obj31)
+      } if (
+        this.prescription.anticoagulant_gaijiliang == "" &&
+        this.prescription.anticoagulant == 5
+      ) {
+        const obj32 = "钙剂量"
+        checkDate.push(obj32)
+      } if ( this.dialysisOrder && 
+            this.dialysisOrder.DeviceNumber.number == '' &&
+            this.patientInfo.DialysisSchedule.device_number.number ==''
+      ) {
+        const obj33 = "透析机号"
+        checkDate.push(obj33)
+      } if (this.afterdialysis.temperature == "") {
+        const obj34 = "透后体温"
+        checkDate.push(obj34)
+      } if (this.afterdialysis.pulse_frequency == "") {
+        const obj35 = "透后脉搏"
+        checkDate.push(obj35)
+      } if (this.afterdialysis.breathing_rate == "") {
+        const obj36 = "透后呼吸频率"
+        checkDate.push(obj36)
+      } if (
+        this.afterdialysis.systolic_blood_pressure == 0 ||
+        this.afterdialysis.diastolic_blood_pressure == 0
+      ) {
+        const obj37 = "透后血压"
+        checkDate.push(obj37)
+      } if (
+        this.afterdialysis.actual_treatment_hour == 0 &&
+        this.afterdialysis.actual_treatment_minute == 0
+      ) {
+        const obj38 = "实际治疗时间"
+        checkDate.push(obj38)
+      } if (this.afterdialysis.cruor == "") {
+        const obj39 = "透析器凝血"
+        checkDate.push(obj39)
+      } if (this.afterdialysis.internal_fistula == "") {
+        const obj40 = "透后内瘘"
+        checkDate.push(obj40)
+      } 
+      // if (this.afterdialysis.catheter == "") {
+      //   const obj41 = "透后导管"
+      //   checkDate.push(obj41)
+      // } 
+      if (this.afterdialysis.complication == 0) {
+        const obj42 = "并发症"
+        checkDate.push(obj42)
+      } if (this.afterdialysis.catheter != "" && this.afterdialysis.cvc_a =='') {
+        const obj43 = "中心静脉封管(肝素-A端)"
+        checkDate.push(obj43)
+      } if (this.afterdialysis.catheter != "" && this.afterdialysis.cvc_v == '') {
+        const obj44 = "中心静脉封管(肝素-V端)"
+        checkDate.push(obj44)
+      } if (this.afterdialysis.ktv =='') {
+        const obj45 = "KT/V"
+        checkDate.push(obj45)
+      } if (this.afterdialysis.weight_after == '') {
+        const obj46 = "透后体重"
+        checkDate.push(obj46)
+      } if (this.afterdialysis.dialysis_intakes ==''){
+        const obj47 = "透析中入量"
+        checkDate.push(obj47)
+      } if (this.afterdialysis.actual_ultrafiltration ==''){
+        const obj48 = "实际超滤量"
+        checkDate.push(obj48)
+      } if (this.afterdialysis.patient_gose == 0){
+        const obj49 = "患者去向"
+        checkDate.push(obj49)
+      } if (this.summary.dialysis_summary == "") {
+        const obj50 = "透析小结"
+        checkDate.push(obj50)
+      } if (this.afterdialysis.remark == ''){
+        const obj51 = "备注"
+        checkDate.push(obj51)
+      } if (
+        this.dialysisOrder == null ||
+        this.dialysisOrder.puncture_nurse == 0
+      ) {
+        const obj47 = "穿刺护士"
+        checkDate.push(obj47)
+      } if (
+        this.dialysisOrder == null ||
+        this.dialysisOrder.start_nurse == 0
+      ) {
+        const obj48 = "治疗护士"
+        checkDate.push(obj48)
+      } if (this.dialysisOrder == null && this.check.creater == 0) {
+        const obj49 = "核对人员"
+        checkDate.push(obj49)
+      } else if (
+        this.dialysisOrder != null &&
+        this.dialysisOrder.start_nurse == this.check.modifier &&
+        this.check.creater == 0
+      ) {
+        const obj49 = "核对人员"
+        checkDate.push(obj49)
+      } else if (
+        this.dialysisOrder != null &&
+        this.dialysisOrder.start_nurse == this.check.creater &&
+        this.check.modifier == 0
+      ) {
+        const obj49 = "核对人员"
+        checkDate.push(obj49)
+      } else if (
+        this.dialysisOrder != null &&
+        this.dialysisOrder.start_nurse != this.check.creater &&
+        this.dialysisOrder.start_nurse != this.check.modifier &&
+        this.check.creater == 0
+      ) {
+        const obj49 = "核对人员"
+        checkDate.push(obj49)
+      } if (
+        this.dialysisOrder == null ||
+        this.dialysisOrder.finish_nurse == 0
+      ) {
+        const obj50 = "下机护士"
+        checkDate.push(obj50)
+      } if (this.prescription.creater == 0) {
+        const obj51 = "治疗医生"
+        checkDate.push(obj51)
+      }
+      if(this.doctor_advices.length > 0){
+        this.doctor_advices.map((item) =>{
+          if(item.id > 0 && (item.created_time || item.start_time)){
+            if(item.execution_staff ==0 && item.checker ==0 && item.advice_doctor ==0){
+              const obj52 = '医生,执行人员,核对人员'
+              checkDate.push(obj52)
+            }
+          }
+        })
+      }
+      this.getcheckData(checkDate)
+    },
     toUpload() {
+      let dom = document.getElementById("dialysis-print-box-1")
+      //调用方法下载
+      html2canvas(dom, {
+        useCORS: true, //允许跨域
+        allowTaint: false,
+        logging: false,
+        letterRendering: true,
+        ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+        scale: 4, //按比例增加分辨率
+        background: '#fff',//pdf背景色为白色，默认是黑色的
+      }).then((canvas) => {
+        //返回图片dataURL，参数：图片格式和清晰度(0-1)
+        var pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+        //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+        var pdf = new jsPDF('', 'pt', 'a4');
+
+        //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+        //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+        pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
+
+        console.log("pdf222222222222222222",pdf)
+
+        var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+        // console.log("base63",newBase64Data)
+        const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+        console.log("blobwoowowowwo",blob)
+        this.openPdf(blob);
+
+        // var data = {
+        //   name:newBase64Data,
+        // }
+        // UploadPrintOrder(data).then(response=>{
+        //   if(response.data.state == 1){
+        //     var sign =  response.data.data.sign
+        //     console.log("SIGNWWOOWWO")
+        //     var pdfBase64 = response.data.data.pdfBase64
+        //     console.log("pdfBase64",pdfBase64)
+        //     this.$message.success("保存成功!")
+        //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+        //     this.openPdf(blob);
+        //   }
+        // })
 
-         let dom = document.getElementById("dialysis-print-box-1")
-         //调用方法下载
-         html2canvas(dom, {
-           useCORS: true, //允许跨域
-           allowTaint: false,
-           logging: false,
-           letterRendering: true,
-           ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
-           scale: 4, //按比例增加分辨率
-           background: '#fff',//pdf背景色为白色，默认是黑色的
-         }).then((canvas) => {
-           //返回图片dataURL，参数：图片格式和清晰度(0-1)
-           var pageData = canvas.toDataURL('image/jpeg', 1.0);
-
-           //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
-           var pdf = new jsPDF('', 'pt', 'a4');
-
-           //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
-           //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
-           pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
-
-           console.log("pdf222222222222222222",pdf)
-
-           var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
-           // console.log("base63",newBase64Data)
-           const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
-           console.log("blobwoowowowwo",blob)
-           this.openPdf(blob);
-
-           // var data = {
-           //   name:newBase64Data,
-           // }
-           // UploadPrintOrder(data).then(response=>{
-           //   if(response.data.state == 1){
-           //     var sign =  response.data.data.sign
-           //     console.log("SIGNWWOOWWO")
-           //     var pdfBase64 = response.data.data.pdfBase64
-           //     console.log("pdfBase64",pdfBase64)
-           //     this.$message.success("保存成功!")
-           //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
-           //     this.openPdf(blob);
-           //   }
-           // })
-
-           // this.viewPdf(newBase64Data)
-           //保存到pdf，名字是stone
-           // pdf.save('stone.pdf');
-
-         });
-       },
+        // this.viewPdf(newBase64Data)
+        //保存到pdf，名字是stone
+        // pdf.save('stone.pdf');
+
+      });
+    },
 
      viewPdf(content) {
        console.log("content",content);
@@ -2679,222 +2642,6 @@ export default {
         return year_d;
       }
     },
-
-    checkData() {
-      if (this.receiverTreatmentAccess.way == 0) {
-        this.$message.error("入科方式未填");
-      } else if (this.predialysis.symptom_before_dialysis == "") {
-        this.$message.error("透前症状未填");
-      } else if (this.predialysis.temperature == "") {
-        this.$message.error("透前体温未填");
-      } else if (this.predialysis.pulse_frequency == "") {
-        this.$message.error("透前脉搏未填");
-      } else if (this.predialysis.breathing_rate == "") {
-        this.$message.error("透前呼吸频率未填");
-      } else if (
-        this.predialysis.systolic_blood_pressure == 0 ||
-        this.predialysis.diastolic_blood_pressure == 0
-      ) {
-        this.$message.error("透前血压未填完整");
-      } else if (this.predialysis.puncture_way == "") {
-        this.$message.error("穿刺方式未填");
-      } else if (this.predialysis.puncture_needle == "") {
-        this.$message.error("穿刺针未填");
-      } else if (
-        this.predialysis.blood_access_part_id == "" &&
-        this.predialysis.blood_access_part_opera_name == ""
-      ) {
-        this.$message.error("血管通路未填");
-      } else if (this.predialysis.internal_fistula == "") {
-        this.$message.error("透前内瘘未填");
-      } else if (this.predialysis.catheter == "") {
-        this.$message.error("透前导管未填");
-      } else if (this.prescription.mode_id == "") {
-        this.$message.error("透析方式未填");
-      } else if (
-        this.prescription.displace_liqui_part == 0 &&
-        this.prescription.mode_id == 2
-      ) {
-        this.$message.error("置换方式未填");
-      } else if (
-        this.prescription.displace_liqui_value == 0 &&
-        this.prescription.mode_id == 2
-      ) {
-        this.$message.error("置换量未填");
-      } else if (this.prescription.blood_flow_volume == 0) {
-        this.$message.error("血流量未填");
-      } else if (
-        this.prescription.dialysis_duration_hour == 0 &&
-        this.prescription.dialysis_duration_minute == 0
-      ) {
-        this.$message.error("透析时间未填");
-      } else if (
-        this.prescription.dialyzer_perfusion_apparatus == "" &&
-        this.prescription.dialysis_dialyszers == ""
-      ) {
-        this.$message.error("透析器未填");
-      } else if (this.prescription.dialysis_irrigation == "") {
-        this.$message.error("灌流器未填");
-      } else if (
-        this.prescription.plasma_separator == "" &&
-        this.org_id == 9538
-      ) {
-        this.$message.error("血浆分离器未填");
-      } else if (
-        this.prescription.bilirubin_adsorption_column == "" &&
-        this.org_id == 9538
-      ) {
-        this.$message.error("胆红素吸附柱未填");
-      } else if (this.predialysis.weight_before == 0) {
-        this.$message.error("透前体重未填");
-      } else if (this.predialysis.dry_weight == 0) {
-        this.$message.error("干体重未填");
-      } else if (this.prescription.target_ultrafiltration == 0) {
-        this.$message.error("计划超滤量未填");
-      } else if (this.prescription.calcium == 0) {
-        this.$message.error("钙未填");
-      } else if (this.prescription.sodium == 0) {
-        this.$message.error("钠未填");
-      } else if (this.prescription.kalium == 0) {
-        this.$message.error("钾未填");
-      } else if (this.prescription.bicarbonate == 0) {
-        this.$message.error("碳酸氢根未填");
-      } else if (this.prescription.dialysate_flow == 0) {
-        this.$message.error("透析液流量未填");
-      } else if (this.prescription.anticoagulant == 0) {
-        this.$message.error("抗凝剂未填");
-      } else if (
-        this.prescription.anticoagulant_gaimingcheng == "" &&
-        this.prescription.anticoagulant == 5
-      ) {
-        this.$message.error("钙名称未填");
-      } else if (
-        this.prescription.anticoagulant_gaijiliang == "" &&
-        this.prescription.anticoagulant == 5
-      ) {
-        this.$message.error("钙剂量未填");
-      } else if (this.afterdialysis.temperature == 0) {
-        this.$message.error("透后体温未填");
-      } else if (this.afterdialysis.pulse_frequency == 0) {
-        this.$message.error("透后脉搏未填");
-      } else if (this.afterdialysis.breathing_rate == 0) {
-        this.$message.error("透后呼吸频率未填");
-      } else if (
-        this.afterdialysis.systolic_blood_pressure == 0 ||
-        this.afterdialysis.diastolic_blood_pressure == 0
-      ) {
-        this.$message.error("透后血压未填完整");
-      } else if (
-        this.afterdialysis.actual_treatment_hour == 0 &&
-        this.afterdialysis.actual_treatment_minute == 0
-      ) {
-        this.$message.error("实际治疗时间未填");
-      } else if (this.afterdialysis.cruor == "") {
-        this.$message.error("透析器凝血未填");
-      } else if (this.afterdialysis.internal_fistula == "") {
-        this.$message.error("透后内瘘未填");
-      } else if (this.afterdialysis.catheter == "") {
-        this.$message.error("透后导管未填");
-      } else if (this.afterdialysis.weight_after == 0) {
-        this.$message.error("透后体重未填");
-      } else if (this.afterdialysis.weight_loss == 0) {
-        this.$message.error("透后体重减少未填");
-      } else if (this.afterdialysis.dialysis_intakes == 0) {
-        this.$message.error("透析中入量未填");
-      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
-        this.$message.error("实际超滤量未填");
-      } else if (this.summary.dialysis_summary == "") {
-        this.$message.error("透析小结未填");
-      } else if (
-        this.dialysisOrder == null ||
-        this.dialysisOrder.puncture_nurse == 0
-      ) {
-        this.$message.error("穿刺护士未填");
-      } else if (
-        this.dialysisOrder == null ||
-        this.dialysisOrder.start_nurse == 0
-      ) {
-        this.$message.error("治疗护士未填");
-      } else if (this.dialysisOrder == null && this.check.creater == 0) {
-        this.$message.error("核对人员未填");
-      } else if (
-        this.dialysisOrder != null &&
-        this.dialysisOrder.start_nurse == this.check.modifier &&
-        this.check.creater == 0
-      ) {
-        this.$message.error("核对人员未填");
-      } else if (
-        this.dialysisOrder != null &&
-        this.dialysisOrder.start_nurse == this.check.creater &&
-        this.check.modifier == 0
-      ) {
-        this.$message.error("核对人员未填");
-      } else if (
-        this.dialysisOrder != null &&
-        this.dialysisOrder.start_nurse != this.check.creater &&
-        this.dialysisOrder.start_nurse != this.check.modifier &&
-        this.check.creater == 0
-      ) {
-        this.$message.error("核对人员未填");
-      } else if (
-        this.dialysisOrder == null ||
-        this.dialysisOrder.finish_nurse == 0
-      ) {
-        this.$message.error("下机护士未填");
-      } else if (this.prescription.creater == 0) {
-        this.$message.error("医生签名未填");
-      } else if (this.tableAdvice.length > 0) {
-        let num = 0;
-        this.tableAdvice.map((item) => {
-          if (item.id > 0 && (item.created_time || item.start_time)) {
-            this.users.map((it) => {
-              if (it.id == item.advice_doctor) {
-                if (it.user_type == 3) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是医生保存的医嘱");
-                } else if (
-                  it.id == item.execution_staff &&
-                  item.execution_staff > 0
-                ) {
-                  if (it.user_type == 2) {
-                    num++;
-                    this.$message.closeAll();
-                    this.$message.error("存在不是护士执行的医嘱");
-                  }
-                } else if (it.id == item.checker && item.checker > 0) {
-                  if (it.user_type == 2) {
-                    num++;
-                    this.$message.closeAll();
-                    this.$message.error("存在不是护士核对的医嘱");
-                  }
-                }
-              } else if (
-                it.id == item.execution_staff &&
-                item.execution_staff > 0
-              ) {
-                if (it.user_type == 2) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是护士执行的医嘱");
-                }
-              } else if (it.id == item.checker && item.checker > 0) {
-                if (it.user_type == 2) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是护士核对的医嘱");
-                }
-              }
-            });
-          }
-        });
-        if (num == 0) {
-          this.$message.success("核对完成");
-        }
-      } else {
-        this.$message.success("核对完成");
-      }
-    },
     getDisplaceLiquiPart: function (val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;
@@ -3631,6 +3378,16 @@ export default {
           return this.patientgose[i].lable
         }
       }
+    },
+    getcheckData(val){
+      if(val.length >0){
+        const a = val.join(',')
+        console.log('a',a);
+        this.$message.error(a +" 未填");
+        return a
+      }else{
+        this.$message.success('核对完成')
+      }
     }
   },
   watch: {

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

@@ -25,7 +25,7 @@
                   </div>
                   <div style="flex: 1;">
                     透析机号:
-                    <!-- {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }} -->
+                    {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
                   </div>
                 </div>
               </td>
@@ -490,111 +490,110 @@ export default {
   },
   methods: {
     checkData(){
-      if(this.receiverTreatmentAccess.sick_condition == 0){
-        this.$message.error('病情评估未填')
-      }else if(this.receiverTreatmentAccess.way == 0){
-        this.$message.error('入科方式未填')
-      }else if(this.prescription.mode_id == ""){
-        this.$message.error('净化治疗方式未填')
-      }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
-        this.$message.error('透析器或灌流器未填')
-      }else if(this.predialysis.blood_access_part_opera_name == ''){
-        this.$message.error('血管通路未填')
-      }else if(this.predialysis.weight_before == 0){
-        this.$message.error('透前体重未填')
-      }else if(this.predialysis.dry_weight == 0){
-        this.$message.error('干体重未填')
-      }else if(this.prescription.target_ultrafiltration == 0){
-        this.$message.error('预脱水量未填')
-      }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
-        this.$message.error('透析时间未填')
-      }else if(this.prescription.blood_flow_volume == 0){
-        this.$message.error('血流量未填')
-      }else if(this.prescription.displace_liqui_part == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
-        this.$message.error('置换方式未填')
-      }else if(this.prescription.displace_liqui_value == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
-        this.$message.error('置换量未填')
-      }else if(this.prescription.anticoagulant == 0){
-        this.$message.error('抗凝剂未填')
-      }else if(this.prescription.calcium == 0 && this.prescription.dialysate_formulation != 0){
-        this.$message.error('钙未填')
-      }else if(this.prescription.sodium == 0 && this.prescription.dialysate_formulation != 0){
-        this.$message.error('钠未填')
-      }else if(this.prescription.kalium == 0 && this.prescription.dialysate_formulation != 0){
-        this.$message.error('钾未填')
-      }else if(this.predialysis.complication == ''){
-        this.$message.error('透前并发症未填')
-      }else if(this.doctorForm.doctor == ""){
-        this.$message.error('医生签名未填')
-      }else if(this.orderForm.start_nurse == ""){
-        this.$message.error('上机护士未填')
-      }else if(this.check.modifier == 0){
-        this.$message.error('核对护士未填')
-      }else if(this.finshForm.finish_nurse == ""){
-        this.$message.error('下机护士未填')
-      }else if(this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0){
-        this.$message.error('透后血压未填完整')
-      }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
-        this.$message.error('实际治疗时间未填')
-      }else if(this.afterdialysis.actual_ultrafiltration == 0){
-        this.$message.error('实际超滤量未填')
-      }else if(this.afterdialysis.puncture_point_oozing_blood == 0){
-        this.$message.error('拔针后穿刺点渗血未填')
-      }else if(this.afterdialysis.puncture_point_haematoma == 0){
-        this.$message.error('穿刺处血肿未填')
-      }else if(this.afterdialysis.internal_fistula == ""){
-        this.$message.error('压迫后内瘘震颤未填')
-      }else if(this.afterdialysis.complication == ''){
-        this.$message.error('透后并发症未填')
-      }else if(this.afterdialysis.cruor == ""){
-        this.$message.error('透析器凝血未填')
-      }else if(this.summary.dialysis_summary == ""){
-        this.$message.error('透析小结未填')
-      }else if(this.tableAdvice.length > 0){
-        let num = 0
+      var checkDate =[]
+      if(this.predialysis.symptom_before_dialysis_other == '' &&
+        this.predialysis.symptom_before_dialysis == ''
+      ){
+        const obj = "上机前病情"
+        checkDate.push(obj)
+      } if(this.prescription.mode == ""){
+        const obj2 = "治疗方式"
+        checkDate.push(obj2)
+      } if(this.prescription.displace_liqui_value == "" &&
+        (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
+          const obj3 = "置换量"
+          checkDate.push(obj3)
+      } if(this.afterdialysis.actual_treatment_hour == '' && 
+          this.afterdialysis.actual_treatment_minute == ''
+      ){
+        const obj4 = "治疗时间"
+        checkDate.push(obj4)
+      } if(this.prescription.anticoagulant == ''){
+        const obj5 = "抗凝剂未填"
+        checkDate.push(obj5)
+      } if(this.prescription.anticoagulant_shouji == 0 && this.prescription.anticoagulant=='普通肝素'){
+        const obj6 = "首剂"
+        checkDate.push(obj6)
+      } if(this.prescription.anticoagulant_weichi == 0 && this.prescription.anticoagulant=='普通肝素'){
+        const obj7 = "维持"
+        checkDate.push(obj7)
+      } if(this.prescription.anticoagulant_zongliang == 0 && this.prescription.anticoagulant=='普通肝素'){
+        const obj8 = "总量"
+        checkDate.push(obj8)
+      } if(this.prescription.prescription_water == 0){
+        const obj14 = "处方脱水量"
+        checkDate.push(obj14)
+      } if(this.prescription.dialysate_flow == ''){
+        const obj16 = "透析液流量"
+        checkDate.push(obj16)
+      } if(this.prescription.creater == ""){
+        const obj15 = "医生签名"
+        checkDate.push(obj15)
+      } if (this.predialysis.machine_type == '') {
+        const obj19 = "透析机"
+        checkDate.push(obj19)
+      } if (
+        this.prescription.dialysis_irrigation == '' &&
+        this.prescription.dialysis_dialyszers == '' &&
+        this.prescription.dialysis_strainer == ''
+      ){
+        const obj18 = "透析(滤)器"
+        checkDate.push(obj18)
+      } if (this.prescription.calcium == 0) {
+        const obj37 = "钙"
+        checkDate.push(obj37)
+      } if (this.prescription.sodium == 0) {
+        const obj38 = "钠"
+        checkDate.push(obj38)
+      } if (this.prescription.kalium == 0) {
+        const obj39 = "钾"
+        checkDate.push(obj39)
+      } if (this.prescription.bicarbonate == 0) {
+        const obj40 = "碳酸氢根"
+        checkDate.push(obj40)
+      } if (this.predialysis.blood_access_part_opera_name == ''){
+        const obj20 = "血管通路"
+        checkDate.push(obj20)
+      } if (this.dialysisOrder == null ||
+        this.dialysisOrder.puncture_nurse == 0
+      ) {
+        const obj21 = "穿刺者"
+        checkDate.push(obj21)
+      } if(this.summary.dialysis_summary == ""){
+        const obj22 = "透析小结"
+        checkDate.push(obj22)
+      } if(this.assessmentafter.weight_after == 0){
+        const obj9 = "上次透后体重"
+        checkDate.push(obj9)
+      } if(this.predialysis.weight_before == 0){
+        const obj10 = "透前体重"
+        checkDate.push(obj10)
+      } if(this.predialysis.dry_weight == 0){
+        const obj11 = "干体重"
+        checkDate.push(obj11)
+      } if(this.afterdialysis.weight_after == 0){
+        const obj12 = "透后体重"
+        checkDate.push(obj12)
+      } if(this.afterdialysis.actual_ultrafiltration == 0){
+        const obj33 = "净脱水量"
+        checkDate.push(obj33)
+      } if (
+        this.dialysisOrder == null ||
+        this.dialysisOrder.start_nurse == 0
+      ) {
+        const obj23 = "护士签名"
+        checkDate.push(obj23)
+      } if(this.tableAdvice.length > 0){
         this.tableAdvice.map(item => {
           if(item.id > 0 && (item.created_time || item.start_time)){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.user_type == 3){
-                  num++
-                  this.$message.closeAll()
-                  this.$message.error('存在不是医生保存的医嘱')
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士执行的医嘱')
-                  }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士核对的医嘱')
-                  }
-                }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.user_type == 2){
-                  num++
-                  this.$message.closeAll()
-                  this.$message.error('存在不是护士执行的医嘱')
-                }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.user_type == 2){
-                  num++
-                  this.$message.closeAll()
-                  this.$message.error('存在不是护士核对的医嘱')
-                }
-              }
-            })
+            if(item.execution_staff ==0 || item.checker ==0){
+              const obj24 = '执行,核对'
+              checkDate.push(obj24)
+            }
           }
         })
-        if(num == 0){
-          this.$message.success('核对完成')
-        }
-      }else{
-        this.$message.success('核对完成')
       }
+      this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function(val) {
       let displace_liqui_part_name = "/";
@@ -1268,6 +1267,16 @@ export default {
           // checker: 0,
         }
       );
+    },
+    getcheckData(val){
+      if(val.length >0){
+        const a = val.join(',')
+        console.log('a',a);
+        this.$message.error(a +" 未填");
+        return a
+      }else{
+        this.$message.success('核对完成')
+      }
     }
   },
   watch: {

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -99,8 +99,7 @@
           <div class="row" style="display: flex;">
             <div class="inline_block" style="flex: 2;" >
               血管通路：
-              <div class="under_line"
-                style=" width: 52%;
+              <div class="under_line" style=" width: 52%;
                   text-align: center; white-space: normal;
                 ">
                 {{ predialysis.blood_access_part_id ? predialysis.blood_access_part_id : '' }}
@@ -161,11 +160,8 @@
             </div>
             <div class="inline_block" style="flex: 1;">
               置换量：
-              <div class="under_line"
-                style=" width: 50%;
-                  text-align: center;
-                  white-space: normal;
-                "
+              <div class="under_line" style=" width: 50%;
+                  text-align: center; white-space: normal;"
               >
                 {{
                   prescription.displace_liqui_value ? prescription.displace_liqui_value : "/"
@@ -1209,114 +1205,281 @@ export default {
   methods: {
     toUpload() {
 
-         let dom = document.getElementById("dialysis-print-box-1")
-         //调用方法下载
-         html2canvas(dom, {
-           useCORS: true, //允许跨域
-           allowTaint: false,
-           logging: false,
-           letterRendering: true,
-           ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
-           scale: 4, //按比例增加分辨率
-           background: '#fff',//pdf背景色为白色，默认是黑色的
-         }).then((canvas) => {
-           //返回图片dataURL，参数：图片格式和清晰度(0-1)
-           var pageData = canvas.toDataURL('image/jpeg', 1.0);
-
-           //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
-           var pdf = new jsPDF('', 'pt', 'a4');
-
-           //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
-           //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
-           pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
-
-           console.log("pdf222222222222222222",pdf)
-
-           var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
-           // console.log("base63",newBase64Data)
-           const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
-           console.log("blobwoowowowwo",blob)
-           this.openPdf(blob);
-
-           // var data = {
-           //   name:newBase64Data,
-           // }
-           // UploadPrintOrder(data).then(response=>{
-           //   if(response.data.state == 1){
-           //     var sign =  response.data.data.sign
-           //     console.log("SIGNWWOOWWO")
-           //     var pdfBase64 = response.data.data.pdfBase64
-           //     console.log("pdfBase64",pdfBase64)
-           //     this.$message.success("保存成功!")
-           //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
-           //     this.openPdf(blob);
-           //   }
-           // })
-
-           // this.viewPdf(newBase64Data)
-           //保存到pdf，名字是stone
-           // pdf.save('stone.pdf');
-
-         });
-       },
-
-     viewPdf(content) {
-       console.log("content",content);
-       const blob = this.base64ToBlob(content);
-       if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-         window.navigator.msSaveOrOpenBlob(blob);
-       } else {
-         const fileURL = URL.createObjectURL(blob);
-         console.log("fileUlrwowowoow",fileURL)
-         window.open(fileURL);//打开ppf文件
-       }
-     },
-     compare (property) {
-       return function (a, b) {
-           var value1 = a[property]
-           var value2 = b[property]
-           return value1 - value2
-       }
-     },
-
-     openPdf(blob) {
-       const objectUrl = URL.createObjectURL(blob);
-       const a = document.createElement('a');
-       a.href = objectUrl;
-       a.target = '_blank';
-       a.click();
-       URL.revokeObjectURL(objectUrl);
-     },
-      base64ToBlob(base64Data, contentType) {
-       contentType = contentType || '';
-       const sliceSize = 1024;
-       const byteCharacters = window.atob(base64Data);
-       const bytesLength = byteCharacters.length;
-       const slicesCount = Math.ceil(bytesLength / sliceSize);
-       const byteArrays = new Array(slicesCount);
-
-       for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
-         const begin = sliceIndex * sliceSize;
-         const end = Math.min(begin + sliceSize, bytesLength);
-
-         const bytes = new Array(end - begin);
-         for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
-           bytes[i] = byteCharacters[offset].charCodeAt(0);
-         }
-         byteArrays[sliceIndex] = new Uint8Array(bytes);
-       }
-
-       return new Blob(byteArrays, {
-         type: contentType
-       });
-     },
-
-     UploadPdf(res) {
-       let pdfBase64Str = res;
-       let title = "上传给后端的个人报告";
-       var myfile = this.dataURLtoFile(pdfBase64Str, title + ".pdf")
-       console.log("myfile",myfile)
-     },
+      let dom = document.getElementById("dialysis-print-box-1")
+      //调用方法下载
+      html2canvas(dom, {
+        useCORS: true, //允许跨域
+        allowTaint: false,
+        logging: false,
+        letterRendering: true,
+        ddpi: window.devicePixelRatio * 4, //将分辨率提高到特定的DPI 提高四倍
+        scale: 4, //按比例增加分辨率
+        background: '#fff',//pdf背景色为白色，默认是黑色的
+      }).then((canvas) => {
+        //返回图片dataURL，参数：图片格式和清晰度(0-1)
+        var pageData = canvas.toDataURL('image/jpeg', 1.0);
+
+        //方向默认竖直，尺寸ponits，格式a4[595.28,841.89]
+        var pdf = new jsPDF('', 'pt', 'a4');
+
+        //addImage后两个参数控制添加图片的尺寸，此处将页面高度按照a4纸宽高比列进行压缩
+        //  pdf.addImage(pageData, 'JPEG', 0, 0, 595.28, 592.28 / canvas.width * canvas.height);
+        pdf.addImage(pageData, 'JPEG', 0, 0, 555.28, 592.28 / canvas.width * canvas.height);
+
+        console.log("pdf222222222222222222",pdf)
+
+        var newBase64Data =  pdf.output("dataurlstring").split("base64,")[1]
+        // console.log("base63",newBase64Data)
+        const blob = this.base64ToBlob(newBase64Data, 'application/pdf');
+        console.log("blobwoowowowwo",blob)
+        this.openPdf(blob);
+
+        // var data = {
+        //   name:newBase64Data,
+        // }
+        // UploadPrintOrder(data).then(response=>{
+        //   if(response.data.state == 1){
+        //     var sign =  response.data.data.sign
+        //     console.log("SIGNWWOOWWO")
+        //     var pdfBase64 = response.data.data.pdfBase64
+        //     console.log("pdfBase64",pdfBase64)
+        //     this.$message.success("保存成功!")
+        //     const blob = this.base64ToBlob(pdfBase64, 'application/pdf');
+        //     this.openPdf(blob);
+        //   }
+        // })
+
+        // this.viewPdf(newBase64Data)
+        //保存到pdf，名字是stone
+        // pdf.save('stone.pdf');
+
+      });
+    },
+    checkData() {
+      var checkDate =[]
+      if (
+        this.predialysis.blood_access_part_id == "" &&
+        this.predialysis.blood_access_part_opera_name == ""
+      ) {
+        const obj10 = '血管通路'
+        checkDate.push(obj10);
+      }
+      if (this.dialysisOrder !=null &&
+          this.dialysisOrder.DeviceNumber.number == '' &&
+          this.patientInfo.DialysisSchedule.device_number.number == ""
+      ) {
+        const obj9 = '透析机'
+        checkDate.push(obj9);
+      }
+      if (this.dialysisOrder !=null &&
+        this.dialysisOrder.dialysis_dialyszers == "" &&
+        this.dialysisOrder.dialysis_strainer == ""
+      ) {
+        const obj17 = '透析(滤)器'
+        checkDate.push(obj17);
+      } if (this.prescription.mode == "") {
+        const obj13 = '治疗方式'
+        checkDate.push(obj13);
+      } if (
+        this.prescription.displace_liqui_value == 0 &&
+        this.prescription.mode_id == 2
+      ) {
+        const obj15 = '置换量'
+        checkDate.push(obj15);
+      } if (this.dialysisOrder !=null &&
+          this.dialysisOrder.dialysis_irrigation != '0'
+      ) {
+        const obj18 = '灌流器'
+        checkDate.push(obj18);
+      } if (this.predialysis.puncture_way == "") {
+        const obj6 = '穿刺方式'
+        checkDate.push(obj6);
+      } if (this.prescription.anticoagulant_name == '') {
+        const obj28 = '抗凝方式'
+        checkDate.push(obj28);
+      } if (
+        this.prescription.anticoagulant_shouji == "" &&
+        this.prescription.anticoagulant_name == '肝素钠'
+      ) {
+        const obj30 = '首剂'
+        checkDate.push(obj30);
+      } if (
+        this.prescription.anticoagulant_weichi == "" &&
+        this.prescription.anticoagulant_name == '肝素钠'
+      ) {
+        const obj31 = '追加'
+        checkDate.push(obj31);
+      } if (this.predialysis.temperature == "") {
+        const obj2 = '透前体温'
+        checkDate.push(obj2);
+      } if (this.predialysis.pulse_frequency == "") {
+        const obj3 = '透前脉搏'
+        checkDate.push(obj3);
+      } if (
+        this.predialysis.systolic_blood_pressure == 0 ||
+        this.predialysis.diastolic_blood_pressure == 0
+      ) {
+        const obj5 = '透前血压'
+        checkDate.push(obj5);
+      } if (this.predialysis.dry_weight == '') {
+        const obj21 = '干体重'
+        checkDate.push(obj21);
+      } if (this.prescription.target_ultrafiltration == '') {
+        const obj = '医嘱脱水量'
+        checkDate.push(obj);
+      } if (this.prescription.dialysis_duration_hour == "" &&
+        this.prescription.dialysis_duration_minute == ''
+      ) {
+        const obj8 = '治疗时间'
+        checkDate.push(obj8);
+      } if (this.predialysis.puncture_needle == "") {
+        const obj7 = '穿刺针'
+        checkDate.push(obj7);
+      } if (this.prescription.creater == 0) {
+        const obj52 = '医生签名'
+        checkDate.push(obj52);
+      } if (this.prescription.remark == 0) {
+        const objq = '特殊医嘱'
+        checkDate.push(objq);
+      } if (
+        this.dialysisOrder != null &&
+        this.dialysisOrder.puncture_nurse == 0
+      ) {
+        const obj47 = '上机护士'
+        checkDate.push(obj47);
+      } if (
+        this.dialysisOrder != null &&
+        this.dialysisOrder.start_nurse == 0
+      ) {
+        const obj48 = '责任护士'
+        checkDate.push(obj48);
+      } if (this.check != null && this.check.modifier == 0) {
+        const obj49 = '核对护士'
+        checkDate.push(obj49);
+      } if (this.afterdialysis.internal_fistula == "") {
+        const obj39 = '穿刺'
+        checkDate.push(obj39);
+      } if (this.afterdialysis.cruor == "") {
+        const obj11 = '透析器'
+        checkDate.push(obj11);
+      } if (this.afterdialysis.is_eat == "") {
+        const obj12 = '透析中进食'
+        checkDate.push(obj12);
+      } if (
+        this.afterdialysis.actual_treatment_hour == 0 &&
+        this.afterdialysis.actual_treatment_minute == 0
+      ) {
+        const obj37 = '实际治疗时间'
+        checkDate.push(obj37);
+      } if (this.predialysis.weight_before == 0) {
+        const obj20 = '透前体重'
+        checkDate.push(obj20);
+      } if (this.afterdialysis.weight_after == 0) {
+        const obj41 = '透后体重'
+        checkDate.push(obj41);
+      } if (
+        this.afterdialysis.systolic_blood_pressure == 0 ||
+        this.afterdialysis.diastolic_blood_pressure == 0
+      ) {
+        const obj36 = '透后血压'
+        checkDate.push(obj36);
+      } if (this.afterdialysis.pulse_frequency == 0) {
+        const obj34 = '透后脉搏'
+        checkDate.push(obj34);
+      } if (this.afterdialysis.actual_ultrafiltration == 0) {
+        const obj16 = '实际脱水量'
+        checkDate.push(obj16);
+      } if (this.afterdialysis.actual_displacement == '') {
+        const obj14 = '实际置换量'
+        checkDate.push(obj14);
+      } if (this.summary.dialysis_summary == "") {
+        const obj45 = '透析小结'
+        checkDate.push(obj45);
+      } if (this.summary.mission == '') {
+        const obj46 = '宣教知识'
+        checkDate.push(obj46);
+      } if (this.prescription.calcium == 0) {
+        const obj23 = '钙'
+        checkDate.push(obj23);
+      } if (this.prescription.sodium == 0) {
+        const obj24 = '钠'
+        checkDate.push(obj24);
+      } if (this.prescription.kalium == 0) {
+        const obj25 = '钾'
+        checkDate.push(obj25);
+      } if (this.doctor_advices.length > 0) {
+        console.log('12122this.doctor_advices',this.doctor_advices);
+
+        this.doctor_advices.map((item) => {
+          if (item.id > 0 && (item.created_time || item.start_time)) {
+            if(item.advice_doctor ==0 && item.execution_staff == 0){
+              const obj53 = '医嘱医生，执行'
+              checkDate.push(obj53);
+            }
+          }
+        });
+      }
+      console.log('checkDate',checkDate);
+
+      this.getcheckData(checkDate)
+    },
+    viewPdf(content) {
+      console.log("content",content);
+      const blob = this.base64ToBlob(content);
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(blob);
+      } else {
+        const fileURL = URL.createObjectURL(blob);
+        console.log("fileUlrwowowoow",fileURL)
+        window.open(fileURL);//打开ppf文件
+      }
+    },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+    },
+
+    openPdf(blob) {
+      const objectUrl = URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = objectUrl;
+      a.target = '_blank';
+      a.click();
+      URL.revokeObjectURL(objectUrl);
+    },
+    base64ToBlob(base64Data, contentType) {
+      contentType = contentType || '';
+      const sliceSize = 1024;
+      const byteCharacters = window.atob(base64Data);
+      const bytesLength = byteCharacters.length;
+      const slicesCount = Math.ceil(bytesLength / sliceSize);
+      const byteArrays = new Array(slicesCount);
+
+      for (let sliceIndex = 0; sliceIndex < slicesCount; ++sliceIndex) {
+        const begin = sliceIndex * sliceSize;
+        const end = Math.min(begin + sliceSize, bytesLength);
+
+        const bytes = new Array(end - begin);
+        for (let offset = begin, i = 0; offset < end; ++i, ++offset) {
+          bytes[i] = byteCharacters[offset].charCodeAt(0);
+        }
+        byteArrays[sliceIndex] = new Uint8Array(bytes);
+      }
+
+      return new Blob(byteArrays, {
+        type: contentType
+      });
+    },
+
+    UploadPdf(res) {
+      let pdfBase64Str = res;
+      let title = "上传给后端的个人报告";
+      var myfile = this.dataURLtoFile(pdfBase64Str, title + ".pdf")
+      console.log("myfile",myfile)
+    },
     // 获取当前年份，用于年龄计算
     getoldAge() {
       let date = new Date();
@@ -1344,159 +1507,159 @@ export default {
       }
     },
 
-    checkData() {
-      if (
-        this.predialysis.blood_access_part_id == "" &&
-        this.predialysis.blood_access_part_opera_name == ""
-      ) {
-        this.$message.error("血管通路未填");
-      } else if (this.dialysisOrder.dialysis_dialyszers == "") {
-        this.$message.error("透析器未填");
-      } else if (this.predialysis.puncture_needle == "") {
-        this.$message.error("穿刺针未填");
-      } else if (this.prescription.mode == "") {
-        this.$message.error("治疗方式未填");
-      } else if (
-        this.prescription.displace_liqui_value == 0 &&
-        this.prescription.mode == 'HDF'
-      ) {
-        this.$message.error("置换量未填");
-      } else if( this.dialysisOrder.dialysis_irrigation == '') {
-        this.$message.error("灌流器未填");
-      } else if (this.predialysis.puncture_way == "") {
-        this.$message.error("穿刺方式未填");
-      } else if (this.prescription.anticoagulant_name == '') {
-        this.$message.error("抗凝方式未填");
-      } else if (this.predialysis.temperature == "") {
-        this.$message.error("透前体温未填");
-      } else if (this.predialysis.pulse_frequency == "") {
-        this.$message.error("透前脉搏未填");
-      } else if (
-        this.predialysis.systolic_blood_pressure == 0 ||
-        this.predialysis.diastolic_blood_pressure == 0
-      ) {
-        this.$message.error("透前血压未填完整");
-      } else if (this.predialysis.weight_before == 0) {
-        this.$message.error("透前体重未填");
-      } else if (this.predialysis.dry_weight == 0) {
-        this.$message.error("干体重未填");
-      } else if (this.prescription.target_ultrafiltration == 0) {
-        this.$message.error("医嘱脱水未填");
-      } else if (
-        this.prescription.dialysis_duration_hour == 0 &&
-        this.prescription.dialysis_duration_minute == 0
-      ) {
-        this.$message.error("治疗时间未填");
-      } else if (this.afterdialysis.internal_fistula == "") {
-        this.$message.error("透后内瘘未填");
-      } else if (this.afterdialysis.cruor == "") {
-        this.$message.error("透析器凝血未填");
-      } else if (
-        this.afterdialysis.actual_treatment_hour == 0 &&
-        this.afterdialysis.actual_treatment_minute == ''
-      ) {
-        this.$message.error("实际治疗时间未填");
-      } else if (this.afterdialysis.dialysis_during == '') {
-        this.$message.error("透析中进食未填");
-      } else if (this.afterdialysis.weight_after == 0) {
-        this.$message.error("透后体重未填");
-      } else if (
-        this.afterdialysis.systolic_blood_pressure == 0 ||
-        this.afterdialysis.diastolic_blood_pressure == 0
-      )  {
-        this.$message.error("透后血压未填完整");
-      } else if (this.afterdialysis.pulse_frequency == 0) {
-        this.$message.error("透后脉搏未填");
-      } else if (this.afterdialysis.actual_ultrafiltration == 0) {
-        this.$message.error("实际脱水量未填");
-      } else if (this.afterdialysis.actual_displacement == "") {
-        this.$message.error("实际置换量未填");
-      } else if (this.summary.dialysis_summary == "") {
-        this.$message.error("透析小结未填");
-      } else if (
-        this.dialysisOrder == null ||
-        this.dialysisOrder.puncture_nurse == 0
-      ) {
-        this.$message.error("穿刺护士未填");
-      } else if(this.dialysisOrder.start_nurse == 0 || this.dialysisOrder == null) {
-        this.$message.error("责任护士未填");
-      }
-      else if (this.dialysisOrder == null && this.check.creater == 0) {
-        this.$message.error("核对人员未填");
-      } else if (
-        this.dialysisOrder != null &&
-        this.dialysisOrder.start_nurse == this.check.modifier &&
-        this.check.creater == 0
-      ) {
-        this.$message.error("核对人员未填");
-      } else if (
-        this.dialysisOrder != null &&
-        this.dialysisOrder.start_nurse == this.check.creater &&
-        this.check.modifier == 0
-      ) {
-        this.$message.error("核对人员未填");
-      } else if (
-        this.dialysisOrder != null &&
-        this.dialysisOrder.start_nurse != this.check.creater &&
-        this.dialysisOrder.start_nurse != this.check.modifier &&
-        this.check.creater == 0
-      ) {
-        this.$message.error("核对人员未填");
-      } else if (this.prescription.creater == 0) {
-        this.$message.error("医生签名未填");
-      } else if (this.tableAdvice.length > 0) {
-        let num = 0;
-        this.tableAdvice.map((item) => {
-          if (item.id > 0 && (item.created_time || item.start_time)) {
-            this.users.map((it) => {
-              if (it.id == item.advice_doctor) {
-                if (it.user_type == 3) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是医生保存的医嘱");
-                } else if (
-                  it.id == item.execution_staff &&
-                  item.execution_staff > 0
-                ) {
-                  if (it.user_type == 2) {
-                    num++;
-                    this.$message.closeAll();
-                    this.$message.error("存在不是护士执行的医嘱");
-                  }
-                } else if (it.id == item.checker && item.checker > 0) {
-                  if (it.user_type == 2) {
-                    num++;
-                    this.$message.closeAll();
-                    this.$message.error("存在不是护士核对的医嘱");
-                  }
-                }
-              } else if (
-                it.id == item.execution_staff &&
-                item.execution_staff > 0
-              ) {
-                if (it.user_type == 2) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是护士执行的医嘱");
-                }
-              } else if (it.id == item.checker && item.checker > 0) {
-                if (it.user_type == 2) {
-                  num++;
-                  this.$message.closeAll();
-                  this.$message.error("存在不是护士核对的医嘱");
-                }
-              }
-            });
-          }
-        });
-        if (num == 0) {
-          this.$message.success("核对完成");
-        }
-      } else {
-        this.$message.success("核对完成");
-      }
+    // checkData() {
+    //   if (
+    //     this.predialysis.blood_access_part_id == "" &&
+    //     this.predialysis.blood_access_part_opera_name == ""
+    //   ) {
+    //     this.$message.error("血管通路未填");
+    //   } else if (this.dialysisOrder.dialysis_dialyszers == "") {
+    //     this.$message.error("透析器未填");
+    //   } else if (this.predialysis.puncture_needle == "") {
+    //     this.$message.error("穿刺针未填");
+    //   } else if (this.prescription.mode == "") {
+    //     this.$message.error("治疗方式未填");
+    //   } else if (
+    //     this.prescription.displace_liqui_value == 0 &&
+    //     this.prescription.mode == 'HDF'
+    //   ) {
+    //     this.$message.error("置换量未填");
+    //   } else if( this.dialysisOrder.dialysis_irrigation == '') {
+    //     this.$message.error("灌流器未填");
+    //   } else if (this.predialysis.puncture_way == "") {
+    //     this.$message.error("穿刺方式未填");
+    //   } else if (this.prescription.anticoagulant_name == '') {
+    //     this.$message.error("抗凝方式未填");
+    //   } else if (this.predialysis.temperature == "") {
+    //     this.$message.error("透前体温未填");
+    //   } else if (this.predialysis.pulse_frequency == "") {
+    //     this.$message.error("透前脉搏未填");
+    //   } else if (
+    //     this.predialysis.systolic_blood_pressure == 0 ||
+    //     this.predialysis.diastolic_blood_pressure == 0
+    //   ) {
+    //     this.$message.error("透前血压未填完整");
+    //   } else if (this.predialysis.weight_before == 0) {
+    //     this.$message.error("透前体重未填");
+    //   } else if (this.predialysis.dry_weight == 0) {
+    //     this.$message.error("干体重未填");
+    //   } else if (this.prescription.target_ultrafiltration == 0) {
+    //     this.$message.error("医嘱脱水未填");
+    //   } else if (
+    //     this.prescription.dialysis_duration_hour == 0 &&
+    //     this.prescription.dialysis_duration_minute == 0
+    //   ) {
+    //     this.$message.error("治疗时间未填");
+    //   } else if (this.afterdialysis.internal_fistula == "") {
+    //     this.$message.error("透后内瘘未填");
+    //   } else if (this.afterdialysis.cruor == "") {
+    //     this.$message.error("透析器凝血未填");
+    //   } else if (
+    //     this.afterdialysis.actual_treatment_hour == 0 &&
+    //     this.afterdialysis.actual_treatment_minute == ''
+    //   ) {
+    //     this.$message.error("实际治疗时间未填");
+    //   } else if (this.afterdialysis.dialysis_during == '') {
+    //     this.$message.error("透析中进食未填");
+    //   } else if (this.afterdialysis.weight_after == 0) {
+    //     this.$message.error("透后体重未填");
+    //   } else if (
+    //     this.afterdialysis.systolic_blood_pressure == 0 ||
+    //     this.afterdialysis.diastolic_blood_pressure == 0
+    //   )  {
+    //     this.$message.error("透后血压未填完整");
+    //   } else if (this.afterdialysis.pulse_frequency == 0) {
+    //     this.$message.error("透后脉搏未填");
+    //   } else if (this.afterdialysis.actual_ultrafiltration == 0) {
+    //     this.$message.error("实际脱水量未填");
+    //   } else if (this.afterdialysis.actual_displacement == "") {
+    //     this.$message.error("实际置换量未填");
+    //   } else if (this.summary.dialysis_summary == "") {
+    //     this.$message.error("透析小结未填");
+    //   } else if (
+    //     this.dialysisOrder == null ||
+    //     this.dialysisOrder.puncture_nurse == 0
+    //   ) {
+    //     this.$message.error("穿刺护士未填");
+    //   } else if(this.dialysisOrder.start_nurse == 0 || this.dialysisOrder == null) {
+    //     this.$message.error("责任护士未填");
+    //   }
+    //   else if (this.dialysisOrder == null && this.check.creater == 0) {
+    //     this.$message.error("核对人员未填");
+    //   } else if (
+    //     this.dialysisOrder != null &&
+    //     this.dialysisOrder.start_nurse == this.check.modifier &&
+    //     this.check.creater == 0
+    //   ) {
+    //     this.$message.error("核对人员未填");
+    //   } else if (
+    //     this.dialysisOrder != null &&
+    //     this.dialysisOrder.start_nurse == this.check.creater &&
+    //     this.check.modifier == 0
+    //   ) {
+    //     this.$message.error("核对人员未填");
+    //   } else if (
+    //     this.dialysisOrder != null &&
+    //     this.dialysisOrder.start_nurse != this.check.creater &&
+    //     this.dialysisOrder.start_nurse != this.check.modifier &&
+    //     this.check.creater == 0
+    //   ) {
+    //     this.$message.error("核对人员未填");
+    //   } else if (this.prescription.creater == 0) {
+    //     this.$message.error("医生签名未填");
+    //   } else if (this.tableAdvice.length > 0) {
+    //     let num = 0;
+    //     this.tableAdvice.map((item) => {
+    //       if (item.id > 0 && (item.created_time || item.start_time)) {
+    //         this.users.map((it) => {
+    //           if (it.id == item.advice_doctor) {
+    //             if (it.user_type == 3) {
+    //               num++;
+    //               this.$message.closeAll();
+    //               this.$message.error("存在不是医生保存的医嘱");
+    //             } else if (
+    //               it.id == item.execution_staff &&
+    //               item.execution_staff > 0
+    //             ) {
+    //               if (it.user_type == 2) {
+    //                 num++;
+    //                 this.$message.closeAll();
+    //                 this.$message.error("存在不是护士执行的医嘱");
+    //               }
+    //             } else if (it.id == item.checker && item.checker > 0) {
+    //               if (it.user_type == 2) {
+    //                 num++;
+    //                 this.$message.closeAll();
+    //                 this.$message.error("存在不是护士核对的医嘱");
+    //               }
+    //             }
+    //           } else if (
+    //             it.id == item.execution_staff &&
+    //             item.execution_staff > 0
+    //           ) {
+    //             if (it.user_type == 2) {
+    //               num++;
+    //               this.$message.closeAll();
+    //               this.$message.error("存在不是护士执行的医嘱");
+    //             }
+    //           } else if (it.id == item.checker && item.checker > 0) {
+    //             if (it.user_type == 2) {
+    //               num++;
+    //               this.$message.closeAll();
+    //               this.$message.error("存在不是护士核对的医嘱");
+    //             }
+    //           }
+    //         });
+    //       }
+    //     });
+    //     if (num == 0) {
+    //       this.$message.success("核对完成");
+    //     }
+    //   } else {
+    //     this.$message.success("核对完成");
+    //   }
 
-    },
+    // },
     getDisplaceLiquiPart: function (val) {
       let displace_liqui_part_name = "/";
       const displace_liqui_part = this.displaceLiquiPartOptions;
@@ -1637,6 +1800,7 @@ export default {
         ? this.modeOptions[mode_id].name
         : "";
     },
+    // 数据源
     getDialysisRecord() {
       this.loading = true;
 
@@ -2194,9 +2358,7 @@ export default {
         }
 
         if(this.org_id == 0 || this.org_id ==10460){
-          console.log("日期搜哦",this.schedule_date_one)
           var strBirthdayArr = this.schedule_date_one.split("-")
-          console.log("strBirthdayArr",strBirthdayArr)
           var yeaer = strBirthdayArr[0]
           var month = strBirthdayArr[1]
           var day = strBirthdayArr[2]
@@ -2242,7 +2404,16 @@ export default {
         return "0.0";
       }
     },
-
+    getcheckData(val){
+      if(val.length >0){
+        const a = val.join(',')
+        console.log('a',a);
+        this.$message.error(a +" 未填");
+        return a
+      }else{
+        this.$message.success('核对完成')
+      }
+    }
   },
   watch: {
     "patientInfo.gender": function () {

src/xt_pages/dialysis/template/DialysisPrintOrderseventyone.vue

@@ -41,7 +41,9 @@
           <div style="flex: 1;">
             透析床
             <span class="under-line" style="display: inline-block;width: 50%;">
-              {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
+              {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? 
+                dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number 
+              }}
             </span>
           </div>
         </div>
@@ -83,7 +85,7 @@
           </div>
           <div style="flex: 1;">
             置换量
-            <span class="under-line" style="display: inline-block;width: 50%;">
+            <span class="under-line" style="display: inline-block;width: 50%;" >
               {{ prescription.displace_liqui_value ? prescription.displace_liqui_value : "/" }}
             </span>L
           </div>
@@ -527,9 +529,15 @@
               <div style="flex:1">
                 医师签名
                 <div class="under-line" style="display: inline-block;width: 50%;">
-                  <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
+                  <!-- <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
                   <span v-if="doctorForm.url !== ''">
                     <img class="es-img" :src="doctorForm.url" style="height:30px;" />
+                  </span> -->
+                  <span style="display: inline-block;" v-if="setAdminUserES(prescription.creater) == ''">
+                    {{ getAdminUser(prescription.creater)}}
+                  </span>
+                  <span style="display: inline-block;" v-else>
+                    <img style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset />
                   </span>
                 </div>
               </div>
@@ -714,111 +722,132 @@ export default {
   },
   methods: {
     checkData(){
-      if(this.receiverTreatmentAccess.sick_condition == 0){
-        this.$message.error('病情评估未填')
-      }else if(this.receiverTreatmentAccess.way == 0){
-        this.$message.error('入科方式未填')
-      }else if(this.prescription.mode_id == ""){
-        this.$message.error('净化治疗方式未填')
-      }else if(this.prescription.dialyzer_perfusion_apparatus == ""){
-        this.$message.error('透析器或灌流器未填')
-      }else if(this.predialysis.blood_access_part_opera_name == ''){
-        this.$message.error('血管通路未填')
-      }else if(this.predialysis.weight_before == 0){
-        this.$message.error('透前体重未填')
-      }else if(this.predialysis.dry_weight == 0){
-        this.$message.error('干体重未填')
-      }else if(this.prescription.target_ultrafiltration == 0){
-        this.$message.error('预脱水量未填')
-      }else if(this.prescription.dialysis_duration_hour == 0 && this.prescription.dialysis_duration_minute == 0){
-        this.$message.error('透析时间未填')
-      }else if(this.prescription.blood_flow_volume == 0){
-        this.$message.error('血流量未填')
-      }else if(this.prescription.displace_liqui_part == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
-        this.$message.error('置换方式未填')
-      }else if(this.prescription.displace_liqui_value == 0 && (this.prescription.mode_id == 2 || this.prescription.mode_id == 5 || this.prescription.mode_id == 12)){
-        this.$message.error('置换量未填')
-      }else if(this.prescription.anticoagulant == 0){
-        this.$message.error('抗凝剂未填')
-      }else if(this.prescription.calcium == 0 && this.prescription.dialysate_formulation != 0){
-        this.$message.error('钙未填')
-      }else if(this.prescription.sodium == 0 && this.prescription.dialysate_formulation != 0){
-        this.$message.error('钠未填')
-      }else if(this.prescription.kalium == 0 && this.prescription.dialysate_formulation != 0){
-        this.$message.error('钾未填')
-      }else if(this.predialysis.complication == ''){
-        this.$message.error('透前并发症未填')
-      }else if(this.doctorForm.doctor == ""){
-        this.$message.error('医生签名未填')
-      }else if(this.orderForm.start_nurse == ""){
-        this.$message.error('上机护士未填')
-      }else if(this.check.modifier == 0){
-        this.$message.error('核对护士未填')
-      }else if(this.finshForm.finish_nurse == ""){
-        this.$message.error('下机护士未填')
-      }else if(this.afterdialysis.systolic_blood_pressure == 0 || this.afterdialysis.diastolic_blood_pressure == 0){
-        this.$message.error('透后血压未填完整')
-      }else if(this.afterdialysis.actual_treatment_hour == 0 && this.afterdialysis.actual_treatment_minute == 0){
-        this.$message.error('实际治疗时间未填')
-      }else if(this.afterdialysis.actual_ultrafiltration == 0){
-        this.$message.error('实际超滤量未填')
-      }else if(this.afterdialysis.puncture_point_oozing_blood == 0){
-        this.$message.error('拔针后穿刺点渗血未填')
-      }else if(this.afterdialysis.puncture_point_haematoma == 0){
-        this.$message.error('穿刺处血肿未填')
-      }else if(this.afterdialysis.internal_fistula == ""){
-        this.$message.error('压迫后内瘘震颤未填')
-      }else if(this.afterdialysis.complication == ''){
-        this.$message.error('透后并发症未填')
-      }else if(this.afterdialysis.cruor == ""){
-        this.$message.error('透析器凝血未填')
-      }else if(this.summary.dialysis_summary == ""){
-        this.$message.error('透析小结未填')
-      }else if(this.tableAdvice.length > 0){
-        let num = 0
+      var checkDate =[]
+      if(this.patientInfo.name == ''){
+        const obj ='姓名'
+        checkDate.push(obj)
+      } if(this.patientInfo.gender ==''){
+        const obj1 ='性别'
+        checkDate.push(obj1)
+      } if(this.patientInfo.id_card_no ==''){
+        const obj2 ='年龄'
+        checkDate.push(obj2)
+      } if(this.patientInfo.dialysis_no == ''){
+        const obj3 ='透析号'
+        checkDate.push(obj3)
+      } if(this.queryParams.xtdate == ''){
+        const obj4 ='治疗日期'
+        checkDate.push(obj4)
+      } if(this.patientInfo.DialysisSchedule.device_zone.name == ''){
+        const obj5 ='治疗区域'
+        checkDate.push(obj5)
+      } if(this.dialysisOrder == '' && 
+          this.dialysisOrder.DeviceNumber.number =='' && 
+          this.patientInfo.DialysisSchedule.device_number.number ==''
+      ){
+        const obj6 ='透析床号'
+        checkDate.push(obj6)
+      } if(this.predialysis.symptom_before_dialysis == '' && 
+        this.predialysis.symptom_before_dialysis_other == ''
+      ){
+        const obj7 ='上机前病情'
+        checkDate.push(obj7)
+      } if(this.prescription.mode ==''){
+        const obj8 ='治疗方式'
+        checkDate.push(obj8)
+      } if(this.prescription.displace_liqui_part =='' && 
+            this.prescription.mode_id == 2 && 
+            this.prescription.mode_id == 5 && this.prescription.mode_id == 12
+      ){
+        const obj9 ='置换方式'
+        checkDate.push(obj9)
+      } if(this.prescription.displace_liqui_value =='' && this.prescription.mode_id == 2){
+        const obj10 ='置换量 '
+        checkDate.push(obj10)
+      } if(this.prescription.dialysis_duration_hour =='' &&
+          this.prescription.dialysis_duration_minute == ''
+      ){
+        const obj11 ='治疗时间'
+        checkDate.push(obj11)
+      } if(this.prescription.anticoagulant ==''){
+        const obj12 ='抗凝剂'
+        checkDate.push(obj12)
+      } if(this.prescription.anticoagulant_shouji ==''){
+        const obj13 ='首剂'
+        checkDate.push(obj13)
+      } if(this.prescription.anticoagulant_zongliang ==''){
+        const obj14 ='总量'
+        checkDate.push(obj14)
+      } if(this.prescription.target_ultrafiltration ==''){
+        const obj15 ='处方脱水量'
+        checkDate.push(obj15)
+      } if(this.prescription.dialysate_flow ==''){
+        const obj16 ='透析液流量'
+        checkDate.push(obj16)
+      } if(this.prescription.creater ==0){
+        const obj17 ='医师签名'
+        checkDate.push(obj17)
+      } if(this.predialysis.machine_type ==''){
+        const obj18 ='透析机'
+        checkDate.push(obj18)
+      } if(this.prescription.dialysis_dialyszers =='' && 
+            this.prescription.dialysis_strainer ==''
+      ){
+        const obj19 ='透 (滤) 器'
+        checkDate.push(obj19)
+      } if(this.prescription.dialysis_irrigation ==''){
+        const obj20 ='灌流器'
+        checkDate.push(obj20)
+      } if (this.predialysis.blood_access_part_opera_name == ''){
+        const obj21 = "血管通路"
+        checkDate.push(obj21)
+      } if(this.dialysisOrder !=null && this.dialysisOrder.start_nurse ==0){
+        const obj22 = "操作者"
+        checkDate.push(obj22)
+      } if(this.predialysis.puncture_needle == '' && this.org_id == 10612){
+        const obj23 = "穿刺针"
+        checkDate.push(obj23)
+      } if(this.dialysisOrder.puncture_nurse == '' && this.org_id == 10612 &&
+        this.dialysisOrder != null 
+      ){
+        const obj23 = "穿刺护士"
+        checkDate.push(obj23)
+      } if(this.assessmentafter.weight_after == '' && 
+            this.afterdialysis.last_after_weight == ''
+      ){
+        const obj24 = "上次透后体重"
+        checkDate.push(obj24)
+      } if(this.predialysis.weight_before == 0){
+        const obj25 = "透前体重"
+        checkDate.push(obj25)
+      } if(this.predialysis.dry_weight == 0){
+        const obj26 = "干体重"
+        checkDate.push(obj26)
+      } if(this.afterdialysis.weight_after == 0){
+        const obj27 = "透后体重"
+        checkDate.push(obj27)
+      } if(this.afterdialysis.actual_ultrafiltration == 0){
+        const obj28 = "净脱水量"
+        checkDate.push(obj28)
+      } if (this.summary.dialysis_summary == "") {
+        const obj29 = "透析小结"
+        checkDate.push(obj29)
+      } if(this.dialysisOrder != null && 
+            this.dialysisOrder.start_nurse ==''
+      ){
+        const obj30 = "护士签名"
+        checkDate.push(obj30)
+      } if(this.tableAdvice.length > 0){
         this.tableAdvice.map(item => {
           if(item.id > 0 && (item.created_time || item.start_time)){
-            this.users.map(it => {
-              if(it.id == item.advice_doctor){
-                if(it.user_type == 3){
-                  num++
-                  this.$message.closeAll()
-                  this.$message.error('存在不是医生保存的医嘱')
-                }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士执行的医嘱')
-                  }
-                }else if(it.id == item.checker && item.checker > 0){
-                  if(it.user_type == 2){
-                    num++
-                    this.$message.closeAll()
-                    this.$message.error('存在不是护士核对的医嘱')
-                  }
-                }
-              }else if(it.id == item.execution_staff && item.execution_staff > 0){
-                if(it.user_type == 2){
-                  num++
-                  this.$message.closeAll()
-                  this.$message.error('存在不是护士执行的医嘱')
-                }
-              }else if(it.id == item.checker && item.checker > 0){
-                if(it.user_type == 2){
-                  num++
-                  this.$message.closeAll()
-                  this.$message.error('存在不是护士核对的医嘱')
-                }
-              }
-            })
+            if(item.execution_staff ==0 && item.checker ==0){
+              const obj32 = '执行,核对'
+              checkDate.push(obj32)
+            }
           }
         })
-        if(num == 0){
-          this.$message.success('核对完成')
-        }
-      }else{
-        this.$message.success('核对完成')
       }
+      this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function(val) {
       let displace_liqui_part_name = "/";
@@ -1133,6 +1162,7 @@ export default {
           //console.log("医师签名", doctorname);
           this.doctorForm.doctor = doctorname.user_name;
           this.doctorForm.url = doctorname.url;
+          console.log("医师签名", this.doctorForm);
           var prescription = response.data.data.dialysisPrescription;
           console.log("透析处方", prescription);
           if (prescription.anticoagulant == 6) {
@@ -1515,6 +1545,16 @@ export default {
           // checker: 0,
         }
       );
+    },
+    getcheckData(val){
+      if(val.length >0){
+        const a = val.join(',')
+        console.log('a',a);
+        this.$message.error(a +" 未填");
+        return a
+      }else{
+        this.$message.success('核对完成')
+      }
     }
   },
   watch: {

src/xt_pages/management/components/EditMachineForm.vue

@@ -190,7 +190,11 @@ export default {
         { id: 1, name: "0.22%季铵盐" },
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
-        { id: 4, name: "1500mg/l含氯消毒剂" }
+        { id: 4, name: "1500mg/l含氯消毒剂" },
+        { id: 5,  name:"消毒湿巾"},
+        { id:6, name:"75%酒精"},
+        { id:7,name:"2000mg/L含氯消毒剂"}
+
       ],
       // 夜路消毒方式
       sterilizeType: [

src/xt_pages/management/components/PlanForm.vue

@@ -218,7 +218,9 @@ export default {
         { id: 2, name: "500mg/l含氯消毒剂" },
         { id: 3, name: "1000mg/l含氯消毒剂" },
         { id: 4, name: "1500mg/l含氯消毒剂" },
-        { id: 5,  name:"消毒湿巾"}
+        { id: 5,  name:"消毒湿巾"},
+        { id:6, name:"75%酒精"},
+        { id:7,name:"2000mg/L含氯消毒剂"}
       ],
       // 夜路消毒方式
       sterilizeType: [

src/xt_pages/management/components/UserForm.vue

@@ -1103,7 +1103,8 @@ export default {
         { id: 3, name: "1000mg/l含氯消毒剂" },
         { id: 4, name: "1500mg/l含氯消毒剂" },
         { id: 5, name: "消毒湿巾" },
-        { id: 6, name: "1.85g/L季铵盐" }
+        { id: 6, name: "1.85g/L季铵盐" },
+        { id:7,name:"2000mg/L含氯消毒剂"}
       ],
       // 夜路消毒方式
       sterilizeType: [
@@ -1411,6 +1412,9 @@ export default {
             if (information[index].disinfectant_type === 6) {
                information[index].disinfectant_type = "1.85g/L季铵盐";
             }
+            if (information[index].disinfectant_type === 7) {
+               information[index].disinfectant_type = "2000mg/l含氯消毒剂";
+            }
 
             if (information[index].disinfection === 1) {
               information[index].disinfection = "已消毒";
@@ -1997,6 +2001,9 @@ export default {
             if (information[index].disinfectant_type === 6) {
               information[index].disinfectant_type = "1.85g/L季铵盐";
             }
+            if (information[index].disinfectant_type === 7) {
+              information[index].disinfectant_type = "2000mg/l含氯消毒剂";
+            }
 
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";
@@ -2339,6 +2346,10 @@ export default {
               information[index].disinfectant_type = "1.85g/L季铵盐";
             }
 
+            if (information[index].disinfectant_type === 7) {
+              information[index].disinfectant_type = "2000mg/l含氯消毒剂";
+            }
+
             if (information[index].disinfection === 0) {
               information[index].disinfection = "";
             }

src/xt_pages/management/home.vue

@@ -3000,7 +3000,9 @@ export default {
           { id: 3, name: '1000mg/l含氯消毒剂' },
           { id: 4, name: '1500mg/l含氯消毒剂' },
           { id: 5,  name:  "消毒湿巾"},
-          { id:6,name:"1.85g/L季铵盐"}
+          { id:6,name:"1.85g/L季铵盐"},
+          { id:7,name:"2000mg/L含氯消毒剂"}
+
         ],
         // 夜路消毒方式
         sterilizeType: [

src/xt_pages/outpatientCharges/listPrint.vue

@@ -15,7 +15,7 @@
 
     <div class='dialysisPage' style="padding-top:40px;">
 
-      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191 && org_id != 0"
+      <listPrintforu v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675 && org_id!=10485 && org_id != 10191"
         :list="list" :patient="patient" :order="order" :admin="admin">
       </listPrintforu>
       <printOne v-if="org_id == 10191" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
@@ -23,7 +23,7 @@
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
      <list-print-three v-if="org_id == 10215 || org_id==9675  || org_id ==10485" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
-      <print-two10265  v-if="org_id == 10265 || org_id == 0 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
+      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
     </div>
   </div>
 </template>
@@ -101,7 +101,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            if(this.org_id == 10265 || this.org_id == 0){
+            if(this.org_id == 10265 ){
               this.order = response.data.data.order
               this.patient = response.data.data.patient
               this.admin = response.data.data.admin_info
@@ -596,7 +596,17 @@
             })
 
 
-          }else {
+          }else if(this.org_id == 10210 || this.org_id == 0){
+            const style =
+              '@media print {.listTitle{font-size: 20px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 14px;justify-content: space-around;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 12px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 20px;}}'
+            printJS({
+              printable: 'list-print',
+              type: 'html',
+              style: style,
+              scanStyles: false
+            })
+          }
+          else {
             const style =
               '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 12px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 20px;}}'
             printJS({

src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue

@@ -24,31 +24,31 @@
         
         <table class="listTable" style="text-align: center;">
             <tr style="border-bottom: 1px solid black;">
-              <td style="width:12%" v-if="org_id==10489 || org_id==0">开方日期</td>
+              <td style="width:12%" v-if="org_id==10489">开方日期</td>
               <td style="width:20%">医保编码</td>
               <td style="width:20%">项目名称</td>
-              <td style="width:13%">规格</td>
+              <td style="width:12%">规格</td>
               <td style="width:5%">数量</td>
               <td style="width:5%">单位</td>
-              <td style="width:8%">单价(元)</td>
-              <td style="width:8%">金额(元)</td>
+              <td style="width:7%">单价(元)</td>
+              <td style="width:7%">金额(元)</td>
               <td style="width:8%">自付比例</td>
             </tr>
             <tr v-for="(item,index) in list" style="line-height: 30px;">
-                <td style="width:12%" v-if="org_id==10489|| org_id==0">
+                <td style="width:12%" v-if="org_id==10489">
                   <span v-if="item.code!=undefined">{{getTimes(item.record_date) }}</span>
                 </td>
                 <td style="width:20%">{{item.code}}</td>
                 <td style="width:20%">{{item.name}}</td>
-                <td style="width:13%">{{item.spec}}</td>
+                <td style="width:12%">{{item.spec}}</td>
                 <td style="width:5%" >
                   <span v-if="item.code!=undefined">{{item.count}}</span>
                 </td>
                 <td style="width:5%" >{{item.unit}}</td>
-                <td style="width:8%">
+                <td style="width:7%">
                   <span v-if="item.code!=undefined">{{(item.price*1).toFixed(2)}}</span>
                 </td>
-                <td style="width:8%">{{(item.price * item.count).toFixed(2)}}</td>
+                <td style="width:7%">{{(item.price * item.count).toFixed(2)}}</td>
                 <td style="width:8%" v-if="item.code!=undefined">
                   {{(item.selfpay_prop)*100}}
                   <span v-if="item.selfpay_prop !=''">%</span>
@@ -197,15 +197,15 @@ export default {
   padding:20px 10px;
 }
 .listTitle{
-  font-size: 24px;
+  font-size: 20px;
   text-align: center;
   font-weight: bold;
   margin-bottom: 10px;
 }
 .listInfo{
   display: flex;
-  font-size: 16px;
-  justify-content: space-between;
+  font-size: 14px;
+  justify-content: space-around;
   margin: 10px 0;
 }
 .listTable{

src/xt_pages/outpatientCharges/summary.vue

@@ -4,41 +4,19 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
     </div>
     <div class="app-container">
-      <div
-        style="
-          display: flex;
-          justify-content: space-between;
-          margin-bottom: 10px;
-        "
-      >
-        <div>
-          <!--<el-button size="small" style="margin-left:10px;" class="filter-item" type="primary"-->
-          <!--@click="Action">-->
-          <!--导出-->
-          <!--</el-button>-->
-          <el-input
-            size="small"
-            style="width: 150px"
-            v-model="keywords"
-            @input="searchAction"
+      <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
+        <div class="content_top" style="margin-right: 10px;">
+          <el-input  style="width: 120px"
+            v-model="keywords" @input="searchAction"
             @keyup.enter.native="searchAction"
-            class="filter-item"
-            placeholder="请输入患者姓名"
+            class="filter-item" placeholder="请输入患者姓名"
           />
-          <el-button
-            size="small"
-            style="margin-left: 10px"
-            class="filter-item"
-            type="primary"
-            @click="searchAction"
-          >
+          <el-button  class="filter-item" type="primary" @click="searchAction">
             搜索
           </el-button>
-          <el-select
-            size="small"
-            v-model="sort_type"
+          <el-select  v-model="sort_type"
             placeholder="请选择"
-            style="width: 150px; margin-left: 10px"
+            style="width: 120px;"
             @change="changeSortType"
           >
             <el-option
@@ -49,15 +27,14 @@
             >
             </el-option>
           </el-select>
-
-          <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType">
+          <el-select v-model="sch_type" placeholder="请选择班次" @change="handleSchType" style="width: 120px;">
             <el-option label="全部" value="0"></el-option>
             <el-option label="上午" value="1"></el-option>
             <el-option label="下午" value="2"></el-option>
             <el-option label="晚上" value="3"></el-option>
           </el-select>
 
-          <el-select v-model="zoneVal" placeholder="请选择分区" style="margin-right:20px;" @change="handleZoneChange">
+          <el-select v-model="zoneVal" placeholder="请选择分区" style="width: 120px;" @change="handleZoneChange">
             <el-option
               v-for="item in zone_options"
               :key="item.id"
@@ -65,64 +42,11 @@
               :value="item.id">
             </el-option>
           </el-select>
-
-
-          <el-select v-model="medTypeVal" placeholder="请选择医疗类别" style="margin-right:20px;"
-                     @change="handleMedChange">
-            <el-option
-              v-for="item in med_options"
-              :key="item.id"
-              :label="item.text"
-              :value="item.id">
-            </el-option>
-          </el-select>
-
-          <!-- <el-date-picker
-              size="small"
-              v-model="start_time"
-              prefix-icon="el-icon-date"
-              @change="handleStartTimeChange"
-              :editable="false"
-              :clearable="false"
-              style="width: 196px; margin-right: 10px"
-              type="date"
-              placeholder="选择开始日期"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              align="right"
-          ></el-date-picker>
-
-          <el-date-picker
-              size="small"
-              v-model="end_time"
-              prefix-icon="el-icon-date"
-              @change="handleEndTimeChange"
-              :editable="false"
-              :clearable="false"
-              style="width: 196px; margin-right: 10px"
-              type="date"
-              placeholder="选择结束日期"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"
-              align="right"
-          ></el-date-picker> -->
         </div>
-        <!-- 按钮 -->
-        <div>
-          <!-- <el-popover
-                      placement="bottom"
-                      width="210"
-                      trigger="click">
-                      <el-button size="small" ref="button_two" @click="open(1)">打印清单</el-button>
-                      <el-button size="small" ref="button_six" @click="open(2)">打印汇总</el-button>
-                      <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
-
-                    </el-popover> -->
+        <div class="content_top">
           <el-button
-            size="small" type="primary" @click="query">查询
-          </el-button>
-          <el-button
-            v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 || $store.getters.xt_user.org_id == 10610 || $store.getters.xt_user.org_id == 0 "
+            v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 ||
+                $store.getters.xt_user.org_id == 10610 || $store.getters.xt_user.org_id == 0"
             size="small" type="primary" @click="batch_print_settlte">批量打印结算单
           </el-button>
           <el-button size="small" type="primary" @click="export_detail"
@@ -139,84 +63,80 @@
           <el-button size="small" type="primary"
                      @click="export_detail_ten_five">导出就诊凭证类型人员
           </el-button>
+        </div>
+      </div>
 
-          <!--                    <el-button  size="small" type="primary" @click="export_detail_ten_three">报表下载4</el-button>-->
-
+      <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
+        <div class="content_top" style="margin-right: 10px;">
+          <el-date-picker size="small" v-model="start_time" prefix-icon="el-icon-date" 
+            @change="handleStartTimeChange":editable="false" :clearable="false" 
+            style="width: 150px;"
+            type="date"
+            placeholder="选择开始日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            align="right"
+          ></el-date-picker>
+          <span style="text-align: center;">-</span>
+          <el-date-picker
+            size="small"
+            v-model="end_time"
+            prefix-icon="el-icon-date"
+            @change="handleEndTimeChange"
+            :editable="false"
+            :clearable="false"
+            style="width: 150px; "
+            type="date"
+            placeholder="选择结束日期"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            align="right"
+          ></el-date-picker>
 
-          <!--          <el-button size="small" type="primary" @click="export_detail_two"-->
-          <!--          >报表下载2-->
-          <!--          </el-button-->
-          <!--          >-->
+          <el-select size="small" v-model="staff" placeholder="请选择缴费人员"
+                   style="width:120px;" >
+            <el-option
+              v-for="item,index in admins"
+              :key="index"
+              :label="item.user_name"
+              :value="item.user_name">
+            </el-option>
+          </el-select>
 
+          <el-select v-model="medTypeVal" @change="handleMedChange"
+            placeholder="请选择医疗类别" style="width: 120px;"
+          >
+            <el-option
+              v-for="item in med_options"
+              :key="item.id"
+              :label="item.text"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+        <div class="content_button">
           <el-button size="small" type="primary" @click="export_detail_three" v-if="$store.getters.xt_user.org_id == 10265 || $store.getters.xt_user.org_id == 0">报表下载12</el-button>
           <el-button size="small" type="primary" @click="accounts_click()">门诊结账</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">诊疗下载</el-button>
-          <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
-          <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
-
-
+          <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>
         </div>
       </div>
-      <div style="margin-bottom: 10px;">
-        <el-date-picker
-          size="small"
-          v-model="start_time"
-          prefix-icon="el-icon-date"
-          @change="handleStartTimeChange"
-          :editable="false"
-          :clearable="false"
-          style="width: 196px; "
-          type="date"
-          placeholder="选择开始日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          align="right"
-        ></el-date-picker>
-        <span style="text-align: center;">-</span>
-        <el-date-picker
-          size="small"
-          v-model="end_time"
-          prefix-icon="el-icon-date"
-          @change="handleEndTimeChange"
-          :editable="false"
-          :clearable="false"
-          style="width: 196px; "
-          type="date"
-          placeholder="选择结束日期"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-          align="right"
-        ></el-date-picker>
-      </div>
-
-      <div style="margin-bottom: 10px;">
-        <el-date-picker
-          size="small"
-          v-model="pay_time"
-          prefix-icon="el-icon-date"
-          :editable="false"
-          :clearable="false"
-          style="width:250px; "
-          type="datetime"
-          placeholder="选择缴费日期"
-          format="yyyy-MM-dd HH:mm:ss"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          align="right"
-        ></el-date-picker>
-      </div>
 
-      <div style="margin-bottom: 10px;">
-        <el-select size="small" v-model="staff" placeholder="请选择缴费人员"
-                   style="width:150px;margin-left:10px;" >
-          <el-option
-            v-for="item,index in admins"
-            :key="index"
-            :label="item.user_name"
-            :value="item.user_name">
-          </el-option>
-        </el-select>
+      <div style=" display: flex; justify-content: space-between;  margin-bottom: 10px;">
+        <div class="content_top">
+          <el-date-picker size="small"
+            v-model="pay_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            :clearable="false"
+            style="width:250px; "
+            type="datetime"
+            placeholder="选择缴费日期"
+            format="yyyy-MM-dd HH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            align="right"
+          ></el-date-picker>
+        </div>
+        <div class="content_top"></div>
       </div>
 
       <el-table
@@ -230,47 +150,48 @@
           color: '#606266',
         }"
         highlight-current-row
+        height="calc(100vh - 300px)"
       >
         <el-table-column align="center" type="selection" width="55"></el-table-column>
         <el-table-column
           prop="date"
           label="序号"
-          width="60"
+          width="40"
           align="center"
           type="index"
         >
         </el-table-column>
-        <el-table-column align="center" width="100" prop="name" label="就诊号">
+        <el-table-column align="center" width="80" prop="name" label="就诊号">
           <template slot-scope="scope">{{ scope.row.mdtrt_id }}</template>
         </el-table-column>
-        <el-table-column align="center" width="90" prop="name" label="患者名字">
+        <el-table-column align="center" width="80" prop="name" label="患者名字">
           <template slot-scope="scope">{{ scope.row.patient.name }}</template>
         </el-table-column>
 
-        <el-table-column align="center" width="90" prop="name" label="患者性别">
+        <el-table-column align="center" width="60" prop="name" label="患者性别">
           <template slot-scope="scope">{{ scope.row.patient.gender == 1 ? '男':'女' }}</template>
         </el-table-column>
 
-        <el-table-column align="center" width="90" prop="name" label="患者年龄">
+        <el-table-column align="center" width="60" prop="name" label="患者年龄">
           <template slot-scope="scope">{{getAge(scope.row.patient.id_card_no)}}</template>
         </el-table-column>
         <!--<el-table-column align="center" prop="name" label="患者类型">-->
         <!--<template slot-scope="scope"></template>-->
         <!--</el-table-column>-->
 
-        <el-table-column align="center" width="90" prop="name" label="应收金额">
+        <el-table-column align="center" width="80" prop="name" label="应收金额">
           <template slot-scope="scope">{{
               scope.row.medfee_sumamt.toFixed(2)
             }}
           </template>
         </el-table-column>
-        <el-table-column align="center" width="90" prop="name" label="实收金额">
+        <el-table-column align="center" width="80" prop="name" label="实收金额">
           <template slot-scope="scope">{{
               scope.row.medfee_sumamt.toFixed(2)
             }}
           </template>
         </el-table-column>
-        <el-table-column align="center" width="90" prop="name" label="科室">
+        <el-table-column align="center" width="70" prop="name" label="科室">
           <template slot-scope="scope">{{
               scope.row.department_name
             }}
@@ -282,12 +203,12 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" width="90" prop="name" label="收费类型">
+        <el-table-column align="center" width="60" prop="name" label="收费类型">
           <template slot-scope="scope">
-            <div v-if="scope.row.is_medicine_insurance == 1">
+            <div v-if="scope.row.his_patient.balance_accounts_type != 2">
               医保
             </div>
-            <div v-if="scope.row.is_medicine_insurance != 1">
+            <div v-if="scope.row.his_patient.balance_accounts_type == 2">
               自费
             </div>
           </template>
@@ -320,12 +241,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column
-          align="center"
-          width="100"
-          prop="name"
-          label="收费日期"
-        >
+        <el-table-column align="center" width="100" prop="name" label="收费日期">
           <template slot-scope="scope">
             {{
               scope.row.setl_time
@@ -334,13 +250,13 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column align="center" width="90" prop="name" label="收费员">
+        <el-table-column align="center" width="70" prop="name" label="收费员">
           <template slot-scope="scope">{{
               getName(scope.row.creator)
             }}
           </template>
         </el-table-column>
-        <el-table-column align="center" width="80" prop="name" label="状态">
+        <el-table-column align="center" width="70" prop="name" label="状态">
           <template slot-scope="scope">
             <div v-if="scope.row.order_status == 1">待结算</div>
             <div v-if="scope.row.order_status == 2">已结算</div>
@@ -349,18 +265,19 @@
         </el-table-column>
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
-            <el-button size="mini" type="primary" @click="toDetail(scope.row)"
+            <el-button class="butt_1" size="mini" type="primary" @click="toDetail(scope.row)"
             >详情
             </el-button
             >
-            <el-button size="mini" type="primary" @click="toPrint(scope.row)">
+            <el-button class="butt_2" size="mini" type="primary" @click="toPrint(scope.row)">
               结算单
             </el-button>
-            <el-button v-if="$store.getters.xt_user.org_id == 10191" size="mini" type="primary"
+            <el-button v-if="$store.getters.xt_user.org_id == 10191" class="butt_2" size="mini" type="primary"
                        @click="tolistPrint(scope.row)">
               结算清单
             </el-button>
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               @click="uploadInfo(scope.row)"
@@ -371,6 +288,7 @@
             </el-button>
 
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               @click="confirmUploadInfo(scope.row)"
@@ -380,6 +298,7 @@
             </el-button>
 
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               @click="cancelUploadTwo(scope.row)"
@@ -389,6 +308,7 @@
             </el-button>
 
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               @click="queryData(scope.row)"
@@ -397,8 +317,8 @@
               查询结算清单
             </el-button>
 
-
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               @click="cancelUpload(scope.row)"
@@ -408,6 +328,7 @@
             </el-button>
 
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               @click="cancelUploadThree(scope.row)"
@@ -415,6 +336,7 @@
               更改结算清单状态为未提交
             </el-button>
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               v-if="
@@ -424,10 +346,11 @@
               @click="settlementPrint(scope.row)"
             >结算单
             </el-button>
-            <el-button size="mini" type="primary" @click="toRefund(scope.row)">
+            <el-button class="butt_2" size="mini" type="primary" @click="toRefund(scope.row)">
               退费
             </el-button>
             <el-button
+              class="butt_2"
               size="mini"
               type="primary"
               @click="invoicePrint(scope.row)"
@@ -3362,7 +3285,6 @@ export default {
           admin_user_id: this.$store.getters.xt_user.user.id
         }
         this.batchOrderObj = params
-
       }
     },
     export_detail() {
@@ -3653,12 +3575,12 @@ export default {
     changeSortType() {
       this.page = 1
       this.keywords = ''
-      // this.getHisOrderList()
+      this.getHisOrderList()
     },
     changeDoctor() {
       this.page = 1
       this.keywords = ''
-      // this.getHisOrderList()
+      this.getHisOrderList()
     },
     handleSizeChange(limit) {
       this.limit = limit
@@ -3671,12 +3593,12 @@ export default {
     handleStartTimeChange() {
       this.page = 1
       this.keywords = ''
-      // this.getHisOrderList()
+      this.getHisOrderList()
     },
     handleEndTimeChange() {
       this.page = 1
       this.keywords = ''
-      // this.getHisOrderList()
+      this.getHisOrderList()
     },
     setMonthPrescription(month_prescriptions) {
       console.log(month_prescriptions)
@@ -3964,7 +3886,7 @@ export default {
       //   }
       //   this.tableData = arr
       // }
-      // this.getHisOrderList()
+      this.getHisOrderList()
     },
     getTimes(time) {
       return uParseTime(time, '{y}-{m}-{d}')
@@ -4124,4 +4046,20 @@ export default {
       padding:5px 0;
     }
   }
+  .content_top{
+    flex: 1; 
+    display: flex;
+    justify-content: space-between;
+  }
+  .content_button{
+    flex: 1; 
+    display: flex;
+    justify-content:space-around;
+  }
+  .butt_1{
+    margin-left:10px;
+  }
+  .butt_2{
+    margin-top: 3px;
+  }
 </style>

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -59,14 +59,65 @@
         <div class="prescriptionBox" style="min-height: 350px;">
           <div class="Rp">Rp:</div>
           <div class="drugsBox" 
-            v-for="(it, index) in item.advices"
-            :key="index"
-            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto','position': 'relative'}"
+            v-for="(it, index1) in item.advices"
+            :key="index1"
+            :style="{'page-break-after':index1==yi&&item.advices.length>7? 'always':'auto','position': 'relative'}"
           >
-            <!-- class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  'page-break-after':item.advices.length>=3&& item.advices[2]?'always':'auto'-->
-            <!-- <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> -->
+            <template v-if="index1==yi+1&&item.advices.length>7">
+
+              <div class="printTitle" v-if="prescriptions[index].med_type == '1111'">
+                {{ orgname }}第一类精神处方笺
+              </div>
+              <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
+                {{ orgname }}第二类精神处方笺
+              </div>
+              <div
+                class="printTitle"
+                v-if="
+                  prescriptions[index].med_type != '1111' &&
+                  prescriptions[index].med_type != '1112'
+                "
+              >
+                {{ orgname }}处方笺
+              </div>
+              <div style="margin-bottom: 10px;">
+                <div class="infoTitle">
+                  <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+                  <p>
+                    性别：
+                    <span v-if="item.patient.gender == 1">男</span>
+                    <span v-if="item.patient.gender == 2">女</span>
+                  </p>
+                  <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+                </div>
+                <div class="infoMain">
+                  <div style="margin-bottom: 10px">
+                    门诊号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}
+                  </div>
+                  <div style="margin-bottom: 10px">
+                    科室：{{ item.info ? getDepart(item.info.departments) : "" }}
+                  </div>
+                  <div style="margin-bottom: 10px" v-if="org_id == 10537">
+                    身份证号：{{newHisPatient.id_card_no | testfile}}
+                  </div>
+                  <div style="margin-bottom: 10px" v-else>
+                    医保卡号：
+                  </div>
+                  <div style="margin-bottom: 10px" v-if="org_id != 10188">
+                    电话：{{ item.patient.phone }}
+                  </div>
+                  <div style="margin-bottom: 10px" v-else>
+                    日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
+                  </div>
+                  <div>地址：{{ item.patient.home_address }}</div>
+                  <div style="display: flex; width: 50%">
+                    临床诊断：{{ getDiagnosis(item.info.diagnosis) }}
+                  </div>
+                </div>
+              </div>
+            </template>
             <div class="drugsOne">
-              <span style="font-weight: bold">{{ index + 1 + "." }}</span
+              <span style="font-weight: bold">{{ index1 + 1 + "." }}</span
               >{{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;<span
               v-if="it.drug.min_unit != it.drug.dose_unit"
               >{{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* &nbsp;</span
@@ -74,7 +125,7 @@
                   it.drug.max_unit
                 }}&nbsp;×&nbsp; {{ it.prescribing_number
                 }}{{ it.prescribing_number_unit }}
-              <!-- <div style="display: inline-block;margin-left: 30px;">
+              <!-- <div style="display: inline-block;margin-left: 30px;" v-if="org_id ==10210 || org_id ==0">
                 <span>{{ it.price}}</span>
               </div> -->
             </div>
@@ -87,10 +138,75 @@
               >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>
             </div>
             <!-- 单价 -->
-            <div style="display: inline-block;position: absolute; top:0;right: 10%;"
+            <div style="display: inline-block;position: relative; top:-38px;left: 80%;"
               v-if="org_id ==10210 || org_id ==0">
                 <span>{{ it.price}}</span>
             </div>
+            <template v-if="index1==yi&&item.advices.length>7">
+              <div class="doctorBox">
+                <p v-if="org_id == 10217">
+                  医师：
+                  <span
+                    style="width: 100px; display: inline-block"
+                    v-if="item.creator == ''"
+                  >
+                      {{ item.doctor }}
+                    </span>
+                  <span
+                    style="width: 100px; display: inline-block"
+                    v-else-if="doc_name != ''"
+                  >
+                      {{ doc_name }}
+                    </span>
+                  <img
+                    style="height: 50px;"
+                    :src="setAdminUserES(item.creator,item.doctor)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </p>
+                <p v-if="org_id == 10510">
+                  医师：
+                  <span
+                    style="width: 100px; display: inline-block"
+                    v-if="item.creator == ''"
+                  >
+                      {{ item.doctor }}
+                    </span>
+                  <span
+                    style="width: 100px; display: inline-block"
+                    v-else-if="doc_name != ''"
+                  >
+                      {{ doc_name }}
+                    </span>
+                  <img
+                    style="height: 50px;"
+                    :src="setAdminUserES(item.creator,item.doctor)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </p>
+                <p v-if="org_id!=10217 && org_id!=10510">
+                  医师： {{ item.doctor ? item.doctor : "" }}
+                </p>
+                <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
+              </div>
+              <div class="actionBar">
+                <p>审核：</p>
+                <p>配对：</p>
+                <p>核对：</p>
+                <p>发药：</p>
+                <p>
+                  药费：{{
+                    getTotalOne(item.id).toFixed(2)
+                      ? getTotalOne(item.id).toFixed(2)
+                      : 0
+                  }}元
+                </p>
+              </div>
+            </template>
           </div>
 
           <div
@@ -141,200 +257,6 @@
           </div>
           <div style="text-align: center">(以下空白)</div>
         </div>
-<!--        <div class="prescriptionBox" >-->
-<!--          <div class="Rp">Rp:</div>-->
-<!--          <div-->
-<!--            class="drugsBox"-->
-<!--            v-for="(it, index) in advicess" :key="index"-->
-<!--            :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"-->
-<!--          >-->
-<!--            &lt;!&ndash; class="drugsBox"  item.advices.length>=5 ? 'danzhang' : 'drugsBox'  :style="{'page-break-after':index==yi&&item.advices.length>3? 'always':'auto'}"&ndash;&gt;-->
-<!--            &lt;!&ndash; <div class="drugsOne"><span style="font-weight:bold;">{{ index+1 + '.' }}</span>{{it.advice_name?it.advice_name:""}}&nbsp;&nbsp;{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.prescribing_number}}{{it.prescribing_number_unit}}</div> &ndash;&gt;-->
-<!--            <template v-if="index==yi+1&&item.advices.length>5">-->
-<!--              <div style="margin: 20px 0px;">-->
-<!--                <div class="infoTitle">-->
-<!--                  <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>-->
-<!--                  <p>-->
-<!--                    性别：-->
-<!--                    <span v-if="item.patient.gender == 1">男</span>-->
-<!--                    <span v-if="item.patient.gender == 2">女</span>-->
-<!--                  </p>-->
-<!--                  <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>-->
-<!--                </div>-->
-<!--                <div class="infoMain">-->
-<!--                  <div style="margin-bottom: 10px">-->
-<!--                    门诊号：{{ hisPatient.number ? hisPatient.number : "" }}-->
-<!--                  </div>-->
-<!--                  <div style="margin-bottom: 10px">-->
-<!--                    科室：{{ item.info ? getDepart(item.info.departments) : "" }}-->
-<!--                  </div>-->
-<!--                  <div style="margin-bottom: 10px">-->
-<!--                    医保卡号：{{ item.hisPatient.number ? item.hisPatient.number : "" }}-->
-<!--                  </div>-->
-<!--                  <div style="margin-bottom: 10px" v-if="org_id != 10188">-->
-<!--                    电话：{{ item.patient.phone }}-->
-<!--                  </div>-->
-<!--                  <div style="margin-bottom: 10px" v-else>-->
-<!--                    日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}-->
-<!--                  </div>-->
-<!--                  <div>地址：{{ item.patient.home_address }}</div>-->
-<!--                  <div style="display: flex; width: 50%">-->
-<!--                    临床诊断：{{ getDiagnosis(item.info.diagnosis) }}-->
-<!--                  </div>-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </template>-->
-<!--            <div style="position: relative;">-->
-<!--              <div class="drugsOne" style="border-right: 1px solid black; width: 80%;">-->
-<!--                  <span style="font-weight: bold" >-->
-<!--                    {{ index + 1 + "." }}-->
-<!--                  </span>-->
-<!--                {{ it.advice_name ? it.advice_name : "" }}&nbsp;&nbsp;-->
-<!--                <span v-if="it.drug.min_unit != it.drug.dose_unit">-->
-<!--                    {{ it.drug.dose }}{{ it.drug.dose_unit }}&nbsp;* {{ it.drug.min_number }}{{ it.drug.min_unit }}/-->
-<!--                    {{it.drug.max_unit}}-->
-<!--                  </span>&nbsp;-->
-<!--                <div>-->
-<!--                  <template v-if="arr.length>0 && arr[0][0].groupno==it.groupno">-->
-<!--                    <div >-->
-<!--                      &lt;!&ndash;  v-for="(its,indexs) in arr" :key="indexs" &ndash;&gt;-->
-<!--                      <span style="margin-left: 38px;">{{arr[0][0].advice_name ? arr[0][0].advice_name : ""}}</span>&nbsp;&nbsp;-->
-<!--                      <span v-if="arr[0][0].drug.min_unit != arr[0][0].drug.dose_unit">-->
-<!--                          {{ arr[0][0].drug.dose }}{{ arr[0][0].drug.dose_unit }}&nbsp;* {{ arr[0][0].drug.min_number }}{{ arr[0][0].drug.min_unit }}/-->
-<!--                          {{arr[0][0].drug.max_unit}}-->
-<!--                        </span>&nbsp;-->
-<!--                    </div>-->
-<!--                  </template>-->
-<!--                </div>-->
-
-<!--                <div style="margin-left: 70px">-->
-<!--                    <span >用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span-->
-<!--                    >&nbsp;&nbsp;<span-->
-<!--                >{{ it.execution_frequency }}&nbsp;{{-->
-<!--                    it.delivery_way-->
-<!--                  }}&nbsp;</span>&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>-->
-<!--                </div>-->
-
-<!--              </div>-->
-<!--              <div style="display: inline-block;position: absolute;left:85%;top:10px;margin-left: 10px;">-->
-<!--                ×&nbsp;{{ it.prescribing_number}}{{ it.prescribing_number_unit }}-->
-<!--              </div>-->
-<!--            </div>-->
-<!--            <template v-if="index==yi&&item.advices.length>5">-->
-<!--              <div style="margin: 20px 0px;">-->
-<!--                <div class="doctorBox" v-if="org_id != 10188 && org_id != 0">-->
-<!--                  <p v-if="org_id == 10217 || org_id == 0">-->
-<!--                    医师：-->
-<!--                    <span-->
-<!--                      style="width: 100px; display: inline-block"-->
-<!--                      v-if="item.creator == ''"-->
-<!--                    >-->
-<!--                        {{ item.doctor }}-->
-<!--                      </span>-->
-<!--                    <span-->
-<!--                      style="width: 100px; display: inline-block"-->
-<!--                      v-else-if="doc_name != ''"-->
-<!--                    >-->
-<!--                        {{ doc_name }}-->
-<!--                      </span>-->
-<!--                    <img-->
-<!--                      style="height: 50px;"-->
-<!--                      :src="setAdminUserES(item.creator,item.doctor)"-->
-<!--                      alt=""-->
-<!--                      srcset=""-->
-
-<!--                    />-->
-<!--                  </p>-->
-<!--                  <p v-else>-->
-<!--                    医师： {{ item.doctor ? item.doctor : "" }}-->
-<!--                  </p>-->
-<!--                  <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>-->
-<!--                </div>-->
-
-<!--                <div class="doctorBoxs" style="border-bottom: 2px solid #000;" v-if="org_id == 10188 || org_id == 0">-->
-<!--                  <p>医师：{{ item.doctor ? item.doctor : "" }}</p>-->
-<!--                </div>-->
-<!--                <div class="actionBar" v-if="org_id != 10188 && org_id != 0">-->
-
-<!--                  <p>审核：</p>-->
-<!--                  <p>配对：</p>-->
-<!--                  <p>核对：</p>-->
-<!--                  <p>发药：</p>-->
-<!--                  <p>-->
-<!--                    药费：{{-->
-<!--                      getTotalOne(item.id).toFixed(2)-->
-<!--                        ? getTotalOne(item.id).toFixed(2)-->
-<!--                        : 0-->
-<!--                    }}元-->
-<!--                  </p>-->
-<!--                  &lt;!&ndash;            <p>药费：466.2元</p>&ndash;&gt;-->
-<!--                </div>-->
-<!--                <div class="actionBar" v-else>-->
-<!--                  <p >审核、调配：</p>-->
-<!--                  <p >核对、发药：</p>-->
-<!--                  <p >-->
-<!--                    药费：{{-->
-<!--                      getTotalOne(item.id).toFixed(2)-->
-<!--                        ? getTotalOne(item.id).toFixed(2)-->
-<!--                        : 0-->
-<!--                    }}元-->
-<!--                  </p>-->
-<!--                  &lt;!&ndash;            <p>药费：551.2元</p>&ndash;&gt;-->
-<!--                  &lt;!&ndash;            <p>药费：466.2元</p>&ndash;&gt;-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </template>-->
-<!--          </div>-->
-
-<!--          <div-->
-<!--            class="drugsBox"-->
-<!--            v-for="(it, i) in item.additionalcharge"-->
-<!--            :key="i"-->
-<!--          >-->
-<!--            <div class="drugsOne">-->
-<!--              {{ it.item_name ? it.item_name : "" }}:&nbsp;{{ it.price }}元/{{-->
-<!--                it.count-->
-<!--              }}次-->
-<!--            </div>-->
-<!--          </div>-->
-
-<!--          <div-->
-<!--            class="drugsBox"-->
-<!--            v-for="(it, index) in item.project"-->
-<!--            :key="index"-->
-<!--          >-->
-<!--            <div class="drugsOne">-->
-<!--                <span style="font-weight: bold">{{ index + 1 + "." }}</span-->
-<!--                >{{-->
-<!--                it.type == 2-->
-<!--                  ? getProjectName(it.project_id)-->
-<!--                    ? getProjectName(it.project_id)-->
-<!--                    : ""-->
-<!--                  : it.good_info.good_name-->
-<!--              }}&nbsp;&nbsp;{{ it.single_dose-->
-<!--              }}{{ it.single_dose_unit }}&nbsp;×&nbsp; {{ it.count }}{{ unit }}-->
-<!--            </div>-->
-<!--            <div style="margin-left: 100px">-->
-<!--                <span>用法：{{ it.single_dose }}{{ it.single_dose_unit }}</span-->
-<!--                >&nbsp;&nbsp;<span>{{ it.delivery_way }}</span-->
-<!--            >&nbsp;&nbsp;<span>{{ it.advice_desc }}</span>-->
-<!--            </div>-->
-<!--          </div>-->
-
-<!--          <div-->
-<!--            class="drugsBox"-->
-<!--            v-for="(it, i) in item.additionalcharge"-->
-<!--            :key="i"-->
-<!--          >-->
-<!--            <div class="drugsOne">-->
-<!--              {{ it.project_id ? it.project_id : "" }}:&nbsp;{{-->
-<!--                it.price.toFixed(2)-->
-<!--              }}元/{{ it.count }}次-->
-<!--            </div>-->
-<!--          </div>-->
-<!--          <div style="text-align: center">(以下空白)</div>-->
-<!--        </div>-->
-
 
         <div class="doctorBox">
           <p v-if="org_id == 10217">

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

@@ -53,6 +53,9 @@
     </div>
     <div class="tableTitle">统计表</div>
     <div>
+      <div style="margin-bottom: 10px;">
+        <el-button @click="exportList" type="primary">导出</el-button>
+      </div>
       <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
         <el-table-column
           fixed
@@ -220,6 +223,178 @@ export default {
     };
   },
   methods: {
+    exportList(){
+      //  console.log("DialysisData",this.tableData)
+      //  console.log("activeModes",this.activeModes)
+
+       if(this.tableData!=null && this.tableData.length>0){
+         for(let i=0;i<this.tableData.length;i++){
+            this.tableData[i].index = i +1
+          for(let j=0;j<this.activeModes.length;j++){
+           
+            if(this.activeModes[j].id == 1){
+               
+               this.tableData[i].mode_id_1 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 2){
+               this.tableData[i].mode_id_2 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 3){
+               this.tableData[i].mode_id_3 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 4){
+               this.tableData[i].mode_id_4 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 5){
+               this.tableData[i].mode_id_5 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 6){
+               this.tableData[i].mode_id_6 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 7){
+               this.tableData[i].mode_id_7 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 8){
+               this.tableData[i].mode_id_8 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 9){
+               this.tableData[i].mode_id_9 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 10){
+               this.tableData[i].mode_id_10 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 11){
+               this.tableData[i].mode_id_11 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 12){
+               this.tableData[i].mode_id_12 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 13){
+               this.tableData[i].mode_id_13 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 14){
+               this.tableData[i].mode_id_14 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+          
+
+            if(this.activeModes[j].id == 19){
+               this.tableData[i].mode_id_19 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 20){
+               this.tableData[i].mode_id_20 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 21){
+               this.tableData[i].mode_id_21 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 22){
+               this.tableData[i].mode_id_22 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 23){
+               this.tableData[i].mode_id_23 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 24){
+               this.tableData[i].mode_id_24 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 25){
+               this.tableData[i].mode_id_25 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 26){
+               this.tableData[i].mode_id_26 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 27){
+               this.tableData[i].mode_id_27 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 28){
+               this.tableData[i].mode_id_28 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 29){
+               this.tableData[i].mode_id_29 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 30){
+               this.tableData[i].mode_id_30 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 31){
+               this.tableData[i].mode_id_31 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 32){
+               this.tableData[i].mode_id_32 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 33){
+               this.tableData[i].mode_id_33 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 34){
+               this.tableData[i].mode_id_34 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 35){
+               this.tableData[i].mode_id_35 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 36){
+               this.tableData[i].mode_id_36 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 37){
+               this.tableData[i].mode_id_37 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 38){
+               this.tableData[i].mode_id_38 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 39){
+               this.tableData[i].mode_id_39 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 40){
+               this.tableData[i].mode_id_40 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 41){
+               this.tableData[i].mode_id_41 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+
+            if(this.activeModes[j].id == 42){
+               this.tableData[i].mode_id_42 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+            if(this.activeModes[j].id == 43){
+               this.tableData[i].mode_id_43 = this.tableData[i].data[this.activeModes[j].id].number?this.tableData[i].data[this.activeModes[j].id].number:""
+            }
+          
+          }
+         }
+       }
+      
+      
+       import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['序号','日期','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','PHF','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','血浆胆红素吸附+HDF','血浆胆红素吸附','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','HFD','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD(无肝素)','HDF17H','HD.','HD(2)']
+        const filterVal = ['index','date','mode_id_1','mode_id_2','mode_id_3','mode_id_4','mode_id_5','mode_id_6','mode_id_7','mode_id_8','mode_id_9','mode_id_10','mode_id_11','mode_id_12','mode_id_13','mode_id_14','mode_id_19','mode_id_20','mode_id_21','mode_id_22','mode_id_23','mode_id_24','mode_id_25','mode_id_26','mode_id_27','mode_id_28','mode_id_29','mode_id_30','mode_id_31','mode_id_32','mode_id_33','mode_id_34','mode_id_35','mode_id_36','mode_id_37','mode_id_38','mode_id_39','mode_id_40','mode_id_41','mode_id_42','mode_id_43']
+
+        const data = this.formatJson(filterVal, this.tableData)
+
+        excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '透析详情'
+         })
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+       );
+     },
     changeTime(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
       if (time > 0) {

src/xt_pages/stock/detail/stockInDetail.vue

@@ -137,6 +137,12 @@
             </template>
           </el-table-column>
 
+          <!-- <el-table-column label="进销商" align="center">
+            <template slot-scope="scope">
+              {{ getDealerName(scope.row.dealer) }}
+            </template>
+          </el-table-column> -->
+
           <el-table-column label="操作时间" align="center">
             <template slot-scope="scope">
               {{ getTime(scope.row.Warehousing.warehousing_time) }}

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -142,6 +142,12 @@
             {{ getManufactuerName(scope.row.manufacturer) }}
           </template>
         </el-table-column>
+<!-- 
+        <el-table-column label="进销商" align="center">
+            <template slot-scope="scope">
+              {{ getDealerName(scope.row.dealer) }}
+            </template>
+          </el-table-column> -->
 
         <!-- <el-table-column label="单据类型" align="center">
           <template slot-scope="scope">

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

@@ -79,6 +79,12 @@
                 {{getDrugTypeName(scope.row.drug_type)}}
               </template>
             </el-table-column>
+
+            <el-table-column label="医保等级" align="center" v-if="org_id ==10697 || org_id == 0">
+              <template slot-scope="scope">
+                <span>{{getMedicalInsuranceLeve(scope.row.medical_insurance_level)?getMedicalInsuranceLeve(scope.row.medical_insurance_level):"" }}</span> 
+              </template>
+            </el-table-column>
             <el-table-column label="药品名称" align="center">
               <template slot-scope="scope">
                  {{scope.row.drug_name}}
@@ -469,10 +475,20 @@ export default {
      checkData:[],
      outData:[],
      drug_id:0,
+     medicalInsuranceLevelList:[]
     }
   
   },
   methods:{
+    getMedicalInsuranceLeve(id){
+      var name = ""
+      for(let i=0;i<this.medicalInsuranceLevelList.length;i++){
+         if(id == this.medicalInsuranceLevelList[i].value){
+            name = this.medicalInsuranceLevelList[i].name
+         }
+      }
+      return name
+    },
     changeStorehouseName(){
       this.getlist()
     },
@@ -595,6 +611,8 @@ export default {
             // this.tableList = arr;
             this.total = response.data.data.total
             this.drugTypeList = response.data.data.drugTypeList
+
+            this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
          }
       })
     },

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

@@ -77,11 +77,17 @@
                  {{scope.row.drug_name}}
               </template>
             </el-table-column>
+          
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
                   {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                 </template>
             </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.medical_insurance_number}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
                  {{getManufacturName(scope.row.manufacturer)}}
@@ -221,7 +227,7 @@ export default {
       getStorehouseList().then(response=>{
          if(response.data.state == 1){
            var houseList = response.data.data.list
-           var obj = {id:0,storehouse_name:"全部"}
+           var obj = {id:0,storehouse_name:""}
            this.houseList.push(obj)
            for(let i=0;i<houseList.length;i++){
              this.houseList.push(houseList[i])
@@ -499,6 +505,25 @@ export default {
             }
            
             }
+            
+            if(this.org_id == 0 || this.org_id == 10697){
+              if(list!=null && list.length>0){
+                var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
+                for(let i=0;i<list.length;i++){
+                  obj.drugSaleMoney += parseFloat(list[i].drugSaleMoney)
+                  obj.oveDrugSaleMoney += parseFloat(list[i].oveDrugSaleMoney)
+                  obj.drugAddSalePrice += parseFloat(list[i].drugAddSalePrice)
+                  obj.drugOutSalePrice +=parseFloat(list[i].drugOutSalePrice)
+                }
+                obj.drugSaleMoney  = obj.drugSaleMoney.toFixed(2)
+                obj.oveDrugSaleMoney  = obj.oveDrugSaleMoney.toFixed(2)
+                obj.drugAddSalePrice  = obj.drugAddSalePrice.toFixed(2)
+                obj.drugOutSalePrice  = obj.drugOutSalePrice.toFixed(2)
+                list.push(obj)
+
+              }
+            }
+           
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
@@ -537,13 +562,16 @@ export default {
     this.getlist()
    },
    getDrugTypeName(id){
+  
      var type_name = ""
      for(let i=0;i<this.drugTypeList.length;i++){
        if(id == this.drugTypeList[i].value){
          type_name = this.drugTypeList[i].name
        }
      }
-     return type_name
+     if (type_name !="全部"){
+      return type_name
+     }
    },
    getHouseName(id){
      var storehouse_name = ""
@@ -1373,10 +1401,10 @@ export default {
 
         }
         import('@/vendor/Export2Excel').then(excel => {
-           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
-           const header = ['', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
-           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:J1', 'K1:M1', 'N1:P1', 'Q1:S1']
-           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
+           const multiHeader = [['序号', '查询日期','  药品类型','药品名称','规格&单位','国家编码','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['', '','','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2', 'I1:K1', 'L1:N1', 'O1:Q1','R1:T1']
+           const filterVal = ['index', 'query_date', 'good_type','drug_name','specification_name','medical_insurance_number','manufacturer_name','dealer_name','drugIn','drugInMoney','drugSaleMoney','drugAdd','drugAddPrice','drugAddSalePrice','drugOut','drugOutPrice','drugOutSalePrice','overDrug','overDrugPrice','oveDrugSaleMoney']
 
            const data = this.formatJson(filterVal, this.tableList)
 

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

@@ -28,6 +28,7 @@
                                   <td rowspan="2" width="80">药品类型</td>
                                   <td rowspan="2" width="80">药品名称</td>
                                   <td rowspan="2" width="80">规格&单位</td>
+                                  <td rowspan="2" width="80">国家编码</td>
                                   <td rowspan="2" width="80">生产厂商</td>
                                   <td rowspan="2" width="80">经销商</td>
                                   <td width="80" colspan="3">期初结余</td>
@@ -57,6 +58,7 @@
                                  <td> {{getDrugTypeName(item.drug_type)}}</td>
                                  <td> {{item.drug_name}}</td>
                                  <td> {{item.dose}}{{item.dose_unit}}*{{item.min_number}}{{item.min_unit}}/{{item.max_unit}}</td>
+                                 <td>{{item.medical_insurance_number}}</td>
                                  <td>{{getManufacturName(item.manufacturer)}}</td>
                                  <td>{{getDearName(item.dealer)}}</td>
                                  <td>{{item.drugIn}}</td>
@@ -410,11 +412,28 @@ export default {
                   list[i].oveDrugSaleMoney = "/"
                 }
             }
+            if(this.org_id == 0 || this.org_id == 10697){
+              if(list!=null && list.length>0){
+                var obj = {drug_type:"",drug_name:"合计",dose:"",dose_unit:"",min_number:"",min_unit:"",max_unit:"",medical_insurance_number:"",manufacturer:"",dealer:"",drugIn:"",drugInMoney:"",drugSaleMoney:0,drugAdd:"",drugAddPrice:"",drugAddSalePrice:0,drugOut:"",drugOutPrice:"",drugOutSalePrice:0,overDrug:"",overDrugPrice:"",oveDrugSaleMoney:0}
+                for(let i=0;i<list.length;i++){
+                  obj.drugSaleMoney += parseFloat(list[i].drugSaleMoney)
+                  obj.oveDrugSaleMoney += parseFloat(list[i].oveDrugSaleMoney)
+                  obj.drugAddSalePrice += parseFloat(list[i].drugAddSalePrice)
+                  obj.drugOutSalePrice +=parseFloat(list[i].drugOutSalePrice)
+                }
+                obj.drugSaleMoney  = obj.drugSaleMoney.toFixed(2)
+                obj.oveDrugSaleMoney  = obj.oveDrugSaleMoney.toFixed(2)
+                obj.drugAddSalePrice  = obj.drugAddSalePrice.toFixed(2)
+                obj.drugOutSalePrice  = obj.drugOutSalePrice.toFixed(2)
+                list.push(obj)
+
+              }
+            }
             this.tableList = list;
             this.total = response.data.data.total
             this.manufacturerList = response.data.data.manufacturerList
             var drugTypeList = response.data.data.drugTypeList
-            var obj = {value:0,name:"全部"}
+            var obj = {value:0,name:""}
             this.drugTypeList.push(obj)
             for(let i=0;i<drugTypeList.length;i++){
                this.drugTypeList.push(drugTypeList[i])
@@ -446,13 +465,17 @@ export default {
     this.getlist()
    },
    getDrugTypeName(id){
+  
      var type_name = ""
      for(let i=0;i<this.drugTypeList.length;i++){
        if(id == this.drugTypeList[i].value){
          type_name = this.drugTypeList[i].name
        }
      }
-     return type_name
+     if (type_name !="全部"){
+      return type_name
+     }
+     
    },
    getHouseName(id){
      var storehouse_name = ""

src/xt_pages/stock/query/goodNewQuery.vue

@@ -53,6 +53,11 @@
                  {{ scope.row.good_number?scope.row.good_number:"" }}
               </template>
             </el-table-column>
+            <el-table-column label="医保等级" align="center" v-if="org_id ==10697 || org_id == 0">
+              <template slot-scope="scope">
+                <span>{{getMedicalInsuranceLeve(scope.row.medical_insurance_level)?getMedicalInsuranceLeve(scope.row.medical_insurance_level):"" }}</span> 
+              </template>
+            </el-table-column>
             <el-table-column label="耗材类型" align="center">
               <template slot-scope="scope">
                 {{getGoodTypeName(scope.row.good_type_id)}}
@@ -426,10 +431,20 @@ export default {
      checkdialogVisible:false,
      checkData:[],
      outData:[],
+     medicalInsuranceLevelList:[],
     }
   
   },
   methods:{
+    getMedicalInsuranceLeve(id){
+      var name = ""
+      for(let i=0;i<this.medicalInsuranceLevelList.length;i++){
+         if(id == this.medicalInsuranceLevelList[i].value){
+            name = this.medicalInsuranceLevelList[i].name
+         }
+      }
+      return name
+    },
     changeStorehouseName(){
       this.getlist()
     },
@@ -504,6 +519,7 @@ export default {
             this.loading = false
             this.tableList = list
             this.total = response.data.data.total
+            this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
            
          }
       })

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -71,7 +71,13 @@
         
             <el-table-column label="耗材编码" align="center" v-if="org_id ==9956 || org_id == 0">
               <template slot-scope="scope">
-                <span v-if="scope.row.good_number>0">{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
+                <span>{{ scope.row.good_number?scope.row.good_number:"" }}</span> 
+              </template>
+            </el-table-column>
+           
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.social_security_directory_code?scope.row.social_security_directory_code:"" }}</span> 
               </template>
             </el-table-column>
             <el-table-column label="耗材类型" align="center">
@@ -212,6 +218,7 @@ export default {
           },
       },
      dealerList:[],
+     medicalInsuranceLevelList:[]
     }
   
   },
@@ -304,7 +311,7 @@ export default {
              
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              if(this.org_id == 0){
+              if(this.org_id == 0 || this.org_id == 10697){
                 list[i].stockOutprice = list[i].packing_price
                 list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
               }else{
@@ -337,15 +344,45 @@ export default {
              
             }
             console.log("listwowowoowowowow",list)
+
+            var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
+          
+            if(this.org_id == 0 || this.org_id == 10697){
+              if(list.length!=null){
+                for(let i=0;i<list.length;i++){
+                 
+                  //  obj.stock_in_price += (this.tableList[i].stock_in_price).toFixed(2)
+                  obj.stockMoney += parseFloat(list[i].stockMoney) 
+                  //  obj.stockOutprice += (this.tableList[i].stockOutprice).toFixed(2)
+                  obj.saleStockMoney += parseFloat(list[i].saleStockMoney)
+
+                  obj.saleOutMoney += parseFloat(list[i].saleOutMoney)
+                  //  obj.overPrice += (this.tableList[i].overPrice).toFixed(2)
+                  obj.overMoney += parseFloat(list[i].overMoney)
+
+                }
+                obj.stockMoney = obj.stockMoney.toFixed(2)
+                obj.saleStockMoney = obj.saleStockMoney.toFixed(2)
+                obj.overMoney = obj.overMoney.toFixed(2)
+                obj.saleOutMoney = obj.saleOutMoney.toFixed(2)
+              
+                list.push(obj)
+             }
+            }
+           
+            console.log("list233333333333333333333333333333333",list)
             this.tableList = list
             this.total = response.data.data.total
 
            this.manufacturerList = response.data.data.manufacturerList
+
           
+        
            
          }
       })
     },
+   
     getManufacturName(id){
       var manufacturer_name = ""
       for(let i=0;i<this.manufacturerList.length;i++){
@@ -383,7 +420,10 @@ export default {
          type_name = this.goodTypeList[i].type_name
        }
      }
-     return type_name
+     if(type_name !='全部'){
+      return type_name
+     }
+    
    },
    getHouseName(id){
      var storehouse_name = ""
@@ -1043,7 +1083,7 @@ export default {
    },
    exportList: function() {
 
-       if(this.org_id!=0&& this.org_id!=9956){
+       if(this.org_id!=0&& this.org_id!=9956 && this.org_id!=10697){
          
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
@@ -1075,7 +1115,7 @@ export default {
         })
        }
 
-       if(this.org_id == 0 || this.org_id == 9956){
+       if(this.org_id == 9956){
         
         for(let i=0;i<this.tableList.length;i++){
           this.tableList[i].index = i+1
@@ -1104,6 +1144,38 @@ export default {
             })
         })
        }
+
+       if(this.org_id == 10697 || this.org_id == 0){
+        
+        for(let i=0;i<this.tableList.length;i++){
+          this.tableList[i].index = i+1
+          this.tableList[i].query_date = this.start_time+"~"+this.end_time
+          this.tableList[i].good_type = this.getGoodTypeName(this.tableList[i].good_type_id)
+          this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
+          this.tableList[i].dealer_name = this.getDearName(this.tableList[i].dealer)
+          this.tableList[i].specification_name_one = this.tableList[i].specification_name + "/"+this.tableList[i].packing_unit
+        }
+        import('@/vendor/Export2Excel').then(excel => {
+           const multiHeader = [['序号','国家编码', '查询日期',' 耗材类型','耗材名称','规格&单位','生产产商','经销商', '期初结余' , '', '', '本期增加', '', '', '本期减少' , '', '', '期末结余' , '', '']]
+           const header = ['','', '','','','','','', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额', '数量', '进货金额', '销售金额']
+           const merges = ['A1:A2', 'B1:B2','C1:C2','D1:D2','E1:E2','F1:F2','G1:G2','H1:H2','I1:K1', 'L1:N1', 'O1:Q1', 'R1:T1']
+           const filterVal = ['index','social_security_directory_code', 'query_date', 'good_type','good_name','specification_name_one','manufacturer_name','dealer_name','stockIn','stock_in_price','stockMoney','stockAdd','addStockMoney','saleStockMoney','outStock','stockOutprice','saleOutMoney','overStock','overPrice','overMoney']
+    
+           const data = this.formatJson(filterVal, this.tableList)
+        
+           const filename = '进销存查询'
+            
+            excel.export_json_to_excel({
+              multiHeader,
+              header,
+              merges,
+              data,
+              filename
+            })
+        })
+       }
+
+       
    
       },
       formatJson(filterVal, jsonData) {
@@ -1163,9 +1235,13 @@ export default {
       return count
     },
     getAllQuery(){
+
      this.getlist()
     }
   },
+  created(){
+ 
+  }
 
 }
 </script>

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -25,7 +25,8 @@
                             <thead>
                                 <tr>
                                   <td rowspan="2" width="80">序号</td>
-                                  <td rowspan="2" width="80" v-if="org_id==9956">耗材编码</td>
+                                  <td rowspan="2" width="80" v-if="org_id==9956 || org_id == 0">耗材编码</td>
+                                  <td rowspan="2" width="80">国家编码</td>
                                   <td rowspan="2" width="80">耗材名称</td>
                                   <td rowspan="2" width="80">耗材类型</td>
                                   <td rowspan="2" width="80">规格&单位</td>
@@ -56,6 +57,7 @@
                                 <tr v-for="(item,index) in this.tableList" :key="index">
                                  <td>{{index + 1}}</td>
                                  <td v-if="org_id==9956">{{item.good_number}}</td>
+                                 <td>{{item.social_security_directory_code}}</td>
                                  <td>{{item.good_name}}</td>
                                  <td>{{getGoodTypeName(item.good_type_id)}}</td>
                                  <td>{{item.specification_name}}</td>
@@ -205,7 +207,7 @@ export default {
                     list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
                    
                      
-                    if(this.org_id == 0){
+                    if(this.org_id == 0 || this.org_id == 10697){
                       list[i].stockOutprice = list[i].packing_price
                       list[i].saleOutMoney = (list[i].packing_price * list[i].outStock).toFixed(2)
                     }else{
@@ -228,8 +230,31 @@ export default {
                      }
                 
                 }
-                this.tableList = list
+               
+               var obj = {good_number:"",medical_insurance_level:"",social_security_directory_code:"合计",good_type_id:"",good_name:"",specification_name:"",packing_unit:"",manufacturer:"",dealer:"",stockIn:"",stock_in_price:"",stockMoney:0,outStock:"",stockOutprice:"",saleStockMoney:0,saleOutMoney:0,overStock:"",overPrice:"",overMoney:0}
+          
+                if(this.org_id == 0 || this.org_id == 10697){
+                  if(list.length!=null){
+                    for(let i=0;i<list.length;i++){
+                    
+                      //  obj.stock_in_price += (this.tableList[i].stock_in_price).toFixed(2)
+                      obj.stockMoney += parseFloat(list[i].stockMoney) 
+                      //  obj.stockOutprice += (this.tableList[i].stockOutprice).toFixed(2)
+                      obj.saleStockMoney += parseFloat(list[i].saleStockMoney)
+
+                      obj.saleOutMoney += parseFloat(list[i].saleOutMoney)
+                      //  obj.overPrice += (this.tableList[i].overPrice).toFixed(2)
+                      obj.overMoney += parseFloat(list[i].overMoney)
 
+                    }
+                    obj.stockMoney = obj.stockMoney.toFixed(2)
+                    obj.saleStockMoney = obj.saleStockMoney.toFixed(2)
+                    obj.overMoney = obj.overMoney.toFixed(2)
+                    obj.saleOutMoney = obj.saleOutMoney.toFixed(2)
+                  
+                    list.push(obj)
+                 }
+                }
                this.manufacturerList = response.data.data.manufacturerList
             
             }
@@ -522,7 +547,10 @@ export default {
             type_name = this.goodTypeList[i].type_name
         }
         }
-        return type_name
+        if(type_name!="全部"){
+          return type_name
+        }
+       
        },
     getWarehouseInfoStart(arr1,arr2,arr3,arr4,arr5){
       var count =0

src/xt_pages/stock/stockFlow.vue

@@ -473,6 +473,8 @@
            this.manufacturerList = manufacturerList
            this.houseList = response.data.data.houseList
            this.patientList = response.data.data.patients
+
+          
           }
        })
      },

src/xt_pages/stock/stockInOrderAdd.vue

@@ -224,6 +224,8 @@
               </el-form-item>
             </template>
           </el-table-column>
+
+          
            <el-table-column label="经销商" align="center" width="150">
              <template slot-scope="scope">
                <el-select size="small" v-model="scope.row.dealer" filterable placeholder="请选择厂商">

src/xt_pages/stock/stockInventoryModePrint.vue

@@ -13,32 +13,95 @@
 
                 <table class="printTable" border="0" cellspacing="0" align="center">
                     <thead class="print_head">
-                        <tr><td colspan="11">{{org_name}}</td></tr>
-                        <tr><td colspan="11">耗材盘点</td></tr>
+                        <tr><td colspan="11">南昌顺友好血液透析中心 {{org_name}}</td></tr>
+                        <tr>
+                          <td colspan="11">耗材盘点</td>
+                         
+                        </tr>
+                        <tr>
+                          <td colspan="11">
+                            <div style="float: right;margin-left: 600px;width: 200px;">{{ getNowTime() }}</div>
+                          </td>
+                        </tr>
+                       
                     </thead>
+                  
                     <tbody class="print_body">
                     <tr>
-                        <td align="center">耗材名称</td>
-                        <td align="center">规格</td>
-                     
-                        <td align="center">本月入库数量</td>
-                        <td align="center">本月出库数量</td>
-                        <td align="center">本月剩余库存</td>
-                        <td align="center">批号</td>
-                        <td align="center">生产日期</td> 
-                        <td align="center">有效日期</td>
-                        <td align="center">生产厂商</td>
-                        <td align="center">盘点数量</td>
+                        <td align="center" style="width: 50px;">序号</td>
+                        <td align="center" style="width: 200px;">耗材名称</td>
+                        <td align="center" style="width: 200px;">规格</td>
+                        <td align="center" style="width: 200px;">上期结余数量</td>
+                        <td align="center" style="width: 200px;">本月入库数量</td>
+                        <td align="center" style="width: 200px;">进货金额</td>
+                        <td align="center" style="width: 200px;">本月入库总金额</td>
+                        <td align="center" style="width: 200px;">本月出库数量</td>
+                        <td align="center" style="width: 200px;">销售价</td>
+                        <td align="center" style="width: 200px;">本月销售总金额</td>
+                        <td align="center" style="width: 200px;" >本月剩余库存数量</td>
+                        <td align="center" style="width: 200px;">进货价</td>
+                        <td align="center" style="width: 200px;">本月剩余总金额</td>
+                        <td align="center" style="width: 200px;">批号</td>
+                        <!-- <td align="center" style="width: 200px;">生产日期</td>  -->
+                        <td align="center" style="width: 200px;">有效日期</td>
+                        <td align="center" style="width: 200px;">生产厂商</td>
+                        <td align="center" style="width: 200px;">盘点数量</td>
                        
                     </tr>
 
                     <tr v-for="(item,index) in tableList" :key="index">
-                        <td align="center">{{ item.good_name }}</td>
-                        <td align="center">{{ item.specification_name }}</td>
-                        <td align="center">{{ getInCount(item.good_id) }}</td>
-                        <td align="center">{{ getOutCount(item.good_id) }}</td> 
-                        <td align="center">{{ getSumCount(item.good_id) }}</td>
                         <td align="center">
+                          <span v-if="item.is_total == 0">{{ index+1 }}</span>
+                          <span v-if="item.is_total == 1">{{ item.index }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ item.good_name }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ item.specification_name }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getLastOver(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.last_over}}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getInCount(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.month_in_total }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getBuyPrice(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.buy_price }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ (getInCount(item.good_id)*getBuyPrice(item.good_id)).toFixed(2) }}</span> 
+                          <span v-if="item.is_total == 1">{{ item.month_in_total_price }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ getOutCount(item.good_id) }}</span>
+                          <span v-if="item.is_total == 1"> {{ item.month_out_total}}</span>
+                        </td> 
+                        <td align="center">
+                          <span v-if="item.is_total==0"> {{ getPackingPrice(item.good_id) }}</span>
+                          <span v-if="item.is_total==1"> {{item.packing_price }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ (getOutCount(item.good_id)*getPackingPrice(item.good_id)).toFixed(2) }}</span>
+                          <span v-if="item.is_total == 1">{{ item.month_out_total_price }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">{{ getSumCount(item.good_id) }}</span>
+                          <span v-if="item.is_total == 1">{{item.month_over_total }}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ getBuyPrice(item.good_id) }}</span> 
+                          <span v-if="item.is_total == 1"> {{ item.buy_price }}</span> 
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0"> {{ (getSumCount(item.good_id) * getBuyPrice(item.good_id)).toFixed(2)}}</span>
+                          <span v-if="item.is_total == 1"> {{ item.month_over_total_price}}</span>
+                        </td>
+                        <td align="center">
+                          <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
@@ -74,9 +137,10 @@
                                     </td>
                               </tr>
                             </table>
+                          </span>
                         </td>
                        
-                        <td align="center">
+                        <!-- <td align="center">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
@@ -112,8 +176,9 @@
                                     </td>
                               </tr>
                             </table>
-                        </td>
+                        </td> -->
                         <td align="center">
+                          <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
@@ -149,9 +214,10 @@
                                     </td>
                               </tr>
                             </table>
+                          </span> 
                         </td>
                         <td align="center">
-
+                           <span v-if="item.is_total == 0">
                             <table
                                 class="ware_table"
                                 style="width: 100%; border-collapse: collapse"
@@ -187,6 +253,7 @@
                                     </td>
                               </tr>
                             </table>
+                          </span>
 
                         </td>
                         <td align="center">
@@ -198,6 +265,9 @@
                    
                     </tbody>
                 </table>
+
+                <div style="float: left;">盘点人签字:</div>
+                <div style="float: right;">监盘人签字:</div>
             </div>
         </div>
     </div>
@@ -218,10 +288,9 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
         crumbs: [
             { path: false, name: '库存管理' },
             { path: false, name: '耗材管理' },
-            { path: false, name: '耗材模版打印' },
+            { path: false, name: '耗材盘点模版打印' },
           ],
           tableList:[],
-          org_name: this.$store.getters.xt_user.org.org_name,
           start_time:"",
           end_time:"",
           manufacturerList:[],
@@ -229,10 +298,24 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
           outinfo:[],
           flowProList:[],
           flowNoProList:[],
-          goodInfo:[]
+          goodInfo:[],
+          org_name:"",
+          warehouseinfoList:[],
+          warehouseOutInfoList:[],
+          cancelInfoList:[],
+       
        }
      },
      methods:{
+        getNowTime: function () {
+          let dateTime;
+          let yy = new Date().getFullYear();
+          let mm = new Date().getMonth() + 1;
+          let dd = new Date().getDate();
+        
+          dateTime = yy + '年' + mm + '月' + dd + '日'
+          return dateTime
+        },
         printAction: function() {
             const style = '@page{size:landscape;margin: 10mm;} @media print { print_content{width:960px;margin:0} .flex{display: flex;justify-content: space-between;} .printTable{width:100%;border-collapse: collapse;border:0px;margin:10px 0;} .printTable thead{text-align:center}.printTable td{padding:5px;} .print_body tr td{border: 1px solid;font-size:12px;border-collapse:collapse;} }';
             printJS({ 
@@ -259,7 +342,6 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
             start_time:this.$route.query.start_time,
             end_time:this.$route.query.end_time,
           }
-          console.log("params-------",params)
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -269,8 +351,29 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
           getStockInventroyModePrintList(params).then(response=>{
               if(response.data.state == 1){
                  var list  =  response.data.data.list
+                 var manufacturerList = response.data.data.manufacturerList
+                 this.manufacturerList = manufacturerList
+
+                 this.infoList = response.data.data.infoList
+
+                 this.outinfo = response.data.data.outinfo
+
+                 this.flowNoProList = response.data.data.flowNoProList
+
+                 this.flowProList = response.data.data.flowProList
+
+                 this.goodInfo = response.data.data.goodInfo
+
+                 var warehouseinfo =  response.data.data.warehouseinfo
+               
+                 this.warehouseinfoList = warehouseinfo
+                 var warehouseOutInfo =  response.data.data.warehouseOutInfo
+                 
+                 this.warehouseOutInfoList = warehouseOutInfo
+                 var cancelInfoList = response.data.data.cancelInfo
+                 this.cancelInfoList = cancelInfoList
                   loading.close()
-                 console.log("list===============",list)
+                //  console.log("list===============",list)
 
                 if(list!=null && list.length > 0){
                   let dataInfo = {}
@@ -283,6 +386,18 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
                       count:0,
                       specification_name:item.specification_name,
                       good_name:item.good_name,
+                      last_over:0, //上期结余数量
+                      month_in_total:0,//本月入库数量
+                      buy_price:0,//进货金额
+                      month_in_total_price:0,//本月入库总金额
+                      month_out_total:0,//本月出库数量,
+                      packing_price:0,//销售价,
+                      month_out_total_price:0,//本月销售总金额,
+                      month_over_total:0,//本月剩余库存
+                      month_over_total_price:0,
+                      is_total:0,
+
+
                     }
                   }
                 })
@@ -294,23 +409,39 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
                           arr[i].child.push(list[j])
                        }
                    }
+
                 }
                 
-                this.tableList = arr
-                console.log("arr--------------",arr)
-                }
-                 var manufacturerList = response.data.data.manufacturerList
-                 this.manufacturerList = manufacturerList
+                for(let s=0;s < arr.length;s++){
+                  arr[s].last_over = this.getLastOver(arr[s].good_id)
+                  arr[s].month_in_total = this.getInCount(arr[s].good_id)
+                  arr[s].buy_price = this.getBuyPrice(arr[s].good_id)
+                  arr[s].month_in_total_price = (this.getInCount(arr[s].good_id) * this.getBuyPrice(arr[s].good_id)).toFixed(2)
+                  arr[s].month_out_total = this.getOutCount(arr[s].good_id)
+                  arr[s].packing_price = this.getPackingPrice(arr[s].good_id)
+                  arr[s].month_out_total_price = (this.getOutCount(arr[s].good_id) *this.getPackingPrice(arr[s].good_id)).toFixed(2)
 
-                 this.infoList = response.data.data.infoList
+                  arr[s].month_over_total = this.getSumCount(arr[s].good_id)
 
-                 this.outinfo = response.data.data.outinfo
+                  arr[s].month_over_total_price = (this.getBuyPrice(arr[s].good_id) * this.getSumCount(arr[s].good_id)).toFixed(2)
 
-                 this.flowNoProList = response.data.data.flowNoProList
-
-                 this.flowProList = response.data.data.flowProList
-
-                 this.goodInfo = response.data.data.goodInfo
+                }
+                console.log("arr------------------------------------------",arr)
+                this.tableList = arr
+              
+                }
+               
+                
+                var obj = {is_total:1,index:"合计",last_over:"",month_in_total:"",buy_price:"",month_in_total_price:0,month_out_total:"",packing_price:"",month_out_total_price:0,month_over_total:"",month_over_total_price:0}
+                for(let i=0;i<this.tableList.length;i++){
+                   obj.month_in_total_price += parseFloat(this.tableList[i].month_in_total_price) 
+                   obj.month_out_total_price += parseFloat(this.tableList[i].month_out_total_price) 
+                   obj.month_over_total_price +=parseFloat(this.tableList[i].month_over_total_price) 
+                }
+                console.log("obj===============================",obj)
+                 this.tableList.push(obj)
+                 console.log("tableLIDT========",this.tableList)
+                
               }
           })
         },
@@ -323,6 +454,77 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
            }
            return manufacturer_name
         },
+        getLastOver(good_id){
+          var in_count = 0 
+          var out_count = 0
+          var cancel_count = 0
+          var total_count = 0
+          var in_arr = []
+          var out_arr = []
+          var cancel_arr = []
+          for(let i=0;i<this.warehouseinfoList.length;i++){
+             if(good_id == this.warehouseinfoList[i].good_id){
+              in_arr.push(this.warehouseinfoList[i])
+             }
+             
+          }
+
+          for(let i=0;i<in_arr.length;i++){
+            in_count += parseInt(in_arr[i].count)
+          }
+          for(let i=0;i<this.warehouseOutInfoList.length;i++){
+            if(good_id == this.warehouseOutInfoList[i].good_id){
+              out_arr.push(this.warehouseOutInfoList[i])
+             
+            }
+          }
+          for(let i=0;i<out_arr.length;i++){
+            out_count += parseInt(out_arr[i].count)
+          }
+
+          for(let i=0;i<this.cancelInfoList.length;i++){
+            if(good_id == this.cancelInfoList[i].good_id){
+              cancel_arr.push(this.cancelInfoList[i])
+            
+            }
+          }
+
+          for(let i=0;i<cancel_arr.length;i++){
+            cancel_count += parseInt(cancel_arr[i].count)
+          }
+
+          // console.log("good_id",good_id)
+          // console.log("in_count",in_count)
+          // console.log("cancel_count",cancel_count)
+          // console.log("out_count",out_count)
+
+
+          total_count = in_count +cancel_count - out_count
+
+          return  total_count
+
+
+        },
+
+        getBuyPrice(good_id){
+          var buy_price = ""
+          for(let i=0;i<this.goodInfo.length;i++){
+           if(good_id == this.goodInfo[i].id){
+              buy_price = this.goodInfo[i].buy_price
+           }
+          }
+          return buy_price
+        },
+        getPackingPrice(good_id){
+          var packing_price = ""
+          for(let i=0;i<this.goodInfo.length;i++){
+           if(good_id == this.goodInfo[i].id){
+            packing_price = this.goodInfo[i].packing_price
+           }
+          }
+          return packing_price
+        },
+        
         
         getInCount(good_id){
           
@@ -355,6 +557,15 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
           total = total_count + total_count_one
           return total
         },
+        getInPrice(good_id){
+          var packing_price = ""
+          for(let i=0;i<this.goodInfo.length;i++){
+             if(good_id == this.goodInfo[i].id){
+              packing_price = this.goodInfo[i].packing_price
+             }
+          }
+          return packing_price
+        },
         getOutCount(good_id){
 
           var newArr =[]
@@ -401,7 +612,8 @@ import { getStockInventroyModePrintList } from  "@/api/stock"
         
      },
      created(){
-        
+      var xtuser = this.$store.getters.xt_user;
+      this.org_name = xtuser.org.org_name;
         this.getlist()
      }
 

src/xt_pages/user/Informed/Informedconsent.vue

@@ -132,6 +132,11 @@
                 <div v-if="show16">
                   <criticalpatient_informed2 :patient_id ="this.patientID" ref="childSixty" :patientCritaicalInformedOnePrint="patientCritaicalInformedOnePrint" @getPatientCriticalOneList="getPatientCriticalOneList"></criticalpatient_informed2>
                 </div>
+                <div v-if="show17">
+                  <Disease_diagnosis :patient_id ="this.patientID" ref="childsevety" >
+
+                  </Disease_diagnosis>
+                </div>
               </div>
             </div>
           </el-tab-pane>
@@ -160,7 +165,11 @@ import Medicalhistory from './components/Medicalhistory'
 import heal_informed from './components/heal_informed'
 import criticalpatient_informed from './components/criticalpatient_informed'
 import criticalpatient_informed2 from './components/criticalpatient_informed2'
-import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,getPatientCriticalList,getPatientCriticalOneList,getTreamentPlan } from '@/api/patient'
+import Disease_diagnosis from './components/Disease_diagnosis'
+import { getPatientDetailInformedconsent,getFallOutBedPrintList,getFilterInformed,getProfundaInformed,
+  getArterOvernous,getHighRiskInformed,getPatientMeDicalList,getAnticoagulationInformed,getCriticalInformed,
+  getHemoperfusionInformed,getInformedConsent,getCatheterization,getDialyzerInformed, getTherapyInformed,
+  getPatientCriticalList,getPatientCriticalOneList,getTreamentPlan } from '@/api/patient'
 export default {
 
   components: {
@@ -180,17 +189,20 @@ export default {
     Medicalhistory,
     heal_informed,
     criticalpatient_informed,
-    criticalpatient_informed2
+    criticalpatient_informed2,
+    Disease_diagnosis
   },
   data() {
     return {
-      // patient_id:0,
+      // patient_id:0,{date:'透析器（滤器）重复使用知情同意书',value:'11'},{date:'危重病人知情同意书',value:'15'},
       activeName:'second',
       templates:[{date:'人脸识别知情同意书',value:'1'},{date:'血液透析(滤过、灌流)治疗知情同意书',value:'2'},{date:'深静脉透析导管拔管术知情同意书',value:'3'},{date:'动静脉内瘘穿刺知情同意书',value:'4'},
                 {date:'高危出血患者血液净化抗凝方式选择知情同意书',value:'5'},{date:'抗凝溶栓治疗知情同意书',value:'6'},{date:'危重患者接受血液净化治疗知情同意书',value:'7'},
                 {date:'血液灌流治疗知情同意书',value:'8'},{date:'自带药物代为注射告知知情同意书',value:'9'},{date:'深静脉透析导管置入术知情同意书',value:'10'},
-                {date:'透析器（滤器）重复使用知情同意书',value:'11'},{date:'血液透析（滤过）治疗知情同意书',value:'12'},{date:'门诊血液透析治疗病历首页',value:'13'},
-                {date:'治疗处理方案知情同意书',value:'14'},{date:'危重病人知情同意书',value:'15'},{date:'危重病人知情同意书',value:'16'},],
+                {date:'血液透析（滤过）治疗知情同意书',value:'12'},{date:'门诊血液透析治疗病历首页',value:'13'},
+                {date:'治疗处理方案知情同意书',value:'14'},{date:'危重病人知情同意书',value:'16'},
+                // {date:'疾病诊断证明书',value:'17'},
+              ],
 
       face_show:true,
       filter_show:false,
@@ -208,6 +220,7 @@ export default {
       show14:false,
       show15:false,
       show16:false,
+      show17:false,
       patientID:0,
       patient:{},
       tableData:[],
@@ -248,7 +261,7 @@ export default {
       }
     })
    },
-   
+
    getPatientMeDicalList(){
       var params = {
          patient_id:this.patientID,
@@ -263,7 +276,7 @@ export default {
    },
 
    getFallOutBedPrintList(){
-      
+
       getFallOutBedPrintList().then(response=>{
          if(response.data.state ==1){
             var list = response.data.data.list
@@ -395,17 +408,17 @@ export default {
       getTreamentPlan().then(response=>{
         if(response.data.state ==1){
           var list = response.data.data.treamentPlan
-          this.patientTreamentPlan = list  
+          this.patientTreamentPlan = list
           this.$refs.childSeventy.show(list)
         }
       })
     },
-   
+
     rowClick(row, column, event){
      console.log('1111',row);
       // console.log('2222',column);
       // console.log('3333',event);
-       
+
         if(row.value==1){
           this.face_show=true
           this.filter_show=false,
@@ -417,12 +430,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getFallOutBedPrintList()
         }
         if(row.value==2){
@@ -436,12 +450,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getFilterInformed()
         }
         if(row.value==3){
@@ -455,12 +470,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getProfundaInformed()
         }
         if(row.value==4){
@@ -474,12 +490,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getArterOvernous()
         }
         if(row.value==5){
@@ -493,12 +510,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getHighRiskInformed()
         }
         if(row.value==6){
@@ -512,12 +530,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getAnticoagulationInformed()
         }
         if(row.value==7){
@@ -531,12 +550,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getCriticalInformed()
         }
         if(row.value==8){
@@ -550,12 +570,13 @@ export default {
           this.hemoperfusion_show=true,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getHemoperfusionInformed()
         }
         if(row.value==9){
@@ -569,12 +590,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=true,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false,
           this.getInformedConsent()
         }
         if(row.value==10){
@@ -588,13 +610,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=true,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
-         
+          this.show16=false,
+          this.show17=false
         }
         if(row.value==11){
           this.face_show=false
@@ -607,12 +629,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=true,
+          // this.dialyzer_show=true,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false
           this.getDialyzerInformed()
         }
         if(row.value==12){
@@ -626,12 +649,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=true,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false
           this.getTherapyInformed()
         }
         if(row.value==13){
@@ -645,12 +669,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=true,
           this.show14=false,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false
           this.getPatientMeDicalList()
         }
         if(row.value==14){
@@ -664,16 +689,17 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=true,
           this.show15=false,
-          this.show16=false
+          this.show16=false,
+          this.show17=false
           this.getTreamentPlan()
         }
         if(row.value==15){
-     
+
           this.filter_show=false
           this.face_show=false
           this.profunda_show=false,
@@ -684,12 +710,13 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=true,
-          this.show16=false
+          this.show16=false,
+          this.show17=false
           this.getPatientCriticalList()
         }
         if(row.value==16){
@@ -703,16 +730,37 @@ export default {
           this.hemoperfusion_show=false,
           this.Bring_show=false,
           this.catheterization_show=false,
-          this.dialyzer_show=false,
+          // this.dialyzer_show=false,
           this.therapy_show=false,
           this.history_show=false,
           this.show14=false,
           this.show15=false,
-          this.show16=true
+          this.show16=true,
+          this.show17=false
           this.getPatientCriticalOneList()
         }
+        if(row.value==17){
+          this.filter_show=false
+          this.face_show=false
+          this.profunda_show=false,
+          this.arteriovenous_show=false,
+          this.Highrisk_show=false,
+          this.anticoagulation_show=false,
+          this.critical_show=false,
+          this.hemoperfusion_show=false,
+          this.Bring_show=false,
+          this.catheterization_show=false,
+          // this.dialyzer_show=false,
+          this.therapy_show=false,
+          this.history_show=false,
+          this.show14=false,
+          this.show15=false,
+          this.show16=false,
+          this.show17=true
+          // this.getPatientCriticalOneList()
+        }
     },
-   
+
   }
 }
 </script>

src/xt_pages/user/Informed/components/Disease_diagnosis.vue

@@ -0,0 +1,248 @@
+<!-- 疾病诊断 -->
+<template>
+  <div style="border:1px solid gainsboro ;padding:10px">
+    <div style="position: relative; left: 400px;width: 250px;margin: 20px 0;">
+      <!-- <el-button type="primary">主要按钮</el-button> -->
+        <el-button type="primary" style=""  @click="bianji">
+            编辑
+        </el-button>
+      <!-- <el-button type="danger" style=""  @click="">
+            删除
+      </el-button> -->
+      <el-button type="success" style=""  @click="printThisPage">
+          打印
+      </el-button>
+    </div>
+    <div id="print_content">
+      <div class="print_page_main_content">
+        <div class="content">
+            <h2 style="text-align: center;">疾病诊断证明书</h2>
+
+            <div style="display: flex;margin: 10px 0;">
+              <!-- <div style="flex:1">
+                门诊号码：
+                <div style="display: inline-block; border-bottom:1px solid black;width: 50%;">
+                  {{patient.admission_number}}
+                </div>
+              </div> -->
+              <div style="flex:1">门诊(住院)号码：
+                <div style="display: inline-block; border-bottom:1px solid black;width: 15%;">
+                  {{ patient.admission_number }}
+                </div>
+              </div>
+            </div>
+            <div style="display: flex;">
+              <div style="flex:1">科别：
+                <div style="display: inline-block; border-bottom:1px solid black;width: 50%;"></div>
+              </div>
+              <div style="flex:1">病室：
+                <div style="display: inline-block; border-bottom:1px solid black;width: 50%;"></div>
+              </div>
+              <div style="flex:1">床号：
+                <div style="display: inline-block; border-bottom:1px solid black;width: 50%;"></div>
+              </div>
+            </div>
+            <table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
+              <tbody>
+                <tr>
+                  <td width="10" style="padding: 5px 0;">姓名</td>
+                  <td width="30">{{ patient.name }}</td>
+                  <td width="20">性别</td>
+                  <td width="20">{{ patient.gender ==1?'男':'女' }}</td>
+                  <td width="20">年龄</td>
+                  <td width="20">{{ getAge(patient) }}</td>
+                </tr>
+                <tr>
+                  <td style="padding: 5px 0;">籍贯</td>
+                  <td>{{patient.home_address}}</td>
+                  <td>服务单位</td>
+                  <td colspan="3"></td>
+                </tr>
+              </tbody>
+            </table>
+
+            <div v-html="content"></div>
+        </div>
+      </div>
+    </div>
+
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="70%"
+    > 
+      <div>
+        <h2 style="text-align: center;">疾病诊断证明书</h2>
+        <div style="display: flex;margin: 10px 0;">
+          <!-- <div style="flex:1">
+            门诊号码：
+            <div style="display: inline-block; border-bottom:1px solid black;width: 50%;"></div>
+          </div> -->
+          <div style="flex:1">门诊(住院)号码：
+            <div style="display: inline-block; border-bottom:1px solid black;width: 15%;">
+              {{ patient.admission_number }}
+            </div>
+          </div>
+        </div>
+        <div style="display: flex;">
+          <div style="flex:1">科别：
+            <div style="display: inline-block; border-bottom:1px solid black;width: 50%;"></div>
+          </div>
+          <div style="flex:1">病室：
+            <div style="display: inline-block; border-bottom:1px solid black;width: 50%;"></div>
+          </div>
+          <div style="flex:1">床号：
+            <div style="display: inline-block; border-bottom:1px solid black;width: 50%;"></div>
+          </div>
+        </div>
+        <table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
+          <tbody>
+            <tr>
+              <td width="10" style="padding: 5px 0;">姓名</td>
+              <td width="30">{{ patient.name }}</td>
+              <td width="20">性别</td>
+              <td width="20">{{ patient.gender ==1?'男':'女' }}</td>
+              <td width="20">年龄</td>
+              <td width="20">{{ getAge(patient) }}</td>
+            </tr>
+            <tr>
+              <td style="padding: 5px 0;">籍贯</td>
+              <td></td>
+              <td>服务单位</td>
+              <td colspan="3"></td>
+            </tr>
+          </tbody>
+        </table>
+        <keep-alive>
+          <editor ref="editor"
+                  id="editor"
+                  style="width: 100%"
+                  v-bind:r_content="content">
+          </editor>
+        </keep-alive>
+      </div>
+      
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import print from "print-js";
+  import Editor from '@/components/Editor'
+  import { getPatientDetailInformedconsent,saveFallOutBedPrint  } from '@/api/patient'
+  import { jsGetAge, uParseTime } from "@/utils/tools";
+//   const content =`<table border="1" style="border-collapse: collapse;width: 100%;text-align: center;">
+//     <tbody> 
+//     <tr><td width="10" style="padding: 5px 0;">姓名</td><td width="30"></td><td width="20">性别</td>
+//       <td width="20"></td><td width="20">年龄</td><td width="20"></td>
+//     </tr>
+//     <tr><td style="padding: 5px 0;">籍贯</td><td></td><td>服务单位</td><td colspan="3"></td></tr>
+//     <tr><td colspan="6">
+//         <p style="min-height: 100px;white-space: normal;text-align: left;">
+//           <span style="display: inline-block;padding: 5px;border-bottom: 1px solid black;width: 90px;">检查所见</span>
+//         </p>
+//         <p style="min-height: 100px;white-space: normal;text-align: left;">
+//           <span style="display: inline-block;padding: 5px;border-bottom: 1px solid black;width: 90px;">诊  &nbsp;&nbsp;断</span>
+//         </p>
+//         <p style="min-height: 100px;white-space: normal;text-align: left;">
+//           <span style="display: inline-block;padding: 5px;border-bottom: 1px solid black;width: 90px;">医师意见</span>
+//         </p>
+//         <p style="padding-top: 20px;">
+//           <span style="display: inline-block;padding: 0 30px;">年</span>
+//           <span>月</span>
+//           <span style="display: inline-block;padding: 0 30px;">日</span>
+//           <span>医师<span style="display: inline-block; border-bottom:1px solid black;width: 120px;"></span></span> 
+//         </p>
+//       </td>
+//     </tr>
+//   </tbody>
+// </table>`
+const content =`
+      <div style="border: 1px solid black;">
+        <p style="min-height: 100px;white-space: normal;text-align: left;">
+          <span style="display: inline-block;padding: 5px;border-bottom: 1px solid black;width: 90px;">检查所见</span>
+        </p>
+        <p style="min-height: 100px;white-space: normal;text-align: left;">
+          <span style="display: inline-block;padding: 5px;border-bottom: 1px solid black;width: 90px;">诊  &nbsp;&nbsp;断</span>
+        </p>
+        <p style="min-height: 100px;white-space: normal;text-align: left;">
+          <span style="display: inline-block;padding: 5px;border-bottom: 1px solid black;width: 90px;">医师意见</span>
+        </p>
+        <p style="padding-top: 20px;text-align: center;">
+          <span style="display: inline-block;padding: 0 30px;">年</span>
+          <span>月</span>
+          <span style="display: inline-block;padding: 0 30px;">日</span>
+          <span>医师<span style="display: inline-block; border-bottom:1px solid black;width: 120px;"></span></span> 
+        </p>
+      </div>`
+  export default{
+    props: {
+      patient_id: {
+        type: Number,
+      },
+      
+    },
+    data(){
+      return{
+        content:content,
+        dialogVisible:false,
+        patient:{},
+      }
+      
+    },
+    components:{
+      Editor
+    },
+    created(){
+      this.getlist()
+    },
+    methods:{
+      getlist(){
+        getPatientDetailInformedconsent(this.patient_id).then(response=>{
+          if(response.data.state == 1){
+            var patient =  response.data.data.patients
+            console.log("patinet",patient)
+            this.patient =patient
+          }
+        })
+      },
+      bianji(){
+        this.dialogVisible=true
+      },
+      printThisPage(){
+          const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}}'
+          printJS({
+              printable: 'print_content',
+              type: 'html',
+              documentTitle: '  ',
+              style: style,
+              scanStyles: false
+          })
+      },
+      getAge: function(val) {
+        if (val.id_card_no == undefined) {
+          return false
+        }
+        var thisLen = val.id_card_no.length
+        var birth = ''
+        if (thisLen == 15) {
+          birth = '19' + val.id_card_no.substr(6, 6)
+        } else {
+          birth = val.id_card_no.substr(6, 8)
+        }
+        var birthtwo =
+          birth.substr(0, 4) +
+          '-' +
+          birth.substr(4, 2) +
+          '-' +
+          birth.substr(6, 2)
+
+        var age = jsGetAge(birthtwo, '-')
+        return age
+      },
+    }
+  }
+</script>

src/xt_pages/user/components/PatientSidebar.vue

@@ -418,7 +418,7 @@ export default {
     getList() {
       fetchAllList().then(response => {
         if (response.data.state == 1) {
-          if(this.org_id ==10191 || this.org_id == 0){
+          if(this.org_id ==10191){
              var patients = response.data.data.patients
             //  console.log("patients",patients)
              for(let i=0;i<patients.length;i++){

src/xt_pages/user/inspection.vue

@@ -1328,9 +1328,11 @@ export default {
                 item[key] = items[index][key]
               }
               
+              console.log("item=-----------------",item)
               if (item.item_id > 0) {
+                
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
-                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id == 0 || this.org_id ==10278 || this.org_id == 10702 || this.org_id == 10191){
+                  if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278 || this.org_id == 10702){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{
@@ -1341,6 +1343,14 @@ export default {
                   item.value = inspectionsMap[items[index].item_id].inspect_value
                   item.item_name = inspectionsMap[items[index].item_id].item_name
                 }
+
+                if(this.org_id == 0 || this.org_id ==10191){
+                  if(item.project_name == "乙肝定性（五项)"){
+                    console.log("金阿迪发到付阿打发")
+                    item.value = inspectionsMap[items[index].id].inspect_value
+                    item.item_name = inspectionsMap[items[index].id].item_name
+                  }
+                }
               } else {
                 if(typeof(inspectionsMap[parseInt(items[index].id)])  == "undefined"){
                   continue

src/xt_pages/user/templateSummary.vue

@@ -121,7 +121,7 @@
         </div>
       </div>
 
-      <el-dialog title="新增阶段小结" width="80%" top="5vh" :visible.sync="show_dialog">
+      <el-dialog title="新增阶段小结" width="83%" top="5vh" :visible.sync="show_dialog">
         <div>
           <div class="new_record_form">
             <div class="cell clearfix">
@@ -732,10 +732,10 @@
                           format="yyyy-MM-dd"
                           value-format="yyyy-MM-dd">
                         </el-date-picker>
-                  </el-form-item> 
-              
+                  </el-form-item>
+
               </div>
-              
+
             </el-row>
             <el-row>
                <span>选择检验检查项目:</span>
@@ -817,9 +817,6 @@
         </span>
       </el-dialog>
 
-
-
-
       <multi-select-box
         :propsForm="InnerDialogProps"
         v-on:dialog-comfirm="innerDialogComfirm"
@@ -1873,7 +1870,7 @@
           this.lastYear = val+"-"+"01"
         }
 
-       
+
         this.getInspectionMajor()
       },
       changFirstYear(){

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -98,6 +98,7 @@
       }"
       style="width: 100%"
       @selection-change="handleSelectionChange"
+      height="calc(80vh - 200px)"
     >
      <el-table-column
         align="center"
@@ -110,7 +111,7 @@
           <span v-if="scope.row.prescription.id == 0">未确认</span>
         </template>
       </el-table-column>
-      <el-table-column label="星期" min-width="100" align="center">
+      <el-table-column label="星期" width="60" align="center">
         <template slot-scope="scope">
            <span v-if="scope.row.schedule_week == 0">周日</span>
            <span v-if="scope.row.schedule_week == 1">周一</span>
@@ -121,27 +122,27 @@
            <span v-if="scope.row.schedule_week == 6">周六</span>
         </template>
       </el-table-column>
-      <el-table-column label="姓名" min-width="100" align="center">
+      <el-table-column label="姓名" width="70" align="center">
         <template slot-scope="scope">
           {{ scope.row.patient }}
         </template>
       </el-table-column>
-      <el-table-column label="分区" min-width="100" align="center">
+      <el-table-column label="分区" min-width="110" align="center">
         <template slot-scope="scope">
           {{ scope.row.zone.name }}（{{ getType(scope.row.partition_id)  }}）
         </template>
       </el-table-column>
-      <el-table-column label="班次" min-width="70" align="center">
+      <el-table-column label="班次" width="70" align="center">
         <template slot-scope="scope">
           {{ getSchedulesType(scope.row.schedule_type) }}
         </template>
       </el-table-column>
-      <el-table-column label="机号" min-width="70" align="center">
+      <el-table-column label="机号" width="70" align="center">
         <template slot-scope="scope">
           {{ scope.row.number.number }}
         </template>
       </el-table-column>
-      <el-table-column label="透析模式" min-width="100" align="center">
+      <el-table-column label="透析模式" width="100" align="center">
         <template slot-scope="scope">
           {{
             scope.row.mode_id && modeOptions[scope.row.mode_id]
@@ -183,7 +184,7 @@
           </span> -->
         </template>
       </el-table-column>
-      <el-table-column label="总量" min-width="100" align="center">
+      <el-table-column label="总量" width="70" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.dialysissolution.anticoagulant == 1">{{
             scope.row.dialysissolution.anticoagulant_zongliang

src/xt_pages/workforce/components/tableWeeks.vue

@@ -151,16 +151,17 @@
         </el-table>
 
         <el-table
-                v-loading="isloading"
-                :row-style="{ color: '#303133' }"
-                :data="scheduleData"
-                border
-                :header-cell-style="{
-                backgroundColor: 'rgb(245, 247, 250)',
-                color: '#606266'
-                 }"
-                style="width: 100%"
-                @selection-change="handleSelectionChange"
+          v-loading="isloading"
+          :row-style="{ color: '#303133' }"
+          :data="scheduleData"
+          border
+          :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+            }"
+          style="width: 100%"
+          @selection-change="handleSelectionChange"
+          height="calc(100vh - 200px)"
         >
           <el-table-column
             align="center"
@@ -173,7 +174,7 @@
                     <span v-if="scope.row.prescription.id == 0">未确定</span>
                 </template>
             </el-table-column>
-            <el-table-column label="星期" min-width="100" align="center">
+            <el-table-column label="星期" width="60" align="center">
                 <template slot-scope="scope">
                     <span v-if="scope.row.schedule_week == 0">周日</span>
                     <span v-if="scope.row.schedule_week == 1">周一</span>
@@ -184,7 +185,7 @@
                     <span v-if="scope.row.schedule_week == 6">周六</span>
                 </template>
             </el-table-column>
-            <el-table-column label="姓名" min-width="100" align="center">
+            <el-table-column label="姓名" width="80" align="center">
                 <template slot-scope="scope">
                     {{ scope.row.patient.name }}
                 </template>
@@ -194,17 +195,17 @@
                     {{ scope.row.zone.name }} （{{ getType(scope.row.partition_id)  }}）
                 </template>
             </el-table-column>
-            <el-table-column label="班次" min-width="70" align="center">
+            <el-table-column label="班次" width="70" align="center">
                 <template slot-scope="scope">
                     {{ getSchedulesType(scope.row.schedule_type) }}
                 </template>
             </el-table-column>
-            <el-table-column label="机号" min-width="70" align="center">
+            <el-table-column label="机号" width="70" align="center">
                 <template slot-scope="scope">
                     {{ scope.row.number.number }}
                 </template>
             </el-table-column>
-            <el-table-column label="透析模式" min-width="100" align="center">
+            <el-table-column label="透析模式" min-width="60" align="center">
                 <template slot-scope="scope">
                     {{
                     scope.row.mode_id && modeOptions[scope.row.mode_id]
@@ -249,7 +250,7 @@
           </span>
                 </template>
             </el-table-column>
-            <el-table-column label="总量" min-width="100" align="center">
+            <el-table-column label="总量" min-width="70" align="center">
                 <template slot-scope="scope">
           <span v-if="scope.row.dialysissolution.anticoagulant == 1">{{
             scope.row.dialysissolution.anticoagulant_zongliang
@@ -718,9 +719,8 @@
             dialysisPipe.push(obj)
           }
         }
-        console.log(dialysisPipe)
+    
         dialysisPipe = this.uniqueDialysisPipe(dialysisPipe)
-        console.log(dialysisPipe)
 
         let desc = ''
         for (let b = 0; b < dialysisPipe.length; b++) {

src/xt_pages/workforce/remind.vue

@@ -15,7 +15,6 @@
     </el-tabs>
     <table-push v-if="activeName=='pushTime'"></table-push>
     <!-- <table-weeks v-else :week-time="activeName"> </table-weeks> -->
-
    <table-weeks v-if="activeName == 'thisWeek'"> </table-weeks>
    <nextTableWeeks v-if="activeName =='nextWeek'"></nextTableWeeks>
   </div>

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))