修改库存

src/api/stock.js

@@ -536,3 +536,11 @@ export function getCancelStockConfig(params) {
   })
 }
 
+export function getStockDetail(params) {
+  return request({
+    url: '/api/stock/detail',
+    method: 'get',
+    params: params
+  })
+}
+

src/lang/zh.js

@@ -151,7 +151,8 @@ export default {
     stockInDetail: '入库单详情',
     salesReturnDetail: '退货单详情',
     stockOutDetail: '出库单详情',
-    cancelStockDetail: '出库退库单详情'
+    cancelStockDetail: '出库退库单详情',
+    stockDetail:'出入库明细查询',
 
   },
   navbar: {

src/xt_pages/stock/cancelStockOrder.vue

@@ -12,7 +12,7 @@
 
 
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -164,6 +164,7 @@
           { path: false, name: '库存管理' },
           { path: '/stock/cancel', name: '出库退库单' }
         ],
+        searchKey:'',
         type: 1,
         page: 1,
         limit: 7,
@@ -186,6 +187,28 @@
       }
     },
     methods: {
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getCancelStockList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
       },
@@ -245,14 +268,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -268,7 +268,12 @@
         tempObj['return_count'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
       }, calculate: function(val) {
         if (val == 0) {
           return ''

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -341,6 +341,19 @@
             this.form.manufacturer = this.cancelStock.manufacturer
             this.form.dealer = this.cancelStock.dealer
           }
+          if( this.recordInfo.recordData.length == 0){
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['good_type_id'] = 0
+            tempObj['good_id'] = 0
+            tempObj['count'] = ''
+            this.recordInfo.recordData.push(tempObj)
+
+
+
+          }
+
+
         })
       }
     },

src/xt_pages/stock/config/dealer.vue

@@ -12,7 +12,7 @@
       <el-col>
         <!--<el-button type="primary" style="float:right;"  @click="showDialog">新增经销商</el-button>-->
 
-        <div>经销商
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
         </div>
 
@@ -71,7 +71,7 @@
                   @click="handleDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              
+
               <!--<el-button-->
                 <!--size="mini"-->
                 <!--type="primary"-->

src/xt_pages/stock/config/goodInfo.vue

@@ -13,7 +13,7 @@
       <el-col>
 
 
-        <div>物品信息
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showInfoDialog">新增</el-button>
         </div>
 
@@ -63,7 +63,7 @@
                   @click="handleGoodInfoEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">              
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
                   size="small"
                   type="danger"
@@ -71,7 +71,7 @@
                   @click="handleGoodInfoDelete(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              
+
               <!--<el-button-->
                 <!--size="mini"-->
                 <!--type="primary"-->

src/xt_pages/stock/config/goodType.vue

@@ -10,7 +10,7 @@
     <el-row :gutter="15">
       <el-col>
 
-        <div>物品类型
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
         </div>
 

src/xt_pages/stock/config/manufacturer.vue

@@ -11,7 +11,7 @@
     <el-row>
       <el-col>
 
-        <div>厂家
+        <div>
           <el-button size="small" icon="el-icon-circle-plus-outline" style="float: right;margin-bottom: 15px" type="primary" @click="showDialog">新增</el-button>
         </div>
 
@@ -59,7 +59,7 @@
                   @click="handleEdit(scope.$index, scope.row)">
                 </el-button>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">              
+              <el-tooltip class="item" effect="dark" content="删除" placement="top">
                 <el-button
                   size="small"
                   type="danger"

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -0,0 +1,453 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+        >
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.order_number}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.CancelStock.return_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.CancelStock.creater)}}
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+
+  export default {
+    name: 'cancelStockDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+        searchKey:'',
+        type: 4,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+      },
+      getTypeName:function(row){
+        let name = ""
+        let name2 = ""
+        if (row.type == 1){
+          name = "耗材退库单"
+
+        }else if(row.type == 2){
+          name = "其他退库单"
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetCancelStock()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetCancelStock()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/detail/salesReturnDetail.vue

@@ -0,0 +1,456 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.order_number}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.SalesReturn.return_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.SalesReturn.creater)}}
+
+            </template>
+          </el-table-column>
+
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+
+  export default {
+    name: 'salesReturnDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+        searchKey:'',
+        type: 3,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+
+      },
+      getTypeName:function(row){
+        let name = ""
+        if (row.type == 1){
+          name = "耗材退货单"
+
+        }else if(row.type == 2){
+          name = "其他退货单"
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetCancelStock()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetCancelStock()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -0,0 +1,465 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix">
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehousing_order}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.Warehousing.warehousing_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.Warehousing.creater)}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price * scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+  export default {
+    name: 'stockInDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+
+        searchKey: '',
+        type: 1,
+        page: 1,
+        limit: 7,
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+
+      }, changeDealer: function(val) {
+        this.dealer_id  = val
+        this.GetCancelStock()
+
+      }, getTypeName: function(row) {
+        let name = ''
+        if (row.type == 1) {
+          name = '耗材入库单'
+
+        } else if (row.type == 2) {
+          name = '其他入库单'
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type } })
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id, type: this.type } })
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -0,0 +1,468 @@
+<template>
+  <div class="main-contain">
+    <div class="app-container">
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">单据类型</span> : </label>
+        <el-select v-model="order_type" clearable placeholder="单据类型" @change="changeType">
+          <el-option
+            v-for="item in orderTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">其它</span> : </label>
+        <el-select v-model="manufacturer_id" clearable placeholder="厂商" @change="changeManufacturer">
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.id"
+            :label="item.manufacturer_name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </div>
+
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehouse_out_order_number}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.WarehouseOut.warehouse_out_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.WarehouseOut.creater)}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.count}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price *  scope.row.count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+
+
+  export default {
+    name: 'stockOutDetail',
+
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        orderTypeArr: [
+          { value: 1, label: '耗材入库单' },
+          { value: 2, label: '其他入库单' }
+        ],
+        manufacturer_id: '',
+        dealer_id: '',
+        order_type: '',
+
+        searchKey:'',
+        type: 2,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      changeType: function(val) {
+        this.order_type  = val
+        this.GetCancelStock()
+      }, changeManufacturer: function(val) {
+        this.manufacturer_id  = val
+        this.GetCancelStock()
+
+      },
+      getTypeName:function(row){
+        let name = ""
+        let name2 = ""
+        if (row.type == 1){
+          name = "耗材出库单"
+
+        }else if(row.type == 2){
+          name = "其他出库单"
+        }
+
+        return name
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          manufacturer: this.manufacturer_id,
+          order_type: this.order_type,
+          dealer: this.dealer_id
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetCancelStock()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetCancelStock()
+      }, startTimeChange(val) {
+        this.GetCancelStock()
+      }, endTimeChange(val) {
+        this.GetCancelStock()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/otherCancelStockOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -163,6 +163,7 @@
           { path: false, name: '库存管理' },
           { path: '/stock/cancel', name: '其他出库退库单' }
         ],
+        searchKey:'',
         type: 2,
         page: 1,
         limit: 7,
@@ -185,6 +186,28 @@
       }
     },
     methods: {
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getCancelStockList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
       },
@@ -244,14 +267,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetCancelStock()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/otherSalesReturnOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -169,6 +169,7 @@
     },
     data() {
       return {
+        searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/return', name: '其他退货单' }
@@ -195,6 +196,28 @@
       }
     },
     methods: {
+      search:function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.saleReturnDate = []
+        getSalesReturnList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.saleReturnDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'salesReturnOrderAdd', query: { type: this.type }})
       },
@@ -254,14 +277,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/otherStockInOrder.vue

@@ -10,8 +10,8 @@
     <div class="app-container">
 
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button class="filter-item"  type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
       <div class="cell clearfix">
@@ -163,6 +163,7 @@
     },
     data() {
       return {
+        searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/in/other', name: '其他入库单' }
@@ -197,7 +198,32 @@
       }
     },
     methods: {
-      GetWarehouse: function() {
+      search:function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.Warehouse.warehouseDate = []
+        getWarehouseList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.Warehouse.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Warehouse.loading = false
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.Warehouse.warehouseDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+
+        GetWarehouse: function() {
         const Params = {
           page: this.page,
           limit: this.limit,

src/xt_pages/stock/otherStockOutOrder.vue

@@ -9,7 +9,7 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -165,6 +165,7 @@ export default {
         { path: false, name: "库存管理" },
         { path: "/stock/out", name: "其他出库单" }
       ],
+      searchKey:'',
       page: 1,
       limit: 7,
       checked: false,
@@ -186,6 +187,29 @@ export default {
     };
   },
   methods: {
+    search:function(){
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords:this.searchKey,
+      }
+      this.warehouseOutDate = [];
+      getWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+
+    },
     AddNewOrder: function() {
       this.$router.push({
         name: "stockOutOrderAdd",
@@ -255,17 +279,17 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     startTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     endTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/salesReturnEdit.vue

@@ -353,6 +353,17 @@
             this.form.manufacturer = this.salesReturn.manufacturer
             this.form.dealer = this.salesReturn.dealer
           }
+
+
+          if( this.recordInfo.recordData.length == 0){
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['good_type_id'] = 0
+            tempObj['good_id'] = 0
+            tempObj['count'] = ''
+            this.recordInfo.recordData.push(tempObj)
+          }
+
         })
       }
     },

src/xt_pages/stock/salesReturnOrder.vue

@@ -11,7 +11,7 @@
     <div class="app-container">
 
       <div class="cell clearfix" >
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -164,6 +164,7 @@
     },
     data() {
       return {
+        searchKey:'',
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/return', name: '退货单' }
@@ -190,6 +191,28 @@
       }
     },
     methods: {
+      search:function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords: this.searchKey,
+        }
+        this.saleReturnDate = []
+        getSalesReturnList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.saleReturnDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
       AddNewOrder: function() {
         this.$router.push({ name: 'salesReturnOrderAdd', query: { type: this.type }})
       },
@@ -249,14 +272,14 @@
         this.multipleSelection = val
       }, handleSizeChange(val) {
         this.limit = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, handleCurrentChange(val) {
         this.page = val
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, startTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, endTimeChange(val) {
-        this.GetWarehouse()
+        this.GetSalesReturn()
       }, calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100
       }, GetConfigInfo: function() {

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -278,7 +278,13 @@
         tempObj['price'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
+
       }, calculate: function(val) {
         if (val == 0) {
           return ''

src/xt_pages/stock/stockDetail.vue

@@ -0,0 +1,451 @@
+<template>
+
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button size="small" @click="AddNewOrder" class="filter-item" style="float:right;" type="primary"
+                 icon="el-icon-circle-plus-outline">新增
+      </el-button>
+    </div>
+
+    <div class="app-container">
+
+
+      <div class="cell clearfix" >
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+      <div class="cell clearfix">
+        <label class="title"><span class="name">日期查询</span> : </label>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+      <div class="filter-container" style="margin-top: 10px">
+        <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+
+      </div>
+
+      <el-row :gutter="12" style="margin-top: 10px">
+        <el-table
+          :data="cancelStockDate"
+          :class="signAndWeighBoxPatients"
+          border
+          highlight-current-row
+          ref="multipleTable"
+          @selection-change="select"
+          :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
+        >
+
+
+
+          <el-table-column label="单据编号" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehousing_order}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="商品类型" align="center">
+            <template slot-scope="scope">
+              {{specificationName(scope.row.good_id)}}
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="单据类型" align="center">
+            <template slot-scope="scope">
+              {{getTypeName(scope.row)}}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="操作时间" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
+            </template>
+          </el-table-column>
+          <el-table-column label="制单人" align="center">
+            <template slot-scope="scope">
+              {{getXuserName(scope.row.creater)}}
+
+            </template>
+          </el-table-column>
+          <el-table-column label="单价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price}}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" align="center">
+            <template slot-scope="scope">
+              {{scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+          <el-table-column label="总价" align="center">
+            <template slot-scope="scope">
+              {{scope.row.price *  scope.row.warehousing_count}}
+            </template>
+          </el-table-column>
+
+        </el-table>
+
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :page-sizes="[7]"
+          :page-size="7"
+          background
+          style="margin-top:20px;float: right"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total">
+        </el-pagination>
+
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+  import { deleteCancelStock, GetAllConfig, getStockDetail } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
+
+  export default {
+    name: 'salesReturnOrder',
+    components: { BreadCrumb },
+    created() {
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth() + 1
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const endTime = year + '-' + month + '-' + day
+      this.end_time = endTime
+
+      var year = new Date().getFullYear()
+      var month = new Date().getMonth()
+      var day = new Date().getDate()
+      if (parseInt(month) < 10) {
+        month = '0' + month
+      }
+      if (parseInt(day) < 10) {
+        day = '0' + day
+      }
+      const startTime = year + '-' + month + '-' + day
+      this.start_time = startTime
+      this.GetCancelStock()
+      this.GetConfigInfo()
+      this.fetchAllAdminUsers()
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/detail', name: '出入库明细查询' }
+        ],
+        searchKey:'',
+        type: 1,
+        page: 1,
+        limit: 7,
+        checked: false,
+        total: 0,
+        pageTotal: 0,
+        pageSelect: 0,
+        adminUserOptions: [],
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        cancelStockDate: [],
+        end_time: '',
+        goodType: [],
+        goodInfo: [],
+        manufacturer: [],
+        selectedTableData: [],
+        dealer: []
+
+      }
+    },
+    methods: {
+      getTypeName:function(row){
+        let name = ""
+        let name2 = ""
+        if (row.type == 1){
+          name = "耗材"
+
+        }else if(row.type == 2){
+          name = "其他"
+        }
+        if (row.types == 1){
+          name2 = "入库单"
+        }else if(row.types == 2){
+          name2 = "出库单"
+        }else if(row.types == 3){
+          name2 = "退货单"
+        }else if(row.types == 4){
+          name2 = "退库单"
+        }
+        return name + name2
+      },
+      specificationName: function(good_info_id) {
+        let name = ''
+        for (let i = 0; i < this.goodInfo.length; i++) {
+          if (this.goodInfo[i].id == good_info_id) {
+            name = this.goodInfo[i].specification_name
+          }
+        }
+        return name
+      },
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      },
+      AddNewOrder: function() {
+        this.$router.push({ name: 'cancelStockOrderAdd', query: { type: this.type }})
+      },
+      GetCancelStock: function() {
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type
+        }
+        this.cancelStockDate = []
+        getStockDetail(Params).then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.cancelStockDate.push(response.data.data.list[i])
+            }
+          }
+        })
+      }, getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (this.adminUserOptions == null || typeof (this.adminUserOptions.length) === 'undefined') {
+          return name
+        }
+        var leng = this.adminUserOptions.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.adminUserOptions[index].id == id) {
+            name = this.adminUserOptions[index].name
+            break
+          }
+        }
+        return name
+      }, fetchAllAdminUsers() {
+        fetchAllAdminUsers().then(response => {
+          console.log(response)
+          if (response.data.state == 1) {
+            this.adminUserOptions = response.data.data.users
+            var alen = this.adminUserOptions.length
+            for (let index = 0; index < alen; index++) {
+              if (this.adminUserOptions[index].user_type == 2) {
+                // this.doctorOptions.push(this.adminUserOptions[index]);
+              }
+            }
+          }
+        })
+      }, handleSelectionChange: function(val) {
+        this.multipleSelection = val
+      }, handleSizeChange(val) {
+        this.limit = val
+        this.GetWarehouse()
+      }, handleCurrentChange(val) {
+        this.page = val
+        this.GetWarehouse()
+      }, startTimeChange(val) {
+        this.GetWarehouse()
+      }, endTimeChange(val) {
+        this.GetWarehouse()
+      }, calculate: function(val) {
+        return Math.round(parseFloat(val) * 100) / 100
+      }, GetConfigInfo: function() {
+        GetAllConfig().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.manufacturer = response.data.data.manufacturer
+            this.dealer = response.data.data.dealer
+            this.goodInfo = response.data.data.goodInfo
+
+          }
+        })
+      }, getManufactuerName: function(manufacturer_id) {
+        for (let i = 0; i < this.manufacturer.length; i++) {
+          if (this.manufacturer[i].id == manufacturer_id) {
+            return this.manufacturer[i].manufacturer_name
+          }
+        }
+      }, getDealerName: function(dealer_id) {
+        for (let i = 0; i < this.dealer.length; i++) {
+          if (this.dealer[i].id == dealer_id) {
+            return this.dealer[i].dealer_name
+          }
+        }
+      }, handleEdit: function(index, row) {
+        this.$router.push({ name: 'cancelStockDetail', query: { id: row.id,type: this.type }})
+      }, handleDelete: function(index, row) {
+        const ids = []
+        ids.push(row.id)
+        const idStr = ids.join(',')
+
+        const params = {
+          ids: idStr
+        }
+
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }, changeAllSelected: function(val) {
+        if (val) {
+          this.$refs.multipleTable.toggleAllSelection()
+        } else {
+          this.$refs.multipleTable.clearSelection()
+        }
+      }, select(selection) {
+        this.selectedTableData = selection
+      }, batchDelete() {
+        if (this.selectedTableData.length <= 0) {
+          this.$message.error('请选择要删除的记录')
+          return
+        }
+        const ids = []
+        for (let i = 0; i < this.selectedTableData.length; i++) {
+          ids.push(this.selectedTableData[i].id)
+        }
+        const idStr = ids.join(',')
+        const params = {
+          ids: idStr
+        }
+        this.$confirm('确认删除出库退库单记录?', '删除出库退库单记录', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteCancelStock(params).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg)
+              return false
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+
+              for (let i = 0; i < ids.length; i++) {
+                for (let y = 0; y < this.cancelStockDate.length; y++) {
+                  if (ids[i] == this.cancelStockDate[y].id) {
+                    this.cancelStockDate.splice(y, 1)
+                  }
+                }
+              }
+            }
+          })
+        }).catch(() => {
+        })
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+
+  }
+
+</style>

src/xt_pages/stock/stockDetailIndex.vue

@@ -0,0 +1,64 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+    </div>
+    <div class="app-container">
+      <div class="service-box">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="入库明细" name="first">
+            <stock-in-detail></stock-in-detail>
+          </el-tab-pane>
+          <el-tab-pane label="退货明细">
+            <sales-return-detail></sales-return-detail>
+
+          </el-tab-pane>
+          <el-tab-pane label="出库明细">
+            <stock-out-detail></stock-out-detail>
+
+          </el-tab-pane>
+          <el-tab-pane label="退库明细">
+           <cancel-stock-detail></cancel-stock-detail>
+          </el-tab-pane>
+
+        </el-tabs>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import StockInDetail from './detail/stockInDetail'
+  import StockOutDetail from './detail/stockOutDetail'
+  import SalesReturnDetail from './detail/salesReturnDetail'
+  import CancelStockDetail from './detail/cancelStockDetail'
+
+  export default {
+    name: 'stockDetailIndex',
+    components: {
+      CancelStockDetail,
+      SalesReturnDetail,
+      StockOutDetail,
+      StockInDetail,
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/detail', name: '出入库明细查询' }
+        ],
+        activeName: 'first'
+      }
+    },
+    methods: {
+      handleClick(tab, event) {
+        console.log(tab, event, this.activeName)
+      }
+    }
+  }
+</script>
+
+

src/xt_pages/stock/stockInOrder.vue

@@ -9,7 +9,7 @@
 
     <div class="app-container">
     <div class="cell clearfix">
-      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据日期/单据编码/制单人/供应商" />
+      <el-input   style="width: 400px;" v-model="searchKey" class="filter-item"  placeholder="单据编码/制单人/厂商" />
       <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="search" >搜索</el-button>
     </div>
 
@@ -162,10 +162,12 @@
     },
     data() {
       return {
+
         crumbs: [
           { path: false, name: '库存管理' },
           { path: '/stock/in', name: '入库单' }
         ],
+        searchKey:'',
         type: 1,
         page: 1,
         limit: 7,
@@ -196,6 +198,31 @@
       }
     },
     methods: {
+      search:function(){
+        const Params = {
+          page: this.page,
+          limit: this.limit,
+          start_time: this.start_time,
+          end_time: this.end_time,
+          type: this.type,
+          keywords:this.searchKey,
+        }
+        this.Warehouse.warehouseDate = []
+        getWarehouseList(Params).then(response => {
+          if (response.data.state == 0) {
+            this.Warehouse.loading = false
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.Warehouse.loading = false
+            this.total = response.data.data.total
+            for (let i = 0; i < response.data.data.list.length; i++) {
+              this.Warehouse.warehouseDate.push(response.data.data.list[i])
+            }
+          }
+        })
+
+      },
       GetWarehouse: function() {
         const Params = {
           page: this.page,

src/xt_pages/stock/stockInOrderAdd.vue

@@ -428,7 +428,12 @@
         tempObj['manufacturer'] = ''
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
       }, calculate: function(val) {
         if (val == 0) {
           return ''

src/xt_pages/stock/stockInOrderEdit.vue

@@ -131,7 +131,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column label="操作" align="center" width="150">
+            <el-table-column label="操作" fixed="right" align="center" width="150">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" content="新增" placement="top">
 
@@ -257,6 +257,7 @@ export default {
       }
   },
     methods: {
+
       comfirm: function(val) {
         this.isVisibility = false
         if (val.selectedGoodInfo.length > 0) {
@@ -459,6 +460,22 @@ export default {
             this.form.manufacturer = this.warehouse.manufacturer
             this.form.dealer = this.warehouse.dealer
             this.warehousing_time = this.getTime(this.warehouse.warehousing_time, '{y}-{m}-{d}')
+
+            if(this.recordInfo.recordData.length == 0){
+              const tempObj = {}
+              tempObj['id'] = 0
+              tempObj['good_type_id'] = 0
+              tempObj['good_id'] = 0
+              tempObj['number'] = ''
+              tempObj['product_date'] = ''
+              tempObj['expiry_date'] = ''
+              tempObj['warehousing_count'] = ''
+              tempObj['price'] = ''
+              tempObj['remark'] = ''
+              tempObj['dealer'] = ''
+              tempObj['manufacturer'] = ''
+              this.recordInfo.recordData.push(tempObj)
+            }
           }
         })
       }

src/xt_pages/stock/stockOutOrder.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
-        <el-input style="width: 400px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-input style="width: 400px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/厂商"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -160,6 +160,7 @@ export default {
   },
   data() {
     return {
+      searchKey:"",
       crumbs: [
         { path: false, name: "库存管理" },
         { path: "/stock/out", name: "出库单" }
@@ -185,6 +186,29 @@ export default {
     };
   },
   methods: {
+    search:function(){
+      const Params = {
+        page: this.page,
+        limit: this.limit,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        type: this.type,
+        keywords:this.searchKey,
+      }
+      this.warehouseOutDate = [];
+      getWarehouseOutList(Params).then(response => {
+        if (response.data.state == 0) {
+          this.$message.error(response.data.msg);
+          return false;
+        } else {
+          this.total = response.data.data.total;
+          for (let i = 0; i < response.data.data.list.length; i++) {
+            this.warehouseOutDate.push(response.data.data.list[i]);
+          }
+        }
+      });
+
+    },
     AddNewOrder: function() {
       this.$router.push({
         name: "stockOutOrderAdd",
@@ -254,17 +278,17 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     startTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     endTimeChange(val) {
-      this.GetWarehouse();
+      this.GetWarehouseOut();
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -300,7 +300,12 @@
 
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        this.recordInfo.recordData.splice(index, 1)
+        if( this.recordInfo.recordData.length <= 1){
+          this.$message.error('只有一条记录的时候无法删除')
+          return
+        }else{
+          this.recordInfo.recordData.splice(index, 1)
+        }
       }, calculate: function(val) {
         if (isNaN(val)) {
           return ''

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -372,6 +372,19 @@
             this.warehouseOut = response.data.data.info
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
           }
+
+          if( this.recordInfo.recordData.length == 0){
+            const tempObj = {}
+            tempObj['id'] = 0
+            tempObj['good_type_id'] = 0
+            tempObj['good_id'] = 0
+            tempObj['count'] = ''
+            tempObj['price'] = ''
+            tempObj['remark'] = ''
+            this.recordInfo.recordData.push(tempObj)
+          }
+
+
         })
       }, calculate: function(val) {
         if (val == 0) {