Browse Source

bug修改

mainqaq 2 years ago
parent
commit
9afa034d21

+ 17 - 0
src/api/stock.js View File

56
   })
56
   })
57
 }
57
 }
58
 
58
 
59
+
59
 export function getManufacturerList(params) {
60
 export function getManufacturerList(params) {
60
   return request({
61
   return request({
61
     url: '/api/stock/manufacturer/list',
62
     url: '/api/stock/manufacturer/list',
993
     params: params
994
     params: params
994
   })
995
   })
995
 }
996
 }
997
+
998
+export function getdealername(params) {
999
+  return request({
1000
+    url: '/api/stock/dealer/getdealername',
1001
+    method: 'Get',
1002
+    params: params
1003
+  })
1004
+}
1005
+
1006
+export function getmanufacturername(params) {
1007
+  return request({
1008
+    url: '/api/stock/manufacturer/getmanufacturername',
1009
+    method: 'get',
1010
+    params: params
1011
+  })
1012
+}

+ 2 - 2
src/xt_pages/DepositManagement/DepositRefund.vue View File

396
     // 审核通过
396
     // 审核通过
397
     pass_exam() {
397
     pass_exam() {
398
       if(this.multipleSelection.length < 1){
398
       if(this.multipleSelection.length < 1){
399
-        alert("未选择任何信息")
399
+        this.$message.error("未选择任何信息")
400
         return
400
         return
401
       }
401
       }
402
       var tmp = "";
402
       var tmp = "";
422
     // 审核拒绝
422
     // 审核拒绝
423
     reject_exam() {
423
     reject_exam() {
424
       if(this.multipleSelection.length < 1){
424
       if(this.multipleSelection.length < 1){
425
-        alert("未选择任何信息")
425
+        this.$message.error("未选择任何信息")
426
         return
426
         return
427
       }
427
       }
428
       var tmp = "";
428
       var tmp = "";

+ 6 - 4
src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue View File

873
     methods: {
873
     methods: {
874
       //调试
874
       //调试
875
       lili(index,row){
875
       lili(index,row){
876
+        // console.log("==index==",index)
877
+        // console.log("==row==",row)
876
         console.log("==doctor_advices==",this.doctor_advices)
878
         console.log("==doctor_advices==",this.doctor_advices)
877
         console.log("==this.form==",this.form)
879
         console.log("==this.form==",this.form)
878
       },
880
       },
988
       },
990
       },
989
       submitEditAdvice() {
991
       submitEditAdvice() {
990
         // console.log()
992
         // console.log()
993
+        console.log("保存22222222222222")
994
+        console.log("==this.src_type==",this.src_type)
991
         if (this.form.advice_name.length == 0) {
995
         if (this.form.advice_name.length == 0) {
992
           this.$message.error('请填写医嘱名称')
996
           this.$message.error('请填写医嘱名称')
993
           return
997
           return
1021
               this.showAdviceForm = false
1025
               this.showAdviceForm = false
1022
               this.showAdvicePanel = true
1026
               this.showAdvicePanel = true
1023
               var advice = response.data.data.advice
1027
               var advice = response.data.data.advice
1024
-              console.log("advic323323232323232",advice)
1025
               this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec
1028
               this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec
1026
               this.doctor_advices[this.currentIndex].drug_spec_unit =
1029
               this.doctor_advices[this.currentIndex].drug_spec_unit =
1027
                 advice.drug_spec_unit
1030
                 advice.drug_spec_unit
1347
                     }
1350
                     }
1348
                   }
1351
                   }
1349
                   this.execTimeDialogVisible = false
1352
                   this.execTimeDialogVisible = false
1350
-                  
1351
                   return false
1353
                   return false
1352
               }
1354
               }
1353
 
1355
 
1412
               this.hideForm()
1414
               this.hideForm()
1413
               console.log("子药23223332323332",this.form.parent_id)
1415
               console.log("子药23223332323332",this.form.parent_id)
1414
               console.log("232322332323232",this.form.parent_id)
1416
               console.log("232322332323232",this.form.parent_id)
1415
-           
1417
+
1416
               if (this.form.parent_id > 0) {
1418
               if (this.form.parent_id > 0) {
1417
                 var spliceIndex = -1
1419
                 var spliceIndex = -1
1418
                 for (let index = this.doctor_advices.length - 1; ; index--) {
1420
                 for (let index = this.doctor_advices.length - 1; ; index--) {
1436
                       this.doctor_advices.push(swapData[index])
1438
                       this.doctor_advices.push(swapData[index])
1437
                     }
1439
                     }
1438
                   }
1440
                   }
1439
-                 
1441
+
1440
                   console.log("doctore_advic4233232323232",this.doctor_advices)
1442
                   console.log("doctore_advic4233232323232",this.doctor_advices)
1441
                 }
1443
                 }
1442
               } else {
1444
               } else {

+ 62 - 1
src/xt_pages/stock/config/dealer.vue View File

1
 <template>
1
 <template>
2
+<!--  专用字典中的经销商-->
2
   <div class=" sign-and-weigh-box" style="background: white">
3
   <div class=" sign-and-weigh-box" style="background: white">
3
     <manufacturer-or-dealer-dialog
4
     <manufacturer-or-dealer-dialog
4
       ref="dialog"
5
       ref="dialog"
16
         <!--<el-button type="primary" style="float:right;"  @click="showDialog">新增经销商</el-button>-->
17
         <!--<el-button type="primary" style="float:right;"  @click="showDialog">新增经销商</el-button>-->
17
 
18
 
18
         <div>
19
         <div>
20
+
21
+          <el-select v-model="key" clearable filterable placeholder="请输入经销商名称" @change="handleSelect" ><!--@change="updateconfig1(h1)"-->
22
+            <el-option
23
+              v-for="item in namelist"
24
+              :key="item.id"
25
+              :label="item.dealer_name"
26
+              :value="item.id"
27
+            >
28
+            </el-option>
29
+          </el-select>
30
+          <el-button
31
+            size="small"
32
+            class="filter-item"
33
+            type="primary"
34
+            icon="el-icon-search"
35
+            @click="search"
36
+          >查询</el-button>
37
+
19
           <el-button
38
           <el-button
20
             size="small"
39
             size="small"
21
             icon="el-icon-circle-plus-outline"
40
             icon="el-icon-circle-plus-outline"
134
   modifyDealer,
153
   modifyDealer,
135
   getDealersList,
154
   getDealersList,
136
   deleteDealer,
155
   deleteDealer,
137
-  GetDealer
156
+  GetDealer,
157
+  getdealername
138
 } from "@/api/stock";
158
 } from "@/api/stock";
139
 
159
 
140
 export default {
160
 export default {
144
   name: "dealer",
164
   name: "dealer",
145
   data() {
165
   data() {
146
     return {
166
     return {
167
+      key:"",
168
+      namelist:[],
147
       thedefaultActive: "1-2",
169
       thedefaultActive: "1-2",
148
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
170
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
149
       dealerData: [],
171
       dealerData: [],
191
     };
213
     };
192
   },
214
   },
193
   methods: {
215
   methods: {
216
+    //初始化供应商列表
217
+    init(){
218
+      // alert("!!!")
219
+      this.key = ""
220
+      var params = {}
221
+      getdealername(params).then(res => {
222
+        if (res.data.state == 1){
223
+          this.namelist = res.data.data.list
224
+        }
225
+      })
226
+    },
227
+    handleSelect(){
228
+      // this.key = val.id
229
+      console.log("this.key",this.key)
230
+    },
231
+    search(){
232
+      let params = {
233
+        page: this.page,
234
+        limit: this.limit,
235
+        key: this.key
236
+      };
237
+      this.loading = true;
238
+      getDealersList(params).then(response => {
239
+        if (response.data.state == 0) {
240
+          this.loading = false;
241
+
242
+          this.$message.error(response.data.msg);
243
+          return false;
244
+        } else {
245
+          this.loading = false;
246
+          this.total = response.data.data.total;
247
+          this.dealerData = [];
248
+          for (let i = 0; i < response.data.data.dealer.length; i++) {
249
+            this.dealerData.push(response.data.data.dealer[i]);
250
+          }
251
+        }
252
+      });
253
+    },
194
     handleEdit: function(index, row) {
254
     handleEdit: function(index, row) {
195
       this.editId = row.id;
255
       this.editId = row.id;
196
       this.editIndex = index;
256
       this.editIndex = index;
392
   },
452
   },
393
   created() {
453
   created() {
394
     this.getList();
454
     this.getList();
455
+    this.init();
395
   }
456
   }
396
 };
457
 };
397
 </script>
458
 </script>

+ 57 - 1
src/xt_pages/stock/config/manufacturer.vue View File

1
 <template>
1
 <template>
2
+<!--  专用字典的生产厂家-->
2
   <div class="main-contain">
3
   <div class="main-contain">
3
     <div class=" sign-and-weigh-box" style="background: white">
4
     <div class=" sign-and-weigh-box" style="background: white">
4
       <manufacturer-or-dealer-dialog
5
       <manufacturer-or-dealer-dialog
15
       <el-row :gutter="15">
16
       <el-row :gutter="15">
16
         <el-col>
17
         <el-col>
17
           <div>
18
           <div>
19
+
20
+            <el-select v-model="key" clearable filterable placeholder="请输入生产厂商名称" @change="handleSelect" ><!--@change="updateconfig1(h1)"-->
21
+              <el-option
22
+                v-for="item in namelist"
23
+                :key="item.id"
24
+                :label="item.manufacturer_name"
25
+                :value="item.id"
26
+              >
27
+              </el-option>
28
+            </el-select>
29
+            <el-button
30
+              size="small"
31
+              class="filter-item"
32
+              type="primary"
33
+              icon="el-icon-search"
34
+              @click="search"
35
+            >查询</el-button>
36
+
18
             <el-button
37
             <el-button
19
               size="small"
38
               size="small"
20
               icon="el-icon-circle-plus-outline"
39
               icon="el-icon-circle-plus-outline"
131
   deleteManufacturer,
150
   deleteManufacturer,
132
   GetManufacturer,
151
   GetManufacturer,
133
   getManufacturerList,
152
   getManufacturerList,
134
-  modifyManufacturer
153
+  modifyManufacturer,
154
+  getmanufacturername
135
 } from "@/api/stock";
155
 } from "@/api/stock";
136
 
156
 
137
 export default {
157
 export default {
141
   name: "manufacturer",
161
   name: "manufacturer",
142
   data() {
162
   data() {
143
     return {
163
     return {
164
+      key:"",
165
+      namelist:[],
144
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
166
       signAndWeighBoxPatients: "sign-and-weigh-box-patients",
145
       manufacturerData: [],
167
       manufacturerData: [],
146
       total: 0,
168
       total: 0,
188
     };
210
     };
189
   },
211
   },
190
   methods: {
212
   methods: {
213
+    //初始化供应商列表
214
+    init(){
215
+      // alert("!!!")
216
+      this.key = ""
217
+      var params = {}
218
+      getmanufacturername(params).then(res => {
219
+        if (res.data.state == 1){
220
+          this.namelist = res.data.data.list
221
+        }
222
+      })
223
+    },
224
+    search(){
225
+      let params = {
226
+        page: this.page,
227
+        limit: this.limit,
228
+        key: this.key
229
+      };
230
+      this.loading = true;
231
+      getManufacturerList(params).then(response => {
232
+        if (response.data.state == 0) {
233
+          this.loading = false;
234
+          this.$message.error(response.data.msg);
235
+          return false;
236
+        } else {
237
+          this.loading = false;
238
+          this.total = response.data.data.total;
239
+          this.manufacturerData = [];
240
+          for (let i = 0; i < response.data.data.manufacturer.length; i++) {
241
+            this.manufacturerData.push(response.data.data.manufacturer[i]);
242
+          }
243
+        }
244
+      });
245
+    },
191
     handleEdit: function(index, row) {
246
     handleEdit: function(index, row) {
192
       this.editId = row.id;
247
       this.editId = row.id;
193
       this.editIndex = index;
248
       this.editIndex = index;
394
   },
449
   },
395
   created() {
450
   created() {
396
     this.getList();
451
     this.getList();
452
+    this.init();
397
   }
453
   }
398
 };
454
 };
399
 </script>
455
 </script>

+ 27 - 5
src/xt_pages/user/doctorAdvice.vue View File

671
                   </template>
671
                   </template>
672
                 </el-table-column>
672
                 </el-table-column>
673
                 <el-table-column
673
                 <el-table-column
674
-                  label="开药数量!"
674
+                  label="开药数量"
675
                   min-width="80"
675
                   min-width="80"
676
                   property="prescribing_number"
676
                   property="prescribing_number"
677
                   align="center"
677
                   align="center"
690
                   align="center"
690
                   align="center"
691
                 >
691
                 >
692
                   <template slot-scope="scope">
692
                   <template slot-scope="scope">
693
-                    <span v-if="scope.row.single_dose != 0"
694
-                      >{{ scope.row.single_dose
695
-                      }}{{ scope.row.single_dose_unit }}</span
696
-                    >
693
+<!--                    <span v-if="scope.row.single_dose != 0">{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>-->
694
+                    <span v-if="scope.row.single_dose != 0">
695
+<!--                    {{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}-->
696
+                    <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
697
+                    <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
698
+                    <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
699
+                    <span v-else-if="scope.row.single_dose_unit == 4" >{{ scope.row.single_dose}}ml</span>
700
+                    <span v-else-if="scope.row.single_dose_unit == 5" >{{ scope.row.single_dose}}万U</span>
701
+                    <span v-else-if="scope.row.single_dose_unit == 6" >{{ scope.row.single_dose}}枚</span>
702
+                    <span v-else-if="scope.row.single_dose_unit == 7" >{{ scope.row.single_dose}}粒</span>
703
+                    <span v-else-if="scope.row.single_dose_unit == 8" >{{ scope.row.single_dose}}片</span>
704
+                    <span v-else-if="scope.row.single_dose_unit == 9" >{{ scope.row.single_dose}}支</span>
705
+                    <span v-else-if="scope.row.single_dose_unit == 10" >{{ scope.row.single_dose}}ug</span>
706
+                    <span v-else-if="scope.row.single_dose_unit == 11" >{{ scope.row.single_dose}}iu</span>
707
+                    <span v-else-if="scope.row.single_dose_unit == 12" >{{ scope.row.single_dose}}包</span>
708
+                    <span v-else-if="scope.row.single_dose_unit == 13" >{{ scope.row.single_dose}}袋</span>
709
+                    <span v-else-if="scope.row.single_dose_unit == 14" >{{ scope.row.single_dose}}万</span>
710
+                    <span v-else-if="scope.row.single_dose_unit == 15" >{{ scope.row.single_dose}}万iu</span>
711
+                    <span v-else-if="scope.row.single_dose_unit == 16" >{{ scope.row.single_dose}}丸</span>
712
+                    <span v-else-if="scope.row.single_dose_unit == 17" >{{ scope.row.single_dose}}盒</span>
713
+                    <span v-else-if="scope.row.single_dose_unit == 18" >{{ scope.row.single_dose}}瓶</span>
714
+                    <span v-else-if="scope.row.single_dose_unit == 19" >{{ scope.row.single_dose}}瓶(袋)</span>
715
+                    <span v-else-if="scope.row.single_dose_unit == 20" >{{ scope.row.single_dose}}次</span>
716
+                    <span v-else >{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>
717
+                  </span>
718
+
697
                   </template>
719
                   </template>
698
                 </el-table-column>
720
                 </el-table-column>
699
                 <el-table-column
721
                 <el-table-column