1

src/api/outcomeWmsJbapplyTemp.js

@@ -18,7 +18,12 @@ export function listOutcomeWmsJbapplyTemp(query) {
     params: query
   })
 }
-
+export function listOutTemp(businessId) {
+  return request({
+    url: '/outcomewmsjbapplytemp/detailOut/' + businessId,
+    method: 'get'
+  })
+}
 export function getOutcomeWmsJbapplyTemp(businessId) {
   return request({
     url: '/outcomewmsjbapplytemp/detail/' + businessId,

src/views/template/enterboundTwo.vue

@@ -52,6 +52,30 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="location" prop="location">
+        <el-input
+          v-model="queryParams.location"
+          placeholder="请输入location"
+          clearable
+          :maxlength="100"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
+      <el-form-item label="操作时间" prop="date">
+        <div class="block">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            style="width: 250px"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="handleChange"
+          />
+        </div>
+      </el-form-item>
       <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -94,6 +118,7 @@
       <div class="mb12 font-small-bold">入库记录表</div>
       <el-table v-loading="loading" border :data="incomeInoutWmsLogList">
         <el-table-column type="index" label="序号" min-width="55" align="center" />
+
         <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true" min-width="120">
           <template slot-scope="scope">
             <span v-if="scope.row.whId ">{{ getDataDictLabel(scope.row.whId) }}</span>
@@ -471,6 +496,7 @@ export default {
           dictValue: '2'
         }
       ],
+      dateRange: [],
       // 查询参数
       queryParams: {
         cj: null,
@@ -527,6 +553,17 @@ export default {
     this.getwareHouse()
   },
   methods: {
+    handleChange() {
+      console.log('dateRange', this.dateRange)
+      if (this.dateRange !== null) {
+        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
+        this.queryParams.endTime = this.dateRange[1] + ' 23:59:59'
+      } else {
+        this.queryParams.beginTime = ''
+        this.queryParams.endTime = ''
+      }
+      console.log('queryParams', this.queryParams)
+    },
     /** 跟据ID获取label*/
     getDataDictLabel(whId) {
       const dictItem = this.warehouseList.find(item => item.dictValue === whId)
@@ -568,6 +605,7 @@ export default {
         remarks: undefined,
         pn: undefined,
         qty: undefined,
+        location: undefined,
         whId: this.warehouseList[0].dictValue,
         ptype: '2',
         ioType: '1',

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -79,6 +79,22 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="操作时间" prop="date">
+        <div class="block">
+          <el-date-picker
+            v-model="dateRange"
+            value-format="yyyy-MM-dd"
+            style="width: 250px"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="handleChange"
+          />
+        </div>
+      </el-form-item>
+
       <el-form-item>
         <el-button
           :class="commonField.queryClass"
@@ -114,6 +130,14 @@
             @click="handleImport"
           >{{ commonField.importName }}
           </el-button>
+          <el-button
+            style="float: right;"
+            type="success"
+            size="small"
+            icon="el-icon-download"
+            @click="handleExport"
+          >导出
+          </el-button>
         </el-form-item>
       </div>
     </el-form>
@@ -183,7 +207,7 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" min-width="160px" >
+        <el-table-column label="操作" class-name="small-padding fixed-width" min-width="160px">
           <template slot-scope="scope">
             <el-button
               v-show="scope.row.dealStatus !=='1'"
@@ -471,17 +495,37 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="备注：" prop="remarks">
-              <span>{{ singleDetails.remarks|| '-' }}</span>
+            <el-form-item label="cj：" prop="cj">
+              <span>{{ getManufacturerLabel( singleDetails.cj)|| '-' }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="cj：" prop="cj">
-              <span>{{ getManufacturerLabel( singleDetails.cj)|| '-' }}</span>
+            <el-form-item label="备注：" prop="remarks">
+              <span>{{ singleDetails.remarks|| '-' }}</span>
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
+
+        <el-table v-if="isShow" v-loading="loading" border :data="outTempList">
+          <el-table-column type="index" label="序号" width="55" align="center" />
+          <el-table-column label="location" prop="location" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.location || '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ scope.row.qty || '-' }}
+            </template>
+          </el-table-column>
+
+          <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            </template>
+          </el-table-column>
+
+        </el-table></el-form>
     </el-dialog>
 
   </div>
@@ -494,7 +538,12 @@ import {
   delOutcomeWmsJbapplyTemp,
   addOutcomeWmsJbapplyTemp,
   updateOutcomeWmsJbapplyTemp,
-  exportOutcomeWmsJbapplyTemp, getDownloadTemplate, importJbapplyExcel, queryByPnAndPtypeAndLot, acquireOrderByCode
+  exportOutcomeWmsJbapplyTemp,
+  getDownloadTemplate,
+  importJbapplyExcel,
+  queryByPnAndPtypeAndLot,
+  acquireOrderByCode,
+  listOutTemp
 } from '@/api/outcomeWmsJbapplyTemp'
 import commonField from '@/utils/commonField'
 import { getDicts } from '@/api/system/dict/data'
@@ -504,6 +553,7 @@ export default {
   name: 'OutcomeWmsJbapplyTemp',
   data() {
     return {
+      dateRange: [],
       // 类型表单
       typeFrom: {
         type: '1'
@@ -547,8 +597,11 @@ export default {
       total: 0,
       // ????表格数据
       outcomeWmsJbapplyTempList: [],
+      outTempList: [],
+      isShow: false,
       // 仓库列表
       warehouseList: [],
+      location: '',
       openqty: false,
       singleDetails: {
         cj: '',
@@ -700,6 +753,18 @@ export default {
   },
 
   methods: {
+    // 搜索栏的时间范围
+    handleChange() {
+      console.log('dateRange', this.dateRange)
+      if (this.dateRange !== null) {
+        this.queryParams.beginTime = this.dateRange[0] + ' 00:00:00'
+        this.queryParams.endTime = this.dateRange[1] + ' 23:59:59'
+      } else {
+        this.queryParams.beginTime = ''
+        this.queryParams.endTime = ''
+      }
+      console.log('queryParams', this.queryParams)
+    },
     // 输入值发生变化时触发查询操作
     handleInputChange() {
       this.queryQty()
@@ -832,10 +897,19 @@ export default {
     },
     // 获取所选行详情信息操作
     handleDetail(row) {
+      const id = row.businessId
+      listOutTemp(id).then(response => {
+        if (response.data.length > 0) {
+          this.outTempList = response.data
+          this.isShow = true
+        }
+      })
       this.singleDetails = row
       console.log(row)
       this.title = '详情信息'
       this.openDetails = !this.openDetails
+      this.isShow = false
+      this.reset()
     },
 
     /* 获取数据字典中的值*/
@@ -874,6 +948,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.outTempList = []
       this.form = {
         cj: '1',
         businessId: undefined,
@@ -887,6 +962,7 @@ export default {
         createByName: undefined,
         rank: undefined,
         lot: undefined,
+        date: undefined,
         flag: '1'
       }
       this.resetForm('form')
@@ -898,6 +974,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = []
       this.queryParams = {
         page: 1,
         rows: 10,
@@ -910,6 +987,7 @@ export default {
         createByName: undefined,
         rank: undefined,
         lot: undefined,
+        date: undefined,
         flag: ''
       }
       this.handleQuery()
@@ -1023,7 +1101,7 @@ export default {
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob)// 创建下载的链接
           downloadElement.href = href
-          downloadElement.download = '????信息' + '.xls' // 下载后文件名
+          downloadElement.download = '检查申请信息' + '.xls' // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click()// 点击下载
           document.body.removeChild(downloadElement)// 下载完成移除元素