Browse Source

批量打印

XMLWAN 4 years ago
parent
commit
3daad11736

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

@@ -566,3 +566,12 @@ export function getWarehouseOutUser(params) {
566 566
   })
567 567
 }
568 568
 
569
+
570
+export function PostSearchStock(keyword,params){
571
+  
572
+  return request({
573
+    url:'/api/warehouseout/postsearchstock?keyword='+keyword,
574
+    method:"get",
575
+    params:params
576
+  })
577
+}

+ 16 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderNine.vue View File

@@ -349,6 +349,7 @@
349 349
               </tr>
350 350
               </tbody>
351 351
             </table>
352
+           
352 353
           </td>
353 354
         </tr>
354 355
         </tbody>
@@ -1230,6 +1231,21 @@
1230 1231
                 </tbody>
1231 1232
               </table>
1232 1233
 
1234
+              <table class="table-box" v-if="org_id == 10032">
1235
+                <tbody>
1236
+                  <tr>
1237
+                   <td width="100">特殊病情处理:</td>
1238
+                   <td width= "480">
1239
+                     <div class="under-line">
1240
+                      &nbsp;
1241
+                      <span>{{ predialysis.remark }}</span>
1242
+                     </div>
1243
+                   </td>
1244
+                    <td></td>
1245
+                  </tr>
1246
+                </tbody>
1247
+              </table>
1248
+
1233 1249
               <!-- <table class="table-box">
1234 1250
                 <tbody>
1235 1251
                   <tr>

+ 7 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue View File

@@ -554,6 +554,7 @@
554 554
             <td width="60">置换量<br />L</td>
555 555
             <td width="60">静脉压<br />mmHg</td>
556 556
             <td width="60">跨膜压<br />mmHg</td>
557
+            <td width="60" v-if="org_id == 9987">ktv</td>
557 558
             <!-- <td width="60">钠浓度<br/>mmol/L</td>
558 559
           <td width="80">透析液温度<br/>℃</td>
559 560
           <td width="60">置换率<br/>ml/min</td> -->
@@ -609,6 +610,9 @@
609 610
             <td>
610 611
               &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
611 612
             </td>
613
+            <td v-if="org_id == 9987">
614
+               &nbsp;{{monitor.ktv}}
615
+            </td>
612 616
           </tr>
613 617
         </tbody>
614 618
       </table>
@@ -1113,7 +1117,8 @@ export default {
1113 1117
         zongliang_unit: 'mg',
1114 1118
         gaimingcheng_unit: '',
1115 1119
         gaijiliang_unit: ''
1116
-      }
1120
+      },
1121
+      org_id:0,
1117 1122
     }
1118 1123
   },
1119 1124
   methods: {
@@ -1603,7 +1608,7 @@ export default {
1603 1608
     this.precaution_arr = getDataConfig('hemodialysis', 'precaution')
1604 1609
     this.intake_arr = getDataConfig('hemodialysis', 'intake')
1605 1610
     this.nutrition_arr = getDataConfig('hemodialysis', 'nutrition')
1606
-
1611
+    this.org_id = this.org_template_info.org_id
1607 1612
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
1608 1613
 
1609 1614
     var bloodAccessParOpera = getDataConfig(

+ 42 - 37
src/xt_pages/stock/Dialog/stockInDialog.vue View File

@@ -10,7 +10,7 @@
10 10
     <el-row :gutter="20">
11 11
       <el-col :span="8">
12 12
         <el-table
13
-          :data="propForm.goods"
13
+          :data="propForm.goodType"
14 14
           ref="table"
15 15
           border
16 16
           highlight-current-row
@@ -24,7 +24,8 @@
24 24
             align="center"
25 25
             label="商品类型">
26 26
             <template slot-scope="scope">
27
-              <span>{{getGoodTypeName(scope.row)}}</span>
27
+              <!-- <span>{{getGoodTypeName(scope.row)}}</span> -->
28
+              <span>{{scope.row.type_name}}</span>
28 29
             </template>
29 30
           </el-table-column>
30 31
         </el-table>
@@ -102,7 +103,8 @@
102 103
         isClose: false,
103 104
         visibility: false,
104 105
         SelectedDatas: [],
105
-        table_current_index: -1
106
+        table_current_index: -1,
107
+        tableData:[],
106 108
       }
107 109
     },
108 110
     props: {
@@ -110,6 +112,10 @@
110 112
         type: Object
111 113
       }
112 114
     },
115
+    created(){
116
+      this.tableData = this.propForm.goodType
117
+      console.log("222233333",this.tableData)
118
+    },
113 119
     methods: {
114 120
       hide: function() {
115 121
         this.visibility = false
@@ -131,30 +137,27 @@
131 137
           }
132 138
         }
133 139
       },
134
-      goodTypeTableChange: function(currentRow, oldCurrentRow) {
135
-        let keyName = ''
136
-        for (var key in currentRow) {
137
-          if (key != 'index') {
138
-            keyName = key
139
-          }
140
-        }
141
-        this.goodInfoTableData = []
142
-        this.goodInfo = []
143
-        if (keyName.length > 0) {
144
-          this.currentGoodTypeId = parseInt(keyName)
145
-          this.goodInfo = currentRow[keyName]
146
-          this.goodInfoTableData = (currentRow[keyName])
140
+       goodTypeTableChange: function(currentRow, oldCurrentRow) {
141
+       
142
+        let keyName = ""
143
+        var arr = []
144
+        for(let i= 0;i<this.propForm.goods.length;i++){
145
+            for(var key in this.propForm.goods[i]){
146
+               if(key == currentRow.id){
147
+                  keyName = key
148
+                  arr.push(this.propForm.goods[i])
149
+               }
150
+            }
147 151
         }
148
-
149
-        for (let i = 0; i < this.goodInfoTableData.length; i++) {
150
-          if (this.goodInfoTableData[i].isSelected) {
151
-            this.$nextTick(function() {
152
-              this.$refs.multipleTable.toggleRowSelection(this.goodInfoTableData[i])
153
-            })
152
+        this.currentGoodTypeId = parseInt(keyName)
153
+        this.goodInfoTableData = arr[keyName]
154
+        for(let i=0;i<arr.length;i++){
155
+          for(var key in arr[i]){
156
+              this.goodInfo = arr[i][keyName]
157
+              this.goodInfoTableData = arr[i][keyName]
154 158
           }
155
-        }
156
-
157
-      },
159
+         }
160
+       },
158 161
       cancle: function(formName) {
159 162
         this.goodInfo = []
160 163
         this.goodInfoTableData = []
@@ -213,22 +216,24 @@
213 216
             return this.propForm.goodUnit[i].name
214 217
           }
215 218
         }
216
-      }, search: function() {
219
+      }, 
220
+     
221
+      search:function() {
217 222
         if (this.keywords.length <= 0) {
218
-          this.$message.error('搜索关键字不能为空')
219
-          return
223
+           console.log("0000000",this.propForm.goodType)
224
+           this.propForm.goodType = this.propForm.goodType
220 225
         }
221 226
         const searchArr = []
222
-        for (let i = 0; i < this.goodInfoTableData.length; i++) {
223
-          if (this.goodInfoTableData[i].specification_name.indexOf(this.keywords) != -1) {
224
-            searchArr.push(this.goodInfoTableData[i])
225
-          }
226
-        }
227
-        this.goodInfoTableData = []
228
-        for (let i = 0; i < searchArr.length; i++) {
229
-          this.goodInfoTableData.push(searchArr[i])
227
+        for(let i=0;i<this.propForm.goodType.length;i++){
228
+           if(this.propForm.goodType[i].type_name.indexOf(this.keywords)!=-1){
229
+              searchArr.push(this.propForm.goodType[i])
230
+           }
230 231
         }
231
-      }, changeGoodInfoTableData: function(val) {
232
+        console.log("searchArr",searchArr)
233
+        this.propForm.goodType = []
234
+        this.propForm.goodType = searchArr
235
+      },
236
+      changeGoodInfoTableData: function(val) {
232 237
       }, changeAllGoodInfoTableData: function(selection) {
233 238
 
234 239
         var goodInfos = this.propForm.goods[this.table_current_index][this.currentGoodTypeId]

+ 4 - 2
src/xt_pages/stock/stockInOrderAdd.vue View File

@@ -15,7 +15,8 @@
15 15
       <stock-in-dialog ref="dialog" :propForm="propForm"
16 16
                        :visibility="isVisibility"
17 17
                        v-on:dialog-comfirm="comfirm"
18
-                       v-on:dialog-cancle="cancle"></stock-in-dialog>
18
+                       v-on:dialog-cancle="cancle">
19
+      </stock-in-dialog>
19 20
 
20 21
 
21 22
       <div class="cell clearfix">
@@ -374,7 +375,8 @@
374 375
         this.propForm.goodType = []
375 376
         this.propForm.goods = []
376 377
         this.$refs.dialog.hide()
377
-      }, GetAllGoodType: function() {
378
+      }, 
379
+      GetAllGoodType: function() {
378 380
         GetAllGoodType().then(response => {
379 381
           if (response.data.state == 0) {
380 382
             this.$message.error(response.data.msg)