Merge remote-tracking branch 'origin/master'

src/views/modules/materialManagement/collect/CollectList.vue

@@ -81,14 +81,20 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="60" title="序号"></vxe-column>
-          <vxe-column min-width="160" align="center" title="领用编号" field="collectNo"></vxe-column>
-          <vxe-column min-width="160" align="center" title="领用物品名称" field="goodsName">
+          <vxe-column min-width="160" align="center" title="领用编号" field="collectNo">
             <template slot-scope="scope">
-              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.goodsName}}</el-link>
-              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.goodsName}}</el-link>
-              <span v-else>{{scope.row.goodsName}}</span>
+              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.collectNo}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.collectNo}}</el-link>
+              <span v-else>{{scope.row.collectNo}}</span>
             </template>
           </vxe-column>
+          <vxe-column min-width="160" align="center" title="领用物品名称" field="goodsName">
+<!--            <template slot-scope="scope">-->
+<!--              <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.id)">{{scope.row.goodsName}}</el-link>-->
+<!--              <el-link  type="primary" :underline="false" v-else-if="hasPermission('material:list')"  @click="view(scope.row.id,)">{{scope.row.goodsName}}</el-link>-->
+<!--              <span v-else>{{scope.row.goodsName}}</span>-->
+<!--            </template>-->
+          </vxe-column>
           <vxe-column min-width="160" align="center" title="经办人" field="handledByName"></vxe-column>
           <vxe-column min-width="160" align="center" title="经办人部门" field="handledByOfficeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="领用时间" field="collectDate"></vxe-column>

src/views/modules/materialManagement/wareHouseSummary/WareHouseHistory.vue

@@ -4,7 +4,7 @@
       title="记录"
       :close-on-click-modal="false"
       v-dialogDrag
-      width="1100px"
+      width="1300px"
       height="500px"
       @close="close"
       append-to-body
@@ -15,6 +15,9 @@
           <div style="height: calc(100% - 80px);">
             <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
               <!-- 搜索框-->
+              <el-form-item label="入库编号" prop="wareHouseNumber">
+                <el-input size="small" v-model="searchForm.wareHouseNumber" placeholder="请输入入库编号" clearable></el-input>
+              </el-form-item>
               <el-form-item label="入库时间" prop="wareHouseDates">
                 <el-date-picker
                   placement="bottom-start"
@@ -62,6 +65,7 @@
                 </template>
               </vxe-column>
               <vxe-column min-width="160" align="center" title="入库数量" field="tradeNumber"></vxe-column>
+              <vxe-column min-width="160" align="center" title="当前库存" field="currentInventory"></vxe-column>
               <vxe-column min-width="160" align="center" title="经办人" field="wareHouseHandledBy"></vxe-column>
               <vxe-column min-width="160" align="center" title="经办人部门" field="wareHouseHandledByOff"></vxe-column>
               <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>
@@ -83,6 +87,9 @@
           <div style="height: calc(100% - 80px);">
             <el-form size="small" :inline="true" class="query-form" ref="searchForm2" :model="searchForm2" @keyup.enter.native="refreshList()" @submit.native.prevent>
               <!-- 搜索框-->
+              <el-form-item label="领用编号" prop="collectNo">
+                <el-input size="small" v-model="searchForm2.collectNo" placeholder="请输入领用编号" clearable></el-input>
+              </el-form-item>
               <el-form-item label="领用时间" prop="collectDates">
                 <el-date-picker
                   placement="bottom-start"
@@ -130,6 +137,7 @@
                 </template>
               </vxe-column>
               <vxe-column min-width="160" align="center" title="领用数量" field="collectNumber"></vxe-column>
+              <vxe-column min-width="160" align="center" title="当前库存" field="currentInventory"></vxe-column>
               <vxe-column min-width="160" align="center" title="经办人" field="collectHandleBy"></vxe-column>
               <vxe-column min-width="160" align="center" title="经办人部门" field="collectHandleByOff"></vxe-column>
               <vxe-column min-width="160" align="center" title="领用时间" field="collectDate"></vxe-column>
@@ -188,10 +196,12 @@
         collectList: [],
         searchForm: {
           tradeName: '',
-          contractDates: []
+          wareHouseNumber: '',
+          wareHouseDates: []
         },
         searchForm2: {
           tradeName: '',
+          collectNo: '',
           collectDates: []
         },
         activeNameTop: 'wareHouse'

src/views/modules/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -92,7 +92,6 @@
 <!--          <vxe-column min-width="160" align="center" title="入库编号" field="wareHouseNumber"></vxe-column>-->
 <!--          <vxe-column min-width="160" align="center" title="入库人" field="wareHouseManName"></vxe-column>-->
 <!--          <vxe-column min-width="160" align="center" title="入库部门" field="wareHouseManOfficeName"></vxe-column>-->
-          <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseTypeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="商品名称" field="tradeName">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('material:list')" @click="view(scope.row.tradeName)">{{scope.row.tradeName}}</el-link>
@@ -100,6 +99,7 @@
               <span v-else>{{scope.row.tradeName}}</span>
             </template>
           </vxe-column>
+          <vxe-column min-width="160" align="center" title="入库类型" field="wareHouseTypeName"></vxe-column>
           <vxe-column min-width="160" align="center" title="总量" field="allNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="领用量" field="borrowNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="剩余量" field="tradeNumber"></vxe-column>