1.修复部分已知bug

fengcang
x_z 3 years ago
parent 9e058ff489
commit a92f5e80fc

@ -24,7 +24,7 @@
type="primary" type="primary"
icon="search" icon="search"
width="1200px" width="1200px"
@click="getList" @click="search"
>查询 >查询
</el-button </el-button
> >
@ -413,13 +413,16 @@ export default {
}; };
this.getList(); this.getList();
}, },
search() {
this.query.page = 1;
this.getList();
},
getList() { getList() {
this.loading = true; this.loading = true;
this.erpIdColumn = false; this.erpIdColumn = false;
this.thirdIdColumn = false; this.thirdIdColumn = false;
getBasicUnitMaintains(this.query) getBasicUnitMaintains(this.query)
.then((response) => { .then((response) => {
console.log(response)
this.loading = false; this.loading = false;
this.erpIdColumn = response.data.BUMErpIdValue == "1" ? true : false; this.erpIdColumn = response.data.BUMErpIdValue == "1" ? true : false;
this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false; this.thirdIdColumn = response.data.BUMThirdIdValue == "1" ? true : false;
@ -504,7 +507,6 @@ export default {
this.editQuery.thirdName4 = null; this.editQuery.thirdName4 = null;
let data = Object.assign({}, this.editQuery); let data = Object.assign({}, this.editQuery);
console.log('------2------');
basicUnitMaintainSave(data, this.formName) basicUnitMaintainSave(data, this.formName)
.then(response => { .then(response => {
this.formLoading = false; this.formLoading = false;

@ -85,7 +85,7 @@
<el-form-item style="display: flex"> <el-form-item style="display: flex">
<el-button-group> <el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="getList"></el-button> <el-button type="primary" icon="search" @click="search"></el-button>
<el-button type="primary" size="mini" icon="search" @click="combine" <el-button type="primary" size="mini" icon="search" @click="combine"
>选入 >选入
</el-button> </el-button>
@ -187,12 +187,15 @@ export default {
checkSelectable(row) { checkSelectable(row) {
return !row.checked; return !row.checked;
}, },
search() {
this.unitQuery.page = 1;
this.getList();
},
getList() { getList() {
this.loading = true; this.loading = true;
this.unitQuery.thirdSys = this.thirdSysFk; this.unitQuery.thirdSys = this.thirdSysFk;
ucloudUnit(this.unitQuery) ucloudUnit(this.unitQuery)
.then((response) => { .then((response) => {
console.log(response);
this.loading = false; this.loading = false;
if (response.code == 20000) { if (response.code == 20000) {
@ -224,6 +227,7 @@ export default {
.then((response) => { .then((response) => {
this.thirdSys = response.data.list || []; this.thirdSys = response.data.list || [];
this.thirdSysFk = this.thirdSys[0].thirdId; this.thirdSysFk = this.thirdSys[0].thirdId;
this.getList();
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -242,7 +246,6 @@ export default {
} }
this.combineQuery.thirdSys = this.thirdSysFk; this.combineQuery.thirdSys = this.thirdSysFk;
this.combineQuery.custmandocResponses = ids; this.combineQuery.custmandocResponses = ids;
console.log(ids);
combine(this.combineQuery) combine(this.combineQuery)
.then((response) => { .then((response) => {
if (response.code == 20000) { if (response.code == 20000) {
@ -283,13 +286,11 @@ export default {
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
console.log(val);
this.currentRow = val; this.currentRow = val;
this.unitQuery.key = this.currentRow.name; this.unitQuery.key = this.currentRow.name;
}, },
handleSelectionUdiChange(val) { handleSelectionUdiChange(val) {
console.log("----" + val[0].id);
this.multipleUdiSelection = val; this.multipleUdiSelection = val;
}, },
}, },

@ -70,6 +70,7 @@
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="searchList" size="mini" <el-button type="primary" icon="search" @click="searchList" size="mini"
>查询 >查询
</el-button </el-button
@ -405,13 +406,23 @@ export default {
}; };
}, },
methods: { methods: {
onReset() {
this.unionQuery = {
page: 1,
limit: 10,
udiCode: null,
nameCode: "",
cpmctymc: "",
ylqxzcrbarmc: null,
ggxh: "",
zczbhhzbapzbh: "",
isCheck: 1
};
},
searchList() { searchList() {
this.unionQuery.page = 1; this.unionQuery.page = 1;
this.getList(); this.getList();
}, },
getList() { getList() {
if ( if (
this.unionQuery.udiCode == "" && this.unionQuery.udiCode == "" &&

@ -164,6 +164,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-dialog <el-dialog
title="接口参数设置" title="接口参数设置"
:close-on-click-modal="false" :close-on-click-modal="false"
@ -184,14 +185,15 @@
> >
</div> </div>
</el-dialog> </el-dialog>
<el-pagination <el-pagination
:page-size="moduleQuery.limit" :page-size="query.limit"
@current-change="handlePageChange" @current-change="moduleClick"
layout="prev, pager, next" layout="prev, pager, next"
:total="total" :total="total"
:current-page="query.page"
></el-pagination> ></el-pagination>
<div style="margin-top: 18px ; color: #F71616;"> <div style="margin-top: 18px ; color: #F71616;">
<span>重要提示本页功能仅供技术提供方修改&nbsp;</span> <span>重要提示本页功能仅供技术提供方修改&nbsp;</span>
</div> </div>
@ -356,7 +358,7 @@
<el-pagination <el-pagination
:page-size="selectTemplateQuery.limit" :page-size="selectTemplateQuery.limit"
@current-change="moduleHandleCurrentChange" @current-change="selectTemplateGetList"
layout="prev, pager, next" layout="prev, pager, next"
:total="selectTemplateTotal" :total="selectTemplateTotal"
:current-page="selectTemplateQuery.page" :current-page="selectTemplateQuery.page"
@ -517,7 +519,8 @@ export default {
moduleDetail(this.query) moduleDetail(this.query)
.then(response => { .then(response => {
this.loading = false; this.loading = false;
this.list = response.data || []; this.list = response.data.list || [];
this.total = response.data.total;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -630,9 +633,11 @@ export default {
}, },
selectTemplateGetList() { selectTemplateGetList(val) {
console.log(this.selectTemplateQuery)
this.selectTemplateLoading = true; this.selectTemplateLoading = true;
if (val != null) {
this.selectTemplateQuery.page = val;
}
systemPDFTemplateList(this.selectTemplateQuery) systemPDFTemplateList(this.selectTemplateQuery)
.then(response => { .then(response => {
this.selectTemplateLoading = false; this.selectTemplateLoading = false;

Loading…
Cancel
Save