Commit 9176d13d authored by hubaoshan's avatar hubaoshan

1

parent b2227c8a
......@@ -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) {
})
}
......@@ -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: [],
......
......@@ -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>
......
......@@ -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>
......
......@@ -54,16 +54,30 @@
/>
</el-select>
</el-form-item>
<el-form-item label="确认状态" prop="sureStatus">
<el-select v-model="queryParams.sureStatus" placeholder="请选择确认状态" clearable size="small" :maxlength="1">
<el-option
v-for="dict in sureStatusOption"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
<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"
/>
</el-select>
</div>
</el-form-item>
<!-- <el-form-item label="确认状态" prop="sureStatus">-->
<!-- <el-select v-model="queryParams.sureStatus" placeholder="请选择确认状态" clearable size="small" :maxlength="1">-->
<!-- <el-option-->
<!-- v-for="dict in sureStatusOption"-->
<!-- :key="dict.dictValue"-->
<!-- :label="dict.dictLabel"-->
<!-- :value="dict.dictValue"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button
:class="commonField.queryClass"
......@@ -81,6 +95,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="handleGain"
>领用</el-button>
<el-button
:class="commonField.addClass"
:type="commonField.typePrimary"
......@@ -88,15 +109,18 @@
:size="commonField.smallSize"
@click="handleAdd"
>新增</el-button>
<!-- <el-button-->
<!-- :class="commonField.exportClass"-->
<!-- :type="commonField.typeSuccess"-->
<!-- :icon="commonField.exportIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="handleExport"-->
<!-- >导出</el-button>-->
<el-button
:class="commonField.exportClass"
:type="commonField.typeSuccess"
:icon="commonField.exportIcon"
:size="commonField.smallSize"
@click="handleExport"
>导出</el-button>
</el-form-item>
</div>
<br>
<br>
<br>
</el-form>
<div class="placeholder" />
<div style="padding:5px 10px">
......@@ -112,15 +136,19 @@
</el-table-column>
<el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.ptype === '1'">jb</span>
<span v-else-if="scope.row.ptype === '2'">label</span>
<span v-if="scope.row.ptype === '2'">label</span>
<span v-else-if="scope.row.ptype === '3'">wd</span>
<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>
<el-table-column label="code" prop="appCode" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.appCode || '-' }}
</template>
</el-table-column>
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
......@@ -138,13 +166,14 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="确认状态" prop="sureStatus" :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-else>-</span>
</template>
</el-table-column>
<!-- <el-table-column label="确认状态" prop="sureStatus" :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-else>-</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column width="120" label="启用状态" prop="flag">-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch-->
......@@ -166,14 +195,15 @@
<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">
<template slot-scope="scope">
<!-- <el-button-->
<!-- :class="commonField.updateClass"-->
<!-- :type="commonField.typeParent"-->
<!-- :size="commonField.size"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- >修改</el-button>-->
<el-button
v-show="scope.row.dealStatus === '0' "
:class="commonField.updateClass"
:type="commonField.typeParent"
:size="commonField.size"
@click="handleUpdate(scope.row)"
>修改</el-button>
<el-button
v-show="scope.row.dealStatus === '0' "
:class="commonField.delClass"
......@@ -181,6 +211,13 @@
:size="commonField.size"
@click="handleDelete(scope.row)"
>删除</el-button>
<el-button
:class="commonField.delClass"
:type="commonField.typeParent"
:size="commonField.size"
@click="handleDetail(scope.row)"
>详情
</el-button>
</template>
</el-table-column>
</el-table>
......@@ -193,7 +230,7 @@
@pagination="getList"
/>
<!-- 添加或修改领用申请配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-dialog ref="dialog1" :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="wh_id" prop="whId">
<el-select
......@@ -253,6 +290,138 @@
<el-button class="submitBtn" type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
<!-- 添加或修改领用对话框-->
<el-dialog :title="title" :visible.sync="openGain" width="500px" append-to-body>
<el-form ref="formPn" :model="formPn" :rules="rules" size="small" label-width="90px">
<el-form-item label="wh_id" prop="whId">
<el-select
v-model="formPn.whId"
placeholder="请选择仓库"
clearable
size="small"
style="width: 100%"
>
<el-option
v-for="dict in warehouseList"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item label="材料一" prop="qty1">
<el-input v-model.trim="formPn.qty1" placeholder="请输入数量" :disabled="disabled1" style="width: 200px" />
<span class="dialogPn">{{ newQty1 }}</span>
</el-form-item>
<el-form-item label="材料二" prop="qty2">
<el-input v-model.trim="formPn.qty2" placeholder="请输入数量" :disabled="disabled2" style="width: 200px" />
<span class="dialogPn">{{ newQty2 }}</span>
</el-form-item>
<el-form-item label="材料三" prop="qty3">
<el-input v-model.trim="formPn.qty3" placeholder="请输入数量" :disabled="disabled3" style="width: 200px" />
<span class="dialogPn">{{ newQty3 }}</span>
</el-form-item>
<el-form-item label="材料四" prop="qty4">
<el-input v-model.trim="formPn.qty4" placeholder="请输入数量" :disabled="disabled4" style="width: 200px" />
<span class="dialogPn">{{ newQty4 }}</span>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button class="cancelBtn" @click="cancel">取 消</el-button>
<el-button class="submitBtn" type="primary" @click="submitFormPn">确 定</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 && getDataDictLabel(singleDetails.whId)">{{ getDataDictLabel(singleDetails.whId) }}</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="ptype:" prop="ptype">
<span v-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-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="appCode">
<span>{{ singleDetails.appCode|| '-' }}</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="出库状态:" prop="ioType">
<span v-if="singleDetails.dealStatus === '0'">未出库</span>
<span v-else-if="singleDetails.dealStatus === '1'">已出库</span>
<span v-else>-</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="创建人:" prop="createBy">
<span>{{ singleDetails.createBy|| '-' }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="创建时间:" prop="createDate">
<span>{{ singleDetails.createDate||'-' }}</span>
</el-form-item>
</el-col>
</el-row>
<el-table v-if="isShow" v-loading="loading" border :data="tempList">
<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="lot" prop="lot" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
</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>
</template>
......@@ -262,7 +431,8 @@ import {
getOutcomeWmsApply,
delOutcomeWmsApply,
addOutcomeWmsApply,
updateOutcomeWmsApply } from '@/api/outcomeWmsApply'
updateOutcomeWmsApply, exportOutcomeWmsApply
} from '@/api/outcomeWmsApply'
import commonField from '@/utils/commonField'
import { getDicts } from '@/api/system/dict/data'
export default {
......@@ -276,11 +446,35 @@ export default {
// ????表格数据
outcomeWmsApplyList: [],
warehouseList: [],
manufacturer: [],
dateRange: [],
isShow: false,
tempList: [],
location: '',
lot: '',
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
openGain: false,
openDetails: false,
// 状态菜单
appCode: '',
singleDetails: {
cj: '',
whId: '',
ptype: '',
pn: '',
qty: '',
lot: '',
orderCode: '',
rank: '',
dealStatus: '',
remarks: '',
createBy: '',
createDate: '',
createName: ''
},
statusOptions: [
{
dictLabel: '启用',
......@@ -328,6 +522,10 @@ export default {
{
dictLabel: 'zd',
dictValue: '5'
},
{
dictLabel: 'che',
dictValue: '30'
}
],
addTypeOption: [
......@@ -346,6 +544,10 @@ export default {
{
dictLabel: 'zd',
dictValue: '5'
},
{
dictLabel: 'che',
dictValue: '30'
}
],
// 查询参数
......@@ -360,7 +562,6 @@ export default {
sureStatus: undefined,
flag: ''
},
// 表单参数
form: {
whId: '',
pn: null,
......@@ -369,6 +570,21 @@ export default {
sureStatus: '0',
ptype: '2'
},
// 表单参数
formPn: {
whId: '',
qty1: null,
qty2: null,
qty3: null,
qty4: null,
dealStatus: '0',
sureStatus: '0',
ptype: '2'
},
disabled1: false,
disabled2: false,
disabled3: false,
disabled4: false,
// 表单校验
rules: {
whId: [
......@@ -390,6 +606,22 @@ export default {
computed: {
commonField() {
return commonField
},
newQty1() {
// 计算新的数量值
return this.formPn.qty1 ? this.formPn.qty1 * 10 : ''
},
newQty2() {
// 计算新的数量值
return this.formPn.qty2 ? this.formPn.qty2 * 20 : ''
},
newQty3() {
// 计算新的数量值
return this.formPn.qty3 ? this.formPn.qty3 * 30 : ''
},
newQty4() {
// 计算新的数量值
return this.formPn.qty4 ? this.formPn.qty4 * 40 : ''
}
},
/** 路由离开前存储筛选条件*/
......@@ -412,11 +644,26 @@ 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)
},
/* 获取数据字典中的值*/
getDataDictLabel(whId) {
const dictItem = this.warehouseList.find(item => item.dictValue === whId)
return dictItem ? dictItem.dictLabel : null
},
getManufacturerLabel(cj) {
const manufacturer = this.manufacturer.find(item => item.value === cj)
return manufacturer ? manufacturer.label : null
},
/** 查询????列表 */
getList() {
this.loading = true
......@@ -431,6 +678,7 @@ export default {
// 取消按钮
cancel() {
this.open = false
this.openGain = false
this.reset()
},
// 表单重置
......@@ -446,7 +694,24 @@ export default {
sureStatus: '0',
flag: '1'
}
this.formPn = {
businessId: undefined,
qty1: undefined,
qty2: undefined,
qty3: undefined,
qty4: undefined,
whId: this.warehouseList[0].dictValue,
ptype: '2',
dealStatus: '0',
sureStatus: '0',
flag: '1'
}
this.disabled1 = false
this.disabled2 = false
this.disabled3 = false
this.disabled4 = false
this.resetForm('form')
this.resetForm('formPn')
},
/** 查询按钮操作 */
handleQuery() {
......@@ -480,6 +745,11 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = '添加检查申请'
},
handleGain() {
this.reset()
this.openGain = true
this.title = '添加领用申请'
},
/** 修改按钮操作 */
......@@ -487,9 +757,50 @@ export default {
this.reset()
const id = row.businessId
getOutcomeWmsApply(id).then(response => {
if (response.data.ptype === '30') {
if (response.data.pn === 'xxx') {
this.disabled2 = true
this.disabled3 = true
this.disabled4 = true
this.formPn = response.data
this.formPn.whId = response.data.whId
this.$set(this.formPn, 'qty1', response.data.qty / 10)
console.log(this.formPn.qty1)
this.openGain = true
this.title = '修改领用申请'
} else if (response.data.pn === 'yyy') {
this.disabled1 = true
this.disabled3 = true
this.disabled4 = true
this.formPn = response.data
this.formPn.whId = response.data.whId
this.$set(this.formPn, 'qty2', response.data.qty / 10)
this.openGain = true
this.title = '修改领用申请'
} else if (response.data.pn === 'zzz') {
this.disabled1 = true
this.disabled2 = true
this.disabled4 = true
this.formPn = response.data
this.formPn.whId = response.data.whId
this.$set(this.formPn, 'qty3', response.data.qty / 10)
this.openGain = true
this.title = '修改领用申请'
} else if (response.data.pn === 'qqq') {
this.disabled1 = true
this.disabled2 = true
this.disabled3 = true
this.formPn = response.data
this.formPn.whId = response.data.whId
this.$set(this.formPn, 'qty4', response.data.qty / 10)
this.openGain = true
this.title = '修改领用申请'
}
} else {
this.form = response.data
this.open = true
this.title = '修改领用申请'
this.title = '修改检查申请'
}
})
},
// 改变状态
......@@ -521,16 +832,122 @@ export default {
this.getList()
})
} else {
console.log(this.form)
console.log('this.form:', this.form)
addOutcomeWmsApply(this.form).then(response => {
this.msgSuccess('新增成功')
this.open = false
this.openGain = false
this.getList()
})
}
}
})
},
submitFormPn: function() {
this.$refs['formPn'].validate(valid => {
if (valid) {
console.log('this.formPn', this.formPn)
if (this.formPn.businessId !== undefined && this.formPn.businessId) {
const qtyList = [
{ qty1: this.formPn.qty1 },
{ qty2: this.formPn.qty2 },
{ qty3: this.formPn.qty3 },
{ qty4: this.formPn.qty4 }
]
const Qty = qtyList.filter(item => item.qty1 > 0 || item.qty2 > 0 || item.qty3 > 0 || item.qty4 > 0)
.map(item => {
let multiplier
if (item.qty1 && item.qty1 > 0) {
multiplier = 10
} else if (item.qty2 && item.qty2 > 0) {
multiplier = 20
} else if (item.qty3 && item.qty3 > 0) {
multiplier = 30
} else {
multiplier = 40
}
// 计算乘积时要访问对象的属性值
const qtyValue = item.qty1 || item.qty2 || item.qty3 || item.qty4
return qtyValue * multiplier // 返回乘以乘数后的值
})
console.log(Qty)
const newQty = Qty[0]
const obj = {
qty: newQty,
whId: this.formPn.whId,
businessId: this.formPn.businessId
}
console.log(obj)
updateOutcomeWmsApply(obj).then(response => {
this.msgSuccess('修改成功')
this.openGain = false
this.getList()
})
} else {
this.boxList = [
{
whId: this.formPn.whId,
qty: this.newQty1,
pn: 'xxx',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
flag: '1'
},
{
whId: this.formPn.whId,
qty: this.newQty2,
pn: 'yyy',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
flag: '1'
},
{
whId: this.formPn.whId,
qty: this.newQty3,
pn: 'zzz',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
flag: '1'
},
{
whId: this.formPn.whId,
qty: this.newQty4,
pn: 'qqq',
ptype: '30',
dealStatus: '0',
sureStatus: '0',
flag: '1'
}
]
const itemQty = this.boxList.filter(item => item.qty > 0)
if (itemQty.length > 0) {
const obj = {
boxList: itemQty
}
console.log('this.boxList:', obj)
addOutcomeWmsApply(obj).then(response => {
this.msgSuccess('新增成功')
this.open = false
this.openGain = false
this.getList()
})
} else {
this.$message({
message: '至少输入一个数量',
type: 'error'
})
}
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.businessId
......@@ -548,28 +965,45 @@ export default {
})
}).catch(function() {
})
}
},
/** 导出按钮操作 */
// handleExport() {
// const queryParams = this.queryParams
// this.$confirm('是否确认操作?', '警告', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(function() {
// return exportOutcomeWmsApply(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' // 下载后文件名
// document.body.appendChild(downloadElement)
// downloadElement.click()// 点击下载
// document.body.removeChild(downloadElement)// 下载完成移除元素
// window.URL.revokeObjectURL(href)// 释放掉blob对象
// })
// })
// }
handleExport() {
const queryParams = this.queryParams
this.$confirm('是否确认操作?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return exportOutcomeWmsApply(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' // 下载后文件名
document.body.appendChild(downloadElement)
downloadElement.click()// 点击下载
document.body.removeChild(downloadElement)// 下载完成移除元素
window.URL.revokeObjectURL(href)// 释放掉blob对象
})
})
},
// 详情
handleDetail(row) {
const id = row.businessId
getOutcomeWmsApply(id).then(response => {
if (response.data.length > 0) {
this.tempList = response.data
this.isShow = true
}
})
this.singleDetails = row
console.log(row)
this.title = '详情信息'
this.openDetails = !this.openDetails
this.isShow = false
this.reset()
}
}
}
</script>
......@@ -584,4 +1018,10 @@ export default {
margin-bottom: 10px
}
}
::v-deep .dialogPn {
display: inline-block !important;
position: relative !important;
left: 20% !important;
text-align: center !important;
}
</style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment