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

修改bug已经去除采购管理的仓库

Browse Source
featFunction
郑明梁 3 years ago
parent d4b8d52622
commit a0e2060caa
15 changed files with 1035 additions and 1150 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.109:9906",
"SERVER_IP": "http://192.168.0.109:9906",
"BASE_URL": "http://192.168.0.41:9996",
"SERVER_IP": "http://192.168.0.41:9996",
"hosp_name": "福建省XX市医院"
}

3
src/views/basic/BasicEntrutsReceModify.vue
Unescape Escape View File

@ -216,7 +216,8 @@ export default {
findSubInvByInv() {
this.subInvList = [];
let query = {
pcode: this.inputQuery.curInv
pcode: this.inputQuery.curInv,
filter:3
};
filterSubByInv(query)
.then((response) => {

26
src/views/home/index.vue
Unescape Escape View File

@ -394,22 +394,7 @@ export default {
this.company = response.data;
});
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
if (response.code == 20000) {
this.storageList = response.data || [];
if (this.storageList != null && this.storageList.length == 1) {
this.userInfo.locInvCode = this.storageList[0].code;
}
this.findSubInvByInv();
}
})
.catch(() => {
});
},
locCHange() {
@ -421,8 +406,10 @@ export default {
findSubInvByInv() {
this.subInvList = [];
filterSubByInv()
let query = {
filter:3
};
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
@ -455,7 +442,7 @@ export default {
this.$store.commit(types.RECEIVE_LOCSUBINVNAME, this.locSubInvName);
}
this.getStorage();
}
})
.catch(() => {
@ -546,6 +533,7 @@ export default {
},
},
created() {
this.getBreadcrumb();
this.getCompanyData();
// this.getStorage();

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

@ -62,18 +62,7 @@
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" @change="locInChange"
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%"
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" @change="setWarehouseName" style="width: 100%"
clearable>
<el-option
v-for="item in subInvList"
@ -81,6 +70,7 @@
: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>
@ -291,9 +281,7 @@ export default {
if(this.formData.billDate=="" || this.formData.billDate==null){
return this.$message.error("单据日期不能为空！");
}
if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){
return this.$message.error("仓库不能为空！");
}
if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
return this.$message.error("分库不能为空！");
}
@ -385,6 +373,9 @@ export default {
this.getList();
}
},
setWarehouseName(obj){
this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId;
},
deleteCodeArray(index, row) {
this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
confirmButtonText: "确定",
@ -441,26 +432,10 @@ export default {
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() {
this.subInvList = [];
let query = {
pcode: this.formData.locStorageCode
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -472,13 +447,7 @@ export default {
.catch(() => {
});
},
locInChange(item) {
if (this.formData.invWarehouseCode != null) {
this.formData.invWarehouseCode = "";
}
this.formData.locStorageCode = item;
this.findSubInvs();
},
},
filters: {},
mounted() {
@ -508,7 +477,7 @@ export default {
};
this.orderEditor = false;
}
this.getStorage();
this.findSubInvs();
this.codeArray = [];
},
};

14
src/views/purchase/purPlanDetailDialog.vue
Unescape Escape View File

@ -62,18 +62,8 @@
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="采购仓库信息" @change="locInChange"
style="width: 50%" :disabled="true"
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%"
<el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 100%"
:disabled="true" clearable>
<el-option
v-for="item in subInvList"

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

@ -83,18 +83,8 @@
<el-col :span="7">
<el-form-item prop="locStorageCode">
<el-select v-model="formData.locStorageCode" placeholder="采购仓库信息" @change="locInChange"
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%"
<el-select v-model="formData.invWarehouseCode" auto-complete="" @change="setLocStorageCode" filterable placeholder="采购分库信息" style="width: 100%"
clearable>
<el-option
v-for="item in subInvList"
@ -102,6 +92,8 @@
: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>
@ -319,9 +311,7 @@ export default {
if(this.formData.billType=="" || this.formData.billType==null){
return this.$message.error("采购类型不能为空！");
}
if(this.formData.locStorageCode=="" || this.formData.locStorageCode==null){
return this.$message.error("采购仓库不能为空！");
}
if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
return this.$message.error("采购分库不能为空！");
}
@ -374,6 +364,10 @@ export default {
this.thisData.stockOrderLists = this.codeArray;
this.selectProductVisible = true;
},
setLocStorageCode(obj){
debugger
 this.formData.locStorageCode= this.subInvList.find(item => item.code == obj).parentId;
},
closeDialogC2(rData) {
this.selectProductVisible = false;
this.thisData = {};
@ -465,26 +459,10 @@ export default {
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() {
this.subInvList = [];
let query = {
pcode: this.formData.locStorageCode
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -496,13 +474,6 @@ export default {
.catch(() => {
});
},
locInChange(item) {
if (this.formData.invWarehouseCode != null) {
this.formData.invWarehouseCode = "";
}
this.formData.locStorageCode = item;
this.findSubInvs();
},
getBusType() {
let query = {
enable: false,
@ -544,7 +515,7 @@ export default {
};
this.orderEditor = false;
}
this.getStorage();
this.findSubInvs();
this.getBusType();
this.codeArray = [];
},

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

@ -61,20 +61,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="locStorageCode">
<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%"
<el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息" style="width: 100%"
:disabled="true"
clearable>
<el-option
@ -83,9 +70,10 @@
: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>
@ -97,18 +85,7 @@
<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%"
<el-select v-model="formData.targetSubInv" placeholder="当前分库信息" @change="setTargetInv" style="width: 100%"
clearable>
<el-option
v-for="item in targetSubInvList"
@ -116,6 +93,7 @@
: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>
@ -438,6 +416,9 @@ export default {
});
},
setTargetInv(obj){
 this.formData.targetInv= this.targetSubInvList.find(item => item.code == obj).parentId;
},
getStockOrderDetailList() {
this.loading = true;
listApplyDetail(this.query) //查找该单号下的所有条码
@ -455,15 +436,7 @@ export default {
},
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
findSubInvs() {
this.subInvList = [];
let query = {
@ -472,7 +445,7 @@ export default {
filterSubByInv(query)
.then((response) => {
this.subInvList = response.data || [];
if (this.subInvList != null && this.subInvList.length == 1) {
if (this.subInvList != null && this.subInvList.length == 1) {getStorage
this.formData.invWarehouseCode = this.subInvList[0].code;
}
})
@ -498,7 +471,7 @@ export default {
findTargetSubInvs() {
this.targetSubInvList = [];
let query = {
pcode: this.formData.targetInv
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -512,13 +485,7 @@ export default {
},
locInChange(item) {
if (this.formData.targetSubInv != null) {
this.formData.targetSubInv = "";
}
this.formData.targetInv = item;
this.findTargetSubInvs();
},
getBusType() {
let query = {
@ -561,8 +528,8 @@ export default {
};
this.orderEditor = false;
}
this.getStorage();
this.findSubInvs();
this.findTargetSubInvs();
this.getTargetStorage();
this.codeArray = [];
this.getBusType();

1910
src/views/thrsys/thrOrderNew.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -104,7 +104,8 @@ export default {
findSubInvByInv() {
this.subInvList = [];
let query = {
pcode: this.userInfo.locInvCode
pcode: this.userInfo.locInvCode,
filter:3
};
filterSubByInv(query)
.then((response) => {

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

@ -320,7 +320,8 @@ export default {
findSubInvByInv(invCode) {
this.subInvList = [];
let query = {
pcode: invCode
pcode: invCode,
filter:3
};
filterSubByInv(query)
.then((response) => {

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

@ -1000,6 +1000,7 @@ export default {
},
findSubStorageMethod(val) {
this. getBusType() ;
let cQuery = {
code: this.formData.invWarehouseCode,
filter: 2,
@ -1018,11 +1019,11 @@ export default {
},
findSubInvByInv(invCode) {
findSubInvByInv() {
this.subInvList = [];
let query = {
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -1222,7 +1223,7 @@ export default {
this.findStorageMethod();
}
}
this.findSubInvByInv(this.formData.locStorageCode);
this.findSubInvByInv();
this.findSubStorageMethod();
this.getBusType();

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

@ -764,7 +764,7 @@ export default {
this.formData.vailInv = this.curAction.vailInv;
this.formData.codeFillCheck = this.curAction.codeFillCheck;
}
this.getStorage(this.formData.billType);
})
.catch(() => {
});
@ -773,7 +773,7 @@ export default {
findSubInvByInv(invCode) {
this.subInvList = [];
let query = {
pcode: invCode
filter:3
};
filterSubByInv(query)
.then((response) => {

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

@ -116,9 +116,7 @@
</el-form-item>
<el-form-item class="query-form-item" prop="fromCorp"
v-if="curAction.corpType ==1">
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" filterable clearable="true"
<el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" @change="setCorpName" filterable clearable="true"
:disabled="codeArray.length>0"
>
<el-option
@ -619,16 +617,7 @@ export default {
this.findSubStorageMethod();
},
getStorage(event) {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
getActionName(action) {
for (let i = 0; i < this.busTypes.length; i++) {
@ -687,9 +676,11 @@ export default {
},
findSubInvByInv(invCode) {
this.subInvList = [];
let query = {
pcode: invCode
pcode: invCode,
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -769,8 +760,16 @@ export default {
}
if (this.$isBlank(event)) {
if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
this.$message.error("往来信息和单据类型不能为空！")
if ( this.$isBlank(this.formData.billType)) {
this.$message.error("单据类型不能为空！")
return;
}
if(this.curAction.corpType==1 && this.$isBlank(this.formData.fromSubInvCode)){
this.$message.error("往来单位不能不能为空！")
return;
}
if(this.curAction.corpType!=1 && this.$isBlank(this.formData.corpName)){
this.$message.error("往来单位不能不能为空！")
return;
}
if (this.$isBlank(this.formData.invWarehouseCode)) {
@ -1079,6 +1078,10 @@ export default {
});
},
setCorpName(code){
this.formData.corpId=code
this.formData.corpName= this.fromSubStorageOptions.find(item => item.code == code).name
},
copyDetail(row) {
this.$confirm("是否复制该记录?", "提示", {
confirmButtonText: "确定",
@ -1265,7 +1268,7 @@ export default {
findSubInvs() {
this.subInvList = [];
let query = {
pcode: this.formData.locStorageCode
filter:3
};
filterSubByInv(query)
.then((response) => {
@ -1318,7 +1321,6 @@ export default {
}
this.findMethod();
this.getBusType();
this.getStorage();
this.findSubInvByInv();
this.findSubStorageMethod();
this.codeArray = [];

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

@ -62,7 +62,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="corpName">
<el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
<el-input v-if="formData.fromSubInvName ==null" v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
<el-input v-if="formData.fromSubInvName !=null" v-model="formData.fromSubInvName"
auto-complete="off" :disabled="true"></el-input>
</el-form-item>
@ -546,7 +546,7 @@ export default {
}
if (this.$isBlank(event)) {
if (this.$isBlank(this.formData.corpName) || this.$isBlank(this.formData.billType)) {
if (this.$isBlank(this.formData.corpName) && this.$isBlank(this.formData.fromSubInvName ==null) || this.$isBlank(this.formData.billType)) {
this.$message.error("往来信息和单据类型不能为空！")
return;
}

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

@ -72,7 +72,7 @@
</el-col>
<el-col :span="7">
<el-form-item prop="billType">
<el-select v-model="formData.billType" placeholder="请选择业务类型" @change="getStorage"
<el-select v-model="formData.billType" placeholder="请选择业务类型"
:disabled="codeArray.length>0"
clearable>
<el-option
@ -905,15 +905,18 @@ export default {
},
getBusType() {
this.formData.billType=null;
if(this.$isBlank(this.query.orderIdFk)){
this.formData.billType=null;
}
let query = {
enabled: true,
invWarehouseCode: this.formData.invWarehouseCode
};
getLocalJoinByUser(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.getStorage(this.formData.billType);
})
.catch(() => {
});
@ -1002,6 +1005,7 @@ export default {
}
if(this.formData.invWarehouseCode!=null){
this.getBusType();
}

Write Preview
Loading…
Cancel
Save