浏览代码

2025 5 12

xmg123 1周前
父节点
当前提交
95bd65ea5d

+ 8 - 0
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue 查看文件

3113
             } else if (schedual.schedule_type == 3) {
3113
             } else if (schedual.schedule_type == 3) {
3114
               this.start_time = year + '-' + month + '-' + day + ' ' + '17:30'
3114
               this.start_time = year + '-' + month + '-' + day + ' ' + '17:30'
3115
             }
3115
             }
3116
+           }else if(this.$store.getters.xt_user.org.id == 10745){
3117
+              if (schedual.schedule_type == 1) {
3118
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
3119
+            } else if (schedual.schedule_type == 2) {
3120
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
3121
+            } else if (schedual.schedule_type == 3) {
3122
+              this.start_time = year + '-' + month + '-' + day + ' ' + '17:30'
3123
+            }
3116
            }else if (this.$store.getters.xt_user.org.id == 10551){
3124
            }else if (this.$store.getters.xt_user.org.id == 10551){
3117
             var date = new Date()
3125
             var date = new Date()
3118
             var year = date.getFullYear()
3126
             var year = date.getFullYear()

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue 查看文件

1454
                           <td width="50" v-if="org_id == 9671">在线尿素监测</td>
1454
                           <td width="50" v-if="org_id == 9671">在线尿素监测</td>
1455
                           <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">血容量<br />(L)</td>
1455
                           <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">血容量<br />(L)</td>
1456
                           <td width="50" v-if="org_id == 10490">碳酸氢钠<br />(ml)</td>
1456
                           <td width="50" v-if="org_id == 10490">碳酸氢钠<br />(ml)</td>
1457
-                          <td width="50" v-if="org_id == 10598">护士签名</td>
1457
+                          <td width="50" v-if="org_id == 10598 || org_id == 10726">护士签名</td>
1458
                           <td width="50" v-if="org_id == 9829">SpO₂<br />(%)</td>
1458
                           <td width="50" v-if="org_id == 9829">SpO₂<br />(%)</td>
1459
                           <td width="200">病情变化及处理</td>
1459
                           <td width="200">病情变化及处理</td>
1460
                         </tr>
1460
                         </tr>
1663
                           <td width="50" v-if="org_id == 10490">
1663
                           <td width="50" v-if="org_id == 10490">
1664
                             {{ monitor.dicarbonate ? monitor.dicarbonate : "" }}
1664
                             {{ monitor.dicarbonate ? monitor.dicarbonate : "" }}
1665
                           </td>
1665
                           </td>
1666
-                          <td width="50" v-if="org_id == 10598">
1666
+                          <td width="50" v-if="org_id == 10598 || org_id == 10726">
1667
                             <span v-if="monitor.creator == 0">
1667
                             <span v-if="monitor.creator == 0">
1668
                               <span v-if="setAdminUserES(monitor.modify) == ''">{{ getAdminUser(monitor.modify)
1668
                               <span v-if="setAdminUserES(monitor.modify) == ''">{{ getAdminUser(monitor.modify)
1669
                                 }}</span>
1669
                                 }}</span>

+ 7 - 5
src/xt_pages/stock/drugs/drugStockInOrder.vue 查看文件

316
             </span>
316
             </span>
317
           </template>
317
           </template>
318
         </el-table-column>
318
         </el-table-column>
319
-        <!-- <el-table-column label="拆零零售价" align="center">
320
-          <template slot-scope="scope">
321
-            {{scope.row.retail_price}}
322
-          </template>
323
-        </el-table-column> -->
319
+      
324
         <el-table-column label="进货价" align="center">
320
         <el-table-column label="进货价" align="center">
325
           <template slot-scope="scope">
321
           <template slot-scope="scope">
326
             <span v-if="scope.row.is_total == 0">{{ scope.row.price }}</span> 
322
             <span v-if="scope.row.is_total == 0">{{ scope.row.price }}</span> 
327
           </template>
323
           </template>
328
         </el-table-column>
324
         </el-table-column>
325
+
326
+        <el-table-column label="拆零零售价" align="center">
327
+          <template slot-scope="scope">
328
+            {{scope.row.retail_price}}
329
+          </template>
330
+        </el-table-column>
329
         <el-table-column label="总价" align="center">
331
         <el-table-column label="总价" align="center">
330
           <template slot-scope="scope">
332
           <template slot-scope="scope">
331
             <!-- {{scope.row.total_price}} -->
333
             <!-- {{scope.row.total_price}} -->

+ 8 - 22
src/xt_pages/stock/stockInOrder.vue 查看文件

71
             @change="endTimeChange"
71
             @change="endTimeChange"
72
           ></el-date-picker>
72
           ></el-date-picker>
73
         </div>
73
         </div>
74
-        <!-- <div style="margin-left: 10px">
75
-          <span>审核状态:</span>
76
-          <el-select
77
-            v-model="check_id"
78
-            style="width: 140px; margin-right: 10px"
79
-            placeholder="请选择"
80
-            @change="changeTypeName"
81
-          >
82
-            <el-option
83
-              v-for="item in checkList"
84
-              :key="item.id"
85
-              :label="item.name"
86
-              :value="item.id"
87
-            >
88
-            </el-option>
89
-          </el-select>
90
-        </div> -->
74
+       
91
 
75
 
92
       </div>
76
       </div>
93
 
77
 
294
            <span v-if="scope.row.is_total == 0">{{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}} </span> 
278
            <span v-if="scope.row.is_total == 0">{{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}} </span> 
295
           </template>
279
           </template>
296
         </el-table-column>
280
         </el-table-column>
297
-         <!-- <el-table-column label="零售价" align="center">
298
-          <template slot-scope="scope">
299
-            {{ scope.row.packing_price}}
300
-          </template>
301
-        </el-table-column> -->
281
+       
302
         <el-table-column label="进货价" align="center">
282
         <el-table-column label="进货价" align="center">
303
           <template slot-scope="scope">
283
           <template slot-scope="scope">
304
             <span v-if="scope.row.is_total == 0">
284
             <span v-if="scope.row.is_total == 0">
306
             </span> 
286
             </span> 
307
           </template>
287
           </template>
308
         </el-table-column>
288
         </el-table-column>
289
+
290
+        <el-table-column label="零售价" align="center">
291
+          <template slot-scope="scope">
292
+            {{ scope.row.packing_price}}
293
+          </template>
294
+        </el-table-column>
309
         <el-table-column label="总价" align="center">
295
         <el-table-column label="总价" align="center">
310
           <template slot-scope="scope">
296
           <template slot-scope="scope">
311
             <span v-if="scope.row.is_total==0">
297
             <span v-if="scope.row.is_total==0">

+ 13 - 13
src/xt_permission.js 查看文件

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28
 //  // 线上注释
28
 //  // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))