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

平衡补单，缺量自动补单移到库存补单页面，新增异常状态

Browse Source
master
anthonywj 4 years ago
parent 542dd9d342
commit b91661fdbf
14 changed files with 74 additions and 56 deletions
Show Stats Download Patch File Download Diff File

9
src/api/basic/busLocalType.js
Unescape Escape View File

@ -16,6 +16,15 @@ export function getLocalJoinBusType(query) {
}); });
} }
export function getLocalJoinByUser(query) {
return axios({
url: "/udiwms/localBusType/filterJoinByUser",
method: "get",
params: query
});
}
export function getLocalJoinNoUse(query) { export function getLocalJoinNoUse(query) {
return axios({ return axios({
url: "/udiwms/localBusType/filterUnUse", url: "/udiwms/localBusType/filterUnUse",

8
src/api/basic/invWarehouse.js
Unescape Escape View File

@ -19,6 +19,14 @@ export function filterAll(query) {
}); });
} }
export function filterAllByUser(query) {
return axios({
url: "/spms/inv/warehouse/filterAllByUser",
method: "get",
params: query
});
}
// 保存 // 保存
export function saveWarehouse(data, formName, method = "post") { export function saveWarehouse(data, formName, method = "post") {

55
src/views/basic/BussinessTypeModify.vue
Unescape Escape View File

@ -103,30 +103,49 @@
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>当前仓库:&nbsp;</span> <span>内部进出平衡补单:&nbsp;</span>
</div> </div>
<el-select clearable v-model="inputQuery.storageCode" placeholder="当前仓库信息"> <el-select :disabled="inputQuery.corpType !=1"
v-model="inputQuery.supplementOrderType"
clearable
placeholder="单据类型">
<el-option <el-option
v-for="item in orderTypeList"
v-for="item in storageList"
:key="item.name" :key="item.name"
:label="item.name" :label="item.name"
:value="item.code"> :value="item.action">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</el-col> </el-col>
<!-- <el-col :span="10" class="el-col">-->
<!-- <div class="text item">-->
<!-- <div class="itemTag">-->
<!-- <span>当前仓库:&nbsp;</span>-->
<!-- </div>-->
<!-- <el-select clearable v-model="inputQuery.storageCode" placeholder="当前仓库信息">-->
<!-- <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>-->
<!-- </div>-->
<!-- </el-col>-->
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="20" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>备注:&nbsp;</span> <span>备注:&nbsp;</span>
</div> </div>
<el-input <el-input
style="width: 200px" style="width: 80%"
size="small" size="small"
splaceholder="请输入内容" splaceholder="请输入内容"
v-model="inputQuery.remark" v-model="inputQuery.remark"
@ -134,25 +153,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>内部进出平衡补单:&nbsp;</span>
</div>
<el-select :disabled="inputQuery.corpType !=1"
v-model="inputQuery.supplementOrderType"
clearable
placeholder="单据类型">
<el-option
v-for="item in orderTypeList"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</div>
</el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
@ -310,7 +311,7 @@ import {
import { import {
getLocalBusType, getLocalJoinNoUse getLocalBusType, getLocalJoinNoUse
} from "../../api/basic/busLocalType"; } from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getJoinBussinessType} from "../../api/basic/bussinessType"; import {getJoinBussinessType} from "../../api/basic/bussinessType";
import {getCandidateBussinessType} from "../../api/receipts/bussinessType"; import {getCandidateBussinessType} from "../../api/receipts/bussinessType";

10
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -242,8 +242,8 @@ import draggable from "vuedraggable";
import {parseTime} from "../../filtres/index"; import {parseTime} from "../../filtres/index";
import store from "../../store"; import store from "../../store";
import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain" import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
export default { export default {
name: "idQuery", name: "idQuery",
@ -461,7 +461,7 @@ export default {
let query = { let query = {
enabled: true, enabled: true,
}; };
getLocalJoinBusType(query) getLocalJoinByUser(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;
@ -501,7 +501,7 @@ export default {
let cQuery = { let cQuery = {
key: query, key: query,
}; };
filterAll(cQuery) filterAllByUser(cQuery)
.then((response) => { .then((response) => {
this.fromStorageOptions = response.data || []; this.fromStorageOptions = response.data || [];
}) })
@ -514,7 +514,7 @@ export default {
// }; // };
this.storageList = []; this.storageList = [];
// this.formData.locStorageCode = null; // this.formData.locStorageCode = null;
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
this.fromStorageOptions = response.data || []; this.fromStorageOptions = response.data || [];

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

@ -203,7 +203,7 @@ import {saveAs} from "file-saver";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {parseTime} from "../../filtres/index"; import {parseTime} from "../../filtres/index";
import store from "../../store"; import store from "../../store";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
const formJson = { const formJson = {
@ -440,7 +440,7 @@ export default {
// }; // };
this.storageList = []; this.storageList = [];
// this.formData.locStorageCode = null; // this.formData.locStorageCode = null;
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

10
src/views/warehouse/stockHospOrderNew.vue
Unescape Escape View File

@ -511,8 +511,8 @@ import store from "../../store";
import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct"; import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct";
import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain"; import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalBusType, getLocalJoinBusType, getLocalJoinByUser} from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import dialogInvProduct from "../inventory/DialogInvProduct" import dialogInvProduct from "../inventory/DialogInvProduct"
export default { export default {
@ -702,7 +702,7 @@ export default {
}, },
getStorage(event) { getStorage(event) {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })
@ -723,7 +723,7 @@ export default {
let cQuery = { let cQuery = {
key: query, key: query,
}; };
filterAll(cQuery) filterAllByUser(cQuery)
.then((response) => { .then((response) => {
this.fromStorageOptions = response.data || []; this.fromStorageOptions = response.data || [];
}) })
@ -1202,7 +1202,7 @@ export default {
let query = { let query = {
enabled: true, enabled: true,
}; };
getLocalJoinBusType(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; this.busTypes = response.data.list || [];
}) })

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

@ -367,7 +367,7 @@ import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store"; import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default { export default {
name: "stockOrder", name: "stockOrder",
@ -763,7 +763,7 @@ export default {
}, },
getStorage() { getStorage() {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

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

@ -434,7 +434,7 @@ import draggable from "vuedraggable";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store"; import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default { export default {
name: "stockOrderDelSearch", name: "stockOrderDelSearch",
@ -909,7 +909,7 @@ export default {
}, },
getStorage() { getStorage() {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

6
src/views/warehouse/stockOrderEditDistribution.vue
Unescape Escape View File

@ -460,7 +460,7 @@ import stockOrderNewSelectProduct from "./stockOrderNewSelectProduct";
import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain"; import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/basicUnitMaintain";
import {getBussinessType} from "../../api/basic/bussinessType"; import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default { export default {
name: "idQuery", name: "idQuery",
@ -1154,7 +1154,7 @@ export default {
}, },
getStorage(event) { getStorage(event) {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })
@ -1181,7 +1181,7 @@ export default {
let cQuery = { let cQuery = {
key: query, key: query,
}; };
filterAll(cQuery) filterAllByUser(cQuery)
.then((response) => { .then((response) => {
this.fromStorageOptions = response.data || []; this.fromStorageOptions = response.data || [];
}) })

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

@ -495,7 +495,7 @@ import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default { export default {
name: "stockOrderEditor", name: "stockOrderEditor",
@ -913,7 +913,7 @@ export default {
}, },
getStorage() { getStorage() {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

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

@ -449,7 +449,7 @@ import store from "../../store";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {selectSysParamByKey} from "../../api/param/systemParamConfig"; import {selectSysParamByKey} from "../../api/param/systemParamConfig";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default { export default {
name: "stockOrder", name: "stockOrder",
@ -892,7 +892,7 @@ export default {
}, },
getStorage() { getStorage() {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

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

@ -440,7 +440,7 @@ import {
} from "../../api/warehouse/stockOrder"; } from "../../api/warehouse/stockOrder";
import draggable from "vuedraggable"; import draggable from "vuedraggable";
import { import {
filterAll filterAll, filterAllByUser
} from "../../api/basic/invWarehouse"; } from "../../api/basic/invWarehouse";
import {saveAs} from "file-saver"; import {saveAs} from "file-saver";
@ -1097,7 +1097,7 @@ export default {
advanceType: this.getActionName(event), advanceType: this.getActionName(event),
}; };
this.storageList = []; this.storageList = [];
filterAll(query) filterAllByUser(query)
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

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

@ -477,7 +477,7 @@ import draggable from "vuedraggable";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store"; import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default { export default {
name: "stockOrderSearch", name: "stockOrderSearch",
@ -932,7 +932,7 @@ export default {
}, },
getStorage() { getStorage() {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

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

@ -340,7 +340,7 @@ import addOrder from "./addOrder";
import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf"; import {inspectionStockOrderPDFFromTemplateFile, stockOrderPDFFromTemplateFile} from "../../api/itextpdf/itextpdf";
import store from "../../store"; import store from "../../store";
import {getLocalJoinBusType} from "../../api/basic/busLocalType"; import {getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAll} from "@/api/basic/invWarehouse"; import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
export default { export default {
name: "stockOrderWaitCheck", name: "stockOrderWaitCheck",
@ -750,7 +750,7 @@ export default {
}, },
getStorage() { getStorage() {
this.storageList = []; this.storageList = [];
filterAll() filterAllByUser()
.then((response) => { .then((response) => {
this.storageList = response.data || []; this.storageList = response.data || [];
}) })

Write Preview
Loading…
Cancel
Save