数据

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -613,6 +613,7 @@
                         {{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure + "/" : "" }}
                         {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
                       </td>
+                       <td style="padding:1px 5px;">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
                       <td style="padding:1px 5px;" height="30px">
                         <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
                           {{ getAdminUser(monitor.monitoring_nurse) }}
@@ -621,7 +622,7 @@
                           <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
                         </span>
                       </td>
-                      <td style="padding:1px 5px;">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
+                     
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">

src/xt_pages/stock/inventory.vue

@@ -43,8 +43,8 @@
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
                 <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary" @click="exportList">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
@@ -64,6 +64,16 @@
                 {{scope.row.count}}
               </template>  
             </el-table-column>
+            <el-table-column prop="name" label="库存" width="100" align="center">
+                  <template slot-scope="scope">
+                   {{scope.row.total}}
+                 </template> 
+            </el-table-column>
+            <el-table-column prop="name" label="批次" width="100" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.number}}
+                </template> 
+            </el-table-column>
             <el-table-column prop="name" label="盘点人" align="center">
              <template slot-scope="scope" >
               {{scope.row.user_name}}
@@ -81,12 +91,13 @@
             </el-table-column>
             <el-table-column prop="name" label="状态"  align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.checker_status == 1">已审核</span>
-                <span v-if="scope.row.checker_status == 2">未审核</span>
+                <span v-if="scope.row.checker_status == 1">盘点完成</span>
+                <span v-if="scope.row.checker_status == 2">正在盘点</span>
              </template>
             </el-table-column>
-            <el-table-column label="操作" align="center">
+            <el-table-column label="操作" align="center" width="300">
                 <template slot-scope="scope">
+                  <el-button type="primary" size="small" @click="getInventory(scope.row.id,scope.row.checker_status)">校对</el-button>
                   <el-button type="primary" size="small" @click="getInventoryDetail(scope.row.id,scope.row.checker_status)">编辑</el-button>
                   <el-button type="danger" size="small" @click="deleteInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
@@ -132,6 +143,17 @@
                 <el-form-item label="规格">
                     <el-input v-model="form.specification_name"></el-input>
                 </el-form-item>
+                <el-form-item label="批号">
+                  <el-select v-model="form.number" filterable placeholder="请选择">
+                      <el-option
+                        v-for="(item,index) in numberList"
+                        :key="index"
+                        :label="item.number"
+                        :value="item.number">
+                      </el-option>
+                  </el-select>
+                </el-form-item>
+
                 <el-form-item label="单位">
                     <el-input v-model="form.warehousing_unit"></el-input>
                 </el-form-item>
@@ -189,6 +211,7 @@
                    {{scope.row.count}}
                  </template> 
                 </el-table-column>
+              
                 <el-table-column prop="name" label="原进货价" width="100" align="center">
                     <template slot-scope="scope">
                     {{scope.row.buy_price}}
@@ -355,13 +378,72 @@
             <el-button @click="modefiyePriceDialogVisible = false">取 消</el-button>
             <el-button type="primary" @click="modifyInventory">保存</el-button>
         </span>
-    </el-dialog>
+      </el-dialog>
+
+
+      <el-dialog
+        title="校对"
+        :visible.sync="proofPriceDialogVisible"
+        width="50%">
+        <span>
+          <el-form  :model="form">
+            <el-row>
+               <el-col>
+                 <el-form-item label="耗材名称:">
+                 <el-autocomplete
+                        class="checkSearch"
+                        popper-class="my-autocomplete"
+                        v-model="form.good_name"
+                        :fetch-suggestions="querySearchAsync"
+                        :trigger-on-focus="true"
+                        placeholder="请输入耗材名称"
+                        @select="handleSelect"
+                        @input="changeGoodName(scope.$index)"
+                        style="width:160px;"
+                        :disabled="true"
+                    >
+                        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                    <template slot-scope="{ item }">
+                        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+                    </template>
+                    </el-autocomplete>
+                </el-form-item>   
+               <el-form-item label="规格">
+                    <el-input v-model="form.specification_name" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>  
+               <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>
+               <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>
+        </span>
+      </el-dialog>
     </div>
 </template>
 
 <script> 
 import { uParseTime } from '@/utils/tools'
-import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory } from "@/api/stock"
+import { postSearchGoodWarehouseList,saveInventory,getInventoryList,SaveCheckedInventory,getInventoryDetail,modifyInventory,deleteInventory,getStockBatchNumber,getGoodWarehouseList } from "@/api/stock"
 export default {
     name: "inventory",
     data() {
@@ -398,7 +480,10 @@ export default {
                 good_origin_place:"",
                 report_count:"",
                 total:"",
-
+                expiry_date:"",
+                product_date:"",
+                number:"",
+                proof_count:"",
             },
          manufacturerList:[],
          dealerList:[],
@@ -416,7 +501,9 @@ export default {
          checkDialogVisible:false,
          editPriceDialogVisible:false,
          modefiyePriceDialogVisible:false,
+         proofPriceDialogVisible:false,
          id:0,
+         numberList:[],
         }
     },
     methods:{
@@ -462,6 +549,8 @@ export default {
         },
          handleSelect(val){
             console.log("val232323223",val)
+            this.getStockBatchNumber(val.good_id)
+            this.getGoodWarehouseList(val.good_id)
             this.form.id = val.id
             this.form.good_id = val.good_id,
             this.form.good_name = val.good_name
@@ -475,10 +564,12 @@ export default {
             this.form.buy_price = val.buy_price
             this.form.warehousing_unit = val.packing_unit  
             this.form.total = val.total
-           
+            this.form.number = val.number
+            this.form.expiry_date = val.expiry_date
+            this.form.product_date = val.product_date
         },
         search(){
-
+          this.getlist()
         },
         print(){
           if(this.ids == ""){
@@ -512,7 +603,7 @@ export default {
             good_name:this.form.good_name,
             specification_name:this.form.specification_name,
             warehousing_unit:this.form.warehousing_unit,
-            count:parseInt(this.form.count),
+            count:this.form.count,
             buy_price:this.form.buy_price.toString(),
             packing_price:this.form.packing_price.toString(),
             manufacturer:this.form.manufacturer,
@@ -522,12 +613,27 @@ export default {
             warehousing_order:this.form.warehousing_order,
             dealer:this.form.dealer,
             start_time:this.getTime(new Date()),
+            product_date:this.form.product_date,
+            expiry_date:this.form.expiry_date,
+            number:this.form.number,
+            warehousing_info_id:0,
+            total:this.form.total,
+
            } 
            this.tableData.push(obj)
         },
       saveInventory(){
         for(let i=0;i<this.tableData.length;i++){
+           for(let j=0;j<this.numberList.length;j++){
+              if(this.tableData[i].number == this.numberList[j].number){
+                this.tableData[i].warehousing_info_id = this.numberList[j].id
+              }
+              this.tableData[i].expiry_date = parseInt(this.tableData[i].expiry_date)
+              this.tableData[i].product_date = parseInt(this.tableData[i].product_date)
+           }
+          
           this.tableData[i].count = parseInt(this.tableData[i].count)
+          this.tableData[i].total = parseInt(this.tableData[i].total)
           if(this.tableData[i].manufacturer == 0){
             this.tableData[i].manufacturer = ""
           }
@@ -537,12 +643,15 @@ export default {
         }
         var params = {
          tableData:this.tableData,
-        }  
+        } 
+        console.log("params",params)
+       
        saveInventory(params).then(response=>{
          if(response.data.state == 1){
            var msg = response.data.data.msg
            this.$message.success("保存成功")
            this.dialogVisible = false
+           this.getlist()
          }
        })
       },
@@ -636,6 +745,22 @@ export default {
        this.form.count = ""
        this.form.remark = ""
      },
+     getInventory(id){
+       getInventoryDetail(id).then(response=>{
+          if(response.data.state == 1){
+            var detail =  response.data.data.detail
+            console.log("detial",detail)
+            this.form.good_name = detail.good_name
+            this.form.specification_name = detail.specification_name
+            this.form.count = detail.count
+            this.form.remark = detail.remark
+            this.form.total = detail.total
+            this.id = detail.id
+            this.proofPriceDialogVisible = true
+
+          }
+       })
+     },
      getInventoryDetail(id,check_status){
         if(check_status == 1){
           this.$message.error("已核对的不能编辑")
@@ -722,6 +847,31 @@ export default {
        formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
+     
+     getStockBatchNumber(id){
+       var params = {
+         id:id
+       }
+      getStockBatchNumber(params).then(response=>{
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("批号列表",list)
+          this.numberList = list
+        }
+      })
+     },
+     getGoodWarehouseList(id){
+       var params = {
+          id:id,
+       }
+      getGoodWarehouseList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           this.form.total =  list.stock_count
+           console.log("list23232",list)
+         }
+      })
+     }
     },
     created(){
       this.getlist()

src/xt_pages/stock/stockDamaged.vue

@@ -38,8 +38,8 @@
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
                 <el-button size="small" type="primary" @click="toCheck">核对</el-button>
-                <el-button size="small" type="primary" @click="print">打印</el-button>
-                <el-button size="small" type="primary" @click="exportList">导出</el-button>
+                <!-- <el-button size="small" type="primary" @click="print">打印</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button> -->
             </div>
         </div>
         <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" @selection-change="changePrice">
@@ -536,8 +536,8 @@ export default {
           start_time:this.getTime(new Date()),
           number:this.form.number,
           warehousing_info_id:0,
-          product_date:val.product_date,
-          expiry_date:val.expiry_date,
+          product_date:this.form.product_date,
+          expiry_date:this.form.expiry_date,
         } 
         this.tableData.push(obj)
         this.form.good_id = 0
@@ -588,6 +588,7 @@ export default {
              this.$message.success("保存成功")
              this.dialogVisible = false
              this.getlist()
+            this.tableData = []
             this.form.good_name = ""
             this.form.packing_price = ""
             this.form.warehousing_order = ""

src/xt_pages/stock/stockFlow.vue

@@ -65,6 +65,7 @@
              <span v-if="scope.row.consumable_type == 2">手动出库</span>
              <span v-if="scope.row.consumable_type == 3">自动出库</span>
              <span v-if="scope.row.consumable_type == 4">手动退库</span>
+             <span v-if="scope.row.consumable_type == 5">报损数量</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -73,6 +74,7 @@
             <span v-if="scope.row.consumable_type == 2">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>  
+            <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -212,6 +214,7 @@
           {id:2,name:"手动出库"},
           {id:3,name:"自动出库"},
           {id:4,name:"手动退库"},
+          {id:5,name:"报损数量"},
         ],
         countList:[],
         outCountList:[],

src/xt_pages/stock/stockOutOrder.vue

@@ -185,11 +185,11 @@
               {{ scope.row.good_name }}
             </template>
           </el-table-column>
-          <el-table-column label="耗材类型" align="center">
+          <!-- <el-table-column label="耗材类型" align="center">
             <template slot-scope="scope">
               {{  getTypeName(scope.row.good_type_id)}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="规格&单位" align="center">
             <template slot-scope="scope">
               {{ scope.row.specification_name}} / {{scope.row.packing_unit}}