Browse Source

Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

yq1 4 weeks ago
parent
commit
3fd9db4996

+ 42 - 42
src/router/modules/charging.js View File

@@ -12,47 +12,47 @@ export default {
12 12
     title:'charging',
13 13
     icon: 'statistics'
14 14
   },
15
-  // children: [
16
-  //   {
17
-  //     path: '/dialysis/charging',
18
-  //     component: () => import('@/xt_pages/charging/index'),
19
-  //     name: '计费查询',
20
-  //     meta: {
21
-  //       title: '计费查询',
22
-  //       noCache: true
23
-  //     }
24
-  //   },
25
-  //   {
26
-  //     path: '/dialysis/charging_cz',
27
-  //     component: () => import('@/xt_pages/charging/charging_cz'),
28
-  //     name: '计费充值',
29
-  //     is_menu: false,
30
-  //     hidden: true,
31
-  //     meta: {
32
-  //       title: '计费充值',
33
-  //       noCache: true
34
-  //     }
35
-  //   },
36
-  //   {
37
-  //     path: '/dialysis/chargin_kf',
38
-  //     component: () => import('@/xt_pages/charging/chargin_kf'),
39
-  //     name: '计数扣费',
40
-  //     is_menu: false,
41
-  //     hidden: true,
42
-  //     meta: {
43
-  //       title: '计数扣费',
44
-  //       noCache: true
45
-  //     }
46
-  //   },
47
-  //   {
48
-  //     path: '/dialysis/charging_collect',
49
-  //     component: () => import('@/xt_pages/charging/charging_collect'),
50
-  //     name: '计费汇总',
51
-  //     meta: {
52
-  //       title: '计费汇总',
53
-  //       noCache: true
54
-  //     }
55
-  //   },
56
-  // ]
15
+  children: [
16
+    {
17
+      path: '/dialysis/charging',
18
+      component: () => import('@/xt_pages/charging/index'),
19
+      name: '计费查询',
20
+      meta: {
21
+        title: '计费查询',
22
+        noCache: true
23
+      }
24
+    },
25
+    {
26
+      path: '/dialysis/charging_cz',
27
+      component: () => import('@/xt_pages/charging/charging_cz'),
28
+      name: '计费充值',
29
+      is_menu: false,
30
+      hidden: true,
31
+      meta: {
32
+        title: '计费充值',
33
+        noCache: true
34
+      }
35
+    },
36
+    {
37
+      path: '/dialysis/chargin_kf',
38
+      component: () => import('@/xt_pages/charging/chargin_kf'),
39
+      name: '计数扣费',
40
+      is_menu: false,
41
+      hidden: true,
42
+      meta: {
43
+        title: '计数扣费',
44
+        noCache: true
45
+      }
46
+    },
47
+    {
48
+      path: '/dialysis/charging_collect',
49
+      component: () => import('@/xt_pages/charging/charging_collect'),
50
+      name: '计费汇总',
51
+      meta: {
52
+        title: '计费汇总',
53
+        noCache: true
54
+      }
55
+    },
56
+  ]
57 57
  
58 58
 }

+ 64 - 9
src/xt_pages/charging/charging_cz.vue View File

@@ -78,32 +78,38 @@
78 78
           <el-form-item label="患者姓名:">
79 79
             <el-autocomplete
80 80
               class="inline-input"
81
-              v-model="state1"
81
+               v-model.trim="smart_keyword"
82 82
               :fetch-suggestions="querySearch"
83 83
               placeholder="请输入内容"
84 84
               @select="handleSelect"
85
-            ></el-autocomplete>
85
+              
86
+            >
87
+           <i class="el-icon-search el-input__icon" slot="suffix"></i>
88
+          <template slot-scope="{ item }">
89
+            <div class="name">{{ item.name }}</div>
90
+          </template>
91
+          </el-autocomplete>
86 92
           </el-form-item>
87 93
           <el-form-item label="HD:">
88
-            <el-input v-model="formLabelAlign.region"></el-input>
94
+            <el-input v-model="hd_count"></el-input>
89 95
           </el-form-item>
90 96
           <el-form-item label="HDF:">
91
-            <el-input v-model="formLabelAlign.type"></el-input>
97
+            <el-input v-model="hdf_count"></el-input>
92 98
           </el-form-item>
93 99
           <el-form-item label="HD+HP:">
94
-            <el-input v-model="formLabelAlign.type"></el-input>
100
+            <el-input v-model="hdhp_count"></el-input>
95 101
           </el-form-item>
96 102
           <el-form-item label="HP:">
97
-            <el-input v-model="formLabelAlign.type"></el-input>
103
+            <el-input v-model="hp_count"></el-input>
98 104
           </el-form-item>
99 105
           <el-form-item label="其他:">
100
-            <el-input v-model="formLabelAlign.type"></el-input>
106
+            <el-input v-model="other_count"></el-input>
101 107
           </el-form-item>
102 108
           <el-form-item label="备注:">
103 109
             <el-input type="textarea" :rows="2" v-model="formLabelAlign.type"></el-input>
104 110
           </el-form-item>
105 111
           <el-form-item>
106
-            <el-button type="primary" @click="newcz_show = false">确 定</el-button>
112
+            <el-button type="primary" @click="savePatentCount">保 存</el-button>
107 113
             <el-button @click="newcz_show = false">取 消</el-button>
108 114
           </el-form-item>
109 115
         </el-form>
@@ -112,6 +118,8 @@
112 118
   </div>
113 119
 </template>
114 120
 <script>
121
+  import {getPatientMapList,savePatentCount } from "@/api/patient"
122
+  import BreadCrumb from "@/xt_pages/components/bread-crumb";
115 123
   export default{
116 124
     data(){
117 125
       return{
@@ -125,13 +133,42 @@
125 133
         formLabelAlign:{
126 134
 
127 135
         },
136
+        smart_keyword:"",
128 137
         currentPage:1,
129 138
         tableData: [{ index: 1, name: '小米', HD: 1, HDF: 1, 'HD+HP': 1, 'qita': 1,examine:false }],
139
+        patient_id:0,
140
+        hd_count:"1",
141
+        hdf_count:"1",
142
+        hdhp_count:"1",
143
+        hp_count:"1",
144
+        other_count:"0",
130 145
       }
131 146
     },
132 147
     methods:{
148
+      handleSelect(val){
149
+        this.smart_keyword = val.name;
150
+        this.patient_id = val.id
151
+      },
133 152
       querySearch(queryString, cb){
134
-
153
+        let key = ''
154
+        if (queryString != undefined) {
155
+          key = queryString
156
+        }
157
+        let searchArray = []
158
+         var  params = {
159
+          keyword:key
160
+         }
161
+        getPatientMapList(params).then(response => {
162
+          if (response.data.state == 1) {
163
+            searchArray = response.data.data.patient
164
+            console.log("searchArray-------------",searchArray)
165
+            cb(searchArray)
166
+          } else {
167
+            this.$message.error(response.data.msg)
168
+            cb([])
169
+          }
170
+        })
171
+        return searchArray
135 172
       },
136 173
       cz_click(row){
137 174
         row.examine=true
@@ -142,6 +179,24 @@
142 179
       handleCurrentChange(){
143 180
 
144 181
       },
182
+      savePatentCount(){
183
+         
184
+        var params = {
185
+          patient_id:this.patient_id,
186
+          hd_count:this.hd_count,
187
+          hdf_count:this.hdf_count,
188
+          hdhp_count:this.hdhp_count,
189
+          hp_count:this.hp_count,
190
+          other_count:this.other_count,
191
+        }
192
+       savePatentCount(params).then(response=>{
193
+
194
+       }) 
195
+      }
196
+     
197
+    },
198
+    created(){
199
+     
145 200
     }
146 201
   }
147 202
 </script>

+ 2 - 2
src/xt_pages/stock/detail/stockOutDetail.vue View File

@@ -1043,13 +1043,13 @@ export default {
1043 1043
         if(this.orgId  == 10265 || this.orgId ==10215 || this.orgId == 9919 || this.orgId == 9671 || this.orgId == 10402 || this.orgId==10138 || this.orgId==10278||this.orgId==10537||this.orgId==10610){
1044 1044
             this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
1045 1045
         }
1046
-        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721 || this.orgId == 10633 || this.orgId == 0){
1046
+        if(this.orgId == 10210 || this.orgId == 9675  || this.orgId == 9956 || this.orgId == 10217 || this.orgId == 10188 || this.orgId == 10191 || this.orgId ==10489 || this.orgId == 10375 || this.orgId == 10485 || this.orgId ==10635 || this.orgId ==10726 || this.orgId == 10724 || this.orgId ==10635 || this.orgId ==10724 || this.orgId ==10726 || this.orgId ==10721 || this.orgId == 10633 || this.orgId == 0  || this.orgId == 10387){
1047 1047
           this.tableOut[i].out_count = this.getWarehouseOut(this.tableOut[i].good_id)
1048 1048
         }
1049 1049
         if(this.orgId ==10445){
1050 1050
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
1051 1051
         }
1052
-        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721 && this.orgId!=10633 && this.orgId!=0){
1052
+        if(this.orgId!=10265 && this.orgId !=10215  && this.orgId != 9671 &&this.orgId!=10210&&this.orgId!=9675 && this.orgId!=9956&& this.orgId!=10217 && this.orgId!=10188 && this.orgId!=10191 && this.orgId!=9919 && this.orgId!=0&& this.orgId!=10402 && this.orgId != 10489 && this.orgId!=10375 && this.orgId!=10485&&this.orgId!=0&&this.orgId!=10138&&this.orgId!=10278&&this.orgId!=10537&&this.orgId!=10610 &&this.orgId!=10445 &&  this.orgId !=10635  &&  this.orgId !=10724 &&  this.orgId !=10726  &&  this.orgId !=10721 && this.orgId!=10633 && this.orgId!=0&& this.orgId!=10387){
1053 1053
           this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
1054 1054
         }
1055 1055
         this.tableOut[i].manufacturer_name = this.getManufacturerNameOne(this.tableOut[i].manufacturer)