Browse Source

新分支

28169 1 year ago
parent
commit
4534658c52

+ 9 - 0
src/api/role/admin.js View File

135
   })
135
   })
136
 }
136
 }
137
 
137
 
138
+export function toTestSeven(params){
139
+ 
140
+  return request({
141
+    url:"api/sign/addcontractsignatory",
142
+    method:"Get",
143
+    params:params
144
+  })
145
+}
146
+
138
 export function toTestEight(params){
147
 export function toTestEight(params){
139
   
148
   
140
   return request({
149
   return request({

+ 3 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_fiftyOne.vue View File

78
               <div class="inline_block">
78
               <div class="inline_block">
79
                 病区:
79
                 病区:
80
                 <div class="under_line" style="width: 50px; text-align: center">
80
                 <div class="under_line" style="width: 50px; text-align: center">
81
-                  {{ "/" }}
81
+                  {{ record.device_zone.name? record.device_zone.name:"/" }}
82
                 </div>
82
                 </div>
83
               </div>
83
               </div>
84
               <div class="inline_block">
84
               <div class="inline_block">
85
                 床号:
85
                 床号:
86
                 <div class="under_line" style="width: 50px; text-align: center">
86
                 <div class="under_line" style="width: 50px; text-align: center">
87
-                  {{ "/" }}
87
+                 
88
+                  {{ record.device_number.number? record.device_number.number:"/" }}
88
                 </div>
89
                 </div>
89
               </div>
90
               </div>
90
               <div class="inline_block">
91
               <div class="inline_block">

+ 1 - 1
src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue View File

890
                           class="under_line"
890
                           class="under_line"
891
                           style="width: 100px; text-align: center"
891
                           style="width: 100px; text-align: center"
892
                         >
892
                         >
893
-                          <span v-if="org_id == 10290">{{
893
+                          <span v-if="org_id == 10290 || org_id == 10138 || org_id == 10278">{{
894
                             record.lastafterweight.weight_after
894
                             record.lastafterweight.weight_after
895
                           }}</span>
895
                           }}</span>
896
                           <span v-else>{{
896
                           <span v-else>{{

+ 19 - 3
src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue View File

740
                             class="under_line"
740
                             class="under_line"
741
                             style="width: 100px; text-align: center"
741
                             style="width: 100px; text-align: center"
742
                           >
742
                           >
743
-                            /
743
+                          {{
744
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
745
+                        }}
744
                           </div>
746
                           </div>
745
                         </div>
747
                         </div>
746
                         <div
748
                         <div
1887
                 <div class="inline_block">
1889
                 <div class="inline_block">
1888
                   病区:
1890
                   病区:
1889
                   <div class="under_line" style="width: 50px; text-align: center">
1891
                   <div class="under_line" style="width: 50px; text-align: center">
1890
-                    {{ "/" }}
1892
+                    {{ record.device_zone.name? record.device_zone.name:"/" }}
1891
                   </div>
1893
                   </div>
1892
                 </div>
1894
                 </div>
1893
                 <div class="inline_block">
1895
                 <div class="inline_block">
1894
                   床号:
1896
                   床号:
1895
                   <div class="under_line" style="width: 50px; text-align: center">
1897
                   <div class="under_line" style="width: 50px; text-align: center">
1896
-                    {{ "/" }}
1898
+                    {{ record.device_number.number? record.device_number.number:"/" }}
1897
                   </div>
1899
                   </div>
1898
                 </div>
1900
                 </div>
1899
                 <div class="inline_block">
1901
                 <div class="inline_block">
2909
           "腹痛",
2911
           "腹痛",
2910
         ],
2912
         ],
2911
         org_id: "",
2913
         org_id: "",
2914
+        displaceLiquiPartOptions:[],
2912
       };
2915
       };
2913
     },
2916
     },
2914
     created() {
2917
     created() {
2918
+      this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
2915
       var bloodAccessParOpera = getDataConfig(
2919
       var bloodAccessParOpera = getDataConfig(
2916
         "hemodialysis",
2920
         "hemodialysis",
2917
         "vascular_access_desc"
2921
         "vascular_access_desc"
3139
         });
3143
         });
3140
     },
3144
     },
3141
     methods: {
3145
     methods: {
3146
+      getDisplaceLiquiPart: function(val) {
3147
+       
3148
+        let displace_liqui_part_name = "/";
3149
+        const displace_liqui_part = this.displaceLiquiPartOptions;
3150
+      
3151
+        for (let i = 0; i < displace_liqui_part.length; i++) {
3152
+           if (displace_liqui_part[i].id == val) {
3153
+           displace_liqui_part_name = displace_liqui_part[i].name;
3154
+        }
3155
+      }
3156
+      return displace_liqui_part_name;
3157
+     },
3142
       getUnit: function (val) {
3158
       getUnit: function (val) {
3143
         if (val.assessment_after_dislysis == null) {
3159
         if (val.assessment_after_dislysis == null) {
3144
           return "";
3160
           return "";

+ 78 - 73
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

29
             >
29
             >
30
                 <el-row :gutter="24">
30
                 <el-row :gutter="24">
31
                     <el-col :span="8" v-if="isShows('透析模式')">
31
                     <el-col :span="8" v-if="isShows('透析模式')">
32
-                        <el-form-item label="透析模式" :prop="isName('透析模式')" :rules="isCheckmust('透析模式')">
32
+                        <el-form-item label="透析模式" :prop="isName('透析模式')">
33
                             <el-select
33
                             <el-select
34
                                    filterable
34
                                    filterable
35
                                     v-model="dialysisPrescription.mode_id"
35
                                     v-model="dialysisPrescription.mode_id"
2066
             }
2066
             }
2067
           }
2067
           }
2068
         } else {
2068
         } else {
2069
-          if (schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
2069
+          if (schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 28) {
2070
             this.zhiShow = true
2070
             this.zhiShow = true
2071
             this.huShow = true
2071
             this.huShow = true
2072
             this.totalShow = true
2072
             this.totalShow = true
2598
         }
2598
         }
2599
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
2599
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
2600
         // console.log('this.schedual', schedual.mode_id)
2600
         // console.log('this.schedual', schedual.mode_id)
2601
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12) {
2601
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 28) {
2602
           this.zhiShow = true
2602
           this.zhiShow = true
2603
           this.huShow = true
2603
           this.huShow = true
2604
           this.totalShow = true
2604
           this.totalShow = true
2809
             //   }
2809
             //   }
2810
 
2810
 
2811
             // }
2811
             // }
2812
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12){
2812
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=28){
2813
               this.dialysisPrescription.displace_liqui_part = 0
2813
               this.dialysisPrescription.displace_liqui_part = 0
2814
               this.dialysisPrescription.displace_liqui_value = 0
2814
               this.dialysisPrescription.displace_liqui_value = 0
2815
               this.dialysisPrescription.replacement_total = 0
2815
               this.dialysisPrescription.replacement_total = 0
3920
           filedList[i].is_show == 1
3920
           filedList[i].is_show == 1
3921
         ) {
3921
         ) {
3922
           // console.log(filedList[i],'false')
3922
           // console.log(filedList[i],'false')
3923
-          if (name == "透析模式" || name == "透析时长") {
3924
-            return [
3925
-              { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
3926
-              {
3927
-                required: true,
3928
-                pattern: /^[1-9]\d*$/,
3929
-                message: `请输入${name}`,
3930
-                trigger: ['blur','change']
3931
-              },
3932
-            ];
3933
-          }
3923
+          // if (name == "透析时长") {
3924
+          //   return [
3925
+          //     { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
3926
+          //     {
3927
+          //       required: true,
3928
+          //       pattern: /^[1-9]\d*$/,
3929
+          //       message: `请输入${name}`,
3930
+          //       trigger: ['blur','change']
3931
+          //     },
3932
+          //   ];
3933
+          // }
3934
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
3934
           return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
3935
 
3935
 
3936
         }
3936
         }
3961
             filedList[i].is_write == 1&&
3961
             filedList[i].is_write == 1&&
3962
             filedList[i].is_show == 1
3962
             filedList[i].is_show == 1
3963
           ) {
3963
           ) {
3964
-            if(name == '置换速度'){
3965
-              return [
3966
-                { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
3967
-                {
3968
-                  required: true,
3969
-                  pattern: /^[1-9]\d*$/,
3970
-                  message: `请输入${name}`,
3971
-                  trigger: ['blur','change']
3972
-                },
3973
-              ];
3974
-            }
3964
+            // if(name == '置换速度'){
3965
+            //   return [
3966
+            //     { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
3967
+            //     {
3968
+            //       required: true,
3969
+            //       pattern: /^[1-9]\d*$/,
3970
+            //       message: `请输入${name}`,
3971
+            //       trigger: ['blur','change']
3972
+            //     },
3973
+            //   ];
3974
+            // }
3975
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
3975
             return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
3976
 
3976
 
3977
           }
3977
           }
4073
     },
4073
     },
4074
     changePrescription(id) {
4074
     changePrescription(id) {
4075
       console.log("id233223232323232323",id)
4075
       console.log("id233223232323232323",id)
4076
-      if(id != 2 && id!=5 && id!= 12){
4076
+      this.dialysisPrescription.mode_id = id
4077
+      if(id != 2 && id!=5 && id!= 12 && id!=28){
4077
         this.dialysisPrescription.displace_liqui_value = ""
4078
         this.dialysisPrescription.displace_liqui_value = ""
4078
         this.dialysisPrescription.displace_liqui_part = ""
4079
         this.dialysisPrescription.displace_liqui_part = ""
4079
         this.dialysisPrescription.replacement_total = ""
4080
         this.dialysisPrescription.replacement_total = ""
4089
           return false
4090
           return false
4090
         } else {
4091
         } else {
4091
           console.log('切换数据', response.data.data.solution)
4092
           console.log('切换数据', response.data.data.solution)
4093
+
4094
+
4092
           this.$message.success('切换成功')
4095
           this.$message.success('切换成功')
4093
           console.log("dialysisPrescription",response.data.data.dialysisPrescription)
4096
           console.log("dialysisPrescription",response.data.data.dialysisPrescription)
4094
-
4097
+        
4095
           if (response.data.data.solution != null) {
4098
           if (response.data.data.solution != null) {
4096
             for (const key in response.data.data.solution) {
4099
             for (const key in response.data.data.solution) {
4097
               // 长期处方不为空
4100
               // 长期处方不为空
4098
               if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4101
               if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4099
                 && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4102
                 && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4100
                 && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
4103
                 && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
4101
-                this.dialysisPrescription[key] =
4102
-                  response.data.data.solution[key]
4104
+                this.dialysisPrescription[key] = response.data.data.solution[key]
4103
               }
4105
               }
4104
             }
4106
             }
4105
               if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340) {
4107
               if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340) {
4113
             }
4115
             }
4114
           } else {
4116
           } else {
4115
             if (response.data.data.prescription != null) {
4117
             if (response.data.data.prescription != null) {
4118
+              console.log("wowowowwo")
4116
               // 临时处方不为空
4119
               // 临时处方不为空
4117
               for (const key in response.data.data.prescription) {
4120
               for (const key in response.data.data.prescription) {
4118
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4121
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4119
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4122
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4120
                   && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
4123
                   && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
4121
-                  this.dialysisPrescription[key] =
4122
-                    response.data.data.prescription[key]
4124
+                  this.dialysisPrescription[key] = response.data.data.prescription[key]
4123
                 }
4125
                 }
4124
               }
4126
               }
4125
             } else if (response.data.data.system_prescription != null) {
4127
             } else if (response.data.data.system_prescription != null) {
4128
+              console.log("见啦地方232332")
4126
               // 系统处方不为空
4129
               // 系统处方不为空
4127
               for (const key in response.data.data.system_prescription) {
4130
               for (const key in response.data.data.system_prescription) {
4128
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4131
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4129
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4132
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4130
                   && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
4133
                   && key != 'injector' && key != 'bloodlines' && key != 'tubing_hemodialysis' && key != 'package' && key != 'a_liquid') {
4131
-                  this.dialysisPrescription[key] =
4132
-                    response.data.data.system_prescription[key]
4134
+                  this.dialysisPrescription[key] =  response.data.data.system_prescription[key]
4135
+                  
4133
                 }
4136
                 }
4134
               }
4137
               }
4135
 
4138
 
4136
             } else {
4139
             } else {
4137
               for (const key in this.dialysisPrescription) {
4140
               for (const key in this.dialysisPrescription) {
4141
+                console.log("wowowowo")
4138
                 // 临时处方为空
4142
                 // 临时处方为空
4139
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4143
                 if (key != 'target_ultrafiltration' && key != 'niprocart' && key != 'target_ultrafiltration' && key != 'jms' && key != 'fistula_needle_set' && key != 'fistula_needle_set_16'
4140
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4144
                   && key != 'hemoperfusion' && key != 'dialyser_sterilised' && key != 'filtryzer' && key != 'target_ktv' && key != 'dialyzers'
4142
                   this.dialysisPrescription[key] = ''
4146
                   this.dialysisPrescription[key] = ''
4143
                 }
4147
                 }
4144
               }
4148
               }
4145
-              this.dialysisPrescription.mode_id = id
4149
+              // this.dialysisPrescription.mode_id = id
4146
             }
4150
             }
4147
               if (this.$store.getters.xt_user.template_info.org_id == 9671 ||this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
4151
               if (this.$store.getters.xt_user.template_info.org_id == 9671 ||this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
4148
               this.dialysisPrescription.sodium = 138
4152
               this.dialysisPrescription.sodium = 138
4157
           if(response.data.data.dialysisPrescription!=null){
4161
           if(response.data.data.dialysisPrescription!=null){
4158
               this.dialysisPrescription.remark =  response.data.data.dialysisPrescription.remark
4162
               this.dialysisPrescription.remark =  response.data.data.dialysisPrescription.remark
4159
           }
4163
           }
4160
-        }
4161
-        if (response.data.data.solution == null) {
4164
+
4165
+          if (response.data.data.solution == null) {
4162
             if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
4166
             if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
4163
               this.dialysisPrescription.sodium = 138
4167
               this.dialysisPrescription.sodium = 138
4164
               this.dialysisPrescription.bicarbonate = 31.1
4168
               this.dialysisPrescription.bicarbonate = 31.1
4168
               }
4172
               }
4169
             }
4173
             }
4170
           }
4174
           }
4171
-        if (
4172
-          this.dialysisPrescription.dialysis_duration_hour === '' ||
4173
-          this.dialysisPrescription.dialysis_duration_minute === ''
4174
-        ) {
4175
+
4176
+          if ( this.dialysisPrescription.dialysis_duration_hour === '' || this.dialysisPrescription.dialysis_duration_minute === '') {
4175
           this.timeValue = ''
4177
           this.timeValue = ''
4176
           this.time = '03:00'
4178
           this.time = '03:00'
4177
         } else {
4179
         } else {
4188
             (this.dialysisPrescription.dialysis_duration_minute > 10
4190
             (this.dialysisPrescription.dialysis_duration_minute > 10
4189
               ? this.dialysisPrescription.dialysis_duration_minute
4191
               ? this.dialysisPrescription.dialysis_duration_minute
4190
               : '0' + this.dialysisPrescription.dialysis_duration_minute)
4192
               : '0' + this.dialysisPrescription.dialysis_duration_minute)
4191
-        }
4192
-      })
4193
+          }
4193
 
4194
 
4194
-      if (
4195
-        id === 1 ||
4196
-        id === 3 ||
4197
-        id === 4 ||
4198
-        id === 6 ||
4199
-        id === 7 ||
4200
-        id === 8 ||
4201
-        id === 9 ||
4202
-        id === 10 ||
4203
-        id === 11 ||
4204
-        id === 13 ||
4205
-        id === 14 ||
4206
-        id === 15 ||
4207
-        id === 16 ||
4208
-        id === 19
4209
-      ) {
4210
-        this.zhiShow = false
4211
-        this.huShow = false
4212
-        this.totalShow = false
4213
-      } else {
4214
-        this.zhiShow = true
4215
-        this.huShow = true
4216
-        this.totalShow = true
4217
-
4218
-        //针对新化博翔
4219
-        if(this.$store.getters.xt_user.template_info.org_id ==10447){
4220
-            this.dialysisPrescription.displace_liqui_part = 1
4221
-            this.dialysisPrescription.displace_liqui_value = 35
4222
-        }
4223
-      }
4195
+          if (
4196
+            id === 1 ||
4197
+            id === 3 ||
4198
+            id === 4 ||
4199
+            id === 6 ||
4200
+            id === 7 ||
4201
+            id === 8 ||
4202
+            id === 9 ||
4203
+            id === 10 ||
4204
+            id === 11 ||
4205
+            id === 13 ||
4206
+            id === 14 ||
4207
+            id === 15 ||
4208
+            id === 16 ||
4209
+            id === 19
4210
+          ) {
4211
+            this.zhiShow = false
4212
+            this.huShow = false
4213
+            this.totalShow = false
4214
+          } else {
4215
+            this.zhiShow = true
4216
+            this.huShow = true
4217
+            this.totalShow = true
4224
 
4218
 
4219
+            //针对新化博翔
4220
+            if(this.$store.getters.xt_user.template_info.org_id ==10447){
4221
+                this.dialysisPrescription.displace_liqui_part = 1
4222
+                this.dialysisPrescription.displace_liqui_value = 35
4223
+            }
4224
+          }
4225
+
4226
+          this.dialysisPrescription.mode_id = id
4227
+          console.log("成功2332Owo",this.dialysisPrescription.mode_id)
4228
+        }
4229
+      })
4225
     },
4230
     },
4226
     handlePatientInfo() {
4231
     handlePatientInfo() {
4227
       this.isVisibility = false
4232
       this.isVisibility = false

+ 12 - 8
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue View File

243
                 || org_id == 10410 ||
243
                 || org_id == 10410 ||
244
                 org_id == 10495 ||
244
                 org_id == 10495 ||
245
                 org_id == 10375 ||
245
                 org_id == 10375 ||
246
-                org_id == 10485) &&
246
+                org_id == 10485 ||
247
+                org_id == 10375) &&
247
                 org_id!=10387
248
                 org_id!=10387
248
             "
249
             "
249
           >
250
           >
313
               org_id != 9555
314
               org_id != 9555
314
               && org_id!=10432 && org_id!=10445
315
               && org_id!=10432 && org_id!=10445
315
               && org_id!=10410 && org_id!=10495 &&
316
               && org_id!=10410 && org_id!=10495 &&
316
-               org_id!=10485 && org_id!=10395 )
317
+               org_id!=10485 && org_id!=10395 && org_id!=10375 )
317
               || org_id == 10387
318
               || org_id == 10387
318
             "
319
             "
319
           >
320
           >
369
                 org_id == 10410 ||
370
                 org_id == 10410 ||
370
                 org_id == 10495  ||
371
                 org_id == 10495  ||
371
                 org_id == 10395
372
                 org_id == 10395
372
-                || org_id == 10485)
373
+                || org_id == 10485 || org_id == 10375)
373
                 && org_id!=10387
374
                 && org_id!=10387
374
             "
375
             "
375
           >
376
           >
422
               org_id!=10432 &&
423
               org_id!=10432 &&
423
               org_id!=10445 &&
424
               org_id!=10445 &&
424
               org_id!=10410 && org_id!=10495
425
               org_id!=10410 && org_id!=10495
425
-              && org_id!=10485 && org_id!=10395) ||
426
+              && org_id!=10485 && org_id!=10395 && org_id!=10375) ||
426
               org_id == 10387
427
               org_id == 10387
427
             "
428
             "
428
           >
429
           >
1147
                 org_id== 10432 ||
1148
                 org_id== 10432 ||
1148
                 org_id== 10445 ||
1149
                 org_id== 10445 ||
1149
                 org_id== 10410 ||
1150
                 org_id== 10410 ||
1150
-                org_id == 10485) &&
1151
+                org_id == 10485 || org_id == 10375) &&
1151
                 org_id!=10387
1152
                 org_id!=10387
1152
             "
1153
             "
1153
           >
1154
           >
1194
               org_id!=10432 &&
1195
               org_id!=10432 &&
1195
               org_id!=10445 &&
1196
               org_id!=10445 &&
1196
               org_id!=10410 &&
1197
               org_id!=10410 &&
1197
-              org_id!=10485)
1198
+              org_id!=10485 &&
1199
+              org_id!=10375)
1198
               || org_id == 10387
1200
               || org_id == 10387
1199
             "
1201
             "
1200
           >
1202
           >
1252
                 org_id == 10410 ||
1254
                 org_id == 10410 ||
1253
                 org_id == 10495 ||
1255
                 org_id == 10495 ||
1254
                 org_id == 10485 ||
1256
                 org_id == 10485 ||
1255
-                org_id == 10395)
1257
+                org_id == 10395 ||
1258
+                org_id == 10375)
1256
                 && org_id!=10387
1259
                 && org_id!=10387
1257
             "
1260
             "
1258
           >
1261
           >
1310
               org_id!=10410 &&
1313
               org_id!=10410 &&
1311
               org_id!=10495 &&
1314
               org_id!=10495 &&
1312
               org_id!=10485 &&
1315
               org_id!=10485 &&
1313
-              org_id!=10395
1316
+              org_id!=10395 &&
1317
+              org_id!=10375
1314
               )
1318
               )
1315
               || org_id == 10387
1319
               || org_id == 10387
1316
             "
1320
             "

+ 4 - 4
src/xt_pages/dialysis/details/dialysisMonitoring.vue View File

14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
14
           <th width="76px">静脉压/动脉压({{monitores[0]&&monitores[0]['venous_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
15
           <th v-if="isShow('血流量')" width="92px">血流量(ml/min)</th>
16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
16
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
17
-          <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!=10387 " width="76px" > 超滤量(ml)</th>
18
-          <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 == 10387"  width="76px"> 超滤量(L) </th>
19
-          <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!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
20
-          <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==10387" width="50px"> 超滤率 <br />(L/h) </th>
17
+          <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!=10387 " width="76px" > 超滤量(ml)</th>
18
+          <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 == 10387"  width="76px"> 超滤量(L) </th>
19
+          <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!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
20
+          <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==10387" width="50px"> 超滤率 <br />(L/h) </th>
21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
21
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
22
           <th v-if="isShow('透析液温度')" width="92px">透析液温度(℃)</th>
23
           <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) " width="92px" > 置换率(ml/min) </th>
23
           <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) " width="92px" > 置换率(ml/min) </th>

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderEight.vue View File

777
             <td>{{ monitor.blood_flow_volume }}</td>
777
             <td>{{ monitor.blood_flow_volume }}</td>
778
             <td>{{ monitor.venous_pressure }}</td>
778
             <td>{{ monitor.venous_pressure }}</td>
779
             <td>{{ monitor.transmembrane_pressure }}</td>
779
             <td>{{ monitor.transmembrane_pressure }}</td>
780
-            <td>{{ monitor.ultrafiltration_rate }}</td>//
780
+            <td>{{ monitor.ultrafiltration_rate }}</td>
781
             <td>{{ monitor.ultrafiltration_volume }}</td>
781
             <td>{{ monitor.ultrafiltration_volume }}</td>
782
             <td>{{ monitor.sodium_concentration }}</td>
782
             <td>{{ monitor.sodium_concentration }}</td>
783
             <td>
783
             <td>

+ 15 - 37
src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue View File

80
                       class="under_line"
80
                       class="under_line"
81
                       style="width: 50px; text-align: center"
81
                       style="width: 50px; text-align: center"
82
                     >
82
                     >
83
-                      <span>{{
84
-                        patientInfo.DialysisSchedule.device_zone.name
85
-                          ? patientInfo.DialysisSchedule.device_zone.name
86
-                          : ""
87
-                      }}</span>
83
+                    <span>{{
84
+                      patientInfo.DialysisSchedule.device_zone.name
85
+                        ? patientInfo.DialysisSchedule.device_zone.name
86
+                        : "/"
87
+                    }}</span>
88
                     </div>
88
                     </div>
89
                   </div>
89
                   </div>
90
                   <div
90
                   <div
100
                       class="under_line"
100
                       class="under_line"
101
                       style="width: 50px; text-align: center"
101
                       style="width: 50px; text-align: center"
102
                     >
102
                     >
103
-                      <!-- <span>{{
104
-                        (dialysisOrder &&
105
-                          dialysisOrder != null &&
106
-                          dialysisOrder.DeviceNumber &&
107
-                          dialysisOrder.DeviceNumber.number.length > 0) ||
108
-                        (dialysisOrder &&
109
-                          dialysisOrder != null &&
110
-                          receiverTreatmentAccess.condition &&
111
-                          receiverTreatmentAccess.condition != 1)
112
-                          ? patientInfo.DialysisSchedule.device_number.number
113
-                          : dialysisOrder.DeviceNumber.number
114
-                      }}</span> -->
115
-
116
-                      <span
117
-                        v-if="
118
-                          dialysisOrder == null ||
119
-                          receiverTreatmentAccess.condition != 1
120
-                        "
121
-                      >
122
-                        {{ patientInfo.DialysisSchedule.device_number.number }}
123
-                      </span>
124
-                      <span
125
-                        v-else-if="
126
-                          dialysisOrder &&
127
-                          dialysisOrder != null &&
128
-                          dialysisOrder.DeviceNumber &&
129
-                          receiverTreatmentAccess.condition == 1
130
-                        "
131
-                      >
132
-                        {{ dialysisOrder.DeviceNumber.number }}
133
-                      </span>
134
-                      <span v-else>/</span>
103
+                    <span>{{
104
+                      dialysisOrder &&
105
+                      dialysisOrder.DeviceNumber &&
106
+                      dialysisOrder.DeviceNumber.number.length > 0
107
+                        ? dialysisOrder.DeviceNumber.number
108
+                        : patientInfo.DialysisSchedule.device_number.number
109
+                    }}</span>
110
+              
111
+
112
+                     
135
                     </div>
113
                     </div>
136
                   </div>
114
                   </div>
137
                   <div
115
                   <div

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSixty.vue View File

820
                         class="under_line"
820
                         class="under_line"
821
                         style="width: 100px; text-align: center"
821
                         style="width: 100px; text-align: center"
822
                       >
822
                       >
823
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956">{{
823
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10138 || org_id == 10278">{{
824
                           lastafterdialysis.weight_after
824
                           lastafterdialysis.weight_after
825
                         }}</span>
825
                         }}</span>
826
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
826
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id!=10138&&org_id!=10278">{{
827
                           predialysis.weight_after_last_transparency
827
                           predialysis.weight_after_last_transparency
828
                             ? predialysis.weight_after_last_transparency
828
                             ? predialysis.weight_after_last_transparency
829
                             : "未称重"
829
                             : "未称重"

+ 3 - 2
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

1113
         { value: '1402', label: '门诊特殊病(1402)' },
1113
         { value: '1402', label: '门诊特殊病(1402)' },
1114
         { value: '1401', label: '门诊慢性病(1401)' },
1114
         { value: '1401', label: '门诊慢性病(1401)' },
1115
         { value: '2302', label: '异地就医(2302)' },
1115
         { value: '2302', label: '异地就医(2302)' },
1116
-
1117
-
1118
         { value: '0', label: '自费' }
1116
         { value: '0', label: '自费' }
1119
 
1117
 
1120
       ],
1118
       ],
4866
         case 1401:
4864
         case 1401:
4867
           return '门诊慢性病(1401)' + '处方' + index
4865
           return '门诊慢性病(1401)' + '处方' + index
4868
           break
4866
           break
4867
+        case 2302:
4868
+          return '异地就医(2302)' + '处方' + index
4869
+          break
4869
         case 9922:
4870
         case 9922:
4870
           return '家庭通道' + '处方' + index
4871
           return '家庭通道' + '处方' + index
4871
           break
4872
           break

File diff suppressed because it is too large
+ 600 - 600
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue


+ 8 - 8
src/xt_pages/outpatientDoctorStation/doctorDesk.vue View File

1765
               // }
1765
               // }
1766
 
1766
 
1767
               var preTime = nowTime
1767
               var preTime = nowTime
1768
-              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485){
1768
+              if ( this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191){
1769
                 if (prescription.pre_time == 0) {
1769
                 if (prescription.pre_time == 0) {
1770
                   if (this.schedule.schedule_type == 1) {
1770
                   if (this.schedule.schedule_type == 1) {
1771
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1771
                     preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1922
                   tempProject.push(obj)
1922
                   tempProject.push(obj)
1923
                 }
1923
                 }
1924
                 var preTime = nowTime
1924
                 var preTime = nowTime
1925
-                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485) {
1925
+                if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191) {
1926
                   if (this.schedule.schedule_type == 1) {
1926
                   if (this.schedule.schedule_type == 1) {
1927
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1927
                      preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
1928
                   } else if (this.schedule.schedule_type == 2) {
1928
                   } else if (this.schedule.schedule_type == 2) {
2232
                     // }
2232
                     // }
2233
 
2233
 
2234
                     var preTime = nowTime
2234
                     var preTime = nowTime
2235
-                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 ) {
2235
+                    if (this.org_id != 0 && this.$store.getters.xt_user.org.id != 9919 && this.$store.getters.xt_user.org.id != 10485 && this.$store.getters.xt_user.org.id != 10191 ) {
2236
                       if (prescription.pre_time == 0) {
2236
                       if (prescription.pre_time == 0) {
2237
                         if (this.schedule.schedule_type == 1) {
2237
                         if (this.schedule.schedule_type == 1) {
2238
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2238
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2390
 
2390
 
2391
                       var preTime = nowTime
2391
                       var preTime = nowTime
2392
                       // var preTime = ''
2392
                       // var preTime = ''
2393
-                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485) {
2393
+                      if(this.org_id != 0 && this.org_id !=  9919 && this.org_id !=  10485 && this.org_id !=  10191) {
2394
                         if (this.schedule.schedule_type == 1) {
2394
                         if (this.schedule.schedule_type == 1) {
2395
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2395
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
2396
                         } else if (this.schedule.schedule_type == 2) {
2396
                         } else if (this.schedule.schedule_type == 2) {
3896
 
3896
 
3897
                     var preTime = nowTime
3897
                     var preTime = nowTime
3898
 
3898
 
3899
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 ) {
3899
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id  != 10485 && this.org_id  != 10191 ) {
3900
                       if (prescription.pre_time == 0) {
3900
                       if (prescription.pre_time == 0) {
3901
                         if (this.schedule.schedule_type == 1) {
3901
                         if (this.schedule.schedule_type == 1) {
3902
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
3902
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4050
 
4050
 
4051
                       // var preTime = nowTime
4051
                       // var preTime = nowTime
4052
                       var preTime = nowTime
4052
                       var preTime = nowTime
4053
-                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485) {
4053
+                      if( this.org_id != 0 && this.org_id != 9919 &&  this.org_id != 10485 &&  this.org_id != 10191) {
4054
                         if (this.schedule.schedule_type == 1) {
4054
                         if (this.schedule.schedule_type == 1) {
4055
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4055
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4056
                         } else if (this.schedule.schedule_type == 2) {
4056
                         } else if (this.schedule.schedule_type == 2) {
4533
 
4533
 
4534
                     var preTime = nowTime
4534
                     var preTime = nowTime
4535
 
4535
 
4536
-                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485) {
4536
+                    if(this.org_id != 0 && this.org_id != 9919 && this.org_id != 10485 && this.org_id != 10191) {
4537
                       if (prescription.pre_time == 0) {
4537
                       if (prescription.pre_time == 0) {
4538
                         // preTime = nowTime
4538
                         // preTime = nowTime
4539
                         if (this.schedule.schedule_type == 1) {
4539
                         if (this.schedule.schedule_type == 1) {
4690
 
4690
 
4691
                       var preTime = nowTime
4691
                       var preTime = nowTime
4692
                       // var preTime = ''
4692
                       // var preTime = ''
4693
-                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485) {
4693
+                      if(this.org_id != 0 && this.org_id != 9919  && this.org_id != 10485 && this.org_id != 10191 ) {
4694
                         if (this.schedule.schedule_type == 1) {
4694
                         if (this.schedule.schedule_type == 1) {
4695
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4695
                           preTime = nowYear + '-' + (nowMonth < 10 ? '0' + nowMonth : nowMonth) + '-' + (nowDay < 10 ? '0' + nowDay : nowDay) + ' ' + '7:00'
4696
                         } else if (this.schedule.schedule_type == 2) {
4696
                         } else if (this.schedule.schedule_type == 2) {

+ 3 - 3
src/xt_pages/role/admin.vue View File

66
           style="float:left"
66
           style="float:left"
67
           @click="toTestSeven">添加合同签署人</el-button> -->
67
           @click="toTestSeven">添加合同签署人</el-button> -->
68
 
68
 
69
-          <el-button   type="primary"
69
+          <!-- <el-button   type="primary"
70
           size="small"
70
           size="small"
71
           icon="el-icon-circle-plus-outline"
71
           icon="el-icon-circle-plus-outline"
72
           style="float:left"  @click="toTestEight">
72
           style="float:left"  @click="toTestEight">
73
             脚本
73
             脚本
74
-          </el-button>
74
+          </el-button> -->
75
           
75
           
76
      </div>
76
      </div>
77
     
77
     
227
 </template>
227
 </template>
228
 
228
 
229
 <script>
229
 <script>
230
-import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestEight } from "@/api/role/admin";
230
+import { adminMainView, getAdmins, setAdminStatus,toSign,toTestOne,toTestTwo,toTestThree,toTestFour,toTestFive,toTestSeven,toTestEight } from "@/api/role/admin";
231
 import { getRoles } from "@/api/role/role";
231
 import { getRoles } from "@/api/role/role";
232
 
232
 
233
 import { parseTime } from "@/utils";
233
 import { parseTime } from "@/utils";

+ 7 - 3
src/xt_pages/stock/detail/stockOutDetail.vue View File

809
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
809
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
810
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
810
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
811
         this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
811
         this.tableOut[i].ctime = this.getTime(this.tableOut[i].ctime)
812
-        if(this.orgId == 9919 || this.orgId == 10402 || this.orgId == 0){
812
+        if(this.orgId == 9919 || this.orgId == 10402){
813
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
813
           this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
814
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
814
           this.tableOut[i].packing_price = this.tableOut[i].buy_price
815
         }else if(this.orgId == 10265){
815
         }else if(this.orgId == 10265){
830
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
830
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
831
         }else if(this.orgId == 10188){
831
         }else if(this.orgId == 10188){
832
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
832
           this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
833
+        }else if(this.orgId == 10489){
834
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
835
+        }else if(this.orgId == 10375){
836
+          this.tableOut[i].total_price = (this.getWarehouseOut(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
833
         }else{
837
         }else{
834
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
838
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
835
         }
839
         }
838
 
842
 
839
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
843
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
840
         }
844
         }
841
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191){
845
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId == 0 || this.orgId ==10489 || this.orgId == 10375){
842
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
846
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
843
           console.log("out_count232233232332",this.tableOut[i].out_count)
847
           console.log("out_count232233232332",this.tableOut[i].out_count)
844
         }
848
         }
845
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402){
849
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375){
846
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
850
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
847
         }
851
         }
848
        }
852
        }