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

bug修改，缺少分库查询，分库联动，分库创建等

Browse Source
fencang
anthonywj 3 years ago
parent 0f92be9513
commit a9c82d3b9d
8 changed files with 499 additions and 357 deletions
Show Stats Download Patch File Download Diff File

4
src/views/inventory/InvProducts.vue
Unescape Escape View File

@ -176,6 +176,7 @@ export default {
data() {
return {
filterQuery: {
invWarehouseCode: null,
invStorageCode: null,
productsName: null,
nameCode: null,
@ -343,6 +344,8 @@ export default {
invChange() {
// this.$set(this.filterQuery, "entrustUser", "");
this.filterQuery.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.filterQuery.invStorageCode
@ -357,7 +360,6 @@ export default {
intentDetail(row) {
this.idQuery = row;
// this.idQuery.supId = null;
this.idQuery.customerId = null;
this.codeDetailVisible = true;
},

31
src/views/inventory/InvStatistics.vue
Unescape Escape View File

@ -51,7 +51,7 @@
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
size="mini">
@change="invChange" size="mini">
<el-option
v-for="item in storageList"
:key="item.name"
@ -61,6 +61,18 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
size="mini">
<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-form-item>
<el-button-group>
<el-button
@ -134,12 +146,14 @@ import store from "../../store";
import {getBussinessType} from "../../api/basic/bussinessType";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default {
data() {
return {
filterQuery: {
invWarehouseCode: null,
cpmctymc: null,
nameCode: null,
relIdFk: null,
@ -174,6 +188,7 @@ export default {
fromOptions: [],
storageOptions: [],
storageList: [],
subInvList: [],
};
},
components: {
@ -311,6 +326,20 @@ export default {
.catch(() => {
});
},
invChange() {
// this.$set(this.filterQuery, "entrustUser", "");
this.filterQuery.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.filterQuery.invStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
},
filters: {
statusFilterType(status) {

2
src/views/warehouse/AdditionalOrder.vue
Unescape Escape View File

@ -283,6 +283,8 @@ export default {
data() {
return {
filterQuery: {
locStorageCode:null,
invWarehouseCode:null,
id: "",
mainAction: null,
action: null,

80
src/views/warehouse/DialogcChangeNewOrder.vue
Unescape Escape View File

@ -72,9 +72,6 @@
<el-col :span="8">
<el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locCHange">
<el-option
v-for="item in storageList"
@ -143,6 +140,19 @@
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
>
<el-option
v-for="item in fromSubStorageOptions"
:key="item.code"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
<!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
</el-option>
</el-select>
</el-form-item>
<el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==2">
@ -152,6 +162,28 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>当前分库：</span>
</div>
</el-col>
<el-col :span="8">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
>
<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>
</el-form>
@ -193,6 +225,7 @@ import {parseTime} from "@/filtres";
import {getLocalJoinByUser} from "@/api/basic/busLocalType";
import {submitOrderWeb} from "@/api/warehouse/order";
import {stockOrderChange, stockOrderDetail} from "@/api/warehouse/stockOrder";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default {
name: "DialogcChangeNewOrder",
@ -221,14 +254,19 @@ export default {
mainAction: null
},
fromStorageOptions: [],
fromSubStorageOptions: [],
curAction: {
corpType: 0,
genUnit: false,
},
busTypes: [],
fromOptions: [],
loading:false,
detailList: []
loading: false,
detailList: [],
storageList: [],
detailLoading: false,
subInvList: [],
}
},
methods: {
@ -271,6 +309,9 @@ export default {
mainAction: this.formData.mainAction,
fromCorp: this.formData.fromCorp,
fromCorpId: this.formData.fromCorpId,
invWarehouseCode: this.formData.invWarehouseCode,
fromSubInvCode: this.formData.fromSubInvCode,
products: products
};
stockOrderChange(tQuery)
@ -288,6 +329,21 @@ export default {
locCHange() {
this.findStorageMethod();
this.findSubInvByInv(this.formData.locStorageCode);
},
findSubInvByInv(invCode) {
this.subInvList = [];
let query = {
pcode: invCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
findStorageMethod(query) {
@ -304,7 +360,18 @@ export default {
.catch(() => {
});
},
findSubStorageMethod() {
let cQuery = {
pcode: this.formData.fromCorpId,
filter: 2,
};
filterSubByInv(cQuery)
.then((response) => {
this.fromSubStorageOptions = response.data || [];
})
.catch(() => {
});
},
findMethod(query) {
this.fromOptions = [];
let cQuery = {
@ -345,6 +412,7 @@ export default {
storageChange(row) {
this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name;
this.findSubStorageMethod();
},
unitChange(row) {

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

@ -782,7 +782,6 @@ export default {
this.curRow = row;
},
storageChange(row) {
console.log(row);
this.formData.fromCorpId = row.code;
this.formData.fromCorp = row.name;
this.findSubStorageMethod();

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

@ -178,8 +178,8 @@
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息"
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
clearable>
<el-option
v-for="item in subInvList"
@ -193,7 +193,6 @@
</el-col>
</el-row>
<el-row :gutter="20" style="margin-top: -10px;">

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

@ -94,10 +94,9 @@
<el-col :span="7">
<el-form-item prop="locStorageCode">
<!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
<!--<el-option label="送货单" value="deliveryNote"></el-option>-->
<!--</el-select>-->
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" disabled>
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
@change="invChange"
disabled>
<el-option
v-for="item in storageList"
:key="item.name"
@ -108,6 +107,30 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<div class="ao-text">
<span>当前分库：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="invWarehouseCode">
<el-select v-model="formData.invWarehouseCode" disabled
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>
</el-card>
@ -124,44 +147,44 @@
>
</el-button-group>
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>扫码录入：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="3">-->
<!-- <div class="ao-text">-->
<!-- <span>扫码录入：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="10">-->
<!-- <el-form-item prop="code">-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;-->
<!-- <el-input-->
<!-- &lt;!&ndash; @keyup.native.enter="focusNext('iCount')" @focus="getInputFocus($event)"-->
<!-- @keypress.enter.native="selectProductFunction($event)"-->
<!-- &ndash;&gt;-->
<!-- <el-input-->
<!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"-->
<!-- auto-complete="off"-->
<!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量：</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- @keyup.enter.native="selectProductFunction($event)"-->
<!-- v-model="code"-->
<!-- auto-complete="off"-->
<!-- ref='inputRef'-->
<!-- @focus="getInputFocus($event)"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="3">&ndash;&gt;-->
<!-- &lt;!&ndash; <div class="ao-text">&ndash;&gt;-->
<!-- &lt;!&ndash; <span>数量：</span>&ndash;&gt;-->
<!-- &lt;!&ndash; </div>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-col :span="4">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item prop="iCount">&ndash;&gt;-->
<!-- &lt;!&ndash; &lt;!&ndash; @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
<!-- &lt;!&ndash; @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
<!-- &lt;!&ndash; @focus="getInputFocus($event)"&ndash;&gt;-->
<!-- &lt;!&ndash; @input="iCountChange"&ndash;&gt;-->
<!-- &lt;!&ndash; oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- </el-row>-->
<!-- highlight-current-row-->
<!-- @current-change="rowChange"-->
@ -421,6 +444,7 @@ import {getBasicUnitMaintains, getBasicUnitMaintains2} from "../../api/basic/bas
import {getBussinessType} from "../../api/basic/bussinessType";
import {getLocalBusType, getLocalJoinBusType} from "../../api/basic/busLocalType";
import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
import {filterSubByInv} from "@/api/basic/invSubWarehouse";
export default {
name: "idQuery",
@ -501,6 +525,7 @@ export default {
selectInvProductVisible: false,
thisData: {},
storageList: [],
subInvList: [],
};
},
components: {
@ -1075,6 +1100,19 @@ export default {
.catch(() => {
});
},
invChange() {
// this.formData.invWarehouseCode = "";
this.subInvList = [];
let query = {
pcode: this.formData.locStorageCode
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
})
.catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
if (this.busTypes[i].action === action) {
@ -1123,6 +1161,9 @@ export default {
this.orderEditor = true;
this.sValue = this.formData.corpName;
this.getStockOrderDetailList();
this.invChange();
} else {
this.formData = {
billdate: "",
@ -1137,6 +1178,8 @@ export default {
this.orderEditor = false;
this.generateBillNo();
}
},
};
</script>

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

@ -697,7 +697,7 @@ export default {
},
distributionForm(index, row) {
this.idQuery.id = '';
console.log("row = " + row.id);
console.log("row = " + row.invWarehouseCode);
if (this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;
this.idQuery.formData = row;

Write Preview
Loading…
Cancel
Save