数据

src/api/stock.js

@@ -930,3 +930,11 @@ export function getGoodWarehouseList(params) {
     params: params
   })
 }
+
+export function proofInventory(params) {
+  return request({
+    url: '/api/stock/proofinventory',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -388,6 +388,13 @@
             <span>{{this.prescription.oxygen_time}}</span>
            </span>
         </li>
+
+         <li v-if="isShow('最大超滤率')">
+          <label>最大超滤率(ml/h):</label>
+          <span class="content">
+            <span>{{this.prescription.max_ultrafiltration_rate}}</span>
+           </span>
+        </li>
        
       </ul>
     </div>

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -805,6 +805,13 @@
                     </el-col>
 
 
+                     <el-col :span="8" v-if="isShows('最大超滤率')">
+                        <el-form-item label="最大超滤率(ml/h)">
+                            <el-input oninput="value=value.replace(/\D|^0/g,'')" v-model="dialysisPrescription.max_ultrafiltration_rate"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+
                 </el-row>
 
 
@@ -1318,7 +1325,7 @@
           puncture_needle_count: '',
           epo: '',
           epo_count: '',
-
+          max_ultrafiltration_rate:'',
           hemodialysisPipelinesOptions: [],
           punctureNeedleOptions: [],
           epoOptions: []

src/xt_pages/stock/inventory.vue

@@ -2,7 +2,7 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                <el-select v-model="inventory_status" size="small" placeholder="请选择">
+                <el-select v-model="inventory_status" size="small" placeholder="请选择" @change="changeInventory">
                     <el-option
                     v-for="item in inventoryList"
                     :key="item.id"
@@ -15,7 +15,7 @@
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
@@ -26,6 +26,7 @@
                 >搜索</el-button
                 >
                 <el-date-picker
+                @change="changeStartTime"
                 size="small"
                 v-model="start_time"
                 type="date"
@@ -37,7 +38,8 @@
                 v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
-                placeholder="选择日期">
+                placeholder="选择日期"
+                @change="changeEndTime">
                 </el-date-picker>
             </div>
             <div>
@@ -414,28 +416,19 @@
                <el-form-item label="盘点数量：">
                  <el-input v-model="form.count" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
-               <el-form-item label="库存数量：" :disabled="true">
-                 <el-input v-model="form.total" style="width:200px"></el-input>
+               <el-form-item label="库存数量：">
+                 <el-input v-model="form.total" style="width:200px" :disabled="true"></el-input>
                </el-form-item>
                <el-form-item label="校对数量：">
                  <el-input v-model="form.proof_count" style="width:200px"></el-input>
                </el-form-item>
              </el-col> 
             </el-row>
-            <el-row>
-             <el-col>
-                <el-form-item label="备注：">
-                    <div style="display:flex;">
-                        <el-input v-model="form.remark"  style="width:200px"></el-input>
-                    </div>
-                </el-form-item>
-              </el-col>  
-            </el-row>
           </el-form>
         </span>
         <span slot="footer" class="dialog-footer">
             <el-button @click="proofPriceDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="modifyInventory">保存</el-button>
+            <el-button type="primary" @click="proofInventory">保存</el-button>
         </span>
       </el-dialog>
     </div>
@@ -443,7 +436,7 @@
 
 <script> 
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList } from "@/api/stock"
+import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList,proofInventory } from "@/api/stock"
 export default {
     name: "inventory",
     data() {
@@ -664,6 +657,7 @@ export default {
           page:this.page,
           limit:this.limit,
          }
+        console.log("parasm",params)
        getInventoryList(params).then(response=>{
           if(response.data.state ==1 ){
            var list =  response.data.data.list
@@ -755,6 +749,8 @@ export default {
             this.form.count = detail.count
             this.form.remark = detail.remark
             this.form.total = detail.total
+            this.form.warehousing_info_id = detail.warehousing_info_id
+            this.form.good_id  = detail.good_id
             this.id = detail.id
             this.proofPriceDialogVisible = true
 
@@ -871,6 +867,40 @@ export default {
            console.log("list23232",list)
          }
       })
+     },
+     proofInventory(){
+        var params = {
+          id:this.id,
+          good_id:this.form.good_id,
+          warehousing_info_id:this.form.warehousing_info_id,
+          proof_count:parseInt(this.form.proof_count),
+          total:parseInt(this.form.total)
+        }
+        console.log("parasm",params)
+       proofInventory(params).then(response=>{
+          if(response.data.state == 1){
+             var info = response.data.data.info
+             this.$message.success("保存成功!")
+             this.proofPriceDialogVisible = false
+             this.form.good_name = ""
+             this.form.specification_name = ""
+             this.form.proof_count = ""
+             this.form.total = ""
+             this.form.good_id = ""
+             this.getlist()
+          }
+       })
+     },
+     changeInventory(){
+       this.getlist()
+     },
+     changeStartTime(val){
+       this.start_time = this.getTime(val)
+       this.getlist()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getlist()
      }
     },
     created(){

src/xt_pages/stock/inventoryDetails.vue

@@ -25,23 +25,21 @@
                 style="width: 200px;margin-left:10px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
                 class="filter-item"
                 type="primary"
                 icon="el-icon-search"
-                @click="search"
-                >搜索</el-button
-                >
+                @click="search">搜索</el-button>
             </div>
-            <div>
+            <!-- <div>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary" @click="exportList">导出</el-button>
-            </div>
+            </div> -->
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
+        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice" style="width:100%">
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
             <el-table-column prop="date" label="耗材名称"  width="100" align="center">
                 <template slot-scope="scope">
@@ -83,7 +81,7 @@
             <!-- <el-table-column prop="name" label="产地"  width="100">
               {{scope.row.now_g}}
             </el-table-column> -->
-            <el-table-column  prop="name" label="生产厂商" width="100" align="center">
+            <el-table-column  prop="name" label="生产厂商" width="260" align="center">
               <template slot-scope="scope">
                 {{scope.row.manufacturer}}
              </template>
@@ -93,11 +91,17 @@
                     {{scope.row.count}}
                 </template>
             </el-table-column>
-            <el-table-column  prop="name" label="亏损价格" width="100" align="center">
-            </el-table-column>
+            <!-- <el-table-column  prop="name" label="亏损价格" width="100" align="center">
+            </el-table-column> -->
             <el-table-column prop="name" label="生产日期" width="100" align="center">
+              <template slot-scope="scope">
+               {{getTime(scope.row.expire_date)}}
+               </template>
             </el-table-column>
             <el-table-column  prop="name" label="有效日期" width="100" align="center">
+               <template slot-scope="scope">
+                 {{getTime(scope.row.product_date)}}
+               </template>
             </el-table-column>
         </el-table>
         <el-pagination
@@ -115,6 +119,7 @@
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
 import { getInventoryDetailList } from "@/api/stock"
 export default {
     name: "inventory",
@@ -136,7 +141,7 @@ export default {
     },
     methods:{
         search(){
-
+         this.getlist()
         },
         print(){
            if(this.ids == ""){
@@ -190,6 +195,17 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+
+      getTime(val) {
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+       },
     },
     created(){
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -11,17 +11,17 @@
                 style="width: 200px;"
                 class="filter-item"
                 v-model.trim="searchKey"
-                placeholder=""
+                placeholder="请输入单据编号或操作人姓名"
                 />
                 <el-button
                 size="small"
                 class="filter-item"
                 type="primary"
                 icon="el-icon-search"
-                @click="search"
-                placeholder="请输入单据编号或操作人姓名">搜索</el-button>
+                @click="search">搜索</el-button>
                 <el-date-picker
                 size="small"
+                @change="changeStartTime"
                 v-model="start_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
@@ -29,6 +29,7 @@
                 </el-date-picker>
                 <el-date-picker
                 size="small"
+                @change="changeEndTime"
                 v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
@@ -149,9 +150,6 @@
             <el-form-item label="零售价">
                 <el-input v-model="form.packing_price"></el-input>
             </el-form-item>
-            <!-- <el-form-item label="新零售价">
-                <el-input v-model="form.new_price"></el-input>
-            </el-form-item> -->
             <el-form-item label="报损数量">
                 <el-input v-model="form.count"></el-input>
             </el-form-item>
@@ -210,11 +208,6 @@
                 {{scope.row.packing_price}}
                </template>
             </el-table-column>
-            <!-- <el-table-column prop="name" label="新零售价" width="100">
-               <template  slot-scope="scope">
-                {{scope.row.new_price}}
-               </template>
-            </el-table-column> -->
             <el-table-column prop="name" label="生产厂商" width="100" align="center">
               <template  slot-scope="scope">
                 {{scope.row.manufacturer}}
@@ -438,7 +431,7 @@ export default {
     },
     methods:{
         search(){
-
+           this.getlist()
         },
         print(){
           if(this.ids == ""){
@@ -809,6 +802,14 @@ export default {
            console.log("list23232",list)
          }
       })
+     },
+     changeStartTime(val){
+        this.start_time = this.getTime(val)
+        this.getlist()
+     },
+     changeEndTime(val){
+       this.end_time = this.getTime(val)
+       this.getlist()
      }
     },
     created(){

src/xt_pages/user/dialysisSolution.vue

@@ -687,6 +687,12 @@
             </el-form-item>
           </el-col>
 
+         <el-col :span="8" v-if="isShows('最大超滤率')">
+            <el-form-item label="最大超滤率(ml/h)">
+              <el-input v-model="addPlan.max_ultrafiltration_rate"></el-input>
+            </el-form-item>
+          </el-col>
+
         </el-row>
 
 
@@ -893,7 +899,7 @@ export default {
         puncture_needle_count:"",
         epo:"",
         epo_count:"",
-
+        max_ultrafiltration_rate:"",
 
       },
       childPlan: {
@@ -1568,6 +1574,7 @@ export default {
       this.addPlan.dialysis_duration_minute = '' + row.dialysis_duration_minute
       this.addPlan.hemodialysis_machine = row.hemodialysis_machine + ''
       this.addPlan.perfusion_apparatus = row.perfusion_apparatus + ''
+      this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
       if(row.blood_flow_volume!="" || row.blood_flow_volume!=undefined){
         this.addPlan.blood_flow_volume = row.blood_flow_volume.toString()
       }
@@ -1674,6 +1681,7 @@ export default {
       this.dialysis_irrigation = row.dialysis_irrigation
       this.dialysis_dialyszers = row.dialysis_dialyszers
       this.addPlan.oxygen_uptake = row.oxygen_uptake
+      this.addPlan.max_ultrafiltration_rate = row.max_ultrafiltration_rate
       if(row.oxygen_uptake == 1){
         this.oxygenShow = true
       }