UDI
/
spms-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领用单据相关bug修改，第三方业务单据修改

Browse Source
featFunction
anthonywj 3 years ago
parent 488b0f3346
commit 6dd441d85d
8 changed files with 1863 additions and 1784 deletions
Show Stats Download Patch File Download Diff File

9
src/api/thrsys/thrOrder.js
Unescape Escape View File

@ -24,6 +24,15 @@ export function delThrOrders(query) {
}); });
} }
export function delOrderDetail(query) {
return axios({
url: "/udiwms/thrsys/delOrderDetail",
method: "post",
data: query
});
}
export function delAll(query) { export function delAll(query) {
return axios({ return axios({
url: "/udiwms/thrsys/order/delAll", url: "/udiwms/thrsys/order/delAll",

612
src/views/inventory/DialogInvProduct.vue
Unescape Escape View File

@ -1,82 +1,86 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input> <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input> <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input> <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="onSubmit"
>查询
</el-button
>
<el-button type="primary" icon="search" @click="combine">确定</el-button>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-button type="primary" icon="search" @click="onSubmit" <el-table v-loading="loading" :data="list" style="width: 100%"
>查询 highlight-current-row="false"
</el-button ref="multipleTable">
> <el-table-column
<el-button type="primary" icon="search" @click="combine">确定</el-button> type="selection"
</el-button-group> width="55">
</el-form-item> </el-table-column>
</el-row> <el-table-column label="序号" type="index"></el-table-column>
</el-form> <el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc">
</el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productionDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="结余数量" prop="reCount">
<template slot-scope="scope">
{{ (scope.row.inCount - scope.row.outCount) }}
</template>
</el-table-column>
<el-table v-loading="loading" :data="list" style="width: 100%" </el-table>
highlight-current-row="false" </el-card>
ref="multipleTable">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="产品标识" prop="nameCode"></el-table-column>
<el-table-column label="产品名称" prop="cpmctymc">
</el-table-column>
<el-table-column label="规格型号" prop="ggxh"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productionDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="入库数量" prop="inCount"></el-table-column>
<el-table-column label="出库数量" prop="outCount"></el-table-column>
<el-table-column label="结余数量" prop="reCount">
<template slot-scope="scope">
{{ (scope.row.inCount - scope.row.outCount) }}
</template>
</el-table-column>
</el-table> <el-dialog
</el-card> title="库存码详情"
:visible.sync="codeDetailVisible"
<el-dialog width="85%"
title="库存码详情" v-if="codeDetailVisible"
:visible.sync="codeDetailVisible" >
width="85%" <codeDetail
v-if="codeDetailVisible" :idQuery="idQuery"
> v-on:closeDetailDialog="closeDetailDialog"
<codeDetail ></codeDetail>
:idQuery="idQuery" </el-dialog>
v-on:closeDetailDialog="closeDetailDialog" <el-pagination
></codeDetail> :page-size="filterQuery.limit"
</el-dialog> @current-change="handleCurrentChange"
<el-pagination layout="prev, pager, next"
:page-size="filterQuery.limit" :total="total"
@current-change="handleCurrentChange" :current-page="filterQuery.page"
layout="prev, pager, next" ></el-pagination>
:total="total" </div>
:current-page="filterQuery.page"
></el-pagination>
</div>
</template> </template>
<script> <script>
import { import {
filterProducts, filterProducts,
filterDetailProducts, filterDetailProducts,
deleteProducts, deleteProducts,
} from "../../api/inventory/InvProducts"; } from "../../api/inventory/InvProducts";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import codeDetail from "./InvProductsDetail"; import codeDetail from "./InvProductsDetail";
@ -87,255 +91,255 @@ import {getStockOrderDetailInstrumentById} from "@/api/warehouse/stockOrder";
export default { export default {
name: "DialogInvProduct", name: "DialogInvProduct",
props: { props: {
data: { data: {
type: Object, type: Object,
required: true, required: true,
}, },
closeDialog: { closeDialog: {
type: Function, type: Function,
required: true, required: true,
}, },
invQueryData: { invQueryData: {
type: Object, type: Object,
required: true, required: true,
} }
},
data() {
return {
filterQuery: {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
page: 1,
limit: 10,
customerId: null,
supId: null,
unitFk: null,
invStorageCode: null,
invWarehouseCode: null,
},
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [],
codeDetailVisible: false,
total: 0,
loading: true,
index: null,
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
deleteLoading: false,
busTypes: [],
idQuery: null,
showSup: false,
fromOptions: [],
};
},
components: {
draggable,
codeDetail,
},
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
supId: null,
page: 1,
limit: 10,
};
this.getList();
},
onSubmit() {
this.loading = true;
this.filterQuery.page = 1;
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
}, },
handleUnitClick(row) { data() {
this.curIndex = row.id; return {
this.dialogTableVisible = true; filterQuery: {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
page: 1,
limit: 10,
customerId: null,
supId: null,
unitFk: null,
invStorageCode: null,
invWarehouseCode: null,
},
detailQuery: {
code: null,
productIdFk: null,
page: 1,
limit: 20,
},
list: [],
codeDetailVisible: false,
total: 0,
loading: true,
index: null,
dialogTableVisible: false,
formLoading: false,
dialogVisible: false,
deleteLoading: false,
busTypes: [],
idQuery: null,
showSup: false,
fromOptions: [],
};
}, },
closeDetailDialog(val) { components: {
this.codeDetailVisible = false; draggable,
codeDetail,
}, },
methods: {
onReset() {
this.$router.push({
path: "",
});
this.filterQuery = {
cpmctymc: null,
nameCode: null,
relIdFk: null,
batchNo: null,
customerId: null,
unitFk: null,
supId: null,
page: 1,
limit: 10,
};
this.getList();
},
onSubmit() {
this.loading = true;
this.filterQuery.page = 1;
this.getList();
},
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleUnitClick(row) {
this.curIndex = row.id;
this.dialogTableVisible = true;
},
closeDetailDialog(val) {
this.codeDetailVisible = false;
},
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.customerId = store.getters.customerId; this.filterQuery.customerId = store.getters.customerId;
filterProducts(this.filterQuery) filterProducts(this.filterQuery)
.then((response) => { .then((response) => {
this.showSup = response.data.showSup; this.showSup = response.data.showSup;
this.loading = false; this.loading = false;
this.list = response.data.list || []; this.list = response.data.list || [];
this.total = response.data.total || 0; this.total = response.data.total || 0;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
this.total = 0; this.total = 0;
}); });
}, },
deleteOrders(data) { deleteOrders(data) {
this.loading = true; this.loading = true;
let query = { let query = {
id: data, id: data,
}
deleteProducts(query)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功！",
});
} else {
this.$message.error(response.message);
} }
deleteProducts(query)
.then((response) => {
if (response.code == 20000) {
this.getList();
this.$message({
type: "success",
message: "删除成功！",
});
} else {
this.$message.error(response.message);
}
}) })
.catch(() => { .catch(() => {
}); });
}, },
deleteDialog(rowId) { deleteDialog(rowId) {
this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", { this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.deleteOrders(rowId); this.deleteOrders(rowId);
}) })
.catch(() => { .catch(() => {
}); });
}, },
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {
key: query, key: query,
}; };
getBasicUnitMaintains(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.fromOptions = response.data.page.list || []; this.fromOptions = response.data.page.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
}, },
intentDetail(row) { intentDetail(row) {
this.idQuery = row; this.idQuery = row;
// this.idQuery.supId = null; // this.idQuery.supId = null;
this.idQuery.customerId = null; this.idQuery.customerId = null;
this.codeDetailVisible = true; this.codeDetailVisible = true;
}, },
getBusType() { getBusType() {
let query = { let query = {
enabled: true, enabled: true,
}; };
getBussinessType(query) getBussinessType(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
this.filterQuery.billAction = this.busTypes[0].action; this.filterQuery.billAction = this.busTypes[0].action;
// this.getList(); // this.getList();
}) })
.catch(() => { .catch(() => {
}); });
}, },
getActionName(action) { getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) { for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) { if (this.busTypes[i].action === action) {
return this.busTypes[i].name; return this.busTypes[i].name;
} }
} }
}, },
combine() { combine() {
let selection = this.$refs.multipleTable.selection; let selection = this.$refs.multipleTable.selection;
if (selection.length < 1) { if (selection.length < 1) {
this.$message.error('未选择产品'); this.$message.error('未选择产品');
return; return;
} }
let ids = []; let ids = [];
selection.forEach((obj, index) => { selection.forEach((obj, index) => {
let data = { let data = {
relId: obj.relIdFk, relId: obj.relIdFk,
batchNo: obj.batchNo, batchNo: obj.batchNo,
productDate: obj.productionDate, productDate: obj.productionDate,
expireDate: obj.expireDate, expireDate: obj.expireDate,
} }
ids.push(data); ids.push(data);
}); });
this.loading = true; this.loading = true;
let tQuery = { let tQuery = {
datas: ids, datas: ids,
stockOrderLists: this.data.stockOrderLists, stockOrderLists: this.data.stockOrderLists,
}; };
getStockOrderDetailInstrumentById(tQuery).then((response) => { getStockOrderDetailInstrumentById(tQuery).then((response) => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.closeDialog(response.data); this.closeDialog(response.data);
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}).catch(() => { }).catch(() => {
this.loading = false; this.loading = false;
}); });
},
}, },
}, filters: {
filters: { statusFilterType(status) {
statusFilterType(status) { const statusMap = {
const statusMap = { false: "success",
false: "success", true: "danger",
true: "danger", };
}; return statusMap[status];
return statusMap[status]; },
}, },
}, mounted() {
mounted() { document.body.ondrop = function (event) {
document.body.ondrop = function (event) { event.preventDefault();
event.preventDefault(); event.stopPropagation();
event.stopPropagation(); };
}; },
}, created() {
created() { this.getBusType();
this.getBusType(); let query = this.$route.query;
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);
this.filterQuery.invStorageCode = this.invQueryData.locStorageCode; this.filterQuery.invStorageCode = this.invQueryData.locStorageCode;
this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode; this.filterQuery.invWarehouseCode = this.invQueryData.invWarehouseCode;
this.filterQuery.limit = parseInt(this.filterQuery.limit); this.filterQuery.limit = parseInt(this.filterQuery.limit);
// 加载表格数据 // 加载表格数据
this.getList(); this.getList();
}, },
}; };
</script> </script>

25
src/views/thrsys/ThrOrdedrReceiveAdd.vue
Unescape Escape View File

@ -54,9 +54,9 @@
<el-form-item> <el-form-item>
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button> <el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
<el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading"> <el-button type="primary" icon="search" @click="newDistributionForm()" :loading="loading">
新增订单 新增单据
</el-button> </el-button>
@ -69,12 +69,11 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
@current-change="handleDetail"> @current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="第三方单据类型" prop="billType"></el-table-column> <el-table-column label="第三方单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来单位ID" prop="corpId"></el-table-column> <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
<el-table-column label="往来单位" prop="corpName" <el-table-column label="往来单位" prop="corpName"
show-overflow-tooltip="true"></el-table-column> show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
<el-table-column label="单据日期" prop="billdate"></el-table-column> <el-table-column label="单据日期" prop="billdate"></el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@ -113,7 +112,7 @@
</el-card> </el-card>
<el-dialog <el-dialog
title="编辑" :title="formMap[formName]"
:visible.sync="newSpDistributionVisible" :visible.sync="newSpDistributionVisible"
width="80%" width="80%"
v-if="newSpDistributionVisible" v-if="newSpDistributionVisible"
@ -158,6 +157,12 @@ export default {
type: 1, type: 1,
editStatus: 1, editStatus: 1,
}, },
formName: null,
formMap: {
add: "新增领用单据",
update: "编辑领用单据",
},
idQuery: {}, idQuery: {},
total: 0, total: 0,
thirdSys: [], thirdSys: [],
@ -231,6 +236,11 @@ export default {
this.getList(); this.getList();
}, },
onSubmitFind() {
this.filterQuery.page = 1;
this.getList();
},
getList() { getList() {
if (this.filterQuery.thirdSysFk == null) { if (this.filterQuery.thirdSysFk == null) {
this.$message.warning("请先选择第三方系统！") this.$message.warning("请先选择第三方系统！")
@ -445,7 +455,9 @@ export default {
if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) { if (this.$isNotBlank(row) && this.$isNotBlank(row.id)) {
this.idQuery.id = row.id; this.idQuery.id = row.id;
this.idQuery.formData = row; this.idQuery.formData = row;
} this.formName = "update";
} else
this.formName = "add";
this.newSpDistributionVisible = true; this.newSpDistributionVisible = true;
}, },
@ -461,6 +473,7 @@ export default {
let start = new Date(); let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end]; this.actDateRange = [start, end];
this.getList();
}, },
}; };
</script> </script>

822
src/views/thrsys/ThrOrdedrReceiveSearch.vue
Unescape Escape View File

@ -1,500 +1,438 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :inline="true" :model="filterQuery"
class="query-form" size="mini">
<el-row>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.billNo"
placeholder="单据号"
clearable
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.corpName"
placeholder="往来单位"
clearable
></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
<el-option
v-for="item in originTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left;font-size: 13px">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{
item.thirdSysName
}}</span>
</el-option>
<el-form :inline="true" :model="filterQuery" </el-select>
class="query-form" size="mini"> </el-form-item>
<el-row> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmitFind">查询</el-button>
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-form-item class="query-form-item"> <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
<el-input @current-change="handleDetail">
v-model="filterQuery.billNo" <el-table-column label="序号" type="index" width="60"></el-table-column>
placeholder="单据号" <el-table-column label="第三方单据类型" prop="billTypeName"></el-table-column>
clearable <el-table-column label="单据号" prop="billNo"></el-table-column>
></el-input> <el-table-column label="往来单位ID" prop="corpId"></el-table-column>
</el-form-item> <el-table-column label="往来单位" prop="corpName"
<el-form-item class="query-form-item"> show-overflow-tooltip="true"></el-table-column>
<el-input <el-table-column label="单据日期" prop="billdate"></el-table-column>
v-model="filterQuery.corpName" <el-table-column label="操作" fixed="right">
placeholder="往来单位" <template slot-scope="scope">
clearable <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
></el-input> >删除
</el-form-item> </el-button>
<el-form-item class="query-form-item"> </template>
</el-table-column>
<el-select v-model="filterQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true"> </el-table>
<el-option <el-pagination
v-for="item in originTypes" :page-size="filterQuery.limit"
:key="item.name" @current-change="handleCurrentChange"
:label="item.name" layout="prev, pager, next"
:value="item.action"> :total="total"
<span style="float: left;font-size: 13px">{{ item.name }}</span> :current-page="filterQuery.page"
<span style="float: right; color: #8492a6; font-size: 13px;margin-left: 10px">{{ ></el-pagination>
item.thirdSysName </el-card>
}}</span> <el-card class="el-card">
</el-option> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column>
</el-select> <el-table-column label="产品编码" prop="productId"></el-table-column>
</el-form-item> <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-form-item class="query-form-item"> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-date-picker <el-table-column label="生产日期" prop="productDate"></el-table-column>
:picker-options="pickerOptions" <el-table-column label="失效日期" prop="expireDate"></el-table-column>
v-model="actDateRange" <el-table-column label="单据数量" prop="reCount"></el-table-column>
type="daterange" <el-table-column label="实际数量" prop="count"></el-table-column>
format="yyyy 年 MM 月 dd 日" </el-table>
value-format="yyyy-MM-dd" </el-card>
range-separator="至" </div>
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
</el-form-item>
<!--<el-form-item class="query-form-item">-->
<!--<el-select v-model="filterQuery.thirdSysFk" placeholder="请选择第三方系统">-->
<!--<el-option-->
<!--v-for="item in thirdSys"-->
<!--:key="item.value"-->
<!--:label="item.thirdName"-->
<!--:value="item.thirdId">-->
<!--<span style="float: left">{{ item.thirdName }}</span>-->
<!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
<!--</el-option>-->
<!--</el-select>-->
<!--</el-form-item>-->
<el-form-item>
<el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList">查询</el-button>
<!--<el-button type="primary" icon="search" @click="clearAll">清空全部</el-button>-->
<!--<el-upload-->
<!--v-if="!this.thirdSysDetail.enabled"-->
<!--:action="uploadFileUrl"-->
<!--multiple-->
<!--:limit="3"-->
<!--:data="uploadData"-->
<!--:show-file-list="false"-->
<!--:on-success="handleChange"-->
<!--:file-list="fileList"-->
<!--&gt;-->
<!--<el-button size="mini" type="primary">导入业务单据</el-button>-->
<!--</el-upload>-->
<!--<el-button type="primary" icon="search" @click="downloadDatas"-->
<!--v-if="this.thirdSysDetail.enabled && this.thirdSysDetail.itrCache">导入业务单据-->
<!--</el-button>-->
</el-button-group>
</el-form-item>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
@current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="第三方单据类型" prop="billType"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来单位ID" prop="corpId"></el-table-column>
<el-table-column label="往来单位" prop="corpName"
show-overflow-tooltip="true"></el-table-column>
<!-- <el-table-column label="单据状态" prop="billFlag"></el-table-column>-->
<el-table-column label="单据日期" prop="billdate"></el-table-column>
<!-- <el-table-column label="扫码单据类型" prop="billType">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ getActionName(scope.row.billType) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="目标单据类型" prop="billType">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ getlocalName(scope.row.billType) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-pagination
:page-size="filterQuery.limit"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total"
:current-page="filterQuery.page"
></el-pagination>
</el-card>
<el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column>
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="生产日期" prop="productDate"></el-table-column>
<el-table-column label="失效日期" prop="expireDate"></el-table-column>
<el-table-column label="单据数量" prop="reCount"></el-table-column>
<el-table-column label="实际数量" prop="count"></el-table-column>
</el-table>
</el-card>
</div>
</template> </template>
<script> <script>
import { import {
delThrOrders, delAll, downloadAll delThrOrders, delAll, downloadAll
} from "../../api/thrsys/thrOrder"; } from "../../api/thrsys/thrOrder";
import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {getOriginBusType} from "../../api/basic/busOriginType"; import {getOriginBusType} from "../../api/basic/busOriginType";
import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys"; import {getBasicThirdSys, filterDetailByKey} from "../../api/basic/basicThirdSys";
import {selectIp} from "../../api/param/systemParamConfig"; import {selectIp} from "../../api/param/systemParamConfig";
import { import {
getCloudErp, getCloudErp,
} from "../../api/inout/erpOrder"; } from "../../api/inout/erpOrder";
export default { export default {
data() { data() {
return { return {
filterQuery: { filterQuery: {
billAction: null, billAction: null,
billNo: "", billNo: "",
originType:null, originType: null,
thirdSysFk: "", thirdSysFk: "",
page: 1, page: 1,
limit: 10, limit: 10,
corpName: null, corpName: null,
type: 1, type: 1,
editStatus: 0, editStatus: 0,
},
total: 0,
thirdSys: [],
thirdSysDetail: null,
busTypes: [],
originTypes: [],
list: [],
detailList: [],
uploadFileUrl: null,
fileList: [],
uploadData: {
thirdSys: "thirdId",
},
loading: false,
actDateRange: [],
pickerOptions: {
shortcuts: [
{
text: "最近一周",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
}, },
total: 0, },
thirdSys: [], {
thirdSysDetail: null, text: "最近一个月",
busTypes: [], onClick(picker) {
originTypes:[], const end = new Date();
list: [], const start = new Date();
detailList: [], start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
uploadFileUrl: null, picker.$emit("pick", [start, end]);
fileList: [],
uploadData: {
thirdSys: "thirdId",
}, },
loading: false, },
actDateRange: [], {
pickerOptions: { text: "最近三个月",
shortcuts: [ onClick(picker) {
{ const end = new Date();
text: "最近一周", const start = new Date();
onClick(picker) { start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
const end = new Date(); picker.$emit("pick", [start, end]);
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近一个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
picker.$emit("pick", [start, end]);
},
},
{
text: "最近三个月",
onClick(picker) {
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
picker.$emit("pick", [start, end]);
},
},
],
}, },
}; },
}, ],
},
methods: { };
onReset() { },
this.$router.push({
path: "",
});
this.filterQuery = {
billNo: "",
thirdSysFk: "",
billFlag: null,
billAction: null,
startDate: null,
endDate: null,
page: 1,
limit: 10,
corpName: null,
type: 1,
editStatus: 0,
};
this.actDateRange = [];
this.getList();
},
getList() { methods: {
if (this.filterQuery.thirdSysFk == null) { onReset() {
this.$message.warning("请先选择第三方系统！") this.$router.push({
return; path: "",
} });
if (this.actDateRange != null) { this.filterQuery = {
this.filterQuery.startDate = this.actDateRange[0]; billNo: "",
this.filterQuery.endDate = this.actDateRange[1]; thirdSysFk: "",
} else { billFlag: null,
this.filterQuery.startDate = null; billAction: null,
this.filterQuery.endDate = null; startDate: null,
} endDate: null,
this.loading = true; page: 1,
getCloudErp(this.filterQuery) limit: 10,
.then((response) => { corpName: null,
if (response.code == 20000) { type: 1,
this.list = response.data.list || []; editStatus: 0,
this.total = response.data.total || 0; };
} else { this.actDateRange = [];
this.$message.error(response.message); this.getList();
} },
this.loading = false;
})
.catch(() => {
this.loading = false;
this.list = [];
this.total = 0;
});
},
handleDetail(row) {
this.detailList = row.subErpOrders;
// console.log(row.billNo);
// let query = {
// orderIdFk: row.id
// };
// this.loading = true;
// getThrOrderDetails(query)
// .then((response) => {
// this.loading = false;
// this.detailList = response.data.list || [];
// this.total = response.data.total || 0;
// })
// .catch(() => {
// this.loading = false;
// this.list = [];
// this.total = 0;
// });
},
deleteDialog(row) {
this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
let dQuery = {
id: row.id,
};
delThrOrders(dQuery)
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("删除成功");
this.getList();
} else {
this.$message.error(response.message);
}
})
.catch(() => {
this.loading = false;
});
}) onSubmitFind() {
.catch(() => { this.filterQuery.page = 1;
}); this.getList();
}, },
clearAll() {
this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
delAll()
.then((response) => {
this.loading = false;
if (response.code == 20000) {
this.$message.success("删除成功");
this.getList();
} else {
this.$message.success(response.message);
}
})
.catch(() => {
this.loading = false;
});
}) getList() {
.catch(() => { if (this.filterQuery.thirdSysFk == null) {
}); this.$message.warning("请先选择第三方系统！")
}, return;
getBasicThirdSys() { }
let query = { if (this.actDateRange != null) {
enabled: true, this.filterQuery.startDate = this.actDateRange[0];
}; this.filterQuery.endDate = this.actDateRange[1];
getBasicThirdSys(query) } else {
.then((response) => { this.filterQuery.startDate = null;
this.thirdSys = response.data.list || []; this.filterQuery.endDate = null;
this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId; }
this.uploadData.thirdSys = this.filterQuery.thirdSysFk; this.loading = true;
this.selectSysParam(); getCloudErp(this.filterQuery)
this.getThirdSysDetail(); .then((response) => {
this.getBusType(); if (response.code == 20000) {
}) this.list = response.data.list || [];
.catch(() => { this.total = response.data.total || 0;
this.loading = false;
this.list = [];
});
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
handleChange(response, files, fileList) {
console.log(response);
if (response.code != 20000) {
this.$message.error(response.message);
} else { } else {
console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]); this.$message.error(response.message);
this.$message.success("文件上传成功,请稍后刷新查看！");
} }
}, this.loading = false;
selectSysParam() { })
let query = { .catch(() => {
key: "thirdIpUrl", this.loading = false;
thirdSysFk: this.filterQuery.thirdSysFk this.list = [];
}; this.total = 0;
selectIp(query).then((response) => { });
if (response.code == 20000) { },
this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload"; handleDetail(row) {
} this.detailList = row.subErpOrders;
}); },
}, deleteDialog(row) {
thirdSysChange() { this.$confirm("此操作将永久删除该单据, 是否继续?", "提示", {
this.uploadData.thirdSys = this.filterQuery.thirdSysFk; confirmButtonText: "确定",
this.getThirdSysDetail(); cancelButtonText: "取消",
}, type: "warning",
getThirdSysDetail() { })
let query = { .then(() => {
thirdSysFk: this.filterQuery.thirdSysFk, let dQuery = {
key: "orderQueryUrl", id: row.id,
}; };
filterDetailByKey(query) delThrOrders(dQuery)
.then((response) => { .then((response) => {
this.thirdSysDetail = response.data; this.loading = false;
}) if (response.code == 20000) {
.catch(() => { this.$message.success("删除成功");
this.loading = false; this.getList();
this.list = []; } else {
});
},
downloadDatas() {
let query = {
billAction: this.filterQuery.billAction
};
downloadAll(query).then((response) => {
if (response.code == 20000) {
this.$message.success(response.data);
} else {
this.$message.error(response.message); this.$message.error(response.message);
} }
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
getlocalName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].localName;
}
}
},
getBusType() {
let query = {
enabled: true,
};
getLocalJoinBusType(query)
.then((response) => {
this.busTypes = response.data.list || [];
// this.getList();
}) })
.catch(() => { .catch(() => {
this.loading = false;
}); });
getOriginBusType(query) })
.catch(() => {
});
}
,
clearAll() {
this.$confirm("此操作将清空所有单据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
delAll()
.then((response) => { .then((response) => {
this.originTypes = response.data.list || []; this.loading = false;
// this.filterQuery.originType = this.originTypes[0].action; if (response.code == 20000) {
// this.getList(); this.$message.success("删除成功");
this.getList();
} else {
this.$message.success(response.message);
}
}) })
.catch(() => { .catch(() => {
this.loading = false;
}); });
})
.catch(() => {
}, });
}
,
getBasicThirdSys() {
let query = {
enabled: true,
};
getBasicThirdSys(query)
.then((response) => {
this.thirdSys = response.data.list || [];
this.filterQuery.thirdSysFk = this.thirdSys[0].thirdId;
this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
this.selectSysParam();
this.getThirdSysDetail();
this.getBusType();
})
.catch(() => {
this.loading = false;
this.list = [];
});
}
,
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
}
,
handleChange(response, files, fileList) {
console.log(response);
if (response.code != 20000) {
this.$message.error(response.message);
} else {
console.log(files[0] + "\n" + this.fileList[0] + "\n" + fileList[0]);
this.$message.success("文件上传成功,请稍后刷新查看！");
}
}
,
selectSysParam() {
let query = {
key: "thirdIpUrl",
thirdSysFk: this.filterQuery.thirdSysFk
};
selectIp(query).then((response) => {
if (response.code == 20000) {
this.uploadFileUrl = response.data.thridUrl + "/udiwms/erp/pi/upload";
}
});
},
thirdSysChange() {
this.uploadData.thirdSys = this.filterQuery.thirdSysFk;
this.getThirdSysDetail();
},
getThirdSysDetail() {
let query = {
thirdSysFk: this.filterQuery.thirdSysFk,
key: "orderQueryUrl",
};
filterDetailByKey(query)
.then((response) => {
this.thirdSysDetail = response.data;
})
.catch(() => {
this.loading = false;
this.list = [];
});
}, },
components: {}, downloadDatas() {
mounted() { let query = {
billAction: this.filterQuery.billAction
};
downloadAll(query).then((response) => {
if (response.code == 20000) {
this.$message.success(response.data);
} else {
this.$message.error(response.message);
}
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].name;
}
}
},
getlocalName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
return this.busTypes[i].localName;
}
}
}, },
created() { getBusType() {
this.getBasicThirdSys(); let query = {
let end = new Date(); enabled: true,
let start = new Date(); };
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); getLocalJoinBusType(query)
this.actDateRange = [start, end]; .then((response) => {
this.busTypes = response.data.list || [];
})
.catch(() => {
});
getOriginBusType(query)
.then((response) => {
this.originTypes = response.data.list || [];
})
.catch(() => {
});
}, },
},
components: {},
mounted() {
},
created() {
this.getBasicThirdSys();
let end = new Date();
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
this.actDateRange = [start, end];
this.getList();
},
}; };
</script> </script>
<style scoped> <style scoped>
.itemTag { .itemTag {
float: left; float: left;
text-align: left; text-align: left;
margin-top: 10px; margin-top: 10px;
width: 25%; width: 25%;
} }
.text { .text {
font-size: 13px; font-size: 13px;
font-family: "Microsoft YaHei"; font-family: "Microsoft YaHei";
} }
.query-form-item { .query-form-item {
display: block !important; display: block !important;
margin-right: 10px; margin-right: 10px;
margin-bottom: 5px; margin-bottom: 5px;
} }
.el-row { .el-row {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.el-col { .el-col {
border-radius: 4px; border-radius: 4px;
flex-wrap: wrap; flex-wrap: wrap;
} }
</style> </style>

1910
src/views/thrsys/thrOrderNew.vue
View File

File diff suppressed because it is too large Load Diff

153
src/views/warehouse/DialogSelectInv.vue
Unescape Escape View File

@ -0,0 +1,153 @@
<template>
<el-form :model="userInfo">
<el-row :gutter="20">
<el-col :span="6">
<div class="ao-text">
<span>当前仓库：</span>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="locStorageCode">
<el-select v-model="userInfo.locInvCode" placeholder="当前仓库信息" clearable
@change="locCHange"
>
<el-option
v-for="item in storageList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6">
<div class="ao-text">
<span>当前分库：</span>
</div>
</el-col>
<el-col :span="16">
<el-form-item prop="locInvCode">
<el-select v-model="userInfo.locSubInvCode" placeholder="当前分库信息" clearable
>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
<el-button type="primary" @click="submitInv">提交</el-button>
<el-button type="primary" @click="closeDG">取消</el-button>
</div>
</el-form>
</template>
<script>
import {filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
import {updateInv} from "@/api/auth/authAdmin";
export default {
name: "DialogSelectInv",
props: {
billData: {
type: Object,
required: true,
},
closeInvDialog: {
type: Function,
required: true,
},
closeSubmitDialog:{
type: Function,
required: true,
}
},
data() {
return {
userInfo: {
locInvCode: this.$store.getters.locInvCode,
locSubInvCode: this.$store.getters.locSubInvCode,
},
storageList: [],
subInvList: [],
}
},
methods: {
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
this.findSubInvByInv();
})
.catch(() => {
});
},
findSubInvByInv() {
this.subInvList = [];
let query = {
pcode: this.userInfo.locInvCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
this.userInfo.locSubInvCode = this.subInvList[0].code;
}
})
.catch(() => {
});
},
locCHange() {
if (this.$isNotBlank(this.userInfo.locSubInvCode)) {
this.userInfo.locSubInvCode = "";
}
this.findSubInvByInv();
},
submitInv() {
if (this.$isBlank(this.userInfo.locInvCode)) {
this.$message.error("当前仓库不能为空！");
return;
}
if (this.$isBlank(this.userInfo.locSubInvCode)) {
this.$message.error("当前分库不能为空！");
return;
}
this.billData.locStorageCode = this.userInfo.locInvCode;
this.billData.invWarehouseCode = this.userInfo.locSubInvCode;
this.closeSubmitDialog();
},
closeDG() {
this.closeInvDialog();
},
},
created() {
this.getStorage();
},
}
</script>
<style scoped>
</style>

112
src/views/warehouse/selectThrOrder.vue
Unescape Escape View File

@ -20,16 +20,6 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<!-- <el-select v-model="listQuery.billAction" placeholder="请选择业务类型">-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- :key="item.localName"-->
<!-- :label="item.localName"-->
<!-- :value="item.action">-->
<!-- <span style="float: left">{{ item.localName }}</span>-->
<!-- &lt;!&ndash;<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>&ndash;&gt;-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true"> <el-select v-model="listQuery.billAction" placeholder="请选择第三方系统单据类型" clearable="true">
<el-option <el-option
@ -47,20 +37,6 @@
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="listQuery.thirdSys" placeholder="请选择第三方系统" @change="thirdSysChange">-->
<!-- <el-option-->
<!-- v-for="item in thirdSys"-->
<!-- :key="item.value"-->
<!-- :label="item.thirdName"-->
<!-- :value="item.thirdId">-->
<!-- <span style="float: left">{{ item.thirdName }}</span>-->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{-->
<!-- item.thirdId-->
<!-- }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
</el-row> </el-row>
<el-row> <el-row>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
@ -81,7 +57,12 @@
</el-form-item> </el-form-item>
<el-form-item style="display: flex"> <el-form-item style="display: flex">
<el-button-group> <el-button-group>
<el-button type="primary" icon="search" @click="getList">查询</el-button> <el-button
type="primary"
icon="el-icon-refresh"
@click="onReset"
></el-button>
<el-button type="primary" icon="search" @click="submitFind">查询</el-button>
<el-button type="primary" icon="search" @click="combine" <el-button type="primary" icon="search" @click="combine"
>确定 >确定
</el-button </el-button
@ -120,60 +101,31 @@
<el-dialog <el-dialog
v-if="storageVisible" v-if="storageVisible"
title="请选择当前仓库" title="请选择单据所属仓库信息"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
append-to-body append-to-body
:visible.sync="storageVisible"> :visible.sync="storageVisible">
<el-table <selectInvDialog
:data="storageList" :closeInvDialog="closeInvDialog"
style="width: 100%;margin-bottom: 20px;" :billData="currentRow"
row-key="id" :closeSubmitDialog="closeSubmitDialog"
highlight-current-row> ></selectInvDialog>
<el-table-column
prop="code"
label="仓库编码"
width="120"
>
</el-table-column>
<el-table-column
prop="name"
label="仓库名称"
width="250"
>
</el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="selectStorage(scope.row)"
>选择
</el-button
>
</template>
</el-table-column>
</el-table>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {addStockOrder, getCloudErp} from "../../api/inout/erpOrder"; import {addStockOrder, getCloudErp} from "../../api/inout/erpOrder";
import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import store from "../../store"; import store from "../../store";
import {getOriginBusType} from "@/api/basic/busOriginType"; import {getOriginBusType} from "@/api/basic/busOriginType";
import {filterAllByUser} from "@/api/basic/invWarehouse"; import {filterAllByUser} from "@/api/basic/invWarehouse";
import selectInvDialog from "./DialogSelectInv";
export default { export default {
name: "closeDialog", name: "closeDialog",
props: { props: {
@ -252,6 +204,21 @@ export default {
}; };
}, },
methods: { methods: {
onReset() {
this.$router.push({
path: "",
});
this.listQuery = {
billNo: "",
corpName: null,
billAction: null,
page: 1,
limit: 10,
};
this.actDateRange = [];
this.getList();
},
tableRowClassName({row}) { tableRowClassName({row}) {
if (row.checked) return "warning-row"; if (row.checked) return "warning-row";
return ""; return "";
@ -318,6 +285,7 @@ export default {
let tQuery = { let tQuery = {
id: this.currentRow.id, id: this.currentRow.id,
locStorageCode: this.curLocInv, locStorageCode: this.curLocInv,
invWarehouseCode: this.currentRow.invWarehouseCode,
} }
addStockOrder(tQuery) addStockOrder(tQuery)
.then((response) => { .then((response) => {
@ -331,6 +299,10 @@ export default {
}); });
} }
}, },
submitFind() {
this.listQuery.page = 1;
this.getList();
},
selectStorage(row) { selectStorage(row) {
this.curLocInv = row.code; this.curLocInv = row.code;
let tQuery = { let tQuery = {
@ -361,15 +333,12 @@ export default {
getLocalJoinBusType(query) getLocalJoinBusType(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
// this.listQuery.billAction = this.busTypes[0].action;
}) })
.catch(() => { .catch(() => {
}); });
getOriginBusType(query) getOriginBusType(query)
.then((response) => { .then((response) => {
this.originTypes = response.data.list || []; this.originTypes = response.data.list || [];
// this.listQuery.billAction = this.originTypes[0].action;
// this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -386,11 +355,24 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
closeInvDialog() {
this.storageVisible = false;
},
closeSubmitDialog() {
this.storageVisible = false;
this.combine();
},
}, },
created() { created() {
this.getBusType(); this.getBusType();
this.getStorage(); this.getStorage();
this.getList();
}, },
components: {selectInvDialog}
}; };
</script> </script>

4
src/views/warehouse/stockOrderEditor.vue
Unescape Escape View File

@ -71,7 +71,7 @@
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmit">查询</el-button> <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="search" @click="selectThrOrderFunction()" <el-button type="primary" icon="search" @click="selectThrOrderFunction()"
:loading="loading">选入订单 :loading="loading">选入单据
</el-button> </el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
@ -436,7 +436,7 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="选入订单" title="选入单据"
:visible.sync="selectThrOrderVisible" :visible.sync="selectThrOrderVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"

Write Preview
Loading…
Cancel
Save