导出

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -124,8 +124,24 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
+
+             <el-tooltip
+              class="item"
+              effect="dark"
+              content="详情"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="warning"
+                icon="el-icon-document"
+                @click="handleSearch(scope.row.id)"
+              >
+              </el-button>
+            </el-tooltip>
+            
             <el-tooltip
               class="item"
               effect="dark"
@@ -170,6 +186,102 @@
       >
       </el-pagination>
     </div>
+
+
+    <el-dialog
+      title="药品详细"
+      :visible.sync="dialogVisible"
+      width="60%">
+      <span>
+          <el-table
+          :data="WarehouseInfo.warehouseInfoDate"
+          :class="signAndWeighBoxPatients"
+          style="width: 100%"
+          border
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug.drug_name
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug?scope.row.drug.drug_spec:''
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.price }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>入库数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.warehousing_count }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{ calculate(scope.row.price * scope.row.warehousing_count) }}
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" min-width="25">
+            <template slot="header" slot-scope="scope">
+              <span>批号</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{ scope.row.number }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="生产日期" min-width="40" align="center">
+            <template v-if="scope.row.product_date != 0" slot-scope="scope">
+              {{ scope.row.product_date | parseTime("{y}-{m}-{d}") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="有效日期" min-width="40" align="center">
+            <template v-if="scope.row.expiry_date != 0" slot-scope="scope">
+              {{ scope.row.expiry_date | parseTime("{y}-{m}-{d}") }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-popover placement="top-start" width="250" trigger="hover">
+                <div>{{ scope.row.remark }}</div>
+                <span slot="reference" v-if="scope.row.remark.length > 20">{{
+                  scope.row.remark.substr(0, 20) + "..."
+                }}</span>
+                <span slot="reference" v-else>{{ scope.row.remark }}</span>
+              </el-popover>
+            </template>
+          </el-table-column>
+        </el-table>
+      </span>
+      <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>
 
@@ -180,7 +292,8 @@ import {
   deleteDrugWarehouseInfo,
   GetAllConfig,
   getDrugWarehouseInfoList,
-  getDrugWarehouseList
+  getDrugWarehouseList,
+  
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 
@@ -208,7 +321,8 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-
+    
+   
     this.GetWarehouse();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -243,7 +357,9 @@ export default {
         loading: false,
         warehouseInfoDate: []
       },
-      startTime: ""
+      
+      startTime: "",
+      dialogVisible:false
     };
   },
   methods: {
@@ -279,6 +395,7 @@ export default {
         end_time: this.end_time,
         type: this.type
       };
+      console.log("params",Params)
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then(response => {
         if (response.data.state == 0) {
@@ -382,12 +499,14 @@ export default {
       this.GetWarehouse();
     },
     startTimeChange(val) {
+    
       var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
       if (time > 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.start_time = "";
       } else {
         this.startTime = this.getTimestamp(val);
+        this.start_time = val
         this.GetWarehouse();
       }
     },
@@ -397,6 +516,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.end_time = "";
       } else {
+        this.end_time = val
         this.GetWarehouse();
       }
     },
@@ -413,6 +533,31 @@ export default {
         name: "drugStockInDetail",
         query: { id: row.id, type: this.type }
       });
+    
+    },
+    handleSearch(id){
+       this.WarehouseInfo.warehouseInfoDate=[]
+       this.GetOrderDetail(id);
+      this.dialogVisible = true
+    },
+    GetOrderDetail(order_id) {
+      const params = {
+        id: order_id
+      };
+      getDrugWarehouseInfoList(params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          for (let i = 0; i < response.data.data.info.length; i++) {
+            this.WarehouseInfo.warehouseInfoDate = []
+            this.WarehouseInfo.warehouseInfoDate.push(
+              response.data.data.info[i]
+            );
+          }
+          this.WarehouseInfo.warehouse = response.data.data.warehousing;
+        }
+      });
     },
     handleDelete: function(index, row) {
       const ids = [];

src/xt_pages/stock/drugs/drugStockInOrderDetail.vue

@@ -154,8 +154,8 @@ export default {
     return {
       crumbs: [
         { path: false, name: "库存管理" },
-        { path: false, name: "耗材入库单" },
-        { path: false, name: "入库单详情" }
+        { path: false, name: "药品入库单"},
+        { path: false, name: "入库单详情"}
       ],
       crumbs2: [
         { path: false, name: "库存管理" },

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -132,8 +132,24 @@
         </el-table-column>
 
 
-        <el-table-column label="操作" align="center">
+        <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
+           
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="详情"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="warning"
+                icon="el-icon-document"
+                @click="handleSearch(scope.row.id)"
+              >
+              </el-button>
+            </el-tooltip>
+
             <el-tooltip
               class="item"
               effect="dark"
@@ -178,6 +194,157 @@
       >
       </el-pagination>
     </div>
+
+
+    <el-dialog
+      title="出库详细"
+      :visible.sync="dialogVisible"
+      width="60%"
+     >
+      <span>
+        <el-table :data="warehousingOutInfo.warehousingOutData" :class="signAndWeighBoxPatients" style="width: 100%"
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+                  :span-method="merge"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>药品名称</span>
+            </template>
+
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug.drug_name
+              }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>规格名称</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.drug_id != 0">{{
+                scope.row.drug?scope.row.drug.drug_spec:''
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>单价</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.price}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="23" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>出库数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span>{{scope.row.count}}</span>
+
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" min-width="20" align="center">
+            <template slot-scope="scope">
+              {{calculate(scope.row.price*scope.row.count)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="备注" min-width="20" align="center">
+            <template slot-scope="scope">
+              <el-popover placement="top-start" width="250" trigger="hover">
+                <div>{{scope.row.remark}}</div>
+                <span slot="reference"
+                      v-if="scope.row.remark.length > 20">{{ scope.row.remark.substr(0,20)+'...' }}</span>
+                <span slot="reference" v-else>{{ scope.row.remark}}</span>
+              </el-popover>
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="" align="center"  >
+            <template slot-scope="scope" v-if="scope.row.is_sys == 1">
+             <div style="color: #589ff8" @click="jump(scope.row.id)">使用明细</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </span>
+      <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>
+
+
+    <el-dialog
+      title="出库明细"
+      :visible.sync="dialogVisibleTwo"
+      width="60%">
+      <span>
+         <div class="app-container">
+
+      <div class="filter-container">
+        <span style="font-size: 18px;color: #606266">商品使用明细</span>
+      </div>
+
+      <div class="cell clearfix">
+        <span style="width: 300px;color: #606266" v-if="userList.length>0">商品类型: {{userList[0].drug.drug_name}} </span>
+        <span style="width: 300px;color: #606266" v-if="userList.length>0">规格名称: {{userList[0].drug.drug_spec}}</span>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table :data="userList" :class="signAndWeighBoxPatients" style="width: 50%"
+                  border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>序号</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.$index+1}}</span>
+              <span v-if="scope.row.is_total == 1">{{'合计'}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用人</span>
+            </template>
+            <template slot-scope="scope">
+              <span v-if="scope.row.is_total == 0">{{scope.row.user.name}}</span>
+              <span v-if="scope.row.is_total == 1"></span>
+            </template>
+          </el-table-column>
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用数量</span>
+            </template>
+            <template slot-scope="scope">
+              <span >{{scope.row.count}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column min-width="35" align="center">
+            <template slot="header" slot-scope="scope">
+              <span>使用时间</span>
+            </template>
+            <template slot-scope="scope">
+              <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-row>
+    </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisibleTwo = false">取 消</el-button>
+        <el-button type="primary" @click="dialogVisibleTwo = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -188,7 +355,9 @@ import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
 import {
   deleteDrugWarehouseOut,
   GetAllConfig,
-  getDrugWarehouseOutList
+  getDrugWarehouseOutList,
+  getDrugWarehouseOutInfo,
+  getDrugWarehouseOutUser
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 
@@ -244,7 +413,16 @@ export default {
       manufacturer: [],
       selectedTableData: [],
       dealer: [],
-      type: 1
+      type: 1,
+      dialogVisible:false,
+      dialogVisibleTwo:false,
+      warehousingOutInfo: {
+      loading: false,
+       warehousingOutData: [],
+       info: {}
+      },
+      userList:[],
+     
     };
   },
   methods: {
@@ -389,6 +567,32 @@ export default {
         query: { id: row.id, type: this.type }
       });
     },
+    handleSearch(id){
+      this.warehousingOutInfo.warehousingOutData = []
+      this.GetOrderDetail(id)
+      this.dialogVisible = true
+      
+    },
+    GetOrderDetail(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getDrugWarehouseOutInfo(params).then(response => {
+          if (response.data.state == 0) {
+
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.warehousingOutInfo.warehousingOutData=[]
+            for (let i = 0; i < response.data.data.list.length; i++) {
+
+              this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+            }
+            this.warehousingOutInfo.info = response.data.data.info
+            this.handleSpanTempArr()
+          }
+        })
+      },
     handleDelete: function(index, row) {
       const ids = [];
       ids.push(row.id);
@@ -479,7 +683,84 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+
+    jump(id){
+      this.GetOrderDetailTwo(id)
+      this.userList=[]
+    },
+
+     GetOrderDetailTwo(order_id) {
+        const params = {
+          'id': order_id
+        }
+        getDrugWarehouseOutUser(params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            var total = 0
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              var obj = response.data.data.list[i]
+              obj['is_total'] = 0
+              this.userList.push(obj)
+              total = total + response.data.data.list[i].count
+            }
+            this.userList=[]
+            this.userList.push({
+              is_total: 1,
+              total: total,
+            })
+
+            console.log(this.userList)
+          }
+        })
+      },
+       merge({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+          const _row = this.tempArr[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      },
+      handleSpanTempArr(){
+        this.tempArr = []
+
+        for (let i = 0; i < this.warehousingOutInfo.warehousingOutData.length; i++) {
+          if (i === 0) {
+            this.tempArr.push(1)
+            this.pos = 0
+          } else {
+            // 判断当前元素与上一个元素是否相同
+            if (this.warehousingOutInfo.warehousingOutData[i].drug_id === this.warehousingOutInfo.warehousingOutData[i - 1].drug_id) {
+              this.tempArr[this.pos] += 1
+              this.tempArr.push(0)
+            } else {
+              this.tempArr.push(1)
+              this.pos = i
+            }
+          }
+        }
+
+        let sameRowArr = [], sIdx = 0
+        this.warehousingOutInfo.warehousingOutData.forEach((item, index) => {
+          item.index = index
+          if (index === 0) {
+            sameRowArr.push([index])
+          } else {
+            if (item.drug_id === this.warehousingOutInfo.warehousingOutData[index - 1].drug_id) {
+              sameRowArr[sIdx].push(index)
+            } else {
+              sIdx = sIdx + 1
+              sameRowArr.push([index])
+            }
+          }
+        })
+        this.sameRowArr = sameRowArr
+      }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -152,7 +152,8 @@
           return ''
         }
         return Math.round(parseFloat(val) * 100) / 100
-      }, GetOrderDetail: function(order_id) {
+      },
+       GetOrderDetail: function(order_id) {
         const params = {
           'id': order_id
         }
@@ -202,12 +203,14 @@
         })
       }, editRecord: function() {
         this.$emit('edit-record')
-      },jump(row){
+      },
+      jump(row){
         this.$router.push({
           name: 'drugStockUserDetail',
           query: { id: row.id }
         })
-      },merge({ row, column, rowIndex, columnIndex }) {
+      },
+      merge({ row, column, rowIndex, columnIndex }) {
         if (columnIndex === 0) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0

src/xt_pages/stock/stockInOrder.vue

@@ -1092,7 +1092,7 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          console.log("2223333-------",response.data.data.info)
+          
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
             response.data.data.info[i].product_date = this.getTime(

src/xt_pages/stock/stockInOrderDetail.vue

@@ -37,6 +37,7 @@
       </div>
 
       <div class="cell clearfix" style="margin-top: 10px">
+     
         <el-button size="small" icon="el-icon-edit" @click="editRecord"
           >编辑</el-button
         >