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

单据查询页面只留一个分库，申购计划相关bug修改，

Browse Source 
第三方产品信息审核问题
zhairh
anthonywj 3 years ago
parent 03cb78449c
commit f31dbef3d5
16 changed files with 3133 additions and 3092 deletions
Show Stats Download Patch File Download Diff File

84
src/views/purchase/pureApplyDetailDialog.vue
Unescape Escape View File

@ -61,18 +61,20 @@
</el-col>
<el-col :span="7">
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 100%"
:disabled="true"
clearable>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option>
</el-select>
<el-select v-model="formData.invWarehouseCode" placeholder="当前仓库信息" style="width: 100%"
:disabled="true"
clearable>
<el-option
v-for="item in subInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.warehouseName
}}</span>
</el-option>
</el-select>
</el-col>
@ -88,22 +90,8 @@
disabled
autosize></el-input>
</el-form-item>
<el-form-item prop="targetInv">
<el-select v-model="formData.targetSubInv" placeholder="当前分库信息" @change="setTargetInv" style="width: 100%"
clearable>
<el-option
v-for="item in targetSubInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
@ -150,12 +138,34 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" v-if="formData.audtoPlan">
<el-col :span="3">
<div class="ao-text">
<span>采购科室：</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item prop="targetInv">
<el-select v-model="formData.targetSubInv" placeholder="当前采购科室信息" @change="setTargetInv"
style="width: 100%"
clearable>
<el-option
v-for="item in targetSubInvList"
:key="item.name"
:label="item.name"
:value="item.code">
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{
item.warehouseName
}}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-card>
<el-table v-loading="loading" :data="codeArray" style="width: 100%;"
:row-class-name="tableRowClassName"
max-height="300" height="300" ref="multipleTable">
@ -213,7 +223,6 @@
</el-table>
</el-card>
</el-form>
<el-dialog
title="产品录入"
:visible.sync="selectProductVisible"
@ -310,11 +319,8 @@ export default {
thisData: {},
storageList: [],
subInvList: [],
targetInvList: [],
targetSubInvList: [],
invQueryData: {},
};
@ -328,6 +334,12 @@ export default {
let tip = "";
if (status == "3") {
tip = "是否确定通过该申购请求？";
if (this.formData.audtoPlan) {
if (this.$isBlank(this.formData.targetSubInv)) {
this.$message.warning("请选择当前采购科室！");
return;
}
}
} else {
tip = "是否确定拒绝该申购请求？";
}
@ -495,7 +507,7 @@ export default {
findTargetSubInvs() {
this.targetSubInvList = [];
let query = {
pcode: this.formData.targetInv
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -560,7 +572,9 @@ export default {
}
this.getStorage();
this.findSubInvs();
this.getTargetStorage();
// this.getTargetStorage();
this.findTargetSubInvs();
this.codeArray = [];
this.getBusType();
},

1
src/views/thrsys/ThrDiProductsCheck.vue
Unescape Escape View File

@ -187,6 +187,7 @@ export default {
},
checDialog(row) {
this.checkVisible = true;
this.remark = "";
this.curRow = row;
},
search() {

1
src/views/thrsys/thrOrderNew.vue
Unescape Escape View File

@ -520,7 +520,6 @@ export default {
//往来分库
findSubStorageMethod() {
debugger
let cQuery = {
code: this.formData.invWarehouseCode,
filter: 2,

2184
src/views/warehouse/IOCheckErrOrder.vue
View File

File diff suppressed because it is too large Load Diff

37
src/views/warehouse/IONewOrder.vue
Unescape Escape View File

@ -28,21 +28,22 @@
</el-col>
<el-col>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择请选择当前仓库当前分库"
clearable="true"
size="mini"
@change="subInvChange"
>
@ -714,11 +715,15 @@ export default {
getSubInvList() {
let query = {
pcode: this.filterQuery.locStorageCode
// pcode: this.filterQuery.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -745,7 +750,7 @@ export default {
};
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query);

1821
src/views/warehouse/IOSearchOrder.vue
View File

File diff suppressed because it is too large Load Diff

36
src/views/warehouse/IOWaitOrder.vue
Unescape Escape View File

@ -33,21 +33,21 @@
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"-->
<!-- @change="invChange"-->
<!-- size="mini">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
@change="invChange"
size="mini">
<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-form-item class="query-form-item">
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange">
<el-option
@ -560,7 +560,7 @@ export default {
this.filterQuery.endTime = null;
}
this.getList();
},
handleSizeChange(val) {
@ -978,11 +978,13 @@ export default {
getSubInvList() {
let query = {
pcode: this.filterQuery.locStorageCode
// pcode: this.filterQuery.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -1009,7 +1011,7 @@ export default {
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let query = this.$route.query;
this.query = Object.assign(this.query, query);

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

@ -1181,7 +1181,6 @@ export default {
},
created() {
debugger
this.formData.code = '';
this.formData.actDate = new Date();
this.codeArray = [];

1846
src/views/warehouse/addOrder.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -27,21 +27,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange"
>
@ -825,11 +825,14 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -897,7 +900,7 @@ export default {
},
created() {
// 加载表格数据
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

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

@ -26,21 +26,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange"
>
@ -875,11 +875,13 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter:3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -975,7 +977,7 @@ export default {
}
},
created() {
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

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

@ -26,21 +26,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini" @change="subInvChange">
<el-option
v-for="item in subInvList"
@ -975,11 +975,14 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter:3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -1021,7 +1024,9 @@ export default {
}
},
created() {
this.getStorage();
// this.getStorage();
this.getSubInvList();
this.getSysParm();
this.getBusType();
this.getList();

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

@ -26,23 +26,23 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
placeholder="请选择当前仓库" clearable="true" size="mini"
@change="invChange">
<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-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini"-->
<!-- @change="invChange">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库库" clearable="true"
size="mini"
@change="subInvChange">
<el-option
@ -973,17 +973,17 @@ export default {
},
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
},
subInvChange() {
this.getBusType();
}
@ -1019,7 +1019,8 @@ export default {
},
created() {
this.getBusType();
this.getStorage();
// this.getStorage();
this.getSubInvList();
let end = new Date();
let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

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

@ -302,8 +302,6 @@ export default {
this.getList();
},
getList() {
debugger
this.loading = true;
this.listQuery.customerId = store.getters.customerId;
if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined && this.data.formData.noInvOut==false){

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

@ -27,21 +27,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange">
<el-option
@ -1026,11 +1026,13 @@ export default {
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -1160,7 +1162,7 @@ export default {
if (store.getters.customerId == 110) {
this.isReceAble = true;
}
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

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

@ -27,21 +27,21 @@
<el-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="query.locStorageCode"-->
<!-- @change="invChange"-->
<!-- placeholder="请选择当前仓库" clearable="true" size="mini">-->
<!-- <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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode"
@change="invChange"
placeholder="请选择当前仓库" clearable="true" size="mini">
<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-form-item class="query-form-item">
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
<el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
size="mini"
@change="subInvChange">
<el-option
@ -813,11 +813,14 @@ export default {
},
getSubInvList() {
let query = {
pcode: this.query.locStorageCode
// pcode: this.query.locStorageCode
filter: 3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
this.getList();
})
.catch(() => {
});
@ -883,7 +886,7 @@ export default {
},
created() {
// 加载表格数据
this.getStorage();
this.getSubInvList();
this.getBusType();
let end = new Date();
let start = new Date();

Write Preview
Loading…
Cancel
Save