XMLWAN 3 years ago
parent
commit
7fab584ee8

+ 9 - 0
src/api/config.js View File

@@ -183,4 +183,13 @@ export function changeFuncPrint(params){
183 183
     method:"get",
184 184
     params:params
185 185
   })
186
+}
187
+
188
+export function getDataPrintList(params){
189
+  
190
+  return request({
191
+    url:"/api/order/getdataprint",
192
+    method:"get",
193
+    params:params
194
+  })
186 195
 }

+ 27 - 6
src/xt_pages/data/basicConfig.vue View File

@@ -78,7 +78,7 @@
78 78
 
79 79
 <script>
80 80
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
81
-import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint} from '@/api/config'
81
+import { getAllIsOpenInit,postXtHisIsOpen,postMonitorIsOpen,changeFuncPrint,getDataPrintList} from '@/api/config'
82 82
 
83 83
 export default {
84 84
   name: "printTemplate",
@@ -217,7 +217,8 @@ export default {
217 217
     },
218 218
 
219 219
     changeFuncPrint(val){
220
-      var is_open  = ""
220
+      console.log("val22222",val)
221
+      var is_open  = 0
221 222
       if(val == true){
222 223
          is_open = 1
223 224
       }
@@ -227,17 +228,37 @@ export default {
227 228
       var params = {
228 229
         is_open:is_open,
229 230
       }
231
+     
230 232
       changeFuncPrint(params).then(response=>{
231
-        
233
+         if(response.data.state == 1){
234
+           var dataPrint =  response.data.data.dataPrint
235
+           this.$message.success("保存成功")
236
+           this.getDataPrintList()
237
+         }
238
+      })
239
+    },
240
+
241
+    getDataPrintList(){
242
+      getDataPrintList().then(response=>{
243
+         if(response.data.state ==1){
244
+           var dataPrint = response.data.data.dataPrint
245
+           console.log("列表数据",dataPrint)
246
+           if(dataPrint.is_open == 1){
247
+              this.is_open_print = true
248
+           }
249
+           if(dataPrint.is_open == 0){
250
+              this.is_open_print = false
251
+           }
252
+         }
232 253
       })
233 254
     }
234 255
 
235 256
   },
236 257
   created() {
237 258
     this.getInitIsOpenConfig()
238
-    this.getMonitorConfig()
239
-    this.getOrderConfig()
240
-
259
+    // this.getMonitorConfig()
260
+    // this.getOrderConfig()
261
+    this.getDataPrintList()
241 262
   }
242 263
 };
243 264
 </script>

+ 4 - 1
src/xt_pages/workforce/components/nextTableWeeks.vue View File

@@ -129,7 +129,10 @@
129 129
       </el-table-column>
130 130
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
131 131
         <template slot-scope="scope">
132
-          <span v-if="org_id!=9987" > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
132
+          <span v-if="org_id!=9987" >
133
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span> 
134
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus =='' && scope.row.dialysissolution.length>0 ">{{ scope.row.dialysissolution[0].dialyzer_perfusion_apparatus }}</span> 
135
+          </span>
133 136
           {{scope.row.prescription.dialysis_dialyszers}}
134 137
          <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
135 138
           <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>

+ 5 - 2
src/xt_pages/workforce/components/tableWeeks.vue View File

@@ -146,8 +146,11 @@
146 146
       </el-table-column>
147 147
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
148 148
         <template slot-scope="scope">
149
-          <span v-if="org_id!=9987">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
150
-          {{scope.row.prescription.dialysis_dialyszers}}
149
+          <span v-if="org_id!=9987">
150
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus!=''">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span> 
151
+             <span v-if="scope.row.prescription.dialyzer_perfusion_apparatus==''&& scope.row.dialysissolution.length>0 ">{{scope.row.dialysissolution[0].dialyzer_perfusion_apparatus}}</span>
152
+          </span>
153
+           {{scope.row.prescription.dialysis_dialyszers}}
151 154
           <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
152 155
           <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
153 156
         </template>

+ 4 - 1
src/xt_pages/workforce/next_remind_print.vue View File

@@ -61,7 +61,10 @@
61 61
                   {{modeOptions[main_collection.mode_id].name}}
62 62
                 </td>
63 63
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">
64
-                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
64
+                 <span v-if="org_id!=9987">
65
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> {{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
66
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution[0].dialyzer_perfusion_apparatus}}</span> 
67
+                  </span>
65 68
                   {{main_collection.prescription.dialysis_dialyszers}} 
66 69
                   <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>
67 70
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''"> {{main_collection.prescription.dialysis_irrigation}}</span>

+ 5 - 2
src/xt_pages/workforce/remind_print.vue View File

@@ -60,8 +60,11 @@
60 60
                   {{modeOptions[main_collection.mode_id].name}}
61 61
                 </td>
62 62
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
63
-                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
64
-                  {{main_collection.prescription.dialysis_dialyszers}}
63
+                  <span v-if="org_id!=9987">
64
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> {{main_collection.prescription.dialyzer_perfusion_apparatus}}</span>
65
+                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{main_collection.dialysissolution[0].dialyzer_perfusion_apparatus}}</span> 
66
+                  </span>
67
+                    {{main_collection.prescription.dialysis_dialyszers}}
65 68
                   <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
66 69
                   <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span>
67 70