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

Merge remote-tracking branch 'origin/featFunction' into otherChange

Browse Source 
# Conflicts:
#	src/views/basic/invWarehouse.vue
#	src/views/thrsys/thrOrderNew.vue
zhairh
郑明梁 3 years ago
parent 5867c1386d 9b8d8945cc
commit aae47452ef
5 changed files with 94 additions and 136 deletions
Show Stats Download Patch File Download Diff File

52
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -355,6 +355,53 @@
</div> </div>
</el-dialog> </el-dialog>
<!--添加单据类型弹窗---->
<!--添加单据类型弹窗-->
<el-dialog
title="仓库关联单据类型"
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="userBussinessTypeFormVisible"
>
<el-row type="flex" justify="end">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button
type="primary"
@click.native="addBussinessType()"
:loading="loading"
>选入
</el-button
>
</el-button-group>
</el-row>
<el-table v-loading="loading" :data="userBussinessTypeList" ref="typeList"
style="width: 100%">
<el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
<el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
:disabled="!configParms.basicInv"
@click.native.stop="delWarehouseBussinessType(scope.row.id)"
>移除
</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click.native="userBussinessTypeFormVisible = !userBussinessTypeFormVisible"
>取消
</el-button
>
</div>
</el-dialog>
<!--表单界面--> <!--表单界面-->
<el-dialog <el-dialog
:title="formMap[formName]" :title="formMap[formName]"
@ -887,7 +934,8 @@ export default {
bussinessTypeQuery: { bussinessTypeQuery: {
enabled: true, enabled: true,
page: 1, page: 1,
limit: 10 limit: 10,
ids:""
}, },
bussinessTypeTotal: 0, bussinessTypeTotal: 0,
curSeleUser: null, curSeleUser: null,
@ -1386,7 +1434,7 @@ export default {
if (that.$refs.typeList) { if (that.$refs.typeList) {
that.$refs.typeList.clearSelection(); that.$refs.typeList.clearSelection();
} }
that.bussinessTypeList.forEach(row => { that.bussinessTypeList.forEach(row => {
if (row.checkSelect==true) { if (row.checkSelect==true) {
that.$refs.typeList.toggleRowSelection(row, true); that.$refs.typeList.toggleRowSelection(row, true);

57
src/views/purchase/purApplyEditDiaolog.vue
Unescape Escape View File

@ -62,18 +62,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange" <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" @change="setWarehouseName" style="width: 100%"
style="width: 50%"
clearable>
<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-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -81,11 +70,12 @@
: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>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3"> <el-col :span="3" >
<div class="ao-text"> <div class="ao-text">
<span>申购说明：</span> <span>申购说明：</span>
</div> </div>
@ -104,7 +94,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item> <el-form-item >
<el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input> <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -299,13 +289,11 @@ export default {
return; return;
} }
if (status === '2') { if (status === '2') {
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.locStorageCode == "" || this.formData.locStorageCode == 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("分库不能为空！");
} }
@ -396,6 +384,9 @@ export default {
this.getList(); this.getList();
} }
}, },
setWarehouseName(obj){
this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId;
},
deleteCodeArray(index, row) { deleteCodeArray(index, row) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", { this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -452,26 +443,10 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList != null && this.storageList.length == 1) {
this.formData.locStorageCode = this.storageList[0].code;
}
this.findSubInvs();
})
.catch(() => {
});
},
findSubInvs() { findSubInvs() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.formData.locStorageCode filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -483,13 +458,7 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
locInChange(item) {
if (this.formData.invWarehouseCode != null) {
this.formData.invWarehouseCode = "";
}
this.formData.locStorageCode = item;
this.findSubInvs();
},
}, },
filters: {}, filters: {},
mounted() { mounted() {
@ -519,7 +488,7 @@ export default {
}; };
this.orderEditor = false; this.orderEditor = false;
} }
this.getStorage(); this.findSubInvs();
this.codeArray = []; this.codeArray = [];
}, },
}; };

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

@ -83,18 +83,8 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="采购仓库信息" @change="locInChange"
style="width: 50%" <el-select v-model="formData.invWarehouseCode" auto-complete="" @change="setLocStorageCode" filterable placeholder="采购分库信息" style="width: 100%"
clearable>
<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-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 50%"
clearable> clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -102,12 +92,16 @@
: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>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" style="margin-top: -10px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>采购说明：</span> <span>采购说明：</span>
@ -364,13 +358,11 @@ 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) { if(this.formData.billType=="" || this.formData.billType==null){
// return this.$message.error("采购类型不能为空！"); return this.$message.error("采购类型不能为空！");
// }
if (this.formData.locStorageCode == "" || this.formData.locStorageCode == 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("采购分库不能为空！");
} }
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
@ -422,6 +414,9 @@ export default {
this.thisData.stockOrderLists = this.codeArray; this.thisData.stockOrderLists = this.codeArray;
this.selectProductVisible = true; this.selectProductVisible = true;
}, },
setLocStorageCode(obj){
 this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId;
},
selectApply() { selectApply() {
this.selectApplyVisible = true; this.selectApplyVisible = true;
@ -519,26 +514,10 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList != null && this.storageList.length == 1) {
this.formData.locStorageCode = this.storageList[0].code;
}
this.findSubInvs();
})
.catch(() => {
});
},
findSubInvs() { findSubInvs() {
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.formData.locStorageCode filter:3
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -550,13 +529,6 @@ export default {
.catch(() => { .catch(() => {
}); });
}, },
locInChange(item) {
if (this.formData.invWarehouseCode != null) {
this.formData.invWarehouseCode = "";
}
this.formData.locStorageCode = item;
this.findSubInvs();
},
getBusType() { getBusType() {
let query = { let query = {
enable: false, enable: false,
@ -598,7 +570,7 @@ export default {
}; };
this.orderEditor = false; this.orderEditor = false;
} }
this.getStorage(); this.findSubInvs();
this.getBusType(); this.getBusType();
this.codeArray = []; this.codeArray = [];
}, },

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

@ -61,20 +61,7 @@
</el-col> </el-col>
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 100%"
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息"
:disabled="true"
style="width: 50%"
clearable>
<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-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 50%"
:disabled="true" :disabled="true"
clearable> clearable>
<el-option <el-option
@ -83,43 +70,13 @@
: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>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item>
</el-col> </el-col>
<!-- <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.targetInv" placeholder="当前仓库信息" @change="locInChange"-->
<!-- style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetInvList"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.code">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" style="width: 50%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in targetSubInvList"-->
<!-- :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-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">
<span>申购说明：</span> <span>申购说明：</span>
@ -130,6 +87,18 @@
<el-input v-model="formData.remark" auto-complete="off" type="textarea" <el-input v-model="formData.remark" auto-complete="off" type="textarea"
disabled disabled
autosize></el-input> autosize></el-input>
<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-form-item>
</el-col> </el-col>

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

@ -61,7 +61,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
//
<el-row :gutter="20" style="margin-top: -5px"> <el-row :gutter="20" style="margin-top: -5px">
<el-col :span="3"> <el-col :span="3">
<div class="ao-text"> <div class="ao-text">

Write Preview
Loading…
Cancel
Save