This commit is contained in:
parent
14bb2ffb55
commit
cca3b4a1e9
|
|
@ -277,7 +277,7 @@
|
|||
<el-table-column
|
||||
label="待出库数量"
|
||||
align="center"
|
||||
prop="outName"
|
||||
prop="outNum"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
|
|
@ -294,15 +294,16 @@
|
|||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
@click="codeOut(scope.row)"
|
||||
v-if="scope.row.manageType == 0 && scope.row.status != 2"
|
||||
v-if="scope.row.manageType == 0 && scope.row.outNum != 0"
|
||||
>
|
||||
编码出库
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
v-if="scope.row.manageType == 1 && scope.row.status != 2"
|
||||
v-if="scope.row.manageType == 1 && scope.row.outNum != 0"
|
||||
@click="numOut(scope.row)"
|
||||
>
|
||||
数量出库
|
||||
|
|
@ -408,12 +409,94 @@
|
|||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
<!-- <pagination
|
||||
v-show="ViewTotal > 0"
|
||||
:total="ViewTotal"
|
||||
:page.sync="queryOutView.pageNum"
|
||||
:limit.sync="queryOutView.pageSize"
|
||||
@pagination="getListView"
|
||||
/> -->
|
||||
</el-dialog>
|
||||
|
||||
<!-- 编码出库 -->
|
||||
<el-dialog
|
||||
:title="title"
|
||||
:visible.sync="openCode"
|
||||
width="1200px"
|
||||
append-to-body
|
||||
>
|
||||
<span style="margin-left: 25px">待出库数量:{{ outNum }}</span>
|
||||
|
||||
<el-form
|
||||
:model="outQuery"
|
||||
ref="outQuery"
|
||||
size="small"
|
||||
:inline="true"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item label="设备编码" prop="maCode">
|
||||
<el-input v-model="outQuery.maCode" maxlength="20" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
size="mini"
|
||||
@click="handleOutQuery"
|
||||
>查询</el-button
|
||||
>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetOutQuery"
|
||||
>重置</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" size="mini" @click="saveCodeOut"
|
||||
>出库</el-button
|
||||
>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-table
|
||||
v-loading="loadingTwo"
|
||||
:data="outCodeList"
|
||||
height="500"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" align="center" width="80" type="index">
|
||||
<!-- <template slot-scope="scope">
|
||||
<span>{{
|
||||
(outQuery.pageNum - 1) * 10 + scope.$index + 1
|
||||
}}</span>
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
align="center"
|
||||
prop="myTypeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="设备编码"
|
||||
align="center"
|
||||
prop="maCode"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
<!-- <pagination
|
||||
v-show="outTotal > 0"
|
||||
:total="outTotal"
|
||||
:page.sync="outQuery.pageNum"
|
||||
:limit.sync="outQuery.pageSize"
|
||||
@pagination="getCodeList"
|
||||
/>
|
||||
</el-dialog>
|
||||
|
||||
|
|
@ -571,10 +654,13 @@ export default {
|
|||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
loadingTwo: false,
|
||||
//查看的显示
|
||||
showOutView: false,
|
||||
//出库的显示
|
||||
showOutInfo: false,
|
||||
//编码出库的显示
|
||||
openCode: false,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
|
|
@ -588,8 +674,10 @@ export default {
|
|||
ViewTotal: 0,
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
typeList: [],
|
||||
//出库数量
|
||||
getListOutInfo: [],
|
||||
outCodeList: [],
|
||||
// 日期范围
|
||||
dateRange: [],
|
||||
statusDataRange: [],
|
||||
|
|
@ -612,6 +700,10 @@ export default {
|
|||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
outQuery: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
form: {
|
||||
remark: "",
|
||||
},
|
||||
|
|
@ -620,6 +712,7 @@ export default {
|
|||
openPrint: false,
|
||||
printData: {},
|
||||
printTableData: [],
|
||||
outNum: 0,
|
||||
};
|
||||
},
|
||||
created() {
|
||||
|
|
@ -681,18 +774,32 @@ export default {
|
|||
});
|
||||
},
|
||||
|
||||
//数量出库
|
||||
numOut() {},
|
||||
|
||||
//编码出库
|
||||
codeOut(row) {
|
||||
// this.title = '编码出库'
|
||||
this.openCode = true;
|
||||
this.resetForm("codeOutForm");
|
||||
this.resetForm("outQuery");
|
||||
// this.resetForm("codeOutForm");
|
||||
// this.resetForm("outQuery");
|
||||
this.outNum = row.outNum;
|
||||
this.outQuery.typeId = row.typeId;
|
||||
this.outObj = row;
|
||||
this.handleCodeOutQuery();
|
||||
// this.outQuery.typeId = row.typeId;
|
||||
// this.outObj = row;
|
||||
// this.handleCodeOutQuery();
|
||||
},
|
||||
|
||||
getCodeList() {
|
||||
// getDetailsByTypeId(this.outQuery).then((response) => {
|
||||
// this.outCodeList = response.data.rows;
|
||||
// if (response.data.total) {
|
||||
// this.outTotal = response.data.total;
|
||||
// }
|
||||
// });
|
||||
},
|
||||
handleOutQuery() {},
|
||||
resetOutQuery() {},
|
||||
saveCodeOut() {},
|
||||
handleCodeOutQuery() {},
|
||||
// 表单重置
|
||||
reset() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue