XMLWAN před 3 roky
rodič
revize
060f0a4f7b

+ 8 - 0
src/api/stock.js Zobrazit soubor

930
     params: params
930
     params: params
931
   })
931
   })
932
 }
932
 }
933
+
934
+export function proofInventory(params) {
935
+  return request({
936
+    url: '/api/stock/proofinventory',
937
+    method: 'get',
938
+    params: params
939
+  })
940
+}

+ 7 - 0
src/xt_pages/dialysis/details/DialysisPrescription.vue Zobrazit soubor

388
             <span>{{this.prescription.oxygen_time}}</span>
388
             <span>{{this.prescription.oxygen_time}}</span>
389
            </span>
389
            </span>
390
         </li>
390
         </li>
391
+
392
+         <li v-if="isShow('最大超滤率')">
393
+          <label>最大超滤率(ml/h):</label>
394
+          <span class="content">
395
+            <span>{{this.prescription.max_ultrafiltration_rate}}</span>
396
+           </span>
397
+        </li>
391
        
398
        
392
       </ul>
399
       </ul>
393
     </div>
400
     </div>

+ 8 - 1
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Zobrazit soubor

805
                     </el-col>
805
                     </el-col>
806
 
806
 
807
 
807
 
808
+                     <el-col :span="8" v-if="isShows('最大超滤率')">
809
+                        <el-form-item label="最大超滤率(ml/h)">
810
+                            <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="dialysisPrescription.max_ultrafiltration_rate"></el-input>
811
+                        </el-form-item>
812
+                    </el-col>
813
+
814
+
808
                 </el-row>
815
                 </el-row>
809
 
816
 
810
 
817
 
1318
           puncture_needle_count: '',
1325
           puncture_needle_count: '',
1319
           epo: '',
1326
           epo: '',
1320
           epo_count: '',
1327
           epo_count: '',
1321
-
1328
+          max_ultrafiltration_rate:'',
1322
           hemodialysisPipelinesOptions: [],
1329
           hemodialysisPipelinesOptions: [],
1323
           punctureNeedleOptions: [],
1330
           punctureNeedleOptions: [],
1324
           epoOptions: []
1331
           epoOptions: []

+ 46 - 16
src/xt_pages/stock/inventory.vue Zobrazit soubor

2
     <div>
2
     <div>
3
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
3
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
4
             <div>
4
             <div>
5
-                <el-select v-model="inventory_status" size="small" placeholder="请选择">
5
+                <el-select v-model="inventory_status" size="small" placeholder="请选择" @change="changeInventory">
6
                     <el-option
6
                     <el-option
7
                     v-for="item in inventoryList"
7
                     v-for="item in inventoryList"
8
                     :key="item.id"
8
                     :key="item.id"
15
                 style="width: 200px;margin-left:10px;"
15
                 style="width: 200px;margin-left:10px;"
16
                 class="filter-item"
16
                 class="filter-item"
17
                 v-model.trim="searchKey"
17
                 v-model.trim="searchKey"
18
-                placeholder=""
18
+                placeholder="请输入单据编号或操作人姓名"
19
                 />
19
                 />
20
                 <el-button
20
                 <el-button
21
                 size="small"
21
                 size="small"
26
                 >搜索</el-button
26
                 >搜索</el-button
27
                 >
27
                 >
28
                 <el-date-picker
28
                 <el-date-picker
29
+                @change="changeStartTime"
29
                 size="small"
30
                 size="small"
30
                 v-model="start_time"
31
                 v-model="start_time"
31
                 type="date"
32
                 type="date"
37
                 v-model="end_time"
38
                 v-model="end_time"
38
                 type="date"
39
                 type="date"
39
                 style="margin-left:5px;width:140px;"
40
                 style="margin-left:5px;width:140px;"
40
-                placeholder="选择日期">
41
+                placeholder="选择日期"
42
+                @change="changeEndTime">
41
                 </el-date-picker>
43
                 </el-date-picker>
42
             </div>
44
             </div>
43
             <div>
45
             <div>
414
                <el-form-item label="盘点数量:">
416
                <el-form-item label="盘点数量:">
415
                  <el-input v-model="form.count" style="width:200px" :disabled="true"></el-input>
417
                  <el-input v-model="form.count" style="width:200px" :disabled="true"></el-input>
416
                </el-form-item>
418
                </el-form-item>
417
-               <el-form-item label="库存数量:" :disabled="true">
418
-                 <el-input v-model="form.total" style="width:200px"></el-input>
419
+               <el-form-item label="库存数量:">
420
+                 <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
419
                </el-form-item>
421
                </el-form-item>
420
                <el-form-item label="校对数量:">
422
                <el-form-item label="校对数量:">
421
                  <el-input v-model="form.proof_count" style="width:200px"></el-input>
423
                  <el-input v-model="form.proof_count" style="width:200px"></el-input>
422
                </el-form-item>
424
                </el-form-item>
423
              </el-col> 
425
              </el-col> 
424
             </el-row>
426
             </el-row>
425
-            <el-row>
426
-             <el-col>
427
-                <el-form-item label="备注:">
428
-                    <div style="display:flex;">
429
-                        <el-input v-model="form.remark"  style="width:200px"></el-input>
430
-                    </div>
431
-                </el-form-item>
432
-              </el-col>  
433
-            </el-row>
434
           </el-form>
427
           </el-form>
435
         </span>
428
         </span>
436
         <span slot="footer" class="dialog-footer">
429
         <span slot="footer" class="dialog-footer">
437
             <el-button @click="proofPriceDialogVisible = false">取 消</el-button>
430
             <el-button @click="proofPriceDialogVisible = false">取 消</el-button>
438
-            <el-button type="primary" @click="modifyInventory">保存</el-button>
431
+            <el-button type="primary" @click="proofInventory">保存</el-button>
439
         </span>
432
         </span>
440
       </el-dialog>
433
       </el-dialog>
441
     </div>
434
     </div>
443
 
436
 
444
 <script> 
437
 <script> 
445
 import { uParseTime } from '@/utils/tools'
438
 import { uParseTime } from '@/utils/tools'
446
-import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList } from "@/api/stock"
439
+import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList,proofInventory } from "@/api/stock"
447
 export default {
440
 export default {
448
     name: "inventory",
441
     name: "inventory",
449
     data() {
442
     data() {
664
           page:this.page,
657
           page:this.page,
665
           limit:this.limit,
658
           limit:this.limit,
666
          }
659
          }
660
+        console.log("parasm",params)
667
        getInventoryList(params).then(response=>{
661
        getInventoryList(params).then(response=>{
668
           if(response.data.state ==1 ){
662
           if(response.data.state ==1 ){
669
            var list =  response.data.data.list
663
            var list =  response.data.data.list
755
             this.form.count = detail.count
749
             this.form.count = detail.count
756
             this.form.remark = detail.remark
750
             this.form.remark = detail.remark
757
             this.form.total = detail.total
751
             this.form.total = detail.total
752
+            this.form.warehousing_info_id = detail.warehousing_info_id
753
+            this.form.good_id  = detail.good_id
758
             this.id = detail.id
754
             this.id = detail.id
759
             this.proofPriceDialogVisible = true
755
             this.proofPriceDialogVisible = true
760
 
756
 
871
            console.log("list23232",list)
867
            console.log("list23232",list)
872
          }
868
          }
873
       })
869
       })
870
+     },
871
+     proofInventory(){
872
+        var params = {
873
+          id:this.id,
874
+          good_id:this.form.good_id,
875
+          warehousing_info_id:this.form.warehousing_info_id,
876
+          proof_count:parseInt(this.form.proof_count),
877
+          total:parseInt(this.form.total)
878
+        }
879
+        console.log("parasm",params)
880
+       proofInventory(params).then(response=>{
881
+          if(response.data.state == 1){
882
+             var info = response.data.data.info
883
+             this.$message.success("保存成功!")
884
+             this.proofPriceDialogVisible = false
885
+             this.form.good_name = ""
886
+             this.form.specification_name = ""
887
+             this.form.proof_count = ""
888
+             this.form.total = ""
889
+             this.form.good_id = ""
890
+             this.getlist()
891
+          }
892
+       })
893
+     },
894
+     changeInventory(){
895
+       this.getlist()
896
+     },
897
+     changeStartTime(val){
898
+       this.start_time = this.getTime(val)
899
+       this.getlist()
900
+     },
901
+     changeEndTime(val){
902
+       this.end_time = this.getTime(val)
903
+       this.getlist()
874
      }
904
      }
875
     },
905
     },
876
     created(){
906
     created(){

+ 27 - 11
src/xt_pages/stock/inventoryDetails.vue Zobrazit soubor

25
                 style="width: 200px;margin-left:10px;"
25
                 style="width: 200px;margin-left:10px;"
26
                 class="filter-item"
26
                 class="filter-item"
27
                 v-model.trim="searchKey"
27
                 v-model.trim="searchKey"
28
-                placeholder=""
28
+                placeholder="请输入单据编号或操作人姓名"
29
                 />
29
                 />
30
                 <el-button
30
                 <el-button
31
                 size="small"
31
                 size="small"
32
                 class="filter-item"
32
                 class="filter-item"
33
                 type="primary"
33
                 type="primary"
34
                 icon="el-icon-search"
34
                 icon="el-icon-search"
35
-                @click="search"
36
-                >搜索</el-button
37
-                >
35
+                @click="search">搜索</el-button>
38
             </div>
36
             </div>
39
-            <div>
37
+            <!-- <div>
40
                 <el-button size="small" type="primary" @click="print">打印</el-button>
38
                 <el-button size="small" type="primary" @click="print">打印</el-button>
41
                 <el-button size="small" type="primary" @click="exportList">导出</el-button>
39
                 <el-button size="small" type="primary" @click="exportList">导出</el-button>
42
-            </div>
40
+            </div> -->
43
         </div>
41
         </div>
44
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
42
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice" style="width:100%">
45
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
43
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
46
             <el-table-column prop="date" label="耗材名称"  width="100" align="center">
44
             <el-table-column prop="date" label="耗材名称"  width="100" align="center">
47
                 <template slot-scope="scope">
45
                 <template slot-scope="scope">
83
             <!-- <el-table-column prop="name" label="产地"  width="100">
81
             <!-- <el-table-column prop="name" label="产地"  width="100">
84
               {{scope.row.now_g}}
82
               {{scope.row.now_g}}
85
             </el-table-column> -->
83
             </el-table-column> -->
86
-            <el-table-column  prop="name" label="生产厂商" width="100" align="center">
84
+            <el-table-column  prop="name" label="生产厂商" width="260" align="center">
87
               <template slot-scope="scope">
85
               <template slot-scope="scope">
88
                 {{scope.row.manufacturer}}
86
                 {{scope.row.manufacturer}}
89
              </template>
87
              </template>
93
                     {{scope.row.count}}
91
                     {{scope.row.count}}
94
                 </template>
92
                 </template>
95
             </el-table-column>
93
             </el-table-column>
96
-            <el-table-column  prop="name" label="亏损价格" width="100" align="center">
97
-            </el-table-column>
94
+            <!-- <el-table-column  prop="name" label="亏损价格" width="100" align="center">
95
+            </el-table-column> -->
98
             <el-table-column prop="name" label="生产日期" width="100" align="center">
96
             <el-table-column prop="name" label="生产日期" width="100" align="center">
97
+              <template slot-scope="scope">
98
+               {{getTime(scope.row.expire_date)}}
99
+               </template>
99
             </el-table-column>
100
             </el-table-column>
100
             <el-table-column  prop="name" label="有效日期" width="100" align="center">
101
             <el-table-column  prop="name" label="有效日期" width="100" align="center">
102
+               <template slot-scope="scope">
103
+                 {{getTime(scope.row.product_date)}}
104
+               </template>
101
             </el-table-column>
105
             </el-table-column>
102
         </el-table>
106
         </el-table>
103
         <el-pagination
107
         <el-pagination
115
 </template>
119
 </template>
116
 
120
 
117
 <script>
121
 <script>
122
+import { uParseTime } from '@/utils/tools'
118
 import { getInventoryDetailList } from "@/api/stock"
123
 import { getInventoryDetailList } from "@/api/stock"
119
 export default {
124
 export default {
120
     name: "inventory",
125
     name: "inventory",
136
     },
141
     },
137
     methods:{
142
     methods:{
138
         search(){
143
         search(){
139
-
144
+         this.getlist()
140
         },
145
         },
141
         print(){
146
         print(){
142
            if(this.ids == ""){
147
            if(this.ids == ""){
190
        formatJson(filterVal, jsonData) {
195
        formatJson(filterVal, jsonData) {
191
         return jsonData.map(v => filterVal.map(j => v[j]));
196
         return jsonData.map(v => filterVal.map(j => v[j]));
192
       },
197
       },
198
+
199
+      getTime(val) {
200
+         if(val < 0){
201
+            return ""
202
+          }
203
+         if(val == ""){
204
+            return ""
205
+          }else {
206
+            return uParseTime(val, '{y}-{m}-{d}')
207
+         }
208
+       },
193
     },
209
     },
194
     created(){
210
     created(){
195
       this.getlist()
211
       this.getlist()

+ 13 - 12
src/xt_pages/stock/stockDamaged.vue Zobrazit soubor

11
                 style="width: 200px;"
11
                 style="width: 200px;"
12
                 class="filter-item"
12
                 class="filter-item"
13
                 v-model.trim="searchKey"
13
                 v-model.trim="searchKey"
14
-                placeholder=""
14
+                placeholder="请输入单据编号或操作人姓名"
15
                 />
15
                 />
16
                 <el-button
16
                 <el-button
17
                 size="small"
17
                 size="small"
18
                 class="filter-item"
18
                 class="filter-item"
19
                 type="primary"
19
                 type="primary"
20
                 icon="el-icon-search"
20
                 icon="el-icon-search"
21
-                @click="search"
22
-                placeholder="请输入单据编号或操作人姓名">搜索</el-button>
21
+                @click="search">搜索</el-button>
23
                 <el-date-picker
22
                 <el-date-picker
24
                 size="small"
23
                 size="small"
24
+                @change="changeStartTime"
25
                 v-model="start_time"
25
                 v-model="start_time"
26
                 type="date"
26
                 type="date"
27
                 style="margin-left:5px;width:140px;"
27
                 style="margin-left:5px;width:140px;"
29
                 </el-date-picker>
29
                 </el-date-picker>
30
                 <el-date-picker
30
                 <el-date-picker
31
                 size="small"
31
                 size="small"
32
+                @change="changeEndTime"
32
                 v-model="end_time"
33
                 v-model="end_time"
33
                 type="date"
34
                 type="date"
34
                 style="margin-left:5px;width:140px;"
35
                 style="margin-left:5px;width:140px;"
149
             <el-form-item label="零售价">
150
             <el-form-item label="零售价">
150
                 <el-input v-model="form.packing_price"></el-input>
151
                 <el-input v-model="form.packing_price"></el-input>
151
             </el-form-item>
152
             </el-form-item>
152
-            <!-- <el-form-item label="新零售价">
153
-                <el-input v-model="form.new_price"></el-input>
154
-            </el-form-item> -->
155
             <el-form-item label="报损数量">
153
             <el-form-item label="报损数量">
156
                 <el-input v-model="form.count"></el-input>
154
                 <el-input v-model="form.count"></el-input>
157
             </el-form-item>
155
             </el-form-item>
210
                 {{scope.row.packing_price}}
208
                 {{scope.row.packing_price}}
211
                </template>
209
                </template>
212
             </el-table-column>
210
             </el-table-column>
213
-            <!-- <el-table-column prop="name" label="新零售价" width="100">
214
-               <template  slot-scope="scope">
215
-                {{scope.row.new_price}}
216
-               </template>
217
-            </el-table-column> -->
218
             <el-table-column prop="name" label="生产厂商" width="100" align="center">
211
             <el-table-column prop="name" label="生产厂商" width="100" align="center">
219
               <template  slot-scope="scope">
212
               <template  slot-scope="scope">
220
                 {{scope.row.manufacturer}}
213
                 {{scope.row.manufacturer}}
438
     },
431
     },
439
     methods:{
432
     methods:{
440
         search(){
433
         search(){
441
-
434
+           this.getlist()
442
         },
435
         },
443
         print(){
436
         print(){
444
           if(this.ids == ""){
437
           if(this.ids == ""){
809
            console.log("list23232",list)
802
            console.log("list23232",list)
810
          }
803
          }
811
       })
804
       })
805
+     },
806
+     changeStartTime(val){
807
+        this.start_time = this.getTime(val)
808
+        this.getlist()
809
+     },
810
+     changeEndTime(val){
811
+       this.end_time = this.getTime(val)
812
+       this.getlist()
812
      }
813
      }
813
     },
814
     },
814
     created(){
815
     created(){

+ 9 - 1
src/xt_pages/user/dialysisSolution.vue Zobrazit soubor

687
             </el-form-item>
687
             </el-form-item>
688
           </el-col>
688
           </el-col>
689
 
689
 
690
+         <el-col :span="8" v-if="isShows('最大超滤率')">
691
+            <el-form-item label="最大超滤率(ml/h)">
692
+              <el-input v-model="addPlan.max_ultrafiltration_rate"></el-input>
693
+            </el-form-item>
694
+          </el-col>
695
+
690
         </el-row>
696
         </el-row>
691
 
697
 
692
 
698
 
893
         puncture_needle_count:"",
899
         puncture_needle_count:"",
894
         epo:"",
900
         epo:"",
895
         epo_count:"",
901
         epo_count:"",
896
-
902
+        max_ultrafiltration_rate:"",
897
 
903
 
898
       },
904
       },
899
       childPlan: {
905
       childPlan: {
1568
       this.addPlan.dialysis_duration_minute = '' + row.dialysis_duration_minute
1574
       this.addPlan.dialysis_duration_minute = '' + row.dialysis_duration_minute
1569
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
1575
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
1570
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
1576
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
1577
+      this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
1571
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
1578
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
1572
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
1579
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
1573
       }
1580
       }
1674
       this.dialysis_irrigation = row.dialysis_irrigation
1681
       this.dialysis_irrigation = row.dialysis_irrigation
1675
       this.dialysis_dialyszers = row.dialysis_dialyszers
1682
       this.dialysis_dialyszers = row.dialysis_dialyszers
1676
       this.addPlan.oxygen_uptake = row.oxygen_uptake
1683
       this.addPlan.oxygen_uptake = row.oxygen_uptake
1684
+      this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
1677
       if(row.oxygen_uptake == 1){
1685
       if(row.oxygen_uptake == 1){
1678
         this.oxygenShow = true
1686
         this.oxygenShow = true
1679
       }
1687
       }