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

Merge remote-tracking branch 'origin/zhairh' into zhairh

Browse Source
zhairh
x_z 3 years ago
parent 9f8360274f 9408eee9be
commit 211ed2f712
23 changed files with 3148 additions and 3128 deletions
Show Stats Download Patch File Download Diff File

4
public/config.json
Unescape Escape View File

@ -1,6 +1,6 @@
{ {
"BASE_URL": "http://192.168.0.166:9996", "BASE_URL": "http://192.168.0.166:9906",
"SERVER_IP": "http://192.168.0.166:9996", "SERVER_IP": "http://192.168.0.166:9906",
"hosp_name": "福建省XX市医院" "hosp_name": "福建省XX市医院"
} }

2
src/views/basic/basicProductEdit.vue
Unescape Escape View File

@ -987,7 +987,7 @@ export default {
this.selectVersionVisible = true; this.selectVersionVisible = true;
this.uuid = this.editQuery.uuid; this.uuid = this.editQuery.uuid;
this.originUuid = this.editQuery.originUuid; this.originUuid = this.editQuery.originUuid;
this.relId = this.editQuery.id; this.relId = this.editQuery.rlId;
}, },
updateVersion() { updateVersion() {

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

@ -152,6 +152,7 @@ export default {
}, },
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
path: "", path: "",
}); });
@ -165,6 +166,8 @@ export default {
supId: null, supId: null,
page: 1, page: 1,
limit: 10, limit: 10,
invStorageCode:this.invQueryData.locStorageCode,
invWarehouseCode:this.invQueryData.invWarehouseCode
}; };
this.getList(); this.getList();
}, },
@ -333,6 +336,7 @@ export default {
}; };
}, },
created() { created() {
this.getBusType(); this.getBusType();
let query = this.$route.query; let query = this.$route.query;

3
src/views/purchase/purPlanEditDialog.vue
Unescape Escape View File

@ -356,9 +356,6 @@ export default {
if (this.formData.billDate == "" || this.formData.billDate == null) { if (this.formData.billDate == "" || this.formData.billDate == null) {
return this.$message.error("单据日期不能为空！"); return this.$message.error("单据日期不能为空！");
} }
/*if(this.formData.billType=="" || this.formData.billType==null){
return this.$message.error("采购类型不能为空！");
}*/
if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){ if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
return this.$message.error("采购分库不能为空！"); return this.$message.error("采购分库不能为空！");

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

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

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

@ -26,7 +26,6 @@
</el-row> </el-row>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions class="margin-top" title="同步至UDI管理系统基础数据" :column="1" :size="100" style="margin-top: 40px" <el-descriptions class="margin-top" title="同步至UDI管理系统基础数据" :column="1" :size="100" style="margin-top: 40px"
border> border>

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

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

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

@ -499,7 +499,9 @@ export default {
this.subInvList = response.data || []; this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) { if (this.subInvList != null && this.subInvList.length == 1) {
this.formData.invWarehouseCode = this.subInvList[0].code; this.formData.invWarehouseCode = this.subInvList[0].code;
this.formData.locStorageCode = this.subInvList[0].parentId;
this.getBusType(); this.getBusType();
this.findSubStorageMethod();
} }
}) })
.catch(() => { .catch(() => {
@ -514,27 +516,7 @@ export default {
} }
}, },
//往来仓库
findStorageMethod() {
if (this.formData.locStorageCode == null)
return;
this.fromStorageOptions = [];
let cQuery = {
locInvCode: this.formData.locStorageCode,
};
filterAllByLoc(cQuery)
.then((response) => {
let temp = response.data || [];
for (let i = 0; i < temp.length; i++) {
if (temp[i].code != this.formData.locStorageCode) {
this.fromStorageOptions.push(temp[i]);
}
}
})
.catch(() => {
});
},
//往来分库 //往来分库
findSubStorageMethod() { findSubStorageMethod() {
@ -918,7 +900,6 @@ export default {
} }
this.formData.locStorageCode = item; this.formData.locStorageCode = item;
this.$forceUpdate(); this.$forceUpdate();
this.findStorageMethod();
this.findSubInvs(); this.findSubInvs();
}, },
@ -960,7 +941,7 @@ export default {
this.getBusType(); this.getBusType();
this.findSubInvs(); this.findSubInvs();
this.findSubStorageMethod();
// this.findSubInvByInv(); // this.findSubInvByInv();
this.codeArray = []; this.codeArray = [];
this.closeConfirmFunction(false); this.closeConfirmFunction(false);

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

File diff suppressed because it is too large Load Diff

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

@ -28,21 +28,22 @@
</el-col> </el-col>
<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-form-item class="query-form-item">
<el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true" <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择请选择当前仓库当前分库"
@change="invChange" 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="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
size="mini" size="mini"
@change="subInvChange" @change="subInvChange"
> >
@ -55,8 +56,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button <el-button
@ -476,10 +475,9 @@ export default {
this.idQuery.id = ''; this.idQuery.id = '';
this.idQuery.actDate = ''; this.idQuery.actDate = '';
this.idQuery.corpOrderId = ''; this.idQuery.corpOrderId = '';
this.idQuery.outChangeEnable = row.outChangeEnable; this.idQuery.outChangeEnable = row.outChangeEnable;
if (row.id !== null && row.id !== undefined && row.id !== '') { if (row.id !== null && row.id !== undefined && row.id !== '') {
this.idQuery.id = row.id; this.idQuery.id = row.id;
this.idQuery.actDate = row.actDate; this.idQuery.actDate = row.actDate;
this.idQuery.corpOrderId = row.corpOrderId; this.idQuery.corpOrderId = row.corpOrderId;
@ -492,7 +490,6 @@ export default {
} else { } else {
this.formName = "add"; this.formName = "add";
} }
if (store.getters.customerId == 110) { if (store.getters.customerId == 110) {
this.addHosOrderVisible = true; this.addHosOrderVisible = true;
this.idQuery.action = row.action; this.idQuery.action = row.action;
@ -718,11 +715,15 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.filterQuery.locStorageCode // pcode: this.filterQuery.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -749,7 +750,7 @@ export default {
}; };
}, },
created() { created() {
this.getStorage(); this.getSubInvList();
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);

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

File diff suppressed because it is too large Load Diff

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

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

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

@ -1005,7 +1005,6 @@ export default {
}; };
filterSubByInv(cQuery) filterSubByInv(cQuery)
.then((response) => { .then((response) => {
this.fromSubStorageOptions = response.data || []; this.fromSubStorageOptions = response.data || [];
if (val == 1) { if (val == 1) {
@ -1182,7 +1181,6 @@ export default {
}, },
created() { created() {
this.formData.code = ''; this.formData.code = '';
this.formData.actDate = new Date(); this.formData.actDate = new Date();
this.codeArray = []; this.codeArray = [];
@ -1221,9 +1219,9 @@ export default {
if (this.$isNotBlank(this.formData.locStorageCode)) { if (this.$isNotBlank(this.formData.locStorageCode)) {
this.findStorageMethod(); this.findStorageMethod();
} }
this.findSubStorageMethod();
} }
this.findSubInvByInv(); this.findSubInvByInv();
this.findSubStorageMethod();
this.getBusType(); this.getBusType();
//查询是否启用多级仓库，判断是否启用部门 //查询是否启用多级仓库，判断是否启用部门

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

File diff suppressed because it is too large Load Diff

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

@ -80,7 +80,7 @@
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来单位" prop="corpName" width="300" <el-table-column label="往来单位" prop="corpName" width="300"
show-overflow-tooltip="true"></el-table-column> show-overflow-tooltip="true"></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="billFlag" width="80"></el-table-column> <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
<el-table-column label="单据日期" prop="billdate"></el-table-column> <el-table-column label="单据日期" prop="billdate"></el-table-column>
</el-table> </el-table>

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

@ -800,6 +800,7 @@ export default {
}; };
this.selectInvProductVisible = true; this.selectInvProductVisible = true;
} else { } else {
this.selectProductVisible = true; this.selectProductVisible = true;
} }
return; return;

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-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@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"
size="mini" size="mini"
@change="subInvChange" @change="subInvChange"
> >
@ -825,11 +825,14 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -897,7 +900,7 @@ export default {
}, },
created() { created() {
// 加载表格数据 // 加载表格数据
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let end = new Date(); let end = new Date();
let start = 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-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@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"
size="mini" size="mini"
@change="subInvChange" @change="subInvChange"
> >
@ -875,11 +875,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -975,7 +977,7 @@ export default {
} }
}, },
created() { created() {
this.getStorage(); this.getSubInvList();
this.getBusType(); this.getBusType();
let end = new Date(); let end = new Date();
let start = 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-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
</el-form-item> </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-form-item class="query-form-item">
<el-select v-model="query.locStorageCode" <el-select v-model="query.invWarehouseCode" placeholder="请选择当前仓库" clearable="true"
@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"
size="mini" @change="subInvChange"> size="mini" @change="subInvChange">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -975,11 +975,14 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
@ -1021,7 +1024,9 @@ export default {
} }
}, },
created() { created() {
this.getStorage(); // this.getStorage();
this.getSubInvList();
this.getSysParm(); this.getSysParm();
this.getBusType(); this.getBusType();
this.getList(); 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-form-item class="query-form-item" v-if="isSp ==110">
<el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input> <el-input v-model="query.corpName" placeholder="往来单位" clearable></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="query.locStorageCode" <!-- <el-select v-model="query.locStorageCode"-->
placeholder="请选择当前仓库" clearable="true" size="mini" <!-- placeholder="请选择当前仓库" clearable="true" size="mini"-->
@change="invChange"> <!-- @change="invChange">-->
<el-option <!-- <el-option-->
v-for="item in storageList" <!-- v-for="item in storageList"-->
:key="item.name" <!-- :key="item.name"-->
:label="item.name" <!-- :label="item.name"-->
:value="item.code"> <!-- :value="item.code">-->
<span style="float: left">{{ item.name }}</span> <!-- <span style="float: left">{{ item.name }}</span>-->
</el-option> <!-- </el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item class="query-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" size="mini"
@change="subInvChange"> @change="subInvChange">
<el-option <el-option
@ -973,17 +973,17 @@ export default {
}, },
getSubInvList() { getSubInvList() {
let query = { let query = {
pcode: this.query.locStorageCode // pcode: this.query.locStorageCode
filter: 3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
this.subInvList = response.data || []; this.subInvList = response.data || [];
this.getList();
}) })
.catch(() => { .catch(() => {
}); });
}, },
subInvChange() { subInvChange() {
this.getBusType(); this.getBusType();
} }
@ -1019,7 +1019,8 @@ export default {
}, },
created() { created() {
this.getBusType(); this.getBusType();
this.getStorage(); // this.getStorage();
this.getSubInvList();
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

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

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

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

Write Preview
Loading…
Cancel
Save