Skip to content

T
template_vue
Commit 58821f21 authored by Hagsn3's avatar Hagsn3
Browse files
Options

代码提交

parent 9f236417
Hide whitespace changes
Inline Side-by-side
Showing with 265 additions and 381 deletions
src/api/outcomeWmsApply.js
View file @ 58821f21
......@@ -8,6 +8,7 @@ import Qs from 'qs'
* 4. 修改
* 5. 逻辑删除
* 6. 导出
* 7.确认
*
*/
......@@ -66,3 +67,12 @@ export function exportOutcomeWmsApply(query) {
responseType: 'blob'
})
}
export function sureStatus(data) {
return request({
url: '/outcomewmsapply/sure',
method: 'put',
data,
headers: { 'Content-Type': 'application/json;charset=utf8' }
})
}
src/views/template/ConfirmationMaterials.vue
View file @ 58821f21
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="100"
size="small"
style="width: 150px"
/>
</el-form-item>
<el-form-item label="wh_id" prop="whId">
<el-select
v-model="queryParams.whId"
......@@ -44,6 +34,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="100"
size="small"
style="width: 150px"
/>
</el-form-item>
<el-form-item label="出库状态" prop="dealStatus">
<el-select v-model="queryParams.dealStatus" placeholder="请选择出库状态" clearable size="small" :maxlength="1">
<el-option
......@@ -64,16 +64,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="flag">
<el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
:class="commonField.queryClass"
......@@ -89,33 +79,12 @@
@click="resetQuery"
>重置</el-button>
</el-form-item>
<div style="float: right">
<el-form-item>
<el-button
:class="commonField.exportClass"
:type="commonField.typeSuccess"
:icon="commonField.exportIcon"
:size="commonField.smallSize"
@click="handleExport"
>导出</el-button>
</el-form-item>
</div>
</el-form>
<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-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">
<template slot-scope="scope">
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.whId === '001'">仓库1</span>
......@@ -133,6 +102,16 @@
<span v-else>-</span>
</template>
</el-table-column>
<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">
<template slot-scope="scope">
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="出库状态" prop="dealStatus" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.dealStatus === '1'">已出库</span>
......@@ -147,41 +126,36 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column width="120" label="启用状态" prop="flag">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
class="switchDisabledStyle"
inactive-value="0"
active-value="1"
@click.native="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.remarks || '-' }}
</template>
</el-table-column>
<!-- <el-table-column width="120" label="启用状态" prop="flag">-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch-->
<!-- v-model="scope.row.flag"-->
<!-- class="switchDisabledStyle"-->
<!-- inactive-value="0"-->
<!-- active-value="1"-->
<!-- @click.native="handleStatusChange(scope.row)"-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </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-column label="操作" class-name="small-padding fixed-width" width="200px">
<el-table-column label="操作" class-name="small-padding fixed-width" width="100px">
<template slot-scope="scope">
<el-button
v-if="scope.row.dealStatus ==='1'&&scope.row.sureStatus === '0' "
: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"
@click="handleDelete(scope.row)"
>删除</el-button>
@click="handleSureStatus(scope.row)"
>确认</el-button>
</template>
</el-table-column>
</el-table>
......@@ -269,7 +243,8 @@ import {
getOutcomeWmsApply,
delOutcomeWmsApply,
updateOutcomeWmsApply,
exportOutcomeWmsApply } from '@/api/outcomeWmsApply'
exportOutcomeWmsApply, sureStatus
} from '@/api/outcomeWmsApply'
import commonField from '@/utils/commonField'
import { getDicts } from '@/api/system/dict/data'
export default {
......@@ -395,6 +370,31 @@ export default {
this.getwareHouse()
},
methods: {
/** 确认按钮*/
handleSureStatus(data) {
this.$confirm('是否确认操作？', '确认', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function() {
return sureStatus(data)
}).then(() => {
this.$message({
message: '确认成功!',
type: 'success'
})
this.getList()
}).catch(function() {
})
// sureStatus(data).then(res => {
// if (res.code === 200) {
// this.$message.success('确认成功！')
// this.getList()
// } else {
// this.$message.error('失败！')
// }
// })
},
/** 查询????列表 */
getList() {
this.loading = true
......
src/views/template/enterboundTwo.vue
View file @ 58821f21
......@@ -60,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"
......@@ -79,22 +79,22 @@
</el-form>
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">领用申请列表</div>
<div class="mb12 font-small-bold">入库记录表</div>
<el-table v-loading="loading" border :data="incomeInoutWmsLogList">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
<el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<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="code" prop="orderCode" :show-overflow-tooltip="true">
<el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true" width="150">
<template slot-scope="scope">
{{ scope.row.orderCode || '-' }}
</template>
</el-table-column>
<el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
<el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<span v-if="scope.row.ptype === '1'">jb</span>
<span v-else-if="scope.row.ptype === '2'">label</span>
......@@ -104,29 +104,18 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
{{ scope.row.pn || '-' }}
</template>
</el-table-column>
<el-table-column label="出入情况" prop="ioType" :show-overflow-tooltip="true">
<el-table-column label="出入情况" prop="ioType" :show-overflow-tooltip="true" width="100">
<template slot-scope="scope">
<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">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
class="switchDisabledStyle"
inactive-value="0"
active-value="1"
@click.native="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<!-- <el-table-column label="apply_id" prop="outApplyId" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.outApplyId || '-' }}-->
......@@ -134,50 +123,36 @@
<!-- </el-table-column>-->
<el-table-column label="申请人" prop="createBy" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.createBy || '-' }}
{{ scope.row.createName || '-' }}
</template>
</el-table-column>
<el-table-column label="申请时间" prop="createDate" :show-overflow-tooltip="true">
<el-table-column label="申请时间" prop="createDate" :show-overflow-tooltip="true" width="150">
<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 || '-' }}
{{ scope.row.updateName || '-' }}
</template>
</el-table-column>
<el-table-column label="创建时间" prop="updateDate" :show-overflow-tooltip="true">
<el-table-column label="创建时间" prop="updateDate" :show-overflow-tooltip="true" width="150">
<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">
<!-- <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" width="150">-->
<!-- <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="120px">
<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.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>
......@@ -192,89 +167,6 @@
: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"
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="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"
placeholder="请选择ptype值"
clearable
:maxlength="1"
size="small"
style="width: 100%"
>
<el-option
v-for="dict in addTypeOption"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<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="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">
<el-radio label="1">启用</el-radio>
<el-radio label="0">停用</el-radio>
</el-radio-group>
</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="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">
......@@ -303,13 +195,13 @@
<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-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" />-->
<span>{{ singleDetails.pn }}</span>
<!-- <el-input v-model.trim="singleDetails.pn" :readonly="true" />-->
</el-form-item>
</el-col>
</el-row>
......@@ -319,7 +211,7 @@
<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-input v-model.trim="singleDetails.ioType" :readonly="true" />-->
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -327,49 +219,49 @@
<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-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 v-show="singleDetails.ioType !== '1'" label="申请人：" prop="createBy">
<span>{{ singleDetails.createName }}</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 v-show="singleDetails.ioType !== '1'" label="申请时间：" prop="createDate">
<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 label="创建人：" prop="updateBy">
<span>{{ singleDetails.updateName }}</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" />-->
<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 v-show="singleDetails.ioType !== '1'" label="确认人：" prop="affirmBy">
<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 v-show="singleDetails.ioType !== '1'" label="确认时间：" prop="affirmDate">
<span>{{ singleDetails.affirmDate }}</span>
<!-- <el-input v-model.trim="singleDetails.affirmDate" :readonly="true" />-->
</el-form-item>
</el-col>
</el-row>
......@@ -406,6 +298,8 @@ export default {
ioType: '',
flag: '',
createBy: '',
createName: '',
updateName: '',
createDate: '',
updateBy: '',
updateDate: '',
......@@ -551,6 +445,7 @@ export default {
this.loading = true
listIncomeInoutWmsLog(this.queryParams).then(
response => {
console.log(response)
this.incomeInoutWmsLogList = response.rows
this.total = response.total
this.loading = false
......@@ -617,16 +512,7 @@ export default {
this.open = true
this.title = '添加入库记录'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.businessId
getIncomeInoutWmsLog(id).then(response => {
this.form = response.data
this.open = true
this.title = '修改入库记录'
})
},
// 改变状态
handleStatusChange(row) {
const text = row.flag === '1' ? '启用' : '停用'
......@@ -645,27 +531,6 @@ export default {
row.flag = row.flag === '0' ? '1' : '0'
})
},
/** 提交按钮 */
submitForm: function() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.businessId !== undefined) {
updateOutcomeWmsApply(this.form).then(response => {
this.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
console.log(this.form)
addOutcomeWmsApply(this.form).then(response => {
this.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.businessId
......
src/views/template/incomeMatBaseinfo.vue
View file @ 58821f21
......@@ -59,16 +59,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="flag">
<el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
:class="commonField.queryClass"
......@@ -93,19 +83,19 @@
: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>
</el-form>
<div class="placeholder" />
<div style="padding:5px 10px">
<div class="mb12 font-small-bold">库存管理列表</div>
<div class="mb12 font-small-bold">材料信息列表</div>
<el-table v-loading="loading" border :data="incomeMatBaseinfoList">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
......@@ -144,35 +134,19 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column width="120" label="状态" prop="flag">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
class="switchDisabledStyle"
inactive-value="0"
active-value="1"
@click.native="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.remarks || '-' }}
</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-column label="操作" class-name="small-padding fixed-width" width="200px">
<el-table-column label="操作" class-name="small-padding fixed-width" width="100">
<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"
......
src/views/template/incomeWmsBox.vue
View file @ 58821f21
......@@ -41,6 +41,23 @@
style="width: 150px"
/>
</el-form-item>
<el-form-item label="ptype" prop="ptype">
<el-select
v-model="queryParams.ptype"
placeholder="请选择ptype值"
clearable
:maxlength="1"
size="small"
style="width: 150px"
>
<el-option
v-for="dict in ptypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
:class="commonField.queryClass"
......@@ -73,11 +90,21 @@
<div class="mb12 font-small-bold">库存管理列表</div>
<el-table v-loading="loading" border :data="incomeWmsBoxList">
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true">
<el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{ scope.row.orderCode || '-' }}
</template>
</el-table-column>
<el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true" width="100">
<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-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>-</span>
</template>
</el-table-column>
<el-table-column label="lot" prop="lot" :show-overflow-tooltip="true" width="110">
<template slot-scope="scope">
{{ scope.row.lot || '-' }}
......@@ -98,7 +125,7 @@
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="label_id" prop="labelId" :show-overflow-tooltip="true">
<el-table-column label="label_id" prop="labelId" :show-overflow-tooltip="true" width="90">
<template slot-scope="scope">
{{ scope.row.mac || '-' }}
</template>
......@@ -108,19 +135,13 @@
{{ scope.row.createName || '-' }}
</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="操作" class-name="small-padding fixed-width" width="100px">
<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.delClass"
:type="commonField.typeParent"
......@@ -208,6 +229,29 @@ export default {
dictValue: '0'
}
],
// ptype菜单
ptypeOptions: [
{
dictLabel: 'jb',
dictValue: '1'
},
{
dictLabel: 'label',
dictValue: '2'
},
{
dictLabel: 'wd',
dictValue: '3'
},
{
dictLabel: 'sl',
dictValue: '4'
},
{
dictLabel: 'zd',
dictValue: '5'
}
],
// 查询参数
queryParams: {
page: 1,
......
src/views/template/outcomeWmsApply.vue
View file @ 58821f21
<template>
<div class="app-container">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="100"
size="small"
style="width: 150px"
/>
</el-form-item>
<el-form-item label="wh_id" prop="whId">
<el-select
v-model="queryParams.whId"
......@@ -44,6 +34,16 @@
/>
</el-select>
</el-form-item>
<el-form-item label="pn" prop="pn">
<el-input
v-model="queryParams.pn"
placeholder="请输入pn"
clearable
:maxlength="100"
size="small"
style="width: 150px"
/>
</el-form-item>
<el-form-item label="出库状态" prop="dealStatus">
<el-select v-model="queryParams.dealStatus" placeholder="请选择出库状态" clearable size="small" :maxlength="1">
<el-option
......@@ -64,16 +64,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="flag">
<el-select v-model="queryParams.flag" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button
:class="commonField.queryClass"
......@@ -98,13 +88,13 @@
: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>
</el-form>
......@@ -113,16 +103,6 @@
<div class="mb12 font-small-bold">领用申请列表</div>
<el-table v-loading="loading" border :data="outcomeWmsApplyList">
<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">
<template slot-scope="scope">
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.whId === '001'">仓库1</span>
......@@ -140,6 +120,16 @@
<span v-else>-</span>
</template>
</el-table-column>
<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">
<template slot-scope="scope">
{{ scope.row.qty || '-' }}
</template>
</el-table-column>
<el-table-column label="出库状态" prop="dealStatus" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.dealStatus === '1'">已出库</span>
......@@ -154,28 +144,28 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column width="120" label="启用状态" prop="flag">
<template slot-scope="scope">
<el-switch
v-model="scope.row.flag"
class="switchDisabledStyle"
inactive-value="0"
active-value="1"
@click.native="handleStatusChange(scope.row)"
/>
</template>
</el-table-column>
<el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.remarks || '-' }}
</template>
</el-table-column>
<!-- <el-table-column width="120" label="启用状态" prop="flag">-->
<!-- <template slot-scope="scope">-->
<!-- <el-switch-->
<!-- v-model="scope.row.flag"-->
<!-- class="switchDisabledStyle"-->
<!-- inactive-value="0"-->
<!-- active-value="1"-->
<!-- @click.native="handleStatusChange(scope.row)"-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="备注" prop="remarks" :show-overflow-tooltip="true">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.remarks || '-' }}-->
<!-- </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-column label="操作" class-name="small-padding fixed-width" width="200px">
<el-table-column label="操作" class-name="small-padding fixed-width" width="100px">
<template slot-scope="scope">
<!-- <el-button-->
<!-- :class="commonField.updateClass"-->
......@@ -188,6 +178,7 @@
:type="commonField.typeParent"
:size="commonField.size"
@click="handleDelete(scope.row)"
v-if="scope.row.dealStatus === '0' "
>删除</el-button>
</template>
</el-table-column>
......@@ -534,28 +525,28 @@ 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对象
// })
// })
// }
}
}
</script>
......
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