1

src/api/outcomeWmsApply.js

@@ -24,18 +24,29 @@ export function listOutcomeWmsApply(query) {
 // 2. 查询????详细信息
 export function getOutcomeWmsApply(businessId) {
   return request({
-    url: '/outcomewmsapply/detail/' + businessId,
+    url: '/outcomewmsapply/detailPn/' + businessId,
     method: 'get'
   })
 }
 
 // 3. 新增????
+// export function addOutcomeWmsApply(data) {
+//   data = Qs.stringify(data)
+//   return request({
+//     url: '/outcomewmsapply/addList',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
 export function addOutcomeWmsApply(data) {
-  data = Qs.stringify(data)
   return request({
-    url: '/outcomewmsapply/add',
+    url: '/outcomewmsapply/addList',
     method: 'post',
-    data: data
+    data: data,
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8' // 接口修改传参类型
+    }
   })
 }
 
@@ -76,4 +87,3 @@ export function sureStatus(data) {
   })
 }
 
-

src/store/modules/permission.js

@@ -4,7 +4,7 @@ import { getInfo } from '@/api/login'
 import Layout from '@/layout/index'
 // pathList: 是要隐藏菜单的集合 system元素:一级菜单的路径(path)
 const pathList = ['/setup/index', '/setup/outku', '/setup/enterbound', '/setup/test', '/setup/enterboundTwo', '/setup/ApplicationTable', '/setup/inspectionRequestProcessing', '/setup/checkTheApplicationForExit',
-  '/setup/enterboundPd']
+  '/setup/enterboundPd', '/setup/Warehousing']
 const permission = {
   state: {
     routes: [],

src/views/template/ConfirmationMaterials.vue

@@ -99,6 +99,7 @@
             <span v-else-if="scope.row.ptype === '4'">sl</span>
             <span v-else-if="scope.row.ptype === '5'">zd</span>
             <span v-else-if="scope.row.ptype === '20'">jl</span>
+            <span v-else-if="scope.row.ptype === '30'">che</span>
             <span v-else>-</span>
           </template>
         </el-table-column>

src/views/template/incomeWmsBox.vue

@@ -132,6 +132,7 @@
             <span v-else-if="scope.row.ptype === '4'">sl</span>
             <span v-else-if="scope.row.ptype === '5'">zd</span>
             <span v-else-if="scope.row.ptype === '20'">jl</span>
+            <span v-else-if="scope.row.ptype === '30'">che</span>
             <span v-else>-</span>
           </template>
         </el-table-column>
@@ -179,7 +180,7 @@
             <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="100px">
+        <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
           <template slot-scope="scope">
             <el-button
               :class="commonField.delClass"
@@ -193,6 +194,12 @@
               :size="commonField.size"
               @click="handleMove(scope.row)"
             >移动</el-button>
+            <el-button
+              type="text"
+              size="mini"
+              @click="handleDetail(scope.row)"
+            >详情
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -229,6 +236,104 @@
         <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-if="singleDetails.whId === '002'">仓库3</span>
+              <span v-else-if="singleDetails.whId === '002'">仓库4</span>
+              <span v-else-if="singleDetails.whId === '002'">仓库5</span>
+              <span v-else>-</span>
+            </el-form-item>
+          </el-col>
+          <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 === '20'">jl</span>
+              <span v-else-if="singleDetails.ptype === '30'">che</span>
+              <span v-else>-</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="code：" prop="orderCode">
+              <span>{{ singleDetails.orderCode|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="pn：" prop="pn">
+              <span>{{ singleDetails.pn|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="LOT：" prop="lot">
+              <span>{{ singleDetails.lot|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="qty：" prop="qty">
+              <span>{{ singleDetails.qty|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="rank：" prop="rank">
+              <span>{{ singleDetails.rank|| '-' }}</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>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-show="isShow" label="bzq：" prop="cheBzq">
+              <span>{{ singleDetails.cheBzq|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-show="isShow" label="bz：" prop="cheBz">
+              <span>{{ singleDetails.cheBz|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-show="isShow" label="cjName：" prop="cheCjName">
+              <span>{{ singleDetails.cheCjName|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-show="isShow" label="unit：" prop="cheUnit">
+              <span>{{ singleDetails.cheUnit|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="创建时间：" prop="createDate">
+              <span>{{ singleDetails.createDate||'-' }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注：" prop="remarks">
+              <span>{{ singleDetails.remarks|| '-' }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -237,13 +342,12 @@ import {
   listIncomeWmsBox,
   getIncomeWmsBox,
   delIncomeWmsBox,
-  addIncomeWmsBox,
   updateIncomeWmsBox,
-  exportIncomeWmsBox, getIncomeWmsBoxId, updateIncomeWmsBoxId, getIncomeWmsBoxPn
+  exportIncomeWmsBox, updateIncomeWmsBoxId, getIncomeWmsBoxPn
 } from '@/api/incomeWmsBox'
 import commonField from '@/utils/commonField'
 import manufacturer from '@/data/cjlist'
-import { getIncomeWmsLabel, listIncomeWmsLabel } from '@/api/incomeWmsLabel'
+
 export default {
   name: 'IncomeWmsBox',
   data() {
@@ -253,12 +357,37 @@ export default {
       // 总条数
       total: 0,
       manufacturer: {},
+      warehouseList: [],
       // 库存管理表格数据
       incomeWmsBoxList: [],
       // 弹出层标题
       title: '',
       // 是否显示弹出层
       open: false,
+      openDetails: false,
+      isShow: true,
+      singleDetails: {
+        cj: '',
+        whId: '',
+        ptype: '',
+        pn: '',
+        qty: '',
+        lot: '',
+        cheBzq: '',
+        cheBz: '',
+        cheCjName: '',
+        cheUnit: '',
+        rank: '',
+        dealStatus: '',
+        remarks: '',
+        createBy: '',
+        createDate: '',
+        createName: ''
+      },
+      cheBzq: '',
+      cheBz: '',
+      cheCjName: '',
+      cheUnit: '',
       // 状态菜单
       statusOptions: [
         {
@@ -374,6 +503,7 @@ export default {
     },
     // 表单重置
     reset() {
+      this.singleDetails = []
       this.form = {
         businessId: undefined,
         remarks: undefined,
@@ -521,7 +651,23 @@ export default {
           window.URL.revokeObjectURL(href)// 释放掉blob对象
         })
       })
+    },
+    // 获取所选行详情信息操作
+    handleDetail(row) {
+      this.singleDetails = []
+      const id = row.businessId
+      getIncomeWmsBox(id).then(response => {
+        this.singleDetails = response.data
+        if (this.singleDetails.ptype !== '30') {
+          this.isShow = false
         }
+      })
+      this.title = '详情信息'
+      this.openDetails = !this.openDetails
+      this.isShow = true
+      this.reset()
+    }
+
   }
 }
 </script>