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

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

Browse Source
zhairh
x_z 3 years ago
parent 211ed2f712 23af0b9963
commit 1a71ff0925
9 changed files with 73 additions and 87 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:9906", "BASE_URL": "http://192.168.1.20:9906",
"SERVER_IP": "http://192.168.0.166:9906", "SERVER_IP": "http://192.168.1.20:9906",
"hosp_name": "福建省XX市医院" "hosp_name": "福建省XX市医院"
} }

9
src/views/basic/UdiInfoManage.vue
Unescape Escape View File

@ -212,6 +212,7 @@
border border
key="3" key="3"
@current-change="handleDetail" @current-change="handleDetail"
highlight-current-row
> >
<el-table-column <el-table-column
label="产品标识" label="产品标识"
@ -1064,6 +1065,7 @@ export default {
}, },
productType: null, productType: null,
editQuery: null, editQuery: null,
pId:0,
productRemarkSet: {}, productRemarkSet: {},
relevanceEdit: { relevanceEdit: {
id: null, id: null,
@ -1075,7 +1077,8 @@ export default {
allowNoBatch: null, allowNoBatch: null,
allowNoExpire: null, allowNoExpire: null,
allowNoProduct: null, allowNoProduct: null,
cpdls: null cpdls: null,
pId:null,
}, },
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,
@ -1451,6 +1454,7 @@ export default {
this.thisData = row; this.thisData = row;
this.editDialogVisible = true; this.editDialogVisible = true;
this.editQuery = row; this.editQuery = row;
this.pId=row.id;
this.relevanceEdit = { this.relevanceEdit = {
id: row.id, id: row.id,
isUseDy: row.isUseDy, isUseDy: row.isUseDy,
@ -1561,13 +1565,12 @@ export default {
this.relevanceEdit.isLock = this.editQuery.isLock; this.relevanceEdit.isLock = this.editQuery.isLock;
this.relevanceEdit.isAdavence = this.editQuery.isAdavence; this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
this.relevanceEdit = this.editQuery; this.relevanceEdit = this.editQuery;
this.relevanceEdit.pid = this.pId;
if (this.checked == true) { if (this.checked == true) {
this.relevanceEdit.isUseDy = 1; this.relevanceEdit.isUseDy = 1;
} else { } else {
this.relevanceEdit.isUseDy = 0; this.relevanceEdit.isUseDy = 0;
} }
updatetUdiInfos(this.relevanceEdit) updatetUdiInfos(this.relevanceEdit)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

6
src/views/basic/UdiInfoManageSp.vue
Unescape Escape View File

@ -192,7 +192,7 @@
v-if="editDialogVisible" v-if="editDialogVisible"
> >
<el-table :data="sysList" style="width: 100%" key="2" border> <el-table :data="sysList" style="width: 100%" key="2" border highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column <el-table-column
label="系统名称" label="系统名称"
@ -843,7 +843,9 @@ export default {
isUseDy: false, isUseDy: false,
isLock: null, isLock: null,
isAdavence: null, isAdavence: null,
pId: null,
}, },
pId: 0,
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,
isImportUdi: false, isImportUdi: false,
@ -1097,6 +1099,7 @@ export default {
this.thisData = row; this.thisData = row;
this.editDialogVisible = true; this.editDialogVisible = true;
this.editQuery = row; this.editQuery = row;
this.pId = row.id;
this.relevanceEdit = { this.relevanceEdit = {
id: row.rlId, id: row.rlId,
// thirdId: row.thirdId, // thirdId: row.thirdId,
@ -1218,6 +1221,7 @@ export default {
this.relevanceEdit.isDisable = this.editQuery.isDisable; this.relevanceEdit.isDisable = this.editQuery.isDisable;
this.relevanceEdit.isLock = this.editQuery.isLock; this.relevanceEdit.isLock = this.editQuery.isLock;
this.relevanceEdit.isAdavence = this.editQuery.isAdavence; this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
this.relevanceEdit.pid = this.pId;
updatetUdiInfos(this.relevanceEdit) updatetUdiInfos(this.relevanceEdit)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

6
src/views/basic/basicCompanyProducts.vue
Unescape Escape View File

@ -353,7 +353,9 @@ export default {
isDisable: null, isDisable: null,
isUseDy: false, isUseDy: false,
isAdavence: null, isAdavence: null,
pId: null,
}, },
pId: 0,
productType: null, productType: null,
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,
@ -735,6 +737,7 @@ export default {
this.thisData = row; this.thisData = row;
this.editDialogVisible = true; this.editDialogVisible = true;
this.editQuery = row; this.editQuery = row;
this.pId = row.id;
this.relevanceEdit = { this.relevanceEdit = {
id: row.rlId, id: row.rlId,
isUseDy: row.isUseDy, isUseDy: row.isUseDy,
@ -826,7 +829,8 @@ export default {
this.relevanceEdit.isDisable = this.editQuery.isDisable; this.relevanceEdit.isDisable = this.editQuery.isDisable;
this.relevanceEdit.isLock = this.editQuery.isLock; this.relevanceEdit.isLock = this.editQuery.isLock;
this.relevanceEdit.isAdavence = this.editQuery.isAdavence; this.relevanceEdit.isAdavence = this.editQuery.isAdavence;
this.relevanceEdit = this.editQuery; this.relevanceEdit = this.editQuery
this.relevanceEdit.pid = this.pId;
if (this.checked == true) { if (this.checked == true) {
this.relevanceEdit.isUseDy = 1; this.relevanceEdit.isUseDy = 1;
} else { } else {

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

@ -58,6 +58,7 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="detailList" :data="detailList"
highlight-current-row
style="width: 100%; margin-top: 20px" style="width: 100%; margin-top: 20px"
border border
@current-change="handleDetail" @current-change="handleDetail"
@ -94,7 +95,6 @@
style="margin-top: 20px" style="margin-top: 20px"
> >
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">

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

@ -49,21 +49,21 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input> <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invStorageCode" 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.invStorageCode" 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"
:disabled="invWarehouseDisabled" :disabled="invWarehouseDisabled"
size="mini"> size="mini">
<el-option <el-option
@ -367,7 +367,7 @@ export default {
if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") { if (this.filterQuery.invStorageCode != null && this.filterQuery.invStorageCode != "") {
this.invWarehouseDisabled = false; this.invWarehouseDisabled = false;
let query = { let query = {
pcode: this.filterQuery.invStorageCode filter: 3,
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -407,7 +407,6 @@ export default {
}; };
}, },
created() { created() {
this.getStorage();
this.findMethod(); this.findMethod();
let query = this.$route.query; let query = this.$route.query;
this.filterQuery = Object.assign(this.filterQuery, query); this.filterQuery = Object.assign(this.filterQuery, query);

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

@ -49,20 +49,20 @@
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input> <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item class="query-form-item">-->
<!-- <el-select v-model="filterQuery.invStorageCode" 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.invStorageCode" 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">
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"
@ -320,21 +320,10 @@ export default {
} }
} }
}, },
getStorage() { getSubInvList() {
this.storageList = [];
filterUplLocInv()
.then((response) => {
this.storageList = response.data || [];
})
.catch(() => {
});
},
invChange() {
// this.$set(this.filterQuery, "entrustUser", "");
this.filterQuery.invWarehouseCode = "";
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.filterQuery.invStorageCode filter: 3,
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -367,7 +356,7 @@ export default {
this.loading = true; this.loading = true;
this.getList(); this.getList();
this.findStorageCode(); this.findStorageCode();
this.getStorage(); this.getSubInvList();
}, },
}; };
</script> </script>

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

@ -63,7 +63,7 @@
<el-col :span="7"> <el-col :span="7">
<el-form-item prop="locStorageCode"> <el-form-item prop="locStorageCode">
<el-select v-model="formData.invWarehouseCode" placeholder="采购分库信息" style="width: 100%" <el-select v-model="formData.invWarehouseCode" placeholder="采购仓库信息" style="width: 100%"
:disabled="true" clearable> :disabled="true" clearable>
<el-option <el-option
v-for="item in subInvList" v-for="item in subInvList"

51
src/views/warehouse/stockOrderInvSearch.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"
> >
@ -825,25 +825,10 @@ export default {
} }
} }
}, },
getStorage() {
this.storageList = [];
filterAllByUser()
.then((response) => {
this.storageList = response.data || [];
if (this.storageList.length > 0) {
this.getSubInvList();
this.getList();
}
})
.catch(() => {
});
},
invChange() { invChange() {
this.query.invWarehouseCode = "";
this.subInvList = []; this.subInvList = [];
let query = { let query = {
pcode: this.query.locStorageCode filter: 3,
}; };
filterSubByInv(query) filterSubByInv(query)
.then((response) => { .then((response) => {
@ -855,11 +840,13 @@ export default {
getSubInvList() { getSubInvList() {
let query = { let query = {
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(() => {
}); });
@ -936,7 +923,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