代码提交

src/api/incomeInoutWmsLog.js

@@ -14,7 +14,7 @@ import Qs from 'qs'
 // 1. 查询入库记录列表
 export function listIncomeInoutWmsLog(query) {
   return request({
-    url: '/incomeinoutwmslog/list',
+    url: '/incomeinoutwmslog/queryIncomeInoutWmsLogByPagination',
     method: 'get',
     params: query
   })

src/views/template/ConfirmationMaterials.vue

@@ -118,7 +118,9 @@
         </el-table-column>
         <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.whId || '-' }}
+            <span v-if="scope.row.whId === '001'">仓库1</span>
+            <span v-else-if="scope.row.whId === '002'">仓库2</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">

src/views/setup/enterboundTwo.vue → src/views/template/enterboundTwo.vue

@@ -10,45 +10,33 @@
           style="width: 150px"
         />
       </el-form-item>
-      <el-form-item label="qty" prop="qty">
-        <el-input
-          v-model.trim="form.qty"
-          placeholder="请输入qty"
-          clearable
-          size="small"
-          style="width: 150px"
-        />
-      </el-form-item>
-      <el-form-item label="code" prop="orderCode">
-        <el-input
-          v-model="queryParams.orderCode"
-          placeholder="请输入code"
-          clearable
-          :maxlength="100"
-          size="small"
-          style="width: 150px"
-        />
-      </el-form-item>
       <el-form-item label="io_type" prop="ioType">
-        <el-input
+        <el-select
           v-model="queryParams.ioType"
-          placeholder="请输入code"
+          placeholder="请选择ioType"
           clearable
-          :maxlength="100"
           size="small"
           style="width: 150px"
-        />
+        >
+          <el-option
+            v-for="dict in ioTypeSelect"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item label="仓库" prop="whId">
+      <el-form-item label="ptype" prop="ptype">
         <el-select
-          v-model="queryParams.whId"
-          placeholder="请选择仓库"
+          v-model="queryParams.ptype"
+          placeholder="请选择ptype值"
           clearable
+          :maxlength="1"
           size="small"
           style="width: 150px"
         >
           <el-option
-            v-for="dict in warehouseList"
+            v-for="dict in ptypeOptions"
             :key="dict.dictValue"
             :label="dict.dictLabel"
             :value="dict.dictValue"
@@ -72,13 +60,13 @@
       </el-form-item>
       <div style="float: right">
         <el-form-item>
-          <el-button
-            :class="commonField.addClass"
-            :type="commonField.typePrimary"
-            :icon="commonField.addIcon"
-            :size="commonField.smallSize"
-            @click="handleAdd"
-          >新增</el-button>
+  <!--          <el-button-->
+  <!--            :class="commonField.addClass"-->
+  <!--            :type="commonField.typePrimary"-->
+  <!--            :icon="commonField.addIcon"-->
+  <!--            :size="commonField.smallSize"-->
+  <!--            @click="handleAdd"-->
+  <!--          >新增</el-button>-->
           <el-button
             :class="commonField.exportClass"
             :type="commonField.typeSuccess"
@@ -92,21 +80,18 @@
     <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">领用申请列表</div>
-      <el-table v-loading="loading" border :data="outcomeWmsApplyList">
+      <el-table v-loading="loading" border :data="incomeInoutWmsLogList">
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.pn || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="qty" prop="qty" :show-overflow-tooltip="true">
+        <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.qty || '-' }}
+            <span v-if="scope.row.whId === '001'">仓库1</span>
+            <span v-else-if="scope.row.whId === '002'">仓库2</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
+        <el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.whId || '-' }}
+            {{ scope.row.orderCode || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
@@ -119,21 +104,19 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="出库状态" prop="dealStatus" :show-overflow-tooltip="true">
+        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.dealStatus === '1'">已出库</span>
-            <span v-else-if="scope.row.dealStatus === '0'">未出库</span>
-            <span v-else>-</span>
+            {{ scope.row.pn || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="确认状态" prop="sureStatus" :show-overflow-tooltip="true">
+        <el-table-column label="出入情况" prop="ioType" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            <span v-if="scope.row.sureStatus === '1'">已确认</span>
-            <span v-else-if="scope.row.sureStatus === '0'">待确认</span>
+            <span v-if="scope.row.ioType === '1'">入</span>
+            <span v-else-if="scope.row.ioType === '2'">出</span>
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column width="120" label="启用状态" prop="flag">
+        <el-table-column width="120" label="状态" prop="flag">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.flag"
@@ -144,30 +127,60 @@
             />
           </template>
         </el-table-column>
-        <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
+        <!--        <el-table-column label="apply_id" prop="outApplyId" :show-overflow-tooltip="true">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            {{ scope.row.outApplyId || '-' }}-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <el-table-column label="申请人" prop="createBy" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.remarks || '-' }}
+            {{ scope.row.createBy || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
+        <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-column label="创建人" prop="updateBy" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.updateBy || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="updateDate" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="确认人" prop="affirmBy" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.affirmBy || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="确认时间" prop="affirmDate" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.affirmDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" class-name="small-padding fixed-width" width="200px">
           <template slot-scope="scope">
-            <!--            <el-button-->
-            <!--              :class="commonField.updateClass"-->
-            <!--              :type="commonField.typeParent"-->
-            <!--              :size="commonField.size"-->
-            <!--              @click="handleUpdate(scope.row)"-->
-            <!--            >修改</el-button>-->
+            <el-button
+              :class="commonField.updateClass"
+              :type="commonField.typeParent"
+              :size="commonField.size"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>
             <el-button
               :class="commonField.delClass"
               :type="commonField.typeParent"
               :size="commonField.size"
+              icon="el-icon-delete"
               @click="handleDelete(scope.row)"
             >删除</el-button>
+            <el-button type="text" size="mini" @click="handleDetail(scope.row)">
+              详情
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -179,9 +192,34 @@
       :limit.sync="queryParams.rows"
       @pagination="getList"
     />
-    <!-- 添加或修改领用申请配置对话框 -->
+    <!-- 添加或修改入库记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" size="small" label-width="90px">
+        <el-form-item label="pn" prop="pn">
+          <el-input v-model.trim="form.pn" show-word-limit :maxlength="100" placeholder="请输入pn" />
+        </el-form-item>
+        <el-form-item label="qty" prop="qty">
+          <el-input v-model.trim="form.qty" show-word-limit :maxlength="100" placeholder="请输入qty" />
+        </el-form-item>
+        <el-form-item label="code" prop="orderCode">
+          <el-input v-model.trim="form.orderCode" show-word-limit :maxlength="100" placeholder="请输入code" />
+        </el-form-item>
+        <el-form-item label="io_type" prop="ioType">
+          <el-select
+            v-model="form.ioType"
+            placeholder="请选择ioType"
+            clearable
+            size="small"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in ioTypeSelect"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="wh_id" prop="whId">
           <el-select
             v-model="form.whId"
@@ -199,6 +237,9 @@
           </el-select>
 
         </el-form-item>
+        <el-form-item label="apply_id" prop="outApplyId">
+          <el-input v-model.trim="form.outApplyId" show-word-limit :maxlength="50" placeholder="请输入apply_id" />
+        </el-form-item>
         <el-form-item label="ptype" prop="ptype">
           <el-select
             v-model="form.ptype"
@@ -216,23 +257,11 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="pn" prop="pn">
-          <el-input v-model.trim="form.pn" show-word-limit :maxlength="100" placeholder="请输入pn" />
-        </el-form-item>
-        <el-form-item label="qty" prop="qty">
-          <el-input v-model.trim="form.qty" placeholder="请输入qty的值" />
-        </el-form-item>
-        <el-form-item label="出库状态">
-          <el-radio-group v-model="form.dealStatus" show-word-limit :maxlength="1">
-            <el-radio label="1">已出库</el-radio>
-            <el-radio label="0">未出库</el-radio>
-          </el-radio-group>
+        <el-form-item label="log" prop="lot">
+          <el-input v-model.trim="form.lot" show-word-limit :maxlength="127" placeholder="请输入log" />
         </el-form-item>
-        <el-form-item label="确认状态">
-          <el-radio-group v-model="form.sureStatus" show-word-limit :maxlength="1">
-            <el-radio label="1">已确认</el-radio>
-            <el-radio label="0">待确认</el-radio>
-          </el-radio-group>
+        <el-form-item label="location" prop="location">
+          <el-input v-model.trim="form.location" show-word-limit :maxlength="255" placeholder="请输入location" />
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.flag">
@@ -246,19 +275,118 @@
         <el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>
       </div>
     </el-dialog>
+    <!--详情-->
+    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
+      <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="仓库：" prop="whId">
+              <span v-if="singleDetails.whId ==='001' ">仓库1</span>
+              <span v-else-if="singleDetails.whId ==='002' ">仓库2</span>
+              <span v-else>-</span>
+              <!--              <el-input v-model.trim="singleDetails.whId" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="orderCode：" prop="orderCode">
+              <span>{{ singleDetails.orderCode }}</span>
+              <!--              <el-input v-model.trim="singleDetails.orderCode" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="ptype：" prop="ptype">
+              <span v-if="singleDetails.ptype === '1'">jb</span>
+              <span v-else-if="singleDetails.ptype === '2'">label</span>
+              <span v-else-if="singleDetails.ptype === '3'">wd</span>
+              <span v-else-if="singleDetails.ptype === '4'">sl</span>
+              <span v-else-if="singleDetails.ptype === '5'">zd</span>
+              <span v-else>-</span>
+<!--              <el-input v-model.trim="singleDetails.ptype" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="pn：" prop="pn">
+              <span>{{singleDetails.pn}}</span>
+<!--              <el-input v-model.trim="singleDetails.pn" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="出入情况：" prop="ioType">
+              <span v-if="singleDetails.ioType === '1'">入</span>
+              <span v-else-if="singleDetails.ioType === '2'">出</span>
+              <span v-else>-</span>
+<!--              <el-input v-model.trim="singleDetails.ioType" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态：" prop="flag">
+              <span v-if="singleDetails.flag ==='0' ">停用</span>
+              <span v-else-if="singleDetails.flag ==='1' ">正常</span>
+              <span v-else>-</span>
+<!--              <el-input v-model.trim="singleDetails.flag" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="申请人：" prop="createBy" v-show="singleDetails.ioType !== '1'">
+              <span>{{singleDetails.createBy}}</span>
+<!--              <el-input v-model.trim="singleDetails.createBy" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="申请时间：" prop="createDate" v-show="singleDetails.ioType !== '1'" >
+              <span>{{singleDetails.createDate}}</span>
+<!--              <el-input v-model.trim="singleDetails.createDate" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="创建人：" prop="updateBy" >
+              <span>{{singleDetails.updateBy}}</span>
+<!--              <el-input v-model.trim="singleDetails.updateBy" :readonly="true" :maxlength="100" />-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间：" prop="updateDate">
+              <span>{{singleDetails.updateDate}}</span>
+<!--              <el-input v-model.trim="singleDetails.updateDate" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="确认人：" prop="affirmBy" v-show="singleDetails.ioType !== '1'">
+              <span>{{singleDetails.affirmBy}}</span>
+<!--              <el-input v-model.trim="singleDetails.affirmBy" :readonly="true" :maxlength="100" />-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="确认时间：" prop="affirmDate" v-show="singleDetails.ioType !== '1'">
+              <span>{{singleDetails.affirmDate}}</span>
+<!--              <el-input v-model.trim="singleDetails.affirmDate" :readonly="true" />-->
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  listOutcomeWmsApply,
-  getOutcomeWmsApply,
   delOutcomeWmsApply,
   addOutcomeWmsApply,
   updateOutcomeWmsApply,
   exportOutcomeWmsApply } from '@/api/outcomeWmsApply'
 import commonField from '@/utils/commonField'
 import { getDicts } from '@/api/system/dict/data'
+import { exportIncomeInoutWmsLog, getIncomeInoutWmsLog, listIncomeInoutWmsLog } from '@/api/incomeInoutWmsLog'
 export default {
   name: 'EnterboundTwo',
   data() {
@@ -267,9 +395,25 @@ export default {
       loading: true,
       // 总条数
       total: 0,
-      // ????表格数据
-      outcomeWmsApplyList: [],
+      // 入库记录表格数据
+      incomeInoutWmsLogList: [],
       warehouseList: [],
+      singleDetails: {
+        whId: '',
+        orderCode: '',
+        ptype: '',
+        pn: '',
+        ioType: '',
+        flag: '',
+        createBy: '',
+        createDate: '',
+        updateBy: '',
+        updateDate: '',
+        affirmBy: '',
+        affirmDate: ''
+      },
+      // 是否显示弹出层（数据详情）
+      openDetails: false,
       // 弹出层标题
       title: '',
       // 是否显示弹出层
@@ -346,15 +490,26 @@ export default {
           dictValue: '5'
         }
       ],
+      ioTypeSelect: [
+        {
+          dictLabel: '入',
+          dictValue: '1'
+        },
+        {
+          dictLabel: '出',
+          dictValue: '2'
+        }
+      ],
       // 查询参数
       queryParams: {
         page: 1,
         rows: 10,
-        pn: undefined,
-        qty: undefined,
-        orderCode: undefined,
-        ioType: undefined,
-        whId: undefined,
+        pn: null,
+        ioType: null,
+        outApplyId: null,
+        ptype: null,
+        lot: null,
+        location: null,
         flag: ''
       },
       // 表单参数
@@ -374,6 +529,16 @@ export default {
   computed: {
     commonField() {
       return commonField
+    },
+    warehouseName() {
+      // 根据不同的whId返回不同的仓库名称
+      if (this.singleDetails.whId === '001') {
+        return '仓库1'
+      } else if (this.singleDetails.whId === '002') {
+        return '仓库2'
+      } else {
+        return '-'
+      }
     }
   },
   created() {
@@ -384,14 +549,21 @@ export default {
     /** 查询????列表 */
     getList() {
       this.loading = true
-      listOutcomeWmsApply(this.queryParams).then(
+      listIncomeInoutWmsLog(this.queryParams).then(
         response => {
-          this.outcomeWmsApplyList = response.rows
+          this.incomeInoutWmsLogList = response.rows
           this.total = response.total
           this.loading = false
         }
       )
     },
+    // 获取所选行详情信息操作
+    handleDetail(row) {
+      this.singleDetails = row
+      console.log(row)
+      this.title = '详情信息'
+      this.openDetails = !this.openDetails
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -406,8 +578,7 @@ export default {
         qty: undefined,
         whId: '001',
         ptype: '2',
-        dealStatus: '0',
-        sureStatus: '0',
+        ioType: '1',
         flag: '1'
       }
       this.resetForm('form')
@@ -444,16 +615,16 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = '添加领用申请'
+      this.title = '添加入库记录'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
       const id = row.businessId
-      getOutcomeWmsApply(id).then(response => {
+      getIncomeInoutWmsLog(id).then(response => {
         this.form = response.data
         this.open = true
-        this.title = '修改领用申请'
+        this.title = '修改入库记录'
       })
     },
     // 改变状态
@@ -521,12 +692,12 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(function() {
-        return exportOutcomeWmsApply(queryParams).then(response => {
+        return exportIncomeInoutWmsLog(queryParams).then(response => {
           const blob = new Blob([response])
           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)// 下载完成移除元素

src/views/template/outcomeWmsApply.vue

@@ -125,7 +125,9 @@
         </el-table-column>
         <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-            {{ scope.row.whId || '-' }}
+            <span v-if="scope.row.whId === '001'">仓库1</span>
+            <span v-else-if="scope.row.whId === '002'">仓库2</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">