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

package.json

@@ -59,11 +59,12 @@
     "jszip": "3.1.5",
     "mockjs": "1.0.1-beta3",
     "moment": "^2.24.0",
-    "node-sass": "4.14.1",
+    "node-sass": "^5.0.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.50",
     "qrcodejs2": "0.0.2",
+    "sass-loader": "^7.0.0",
     "screenfull": "4.2.0",
     "serve-static": "1.13.2",
     "showdown": "1.8.5",
@@ -110,7 +111,6 @@
     "html-webpack-plugin": "2.30.1",
     "lint-staged": "7.2.0",
     "node-notifier": "5.1.2",
-    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "3.2.0",
     "ora": "1.3.0",
     "portfinder": "1.0.13",
@@ -120,7 +120,6 @@
     "qiniu-webpack-plugin": "^0.4.2",
     "quill-image-extend-module": "^1.1.2",
     "rimraf": "2.6.2",
-    "sass-loader": "^6.0.7",
     "sass-resources-loader": "^1.3.4",
     "script-loader": "^0.7.2",
     "semver": "5.4.1",

src/api/device.js

@@ -399,4 +399,139 @@ export function getRegistNumber(id,record_date,params){
     method:"Get",
     params:params,
   })
+}
+
+export function saveSetAirDisInfect(params){
+ 
+  return request({
+    url:"/api/manage/savesetairdisinfect",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getSetAirDisInfectById(params){
+
+   return request({
+    url:"/api/manage/getsetairinfectbyid",
+    method:"get",
+    params:params
+   })
+}
+
+export function saveNewAirWayDisinfect(data){
+
+  return request({
+    url:"/api/manage/savenewairwaydisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getNewAirWayDisinfectList(params){
+  
+  return request({
+    url:"/api/manage/getnewairwaydisinfectlist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getAirDisinfectWayLongTime(department,params){
+ 
+  return request({
+    url:"/api/manage/getairdisinfectwaylongtime?department="+department,
+    method:"Get",
+    params:params
+  })
+}
+
+export function getNewAirWayDisinfectByIdList(id,params){
+
+  return request({
+    url:"/api/manage/getnewairwaydisinfectbyidlist?id="+id,
+    method:"get",
+    params:params
+  })
+}
+
+export function updateNewAirWayDisinfect(data){
+ 
+  return request({
+    url:"/api/manage/updatenewairwaydisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deleteNewAirWayDisInfect(id,params){
+ 
+  return request({
+    url:"/api/manage/deletenewairwaydisinfect?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function setObjectDisinfect(params){
+ 
+  return request({
+    url:"/api/manage/setobjectdisinfect",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getObjectWayDisinfect(params){
+ 
+  return request({
+    url:"/api/manage/getobjectwaydisinfect",
+    method:"get",
+    params:params,
+  })
+}
+
+export function saveObjectWayTableDisinfect(data){
+ 
+  return request({
+    url:"/api/manage/saveobjectwaytabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function getObjectTableDisInfectWayList(params){
+  
+  return request({
+    url:"/api/manage/getobjcettabledisinfectwaylist",
+    method:"get",
+    params:params,
+  })
+}
+
+export function getObjectTableDisInfectWayByIdList(id,params){
+
+   return request({
+    url:"/api/manage/getobjecttabledisinfectwaybylist?id="+id,
+    method:"get",
+    params:params,
+   })
+}
+
+export function updateObjectWayTableDisinfect(data){
+ 
+  return request({
+    url:"/api/manage/updateobjectwaytabledisinfect",
+    method:"post",
+    data:data,
+  })
+}
+
+export function deleteObjectTableWayDisinfect(id,params){
+
+  return request({
+    url:"/api/manage/deleteobjecttablewaydisinfect?id="+id,
+    method:"get",
+    params:params,
+  })
 }

src/router/modules/dialysis.js

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

src/router/modules/patient.js

@@ -74,7 +74,7 @@ export default {
       noCache: true
     }
   },
-  
+
 
   {
     path: '/patients/patient/:mid/vascularAccessDetail/:pid',
@@ -325,7 +325,7 @@ export default {
       noCache: true
     }
   },
-  
+
   // {//评估工具/跌倒评估
   //   path: '/patients/patient/:id/Fallassessment',
   //   component: () => import('@/xt_pages/user/evaluationtool/Fallassessment'),

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -227,6 +227,11 @@
                 }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="国家编码" width="162" align="center">
+              <template slot-scope="scope">
+                <span>{{getDrugName(scope.row.DrugId)}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="备注" width="170" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.Remarks ? scope.row.Remarks : "" }}</span>
@@ -319,6 +324,7 @@ export default {
       shift: 0, //班次
       fen: [],
       partition: 0, //分区
+      drugList:[],
     };
   },
   watch: {},
@@ -451,6 +457,7 @@ export default {
         if (res.data.state == 1) {
           this.waitmount = res.data.data.itotal;
           this.alreadmount = res.data.data.wtotal;
+          this.drugList = res.data.data.drug
         }
       });
       // console.log("2222222")
@@ -706,6 +713,16 @@ export default {
         })
         .catch(() => {});
     },
+    getDrugName(drug_id){
+    
+      var  medical_insurance_number = ""
+      for(let i=0;i<this.drugList.length;i++){
+       if(drug_id == this.drugList[i].id){
+        medical_insurance_number = this.drugList[i].medical_insurance_number
+       }
+      }
+      return medical_insurance_number
+    }
   },
 };
 </script>

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -23,11 +23,13 @@
             <el-button type="primary" style="margin-left: 10px;" @click="toSeach">搜索</el-button>
           </div>
           <div style="float:right;margin-bottom:10px;">
-            <el-button type="primary" @click="printCard">打印</el-button>
-            <el-button type="primary" @click="dialogFormVisible = true">新增</el-button>
-
+            <el-button type="primary" @click="toSetting">设置</el-button>
+            <el-button type="primary" @click="printCard" v-if="art_way_one==0 || art_way_one ==1">打印</el-button>
+            <el-button type="primary" @click="printCardOne" v-if=" art_way_one ==2">打印</el-button>
+            <el-button type="primary" @click="dialogFormVisible = true" v-if="art_way_one == 0 || art_way_one == 1">新增</el-button>
+            <el-button type="primary" @click="newdialogFormVisible = true" v-if="art_way_one == 2">新增</el-button>
           </div>
-          <div class="tab_air">
+          <div class="tab_air" v-if="art_way_one == 0 || art_way_one ==1">
             <el-table  :data="tableData" :fit="true" stripe>
                 <el-table-column prop="year" label="名称" width="150" align="center">
                     <el-table-column prop="year" label="消毒时间" align="center" width="150">
@@ -138,7 +140,72 @@
           </el-pagination>
          </div>
 
-            <!-- 新增 -->
+         <div  v-if="art_way_one == 2">
+            <el-table  :data="tableDataOne" :fit="true" stripe   style="width: 100%"
+                row-key="id"
+                border
+                lazy
+                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+               
+            <el-table-column prop="year" label="消毒日期" align="center" width="150">
+                <template slot-scope="scope">
+                    {{getTimes(scope.row.record_date) }}
+                </template>
+                
+            </el-table-column>
+
+            <el-table-column prop="year" label="消毒物品" align="center" width="150">
+                <template slot-scope="scope">
+                  {{scope.row.department  }} 
+                </template>
+                
+            </el-table-column>
+                   
+             
+                <el-table-column prop="fenopda" :label="'500mg/l含氯制剂'" align="center" min-width="60">
+                    <template slot-scope="scope">
+                        {{ getTimeTwo(scope.row.first_start_time) }} - {{ getTimeTwo(scope.row.first_end_time) }}
+                       
+                    </template>
+                </el-table-column>
+                <el-table-column prop="dwaiod" label="责任人" align="center" min-width="60">
+                    <template slot-scope="scope">
+                        {{getName(scope.row.first_creator)}}
+
+                     
+                    </template>
+                </el-table-column>
+
+              
+
+                <el-table-column prop="city" label="操作" align="center" min-width="100">
+                    <template slot-scope="scope">
+                        <el-button
+                        size="mini"
+                        type="primary"
+                        @click="handleEditOne(scope.row.id)">编辑</el-button>
+                        <el-button
+                        size="mini"
+                        type="danger"
+                        @click="handleDeleteOne(scope.row.id)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+              :page-sizes="[10, 20, 50, 100]"
+              :page-size="10"
+              background
+              style="margin-top:20px;float: right"
+              layout="total, sizes, prev, pager, next, jumper"
+              :total="total"
+              @size-change="handleSizeChangeOne"
+              @current-change="handleCurrentChangeOne"
+          >
+            
+          </el-pagination>
+         </div>
+
+         <!-- 新增 -->
           <el-dialog
           class="centerDialog"
           width="1000px"
@@ -1054,7 +1121,284 @@
                 </div>
             </div>
          </div>
-        
+
+
+         <div hidden="hiddenShowOne">
+            <div id="print-card-info_one" v-show="hiddenShowOne">
+                <div>
+                    <h1 style="text-align: center;">物表消毒登记</h1>
+                    <div>
+                        <table border="1" style="text-align: center;margin: auto;border-collapse: collapse;">
+                            <tr>
+                               <td>消毒时间</td>
+                               <td>消毒物品</td>
+                                <td>500mg/l含氯制剂</td>
+                                <td>负责人</td>
+                            </tr>
+
+                            <tr v-for="(item,index) in tableDataOne" :key="index">
+                                <td>{{getTimes(item.record_date) }}</td>
+                                <td>{{item.department}}</td>
+                                <td>{{getTimeTwo( item.first_start_time)}}- {{getTimeTwo(item.first_end_time)  }}</td>
+                                <td>
+                                <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">
+                                   {{getName(item.first_creator)}}
+                                  </span>
+                                <span v-else>
+                                    <img style="height:30px;" :src="setAdminUserES(item.last_creator?item.last_creator:item.last_creator)" alt="" srcset="">
+                                </span>   
+                                </td>
+                            </tr>
+                         </table>   
+
+                    </div>
+                </div>
+            </div>
+         </div>
+         
+         <el-dialog
+            title="请选择版本"
+            :visible.sync="setEditDialog"
+            width="60%">
+            <span>
+                <el-radio v-model="air_way" label="1">版本一</el-radio>
+                <el-radio v-model="air_way" label="2">版本二</el-radio>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="setEditDialog = false">取 消</el-button>
+                <el-button type="primary" @click="saveSetObjectTable()">保 存</el-button>
+            </span>
+         </el-dialog>
+
+
+         <el-dialog
+          class="centerDialog"
+          width="1000px"
+          title="新增物表消毒表"
+          :visible.sync="newdialogFormVisible">
+              <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                  <div style="width: 100%;">
+                    <el-form-item label="创建日期" label-width="110px" required prop="record_date">
+                        <el-date-picker
+                        value-format="yyyy-MM-dd"
+                        v-model="form.record_date"
+                        type="date"
+                        placeholder="选择日期时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="消毒物品" label-width="110px" required prop="department">
+                        <el-select v-model="form.department" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disinfectionOfficeList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                        </el-select>
+                    </el-form-item>
+                  </div>
+                  <div class="form_title">
+                    <span >
+                     {{ form.department }}
+                   </span>
+                  </div>
+                  <el-form-item label="消毒方式" label-width="110px">
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="消毒液" label-width="110px">
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="消毒时间(h)" label-width="110px">
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
+                  </el-form-item>
+                  <el-form-item label="开始时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_start_time"
+                        @change="firststartime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="结束时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_end_time"
+                        @change="firstendtime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                 
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.first_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.first_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px" >
+                      <el-select v-model="form.first_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px">
+                      <el-select v-model="form.first_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+    
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                  <el-button @click="newdialogFormVisible = false">取 消</el-button>
+                  <el-button type="primary" @click="saveObjectWayTableDisinfect('form')">保 存</el-button>
+              </div>
+          </el-dialog>
+
+
+        <el-dialog
+          class="centerDialog"
+          width="1000px"
+          title="编辑物表消毒表"
+          :visible.sync="editnewdialogFormVisible">
+              <el-form :model="form" ref="form" class="airForm" :rules="airRules">
+                  <div style="width: 100%;">
+                    <el-form-item label="创建日期" label-width="110px" required prop="record_date">
+                        <el-date-picker
+                        value-format="yyyy-MM-dd"
+                        v-model="form.record_date"
+                        type="date"
+                        placeholder="选择日期时间">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="消毒物品" label-width="110px" required prop="department">
+                        <el-select v-model="form.department" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disinfectionOfficeList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                        </el-select>
+                    </el-form-item>
+                  </div>
+                  <div class="form_title">
+                    <span >
+                     {{ form.department }}
+                   </span>
+                  </div>
+                  <el-form-item label="消毒方式" label-width="110px">
+                      <!-- <el-input v-model="form.first_disinfection_methods"></el-input> -->
+                      <el-select v-model="form.first_disinfection_methods" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in DisinfectionMode"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="消毒液" label-width="110px">
+                      <!-- <el-input v-model="form.first_disinfection_water"></el-input> -->
+                      <el-select v-model="form.first_disinfection_water" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in disInfectionWaterList"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.name">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="消毒时间(h)" label-width="110px">
+                      <el-input v-model="form.first_disinfection_time " :disabled="true"></el-input>
+                  </el-form-item>
+                  <el-form-item label="开始时间" label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_start_time"
+                        @change="firststartime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item label="结束时间"  label-width="110px">
+                    <el-date-picker
+                        type="datetime"
+                        format="yyyy-MM-dd HH:mm"
+                        value-format="yyyy-MM-dd HH:mm"
+                        placeholder="选择时间"
+                        v-model="form.first_end_time"
+                        @change="firstendtime"
+                        style="width:100%;"
+                    ></el-date-picker>
+                  </el-form-item>
+                 
+                  <el-form-item label="检测合格" label-width="110px">
+                      <div>
+                          <el-radio v-model="form.first_is_check" label="1">是</el-radio>
+                          <el-radio v-model="form.first_is_check" label="2">否</el-radio>
+                      </div>
+                  </el-form-item>
+                  <el-form-item label="修改标志" label-width="110px" >
+                      <el-select v-model="form.first_modifications" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in options"
+                          :key="index"
+                          :label="item.name"
+                          :value="item.id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+                  <el-form-item label="责任人" label-width="110px">
+                      <el-select v-model="form.first_creator" placeholder="请选择">
+                          <el-option
+                          v-for="(item,index) in docList"
+                          :key="index"
+                          :label="item.user_name"
+                          :value="item.admin_user_id">
+                          </el-option>
+                      </el-select>
+                  </el-form-item>
+    
+              </el-form>
+              <div slot="footer" class="dialog-footer">
+                  <el-button @click="editnewdialogFormVisible = false">取 消</el-button>
+                  <el-button type="primary" @click="updateObjectWayTableDisinfect('form')">保 存</el-button>
+              </div>
+          </el-dialog>
       </div>
     </div>
   </template>
@@ -1067,7 +1411,14 @@
         getObjectTableDisInfectList,
         getObjectTableDisInfectByIdList,
         updateObjectTableDisinfect, 
-        deleteObjectTableDisinfect
+        deleteObjectTableDisinfect,
+        setObjectDisinfect,
+        getObjectWayDisinfect,
+        saveObjectWayTableDisinfect,
+        getObjectTableDisInfectWayList,
+        getObjectTableDisInfectWayByIdList,
+        updateObjectWayTableDisinfect,
+        deleteObjectTableWayDisinfect
     } from "@/api/device"
     import { getManageMentDataConfig } from '@/utils/data'
     import { uParseTime } from '@/utils/tools'
@@ -1081,11 +1432,14 @@
         return {
           crumbs: [
             { path: false, name: '院感管理' },
-            { path: false, name: '透析室空气消毒记录表' }
+            { path: false, name: '透析室物表消毒记录表' }
           ],
 
           dialogFormVisible:false,
           editDialogFormVisible:false,
+          newdialogFormVisible:false,
+          editnewdialogFormVisible:false,
+          setEditDialog:false,
           startvalue:'',
           endvalue:'',
           form: {
@@ -1140,7 +1494,7 @@
             last_is_check:"1",//检验合格
             last_modifications:"",//修改标志
             last_creator:this.$store.getters.xt_user.user.id,//第一责任人
-          
+            department:"",
           },
         //   value1:'',
           docList:[],
@@ -1173,23 +1527,36 @@
          ],
          operators: [],
          operatorMaps:{},
-         
+         setEditDialog:false,
+         air_way:"2",
+         disinfectionOfficeList:[],
+         tableDataOne:[],
+         hiddenShowOne:false,
+         art_way_one:0,
         }
+
       },
       created(){
         var  disinfection_fluid = getManageMentDataConfig('management', 'disinfection_fluid')
-        console.log("disinfection_fluid",disinfection_fluid)
+      
         for(let i=0;i<disinfection_fluid.length;i++){
           this.disInfectionWaterList.push(disinfection_fluid[i])
         }
 
         var  disinfection_methods = getManageMentDataConfig('management', 'disinfection_methods')
-        console.log("disinfection_methods",disinfection_methods)
+       
         for(let i=0;i<disinfection_methods.length;i++){
           this.DisinfectionMode.push(disinfection_methods[i])
         }
+        var  disinfection_offices = getManageMentDataConfig('management', 'disinfection_object')
+        
+        for(let i=0;i<disinfection_offices.length;i++){
+          this.disinfectionOfficeList.push(disinfection_offices[i])
+        }
         this.getAllDoctorList()
         this.getObjectTableDisInfectList()
+        this.getObjectTableDisInfectWayList()
+        this.getObjectWayDisinfect()
       },
       computed:{
         firstdisinfection_time (){
@@ -1244,6 +1611,23 @@
             });
         }, 1);
        },
+       printCardOne(){
+        this.hiddenShowOne = true;
+        var ptime = Math.round(new Date().getTime() / 1000);
+        this.print_time = uParseTime(ptime, "{y}年{m}月{d}日");
+
+        const style =
+            "@media print { .print_main_content { background-color: white; width:960px; margin:0 auto; padding: 0 0 20px 0;font-size:15px } .print_main_content .order_title { text-align: center; font-size: 15px; line-height: 50px;} .print_main_content table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px;font-size:15px } .print_main_content table tbody tr td { border: 1px solid; text-align: center; padding: 10px 8px;font-size:15px } .td_proj_title { font-size: 15px; line-height: 25px;} .td_proj_content { font-size: 15px; line-height: 25px; } .td_align_left { text-align: left; } .print_footnote_panel { font-size: 15px; line-height: 40px; } .print_footnote_panel .proj { display: inline-block; width: 49%; } .print_footnote_panel .proj}";
+
+        setTimeout(() => {
+            printJS({
+            printable: "print-card-info_one",
+            type: "html",
+            style: style,
+            scanStyles: false
+            });
+        }, 1);
+       },
        getTimes(time) {
          return uParseTime(time, '{y}-{m}-{d}')
        },
@@ -1461,6 +1845,35 @@
             }
           })
         },
+        handleEditOne(id){
+            getObjectTableDisInfectWayByIdList(id).then(response=>{
+                var list = response.data.data.list
+              console.log("list",list)
+              this.form.id = list.id
+              this.form.record_date = this.getTimes(list.record_date)
+              this.form.first_disinfection_water = list.first_disinfection_water? list.first_disinfection_water:""
+              this.form.first_disinfection_methods = list.first_disinfection_methods? list.first_disinfection_methods:""
+              this.form.first_disinfection_time = list.first_disinfection_time?list.first_disinfection_time:""
+              this.form.first_start_time = this.getTimeThree(list.first_start_time)
+              this.form.first_end_time = this.getTimeThree(list.first_end_time)
+              this.form.first_total_time = list.first_total_time?list.first_total_time:""
+              this.form.first_is_check = list.first_is_check.toString()
+              this.form.first_modifications = list.first_modifications?list.first_modifications:""
+              this.form.first_creator = list.first_creator
+
+              this.form.last_start_time = this.getTimeThree(list.last_start_time)
+              this.form.last_end_time = this.getTimeThree(list.last_end_time)
+              this.form.last_total_time = list.last_total_time?list.last_total_time:""
+              this.form.last_is_check = list.last_is_check.toString()
+              this.form.last_modifications = list.last_modifications?list.last_modifications:""
+              this.form.last_creator = list.last_creator
+              this.form.last_disinfection_water = list.last_disinfection_water?list.last_disinfection_water:""
+              this.form.last_disinfection_methods = list.last_disinfection_methods?list.last_disinfection_methods:""
+              this.form.last_disinfection_time = list.last_disinfection_time?list.last_disinfection_time:""
+              this.form.department = list.department
+              this.editnewdialogFormVisible = true
+            })
+        },
         updateObjectTableDisinfect(formName){
           this.$refs[formName].validate((valid=>{
             if(valid){
@@ -1536,6 +1949,47 @@
             }
           }))
         },
+        updateObjectWayTableDisinfect(formName){
+          this.$refs[formName].validate((valid=>{
+            if(valid){
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+              
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+               
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
+                console.log("hhahdhfhahdf",this.form)
+                updateObjectWayTableDisinfect(this.form).then(response=>{
+                 if(response.data.state == 1){
+                   var objectDisinfect =  response.data.data.objectDisinfect
+                   this.$message.success("保存成功!")
+                   this.editnewdialogFormVisible = false
+                   this.getObjectTableDisInfectWayList()
+                 }
+              })
+            }
+          }))
+        },
         handleDelete(id){
           deleteObjectTableDisinfect(id).then(response=>{
             if(response.data.state ==1){
@@ -1545,6 +1999,15 @@
             }
           })
         },
+        handleDeleteOne(id){
+          deleteObjectTableWayDisinfect(id).then(response=>{
+            if(response.data.state ==1){
+              var msg = response.data.data.msg
+              this.$message.success("删除成功!")
+              this.getObjectTableDisInfectWayList()
+            }
+          })
+        },
         firststartime(val){
             this.form.first_start_time = val
             this.form.first_disinfection_time = this.firstdisinfection_time
@@ -1597,13 +2060,6 @@
               }
            }
            return user_name
-           // if (id in this.operatorMaps) {
-
-           // return this.operatorMaps[id].url
-
-           // } else {
-           // return ''
-           // }
        },
 
        handleSizeChange(val) {
@@ -1614,9 +2070,118 @@
         this.page = val;
         this.getObjectTableDisInfectList()
       },
+      handleSizeChangeOne(val){
+        this.limit = val;
+        this.getObjectTableDisInfectWayList()
+      },
+      handleCurrentChangeOne(val){
+        this.page = val;
+        this.getObjectTableDisInfectWayList()
+      },
       toSeach(){
         this.getObjectTableDisInfectList()
-      }
+        this.getObjectTableDisInfectWayList()
+      },
+      toSetting(){
+        getObjectWayDisinfect().then(response=>{
+           if(response.data.state==1){
+             var objctSet = response.data.data.disinfect
+             if(objctSet!=undefined){
+                this.art_way_one = objctSet.air_way.toString()
+             }
+             this.setEditDialog = true
+             
+           }
+        })
+      },
+      getObjectWayDisinfect(){
+        getObjectWayDisinfect().then(response=>{
+           if(response.data.state==1){
+             var objctSet = response.data.data.disinfect
+             if(objctSet!=undefined){
+                this.art_way_one = objctSet.air_way
+             }
+             console.log("art_way_one23232322323",this.art_way_one)
+            
+           }
+        })
+      },
+      saveSetObjectTable(){
+         var params = {
+            air_way:parseInt(this.air_way)
+         }
+        setObjectDisinfect(params).then(response=>{
+           if(response.data.state==1){
+             var objctSet = response.data.data.objctSet
+             this.setEditDialog = false
+             this.getObjectWayDisinfect()
+           }
+        })
+      },
+      saveObjectWayTableDisinfect(formName){
+        this.$refs[formName].validate((valid)=>{
+            if(valid){
+                if(this.form.first_is_check!=""){
+                  this.form.first_is_check = parseInt(this.form.first_is_check) 
+                }else{
+                    this.form.first_is_check=0
+                }
+
+                if(this.form.first_modifications!=""){
+                  this.form.first_modifications = parseInt(this.form.first_modifications) 
+                }else{
+                    this.form.first_modifications=0
+                }
+
+
+                if(this.form.last_is_check!=""){
+                    this.form.last_is_check = parseInt(this.form.last_is_check)
+                }else{
+                    this.form.last_is_check = 0
+                }
+
+              
+
+                if(this.form.last_modifications!=""){
+                    this.form.last_modifications = parseInt(this.form.last_modifications)
+                }else{
+                    this.form.last_modifications = 0
+                }
+
+                if(this.form.last_start_time == null){
+                   this.form.last_start_time = ""
+                }
+
+                if(this.form.last_end_time == null){
+                   this.form.last_end_time = ""
+                }
+              
+              saveObjectWayTableDisinfect(this.form).then(response=>{
+                if(response.data.state ==1){
+                    var objectDisinfect =  response.data.data.objectDisinfect
+                   this.$message.success("保存成功!")
+                   this.newdialogFormVisible = false
+                   this.getObjectTableDisInfectWayList()
+                }
+              })
+            }
+        })
+      },
+      getObjectTableDisInfectWayList(){
+        var params = {
+                start_time:this.startvalue,
+                end_time:this.endvalue,
+                limit:this.limit,
+                page:this.page,
+             }
+             getObjectTableDisInfectWayList(params).then(response=>{
+              if(response.data.state == 1){
+                var list = response.data.data.list
+                this.tableDataOne = list
+                this.total = response.data.data.total
+              }
+            })  
+       }
         
       }
     }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -419,6 +419,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 68">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -2170,6 +2179,9 @@ export default {
       else if (this.template_id == 67) {
         this.$router.push({ path: "/dialysis/print/batch/sixtyseven" });
       }
+      else if (this.template_id == 68) {
+        this.$router.push({ path: "/dialysis/print/batch/sixtyeight" });
+      }
     },
     batchPrintActionOne: function() {
       if (this.selecting_schs.length === 0) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -111,7 +111,8 @@
           org_template_info.template_id == 50 ||
           org_template_info.template_id == 52 ||
           org_template_info.template_id == 53  ||
-          org_template_info.template_id == 64)
+          org_template_info.template_id == 64 ||
+          org_template_info.template_id == 68)
         "
       >
       <div>
@@ -1293,6 +1294,11 @@
             v-if="org_template_info.template_id == 67">
 
           </DialysisPrintOrdersixtySeven>
+          <DialysisPrintOrderSixtyeight
+            v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 68"
+          >
+          </DialysisPrintOrderSixtyeight>
         </div>
       </el-container>
     </div>
@@ -1378,6 +1384,7 @@ import DialysisPrintOrderSixtyfour from './template/DialysisPrintOrderSixtyfour'
 import DialysisPrintOrderSixtyFive from "./template/DialysisPrintOrderSixtyFive.vue"
 import DialysisPrintOrderSixtysix from './template/DialysisPrintOrderSixtysix.vue'
 import DialysisPrintOrdersixtySeven from './template/DialysisPrintOrdersixtySeven.vue'
+import DialysisPrintOrderSixtyeight from './template/DialysisPrintOrderSixtyeight.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1448,6 +1455,7 @@ export default {
     DialysisPrintOrderSixtyfour,
     DialysisPrintOrderSixtyFive,
     DialysisPrintOrderSixtysix,
+    DialysisPrintOrderSixtyeight,
     LabelBox,
     BreadCrumb,
     // DialysisPrintOrderSixtyFive
@@ -1695,7 +1703,8 @@ export default {
         this.org_template_info.template_id == 58 ||
         this.org_template_info.template_id == 60 ||
         this.org_template_info.template_id == 61 ||
-        this.org_template_info.template_id == 66
+        this.org_template_info.template_id == 66 ||
+        this.org_template_info.template_id == 68
 
       ) {
         printJS({

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4144,6 +4144,73 @@ export default {
         //    this.advice_groups.push(group)
         //   }
         // }
+
+
+        
+
+        console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
+        if(this.org_id ==10515 || this.org_id == 0){
+          if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
+            for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
+              this.doctor_advices.push(response.data.data.doctorAdevieInfo[i])
+              // this.doctor_advices_2.push(response.data.data.doctorAdevieInfo[i])
+            }
+         }
+
+
+         let projects = [];
+        response.data.data.projects.map((item) => {
+          if (item.type == 2) {
+            projects.push(item);
+          }
+        });
+        this.projects = projects;
+
+      
+        console.log("this.projects", this.projects);
+
+        // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
+      
+        if(this.projects!=null && this.projects.length >0){
+           for(let i=0;i<this.projects.length;i++){
+             if(this.projects[i].type== 2){
+            
+              this.projects[i].project_team_name = ""
+              this.projects[i].project_team_id = 0
+              console.log("this.projects[i].project.team",this.projects[i].project.team)
+              if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+                this.projects[i].project_team = this.projects[i].team.project_team
+                this.projects[i].project_team_id = this.projects[i].team.id
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.projects[i].advice_name =  this.projects[i].team.project_team
+              
+               
+                this.doctor_advices.push(this.projects[i])
+                // this.doctor_advices_2.push(this.project[i])
+              }else{
+                this.projects[i].project_team = this.projects[i].project.project_name
+                this.projects[i].advice_name = this.projects[i].project.project_name
+                this.projects[i].start_time = this.projects[i].start_time
+                this.projects[i].single_dose = this.projects[i].single_dose
+                this.projects[i].single_dose_unit = this.projects[i].unit
+                this.projects[i].execution_time = this.projects[i].execution_time
+                this.projects[i].execution_staff= this.projects[i].execution_staff 
+                this.doctor_advices.push(this.projects[i])
+                // this.doctor_advices_2.push(this.projects[i])
+              }
+             
+             }
+             
+           }
+        }
+         
+        }
+      
+        console.log("时间我我我哦我我",this.doctor_advices)
         if (this.doctor_advices.length <= 6) {
           var nl = 6;
           this.print_length = 6;
@@ -4178,6 +4245,8 @@ export default {
           this.doctor_advices_2 = doctor_advices_2;
         }
         // console.log(this.advice_groups);
+
+       
       } else {
         this.loading = false;
         this.$message.error("请求数据失败");

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -173,6 +173,9 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="医师编码：">
+         <el-input v-model="form.doctor_number"></el-input>
+      </el-form-item>
       <el-form-item label="科室：" prop="department">
         <el-select v-model="form.department" placeholder="请选择">
           <el-option
@@ -387,7 +390,8 @@
           medical_expenses: '',
           cost: '',
           phone: '',
-          social_type: ''
+          social_type: '',
+          doctor_number:"",
         }
 
       }
@@ -526,7 +530,7 @@
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {
-            console.log(this.doctors[i].department_id)
+            this.form.doctor_number = this.doctors[i].doctor_number
             this.form.department = this.doctors[i].department_id
             if (this.form.department == 0) {
 

src/xt_pages/outpatientCharges/components/registerDialog9504.vue

@@ -165,6 +165,10 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="医师编码：">
+         <el-input v-model="form.doctor_number"></el-input>
+      </el-form-item>
+
       <el-form-item label="科室：" prop="department" >
         <el-select v-model="form.department" placeholder="请选择">
           <el-option
@@ -629,6 +633,7 @@
           cost: '',
           phone: '',
           social_type: '',
+          doctor_number:"",
         }, IDCardTypes: [{
           value: 1,
           label: '社保卡'
@@ -903,7 +908,7 @@
       changeDoctor() {
         for (let i = 0; i < this.doctors.length; i++) {
           if (this.doctors[i].admin_user_id == this.form.doctor) {
-            console.log(this.doctors[i].department_id)
+            this.form.doctor_number = this.doctors[i].doctor_number
             this.form.department = this.doctors[i].department_id
             if(this.form.department == 0){
 

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -12,9 +12,9 @@
     </template>
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375"><!---->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387" >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id !=0" >
             <printOne v-if="org_id != 10088 &&  org_id != 0 " :paramsObj="invoiceParams"></printOne>
-            <printThree v-if="org_id == 10088 || org_id == 0" :paramsObj="invoiceParams"></printThree>
+            <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 || org_id == 4 " :paramsObj="invoiceParams"></printFour>
@@ -33,7 +33,7 @@
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217 ">
+    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 0">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printSix.vue

@@ -5,6 +5,7 @@
       <div :style="{position: 'absolute',top:(18 + (index * 420))  + 'px',left:117+ 'px',}">{{ list.order_number }}</div>
       <div >
           <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:92+ 'px',}">{{ paramsObj.name }}</div>
+          <div :style="{position: 'absolute',top:(38 + (index * 420))  + 'px',left:492+ 'px',}">{{ doctor_info.user_name }}  {{ doctor_info.doctor_number }} </div>
       </div>
       <div :style="{position: 'absolute',top:(95 + (index * 420))  + 'px',left:76+ 'px',}">
           <div v-if="list.westernMedicineCostTotal">西药 {{ list.westernMedicineCostTotal }}</div>
@@ -116,6 +117,7 @@ export default {
           org_name:'',
           page:1,
           pageArr:[],
+          doctor_info:{},
       }
   },
   created(){
@@ -150,6 +152,8 @@ export default {
               this.getPage()
               this.pageArr.push(10)
               console.log('pageArr',this.pageArr.length)
+              this.doctor_info = res.data.data.doctor_info
+              console.log("doc_ON2O2O2O",this.doctor_info)
           })
       },
       smalltoBIG(n) {

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -105,6 +105,11 @@
                     </el-select>
                 </template>
             </el-table-column>
+            <el-table-column align="center" prop="remark" width="80" label="国家编码">
+                <template slot-scope="scope">
+                    <el-input   v-model="scope.row.drug.medical_insurance_number" placeholder=""></el-input>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="remark" width="50" label="备注">
                 <template slot-scope="scope">
                     <el-input :disabled="prescription.is_medicine_status"  v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
@@ -183,6 +188,14 @@
 
                 </template>
             </el-table-column>
+            <el-table-column align="center" prop="name" width="50" label="国家编码">
+                <template slot-scope="scope" v-if="scope.row.type==3">
+                    <el-input v-model="scope.row.good_info.social_security_directory_code"></el-input>
+                </template>
+                <template slot-scope="scope" v-if="scope.row.type==2">
+                    <el-input v-model="scope.row.project.medical_code"></el-input>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="name" width="50" label="备注">
                 <template slot-scope="scope">
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
@@ -319,19 +332,11 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            this.drugways = []
-            //内蒙古医院因为使用坐标系统，需要按坐标系统的用药途径改造,所以需要把默认的用药途径删除
-            if(this.$store.getters.xt_user.org_id == 0 ){
-              for(let i = 0; i < response.data.data.drugways.length; i++){
-                if(response.data.data.drugways[i].org_id > 0 ){
-                  this.drugways.push(response.data.data.drugways[i])
-                }
-              }
-            }else{
-              this.drugways = response.data.data.drugways
-            }
+            this.drugways = response.data.data.drugways
+
             this.efs = response.data.data.efs
             this.drugList = response.data.data.drugs
+           
           }
         })
 
@@ -693,7 +698,8 @@
     watch: {
       'prescription.advices': {
         handler(newVal, oldVal) {
-
+          console.log("检查我我我我",this.prescription.advices)
+          console.log("检查我我我我",this.prescription.project)
         },
         deep: true
       }

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -352,7 +352,7 @@
 
             />
           </p>
-          <p v-if="org_id == 10510 ||org_id == 0">
+          <p v-if="org_id == 10510">
             医师：
             <span
               style="width: 100px; display: inline-block"
@@ -374,7 +374,7 @@
 
             />
           </p>
-          <p v-else>
+          <p v-if="org_id!=10217 && org_id!=10510">
             医师： {{ item.doctor ? item.doctor : "" }}
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>

src/xt_pages/outpatientRegistration/index.vue

@@ -381,6 +381,9 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="医师编码：">
+                       <el-input v-model="form.doctor_number"></el-input>
+                    </el-form-item>
                     <el-form-item label="科室：" prop="department" :validate-event="is_Name">
                         <el-select v-model="form.department" placeholder="请选择">
                             <el-option
@@ -484,7 +487,8 @@
           total: '',
           phone: '',
           social_type: '',
-          id_card_type: 2
+          id_card_type: 2,
+          doctor_number:"",
 
         },
         medical_care: [
@@ -1515,17 +1519,20 @@
       ,
 
       changeDoctor(id) {
-
+        console.log("idwowowowo",id)
         for (let i = 0; i < this.doctorList.length; i++) {
           if (this.doctorList[i].admin_user_id == id) {
+            this.form.doctor_number = this.doctorList[i].doctor_number
             if (this.doctorList[i].department_id == 0) {
               this.form.department = this.departmentList[0].id
+              
             } else {
               this.form.department = this.doctorList[i].department_id
             }
 
           }
         }
+        console.log("this.form.doctor_number",this.form.doctor_number)
       },
       changeName(id) {
         this.form.sex = ''

src/xt_pages/role/admin.vue

@@ -179,12 +179,12 @@
            
 
         
-         <el-button
+         <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSendInformaton">发送短信验证码</el-button> 
+          @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
      </div>
@@ -271,7 +271,7 @@
               </el-button>
             </span> -->
 
-            <span>
+            <!-- <span>
               <el-button type="primary" size="small" @click="toQianShu(scope.row.user_id,scope.row.user_name)">
                     <span>创建签署人用户</span>
               </el-button>
@@ -287,7 +287,7 @@
               <el-button type="primary" size="small" @click="toShouQuan(scope.row.user_id,scope.row.user_name)">
                     <span>创建企业印章</span>
               </el-button>
-            </span>
+            </span> -->
             <el-tooltip
               class="item"
               effect="dark"

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

@@ -113,6 +113,14 @@
               </el-form-item>
             </template>
           </el-table-column>
+        <el-table-column align="center" width="100">
+          <template slot="header" slot-scope="scope">
+              国家编码
+            </template>
+           <template slot-scope="scope">
+              {{ scope.row.medical_insurance_number? scope.row.medical_insurance_number:"" }}
+           </template>
+        </el-table-column>
           <el-table-column align="center" width="200">
             <template slot="header" slot-scope="scope">
               <span>商品类型<span style="color: red">*</span></span>
@@ -520,11 +528,11 @@ export default {
           this.recordInfo.recordData[i].name = val.name;
           this.recordInfo.recordData[i].project_name = val.project_name;
           this.recordInfo.recordData[i].project_type = val.project_type;
-          this.recordInfo.recordData[i].second_specification_name =
-            val.second_specification_name;
+          this.recordInfo.recordData[i].second_specification_name =val.second_specification_name;
           this.recordInfo.recordData[i].second_total = val.second_total;
           this.recordInfo.recordData[i].sencond_unit = val.sencond_unit;
           this.recordInfo.recordData[i].min_price = val.min_price;
+          this.recordInfo.recordData[i].medical_insurance_number = val.medical_insurance_number
           if (val.count == NaN) {
             this.recordInfo.recordData[i].count = "";
           } else {
@@ -588,6 +596,7 @@ export default {
       tempObj["remake"] = "";
       tempObj["project_id"] = 0;
       tempObj["min_price"] = 0;
+      tempObj["medical_insurance_number"] =0
       this.recordInfo.recordData = []
       this.recordInfo.recordData.push(tempObj);
       if(this.storehouse_in_id == this.storehouse_out_id){
@@ -665,6 +674,7 @@ export default {
           drugList[i].count = "";
           drugList[i].remake = "";
           drugList[i].min_price = drugList[i].min_price;
+          drugList[i].medical_insurance_number = drugList[i].medical_insurance_number
           if (drugList[i].max_unit != drugList[i].min_unit) {
             drugList[i].unitList = [
               { id: 1, name: "" },
@@ -719,6 +729,7 @@ export default {
           goodList[i].sencond_unit = goodList[i].packing_unit;
           goodList[i].remake = "";
           goodList[i].min_price = goodList[i].retail_price;
+          goodList[i].medical_insurance_number = goodList[i].medical_insurance_number
           for (let j = 0; j < goodList[i].unitList.length; j++) {
             goodList[i].unitList[0].name = goodList[i].packing_unit;
           }
@@ -771,7 +782,8 @@ export default {
     tempObj["remake"] = "";
     tempObj["is_source"] = 0;
     tempObj["project_id"] = 0;
-    tempObj["min_price"] = 0;
+    tempObj["min_price"] = 0; 
+    tempObj["medical_insurance_number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.getlist();
   },

src/xt_pages/stock/inventoryTransfer/transEdit.vue

@@ -132,6 +132,14 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column align="center" width="100">
+          <template slot="header" slot-scope="scope">
+              国家编码
+            </template>
+           <template slot-scope="scope">
+              {{ scope.row.medical_insurance_number? scope.row.medical_insurance_number:"" }}
+           </template>
+         </el-table-column>
           <el-table-column align="center" width="250">
             <template slot="header" slot-scope="scope">
               <span>规格<span style="color: red">*</span></span>
@@ -451,6 +459,7 @@ export default {
       tempObj["remake"] = "";
       tempObj["project_id"] = 0;
       tempObj["min_price"] = 0;
+      tempObj["medical_insurance_number"] = ""
       this.recordInfo.recordData.push(tempObj);
     },
 
@@ -687,7 +696,8 @@ export default {
             }
 
             drugList[i].sencond_unit = drugList[i].max_unit;
-            for (let j = 0; j < drugList[i].unitList.length; j++) {
+            drugList[i].medical_insurance_number  = drugList[i].medical_insurance_number
+              for (let j = 0; j < drugList[i].unitList.length; j++) {
               if (drugList[i].max_unit != drugList[i].min_unit) {
                 drugList[i].unitList[0].name = drugList[i].max_unit;
                 drugList[i].unitList[1].name = drugList[i].min_unit;
@@ -730,9 +740,11 @@ export default {
             goodList[i].sencond_unit = goodList[i].packing_unit;
             goodList[i].remake = "";
             goodList[i].min_price = goodList[i].retail_price;
+            goodList[i].medical_insurance_number = goodList[i].medical_insurance_number
             for (let j = 0; j < goodList[i].unitList.length; j++) {
               goodList[i].unitList[0].name = goodList[i].packing_unit;
             }
+            
             this.tabList.push(goodList[i]);
           }
         }
@@ -847,6 +859,7 @@ export default {
       tempObj["remake"] = "";
       tempObj["project_id"] = 0;
       tempObj["min_price"] = 0;
+      tempObj["medical_insurance_number"] = ""
       if(this.storehouse_in_id == this.storehouse_out_id){
          this.$message.error("调出仓库和调入仓库不能是同一个仓库!")
          this.storehouse_out_id = ""
@@ -925,6 +938,7 @@ export default {
           drugList[i].count = "";
           drugList[i].remake = "";
           drugList[i].min_price = drugList[i].min_price;
+          drugList[i].medical_insurance_number = drugList[i].medical_insurance_number
           if (drugList[i].max_unit != drugList[i].min_unit) {
             drugList[i].unitList = [
               { id: 1, name: "" },
@@ -979,6 +993,7 @@ export default {
           goodList[i].sencond_unit = goodList[i].packing_unit;
           goodList[i].remake = "";
           goodList[i].min_price = goodList[i].retail_price;
+          goodList[i].medical_insurance_number= goodList[i].medical_insurance_number
           for (let j = 0; j < goodList[i].unitList.length; j++) {
             goodList[i].unitList[0].name = goodList[i].packing_unit;
           }
@@ -1011,6 +1026,7 @@ export default {
     tempObj["is_source"] = 0;
     tempObj["project_id"] = 0;
     tempObj["min_price"] = 0;
+    tempObj["medical_insurance_number"] = ""
     this.recordInfo.recordData.push(tempObj);
     this.getlist();
     this.getSencondOrderDetail();

src/xt_pages/workforce/Patientshift.vue

@@ -2,6 +2,9 @@
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs" style="flex:1;"></bread-crumb>
+      <!-- <div style="display: inline-block;position: relative;right: -30%;"> -->
+        <el-button type="primary"  @click="quan_ping">全屏</el-button>
+      <!-- </div> -->
     </div>
     <div class="app-container" style="background-color: white">
       <div id="print_content">
@@ -43,6 +46,9 @@
               inactive-text="OFF">
             </el-switch>
           </div>
+          <!-- <div style="display: inline-block;position: relative;right: -30%;">
+            <el-button type="primary"  @click="quan_ping">全屏</el-button>
+          </div> -->
         </div>
         <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
           <table class="table">
@@ -57,7 +63,7 @@
                 <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
                 <td>
                   <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
-                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':hidder ? '30px': '110px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
+                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':!hidder ? '110px': '30px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
                       <div class="huanzhekuai">
                         <div v-for="(item2) in item.list"   draggable="true" >
                           <template >
@@ -86,6 +92,7 @@
           </table>
           
         </div>
+       
         <!-- 双击弹窗 -->
         <el-dialog
           title="提示"
@@ -218,6 +225,97 @@
         </el-dialog>
       </div>
     </div>
+    <!-- 全屏 -->
+    <div id="patient_quan" style="width: 100%;background: #fff;" v-if="quanping==true">
+      <div class="position">
+      <bread-crumb :crumbs="crumbs" style="flex:1;"></bread-crumb>
+      <!-- <div style="display: inline-block;position: relative;right: -30%;"> -->
+        <el-button type="primary"  @click="quan_ping">取消全屏</el-button>
+      <!-- </div> -->
+    </div>
+       <div style="margin: 20px 0;">
+          <div class="content_top">日期：
+            <el-date-picker
+              @change="date_picker"
+              v-model="date"
+              type="date"
+              placeholder="选择日期">
+            </el-date-picker>
+          </div>
+          <div class="content_top">排班班次：
+            <el-select v-model="classes" placeholder="请选择" @change="banci_select">
+              <el-option
+                v-for="item in schedulArr"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="content_top">病区选择：
+            <el-select v-model="bingqu" placeholder="请选择" @change="bingqu_select">
+              <el-option
+                v-for="item in partitionArr"
+                :key="item.value"
+                :label="item.name"
+                :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="content_top">隐藏备注：
+            <el-switch
+              v-model="hidder"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              active-text="ON"
+              inactive-text="OFF">
+            </el-switch>
+          </div>
+         
+        </div>
+        <div class="table_panel"  v-for="(item, index) in tableData" :key="index">
+          <table class="table">
+            <thead>
+              <tr>
+                <td :width="td_1_width">分区</td>
+                <td :width="td_3_width">病人姓名</td>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(ite,index) in item.zones" :key="index">
+                <td style="text-align: center;">{{ getZoneName(ite.partition_id) }}</td>
+                <td>
+                  <div v-for="(it,index) in numberlist" style="display: inline-block;position: relative;" >
+                    <div  v-if="ite.partition_id==it.zone_id" class="huanzhekuais" :style="{'height':!hidder ? '110px': '30px','line-height':hidder ? '30px':''}" @dblclick="db_click($event,it)" @drop="drop($event,item,it.number)" @dragstart="curInfoDragStart($event,item)" draggable="true"   @dragover="allowDrop"> 
+                      <div class="huanzhekuai">
+                        <div v-for="(item2) in item.list"   draggable="true" >
+                          <template >
+                            <div v-if="it.id==item2.bed_id" style="display: inline-block;">
+                              <div>
+                                <span>{{nameSplit(item2.name) }}({{ getmode(item2.mode_id) }})</span><br>
+                                <span v-if="!hidder" >
+                                  <span style="font-size: 14px;margin-bottom: 5px;">{{item2.order.DeviceNumber.zone.name}}-{{item2.order.DeviceNumber.number}}</span><br>
+                                  <span style="font-size: 14px;margin-bottom: 5px;">{{getBloodAccess(item2.order.blood_access_id)}}</span><br>
+                                  <span style="font-size: 13px;;margin-bottom: 5px;">{{item2.order.schedule_remark}}</span>
+                                </span> 
+                              </div>
+                            </div>
+                          </template> 
+                        </div>
+                      </div> 
+                                        
+                    </div>
+                    <div v-if="ite.partition_id==it.zone_id" style="display: inline-block;width: 125px;text-align: center;">
+                      {{ it.number }}
+                    </div>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          
+        </div>
+    </div>
   </div>
 </template>
 
@@ -243,7 +341,8 @@ export default {
       tipDialogVisible:false,
       tipDialogVisibleTwo:false,
       tipDialogVisibleThree:false,
-      hidder: true,
+      hidder: false,
+      quanping:false,
       td_1_width: '8%',
       td_3_width: '90%',
       date:'',
@@ -651,7 +750,15 @@ export default {
     // console.log('8888',this.huanzhe.order.DeviceNumber.zone.name);
   },
   methods:{
-   
+    quan_ping(){
+      if(this.quanping==false){
+        // console.log('ttttt');
+        return this.quanping=true
+      }else{
+        // console.log('fffff');
+        return this.quanping=false
+      }
+    },
     drop(e,val,value){
       this.allowDrop(e)
       var bedid = ''
@@ -660,8 +767,9 @@ export default {
       var zoneid=''
       console.log('kkkkk',e.target.innerText);
       const inntext= e.target.innerText.split('(')[0]
+      console.log('vvvv',inntext,val.list[0].new_name);
       for(let i=0;i<val.list.length;i++){
-        if(inntext == val.list[i].name){
+        if(inntext == val.list[i].new_name){
           console.log('6666',val,value);
           console.log('7777',this.numberlist);
           this.tipDialogVisible=true
@@ -820,7 +928,7 @@ export default {
     curInfoDragStart(e,val){
       const inntext2= e.target.innerText.split('(')[0]
       for(let i=0;i<val.list.length;i++){
-        if(inntext2 == val.list[i].name){
+        if(inntext2 == val.list[i].new_name){
           this.cur_drag_info={
             id:val.list[i].id,
             name:val.list[i].name,
@@ -905,6 +1013,12 @@ export default {
           var numberlist=response.data.data.numberList
           this.numberlist= numberlist
           this.subzone = numberlist
+          for(let i=0;i<list.length;i++){
+           const new_name = 'new_name'
+           list[i][new_name]=this.nameSplit(list[i].name)
+           
+          }
+          console.log('9999',list);
           if (list != null && list.length > 0) {
             const dataInfo = {}
             list.forEach((item, index) => {
@@ -1389,4 +1503,67 @@ export default {
   }
 }
 </style>
+<style lang="scss" scoped>
+#patient_quan{
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  margin: 0;
+  background: #fff;
+  padding: 20px;
+  height: 100%;
+  z-index: 2000;
+  .content_top{
+    display: inline-block;
+  }
+  .table_panel {
+    .table {
+      width: 100%;
+      border: 1px solid;
+      border-collapse: collapse;
+      padding: 2px;
+
+      thead {
+        tr {
+          td {
+            border: 1px solid;
+            text-align: center;
+            font-size: 20px;
+            padding: 15px 5px;
+          }
+        }
+      }
+      tbody {
+        tr {
+          td {
+            border: 1px solid;
+            // text-align: center;
+            font-size: 18px;
+            padding: 5px 5px;
+
+           .huanzhekuai{
+            width: 125px;
+            display: inline-block;
+            text-align: center;
+            // margin:0 10px;
+           }
+           .huanzhekuais{
+            width: 125px;
+            // display: inline-block;
+            text-align: center;
+            margin:0 10px;
+            // line-height: 110px;
+            background: #30b8e394;
+           }
+           
+          }
+        }
+      }
+    }
+  }
+}
+</style>