xmg123 2 tygodni temu
rodzic
commit
021e1ad6aa

Plik diff jest za duży
+ 18869 - 1150
package-lock.json


+ 0 - 1
package.json Wyświetl plik

59
     "jszip": "^3.10.1",
59
     "jszip": "^3.10.1",
60
     "mockjs": "1.0.1-beta3",
60
     "mockjs": "1.0.1-beta3",
61
     "moment": "^2.24.0",
61
     "moment": "^2.24.0",
62
-    "node-sass": "^4.14.1",
63
     "normalize.css": "7.0.0",
62
     "normalize.css": "7.0.0",
64
     "nprogress": "0.2.0",
63
     "nprogress": "0.2.0",
65
     "pdfmake": "^0.2.8",
64
     "pdfmake": "^0.2.8",

+ 10 - 32
src/xt_pages/charging/charging_collect.vue Wyświetl plik

9
                v-model.trim="smart_keyword"
9
                v-model.trim="smart_keyword"
10
               :fetch-suggestions="querySearch"
10
               :fetch-suggestions="querySearch"
11
               placeholder="请输入内容"
11
               placeholder="请输入内容"
12
-              @select="handleSelect"
12
+              @select="handleSelectOne"
13
               
13
               
14
             >
14
             >
15
            <i class="el-icon-search el-input__icon" slot="suffix"></i>
15
            <i class="el-icon-search el-input__icon" slot="suffix"></i>
83
           </el-table-column>
83
           </el-table-column>
84
         </el-table>
84
         </el-table>
85
       </div>
85
       </div>
86
-      <div style="text-align: right;">
87
-        <el-pagination
88
-          @size-change="handleSizeChange"
89
-          @current-change="handleCurrentChange"
90
-          :current-page="currentPage"
91
-          :page-sizes="[10, 20, 30, 40,100]"
92
-          :page-size="10"
93
-          layout="total, sizes, prev, pager, next, jumper"
94
-          :total="total">
95
-        </el-pagination>
96
-      </div>
86
+     
97
     </div>
87
     </div>
98
 
88
 
99
     <el-dialog
89
     <el-dialog
157
           <div><el-button type="primary" @click="queryCount">查询</el-button></div>
147
           <div><el-button type="primary" @click="queryCount">查询</el-button></div>
158
         </div>
148
         </div>
159
         <div style="margin: 10px 0;">
149
         <div style="margin: 10px 0;">
160
-          <el-table border :data="tableList" style="width: 100%" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
150
+          <el-table border :data="tableData" style="width: 100%" :header-cell-style="{'text-align':'center'}" :cell-style="{'text-align':'center'}">
161
             <el-table-column prop="index" label="序号" width="">
151
             <el-table-column prop="index" label="序号" width="">
162
                <template slot-scope="scope">
152
                <template slot-scope="scope">
163
                    {{ scope.$index+1 }}
153
                    {{ scope.$index+1 }}
247
         {mode_id:4,mode_name:"HP"},
237
         {mode_id:4,mode_name:"HP"},
248
         {mode_id:5,mode_name:"其他"}
238
         {mode_id:5,mode_name:"其他"}
249
         ],
239
         ],
240
+        tableData:[]
250
       }
241
       }
251
     },
242
     },
252
     methods:{
243
     methods:{
285
         this.smart_keyword = val.name;
276
         this.smart_keyword = val.name;
286
         this.patient_id = val.id
277
         this.patient_id = val.id
287
       },
278
       },
279
+      handleSelectOne(){
280
+        this.getlist()
281
+      },
288
       querySearch(queryString, cb){
282
       querySearch(queryString, cb){
289
         let key = ''
283
         let key = ''
290
         if (queryString != undefined) {
284
         if (queryString != undefined) {
326
             if(response.data.state == 1){
320
             if(response.data.state == 1){
327
               this.collect_show = true
321
               this.collect_show = true
328
               var tableList =  response.data.data.list
322
               var tableList =  response.data.data.list
329
-              this.tableList = []
330
-              this.tableList = tableList
323
+              this.tableData = []
324
+              this.tableData = tableList
331
               this.patient = response.data.data.patient
325
               this.patient = response.data.data.patient
332
               this.userList = []
326
               this.userList = []
333
               this.userList = response.data.data.userList
327
               this.userList = response.data.data.userList
410
         return user_name
404
         return user_name
411
       },
405
       },
412
       getQuery(){
406
       getQuery(){
413
-        var params = {
414
-           patient_id:this.patient_id,
415
-           mode_id:this.mode_id,
416
-           is_type:this.is_type,
417
-           start_time:this.start_time,
418
-           end_time:this.end_time,
419
-          }
420
-          getPatientCountFlowById(params).then(response=>{
421
-            if(response.data.state == 1){
422
-              var tableList =  response.data.data.list
423
-              this.tableList = []
424
-              this.tableList = tableList
425
-              this.patient = response.data.data.patient
426
-              this.userList = []
427
-              this.userList = response.data.data.userList
428
-            }
429
-        })
407
+        this.getlist()
430
       }
408
       }
431
     },
409
     },
432
     created(){
410
     created(){

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Wyświetl plik

4357
         }
4357
         }
4358
 
4358
 
4359
         //HIS客户显示临时医嘱的地方
4359
         //HIS客户显示临时医嘱的地方
4360
-        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644|| this.org_id == 10724  || this.org_id ==10751 || this.org_id == 0 || this.org_id ==10744) {
4360
+        if (this.org_id == 10510 || this.org_id == 10567 || this.org_id == 10489 || this.org_id == 10644|| this.org_id == 10724  || this.org_id ==10751) {
4361
           if (response.data.data.doctorAdevieInfo != null && response.data.data.doctorAdevieInfo.length > 0) {
4361
           if (response.data.data.doctorAdevieInfo != null && response.data.data.doctorAdevieInfo.length > 0) {
4362
 
4362
 
4363
             for (let i = 0; i < response.data.data.doctorAdevieInfo.length; i++) {
4363
             for (let i = 0; i < response.data.data.doctorAdevieInfo.length; i++) {

+ 2 - 2
src/xt_pages/outpatientTool/labelPrint.vue Wyświetl plik

134
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
134
                               <div>{{getTime(current_ctime,'{m}-{d}')}}</div>
135
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
135
                               <div>{{getTime(current_ctime,'{h}:{i}')}}</div>
136
                           </div>
136
                           </div>
137
-                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217"  id="barcode">
137
+                          <img style="" v-if="$store.getters.xt_user.org.id != 10138 && $store.getters.xt_user.org.id != 10217&& $store.getters.xt_user.org.id != 10278&& $store.getters.xt_user.org.id != 0"  id="barcode">
138
                       </div>
138
                       </div>
139
                       <div style="margin-bottom:0px;">{{current_number}}</div>
139
                       <div style="margin-bottom:0px;">{{current_number}}</div>
140
                       <div style="display:flex;">
140
                       <div style="display:flex;">
141
                           <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
141
                           <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
142
-                          <div style="font-size:28px;margin-left:20px;font-weight: bold">{{current_name}}</div>
142
+                          <div style="font-size:18px;margin-left:20px;font-weight: bold">{{current_name}}</div>
143
                       </div>
143
                       </div>
144
                   </div>
144
                   </div>
145
             </div>
145
             </div>

+ 1 - 1
src/xt_pages/stock/detail/stockInDetail.vue Wyświetl plik

301
                 :trigger-on-focus="true"
301
                 :trigger-on-focus="true"
302
                 placeholder="请输入耗材名称"
302
                 placeholder="请输入耗材名称"
303
                 @select="handleSelectOne"
303
                 @select="handleSelectOne"
304
-                style="width:500px;"
304
+                style="width:400px;"
305
                 :popper-append-to-body="true"
305
                 :popper-append-to-body="true"
306
               >
306
               >
307
                 <i class="el-icon-search el-input__icon" slot="suffix"></i>
307
                 <i class="el-icon-search el-input__icon" slot="suffix"></i>

+ 1 - 1
src/xt_pages/stock/drugs/components/drugInOrder.vue Wyświetl plik

321
               :trigger-on-focus="true"
321
               :trigger-on-focus="true"
322
               placeholder="请输入药品名称"
322
               placeholder="请输入药品名称"
323
               @select="handleSelectOne"
323
               @select="handleSelectOne"
324
-              style="width: 500px"
324
+              style="width: 400px"
325
            >
325
            >
326
             <i class="el-icon-search el-input__icon" slot="suffix"></i>
326
             <i class="el-icon-search el-input__icon" slot="suffix"></i>
327
             <template slot-scope="{ item }">
327
             <template slot-scope="{ item }">

+ 4 - 0
src/xt_pages/stock/drugs/components/purchaseNewDrugQuery.vue Wyświetl plik

1720
             min_str = (total % min_number) + min_unit;
1720
             min_str = (total % min_number) + min_unit;
1721
           }
1721
           }
1722
       }
1722
       }
1723
+      if(max_str<0){
1724
+         max_str =""
1725
+      }
1723
       if(max_str == "" && min_str == ""){
1726
       if(max_str == "" && min_str == ""){
1724
         return "0"
1727
         return "0"
1725
       }else{
1728
       }else{
1729
+
1726
         return max_str + min_str;
1730
         return max_str + min_str;
1727
       }
1731
       }
1728
     },
1732
     },

+ 6 - 5
src/xt_pages/stock/drugs/drugNewPrint.vue Wyświetl plik

144
      },
144
      },
145
       getSumCount(){
145
       getSumCount(){
146
         var sum_count = 0
146
         var sum_count = 0
147
-        for(let i=0;i<this.tableData.length;i++){
148
-          sum_count+=this.tableData[i].warehousing_count
147
+        for(let i=0;i<this.goodList.length;i++){
148
+          sum_count+=this.goodList[i].warehousing_count
149
         }
149
         }
150
         return sum_count
150
         return sum_count
151
       },
151
       },
152
       getSumPrice(){
152
       getSumPrice(){
153
         var all_price = 0
153
         var all_price = 0
154
-        for(let i=0;i<this.tableData.length;i++){
155
-          all_price+= (this.tableData[i].warehousing_count * this.tableData[i].price)
154
+        console.log("taoblePrint===========",this.tableData)
155
+        for(let i=0;i<this.goodList.length;i++){
156
+          all_price+= (this.goodList[i].warehousing_count * this.goodList[i].price)
156
         }
157
         }
157
         if(all_price>0){
158
         if(all_price>0){
158
-           all_price.toFixed(2)
159
+          return all_price.toFixed(2)
159
         }else{
160
         }else{
160
           return ""
161
           return ""
161
         }
162
         }

+ 5 - 2
src/xt_pages/stock/goodPrint.vue Wyświetl plik

155
       },
155
       },
156
       getSumPrice(){
156
       getSumPrice(){
157
         var all_price = 0
157
         var all_price = 0
158
+        console.log("tabliedate----------",this.tableData)
158
         for(let i=0;i<this.tableData.length;i++){
159
         for(let i=0;i<this.tableData.length;i++){
159
-          all_price+= (this.tableData[i].warehousing_count * this.tableData[i].price)
160
+          all_price +=(this.tableData[i].warehousing_count * this.tableData[i].price)
160
         }
161
         }
162
+        console.log("all_price-------------",all_price)
161
         if(all_price>0){
163
         if(all_price>0){
162
-           all_price.toFixed(2)
164
+          return all_price.toFixed(2)
165
+
163
         }else{
166
         }else{
164
           return ""
167
           return ""
165
         }
168
         }