XMLWAN 4 年前
父节点
当前提交
cbd4e97c2d

+ 1 - 1
src/xt_pages/data/specialDictionary.vue 查看文件

21
           <!--<manufacturer></manufacturer>-->
21
           <!--<manufacturer></manufacturer>-->
22
           <manufacturer></manufacturer>
22
           <manufacturer></manufacturer>
23
         </el-tab-pane>
23
         </el-tab-pane>
24
-        <el-tab-pane label="供应商" name="6">
24
+        <el-tab-pane label="经销商" name="6">
25
           <!--<supplier></supplier>-->
25
           <!--<supplier></supplier>-->
26
           <dealer></dealer>
26
           <dealer></dealer>
27
         </el-tab-pane>
27
         </el-tab-pane>

+ 1 - 0
src/xt_pages/dialysis/PatientBox.vue 查看文件

240
     },
240
     },
241
     patientStateVal:Number
241
     patientStateVal:Number
242
   },
242
   },
243
+ 
243
   methods: {
244
   methods: {
244
     stateColor: function(schedual) {
245
     stateColor: function(schedual) {
245
       var state = this.computeState(schedual);
246
       var state = this.computeState(schedual);

+ 5 - 2
src/xt_pages/dialysis/batch_print/batch_print_order_six.vue 查看文件

640
                             record.prescription &&
640
                             record.prescription &&
641
                             record.prescription.dialyzer_perfusion_apparatus
641
                             record.prescription.dialyzer_perfusion_apparatus
642
                               ? record.prescription.dialyzer_perfusion_apparatus
642
                               ? record.prescription.dialyzer_perfusion_apparatus
643
-                              : "/"
643
+                              : ""
644
+                          }}
645
+                          {{
646
+                            record.prescription && record.prescription.dialysis_dialyszers?record.prescription.dialysis_dialyszers:"/"
644
                           }}
647
                           }}
645
                         </div>
648
                         </div>
646
                       </div>
649
                       </div>
650
                           class="under_line"
653
                           class="under_line"
651
                           style="width: 70px;text-align: center"
654
                           style="width: 70px;text-align: center"
652
                         >
655
                         >
653
-                          /
656
+                          {{record.prescription && record.prescription.dialysis_irrigation?record.prescription.dialysis_irrigation:"/"}}
654
                         </div>
657
                         </div>
655
                       </div>
658
                       </div>
656
                       <div class="inline_block" style="flex:1;">
659
                       <div class="inline_block" style="flex:1;">

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

1697
 
1697
 
1698
 
1698
 
1699
           //获取最后一次血管通路
1699
           //获取最后一次血管通路
1700
+        //   console.log("最后一次血管通路",this.predialysis)
1700
         //  if(this.predialysis!=null){
1701
         //  if(this.predialysis!=null){
1701
         //     if(this.lastAssessment!=null){
1702
         //     if(this.lastAssessment!=null){
1702
         //       var blood_id = 0
1703
         //       var blood_id = 0

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

334
                   <div class="inline_block" style="flex:1;">
334
                   <div class="inline_block" style="flex:1;">
335
                     透析(滤)器:
335
                     透析(滤)器:
336
                     <div class="under_line" style="width: 100px;text-align: center">
336
                     <div class="under_line" style="width: 100px;text-align: center">
337
-                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "/" }}
337
+                      {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : "" }}
338
+                      {{prescription.dialysis_dialyszers?prescription.dialysis_dialyszers:"/"}}
338
                     </div>
339
                     </div>
339
                   </div>
340
                   </div>
340
                   <div class="inline_block" style="flex:1;">
341
                   <div class="inline_block" style="flex:1;">
341
                     灌流器:
342
                     灌流器:
342
                     <div class="under_line" style="width: 70px;text-align: center">
343
                     <div class="under_line" style="width: 70px;text-align: center">
343
-                      /
344
+                     {{prescription.dialysis_irrigation?prescription.dialysis_irrigation:'/'}}
344
                     </div>
345
                     </div>
345
                   </div>
346
                   </div>
346
                   <div class="inline_block" style="flex:1;">
347
                   <div class="inline_block" style="flex:1;">

+ 2 - 2
src/xt_pages/outpatientRegistration/registrationHistory.vue 查看文件

83
                     <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
83
                     <template slot-scope="scope">{{getMedicalTreatment(scope.row.social_type)}}</template>
84
                 </el-table-column>
84
                 </el-table-column>
85
                 <el-table-column align="center" prop="name" label="医生" width="80">
85
                 <el-table-column align="center" prop="name" label="医生" width="80">
86
-                    <template slot-scope="scope">{{getDoctor(scope.row.admin_user_id) }}</template>
86
+                    <template slot-scope="scope">{{getDoctor(scope.row.doctor) }}</template>
87
                 </el-table-column>
87
                 </el-table-column>
88
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
88
                 <el-table-column align="center" prop="name" label="挂号费" width="70">
89
                     <template slot-scope="scope">{{ scope.row.register_cost }}</template>
89
                     <template slot-scope="scope">{{ scope.row.register_cost }}</template>
182
                       <div>{{ getRegister(form.register_type) }}</div>
182
                       <div>{{ getRegister(form.register_type) }}</div>
183
                     </el-form-item>
183
                     </el-form-item>
184
                     <el-form-item label="医生:"  prop="doctor" :validate-event="is_Name" >
184
                     <el-form-item label="医生:"  prop="doctor" :validate-event="is_Name" >
185
-                      <div>{{ getDoctor(form.admin_user_id) }}</div>
185
+                      <div>{{ getDoctor(form.doctor) }}</div>
186
                     </el-form-item>
186
                     </el-form-item>
187
                     <el-form-item label="科室:"  prop="department" :validate-event="is_Name">
187
                     <el-form-item label="科室:"  prop="department" :validate-event="is_Name">
188
                       <div>{{ getDepartMent(form.departments) }}</div>
188
                       <div>{{ getDepartMent(form.departments) }}</div>

+ 32 - 24
src/xt_pages/stock/Dialog/goodInfoDailog.vue 查看文件

54
               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
54
               <el-input v-model="form.specification_name" placeholder="" maxlength="30"></el-input>
55
             </el-form-item>
55
             </el-form-item>
56
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
56
             <el-form-item label="生产厂商 : " prop="manufacturer" style="width:100%">
57
-              <!-- <el-select v-model="form.manufacturer" style="width:100%" placeholder="请选择" filterable>
58
-                <el-option
59
-                  v-for="(item,index) in form.manufacturers"
60
-                  :key="index"
61
-                  :label="item.manufacturer_name"
62
-                  :value="item.id">
63
-                </el-option>
64
-              </el-select> -->
65
-
57
+             
66
                <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
58
                <el-select v-model="form.manufacturer" style="width:100%;" filterable placeholder="请选择">
67
                   <el-option
59
                   <el-option
68
                     v-for="(item,index) in form.manufacturers"
60
                     v-for="(item,index) in form.manufacturers"
131
                 </el-option>
123
                 </el-option>
132
               </el-select>
124
               </el-select>
133
             </el-form-item>
125
             </el-form-item>
134
-            <!--<el-form-item label="代理商 : " prop="name" style="visibility: hidden;">-->
135
-            <!--<el-input style="width:160px;" v-model="form.agent" placeholder="" maxlength="30"></el-input>-->
136
-            <!--</el-form-item>-->
137
-
138
-
126
+          
139
             <el-form-item label="状态 : " prop="good_status">
127
             <el-form-item label="状态 : " prop="good_status">
140
-              <!--<el-radio-group v-model="form.good_status">-->
141
-              <!--<el-radio :label="1">停用</el-radio>-->
142
-              <!--<el-radio :label="2">收费</el-radio>-->
143
-              <!--</el-radio-group>-->
144
-
145
               <el-checkbox-group v-model="good_status">
128
               <el-checkbox-group v-model="good_status">
146
                 <el-checkbox label="停用">停用</el-checkbox>
129
                 <el-checkbox label="停用">停用</el-checkbox>
147
                 <el-checkbox label="收费">收费</el-checkbox>
130
                 <el-checkbox label="收费">收费</el-checkbox>
148
               </el-checkbox-group>
131
               </el-checkbox-group>
149
             </el-form-item>
132
             </el-form-item>
150
 
133
 
134
+           <el-form-item label="经销商 : " prop="manufacturer" style="width:100%">
135
+             
136
+               <el-select v-model="form.dealer" style="width:100%;" filterable placeholder="请选择">
137
+                  <el-option
138
+                    v-for="(item,index) in dealer"
139
+                    :key="index"
140
+                    :label="item.dealer_name"
141
+                    :value="item.id">
142
+                  </el-option>
143
+              </el-select>
144
+           </el-form-item>
145
+
151
 
146
 
152
             <el-form-item label="备注 : " prop="name" style="width:100%;">
147
             <el-form-item label="备注 : " prop="name" style="width:100%;">
153
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
148
               <el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="form.remark"></el-input>
227
           <el-form-item label="代理商:" prop="agent">
222
           <el-form-item label="代理商:" prop="agent">
228
             <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
223
             <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
229
           </el-form-item>
224
           </el-form-item>
230
-          <!--<el-form-item label="耗材编码:" prop="name">-->
231
-          <!--<el-input v-model="form.name" style="width:160px;" placeholder="" maxlength="30"></el-input>-->
232
-          <!--</el-form-item>-->
225
+         
233
           <el-form-item label="耗材编号:" prop="good_number">
226
           <el-form-item label="耗材编号:" prop="good_number">
234
             <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
227
             <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
235
           </el-form-item>
228
           </el-form-item>
250
 
243
 
251
 <script>
244
 <script>
252
   import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
245
   import { getDictionaryDataConfig,getDataConfig } from '@/utils/data'
253
-  import { getManufacturerList } from "@/api/stock";
246
+  import { getManufacturerList,GetAllConfig } from "@/api/stock";
247
+
254
   export default {
248
   export default {
255
     name: 'goodInfoDailog',
249
     name: 'goodInfoDailog',
256
     data() {
250
     data() {
332
             { required: true, message: '请输入库存警戒', trigger: 'blur' }
326
             { required: true, message: '请输入库存警戒', trigger: 'blur' }
333
           ]
327
           ]
334
 
328
 
335
-        }
329
+        },
330
+        dealer:[]
336
       }
331
       }
337
     },
332
     },
338
     props: {
333
     props: {
480
            console.log("列表2222222",manufacturerList)
475
            console.log("列表2222222",manufacturerList)
481
            this.manufacturerList = manufacturerList
476
            this.manufacturerList = manufacturerList
482
         })
477
         })
478
+      },
479
+      GetAllConfig(){
480
+        GetAllConfig().then(response => {
481
+        if (response.data.state == 0) {
482
+          this.$message.error(response.data.msg);
483
+          return false;
484
+        } else {
485
+          this.dealer = response.data.data.dealer;
486
+          console.log("经销傻姑娘",this.dealer)
487
+        }
488
+       });
483
       }
489
       }
484
     },
490
     },
485
     watch: {
491
     watch: {
494
     },
500
     },
495
     created(){
501
     created(){
496
       this.getlist()
502
       this.getlist()
503
+      //获取所有经销商
504
+      this.GetAllConfig()
497
     }
505
     }
498
   }
506
   }
499
 
507
 

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

1130
       const ids = [];
1130
       const ids = [];
1131
       ids.push(this.WarehouseInfo.warehouse.id);
1131
       ids.push(this.WarehouseInfo.warehouse.id);
1132
       const idStr = ids.join(",");
1132
       const idStr = ids.join(",");
1133
-
1133
+     
1134
       const params = {
1134
       const params = {
1135
         ids: idStr
1135
         ids: idStr
1136
       };
1136
       };

+ 479 - 10
src/xt_pages/stock/stockOutOrder.vue 查看文件

207
         </div>
207
         </div>
208
 
208
 
209
         <div class="filter-container" style="margin-top: 10px">
209
         <div class="filter-container" style="margin-top: 10px">
210
-         <!-- <el-button size="small" icon="el-icon-edit" @click="editRecord" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
211
-         <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button> -->
210
+         <el-button size="small" icon="el-icon-edit" @click="editRecord(warehousingOutInfo.info.id)" v-if="warehousingOutInfo.info.is_sys != 1">编辑</el-button>
211
+         <el-button size="small" icon="el-icon-delete" @click="deleteRecord" v-if="warehousingOutInfo.info.is_sys != 1">删除</el-button>
212
         </div>
212
         </div>
213
 
213
 
214
 
214
 
369
 
369
 
370
 
370
 
371
   <!-- 编辑 -->
371
   <!-- 编辑 -->
372
-  
372
+   <el-dialog
373
+      title="编辑出库单"
374
+      :visible.sync="editDialogVisible"
375
+      width="80%">
376
+      <span>
377
+
378
+        <div style="margin-bottom:10px">
379
+          <label class="title"><span class="name">出库时间</span> : </label>
380
+          <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :editable="false"
381
+                          style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
382
+                          value-format="yyyy-MM-dd"></el-date-picker>
383
+          <label class="title" style="margin-left:10px;"><span class="name">经 销 商</span> : </label>
384
+          <el-select size="small" v-model="form.dealer" clearable placeholder="请选择经销商" @change="changeDealer">
385
+            <el-option
386
+              v-for="(option, index) in dealer"
387
+              :key="index"
388
+              :label="option.dealer_name"
389
+              :value="option.id">
390
+            </el-option>
391
+          </el-select>
392
+          <label class="title" style="margin-left:10px;"><span class="name">厂商</span> : </label>
393
+
394
+          <el-select size="small" v-model="form.manufacturer" clearable placeholder="请选择厂商" @change="changeManufacturer">
395
+            <el-option
396
+              v-for="(option, index) in manufacturer"
397
+              :key="index"
398
+              :label="option.manufacturer_name"
399
+              :value="option.id">
400
+            </el-option>
401
+          </el-select>
402
+        </div>
403
+
404
+
405
+      <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
406
+        <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
407
+                  max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
408
+        >
409
+
410
+          <el-table-column min-width="35" align="center">
411
+
412
+            <template slot="header" slot-scope="scope">
413
+              <span>耗材类型<span style="color: red">*</span></span>
414
+            </template>
415
+
416
+            <template slot-scope="scope">
417
+              <el-form-item style="padding-top: 15px">
418
+                <el-input placeholder="请输入商品类型" v-model="scope.row.good_type_id"
419
+                          :value="typeName(scope.row.good_type_id)"
420
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
421
+              </el-form-item>
422
+            </template>
423
+          </el-table-column>
424
+          
425
+          <el-table-column min-width="35" align="center">
426
+            <template slot="header" slot-scope="scope">
427
+              <span>规格名称<span style="color: red">*</span></span>
428
+            </template>
429
+            <template slot-scope="scope">
430
+
431
+              <el-form-item style="padding-top: 15px">
432
+                <el-input placeholder="请输入规格名称" v-model="scope.row.good_id"
433
+                          :value="specificationName(scope.row.good_id)"
434
+                          @focus="showDialog(scope.$index, scope.row)"></el-input>
435
+              </el-form-item>
436
+
437
+            </template>
438
+          </el-table-column>
439
+
440
+
441
+          <el-table-column min-width="23" align="center">
442
+            <template slot="header" slot-scope="scope">
443
+              <span>单价<span style="color: red">*</span></span>
444
+            </template>
445
+            <template slot-scope="scope">
446
+              <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
447
+                            style="padding-top: 17px">
448
+                <el-input type="number" v-model="scope.row.price"></el-input>
449
+              </el-form-item>
450
+            </template>
451
+          </el-table-column>
452
+
453
+          <el-table-column min-width="23" align="center">
454
+            <template slot="header" slot-scope="scope">
455
+              <span>出库数量<span style="color: red">*</span></span>
456
+            </template>
457
+            <template slot-scope="scope">
458
+              <el-form-item :prop="'recordData.' + scope.$index + '.count'" :rules='tableRules.count'
459
+                            style="padding-top: 17px">
460
+                <el-input type="number" v-model="scope.row.count"></el-input>
461
+              </el-form-item>
462
+            </template>
463
+          </el-table-column>
464
+
465
+          <el-table-column label="总价" min-width="20" align="center">
466
+            <template slot-scope="scope">
467
+              {{calculate(scope.row.price*scope.row.count)}}
468
+            </template>
469
+          </el-table-column>
470
+          <el-table-column label="备注" min-width="20" align="center">
471
+            <template slot-scope="scope">
472
+              <el-input v-model="scope.row.remark"></el-input>
473
+            </template>
474
+          </el-table-column>
475
+          <el-table-column label="操作" align="center" min-width="30">
476
+            <template slot-scope="scope">
477
+              <el-tooltip class="item" effect="dark" content="新增" placement="top">
478
+                <el-button
479
+                  size="mini"
480
+                  type="primary"
481
+                  icon="el-icon-circle-plus-outline"
482
+                  @click="handleEditOne(scope.$index, scope.row)">
483
+                </el-button>
484
+              </el-tooltip>
485
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
486
+                <el-button
487
+                  size="mini"
488
+                  type="danger"
489
+                  icon="el-icon-delete"
490
+                  @click="handleDeleteOne(scope.$index, scope.row)">
491
+                </el-button>
492
+              </el-tooltip>
493
+            </template>
494
+          </el-table-column>
495
+        </el-table>
496
+      </el-form>
497
+      </span>
498
+      <span slot="footer" class="dialog-footer">
499
+        <el-button @click="editDialogVisible = false">取 消</el-button>
500
+        <el-button type="primary" @click="submit">确 定</el-button>
501
+      </span>
502
+  </el-dialog>
503
+   
504
+
505
+   <stock-in-dialog
506
+        ref="dialog"
507
+        :propForm="propForm"
508
+        :visibility="isVisibility"
509
+        v-on:dialog-comfirm="comfirm"
510
+        v-on:dialog-cancle="cancle"
511
+      >
512
+   </stock-in-dialog>
513
+
373
   
514
   
374
   </div>
515
   </div>
375
 </template>
516
 </template>
384
   getWarehouseOutList,
525
   getWarehouseOutList,
385
   getWarehouseOutInfo,
526
   getWarehouseOutInfo,
386
   getWarehouseOutUser,
527
   getWarehouseOutUser,
387
-  GetOutStockTotalCount
528
+  GetOutStockTotalCount,
529
+  deleteWarehouseOutInfo,
530
+  GetAllGoodInfoByID,
531
+  editWarehouseoutInfo,
388
 } from "@/api/stock";
532
 } from "@/api/stock";
389
 import BreadCrumb from "../components/bread-crumb";
533
 import BreadCrumb from "../components/bread-crumb";
534
+import StockInDialog from './Dialog/stockInDialog'
390
 
535
 
391
 export default {
536
 export default {
392
   name: "salesReturnOrder",
537
   name: "salesReturnOrder",
393
-  components: { BreadCrumb },
538
+  components: { StockInDialog, BreadCrumb},
394
   created() {
539
   created() {
395
     var nowDate = new Date();
540
     var nowDate = new Date();
396
     var nowYear = nowDate.getFullYear();
541
     var nowYear = nowDate.getFullYear();
416
     this.GetWarehouseOut();
561
     this.GetWarehouseOut();
417
    
562
    
418
     this.fetchAllAdminUsers();
563
     this.fetchAllAdminUsers();
564
+    
419
   },
565
   },
420
   data() {
566
   data() {
567
+     var checkGoodId = (rule, value, callback) => {
568
+      setTimeout(() => {
569
+        if (value == "" || value == 0) {
570
+          return callback(new Error("规格名称不能为空"));
571
+        }
572
+      }, 2000);
573
+    };
421
     return {
574
     return {
422
       searchKey: "",
575
       searchKey: "",
423
       crumbs: [
576
       crumbs: [
453
       userList:[],
606
       userList:[],
454
       type_name:'',
607
       type_name:'',
455
       specification_name:"",
608
       specification_name:"",
456
-      stockCount:[]
609
+      stockCount:[],
610
+      editDialogVisible:false,
611
+      warehouse_out_time: '',
612
+      form: {
613
+          manufacturer: 0,
614
+          dealer: 0
615
+        },
616
+       warehouseInfoList: [],
617
+       tableRules: {
618
+        price: [{ required: true, message: "单价不能为空", trigger: "blur" }],
619
+        warehousing_count: [
620
+          { required: true, message: "数量不能为空", trigge: "blur" }
621
+        ],
622
+
623
+        good_id: [{ validator: checkGoodId, trigger: "blur" }]
624
+      },
625
+
626
+      recordInfo: {
627
+        recordData: [],
628
+        stock_in_code: "",
629
+        current_index: ""
630
+      },
631
+      propForm: {
632
+        goods:[],
633
+        goodType: [],
634
+        goodInfo: [],
635
+        goodUnit: [],
636
+        title: '入库',
637
+        manufacturer: 0,
638
+        dealer: 0
639
+      },
640
+      isVisibility: false,
641
+      good_type_id:""
457
     };
642
     };
458
   },
643
   },
459
   methods: {
644
   methods: {
593
           this.dealer = response.data.data.dealer;
778
           this.dealer = response.data.data.dealer;
594
           this.goodInfo = response.data.data.goodInfo
779
           this.goodInfo = response.data.data.goodInfo
595
           this.goodType = response.data.data.goodType
780
           this.goodType = response.data.data.goodType
781
+          this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
782
+          this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
596
         }
783
         }
597
       });
784
       });
598
     },
785
     },
727
         const params = {
914
         const params = {
728
           'id': id
915
           'id': id
729
         }
916
         }
917
+        console.log("#3333333",id)
730
       getWarehouseOutInfo(params).then(response => {
918
       getWarehouseOutInfo(params).then(response => {
731
           if (response.data.state == 0) {
919
           if (response.data.state == 0) {
732
 
920
 
738
             }
926
             }
739
 
927
 
740
             this.warehousingOutInfo.info = response.data.data.info
928
             this.warehousingOutInfo.info = response.data.data.info
929
+
930
+            console.log("出库222222222",this.warehousingOutInfo)           
741
             // this.handleSpanTempArr()
931
             // this.handleSpanTempArr()
742
           }
932
           }
743
         })
933
         })
817
         })
1007
         })
818
       },
1008
       },
819
 
1009
 
820
-      editRecord(){
821
      
1010
      
822
-      },
823
-      deleteRecord(){
1011
+     deleteRecord: function() {
1012
+        const ids = []
1013
+        ids.push(this.warehousingOutInfo.info.id)
1014
+        const idStr = ids.join(',')
824
 
1015
 
1016
+        const params = {
1017
+          ids: idStr
1018
+        }
1019
+
1020
+        this.$confirm('确认删除出库单?', '删除出库单记录', {
1021
+          confirmButtonText: '确定',
1022
+          cancelButtonText: '取消',
1023
+          type: 'warning'
1024
+        }).then(() => {
1025
+          deleteWarehouseOut(params).then(response => {
1026
+            if (response.data.state == 0) {
1027
+              this.$message.error(response.data.msg)
1028
+              return false
1029
+            } else {
1030
+              this.$notify({
1031
+                title: '成功',
1032
+                message: '删除成功',
1033
+                type: 'success',
1034
+                duration: 2000
1035
+              })
1036
+
1037
+              this.$router.back(-1)
1038
+            }
1039
+          })
1040
+        }).catch(() => {
1041
+        })
825
       },
1042
       },
826
 
1043
 
827
       GetTotalCount(time){
1044
       GetTotalCount(time){
851
      unique(arr) {
1068
      unique(arr) {
852
         const res = new Map();
1069
         const res = new Map();
853
         return arr.filter((arr) => !res.has(arr.patient_id) && res.set(arr.patient_id, 1));
1070
         return arr.filter((arr) => !res.has(arr.patient_id) && res.set(arr.patient_id, 1));
854
-     }
1071
+     },
1072
+
1073
+    editRecord(id){
1074
+      this.warehouseOut= []
1075
+      this.recordInfo.recordData = []
1076
+      this.GetConfigInfo()
1077
+      this.GetOrderDetailTwo(id)
1078
+      this.good_type_id = id
1079
+    },
1080
+
1081
+     GetOrderDetailTwo(order_id) {
1082
+        const params = {
1083
+          'id': order_id
1084
+        }
1085
+        console.log("触发了222222",order_id)
1086
+        getWarehouseOutInfo(params).then(response => {
1087
+         if (response.data.state == 0) {
1088
+            this.$message.error(response.data.msg)
1089
+            return false
1090
+          } else {
1091
+
1092
+            for (let i = 0; i < response.data.data.list.length; i++) {
1093
+              response.data.data.list[i].price = response.data.data.list[i].price.toString()
1094
+              response.data.data.list[i].count = response.data.data.list[i].count.toString()
1095
+              this.recordInfo.recordData.push(response.data.data.list[i])
1096
+            }
1097
+            this.warehouseOut = response.data.data.info
1098
+            this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
1099
+            this.form.manufacturer = this.warehouseOut.manufacturer
1100
+            this.form.dealer = this.warehouseOut.dealer
1101
+            this.editDialogVisible = true
1102
+          }
1103
+
1104
+          if (this.recordInfo.recordData.length == 0) {
1105
+            const tempObj = {}
1106
+            tempObj['id'] = 0
1107
+            tempObj['good_type_id'] = 0
1108
+            tempObj['good_id'] = 0
1109
+            tempObj['count'] = ''
1110
+            tempObj['price'] = ''
1111
+            tempObj['remark'] = ''
1112
+            this.recordInfo.recordData.push(tempObj)
1113
+            this.editDialogVisible = true
1114
+          }
1115
+        })
1116
+      },
1117
+     getTime(val, temp) {
1118
+        if (val != 0) {
1119
+          return uParseTime(val, temp)
1120
+        } else {
1121
+          return ''
1122
+        }
1123
+     },
1124
+     changeManufacturer(val) {
1125
+        this.propForm.manufacturer = val
1126
+      },
1127
+       changeDealer(val) {
1128
+        this.propForm.dealer = val
1129
+     },
1130
+      typeName: function(good_type_id) {
1131
+        let name = "";
1132
+        for (let i = 0; i < this.goodType.length; i++) {
1133
+          if (this.goodType[i].id == good_type_id) {
1134
+            name = this.goodType[i].type_name;
1135
+          }
1136
+        }
1137
+        return name;
1138
+      },
1139
+     specificationName: function(good_info_id) {
1140
+        let name = "";
1141
+        for (let i = 0; i < this.goodInfo.length; i++) {
1142
+          if (this.goodInfo[i].id == good_info_id) {
1143
+            name = this.goodInfo[i].specification_name;
1144
+          }
1145
+        }
1146
+        return name;
1147
+     }, 
1148
+     handleEditOne(){
1149
+        const tempObj = {}
1150
+        tempObj['id'] = 0
1151
+        tempObj['good_type_id'] = 0
1152
+        tempObj['good_id'] = 0
1153
+        tempObj['count'] = ''
1154
+        tempObj['price'] = ''
1155
+        tempObj['remark'] = ''
1156
+        this.recordInfo.recordData.push(tempObj)
1157
+     },
1158
+     handleDeleteOne: function(index, row) {
1159
+        if (row.id == 0) {
1160
+          this.recordInfo.recordData.splice(index, 1)
1161
+        } else {
1162
+          const params = {
1163
+            id: row.id
1164
+          }
1165
+          this.$confirm('确认删除该出库耗材信息记录?', '删除出库耗材信息记录', {
1166
+            confirmButtonText: '确定',
1167
+            cancelButtonText: '取消',
1168
+            type: 'warning'
1169
+          }).then(() => {
1170
+            deleteWarehouseOutInfo(params).then(response => {
1171
+              if (response.data.state == 0) {
1172
+                this.$message.error(response.data.msg)
1173
+                return false
1174
+              } else {
1175
+                this.$message.success('删除成功')
1176
+
1177
+                this.recordInfo.recordData.splice(index, 1)
1178
+              }
1179
+            })
1180
+          }).catch(() => {
1181
+          })
1182
+        }
1183
+      },
1184
+      showDialog(index, row) {
1185
+        this.currentIndex = index;
1186
+        const loading = this.$loading({
1187
+          lock: true,
1188
+          text: "Loading",
1189
+          spinner: "el-icon-loading",
1190
+          background: "rgba(0, 0, 0, 0.7)"
1191
+        });
1192
+
1193
+        const params = {
1194
+          manufacturer_id: this.form.manufacturer,
1195
+          dealer_id: this.form.dealer
1196
+        };
1197
+        this.propForm.goods = []
1198
+
1199
+        GetAllGoodInfoByID(params).then(response => {
1200
+          if (response.data.state == 0) {
1201
+            this.$message.error(response.data.msg);
1202
+            return false;
1203
+          } else {
1204
+            if (response.data.data.goodInfo.length <= 0) {
1205
+              this.$message.error("该厂商或经销商没有物品信息");
1206
+              return;
1207
+            }
1208
+            this.$refs.dialog.show();
1209
+            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
1210
+              this.propForm.goodType.push(
1211
+                response.data.data.goodInfo[i].type
1212
+              );
1213
+            }
1214
+            const obj = {};
1215
+            this.propForm.goodType = this.propForm.goodType.reduce(
1216
+              (cur, next) => {
1217
+                obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
1218
+                return cur;
1219
+              },
1220
+              []
1221
+            ); // 设置cur默认类型为数组,并且初始值为空的数组
1222
+          }
1223
+
1224
+          for (let i = 0; i < this.propForm.goodType.length; i++) {
1225
+            let goodInfo = [];
1226
+            let goodObj = {};
1227
+
1228
+            for (let a = 0; a < response.data.data.goodInfo.length; a++) {
1229
+              var respObj = response.data.data.goodInfo[a];
1230
+              respObj["isSelected"] = false;
1231
+              if (respObj.type.id == this.propForm.goodType[i].id) {
1232
+                goodInfo.push(respObj);
1233
+              }
1234
+            }
1235
+            const obj = {};
1236
+            goodInfo = goodInfo.reduce((cur, next) => {
1237
+              obj[next.id] ? "" : (obj[next.id] = true && cur.push(next));
1238
+              return cur;
1239
+            }, []); // 设置cur默认类型为数组,并且初始值为空的数组
1240
+
1241
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo);
1242
+            this.propForm.goods.push(goodObj);
1243
+          }
1244
+          loading.close();
1245
+        });
1246
+      },
1247
+     
1248
+      comfirm: function(val) {
1249
+        this.$refs.dialog.hide();
1250
+        this.propForm.goodType = [];
1251
+        this.propForm.goods = [];
1252
+
1253
+        if (val.selectedGoodInfo.length > 0) {
1254
+          for (let i = val.selectedGoodInfo.length - 1; ; i--) {
1255
+            if (i == 0) {
1256
+              this.recordInfo.recordData[this.currentIndex].good_type_id =
1257
+                val.selectedGoodInfo[i].good_type_id;
1258
+              this.recordInfo.recordData[this.currentIndex].good_id =
1259
+                val.selectedGoodInfo[i].id;
1260
+              this.recordInfo.recordData[
1261
+                this.currentIndex
1262
+                ].price = val.selectedGoodInfo[i].buy_price.toString();
1263
+            } else {
1264
+              const tempForm = {};
1265
+              tempForm["id"] = 0;
1266
+              tempForm["good_type_id"] = val.selectedGoodInfo[i].good_type_id;
1267
+              tempForm["good_id"] = val.selectedGoodInfo[i].id;
1268
+              tempForm["count"] = "";
1269
+              tempForm["price"] = val.selectedGoodInfo[i].buy_price.toString();
1270
+              tempForm["remark"] = "";
1271
+              this.recordInfo.recordData.splice(
1272
+                this.currentIndex + 1,
1273
+                0,
1274
+                tempForm
1275
+              );
1276
+            }
1277
+          }
1278
+        }
1279
+        this.currentIndex = -1;
1280
+      },
1281
+      cancle: function() {
1282
+        this.$refs.dialog.hide()
1283
+        this.propForm.goods = [];
1284
+
1285
+        this.propForm.goodType = [];
1286
+      },
1287
+
1288
+      submit() {
1289
+        this.$refs['tableForm'].validate((valid) => {
1290
+          if (valid) {
1291
+            const array = this.recordInfo.recordData
1292
+            console.log("$arr3333333333",array)
1293
+            for (let i = 0; i < array.length; i++) {
1294
+              if (array[i].good_type_id == 0) {
1295
+                this.$message.error('商品类型不能为空')
1296
+                return
1297
+              }
1298
+              if (array[i].good_id == 0) {
1299
+                this.$message.error('规格名称不能为空')
1300
+                return
1301
+              }
1302
+            }
1303
+
1304
+            const params = {
1305
+              'stockOut': this.recordInfo.recordData
1306
+            }
1307
+            editWarehouseoutInfo(params, this.warehouse_out_time,this.good_type_id, 1, this.form.manufacturer, this.form.dealer).then(response => {
1308
+              if (response.data.state == 0) {
1309
+                this.$message.error(response.data.msg)
1310
+                return false
1311
+              } else {
1312
+                this.$message.success('保存成功')
1313
+                this.editDialogVisible = false
1314
+                this.warehousingOutInfo.info = []
1315
+                this.warehousingOutInfo.warehousingOutData = []
1316
+                this.GetOrderDetailOne(this.good_type_id)
1317
+              }
1318
+            })
1319
+          } else {
1320
+            return false
1321
+          }
1322
+        })
1323
+      }, 
855
   }
1324
   }
856
 };
1325
 };
857
 </script>
1326
 </script>

+ 5 - 3
src/xt_pages/stock/stockOutOrderDetail.vue 查看文件

238
             this.handleSpanTempArr()
238
             this.handleSpanTempArr()
239
           }
239
           }
240
         })
240
         })
241
-      }, deleteRecord: function() {
241
+      },
242
+       deleteRecord: function() {
242
         const ids = []
243
         const ids = []
243
         ids.push(this.warehousingOutInfo.info.id)
244
         ids.push(this.warehousingOutInfo.info.id)
244
         const idStr = ids.join(',')
245
         const idStr = ids.join(',')
269
           })
270
           })
270
         }).catch(() => {
271
         }).catch(() => {
271
         })
272
         })
272
-      }, editRecord: function() {
273
-        this.$emit('edit-record')
273
+      },
274
+       editRecord: function() {
275
+         this.$emit('edit-record')
274
       },
276
       },
275
       jump(row){
277
       jump(row){
276
         this.$router.push({
278
         this.$router.push({

+ 2 - 2
src/xt_pages/stock/stockOutOrderEdit.vue 查看文件

72
           <el-table-column min-width="35" align="center">
72
           <el-table-column min-width="35" align="center">
73
 
73
 
74
             <template slot="header" slot-scope="scope">
74
             <template slot="header" slot-scope="scope">
75
-              <span>商品类型<span style="color: red">*</span></span>
75
+              <span>耗材类型<span style="color: red">*</span></span>
76
             </template>
76
             </template>
77
 
77
 
78
             <template slot-scope="scope">
78
             <template slot-scope="scope">
333
           const params = {
333
           const params = {
334
             id: row.id
334
             id: row.id
335
           }
335
           }
336
-          this.$confirm('确认删除该出库商品信息记录?', '删除出库商品信息记录', {
336
+          this.$confirm('确认删除该出库耗材信息记录?', '删除出库耗材信息记录', {
337
             confirmButtonText: '确定',
337
             confirmButtonText: '确定',
338
             cancelButtonText: '取消',
338
             cancelButtonText: '取消',
339
             type: 'warning'
339
             type: 'warning'

+ 31 - 6
src/xt_pages/workforce/appointment.vue 查看文件

126
 
126
 
127
        <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
127
        <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
128
             <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
128
             <el-form :model="form"  ref="form" label-width="90px" :rules="rules">
129
+                <el-form-item label="周次:">
130
+                   <el-radio v-model="form.lastweek" label="1">上周排班信息</el-radio>
131
+                   <el-radio v-model="form.lastweek" label="2">本周排班信息</el-radio>
132
+                </el-form-item>
129
                 <el-form-item label="复制到 : " required  prop="copyWeek">
133
                 <el-form-item label="复制到 : " required  prop="copyWeek">
130
                     <el-select v-model="form.copyWeek" placeholder="请选择">
134
                     <el-select v-model="form.copyWeek" placeholder="请选择">
131
                         <el-option
135
                         <el-option
192
         end_time:"",
196
         end_time:"",
193
         export_type:0,
197
         export_type:0,
194
         form:{
198
         form:{
199
+          lastweek:"1",
195
           copyWeek:"",
200
           copyWeek:"",
196
         },
201
         },
197
         newVisible:false,
202
         newVisible:false,
580
         return isShow
585
         return isShow
581
       },
586
       },
582
        handleSuccess({ results, header }) {
587
        handleSuccess({ results, header }) {
583
-        console.log("results333333333333333333",results)
584
-        console.log("hearder2222222222222",header)
588
+       
585
         let headers = []
589
         let headers = []
586
         for (let key in results[0]) {
590
         for (let key in results[0]) {
587
           headers.push(key)
591
           headers.push(key)
2625
           return (new Date(time)).getTime() / 1000
2629
           return (new Date(time)).getTime() / 1000
2626
         },
2630
         },
2627
         submitAction(formName){
2631
         submitAction(formName){
2632
+           
2633
+             var start_time = ""
2634
+             var end_time = ""
2635
+             console.log("this222",this.form.lastweek)
2636
+             //上周
2637
+             if(this.form.lastweek == "1"){
2638
+                let weekOfday = parseInt(moment().format('d')) 
2639
+                start_time =  this.getTimestamp(moment().subtract(weekOfday + 6, 'days').format('YYYY-MM-DD')) -28800
2640
+                end_time =  this.getTimestamp(moment().subtract(weekOfday, 'days').format('YYYY-MM-DD')) -28800
2641
+                console.log("start",start_time)
2642
+                console.log("end",end_time)
2643
+             }
2644
+            
2645
+            //本周
2646
+             if(this.form.lastweek == "2"){
2647
+                start_time = this.getTimestamp(this.weekDayArr[0])
2648
+                end_time = this.getTimestamp(this.weekDayArr[6])
2649
+                console.log("start",start_time)
2650
+                console.log("end",end_time)
2651
+             }
2652
+
2628
             var label = ""
2653
             var label = ""
2629
             for(let i=0;i<this.timeOptions.length;i++){
2654
             for(let i=0;i<this.timeOptions.length;i++){
2630
                if(this.form.copyWeek == this.timeOptions[i].value){
2655
                if(this.form.copyWeek == this.timeOptions[i].value){
2634
            var start = label.split('~')
2659
            var start = label.split('~')
2635
            var copy_startime = this.getTimestamp(start[0])
2660
            var copy_startime = this.getTimestamp(start[0])
2636
            var copy_endtime = this.getTimestamp(start[1])
2661
            var copy_endtime = this.getTimestamp(start[1])
2637
-
2662
+         
2638
             const params = {
2663
             const params = {
2639
-              start_time:this.getTimestamp(this.weekDayArr[0]),
2640
-              end_time:this.getTimestamp(this.weekDayArr[6]),
2664
+              start_time:start_time,
2665
+              end_time:end_time,
2641
               copy_startime:copy_startime,
2666
               copy_startime:copy_startime,
2642
               copy_endtime:copy_endtime,
2667
               copy_endtime:copy_endtime,
2643
             }
2668
             }
2644
            console.log("parasm",params)
2669
            console.log("parasm",params)
2645
-
2670
+           
2646
            this.$refs[formName].validate(valid=>{
2671
            this.$refs[formName].validate(valid=>{
2647
               if(valid){
2672
               if(valid){
2648
                 copyPatientSchedule(params).then(response=>{
2673
                 copyPatientSchedule(params).then(response=>{

+ 6 - 3
src/xt_pages/workforce/components/nextTableWeeks.vue 查看文件

81
       </el-table-column>
81
       </el-table-column>
82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
83
         <template slot-scope="scope">
83
         <template slot-scope="scope">
84
-          <span > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
84
+          <span v-if="org_id!=9987" > {{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
85
           {{scope.row.prescription.dialysis_dialyszers}}
85
           {{scope.row.prescription.dialysis_dialyszers}}
86
-          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
86
+         <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
87
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
87
         </template>
88
         </template>
88
       </el-table-column>
89
       </el-table-column>
89
       <el-table-column label="抗凝剂" min-width="100" align="center">
90
       <el-table-column label="抗凝剂" min-width="100" align="center">
205
         Sunday: []
206
         Sunday: []
206
       },
207
       },
207
       scheduleData: [],
208
       scheduleData: [],
208
-      modeOptions: null
209
+      modeOptions: null,
210
+       org_id:0
209
     };
211
     };
210
   },
212
   },
211
   watch: {
213
   watch: {
419
       this.week_type = 7;
421
       this.week_type = 7;
420
     }
422
     }
421
     this.getNextScheduleWeekDay();
423
     this.getNextScheduleWeekDay();
424
+    this.org_id = this.$store.getters.xt_user.org.id
422
   }
425
   }
423
 };
426
 };
424
 </script>
427
 </script>

+ 10 - 5
src/xt_pages/workforce/components/scheduleUploadExcel/index.vue 查看文件

10
     <el-button type="primary" @click="handleUpload()">确 定</el-button>
10
     <el-button type="primary" @click="handleUpload()">确 定</el-button>
11
   </span>
11
   </span>
12
     </el-dialog>
12
     </el-dialog>
13
-     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick">
13
+     <input id="excel-upload-input" ref="excel-upload-input" type="file"  accept=".xlsx,.xls,.xltx," @change="handleClick" >
14
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
14
     <el-button :loading="loading" style="margin-left:16px;" size="mini" type="primary" @click="msgTipVisible = true">点击导入
15
     </el-button>
15
     </el-button>
16
   </div>
16
   </div>
74
         document.getElementById('excel-upload-input').click()
74
         document.getElementById('excel-upload-input').click()
75
       },
75
       },
76
       handleClick(e) {
76
       handleClick(e) {
77
-        
77
+       
78
         const files = e.target.files
78
         const files = e.target.files
79
         const rawFile = files[0] // only use files[0]
79
         const rawFile = files[0] // only use files[0]
80
         console.log("rawfiel",rawFile)
80
         console.log("rawfiel",rawFile)
81
         if (!rawFile) 
81
         if (!rawFile) 
82
         return
82
         return
83
         this.upload(rawFile)
83
         this.upload(rawFile)
84
+
84
       },
85
       },
85
       upload(rawFile) {
86
       upload(rawFile) {
86
-        console.log("触发了吗")
87
+        
87
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
88
         this.$refs['excel-upload-input'].value = null // fix can't select the same excel
88
         console.log("3333",this.beforeUpload)
89
         console.log("3333",this.beforeUpload)
89
         if (!this.beforeUpload) {
90
         if (!this.beforeUpload) {
104
           reader.onload = e => {
105
           reader.onload = e => {
105
            
106
            
106
             const data = e.target.result
107
             const data = e.target.result
108
+            console.log("data22222",data)
107
             const fixedData = this.fixdata(data)
109
             const fixedData = this.fixdata(data)
108
             const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
110
             const workbook = XLSX.read(btoa(fixedData), { type: 'base64' })
109
             const firstSheetName = workbook.SheetNames[0]
111
             const firstSheetName = workbook.SheetNames[0]
145
           headers.push(hdr)
147
           headers.push(hdr)
146
         }
148
         }
147
         return headers
149
         return headers
150
+
151
+    
152
+
148
       },
153
       },
149
       isExcel(file) {
154
       isExcel(file) {
150
-        console.log("file",file)
151
-        return /\.(xlsx|xls|csv)$/.test(file.name)
155
+        
156
+        return /\.(xlsx|xls|csv)$/.test(file.name)       
152
       }
157
       }
153
     }
158
     }
154
   }
159
   }

+ 6 - 3
src/xt_pages/workforce/components/tableWeeks.vue 查看文件

81
       </el-table-column>
81
       </el-table-column>
82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
82
       <el-table-column label="透析器/灌流器" min-width="100" align="center">
83
         <template slot-scope="scope">
83
         <template slot-scope="scope">
84
-          {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
84
+          <span v-if="org_id!=9987">{{ scope.row.prescription.dialyzer_perfusion_apparatus }}</span>
85
           {{scope.row.prescription.dialysis_dialyszers}}
85
           {{scope.row.prescription.dialysis_dialyszers}}
86
-          <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{scope.row.prescription.dialysis_irrigation}}</span>
86
+          <span v-if="scope.row.prescription.dialysis_dialyszers!='' && scope.row.prescription.dialysis_irrigation!=''">/</span>
87
+          <span v-if="scope.row.prescription.dialysis_irrigation!=''">{{scope.row.prescription.dialysis_irrigation}}</span>
87
         </template>
88
         </template>
88
       </el-table-column>
89
       </el-table-column>
89
 
90
 
206
         Sunday: []
207
         Sunday: []
207
       },
208
       },
208
       scheduleData: [],
209
       scheduleData: [],
209
-      modeOptions: null
210
+      modeOptions: null,
211
+      org_id:0
210
     };
212
     };
211
   },
213
   },
212
   watch: {
214
   watch: {
455
     // };
457
     // };
456
     this.getScheduleWeekDay();
458
     this.getScheduleWeekDay();
457
     console.log("org2222222",this.$store.getters.xt_user.org.id)
459
     console.log("org2222222",this.$store.getters.xt_user.org.id)
460
+    this.org_id = this.$store.getters.xt_user.org.id
458
   }
461
   }
459
 };
462
 };
460
 </script>
463
 </script>

+ 5 - 2
src/xt_pages/workforce/next_remind_print.vue 查看文件

59
                   {{modeOptions[main_collection.mode_id].name}}
59
                   {{modeOptions[main_collection.mode_id].name}}
60
                 </td>
60
                 </td>
61
                 <td :width="td_1_width">
61
                 <td :width="td_1_width">
62
-                  {{main_collection.prescription.dialyzer_perfusion_apparatus}}
62
+                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
63
                   {{main_collection.prescription.dialysis_dialyszers}} 
63
                   {{main_collection.prescription.dialysis_dialyszers}} 
64
-                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
64
+                  <span v-if="main_collection.prescription.dialysis_dialyszers!='' && main_collection.prescription.dialysis_irrigation!=''">/</span>
65
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''"> {{main_collection.prescription.dialysis_irrigation}}</span>
65
 
66
 
66
                 </td>
67
                 </td>
67
                 <td :width="td_1_width">
68
                 <td :width="td_1_width">
116
         currentDate:'',
117
         currentDate:'',
117
         start_time:moment().week(moment().week() + 1).startOf('week').unix(),
118
         start_time:moment().week(moment().week() + 1).startOf('week').unix(),
118
         end_time:moment().week(moment().week() + 1).endOf('week').unix(),
119
         end_time:moment().week(moment().week() + 1).endOf('week').unix(),
120
+        org_id:0,
119
       }
121
       }
120
     },
122
     },
121
     components: {
123
     components: {
122
       BreadCrumb
124
       BreadCrumb
123
     },
125
     },
124
     created() {
126
     created() {
127
+     this.org_id = this.$store.getters.xt_user.org.id
125
      this.currentDate = this.getCurrentDate()
128
      this.currentDate = this.getCurrentDate()
126
       this.modeOptions = this.$store.getters.treatment_mode
129
       this.modeOptions = this.$store.getters.treatment_mode
127
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
130
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit

+ 6 - 3
src/xt_pages/workforce/remind_print.vue 查看文件

59
                   {{modeOptions[main_collection.mode_id].name}}
59
                   {{modeOptions[main_collection.mode_id].name}}
60
                 </td>
60
                 </td>
61
                 <td :width="td_1_width">
61
                 <td :width="td_1_width">
62
-                  {{main_collection.prescription.dialyzer_perfusion_apparatus}}
62
+                  <span v-if="org_id!=9987">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
63
                   {{main_collection.prescription.dialysis_dialyszers}} 
63
                   {{main_collection.prescription.dialysis_dialyszers}} 
64
-                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">/ {{main_collection.prescription.dialysis_irrigation}}</span>
64
+                  <span v-if="main_collection.prescription.dialysis_dialyszers!=''&& main_collection.prescription.dialysis_irrigation!='' ">/</span>
65
+                  <span v-if="main_collection.prescription.dialysis_irrigation!=''">{{main_collection.prescription.dialysis_irrigation}}</span>
65
 
66
 
66
                 </td>
67
                 </td>
67
                 <td :width="td_1_width">
68
                 <td :width="td_1_width">
113
         td_4_width: '45%',
114
         td_4_width: '45%',
114
         modeOptions: null,
115
         modeOptions: null,
115
         anticoagulants_confit:null,
116
         anticoagulants_confit:null,
116
-        currentDate:''
117
+        currentDate:'',
118
+        org_id:0
117
       }
119
       }
118
     },
120
     },
119
     components: {
121
     components: {
120
       BreadCrumb
122
       BreadCrumb
121
     },
123
     },
122
     created() {
124
     created() {
125
+     this.org_id = this.$store.getters.xt_user.org.id
123
      this.currentDate = this.getCurrentDate()
126
      this.currentDate = this.getCurrentDate()
124
       this.modeOptions = this.$store.getters.treatment_mode
127
       this.modeOptions = this.$store.getters.treatment_mode
125
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
128
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit