Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/drug/drug.js

     data: data
   })
 }
+
+export function getDrugInventoryList(params) {
+  return request({
+    url: '/api/drug/getdruginventorylist',
+    methods: 'get',
+    params: params
+  })
+}
+
+export function SaveDrugCheckedInventory(params) {
+  return request({
+    url: '/api/drug/savedrugcheckinventory',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugInventoryDetail(id, params) {
+  return request({
+    url: '/api/drug/getdruginventorydetail?id=' + id,
+    method: 'Get',
+    params: params
+  })
+}
+
+export function modifyInventory(params) {
+  return request({
+    url: '/api/drug/modifyinventory',
+    method: 'Get',
+    params: params
+  })
+}
+
+export function deleteDrugInventory(params) {
+  return request({
+    url: '/api/drug/deletedruginventory',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getDrugInventoryPrintList(params) {
+  return request({
+    url: '/api/drug/getdruginventoryprintlist',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getInventoryDetailList(params) {
+  return request({
+    url: '/api/drug/getinventorydetaillist',
+    method: 'Get',
+    params: params
+  })
+}

src/xt_pages/stock/drugs/inventory.vue

                 >
                 <el-date-picker
                 size="small"
-                v-model="value1"
+                v-model="start_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
                 placeholder="选择日期">
                 </el-date-picker>
                 <el-date-picker
                 size="small"
-                v-model="value2"
+                v-model="end_time"
                 type="date"
                 style="margin-left:5px;width:140px;"
                 placeholder="选择日期">
             </div>
             <div>
                 <el-button size="small" type="primary" @click="dialogVisible = true">新增</el-button>
-                <el-button size="small" type="primary">核对</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">导出</el-button>
+                <el-button size="small" type="primary" @click="exportList">导出</el-button>
             </div>
         </div>
-        <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
-            prop="date"
-            label="盘点编号">
+        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
+           <el-table-column type="selection" width="55" align="center"> </el-table-column>
+            <el-table-column prop="date" label="盘点编号" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.warehousing_order}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="date"
-            label="盘点日期">
+            <el-table-column prop="date" label="盘点日期" align="center">
+                <template slot-scope="scope">
+                  {{getTime(scope.row.start_time)}}
+                </template>
+            </el-table-column>
+             <el-table-column prop="name" label="盘点数量" align="center">
+                <template slot-scope="scope">
+                  {{scope.row.count}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="盘点人">
+            <el-table-column prop="name" label="盘点人" align="center">
+                <template slot-scope="scope">
+                  {{getDoctorName(scope.row.creater)}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="审核日期">
+            <el-table-column prop="name" label="审核日期" align="center">
+                <template slot-scope="scope">
+                  {{getTime(scope.row.checker_time)}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="审核人">
+            <el-table-column prop="name" label="审核人" align="center">
+                <template slot-scope="scope">
+                   {{getDoctorName(scope.row.checker)}}
+                </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="状态">
+            <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>
+              </template>
             </el-table-column>
-            <el-table-column
-            label="操作">
+            <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="text" size="small" >编辑</el-button>
-                  <el-button type="text" size="small" >删除</el-button>
+                  <el-button type="primary" size="small" @click="editInventory(scope.row.id,scope.row.checker_status,scope.$index)">编辑</el-button>
+                  <el-button type="danger" size="small" @click="deleteDrugInventory(scope.row.id,scope.row.checker_status,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :page-sizes="[5, 10, 50, 100]"
-            :page-size="5"
+            :page-sizes="[10, 20, 40, 100]"
+            :page-size="10"
             background
             style="margin-top:20px;text-align: right"
             layout="total, sizes, prev, pager, next, jumper"
                        {{scope.row.retail_price}}
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="新零售价" width="100">
+                <!-- <el-table-column prop="name" label="新零售价" width="100">
                      <template slot-scope="scope">
                        {{scope.row.new_price}}
                     </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column  prop="name" label="生产厂商" width="100">
                     <template slot-scope="scope">
                        {{scope.row.manufacturer}}
             :visible.sync="editdialogVisible"
             width="1200px">
             <el-form :model="form" class="modifyDialog" label-width="120px">
+
                 <el-form-item label="耗材ID">
                     <el-input v-model="form.drug_id"></el-input>
                 </el-form-item>
                 <el-button type="primary" @click="saveInventory">确 定</el-button>
             </span>
         </el-dialog>
+
+      <el-dialog
+        title="药品盘点核对"
+        :visible.sync="checkDialogVisible"
+        width="30%"
+        >
+        <span>
+          <el-form :model="form">
+            <el-row>
+              <el-col>
+                <el-form-item label="核对时间">
+                 <el-date-picker
+                    size="small"
+                    v-model="check_time"
+                    type="date"
+                    style="margin-left:5px;width:140px;"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+             <el-row>
+              <el-col>
+                <el-form-item label="核对人">
+                  <el-select v-model="checker" placeholder="请选择">
+                    <el-option
+                    v-for="item in doctorList"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
+                    </el-option>
+                 </el-select>
+                </el-form-item>  
+              </el-col>
+            </el-row>  
+          </el-form>  
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="checkDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="SaveDrugCheckedInventory">保 存</el-button>
+        </span>
+    </el-dialog>
+
+
+       <el-dialog
+            title="库房调价"
+            :visible.sync="modifydialogVisible"
+            width="1200px">
+            <el-form :model="form" class="modifyDialog" label-width="120px">
+
+                <el-form-item label="耗材ID">
+                    <el-input v-model="form.drug_id"></el-input>
+                </el-form-item>
+                <el-form-item label="药品名称">
+                  <el-autocomplete
+                    class="checkSearch"
+                    popper-class="my-autocomplete"
+                    v-model="form.drug_name"
+                    :fetch-suggestions="querySearchAsync"
+                    :trigger-on-focus="true"
+                    placeholder="请输入药品名称"
+                    @select="handleSelect"
+                    style="width:160px;"
+                  >
+                    <i class="el-icon-search el-input__icon" slot="suffix"></i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.drug_name + item.dose + item.dose_unit + "*" +item.min_number + item.min_unit +"/" + item.max_unit + "  "+item.manufacturer}}</div>
+                  </template>
+                 </el-autocomplete>  
+                </el-form-item>
+                <el-form-item label="规格">
+                    <el-input v-model="form.specification_name" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="单位">
+                    <el-input v-model="form.warehousing_unit"></el-input>
+                </el-form-item>
+                <el-form-item label="进货价">
+                    <el-input v-model="form.last_price"></el-input>
+                </el-form-item>
+                <el-form-item label="零售价">
+                    <el-input v-model="form.retail_price"></el-input>
+                </el-form-item>
+                <el-form-item label="盘点数量">
+                    <el-input v-model="form.count"></el-input>
+                </el-form-item>
+                <el-form-item label="库存">
+                    <el-input v-model="form.total" :disabled="true"></el-input>
+                </el-form-item>
+                <el-form-item label="产地">
+                    <el-input v-model="form.drug_origin_place"></el-input>
+                </el-form-item>
+                <el-form-item label="批准文号">
+                    <el-input v-model="form.number"></el-input>
+                </el-form-item>
+                <el-form-item label="生产厂商">
+                    <el-input v-model="form.manufacturer"></el-input>
+                </el-form-item>
+                <el-form-item label="备注">
+                    <div style="display:flex;">
+                        <el-input v-model="form.remark"></el-input>
+                    </div>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="modifydialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="modifyInventory">确 定</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
 
 <script>
 import { uParseTime } from '@/utils/tools'
-import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory} from "@/api/drug/drug"
+import { postSearchDrugWarehouseList,getDrugWarehouseInfoList,saveDrugInventory,getDrugInventoryList,SaveDrugCheckedInventory,getDrugInventoryDetail,modifyInventory} from "@/api/drug/drug"
 export default {
     name: "drugInventory",
     data() {
             },
             total: 0,
             editdialogVisible:false,
+            limit:10,
+            page:1,
+            start_time:"",
+            end_time:"",
+            tableList:[],
+            doctorList:[],
+            checkDialogVisible:false,
+            ids:"",
+            checker:this.$store.getters.xt_user.user.id,
+            check_time:new Date(),
+            id:"",
+            modifydialogVisible:false,
         }
     },
     methods:{
 
         },
         print(){
-            this.$router.push({path:'/stock/stockModifyPricePrint'})
+          if(this.ids == ""){
+           this.$message.error("请勾选打印数据")
+           return false
+          }
+          this.$router.push({path:'/stock/drugs/inventoryPrint?ids='+this.ids})
             
         },
-        handleSizeChange(){},
-        handleCurrentChange(){},
+        handleSizeChange(val){
+          this.limit = val
+          this.getlist()
+        },
+        handleCurrentChange(val){
+          this.page = val
+          this.getlist()
+        },
         querySearchAsync(keyword, cb) {
             let key = '';
             if (keyword != undefined) {
                if(this.tableData[i].manufacturer == 0){
                 this.tableData[i].manufacturer = ""
               }
+              if(this.tableData[i].batch_number == undefined){
+                 this.tableData[i].batch_number = ""
+              }
            }
            var params = {
               tableData:this.tableData
               this.editdialogVisible = false
             }
           })
-        }
+        },
+        getlist(){
+          var params = {
+            limit:this.limit,
+            page:this.page,
+            keyword:this.searchKey, 
+            start_time:this.start_time,
+            end_time:this.end_time,
+          }
+          console.log("params2332332",params)
+          getDrugInventoryList(params).then(response=>{
 
+            if(response.data.state == 1){
+              this.total =  response.data.data.total
+              this.tableList = response.data.data.list
+              console.log("09999999",this.tableList)
+              console.log("表格",this.tableList)
+              this.doctorList =  response.data.data.doctorList
+              console.log("医生",this.doctorList)
+
+            }
+          })
+        },
+        getDoctorName(id){
+          var name = ""
+          for(let i=0;i<this.doctorList.length;i++){
+            if(id == this.doctorList[i].admin_user_id){
+                name = this.doctorList[i].user_name
+            }
+          }
+          return name
+        },
+     changePrice(val){  
+        var arr = []
+        for(let i=0;i<val.length;i++){
+            arr.push(val[i].id)
+        }
+        var str = arr.join(",") 
+        console.log("str",str)
+        this.ids = str
+        },
+      toCheck(){
+        if(this.ids.length <=0){
+            this.$message.error("请勾选核对数据")
+            return
+        }else{
+            this.checkDialogVisible = true
+        }
+     },
+      SaveDrugCheckedInventory(){
+         var params = {
+            ids:this.ids,
+            check_time:this.getTime(this.check_time),
+            checker:this.checker,
+         }
+       console.log("params",params)
+       SaveDrugCheckedInventory(params).then(response=>{
+         if(response.data.state == 1){
+           this.$message.success("保存成功")
+           var msg = response.data.data.msg
+           this.checkDialogVisible = false
+           this.getlist()
+         }
+       })
+     },
+     editInventory(id,check_status){
+      if(check_status == 1){
+        this.$message.error("已核对不能编辑")
+        return false
+      }
+       getDrugInventoryDetail(id).then(response=>{
+         if(response.data.state == 1){
+            var detail = response.data.data.detail
+            this.id = detail.id
+            this.form.drug_id = detail.drug_id
+            this.form.drug_name = detail.drug_name
+            this.form.specification_name = detail.specification_name
+            this.form.retail_price = detail.retail_price
+            this.form.warehousing_order =detail.warehousing_order
+            this.form.number = detail.number
+        
+            this.form.manufacturer = detail.manufacturer
+            this.form.remark = detail.remark
+            this.form.warehousing_unit = detail.warehousing_unit
+            this.form.total = parseInt(detail.total)
+        
+            this.form.last_price = detail.last_price
+          
+            this.form.count =  parseInt(detail.count)
+            this.form.drug_origin_place = detail.drug_origin_place
+            this.modifydialogVisible = true
+         }
+       })
+     },
+     modifyInventory(){
+       var params = {
+          id:this.id,
+          drug_id:this.form.drug_id,
+          drug_name:this.form.drug_name,
+          specification_name:this.form.specification_name,
+          warehousing_unit:this.form.warehouseing_unit,
+          last_price:this.form.last_price,
+          retail_price:this.form.retail_price,
+          count:this.form.count,
+          total:this.form.total,
+          drug_origin_place:this.form.drug_origin_place,
+          batch_number:this.form.batch_number,
+          manufacturer:this.form.manufacturer,
+          remark:this.form.remark,
+       }
+      modifyInventory(params).then(response=>{
+         if(response.data.state == 1){
+           var inventory =  response.data.data.inventory
+           this.modifydialogVisible = false
+           this.getlist()
+         }
+      })
+     },
+     deleteDrugInventory(id,check_status){
+       if(check_status == 1){
+          this.$message.error("已核对的不能编辑")
+          return
+        }
+        this.$confirm('是否删除所选内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let params = {
+            id:id,
+          }
+       deleteDrugInventory(params).then(response => {
+            if (response.data.state == 1) {
+              var msg = response.data.data.msg
+              this.$message.success("保存成功")
+              this.tableList.splice(index,1)
+            } 
+          })
+        }).catch(() => {
+          this.loading = false
+        });   
+     },
+       exportList(){
+       
+         import('@/vendor/Export2Excel').then(excel => {
+         const tHeader = ['药品名称', '规格', '单位','零售价','当前库存','盘点数','亏损金额']
+         const filterVal = ['drug_name', 'spe', 'count','retail_price','total','count','']
+         const data = this.formatJson(filterVal, this.tableList)
+      
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '耗材盘点'
+         })
+          this.downloadLoading = false
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
     },
     created(){
+      this.getlist()
     },
     mounted() {
     },

src/xt_pages/stock/drugs/inventoryDetails.vue

     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
-                耗材类别：
+                <!-- 耗材类别：
                 <el-select v-model="value" size="small" placeholder="请选择">
                     <el-option
                     v-for="item in options"
                     :label="item.label"
                     :value="item.value">
                     </el-option>
-                </el-select>
+                </el-select> -->
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"
                 >搜索</el-button
                 >
             </div>
-            <div>
+            <!-- <div>
                 <el-button size="small" type="primary" @click="print">打印</el-button>
                 <el-button size="small" type="primary">导出</el-button>
-            </div>
+            </div> -->
         </div>
         <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-            <el-table-column
-            prop="date"
-            label="耗材名称"
-            width="100">
+            <el-table-column prop="date" label="药品名称" width="100" align="center">
+               <template slot-scope="scope">
+                 {{scope.row.drug_name}}
+               </template>
             </el-table-column>
-            <el-table-column
-            prop="date"
-            label="类别"
-            width="100">
+            <el-table-column  prop="name" label="规格" width="100"  align="center">
+              <template slot-scope="scope">
+                 {{scope.row.specification_name}}
+               </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="规格"
-            width="100">
-            </el-table-column>
-            <el-table-column
-            prop="name"
-            label="单位"
-            width="100">
+            <el-table-column prop="name" label="单位" width="100"  align="center">
+                <template slot-scope="scope">
+                  {{scope.row.warehousing_unit}}
+               </template>
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="库存数量"
-            width="100">
+            <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">
+            <el-table-column prop="name" label="进价" width="100"  align="center">
+                <template slot-scope="scope">
+                   {{scope.row.last_price}}
+                </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="零售价"
-            width="100">
+            <el-table-column prop="name" label="零售价" width="100"  align="center">
+                <template slot-scope="scope">
+                  {{scope.row.retail_price}}
+                </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="零售总价"
-            width="100">
+            <el-table-column prop="name"  label="零售总价" width="100"  align="center">
+                <template slot-scope="scope">
+                  {{scope.row.count * scope.row.retail_price}}
+                </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="产地"
-            width="100">
+            <el-table-column prop="name" label="产地" width="100"  align="center">
+                <template slot-scope="scope">
+                   {{scope.row.drug_origin_place}}
+                </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="生产厂商"
-            width="100">
+            <el-table-column prop="name" label="生产厂商" width="100"  align="center">
+                <template slot-scope="scope">
+                  {{scope.row.manufacturer}}
+                </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="实盘点"
-            width="100">
+            <el-table-column prop="name" label="实盘点" width="100"  align="center">
+               <template slot-scope="scope">
+                  {{scope.row.count}}
+                </template> 
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="亏损价格"
-            width="100">
+            <el-table-column  prop="name" label="亏损价格" width="100"  align="center">
+               <template slot-scope="scope">
+               
+                </template>  
             </el-table-column>
-            <el-table-column
-            prop="name"
-            label="生产日期"
-            width="100">
+            <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-column
-            prop="name"
-            label="有效日期"
-            width="100">
+            <el-table-column prop="name" label="有效日期" width="100"  align="center">
+                <template slot-scope="scope">
+                   {{getTime(scope.row.expiry_date)}}
+                </template>  
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
             fixed="right"
             width="100"
             label="操作">
                     <el-button type="text" size="small">删除</el-button>
                     <el-button type="text" size="small">编辑</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
         <el-pagination
             @size-change="handleSizeChange"
             :total="total"
         >
         </el-pagination>
-        <el-dialog
-        title="库房调价"
-        :visible.sync="dialogVisible"
-        width="1200px"
-        :before-close="handleClose">
-            <el-form :model="form" class="modifyDialog" label-width="120px">
-                <el-form-item label="耗材ID">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="药品名称">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="规格">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="单位">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="进货价">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="零售价">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="报损数量">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="库存">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="产地">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="批准文号">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="生产厂商">
-                    <el-input v-model="form.name"></el-input>
-                </el-form-item>
-                <el-form-item label="备注">
-                    <div style="display:flex;">
-                        <el-input v-model="form.name"></el-input>
-                        <el-button style="margin-left:5px;" type="primary">添加</el-button>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <el-table :data="tableData" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
-                <el-table-column
-                prop="date"
-                label="耗材ID"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="date"
-                label="耗材名称"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="规格"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="单位"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="调价数量"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="原进货价"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="原零售价"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="新零售价"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="生产厂商"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="产地"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="批准文号"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                prop="name"
-                label="备注"
-                width="100">
-                </el-table-column>
-                <el-table-column
-                fixed="right"
-                width="100"
-                label="操作">
-                    <template slot-scope="scope">
-                        <el-button type="text" size="small">删除</el-button>
-                        <el-button type="text" size="small">编辑</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
-            </span>
-        </el-dialog>
+      
     </div>
 </template>
 
 <script>
+import { uParseTime } from '@/utils/tools'
+import { getInventoryDetailList } from "@/api/drug/drug"
 export default {
     name: "inventory",
     data() {
                 name: '',
             },
             total: 0,
+            limit:10,
+            page:1,
             
         }
     },
             this.$router.push({path:'/stock/drugs/inventoryPrint'})
             
         },
-        handleSizeChange(){},
-        handleCurrentChange(){}
+        handleSizeChange(val){
+         this.limit = val
+         this.getlist()
+        },
+        handleCurrentChange(val){
+          this.page = val
+          this.getlist()
+        },
+        getlist(){
+            var params = {
+              limit:this.limit,
+              page:this.page,
+              keyword:this.searchKey,
+            }
+           console.log("parasm232332323",params)
+          getInventoryDetailList(params).then(response=>{
+             if(response.data.state == 1){
+              this.total =  response.data.data.total
+              this.tableData = response.data.data.list
+              this.doctorList = response.data.data.doctorList
+             }
+          })   
+        },
+         getTime(val) {
+          console.log("val3233232322323",val)
+         if(val == undefined){
+           return  ""
+         }
+         if(val < 0){
+            return ""
+          }
+         if(val == ""){
+            return ""
+          }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+         }
+        },
 
     },
     created(){
+      this.getlist()
     },
     mounted() {
     },

src/xt_pages/stock/drugs/inventoryPrint.vue

                         <td>盘点数</td>
                         <td>亏损金额</td>
                     </tr>
-                    <tr v-for="item in 3">
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
-                        <td></td>
+                    <tr v-for="(item,index) in tableData" :key="index">
+                        <td>{{index+1}}</td>
+                        <td>{{item.drug_name}}</td>
+                        <td>{{item.warehouseing_unit}}</td>
+                        <td>{{item.retail_price}}</td>
+                        <td>{{item.total}}</td>
+                        <td>{{item.count}}</td>
+                        <td></td>       
                     </tr>
                 </table>
                 <div style="margin-top:10px;">
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
 const moment = require('moment');
 import { uParseTime } from '@/utils/tools'
+import { getDrugInventoryPrintList } from "@/api/drug/drug"
 export default {
     components:{
         BreadCrumb
             { path: false, name: '药品管理' },
             { path: false, name: '药品盘点打印' },
           ],
+          ids:"",
+          tableData:[]
         }
     },
     methods:{
             scanStyles: false
             })
         },
-
+        getDrugInventoryPrintList(ids){
+             var params = {
+                 ids:ids,
+             }
+          console.log("parasm2232",params)
+          getDrugInventoryPrintList(params).then(response=>{
+              if(response.data.state == 1){
+                 this.tableData = response.data.data.list
+              }
+          })    
+        }
 
     },
     created(){
+      this.ids = this.$route.query.ids
+      this.getDrugInventoryPrintList(this.ids)
     }
 }
 </script>

src/xt_pages/stock/inventory.vue

                 <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">>
+        <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"  @selection-change="changePrice">
             <el-table-column type="selection" width="55" align="center"> </el-table-column>
             <el-table-column prop="date" label="盘点编号"  align="center">
               <template slot-scope="scope">

src/xt_pages/user/dialysisSolution.vue

             <el-form-item label="促红素:">
               <el-select v-model="addPlan.epo" @change="changeBodyFluid">
                 <el-option
-                        v-for="item in epo"
+                        v-for="item in epoOptions"
                         :label="item.name"
                         :key="item.id"
                         :value="item.name"

src/xt_pages/user/templateSummary.vue

                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="text" v-model="form.template_summary_content"></el-input>
+                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="text" v-model="form.template_plan_content"></el-input>
+                     <el-input style="margin:10px 0;" type="textarea"  autosize v-model="form.template_plan_content"></el-input>
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="text" v-model="form.template_summary_content"></el-input>
+                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_summary_content"></el-input>
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结个体化透析方案</span> : </label>
                         :value="item.value">
                         </el-option>
                      </el-select>
-                     <el-input style="margin:10px 0;" type="text" v-model="form.template_plan_content"></el-input>
+                     <el-input style="margin:10px 0;" type="textarea" autosize v-model="form.template_plan_content"></el-input>
                   </el-row>
                   <el-row>
                     <label class="title"><span class="name">阶段小结化验结果</span> : </label>

src/xt_pages/workforce/components/tableWeeks.vue

         let desc = ''
         for (let b = 0; b < modes.length; b++) {
           if (desc.length == 0) {
-            desc = modes[b].name + ': ' + modes[b].count + '支'
+            desc = modes[b].name + ': ' + modes[b].count
           } else {
-            desc = desc + '              ' + modes[b].name + ': ' + modes[b].count + '支'
+            desc = desc + '              ' + modes[b].name + ': ' + modes[b].count
           }
         }
 

src/xt_pages/workforce/next_remind_print.vue

                  <span v-if="org_id!=9987">
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
                         <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                        <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
+                        <!-- <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
+                         <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                      </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>

src/xt_pages/workforce/remind_print.vue

                 </td>
                 <td :width="td_1_width" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus ==1">
                   <span v-if="org_id!=9987">
-                     <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus!=''"> 
-                       <span v-if="org_id!=10131">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
-                       <span v-if="org_id==10131">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span> 
+                     <span > 
+                       <span v-if="org_id!=10131 && main_collection.prescription.dialyzer_perfusion_apparatus!=''">{{main_collection.prescription.dialyzer_perfusion_apparatus}}</span> 
+                       <!-- <span v-if="org_id==10131 || org_id==9671">{{getDialysisDialyszerPerfusionOne(main_collection.prescription.patient_id)}}</span>  -->
+                       <span v-if="org_id==10131 || org_id==9671">{{main_collection.dialysissolution.dialyzer_perfusion_apparatus}}</span>
                       </span>
                      <span v-if="main_collection.prescription.dialyzer_perfusion_apparatus ==''&& main_collection.dialysissolution.length>0">{{getDialysisDialyszerPerfusion(main_collection.patient_id)}}</span> 
                   </span>
     created() {
       this.getPrintList()
       this.org_id = this.$store.getters.xt_user.org.id
+      console.log("org_id23322323",this.org_id)
     //  this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
        getScheduleList(params).then(response=>{
          if(response.data.state ==1){
            var list = response.data.data.list
+           console.log("list2323323",list)
            for(let i=0;i<list.length;i++){
               list[i].sort = list[i].number.sort
            }
             }
           }
         }
+        console.log("name232333223",name)
        return name
      }
     },

src/xt_pages/workforce/template.vue

         </el-button>
 
         <!--<upload-excel style="float:right;" :on-success='handleSuccess' :before-upload="beforeUpload"></upload-excel>-->
-        <schedule-template-upload-excel style="margin-right:10px;" :on-success='handleSuccess'
-                                        :before-upload="beforeUpload"></schedule-template-upload-excel>
+        <schedule-template-upload-excel style="margin-right:10px;" :on-success='handleSuccess'></schedule-template-upload-excel>
 
 
         <el-button size="small" icon="el-icon-setting" type="primary" @click="setScheduleTemplateAction">设置模板</el-button>
 
 
         })
-      },
-      beforeUpload(){
-
       },
       handleSuccess({ results, header }) {
-         consle.log("result32eeeeeeee",results)
+        
         let headers = []
         for (let key in results[0]) {
           headers.push(key)