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

package-lock.json

@@ -3875,9 +3875,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.5.155",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
-      "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng==",
+      "version": "1.5.157",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz",
+      "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==",
       "dev": true
     },
     "elegant-spinner": {
@@ -3993,27 +3993,27 @@
       }
     },
     "es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "version": "1.23.10",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.10.tgz",
+      "integrity": "sha512-MtUbM072wlJNyeYAe0mhzrD+M6DIJa96CZAOBBrhDbgKnB4MApIKefcyAB1eOdYn8cUNZgvwBvEzdoAYsxgEIw==",
       "dev": true,
       "requires": {
         "array-buffer-byte-length": "^1.0.2",
         "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.4",
         "data-view-buffer": "^1.0.2",
         "data-view-byte-length": "^1.0.2",
         "data-view-byte-offset": "^1.0.1",
         "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
+        "es-object-atoms": "^1.1.1",
         "es-set-tostringtag": "^2.1.0",
         "es-to-primitive": "^1.3.0",
         "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
+        "get-intrinsic": "^1.3.0",
+        "get-proto": "^1.0.1",
         "get-symbol-description": "^1.1.0",
         "globalthis": "^1.0.4",
         "gopd": "^1.2.0",
@@ -4029,13 +4029,13 @@
         "is-shared-array-buffer": "^1.0.4",
         "is-string": "^1.1.1",
         "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
+        "is-weakref": "^1.1.1",
         "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
+        "object-inspect": "^1.13.4",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.7",
         "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
+        "regexp.prototype.flags": "^1.5.4",
         "safe-array-concat": "^1.1.3",
         "safe-push-apply": "^1.0.0",
         "safe-regex-test": "^1.1.0",
@@ -4048,7 +4048,7 @@
         "typed-array-byte-offset": "^1.0.4",
         "typed-array-length": "^1.0.7",
         "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "which-typed-array": "^1.1.19"
       }
     },
     "es-define-property": {
@@ -7744,9 +7744,9 @@
       }
     },
     "marked": {
-      "version": "15.0.11",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.11.tgz",
-      "integrity": "sha512-1BEXAU2euRCG3xwgLVT1y0xbJEld1XOrmRJpUwRCcy7rxhSCwMrmEu9LXoPhHSCJG41V7YcQ2mjKRr5BA3ITIA=="
+      "version": "15.0.12",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz",
+      "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA=="
     },
     "math-expression-evaluator": {
       "version": "1.4.0",

src/api/stock.js

@@ -1178,4 +1178,13 @@ export function changeGoodWarehouseInfo(data){
     method:"post",
     data:data,
   })
+}
+
+export function getRepatGoodList(data){
+ 
+  return request({
+    url:"/api/good/getrepatgoodlist",
+    method:"post",
+    data:data
+  })
 }

src/router/modules/dialysis.js

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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -845,7 +845,7 @@ export default {
         this.$message.error("未选择任何数据");
         return;
       }else{
-        if(this.org_id != 10653 && this.org_id !=0){
+        if(this.org_id != 10653){
           this.$refs.patientprint.show(
             this.tableData,
             this.currentRow,

src/xt_pages/Pharmacy/print/patientPrint.vue

@@ -14,6 +14,7 @@
         <div>患者名称：{{name}}</div>
         <div>发药状态：{{state}}</div>
         <div>日期：{{times}}</div>
+        <div>患者签名：</div>
       </div>
 
       <el-table
@@ -66,6 +67,7 @@
           </template>
         </el-table-column>
       </el-table>
+      
     </div>
   </el-dialog>
 </template>
@@ -146,14 +148,6 @@ export default {
     print() {
       console.log(this.org_name,'this.org_name')
       Vue.prototype.printJson = printutils.printJson;
-      //   const style =
-      //     '@media print {.list_title{  width: 940px;border-bottom: 1px solid;display: flex;margin: 30px auto}}';
-      //   printJS({
-      //     printable: "dialysis-print-box-1",
-      //     type: "html",
-      //     style: style,
-      //     scanStyles: false,
-      //   });
       this.printJson({
         title: `
         <div>
@@ -162,6 +156,7 @@ export default {
         <div style="width: 310px;padding: 10px 0;">患者名称：${this.name}</div>
         <div style="width: 320px;padding: 10px 0;">发药状态：${this.state}</div>
         <div style="width: 310px;padding: 10px 0;">日期：${this.times}</div>
+        <div style="width: 310px;padding: 10px 0;">患者签名：</div>
         </div></div>`, // 打印出来的标题
         data: this.tableData, // 需要打印的数据
         serial: true, // 是否需要打印序列号
@@ -213,6 +208,15 @@ export default {
             displayName: "备注",
           },
         ],
+        footer: `
+        <div style="width: 940px; margin-top: 30px; display: flex; justify-content: space-between;">
+          
+          <div style="width: 300px; border-top: 1px solid #000; text-align: center; padding-top: 5px;">
+            患者签名：________________
+          </div>
+         
+        </div>`
+  
       });
     },
   },

src/xt_pages/data/components/addDrugs.vue

@@ -384,17 +384,7 @@
                             </el-date-picker>
                         </el-form-item>
 
-                        <el-form-item label="是否零用:">
-
-                            <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
-                                <el-option
-                                        v-for="(item,index) in userList"
-                                        :key="index"
-                                        :label="item.name"
-                                        :value="item.id">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+                       
 
 
                         <el-form-item label="药品备注:">
@@ -448,6 +438,18 @@
                 <el-form :model="form" label-width="130px"
                          style="display: flex;flex-wrap: wrap;justify-content: space-between;">
 
+                         <el-form-item label="是否零用:">
+
+                            <el-select v-model="form.is_user" style="width:160px" filterable placeholder="请选择">
+                                <el-option
+                                        v-for="(item,index) in userList"
+                                        :key="index"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                            </el-select>
+                         </el-form-item>
+
                     <el-form-item label="标签:" prop="label">
                         <el-select v-model="form.label" style="width:160px;" placeholder="请选择">
                             <el-option

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -2434,7 +2434,7 @@
                         <span v-if="org_id == 9675 || org_id == 10447 || org_id == 10624 || org_id == 10471">L</span>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0">
+                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0 || org_id == 10579">
                         在线Kt/V：
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -578,6 +578,16 @@
             type="primary"
           >批量打印</el-button>
         </template>
+
+        <template v-if="this.template_id == 86">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            :disabled="selecting_schs.length == 0"
+            @click="batchPrintAction"
+            type="primary"
+          >批量打印</el-button>
+        </template>
       </div>
     </div>
     <div class="app-container">
@@ -2860,6 +2870,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/eightythree" });
       } else if (this.template_id == 84) {
         this.$router.push({ path: "/dialysis/print/batch/eightyfour" });
+      }else if(this.template_id == 86){
+        this.$router.push({ path: "/dialysis/print/batch/eightysix" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -173,13 +173,13 @@
         </li> -->
 
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597 && this.$store.getters.xt_user.template_info.org_id != 10571  && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766&& this.$store.getters.xt_user.template_info.org_id != 10777">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "ml" : "" }}</span>
         </li>
 
-        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 9478|| this.$store.getters.xt_user.template_info.org_id == 10766">
+        <li v-if="isShow('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 ||  this.$store.getters.xt_user.template_info.org_id == 10571 || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10598 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10679 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 9478|| this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 10777">
           <label>处方脱水量 : </label>
           <span class="content">{{ prescription_water != "0" ? prescription_water : "" }}</span>
           <span class="unit">{{ prescription_water != "0" ? "L" : "" }}</span>

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

@@ -161,7 +161,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745 && this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745 && this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10752&& this.$store.getters.xt_user.template_info.org_id != 10757&& this.$store.getters.xt_user.template_info.org_id != 9478&& this.$store.getters.xt_user.template_info.org_id != 10766&& this.$store.getters.xt_user.template_info.org_id != 10777">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -171,7 +171,7 @@
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745 || this.$store.getters.xt_user.template_info.org_id==10752|| this.$store.getters.xt_user.template_info.org_id==10757|| this.$store.getters.xt_user.template_info.org_id==9478|| this.$store.getters.xt_user.template_info.org_id==10766">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745 || this.$store.getters.xt_user.template_info.org_id==10752|| this.$store.getters.xt_user.template_info.org_id==10757|| this.$store.getters.xt_user.template_info.org_id==9478|| this.$store.getters.xt_user.template_info.org_id==10766|| this.$store.getters.xt_user.template_info.org_id==10777">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
@@ -2869,7 +2869,7 @@ mu
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("除非=======================")
 
-        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726|| this.$store.getters.xt_user.template_info.org_id==10752 ||  this.$store.getters.xt_user.template_info.org_id==10697){
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10777|| this.$store.getters.xt_user.template_info.org_id==10752 ||  this.$store.getters.xt_user.template_info.org_id==10697){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(1)
@@ -3421,8 +3421,20 @@ mu
           this.zongliang = this.dialysisPrescription.anticoagulant_zongliang
 
         }
-        // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
-        // console.log('this.schedual', schedual.mode_id)
+
+        if(this.dialysisPrescription.mode_id == 0){
+          if(schedual!=undefined || schedual!=null){
+            this.dialysisPrescription.mode_id == schedual.mode_id
+          }
+          
+        }
+
+
+       
+        
+       
+        console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
+        console.log('this.schedual', schedual.mode_id)
         if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || pre.mode_id == 13 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 13 || schedual.mode_id == 0 || schedual.mode_id == 37 || schedual.mode_id == 36 || schedual.mode_id == 35 || schedual.mode_id == 34|| schedual.mode_id == 41) {
           this.zhiShow = true
           this.huShow = true
@@ -3447,7 +3459,7 @@ mu
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697|| this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9478 || this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 10768){
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10777 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10697|| this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9478 || this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 10768){
           this.getPatientBefor()
         }
 

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

@@ -387,7 +387,7 @@
                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id==9779) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id==9779 || org_id ==10777) &&
                 org_id!=10387
             "
           >
@@ -458,7 +458,7 @@
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766 && org_id!=9779)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766 && org_id!=9779 && org_id!=10777)
               || org_id == 10387
             "
           >
@@ -529,7 +529,7 @@
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 9779)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745||org_id ==10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 9779 || org_id == 10777)
                 && org_id!=10387
             "
           >
@@ -584,7 +584,7 @@
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766&& org_id!=9779) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766&& org_id!=9779 && org_id!=10777) ||
               org_id == 10387
             "
           >
@@ -700,7 +700,7 @@
                 org_id == 10395||
                 org_id == 10617 ||
                 org_id ==10677 ||
-                org_id == 10721 || org_id ==10727 || org_id == 10751 || org_id == 10752 || org_id== 10766
+                org_id == 10721 || org_id ==10727 || org_id == 10751 || org_id == 10752 || org_id== 10766 || org_id == 10777
 
                )&& org_id!=10598 && org_id!=10414
             "
@@ -1691,7 +1691,7 @@
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 10777) &&
                 org_id!=10387
             "
           >
@@ -1739,7 +1739,7 @@
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745 && org_id!=10751 && org_id!=10752 && org_id!=10757 && org_id!=10766 && org_id!=10777)
               || org_id == 10387
             "
           >
@@ -1812,7 +1812,7 @@
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745 || org_id == 10751 || org_id == 10752 || org_id == 10757 || org_id == 10766 || org_id == 10777)
                 && org_id!=10387 && org_id!=10694
             "
           >
@@ -1897,7 +1897,8 @@
               org_id!=10751 &&
               org_id!=10752 &&
               org_id!=10757 &&
-              org_id!=10766
+              org_id!=10766 && 
+              org_id!=10777
               )
               || org_id == 10387 || org_id == 10694
             "
@@ -1963,7 +1964,7 @@
               org_id!=10395 &&
               org_id!=10617 &&
               org_id!=10677 &&
-              org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10751 && org_id!=10752 && org_id!=10766)
+              org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10751 && org_id!=10752 && org_id!=10766 && org_id!=10777)
               || org_id ==10558 || org_id==10598
             "
           >
@@ -1991,7 +1992,7 @@
                 org_id==10445 ||
                 org_id==10410 ||
                 org_id==10395 || 
-                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206 || org_id == 10751 || org_id == 10752 || org_id == 10766) && org_id !=10558 && org_id!=10598 && org_id!=10414 
+                org_id==10617 || org_id==10677 || org_id == 10721 || org_id==10727 || org_id==10206 || org_id == 10751 || org_id == 10752 || org_id == 10766 || org_id == 10777) && org_id !=10558 && org_id!=10598 && org_id!=10414 
             "
           >
             <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
@@ -2016,7 +2017,7 @@
             :span="8"
             v-if="
               isShow('置换量') &&
-              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768 || org_id == 9779) &&
+              (template_id != 6 || org_id == 9919 || org_id == 10191 || org_id ==10551 || org_id ==10558 || org_id ==10346 || org_id ==10598 || org_id == 10694 || org_id == 10697 || org_id ==10567 || org_id ==10644 || org_id == 10721 || org_id ==10727 || org_id ==10206 || org_id == 10731 || org_id == 10744 || org_id == 10766 || org_id == 10768 || org_id == 9779 || org_id == 10777) &&
               org_id != 9779 &&
               template_id != 11 &&
               template_id != 20 &&
@@ -2066,7 +2067,7 @@
                 org_id ==10432 ||
                 org_id ==10445 ||
                 org_id == 10395 || org_id == 10751 || org_id == 10752) &&
-                org_id!=10694 && org_id!=10697 && org_id!=10721 && org_id!=10727 && org_id!=10744 && org_id!=9779
+                org_id!=10694 && org_id!=10697 && org_id!=10721 && org_id!=10727 && org_id!=10744 && org_id!=9779 && org_id!=10777
             "
           >
             <el-form-item label="置换量(ml)：" :prop="isName('置换量')"

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -20,18 +20,18 @@
           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10766) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9779" width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=9779) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752 || this.$store.getters.xt_user.template_info.org_id == 10766) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 || this.$store.getters.xt_user.template_info.org_id == 10757 || this.$store.getters.xt_user.template_info.org_id == 9779|| this.$store.getters.xt_user.template_info.org_id == 10777" width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && this.$store.getters.xt_user.template_info.org_id != 9555 &&  this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 && this.$store.getters.xt_user.template_info.org_id!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=9779&& this.$store.getters.xt_user.template_info.org_id!=10777) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745|| this.$store.getters.xt_user.template_info.org_id == 10757"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 9779) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=10757 && this.$store.getters.xt_user.template_info.org_id!=9779) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 10757|| this.$store.getters.xt_user.template_info.org_id == 10766|| this.$store.getters.xt_user.template_info.org_id == 9779|| this.$store.getters.xt_user.template_info.org_id == 10777) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && this.$store.getters.xt_user.template_info.org_id!=10445 && this.$store.getters.xt_user.template_info.org_id!=10410 &&this.$store.getters.xt_user.template_info.org_id!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742&& this.$store.getters.xt_user.template_info.org_id!=10751&& this.$store.getters.xt_user.template_info.org_id!=10752&& this.$store.getters.xt_user.template_info.org_id!=10766&& this.$store.getters.xt_user.template_info.org_id!=10757 && this.$store.getters.xt_user.template_info.org_id!=9779&& this.$store.getters.xt_user.template_info.org_id!=10777) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
           <th v-if="isShow('透析液温度1')" width="92px">透析液温度(℃)</th>
-          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206 || org_id == 10751 || org_id == 10752 || org_id == 10766) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
-          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752 && org_id!=10766) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
+          <th v-if=" isShow('置换率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46  || template_id == 48 || template_id == 53  || template_id == 54 || template_id == 56 || org_id == 10432 || org_id == 10445 || org_id == 10410 || org_id ==10617 || org_id==10677 || org_id==10702 || org_id==10721 || org_id ==10727 || org_id == 10206 || org_id == 10751 || org_id == 10752 || org_id == 10766 || org_id == 10777) && org_id!=10558 && org_id!=10598 && org_id!=10414  " width="92px" > 置换率(ml/min) </th>
+          <th v-if=" isShow('置换率') && (template_id != 6 && template_id != 10 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && org_id!=10432 && org_id!=10445 && org_id!=10410 && org_id!=10617  && org_id!=10677 && org_id !=10702 && org_id !=10721 && org_id !=10727 && org_id !=10206 && org_id!=10751&& org_id!=10752 && org_id!=10766 && org_id!=10777) || org_id == 10558 || org_id ==10598 || org_id ==10414 " width="92px" > 置换率(L/h)  </th>
           <th v-if=" isShow('置换率1')" width="92px" > 置换率(ml/min) </th>
           <th v-if=" isShow('置换量') && (template_id == 43)" width="92px"> 置换量(ml/h)  </th>
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191 && org_id!=10478 && org_id!=10346 && org_id!=10517) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10751|| this.$store.getters.xt_user.template_info.org_id == 10752|| this.$store.getters.xt_user.template_info.org_id == 9779 ) && org_id!=10558 && org_id!=10598  && org_id!=10414 && org_id!=10694 && org_id!=10697 && org_id!=10567 && org_id!=10644 && org_id!=10731 && org_id!=10744 && org_id!=10766&& org_id!=10768" width="92px"  > 置换量(ml)  </th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1056,6 +1056,19 @@
         >
         </div>
       </template>
+
+      <template v-if="org_template_info.template_id == 86 || org_id== 10777">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1593,6 +1606,10 @@
           v-if="org_template_info.template_id == 84">
 
           </DialysisPrintOrdereightyfour>
+
+          <DialysisPrintOrdereightsix ref="childRef" v-if="org_template_info.template_id == 86 || org_id == 0 || org_id == 10777">
+          </DialysisPrintOrdereightsix>
+         
         </div>
       </el-container>
     </div>
@@ -1696,6 +1713,7 @@ import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
 import DialysisPrintOrdereightythree from './template/DialysisPrintOrdereightythree'
 import DialysisPrintOrdereightyfour from './template/DialysisPrintOrdereightyfour'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
+import DialysisPrintOrdereightsix  from './template/DialysisPrintOrdereightsix.vue'
 export default {
   name: "dialysisPrintOrder",
   components: {
@@ -1784,6 +1802,7 @@ export default {
     DialysisPrintOrdereightythree,
     DialysisPrintOrdereightyfour,
     DialysisPrintOrderZero,
+    DialysisPrintOrdereightsix,
     LabelBox,
     BreadCrumb,
     // DialysisPrintOrderSixtyFive
@@ -2447,7 +2466,7 @@ export default {
           style: style,
           scanStyles: false,
         });
-      }else if (this.org_template_info.template_id == 73 ) {
+      }else if (this.org_template_info.template_id == 73 || this.org_template_info.template_id == 86 || this.org_id == 10777) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2682,7 +2701,7 @@ export default {
 
       }
 
-      if(this.org_id == 0 || this.org_id == 10206){
+      if(this.org_id == 10206){
         printJS({
           printable: "dialysis-print-box-1-2",
           type: "html",
@@ -2746,16 +2765,25 @@ export default {
     getDialysisRecord() {
       this.loading = true;
       getDialysisRecord(this.queryParams).then((response) => {
+        console.log("response======",response.data.state)
         if (response.data.state == 1) {
           this.childResponse = response;
-           this.mode_id= response.data.data.patientInfo.DialysisSchedule.mode_id
+         
+        
+          this.mode_id= response.data.data.patientInfo.DialysisSchedule.mode_id
           this.date = response.data.data.patientInfo.DialysisSchedule.schedule_date
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
           // if(this.org_id !=0){//&& this.org_id !=0
-            this.org_template_info.template_id= response.data.data.org_template_info.template_id
-            this.org_template_info = response.data.data.org_template_info;
+          this.org_template_info.template_id= response.data.data.org_template_info.template_id
+          this.org_template_info = response.data.data.org_template_info;
+          console.log("hahahahahh",this.org_template_info.template_id)
+           if(this.org_template_info.template_id == 86 || this.org_id == 0 || this.org_id == 10777){
+              console.log("hahahah",this.$refs)
+              console.log("hahahah",this.$refs.childRef)
+              this.$refs.childRef.getDialysisRecord(response)
+          }
           // }else{
           //   this.org_template_info = response.data.data.org_template_info;
           //   this.org_template_info.template_id= 84
@@ -3190,7 +3218,7 @@ export default {
     changePatient(schedual) {
       console.log('schedual',schedual);
       var xtdate = parseTime(schedual.schedule_date, "{y}-{m}-{d}");
-      console.log('fffff打印单单号',this.org_template_info.template_id);
+      // console.log('fffff打印单单号',this.org_template_info.template_id);
       this.x_tdate=xtdate
 
       // this.queryParams.xtdate = xtdate;

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -557,9 +557,7 @@
               </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-select v-model="partion_type"  ref="partionSelect" placeholder="请选择" @change="changePartionType" multiple  style="width: 200px;">
               <el-option
                 v-for="item in partitionArr"
                 :key="item.id"
@@ -642,6 +640,7 @@
             </el-select>
             <label class="title"> <span class="name">病区选择</span> : </label>
             <el-select v-model="partion_type" placeholder="请选择"
+             @visible-change="handleVisibleChange"
               @change="changePartionTypeOne" multiple style="width: 120px;">
               <el-option
                 v-for="item in partitionArr"
@@ -1127,6 +1126,7 @@ export default {
       hisAdviceMonthList:[],
       tableMonthList:[],
       patientDialogVisible:false,
+      selectVisible: false,
     };
   },
   created() {
@@ -1150,6 +1150,9 @@ export default {
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   methods: {
+    handleVisibleChange(visible) {
+      this.selectVisible = visible;
+    },
     toPatientStatic(){
       this.$router.push({ path: "/dialysis/patient/patientAdvice"});
     },
@@ -2808,6 +2811,7 @@ export default {
         this.toStatic()
       },
       changePartionType(){
+         this.$refs.partionSelect.blur()
         this.tableList = []
         this.toStatic()
       },

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -1804,8 +1804,6 @@ import { jsGetAge, uParseTime } from "@/utils/tools";
 
 import LabelBox from "../printItem/LabelBox";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
-// import DialysisPrintOrderOne from './template/dialysisPrintOrderOne'
-// import DialysisPrintOrderTwo from './template/dialysisPrintOrderTwo'
 import print from "print-js";
 import html2pdf from 'html2pdf.js'
 import { UploadPrintOrder } from "@/api/role/admin"
@@ -1815,18 +1813,8 @@ import { jsPDF } from 'jspdf';
 export default {
   name: "dialysisPrintOrderSix",
   props: ["childResponse"],
-  // props:{
-  //   childResponse:{
-  //     type: Object
-  //   }
-  //   ,
-  //   x_tdate:{
-  //     type:String
-  //   }
-  // },
+  
   components: {
-    // DialysisPrintOrderOne,
-    // DialysisPrintOrderTwo,
     CheckBox,
     LabelBox,
     BreadCrumb,

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1465,12 +1465,12 @@
                             {{ monitor.temperature ? monitor.temperature : "" }}
                           </td>
                           <td>
-                            <span v-if="org_id!=9478 && org_id!=10744">
+                            <span v-if="org_id!=9478 && org_id!=10744 && org_id!=10726">
                               {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                             </span>
 
-                            <span v-if="org_id == 9478 || org_id == 10744">
+                            <span v-if="org_id == 9478 || org_id == 10744 || org_id == 10726">
                               {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "拒测" }}
                             </span>
@@ -1627,15 +1627,15 @@
                             <span v-if="org_id != 10644 && org_id != 0">{{ monitor.ultrafiltration_rate ?
                               monitor.ultrafiltration_rate : "" }}</span>
                             <span v-if="org_id == 10644">
-                              <span v-if="monitor.patient_id == 39872 && monitor.monitoring_date == 1747670400">
+                              <!-- <span v-if="monitor.patient_id == 39872 && monitor.monitoring_date == 1747670400">
                                  <span v-if="monindex == 1">
                                       0
                                  </span>
                                  <span v-if="monindex != 1">
                                   {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}
                                  </span>
-                              </span>
-                              <span v-if="monitor.patient_id!=39872 && monitor.monitoring_date!=1747670400">
+                              </span> -->
+                              <span>
                                   <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume ?
                                   monitor.ultrafiltration_volume : "0" }}</span>
                                   <span v-if="monindex == monitors.length - 1">{{ monitor.ultrafiltration_volume ?
@@ -2369,7 +2369,7 @@
                         <span v-if="org_id == 9675 || org_id == 10447 || org_id == 10624 || org_id == 10471">L</span>
                       </div>
 
-                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0">
+                      <div class="inline_block" style="flex: 1" v-if="org_id == 10598 || org_id == 0 || org_id ==10579">
                         在线Kt/V：
                         <div class="under_line" style="width: 100px; text-align: center">
                           {{

src/xt_pages/management/components/EditMachineForm.vue

@@ -219,6 +219,7 @@ export default {
         { id: 9, name: "5%次氯酸钠" },
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
         { id: 11, name: "20%柠檬酸 + 5%次氯酸钠"},
+        { id: 12,name:"冰乙酸原液"}
       ]
     };
   },

src/xt_pages/management/components/PlanForm.vue

@@ -247,6 +247,7 @@ export default {
         { id: 9, name: "5%次氯酸钠" },
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
         { id: 11, name: "20%柠檬酸 + 5%次氯酸钠" },
+        { id: 12,name:"冰乙酸原液"}
       ],
       // 床单位更换
        bedType: [

src/xt_pages/management/components/UserForm.vue

@@ -1130,6 +1130,8 @@ export default {
         { id: 8, name: "50%冰醋酸" },
         { id: 9, name: "5%次氯酸钠" },
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
+        { id: 11, name: "20%柠檬酸 + 5%次氯酸钠"},
+        { id: 12,name:"冰乙酸原液"}
       ],
       runOption: [{ id: 1, name: "正常" }, { id: 2, name: "故障" }],
       runOptions: [{ id: 1, name: "达标" }, { id: 2, name: "未达标" }],
@@ -1497,6 +1499,12 @@ export default {
             if (information[index].disinfectant === 10) {
               information[index].disinfectant = "25%的柠檬酸+5%次氯酸钠";
             }
+            if (information[index].disinfectant === 11) {
+              information[index].disinfectant = "20%柠檬酸 + 5%次氯酸钠";
+            }
+            if (information[index].disinfectant === 12) {
+              information[index].disinfectant = "冰乙酸原液";
+            }
             if (information[index].disinfection_status === 0) {
               information[index].disinfection_status = "";
             }
@@ -2088,6 +2096,12 @@ export default {
            if (information[index].disinfectant === 10) {
               information[index].disinfectant = "25%的柠檬酸+5%次氯酸钠";
             }
+            if (information[index].disinfectant === 11) {
+              information[index].disinfectant = "20%柠檬酸 + 5%次氯酸钠";
+            }
+            if (information[index].disinfectant === 12) {
+              information[index].disinfectant = "冰乙酸原液";
+            }
             if (information[index].disinfection_status === 1) {
               information[index].disinfection_status = "已消毒";
             }
@@ -2432,6 +2446,12 @@ export default {
             if (information[index].disinfectant === 10) {
               information[index].disinfectant = "25%的柠檬酸+5%次氯酸钠";
             }
+            if (information[index].disinfectant === 11) {
+              information[index].disinfectant = "20%柠檬酸 + 5%次氯酸钠";
+            }
+            if (information[index].disinfectant === 12) {
+              information[index].disinfectant = "冰乙酸原液";
+            }
             if (information[index].disinfection_status === 0) {
               information[index].disinfection_status = "";
             }

src/xt_pages/management/home.vue

@@ -3085,6 +3085,7 @@ export default {
           { id: 9, name: '5%次氯酸钠' },
           { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
           { id: 11, name: "20%柠檬酸 + 5%次氯酸钠"},
+          { id: 12,name:"冰乙酸原液"}
         ],
 
         userform: {
@@ -4117,6 +4118,12 @@ export default {
               if (plan[index].disinfectant === 10) {
                 plan[index].disinfectant = '25%的柠檬酸+5%次氯酸钠'
               }
+              if (plan[index].disinfectant === 11) {
+                plan[index].disinfectant = '20%柠檬酸 + 5%次氯酸钠'
+              }
+              if (plan[index].disinfectant === 12) {
+                plan[index].disinfectant = '冰乙酸原液'
+              }
             }
             this.tableData = plan
           }
@@ -4260,6 +4267,12 @@ export default {
              if (plandetail[index].disinfectant === 10) {
                 plandetail[index].disinfectant = '25%的柠檬酸+5%次氯酸钠'
               }
+              if (plandetail[index].disinfectant === 11) {
+                plandetail[index].disinfectant = '20%柠檬酸 + 5%次氯酸钠'
+              }
+              if (plandetail[index].disinfectant === 12) {
+                plandetail[index].disinfectant = '冰乙酸原液'
+              }
             }
             this.planData = plandetail
           }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -347,7 +347,9 @@
       <span>
         <el-input
          ref="inputRef"
+         inputmode="verbatim"
          @keyup.native="changeText"
+         @paste.native.prevent="handlePaste"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -360,6 +362,35 @@
         <el-button type="primary" @click="saveTextArea()">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog
+      title="重复值警告"
+      :visible.sync="showDuplicateAlert"
+      width="30%"
+      append-to-body>
+      <div v-for="(item, index) in duplicateList" :key="index">
+        <el-alert
+          :title="`重复值: ${item.value} (出现 ${item.count} 次)`"
+          type="error"
+          :closable="false"
+          show-icon>
+        </el-alert>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="showDuplicateAlert = false">我知道了</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog
+      title="重复值警告"
+      :visible.sync="showDuplicateAlertOne"
+      width="30%"
+      append-to-body>
+       <span>{{ msg }}</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="showDuplicateAlertOne = false">我知道了</el-button>
+      </span>
+    </el-dialog>
   </div>
 
 </template>
@@ -379,7 +410,8 @@
     postWarehouse,
     postSearchGoodList,
     toCheckWarehouseInfo,
-    toReturnCheckWarehouseInfo
+    toReturnCheckWarehouseInfo,
+    getRepatGoodList
   } from '@/api/stock'
   import BreadCrumb from '../components/bread-crumb'
 
@@ -512,9 +544,23 @@
         currentRow:{},
         currentIndex:0,
         textarea:"",
+        duplicateList:[],
+        showDuplicateAlert:false,
+        showDuplicateAlertOne:false,
+        good_id:0,
+        isComposing: false
       }
     },
     methods: {
+    
+      handleKeyDown(e) {
+     
+      },
+  
+      handlePaste(e) {
+        e.preventDefault(); // 完全禁止粘贴，避免绕过输入限制
+        this.$message.warning('扫码输入不支持粘贴');
+      },
       getTotal(){
         if(this.textarea!=null){
           var  textAreaList = this.textarea.split(",")
@@ -1004,15 +1050,15 @@
         this.currentIndex = val
       },
       handleSelect(val){
-        // console.log("al32323232323223",val)
+          console.log("al32323232323223",val)
+          this.good_id =  0
+          this.good_id = val.id
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].id = 0
-              this.recordInfo.recordData[i].good_type_id = val.id
               this.recordInfo.recordData[i].good_name = val.good_name
               this.recordInfo.recordData[i].good_type_id = val.good_type_id
               this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
-
               this.recordInfo.recordData[i].manufacturer = val.manufacturer
               this.recordInfo.recordData[i].remark = val.remark
               this.recordInfo.recordData[i].license_number = val.number
@@ -1065,7 +1111,9 @@
        toCheckWarehouseInfo(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            this.$message.success("审核成功!")
+            // var total_one = response.data.data.total_one
+            // var total_two = response.data.data.total_two
+            // this.$message.success("审核成功!,追溯码成功"+total_one+"个"+"追溯码重复"+total_two+"个")
             this.showCheck = false
             this.showReturnCheck = true
             this.$router.back(-1)
@@ -1117,6 +1165,7 @@
        }
      },
      changeGoodCode(row,index){
+        
         this.textarea=""
         this.textarea = row.good_code
         this.currentRow = row
@@ -1125,7 +1174,7 @@
      },
      changeText(event){
 
-        // 1. 转换为半角字符（英文输入法标准）
+      //  1. 转换为半角字符（英文输入法标准）
         const halfWidth = this.textarea.replace(/[\uff01-\uff5e]/g, ch => 
           String.fromCharCode(ch.charCodeAt(0) - 0xfee0)
         );
@@ -1133,7 +1182,35 @@
         // 2. 移除中文空格（全角空格转半角）
       const normalizedSpace = halfWidth.replace(/\u3000/g, ' ');
 
-      console.log("normalizedSpace----------",normalizedSpace)
+
+      //   const fullToHalfMap = {
+      //     '（': '(', '）': ')',
+      //     '０': '0', '１': '1', '２': '2', '３': '3', '４': '4',
+      //     '５': '5', '６': '6', '７': '7', '８': '8', '９': '9',
+      //     'Ａ': 'A', 'Ｂ': 'B', 'Ｃ': 'C', 'Ｄ': 'D', 'Ｅ': 'E',
+      //     'Ｆ': 'F', 'Ｇ': 'G', 'Ｈ': 'H', 'Ｉ': 'I', 'Ｊ': 'J',
+      //     'Ｋ': 'K', 'Ｌ': 'L', 'Ｍ': 'M', 'Ｎ': 'N', 'Ｏ': 'O',
+      //     'Ｐ': 'P', 'Ｑ': 'Q', 'Ｒ': 'R', 'Ｓ': 'S', 'Ｔ': 'T',
+      //     'Ｕ': 'U', 'Ｖ': 'V', 'Ｗ': 'W', 'Ｘ': 'X', 'Ｙ': 'Y',
+      //     'Ｚ': 'Z', 'ａ': 'a', 'ｂ': 'b', 'ｃ': 'c', 'ｄ': 'd',
+      //     'ｅ': 'e', 'ｆ': 'f', 'ｇ': 'g', 'ｈ': 'h', 'ｉ': 'i',
+      //     'ｊ': 'j', 'ｋ': 'k', 'ｌ': 'l', 'ｍ': 'm', 'ｎ': 'n',
+      //     'ｏ': 'o', 'ｐ': 'p', 'ｑ': 'q', 'ｒ': 'r', 'ｓ': 's',
+      //     'ｔ': 't', 'ｕ': 'u', 'ｖ': 'v', 'ｗ': 'w', 'ｘ': 'x',
+      //     'ｙ': 'y', 'ｚ': 'z'
+      // };
+
+      // // 2. 执行转换
+      // let result = '';
+      // for (const char of this.textarea) {
+      //     result += fullToHalfMap[char] || char;
+      // }
+
+      // // 3. 提取标准格式数据
+      // const normalizedSpace = result.match(/(\(\d{2}\)[\dA-Za-z]+)+/g);
+      
+      // console.log("normalizedSpace---",normalizedSpace[0])
+
 
       var  textAreaList = normalizedSpace.split(",")
       if (event.key === 'Enter') {
@@ -1168,8 +1245,45 @@
 
           }
         }
+        if (this.checkDuplicates()) {
+           this.showDuplicateAlert = true
+          return
+        }
+
+        // if(this.org_id == 10164 || this.org_id == 0){
+          
+        //   this.getRepatGood(this.textarea)
+        //   this.showDuplicateAlertOne = true
+        // }
+      
         this.dialogVisible = false
       },
+      getCodeList() {
+        return this.textarea.replace(/\n/g,',')  .split(',').map(item => item.trim()).filter(item => item !== '') 
+      },
+      checkDuplicates() {
+        const codes = this.getCodeList()
+        const countMap = new Map()
+        this.duplicateList = []
+        this.duplicateCount = 0
+        
+        // 统计出现次数
+        codes.forEach(code => {
+          countMap.set(code, (countMap.get(code) || 0) + 1)
+        })
+        
+        // 找出重复项
+        countMap.forEach((count, code) => {
+          if (count > 1) {
+            this.duplicateList.push({
+              value: code,
+              count: count
+            })
+            this.duplicateCount += (count - 1)
+          }
+        })
+      return this.duplicateList.length > 0
+     },
      getGoodCode(val){
         var newArr = []
         var total = 0
@@ -1182,6 +1296,21 @@
             return ""
           }
         }
+     },
+     getRepatGood(val){
+       var params = {
+        good_str:val,
+        good_id:this.good_id,
+       }
+       getRepatGoodList(params).then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+         }else{
+            var msg = response.data.msg
+            this.msg = msg
+            this.$message.error(msg)
+         }
+       })
      }
     }
     ,

src/xt_pages/stock/stockInOrderEdit.vue

@@ -517,7 +517,8 @@ export default {
       dialogVisible:false,
       currentRow:{},
       currentIndex:0,
-      textarea:""
+      textarea:"",
+      good_id:0,
     };
   },
   methods: {
@@ -1040,9 +1041,10 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
+        this.good_id =  0
+        this.good_id = val.id
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.currentIndex == i){
-            this.recordInfo.recordData[i].good_type_id = val.id
             this.recordInfo.recordData[i].good_name = val.good_name
             this.recordInfo.recordData[i].good_type_id = val.good_type_id
             this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
@@ -1161,6 +1163,8 @@ export default {
       }
     },
     changeGoodCode(row,index){
+        this.good_id = 0
+        this.good_id = row.good_id
         this.textarea=""
         this.textarea = row.good_code
         this.currentRow = row
@@ -1189,9 +1193,69 @@ export default {
             this.recordInfo.recordData[i].good_code = this.textarea 
           }
         }
+
+        if (this.checkDuplicates()) {
+           this.showDuplicateAlert = true
+          return
+        }
+
+        if(this.org_id == 10164 || this.org_id == 0){
+          this.getRepatGood(this.textarea)
+        }
         this.dialogVisible = false
       },
-     
+      getCodeList() {
+        return this.textarea.replace(/\n/g,',')  .split(',').map(item => item.trim()).filter(item => item !== '') 
+      },
+      checkDuplicates() {
+        const codes = this.getCodeList()
+        const countMap = new Map()
+        this.duplicateList = []
+        this.duplicateCount = 0
+        
+        // 统计出现次数
+        codes.forEach(code => {
+          countMap.set(code, (countMap.get(code) || 0) + 1)
+        })
+        
+        // 找出重复项
+        countMap.forEach((count, code) => {
+          if (count > 1) {
+            this.duplicateList.push({
+              value: code,
+              count: count
+            })
+            this.duplicateCount += (count - 1)
+          }
+        })
+      return this.duplicateList.length > 0
+     },
+     getGoodCode(val){
+        var newArr = []
+        var total = 0
+        if(val!=undefined){
+          newArr = val.split(",") 
+          total = newArr.length - 1
+          if(total >0){
+            return  total
+          }else{
+            return ""
+          }
+        }
+     },
+     getRepatGood(val,good_id){
+      
+       var params = {
+        good_str:val,
+        good_id:this.good_id,
+       }
+       getRepatGoodList(params).then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           
+         }
+       })
+     }
   },
   created() {
     this.org_id = this.$store.getters.xt_user.org.id

src/xt_pages/user/components/PatientDetail.vue

@@ -1986,20 +1986,21 @@ export default {
       fetchPatient(id).then((response) => {
           console.log(response.data.data);
           if (response.data.state === 1) {
-            
-            this.$emit("tran-patient-info", response.data.data.patient);
-            var patietInfo = response.data.data.patient;
-            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
             var viewModels = response.data.data.viewModels
             var is_sub_super_admin = false
-            var user_id = this.$store.getters.xt_user.user.id
+            var user_name = this.$store.getters.xt_user.user.user_name
             this.is_show = false
             for(let i=0;i<viewModels.length;i++){
-              if(user_id == viewModels[i].user_id){
+              if(user_name == viewModels[i].user_name){
                   is_sub_super_admin = is_sub_super_admin
               }
             }
             this.is_show = is_sub_super_admin
+            console.log("is_shjow==========",this.is_show)
+            this.$emit("tran-patient-info", response.data.data.patient);
+            var patietInfo = response.data.data.patient;
+            this.patientVascularAccessOne = response.data.data.patientVascularAccessOne
+          
             console.log("触发了吗无222222", patietInfo);
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;

src/xt_pages/user/components/PatientForm.vue

@@ -2100,15 +2100,16 @@ export default {
             var patietInfo = response.data.data.patient;
             var viewModels = response.data.data.viewModels
             var is_sub_super_admin = false
-            var user_id = this.$store.getters.xt_user.user.id
-            console.log("user_id=====",user_id)
+            var user_name = this.$store.getters.xt_user.user.user_name
+            console.log("user_id=====",this.$store.getters.xt_user.user)
             this.is_show = false
             for(let i=0;i<viewModels.length;i++){
-              if(user_id == viewModels[i].user_id){
+              if(user_name == viewModels[i].user_name){
                   is_sub_super_admin = is_sub_super_admin
               }
             }
             this.is_show = is_sub_super_admin
+            console.log("is_show==============",this.is_show)
             this.fileList = []
             var arrNew = []
             if(patietInfo.org_logo!=""){