XMLWAN 3 年 前
コミット
bf763ef457

+ 2 - 2
src/xt_pages/dialysis/details/dialog/monitor_dialog.vue ファイルの表示

443
            <el-table-column
443
            <el-table-column
444
             prop="heparin"
444
             prop="heparin"
445
             align="center"
445
             align="center"
446
-            label="累计血容量"
446
+            label="累计血容量(ml)"
447
             width="140"
447
             width="140"
448
             v-if="isShow('累计血容量')"
448
             v-if="isShow('累计血容量')"
449
           >
449
           >
776
          </el-col>
776
          </el-col>
777
 
777
 
778
           <el-col :span="8" v-if=" isShow('累计血容量')">
778
           <el-col :span="8" v-if=" isShow('累计血容量')">
779
-            <el-form-item label="累计血容量:">
779
+            <el-form-item label="累计血容量(ml):">
780
               <el-input v-model="form.accumulated_blood_volume"></el-input>
780
               <el-input v-model="form.accumulated_blood_volume"></el-input>
781
             </el-form-item>
781
             </el-form-item>
782
           </el-col>
782
           </el-col>

+ 1 - 1
src/xt_pages/dialysis/details/dialysisMonitoring.vue ファイルの表示

31
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
31
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
32
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
32
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
33
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
33
           <th v-if="isShow('抗凝剂')" width="92px">抗凝剂</th>
34
-          <th v-if="isShow('累计血容量')" width="92px">累计血容量</th>
34
+          <th v-if="isShow('累计血容量')" width="92px">累计血容量(ml)</th>
35
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
35
           <th v-if="isShow('血温监测')" width="92px">血温监测</th>
36
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
36
           <th v-if="isShow('尿素监测')" width="92px">尿素监测</th>
37
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>
37
           <th v-if="isShow('血浓量')" width="92px">血浓量</th>

+ 181 - 13
src/xt_pages/stock/inventory.vue ファイルの表示

97
                 <span v-if="scope.row.checker_status == 2">正在盘点</span>
97
                 <span v-if="scope.row.checker_status == 2">正在盘点</span>
98
              </template>
98
              </template>
99
             </el-table-column>
99
             </el-table-column>
100
-            <el-table-column label="操作" align="center" width="300">
100
+            <el-table-column label="操作" align="center" width="200">
101
                 <template slot-scope="scope">
101
                 <template slot-scope="scope">
102
-                  <el-button type="primary" size="small" @click="getInventory(scope.row.id,scope.row.checker_status)">校对</el-button>
102
+                  <!-- <el-button type="primary" size="small" @click="getInventory(scope.row.id,scope.row.checker_status)">校对</el-button> -->
103
                   <el-button type="primary" size="small" @click="getInventoryDetail(scope.row.id,scope.row.checker_status)">编辑</el-button>
103
                   <el-button type="primary" size="small" @click="getInventoryDetail(scope.row.id,scope.row.checker_status)">编辑</el-button>
104
                   <el-button type="danger" size="small" @click="deleteInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
104
                   <el-button type="danger" size="small" @click="deleteInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
105
                 </template>
105
                 </template>
122
         width="1200px">
122
         width="1200px">
123
             <el-form :model="form" class="modifyDialog" label-width="120px">
123
             <el-form :model="form" class="modifyDialog" label-width="120px">
124
                 <el-form-item label="耗材ID">
124
                 <el-form-item label="耗材ID">
125
-                    <el-input v-model="form.good_id"></el-input>
125
+                    <el-input v-model="form.good_id" :disabled="true"></el-input>
126
                 </el-form-item>
126
                 </el-form-item>
127
                 <el-form-item label="耗材名称">
127
                 <el-form-item label="耗材名称">
128
                    <el-autocomplete
128
                    <el-autocomplete
143
                  </el-autocomplete>
143
                  </el-autocomplete>
144
                 </el-form-item>
144
                 </el-form-item>
145
                 <el-form-item label="规格">
145
                 <el-form-item label="规格">
146
-                    <el-input v-model="form.specification_name"></el-input>
146
+                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
147
                 </el-form-item>
147
                 </el-form-item>
148
                 <el-form-item label="批号">
148
                 <el-form-item label="批号">
149
-                  <el-select v-model="form.number" filterable placeholder="请选择">
149
+                  <el-select v-model="form.number" filterable placeholder="请选择" @change="changeNumber">
150
                       <el-option
150
                       <el-option
151
                         v-for="(item,index) in numberList"
151
                         v-for="(item,index) in numberList"
152
                         :key="index"
152
                         :key="index"
157
                 </el-form-item>
157
                 </el-form-item>
158
 
158
 
159
                 <el-form-item label="单位">
159
                 <el-form-item label="单位">
160
-                    <el-input v-model="form.warehousing_unit"></el-input>
160
+                    <el-input v-model="form.warehousing_unit" :disabled="true"></el-input>
161
                 </el-form-item>
161
                 </el-form-item>
162
                 <el-form-item label="进货价">
162
                 <el-form-item label="进货价">
163
-                    <el-input v-model="form.buy_price"></el-input>
163
+                    <el-input v-model="form.buy_price" :disabled="true"></el-input>
164
                 </el-form-item>
164
                 </el-form-item>
165
                 <el-form-item label="零售价">
165
                 <el-form-item label="零售价">
166
-                    <el-input v-model="form.packing_price"></el-input>
166
+                    <el-input v-model="form.packing_price" :disabled="true"></el-input>
167
                 </el-form-item>
167
                 </el-form-item>
168
                 <el-form-item label="盘点数量">
168
                 <el-form-item label="盘点数量">
169
                     <el-input v-model="form.count"></el-input>
169
                     <el-input v-model="form.count"></el-input>
170
                 </el-form-item>
170
                 </el-form-item>
171
                 <el-form-item label="库存">
171
                 <el-form-item label="库存">
172
-                    <el-input v-model="form.total"></el-input>
172
+                    <el-input v-model="form.total" :disabled="true"></el-input>
173
                 </el-form-item>
173
                 </el-form-item>
174
                 <el-form-item label="产地">
174
                 <el-form-item label="产地">
175
                     <el-input v-model="form.good_origin_place"></el-input>
175
                     <el-input v-model="form.good_origin_place"></el-input>
176
                 </el-form-item>
176
                 </el-form-item>
177
                 <el-form-item label="批准文号">
177
                 <el-form-item label="批准文号">
178
-                    <el-input v-model="form.license_number"></el-input>
178
+                    <el-input v-model="form.license_number" :disabled="true"></el-input>
179
                 </el-form-item>
179
                 </el-form-item>
180
                 <el-form-item label="生产厂商">
180
                 <el-form-item label="生产厂商">
181
-                    <el-input v-model="form.manufacturer"></el-input>
181
+                    <el-input v-model="form.manufacturer" :disabled="true"></el-input>
182
                 </el-form-item>
182
                 </el-form-item>
183
                 <el-form-item label="备注">
183
                 <el-form-item label="备注">
184
                     <div style="display:flex;">
184
                     <div style="display:flex;">
329
                     </template>
329
                     </template>
330
                     </el-autocomplete>
330
                     </el-autocomplete>
331
                 </el-form-item>
331
                 </el-form-item>
332
+               <el-form-item label="规格">
333
+                    <el-input v-model="form.specification_name" :disabled="true" style="width:200px"></el-input>
334
+                </el-form-item>
335
+                <el-form-item label="批号">
336
+                  <el-select v-model="form.number" filterable placeholder="请选择"  @change="changeNumber">
337
+                      <el-option
338
+                        v-for="(item,index) in numberList"
339
+                        :key="index"
340
+                        :label="item.number"
341
+                        :value="item.number">
342
+                      </el-option>
343
+                  </el-select>
344
+                </el-form-item>
345
+
346
+                <el-form-item label="单位">
347
+                    <el-input v-model="form.warehousing_unit" :disabled="true" style="width:200px"></el-input>
348
+                </el-form-item>
349
+                <el-form-item label="进货价">
350
+                    <el-input v-model="form.buy_price" :disabled="true" style="width:200px"></el-input>
351
+                </el-form-item>
352
+                <el-form-item label="零售价">
353
+                    <el-input v-model="form.packing_price" :disabled="true" style="width:200px"></el-input>
354
+                </el-form-item>
355
+                <el-form-item label="盘点数量">
356
+                    <el-input v-model="form.count" style="width:200px"></el-input>
357
+                </el-form-item>
358
+                <el-form-item label="库存">
359
+                    <el-input v-model="form.total" :disabled="true" style="width:200px"></el-input>
360
+                </el-form-item>
361
+                <el-form-item label="产地">
362
+                    <el-input v-model="form.good_origin_place" style="width:200px"></el-input>
363
+                </el-form-item>
364
+                <el-form-item label="批准文号">
365
+                    <el-input v-model="form.license_number" :disabled="true" style="width:200px"></el-input>
366
+                </el-form-item>
367
+                <el-form-item label="生产厂商">
368
+                    <el-input v-model="form.manufacturer" :disabled="true" style="width:200px"></el-input>
369
+                </el-form-item>
370
+                <el-form-item label="经销商">
371
+                    <el-input v-model="form.dealer" :disabled="true" style="width:200px"></el-input>
372
+                </el-form-item>
332
                <el-form-item label="盘点数量:">
373
                <el-form-item label="盘点数量:">
333
                  <el-input v-model="form.count" style="width:200px"></el-input>
374
                  <el-input v-model="form.count" style="width:200px"></el-input>
334
                </el-form-item>
375
                </el-form-item>
360
           <el-form  :model="form">
401
           <el-form  :model="form">
361
             <el-row>
402
             <el-row>
362
                <el-col>
403
                <el-col>
404
+                <el-form-item label="耗材名称:">
405
+                      <el-autocomplete
406
+                          class="checkSearch"
407
+                          popper-class="my-autocomplete"
408
+                          v-model="form.good_name"
409
+                          :fetch-suggestions="querySearchAsync"
410
+                          :trigger-on-focus="true"
411
+                          placeholder="请输入耗材名称"
412
+                          @select="handleSelect"
413
+                          @input="changeGoodName(scope.$index)"
414
+                          style="width:160px;"
415
+                      >
416
+                          <i class="el-icon-search el-input__icon" slot="suffix"></i>
417
+                      <template slot-scope="{ item }">
418
+                          <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
419
+                      </template>
420
+                      </el-autocomplete>
421
+                </el-form-item>
422
+                <el-form-item label="规格">
423
+                    <el-input v-model="form.specification_name" :disabled="true" style="width:200px"></el-input>
424
+                </el-form-item>
425
+                <el-form-item label="批号">
426
+                  <el-select v-model="form.number" filterable placeholder="请选择"  @change="changeNumber">
427
+                      <el-option
428
+                        v-for="(item,index) in numberList"
429
+                        :key="index"
430
+                        :label="item.number"
431
+                        :value="item.number">
432
+                      </el-option>
433
+                  </el-select>
434
+                </el-form-item>
435
+
436
+                <el-form-item label="单位">
437
+                    <el-input v-model="form.warehousing_unit" :disabled="true" style="width:200px"></el-input>
438
+                </el-form-item>
439
+                <el-form-item label="进货价">
440
+                    <el-input v-model="form.buy_price" :disabled="true" style="width:200px"></el-input>
441
+                </el-form-item>
442
+                <el-form-item label="零售价">
443
+                    <el-input v-model="form.packing_price" :disabled="true" style="width:200px"></el-input>
444
+                </el-form-item>
445
+                <el-form-item label="盘点数量">
446
+                    <el-input v-model="form.count" style="width:200px"></el-input>
447
+                </el-form-item>
448
+                <el-form-item label="库存">
449
+                    <el-input v-model="form.total" :disabled="true" style="width:200px"></el-input>
450
+                </el-form-item>
451
+                <el-form-item label="产地">
452
+                    <el-input v-model="form.good_origin_place" style="width:200px"></el-input>
453
+                </el-form-item>
454
+                <el-form-item label="批准文号">
455
+                    <el-input v-model="form.license_number" :disabled="true" style="width:200px"></el-input>
456
+                </el-form-item>
457
+                <el-form-item label="生产厂商">
458
+                    <el-input v-model="form.manufacturer" :disabled="true" style="width:200px"></el-input>
459
+                </el-form-item>
460
+                <el-form-item label="经销商">
461
+                    <el-input v-model="form.dealer" :disabled="true" style="width:200px"></el-input>
462
+                </el-form-item>
363
                <el-form-item label="盘点数量:">
463
                <el-form-item label="盘点数量:">
364
                  <el-input v-model="form.count" style="width:200px"></el-input>
464
                  <el-input v-model="form.count" style="width:200px"></el-input>
365
                </el-form-item>
465
                </el-form-item>
482
          dealerList:[],
582
          dealerList:[],
483
          goodList:[],
583
          goodList:[],
484
          currentIndex: 0,
584
          currentIndex: 0,
485
-         inventory_status:"",
585
+         inventory_status:0,
486
          limit:10,
586
          limit:10,
487
          page:1,
587
          page:1,
488
          doctorList:[],
588
          doctorList:[],
591
           this.getlist()
691
           this.getlist()
592
         },
692
         },
593
         addInventory(){
693
         addInventory(){
694
+           if(this.form.good_name == ""){
695
+             this.$message.error("请输入耗材名称")
696
+             return 
697
+           }
698
+           if(this.form.count == ""){
699
+             this.$message.error("请输入盘点数量")
700
+             return
701
+           }
594
            var obj = {
702
            var obj = {
595
             good_id:this.form.good_id,
703
             good_id:this.form.good_id,
596
             good_name:this.form.good_name,
704
             good_name:this.form.good_name,
643
          if(response.data.state == 1){
751
          if(response.data.state == 1){
644
            var msg = response.data.data.msg
752
            var msg = response.data.data.msg
645
            this.$message.success("保存成功")
753
            this.$message.success("保存成功")
754
+           this.tableData = []
755
+           this.form.good_id = ""
756
+           this.form.good_name = ""
757
+           this.form.specification_name = ""
758
+           this.form.manufacturer = ""
759
+           this.form.dealer = ""
760
+           this.form.good_origin_place = ""
761
+           this.form.buy_price = ""
762
+           this.form.packing_price = ""
763
+           this.form.count = ""
764
+           this.form.remark = ""
765
+           this.form.number = ""
646
            this.dialogVisible = false
766
            this.dialogVisible = false
647
            this.getlist()
767
            this.getlist()
648
          }
768
          }
719
      },
839
      },
720
      toEdit(row){
840
      toEdit(row){
721
       this.form.good_name = row.good_name
841
       this.form.good_name = row.good_name
842
+      this.form.specification_name = row.specification_name
843
+      this.form.number = row.number
844
+      this.form.warehousing_unit = row.warehousing_unit
845
+      this.form.manufacturer = row.manufacturer
846
+      this.form.dealer = row.dealer
847
+      this.form.buy_price = row.buy_price
848
+      this.form.packing_price = row.packing_price
849
+      this.form.good_origin_place = row.good_origin_place
722
       this.form.count = row.count
850
       this.form.count = row.count
723
       this.form.remark = row.remark
851
       this.form.remark = row.remark
724
       this.form.id = row.id
852
       this.form.id = row.id
728
        for(let i=0;i<this.tableData.length;i++){
856
        for(let i=0;i<this.tableData.length;i++){
729
          if(this.form.id == this.tableData[i].id){
857
          if(this.form.id == this.tableData[i].id){
730
             this.tableData[i].good_name = this.form.good_name
858
             this.tableData[i].good_name = this.form.good_name
731
-            // this.tableData[i].packing_price = this.form.packing_price
859
+            this.tableData[i].packing_price = this.form.packing_price
860
+            this.tableData[i].buy_price = this.form.buy_price
861
+            this.tableData[i].specification_name = this.form.specification_name
862
+            this.tableData[i].warehousing_unit = this.form.warehousing_unit
863
+            this.tableData[i].number = this.form.number
864
+            this.tableData[i].good_origin_place = this.form.good_origin_place
865
+            this.tableData[i].dealer = this.form.dealer
866
+            this.tableData[i].manufacturer = this.form.manufacturer
732
             this.tableData[i].count = this.form.count
867
             this.tableData[i].count = this.form.count
733
             this.tableData[i].remark = this.form.remark
868
             this.tableData[i].remark = this.form.remark
734
          }
869
          }
766
           if(response.data.state == 1){
901
           if(response.data.state == 1){
767
             var detail =  response.data.data.detail
902
             var detail =  response.data.data.detail
768
             console.log("detial",detail)
903
             console.log("detial",detail)
904
+            this.form.good_name = detail.good_name
905
+            this.form.good_id = detail.good_id
906
+            this.form.specification_name = detail.specification_name
907
+            this.form.number = detail.number
908
+            this.form.license_number = detail.license_number
909
+            this.form.good_origin_place = detail.good_origin_place
910
+            this.form.dealer = detail.dealer
911
+            this.form.manufacturer = detail.manufacturer
769
             this.form.count = detail.count
912
             this.form.count = detail.count
770
             this.form.remark = detail.remark
913
             this.form.remark = detail.remark
914
+            this.form.warehousing_info_id = detail.warehousing_info_id
771
             this.id = detail.id
915
             this.id = detail.id
916
+            this.form.buy_price = detail.buy_price
917
+            this.form.packing_price = detail.packing_price
918
+            this.form.warehousing_unit = detail.warehousing_unit
919
+            this.form.total = detail.total
772
             this.modefiyePriceDialogVisible = true
920
             this.modefiyePriceDialogVisible = true
773
 
921
 
774
           }
922
           }
777
      modifyInventory(){
925
      modifyInventory(){
778
          var params = {
926
          var params = {
779
            id:this.id,
927
            id:this.id,
928
+           good_id:this.form.good_id,
929
+           good_name:this.form.good_name,
930
+           specification_name:this.form.specification_name,
931
+           number:this.form.number,
932
+           warehousing_unit:this.form.warehousing_unit,
933
+           buy_price:this.form.buy_price.toString(),
934
+           packing_price:this.form.packing_price.toString(),
935
+           total:parseInt(this.form.total),
936
+           good_origin_place:this.form.good_origin_place,
937
+           license_number:this.form.license_number,
938
+           dealer:this.form.dealer,
939
+           manufacturer:this.form.manufacturer,
780
            count:parseInt(this.form.count),
940
            count:parseInt(this.form.count),
781
            remark:this.form.remark,
941
            remark:this.form.remark,
782
          }
942
          }
901
      changeEndTime(val){
1061
      changeEndTime(val){
902
        this.end_time = this.getTime(val)
1062
        this.end_time = this.getTime(val)
903
        this.getlist()
1063
        this.getlist()
1064
+     },
1065
+    changeNumber(val){
1066
+      
1067
+     for(let i=0;i<this.numberList.length;i++){
1068
+       if(val == this.numberList[i].number){
1069
+         this.form.warehousing_info_id = this.numberList[i].id
1070
+       }
904
      }
1071
      }
1072
+    }
905
     },
1073
     },
906
     created(){
1074
     created(){
907
       this.getlist()
1075
       this.getlist()

+ 139 - 7
src/xt_pages/stock/stockDamaged.vue ファイルの表示

54
               <template  slot-scope="scope">
54
               <template  slot-scope="scope">
55
                 {{getTime(scope.row.start_time)}}
55
                 {{getTime(scope.row.start_time)}}
56
                </template>    
56
                </template>    
57
+            </el-table-column>
58
+            <el-table-column prop="date" label="耗材名称"  align="center">
59
+              <template  slot-scope="scope">
60
+                {{scope.row.good_name}}
61
+               </template>    
62
+            </el-table-column>
63
+            <el-table-column prop="date" label="耗材规格"  align="center">
64
+              <template  slot-scope="scope">
65
+                {{scope.row.specification_name}}
66
+               </template>    
57
             </el-table-column>
67
             </el-table-column>
58
              <el-table-column prop="date" label="报损数量"  align="center">
68
              <el-table-column prop="date" label="报损数量"  align="center">
59
               <template  slot-scope="scope">
69
               <template  slot-scope="scope">
81
                 <span v-if="scope.row.checker_status == 2">未核对</span>
91
                 <span v-if="scope.row.checker_status == 2">未核对</span>
82
               </template>
92
               </template>
83
             </el-table-column>
93
             </el-table-column>
84
-            <el-table-column label="操作"  align="center">
94
+            <el-table-column label="操作"  align="center"  width="200" >
85
                 <template slot-scope="scope">
95
                 <template slot-scope="scope">
86
                 <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
96
                 <el-button type="primary" size="small" @click="editStockDamage(scope.row.id,scope.row.checker_status)">编辑</el-button>
87
                 <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
97
                 <el-button type="danger" size="small" @click="deleteStockDamage(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
132
                 <el-input v-model="form.specification_name" :disabled="true"></el-input>
142
                 <el-input v-model="form.specification_name" :disabled="true"></el-input>
133
             </el-form-item>
143
             </el-form-item>
134
             <el-form-item label="批号">
144
             <el-form-item label="批号">
135
-                 <el-select v-model="form.number" filterable placeholder="请选择">
145
+                 <el-select v-model="form.number" filterable placeholder="请选择"  @change="chageNumberlist">
136
                   <el-option
146
                   <el-option
137
                     v-for="(item,index) in numberList"
147
                     v-for="(item,index) in numberList"
138
                     :key="index"
148
                     :key="index"
287
 
297
 
288
 <!-- 编辑 -->
298
 <!-- 编辑 -->
289
       <el-dialog
299
       <el-dialog
290
-        title="编辑"
300
+        title="编辑报损"
291
         :visible.sync="editPriceDialogVisible"
301
         :visible.sync="editPriceDialogVisible"
292
         width="50%">
302
         width="50%">
293
         <span>
303
         <span>
316
                  <el-input v-model="form.specification_name" style="width:200px"></el-input>
326
                  <el-input v-model="form.specification_name" style="width:200px"></el-input>
317
                </el-form-item>
327
                </el-form-item>
318
                <el-form-item label="批号">
328
                <el-form-item label="批号">
319
-                 <el-select v-model="form.number" filterable placeholder="请选择">
329
+                 <el-select v-model="form.number" filterable placeholder="请选择"  @change="chageNumberlist">
320
                   <el-option
330
                   <el-option
321
                     v-for="(item,index) in numberList"
331
                     v-for="(item,index) in numberList"
322
                     :key="index"
332
                     :key="index"
326
                 </el-select>
336
                 </el-select>
327
               </el-form-item>
337
               </el-form-item>
328
               <el-form-item label="单位">
338
               <el-form-item label="单位">
329
-                 <el-input v-model="form.warehousing_unit"></el-input>
339
+                 <el-input v-model="form.warehousing_unit" style="width:200px" :disabled="true"></el-input>
340
+              </el-form-item>
341
+              <el-form-item label="进货价">
342
+                  <el-input v-model="form.buy_price" style="width:200px" :disabled="true"></el-input>
343
+              </el-form-item>
344
+              <el-form-item label="零售价">
345
+                  <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
346
+              </el-form-item>
347
+              <el-form-item label="库存">
348
+                  <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
349
+              </el-form-item>
350
+              <el-form-item label="产地">
351
+                  <el-input v-model="form.good_origin_place" style="width:200px" :disabled="true"></el-input>
352
+              </el-form-item>
353
+              <el-form-item label="批准文号">
354
+                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></el-input>
355
+              </el-form-item>
356
+              <el-form-item label="生产厂商">
357
+                  <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
358
+              </el-form-item>
359
+              <el-form-item label="供应商">
360
+                  <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
330
               </el-form-item>
361
               </el-form-item>
331
                 <el-form-item label="报损数量:">
362
                 <el-form-item label="报损数量:">
332
                  <el-input v-model="form.count" style="width:200px"></el-input>
363
                  <el-input v-model="form.count" style="width:200px"></el-input>
358
         <span>
389
         <span>
359
           <el-form  :model="form">
390
           <el-form  :model="form">
360
             <el-row>
391
             <el-row>
361
-               <el-col>
392
+             <el-col>
393
+                <el-form-item label="耗材名称:">
394
+                    <el-autocomplete
395
+                        class="checkSearch"
396
+                        popper-class="my-autocomplete"
397
+                        v-model="form.good_name"
398
+                        :fetch-suggestions="querySearchAsync"
399
+                        :trigger-on-focus="true"
400
+                        placeholder="请输入耗材名称"
401
+                        @select="handleSelect"
402
+                        @input="changeGoodName(scope.$index)"
403
+                        style="width:160px;"
404
+                    >
405
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
406
+                    <template slot-scope="{ item }">
407
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
408
+                    </template>
409
+                    </el-autocomplete>
410
+                </el-form-item>
411
+               <el-form-item label="规格:">
412
+                 <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
413
+               </el-form-item>
414
+               <el-form-item label="批号">
415
+                 <el-select v-model="form.number" filterable placeholder="请选择" @change="chageNumberlist">
416
+                  <el-option
417
+                    v-for="(item,index) in numberList"
418
+                    :key="index"
419
+                    :label="item.number"
420
+                    :value="item.number">
421
+                  </el-option>
422
+                </el-select>
423
+              </el-form-item>
424
+               <el-form-item label="单位">
425
+                 <el-input v-model="form.warehousing_unit" style="width:200px" :disabled="true"></el-input>
426
+              </el-form-item>
427
+              <el-form-item label="进货价">
428
+                  <el-input v-model="form.buy_price" style="width:200px" :disabled="true"></el-input>
429
+              </el-form-item>
430
+              <el-form-item label="零售价">
431
+                  <el-input v-model="form.packing_price" style="width:200px" :disabled="true"></el-input>
432
+              </el-form-item>
433
+              <el-form-item label="库存">
434
+                  <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
435
+              </el-form-item>
436
+              <el-form-item label="产地">
437
+                  <el-input v-model="form.good_origin_place" style="width:200px" :disabled="true"></el-input>
438
+              </el-form-item>
439
+              <el-form-item label="批准文号">
440
+                  <el-input v-model="form.license_number" style="width:200px" :disabled="true"></el-input>
441
+              </el-form-item>
442
+              <el-form-item label="生产厂商">
443
+                  <el-input v-model="form.manufacturer" style="width:200px" :disabled="true"></el-input>
444
+              </el-form-item>
445
+              <el-form-item label="供应商">
446
+                  <el-input v-model="form.dealer" style="width:200px" :disabled="true"></el-input>
447
+              </el-form-item>
362
                <el-form-item label="报损数量:">
448
                <el-form-item label="报损数量:">
363
                  <el-input v-model="form.count" style="width:200px"></el-input>
449
                  <el-input v-model="form.count" style="width:200px"></el-input>
364
                </el-form-item>
450
                </el-form-item>
519
           this.form.packing_price = val.packing_price
605
           this.form.packing_price = val.packing_price
520
           this.form.warehousing_order = val.warehousing_order
606
           this.form.warehousing_order = val.warehousing_order
521
           this.form.license_number = val.license_number
607
           this.form.license_number = val.license_number
522
-          this.form.dealer = val.dealer
608
+          if(this.form.dealer == 0){
609
+            this.form.dealer = ""
610
+          }else{
611
+            this.form.dealer = val.dealer
612
+          }
523
           this.form.manufacturer = val.manufacturer
613
           this.form.manufacturer = val.manufacturer
524
           this.form.specification_name = val.specification_name
614
           this.form.specification_name = val.specification_name
525
           this.form.remark = val.remark
615
           this.form.remark = val.remark
555
           warehousing_info_id:0,
645
           warehousing_info_id:0,
556
           product_date:this.form.product_date,
646
           product_date:this.form.product_date,
557
           expiry_date:this.form.expiry_date,
647
           expiry_date:this.form.expiry_date,
648
+          total:this.form.total,
558
         } 
649
         } 
559
         this.tableData.push(obj)
650
         this.tableData.push(obj)
560
         this.form.good_id = 0
651
         this.form.good_id = 0
572
         this.form.dealer = ""
663
         this.form.dealer = ""
573
         this.form.number = ""
664
         this.form.number = ""
574
         this.form.good_id = ""
665
         this.form.good_id = ""
666
+        this.form.total= ""
575
       },
667
       },
576
       saveReportStock(){
668
       saveReportStock(){
577
          for(let i = 0;i<this.tableData.length;i++){
669
          for(let i = 0;i<this.tableData.length;i++){
600
             tableData:this.tableData,
692
             tableData:this.tableData,
601
           }
693
           }
602
           console.log("params",params)
694
           console.log("params",params)
695
+       
603
         saveReportStock(params).then(response=>{
696
         saveReportStock(params).then(response=>{
604
            if(response.data.state == 1){
697
            if(response.data.state == 1){
605
              var msg = response.data.data.msg
698
              var msg = response.data.data.msg
715
       this.editPriceDialogVisible = true  
808
       this.editPriceDialogVisible = true  
716
      },
809
      },
717
      upatePrice(){
810
      upatePrice(){
811
+       if(this.form.count == ""){
812
+         this.$message.error("请输入报损数量")
813
+         return false
814
+       }
718
        for(let i=0;i<this.tableData.length;i++){
815
        for(let i=0;i<this.tableData.length;i++){
719
          if(this.form.id == this.tableData[i].id){
816
          if(this.form.id == this.tableData[i].id){
720
             this.tableData[i].good_name = this.form.good_name
817
             this.tableData[i].good_name = this.form.good_name
744
        getStockDamageDetail(id).then(response=>{
841
        getStockDamageDetail(id).then(response=>{
745
          if(response.data.state == 1){
842
          if(response.data.state == 1){
746
            var detail = response.data.data.detail
843
            var detail = response.data.data.detail
844
+           console.log("hhhhh32233223",detail)
747
            this.form.count = detail.count
845
            this.form.count = detail.count
846
+           this.form.good_name = detail.good_name
847
+           this.form.specification_name = detail.specification_name
848
+           this.form.total = detail.total
849
+           this.form.buy_price = detail.buy_price
850
+           this.form.packing_price = detail.packing_price
851
+           this.form.good_origin_place = detail.good_origin_place
852
+           this.form.warehousing_unit = detail.warehousing_unit
853
+           this.form.manufacturer = detail.manufacturer
854
+           this.form.dealer = detail.dealer
855
+           this.form.license_number = detail.license_number
856
+           this.form.number = detail.number
748
            this.id = detail.id
857
            this.id = detail.id
858
+           this.form.good_id = detail.good_id
859
+           this.form.warehousing_info_id = detail.warehousing_info_id
749
            this.modifyPriceDialogVisible = true
860
            this.modifyPriceDialogVisible = true
750
          }
861
          }
751
        })
862
        })
754
         var params = {
865
         var params = {
755
           count:parseInt(this.form.count),
866
           count:parseInt(this.form.count),
756
           id:this.id,
867
           id:this.id,
868
+          good_name:this.form.good_name,
869
+          specification_name:this.form.specification_name,
870
+          number:this.form.number,
871
+          warehousing_unit:this.form.warehousing_unit,
872
+          buy_price:this.form.buy_price.toString(),
873
+          packing_price:this.form.packing_price.toString(),
874
+          good_origin_place:this.form.good_origin_place,
875
+          manufacturer:this.form.manufacturer,
876
+          dealer:this.form.dealer,
877
+          license_number:this.form.license_number,
878
+          warehousing_info_id:this.form.warehousing_info_id,
879
+          good_id:this.form.good_id,
757
         }
880
         }
758
         console.log("param2323",params)
881
         console.log("param2323",params)
882
+       
759
        modifyPrice(params).then(response=>{
883
        modifyPrice(params).then(response=>{
760
          if(response.data.state ==1){
884
          if(response.data.state ==1){
761
            var adjust = response.data.data.adjust
885
            var adjust = response.data.data.adjust
850
      changeEndTime(val){
974
      changeEndTime(val){
851
        this.end_time = this.getTime(val)
975
        this.end_time = this.getTime(val)
852
        this.getlist()
976
        this.getlist()
977
+     },
978
+     chageNumberlist(val){
979
+       console.log("val2323322",val)
980
+       for(let i=0;i<this.numberList.length;i++){
981
+         if(this.numberList[i].number == val){
982
+            this.form.warehousing_info_id = this.numberList[i].id
983
+         }
984
+       }
853
      }
985
      }
854
     },
986
     },
855
     created(){
987
     created(){

+ 18 - 25
src/xt_pages/user/templateSummary.vue ファイルの表示

109
                   </div>
109
                   </div>
110
                 </div>
110
                 </div>
111
 
111
 
112
-                <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:
113
-                  <!-- {{editObj.template_plan_content}} -->
112
+                <!-- <div style="padding:10px;line-height:20px;">阶段小结个体化透析方案:
114
                   <span v-html="editObj.template_plan_content"></span>
113
                   <span v-html="editObj.template_plan_content"></span>
115
-                </div>
114
+                </div> -->
116
               </div>
115
               </div>
117
             </el-col>
116
             </el-col>
118
           </el-row>
117
           </el-row>
315
                     </keep-alive>
314
                     </keep-alive>
316
                      <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
315
                      <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
317
                   </el-row>
316
                   </el-row>
318
-                  <el-row>
317
+                  <!-- <el-row>
319
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
318
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
320
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
319
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
321
                         <el-option
320
                         <el-option
332
                                 v-bind:r_content="form.template_plan_content">
331
                                 v-bind:r_content="form.template_plan_content">
333
                         </editor>
332
                         </editor>
334
                     </keep-alive>
333
                     </keep-alive>
335
-                     <!-- <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input> -->
336
-                  </el-row>
334
+                    
335
+                  </el-row> -->
337
                   <el-row>
336
                   <el-row>
338
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
337
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
339
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
338
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
578
                         :value="item.value">
577
                         :value="item.value">
579
                         </el-option>
578
                         </el-option>
580
                      </el-select>
579
                      </el-select>
581
-                      <keep-alive>
582
-                        <editor ref="editor"
583
-                                id="edit_editor1"
580
+                       <keep-alive>
581
+                        <editor ref="edit_neditor"
582
+                                id="edit_editor2"
584
                                 style="width: 800px"
583
                                 style="width: 800px"
585
                                 v-bind:r_content="form.template_summary_content">
584
                                 v-bind:r_content="form.template_summary_content">
586
                         </editor>
585
                         </editor>
587
-                    </keep-alive>
586
+                      </keep-alive>
588
                      <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
587
                      <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input> -->
589
                   </el-row>
588
                   </el-row>
590
-                  <el-row>
589
+                  <!-- <el-row>
591
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
590
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
592
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
591
                      <el-select v-model="form.template_plan_id" placeholder="请选择" @change="changeTempalte">
593
                         <el-option
592
                         <el-option
604
                                 v-bind:r_content="form.template_plan_content">
603
                                 v-bind:r_content="form.template_plan_content">
605
                         </editor>
604
                         </editor>
606
                     </keep-alive>
605
                     </keep-alive>
607
-                     <!-- <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input> -->
608
-                  </el-row>
606
+                  </el-row> -->
609
                   <el-row>
607
                   <el-row>
610
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
608
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
611
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
609
                     <el-button type="primary" @click="toInspection">选择检验检查</el-button>
1294
         console.log("年",year)
1292
         console.log("年",year)
1295
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
1293
         var month = this.form.start_year+"-"+this.form.start_month+"-"+"01"
1296
         console.log("月",this.$refs)
1294
         console.log("月",this.$refs)
1297
-        console.log("hhhhhh",this.$refs.edit_neditor.content)
1298
-        console.log("ooooo",this.$refs.edit_neditorOne.content)
1295
+      
1299
 
1296
 
1300
          var params = {
1297
          var params = {
1301
             title:this.form.title,
1298
             title:this.form.title,
1316
             befor_weight:this.form.befor_weight.toString(),
1313
             befor_weight:this.form.befor_weight.toString(),
1317
             after_weight:this.form.after_weight.toString(),
1314
             after_weight:this.form.after_weight.toString(),
1318
             befor_pressure:this.form.befor_pressure,
1315
             befor_pressure:this.form.befor_pressure,
1319
-            // template_plan_content:this.form.template_plan_content,
1320
-            template_plan_content:this.$refs.edit_neditor.content,
1321
-            // template_inspection_content:JSON.stringify(this.form.template_inspection_content),
1316
+            template_plan_content:"",
1322
             admin_user_id:this.form.admin_user_id,
1317
             admin_user_id:this.form.admin_user_id,
1323
             record_time:this.form.record_time,
1318
             record_time:this.form.record_time,
1324
             after_pressure:this.form.after_pressure,
1319
             after_pressure:this.form.after_pressure,
1325
             template_summary_id:this.form.template_summary_id,
1320
             template_summary_id:this.form.template_summary_id,
1326
-            // template_summary_content:this.form.template_summary_content,
1327
-            template_summary_content:this.$refs.edit_neditorOne.content,
1321
+            template_summary_content:this.$refs.edit_neditor.content,
1328
             template_plan_id:this.form.template_plan_id,
1322
             template_plan_id:this.form.template_plan_id,
1329
             template_inspection_id:this.form.template_inspection_id,
1323
             template_inspection_id:this.form.template_inspection_id,
1330
             patient_id:parseInt(this.patient_id),
1324
             patient_id:parseInt(this.patient_id),
1515
                  this.form.template_plan_id = list.template_plan_id
1509
                  this.form.template_plan_id = list.template_plan_id
1516
                }
1510
                }
1517
 
1511
 
1518
-               console.log("hhhhhhhhh",list.template_plan_id)
1519
                this.form.template_summary_content =list.template_summary_content
1512
                this.form.template_summary_content =list.template_summary_content
1520
                if(list.template_summary_id == 0){
1513
                if(list.template_summary_id == 0){
1521
                  this.form.template_summary_id = ""
1514
                  this.form.template_summary_id = ""
1559
         if(this.form.template_plan_id == ""){
1552
         if(this.form.template_plan_id == ""){
1560
            this.form.template_plan_id = 0
1553
            this.form.template_plan_id = 0
1561
         }
1554
         }
1562
-        if(this.dialysis_count == ""){
1563
-            this.dialysis_count = 0
1555
+        if(this.form.dialysis_count == ""){
1556
+            this.form.dialysis_count = 0
1564
         }
1557
         }
1565
         var params = {
1558
         var params = {
1566
             id:this.form.id,
1559
             id:this.form.id,
1584
             befor_pressure:this.form.befor_pressure,
1577
             befor_pressure:this.form.befor_pressure,
1585
             // template_summary_content:this.form.template_summary_content,
1578
             // template_summary_content:this.form.template_summary_content,
1586
             // template_plan_content:this.form.template_plan_content,
1579
             // template_plan_content:this.form.template_plan_content,
1587
-            template_plan_content:this.$refs.editor.content,
1588
-            template_summary_content:this.$refs.editorOne.content,
1580
+            template_plan_content:"",
1581
+            template_summary_content:this.$refs.edit_neditor.content,
1589
             admin_user_id:this.form.admin_user_id,
1582
             admin_user_id:this.form.admin_user_id,
1590
             record_time:this.form.record_time,
1583
             record_time:this.form.record_time,
1591
             after_pressure:this.form.after_pressure,
1584
             after_pressure:this.form.after_pressure,

+ 3 - 3
src/xt_pages/user/templateSummaryPrint.vue ファイルの表示

72
           </div>
72
           </div>
73
         </div> 
73
         </div> 
74
       </div>
74
       </div>
75
-      <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
75
+      <!-- <div style="padding:20px 0;border-bottom:1px solid #000;min-height:200px;">
76
         <span style="font-weight:bold;">阶段小结个性化方案:</span>
76
         <span style="font-weight:bold;">阶段小结个性化方案:</span>
77
-        <!-- <div style="line-height:24px;">{{patientList.template_plan_content}}</div> -->
77
+      
78
          <div v-html="patientList.template_plan_content"></div>
78
          <div v-html="patientList.template_plan_content"></div>
79
-      </div>
79
+      </div> -->
80
      <div style="margin-top:10px;">
80
      <div style="margin-top:10px;">
81
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>  
81
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>  
82
        <span style="margin-left:20px;">记录时间:{{getTime(patientList.record_time)}}</span>  
82
        <span style="margin-left:20px;">记录时间:{{getTime(patientList.record_time)}}</span>  

+ 45 - 8
src/xt_pages/workforce/components/nextTableWeeks.vue ファイルの表示

58
     </div>
58
     </div>
59
     <div class="cell clearfix">
59
     <div class="cell clearfix">
60
       <div  class="title"><span class="name">分区</span> :</div>
60
       <div  class="title"><span class="name">分区</span> :</div>
61
-      <div class="time">
61
+      <!-- <div class="time">
62
         <ul class>
62
         <ul class>
63
           <li
63
           <li
64
             :class="item.id == zone ? 'active' : ''"
64
             :class="item.id == zone ? 'active' : ''"
69
             {{ item.name }}
69
             {{ item.name }}
70
           </li>
70
           </li>
71
         </ul>
71
         </ul>
72
-      </div>
72
+      </div> -->
73
+       <el-select v-model="zone" multiple placeholder="请选择" @change="changeZone">
74
+          <el-option
75
+            v-for="item in zoneList"
76
+            :key="item.id"
77
+            :label="item.name"
78
+            :value="item.id">
79
+          </el-option>
80
+       </el-select>
73
     </div>
81
     </div>
74
     <el-table
82
     <el-table
75
       :row-style="{ color: '#303133' }"
83
       :row-style="{ color: '#303133' }"
260
         {id:2,name:"未确认"},
268
         {id:2,name:"未确认"},
261
       ],
269
       ],
262
       zone:"",
270
       zone:"",
263
-      zoneList:[{id:0,name:"全部"}],
271
+      // zoneList:[{id:0,name:"全部"}],
272
+      zoneList:[],
264
     };
273
     };
265
   },
274
   },
266
   watch: {
275
   watch: {
274
 
283
 
275
   methods: {
284
   methods: {
276
     printAction() {
285
     printAction() {
286
+       var zone = this.zone
287
+        var newArr = []
288
+        for(let i=0;i<this.zoneList.length;i++){
289
+           newArr.push(this.zoneList[i].id)
290
+        }
291
+        var arr = newArr.join(",")
292
+        var str = ""
293
+        if(this.zone == 0){
294
+           str = arr  
295
+        }
296
+        if(zone != 0){
297
+          str = zone.join(",")
298
+        }
277
       this.$router.push({
299
       this.$router.push({
278
-        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+this.zone+"&prestatus="+this.pre_status
300
+        path: "/schedule/remind/print/next?week_type=" + this.week_type+"&week_time="+this.week_time+"&zone="+str+"&prestatus="+this.pre_status
279
       });
301
       });
280
     },
302
     },
281
    compare(property) {
303
    compare(property) {
289
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
311
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
290
         const end = moment().weekday(7).format('YYYY-MM-DD')
312
         const end = moment().weekday(7).format('YYYY-MM-DD')
291
         // console.log("start",moment(start).unix())
313
         // console.log("start",moment(start).unix())
292
-      
314
+        var zone = this.zone
315
+        var newArr = []
316
+        for(let i=0;i<this.zoneList.length;i++){
317
+           newArr.push(this.zoneList[i].id)
318
+        }
319
+        var arr = newArr.join(",")
320
+        var str = ""
321
+        if(this.zone == 0){
322
+           str = arr  
323
+        }
324
+        if(zone != 0){
325
+          str = zone.join(",")
326
+        }
293
         const params = {
327
         const params = {
294
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
328
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
295
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),
329
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),
296
           week_type:this.week_type,
330
           week_type:this.week_type,
297
           week_time:this.week_time,
331
           week_time:this.week_time,
298
-          zone:this.zone,
332
+          zone:str,
299
         }
333
         }
300
         // const params = {
334
         // const params = {
301
         //   start_time:1609603200,
335
         //   start_time:1609603200,
546
          if(response.data.state == 1){
580
          if(response.data.state == 1){
547
             var zonelist = response.data.data.zoneList
581
             var zonelist = response.data.data.zoneList
548
             this.zoneList.push(...zonelist)
582
             this.zoneList.push(...zonelist)
549
-           
583
+            this.getNextScheduleWeekDay()
550
          }
584
          }
551
       })
585
       })
552
     },
586
     },
574
         }
608
         }
575
        return name
609
        return name
576
     }, 
610
     }, 
611
+    changeZone(val){
612
+      this.zone = val
613
+      this.getNextScheduleWeekDay()
614
+    }
577
   },
615
   },
578
   components: {
616
   components: {
579
     WeekItem
617
     WeekItem
586
       this.week_type = 7;
624
       this.week_type = 7;
587
     }
625
     }
588
     this.getAllZoneList()
626
     this.getAllZoneList()
589
-    this.getNextScheduleWeekDay();
590
     this.org_id = this.$store.getters.xt_user.org.id
627
     this.org_id = this.$store.getters.xt_user.org.id
591
    
628
    
592
   }
629
   }

+ 68 - 12
src/xt_pages/workforce/components/tableWeeks.vue ファイルの表示

75
         </div>
75
         </div>
76
         <div class="cell clearfix">
76
         <div class="cell clearfix">
77
             <div class="title"><span class="name">分区</span> :</div>
77
             <div class="title"><span class="name">分区</span> :</div>
78
-            <div class="time">
78
+            <!-- <div class="time">
79
                 <ul class>
79
                 <ul class>
80
                     <li
80
                     <li
81
-                            :class="item.id == zone ? 'active' : ''"
81
+                          :class="item.id == zone ? 'active' : ''"
82
                             @click="selectZoneList(item.id)"
82
                             @click="selectZoneList(item.id)"
83
                             v-for="item in zoneList"
83
                             v-for="item in zoneList"
84
                             :key="item.id"
84
                             :key="item.id"
86
                         {{ item.name }}
86
                         {{ item.name }}
87
                     </li>
87
                     </li>
88
                 </ul>
88
                 </ul>
89
-            </div>
89
+            </div> -->
90
+            <el-select v-model="zone" multiple placeholder="请选择" @change="changeZone">
91
+              <el-option
92
+                v-for="item in zoneList"
93
+                :key="item.id"
94
+                :label="item.name"
95
+                :value="item.id">
96
+              </el-option>
97
+            </el-select>
90
         </div>
98
         </div>
91
         <el-table
99
         <el-table
92
                 v-loading="isloading"
100
                 v-loading="isloading"
437
           anticoagulant_zongliang: '',
445
           anticoagulant_zongliang: '',
438
           doctor_advice: ''
446
           doctor_advice: ''
439
         },
447
         },
440
-        zone: 0,
441
-        zoneList: [{ id: 0, name: '全部' }],
442
-        summarySchData: []
448
+        // zone: 0,
449
+        // zoneList: [{ id: 0, name: '全部' }],
450
+        summarySchData: [],
451
+        zone:0,
452
+        zoneList:[],
443
       }
453
       }
444
     },
454
     },
445
     watch: {
455
     watch: {
844
       }
854
       }
845
       ,
855
       ,
846
       printAction() {
856
       printAction() {
857
+        var zone = this.zone
858
+        var newArr = []
859
+        for(let i=0;i<this.zoneList.length;i++){
860
+           newArr.push(this.zoneList[i].id)
861
+        }
862
+        var arr = newArr.join(",")
863
+        var str = ""
864
+        if(this.zone == 0){
865
+           str = arr  
866
+        }
867
+        if(zone != 0){
868
+          str = zone.join(",")
869
+        }
847
         this.$router.push({
870
         this.$router.push({
848
-          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + this.zone
871
+          path: '/schedule/remind/print?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str
849
         })
872
         })
850
       }
873
       }
851
       ,
874
       ,
852
       signPrint() {
875
       signPrint() {
876
+        var zone = this.zone
877
+        var newArr = []
878
+        for(let i=0;i<this.zoneList.length;i++){
879
+           newArr.push(this.zoneList[i].id)
880
+        }
881
+        var arr = newArr.join(",")
882
+        var str = ""
883
+        if(this.zone == 0){
884
+           str = arr  
885
+        }
886
+        if(zone != 0){
887
+          str = zone.join(",")
888
+        }
853
         this.$router.push({
889
         this.$router.push({
854
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + this.zone + '&prestatus=' + this.pre_status
890
+          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status
855
         })
891
         })
856
       }
892
       }
857
       ,
893
       ,
915
       ,
951
       ,
916
 
952
 
917
       getScheduleList() {
953
       getScheduleList() {
954
+        
955
+        var zone = this.zone
956
+        var newArr = []
957
+        for(let i=0;i<this.zoneList.length;i++){
958
+           newArr.push(this.zoneList[i].id)
959
+        }
960
+        var arr = newArr.join(",")
961
+        var str = ""
962
+        if(this.zone == 0){
963
+           str = arr  
964
+        }
965
+        if(zone != 0){
966
+          str = zone.join(",")
967
+        }
918
         const params = {
968
         const params = {
919
           week_type: this.week_type,
969
           week_type: this.week_type,
920
           week_time: this.week_time,
970
           week_time: this.week_time,
921
-          zone: this.zone
971
+          zone: str,
922
         }
972
         }
973
+        console.log("param",params)
923
         this.scheduleData = []
974
         this.scheduleData = []
924
         this.isloading = true
975
         this.isloading = true
925
         getScheduleList(params).then(response => {
976
         getScheduleList(params).then(response => {
1433
           if (response.data.state == 1) {
1484
           if (response.data.state == 1) {
1434
             var zonelist = response.data.data.zoneList
1485
             var zonelist = response.data.data.zoneList
1435
             this.zoneList.push(...zonelist)
1486
             this.zoneList.push(...zonelist)
1436
-
1487
+            this.getScheduleList()
1437
           }
1488
           }
1438
         })
1489
         })
1439
       }
1490
       }
1464
         }
1515
         }
1465
         console.log('name', name)
1516
         console.log('name', name)
1466
         return name
1517
         return name
1518
+      },
1519
+      changeZone(val){
1520
+        this.zone = val
1521
+        this.getScheduleList()
1467
       }
1522
       }
1468
     },
1523
     },
1469
     components: {
1524
     components: {
1471
     }
1526
     }
1472
     ,
1527
     ,
1473
     created() {
1528
     created() {
1529
+      this.getAllZoneList()
1474
       this.modeOptions = this.$store.getters.treatment_mode
1530
       this.modeOptions = this.$store.getters.treatment_mode
1475
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
1531
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
1476
       this.week_type = new Date().getDay()
1532
       this.week_type = new Date().getDay()
1478
         this.week_type = 7
1534
         this.week_type = 7
1479
       }
1535
       }
1480
       this.org_id = this.$store.getters.xt_user.org.id
1536
       this.org_id = this.$store.getters.xt_user.org.id
1481
-      this.getScheduleList()
1482
-      this.getAllZoneList()
1537
+     
1538
+     
1483
     }
1539
     }
1484
   }
1540
   }
1485
 </script>
1541
 </script>