1.修复bug

prod
x_z 2 years ago
parent 4b13477044
commit f5ee1c9753

@ -28,14 +28,17 @@
<el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">/</el-button>
<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="el-icon-search" @click="search"></el-button> <el-button type="primary" icon="el-icon-search" @click="search"></el-button>
<el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)" :disabled="!configParms.basicCorp">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click.native="handleForm(null, null)"
:disabled="!configParms.basicCorp">新增
</el-button>
<el-button type="primary" icon="el-icon-bottom-right" @click="intentDetail"></el-button> <el-button type="primary" icon="el-icon-bottom-right" @click="intentDetail"></el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index"></el-table-column> <el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip></el-table-column> <el-table-column label="往来单位编码" prop="erpId" show-overflow-tooltip></el-table-column>
@ -47,7 +50,9 @@
<el-table-column label="操作" width="120"> <el-table-column label="操作" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click.native="handleForm(scope.$index, scope.row)">编辑</el-button> <el-button type="text" @click.native="handleForm(scope.$index, scope.row)">编辑</el-button>
<el-button type="text" :disabled="!configParms.basicCorp" @click.native.stop="deleteDialog(scope.row)">删除</el-button> <el-button type="text" :disabled="!configParms.basicCorp" @click.native.stop="deleteDialog(scope.row)">
删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -62,7 +67,6 @@
></pagination> ></pagination>
<el-dialog <el-dialog
:title="combinTypeMap[combinType]" :title="combinTypeMap[combinType]"
:visible.sync="selectDrugDialogVisible" :visible.sync="selectDrugDialogVisible"
@ -104,8 +108,12 @@
<el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column> <el-table-column label="第三方往来单位名称" prop="thirdName" show-overflow-tooltip></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="intentSelect(scope.row)" :disabled="!configParms.basicCorp">关联</el-button> <el-button type="text" size="small" @click="intentSelect(scope.row)" :disabled="!configParms.basicCorp">
<el-button type="text" size="small" @click.native.stop="removeErp(scope.row)" :disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp">解绑</el-button> 关联
</el-button>
<el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"
:disabled="scope.row.thirdId=='' ||scope.row.thirdId==null || !configParms.basicCorp">解绑
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -113,35 +121,42 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="12" type="flex"> <el-col :span="12" type="flex">
<el-form-item label="往来单位名称" prop="name"> <el-form-item label="往来单位名称" prop="name">
<el-input v-model="editQuery.name" size="small" style="width: 90%" auto-complete="off" @input="change()" splaceholder="请输入往来单位名称"></el-input> <el-input v-model="editQuery.name" size="small" style="width: 90%" auto-complete="off" @input="change()"
splaceholder="请输入往来单位名称"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" type="flex"> <el-col :span="12" type="flex">
<el-form-item label="往来单位编码" prop="erpId"> <el-form-item label="往来单位编码" prop="erpId">
<el-input v-model="editQuery.erpId" style="width: 90%" auto-complete="off" disabled="true" splaceholder="请输入往来单位编码"></el-input> <el-input v-model="editQuery.erpId" style="width: 90%" auto-complete="off" disabled="true"
splaceholder="请输入往来单位编码"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="12" type="flex"> <el-col :span="12" type="flex">
<el-form-item label="社会信用号" prop="creditNo"> <el-form-item label="社会信用号" prop="creditNo">
<el-input v-model="editQuery.creditNo" style="width: 90%" splaceholder="请输入社会信用号" auto-complete="off"></el-input> <el-input v-model="editQuery.creditNo" style="width: 90%" splaceholder="请输入社会信用号"
auto-complete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" type="flex"> <el-col :span="12" type="flex">
<el-form-item label="联系人" prop="contact"> <el-form-item label="联系人" prop="contact">
<el-input v-model="editQuery.contact" splaceholder="请输入联系人" style="width: 90%" auto-complete="off"></el-input> <el-input v-model="editQuery.contact" splaceholder="请输入联系人" style="width: 90%"
auto-complete="off"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :type="flex"> <el-row :type="flex">
<el-col :span="12" type="flex"> <el-col :span="12" type="flex">
<el-form-item label="地址" prop="addr"> <el-form-item label="地址" prop="addr">
<el-input type="" v-model="editQuery.addr" splaceholder="请输入地址" style="width: 90%" auto-complete="off"></el-input></el-form-item> <el-input type="" v-model="editQuery.addr" splaceholder="请输入地址" style="width: 90%"
auto-complete="off"></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="12" type="flex"> <el-col :span="12" type="flex">
<el-form-item label="联系电话" prop="mobile"> <el-form-item label="联系电话" prop="mobile">
<el-input v-model="editQuery.mobile" splaceholder="请输入联系电话" auto-complete="off" style="width: 90%"></el-input> <el-input v-model="editQuery.mobile" splaceholder="请输入联系电话" auto-complete="off"
style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -160,14 +175,17 @@
</el-col> </el-col>
<el-col :span="12" type="flex"> <el-col :span="12" type="flex">
<el-form-item label="拼音码" prop="spell"> <el-form-item label="拼音码" prop="spell">
<el-input v-model="editQuery.spell" placeholder="请输入拼音码" auto-complete="off" style="width: 90%"></el-input> <el-input v-model="editQuery.spell" placeholder="请输入拼音码" auto-complete="off"
style="width: 90%"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div style='text-align: center; margin-bottom: 10px;'> <div style='text-align: center; margin-bottom: 10px;'>
<el-button @click.native="hideForm">取消</el-button> <el-button @click.native="hideForm">取消</el-button>
<el-button type="primary" @click.native="formSubmit()" :loading="formLoading" :disabled="!configParms.basicCorp">提交</el-button> <el-button type="primary" @click.native="formSubmit()" :loading="formLoading"
:disabled="!configParms.basicCorp">提交
</el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-card> </el-card>
@ -175,7 +193,14 @@
</template> </template>
<script> <script>
import {getBasicUnitMaintains, basicUnitMaintainSave, deleteBasicUnitMaintain, getThrsysUnit, removeRl,getSystemParamConfig} from "@/api/basic/basicUnitMaintain"; import {
getBasicUnitMaintains,
basicUnitMaintainSave,
deleteBasicUnitMaintain,
getThrsysUnit,
removeRl,
getSystemParamConfig
} from "@/api/basic/basicUnitMaintain";
import selectUnit from "./corpRelevance"; import selectUnit from "./corpRelevance";
import selectSingleUnit from "./corpSingleRelevance"; import selectSingleUnit from "./corpSingleRelevance";
import {getBasicThirdSys} from "@/api/basic/basicThirdSys"; import {getBasicThirdSys} from "@/api/basic/basicThirdSys";
@ -191,7 +216,7 @@ export default {
page: 1, page: 1,
limit: 20, limit: 20,
}, },
showSearch:true, showSearch: true,
erpIdColumn: false, erpIdColumn: false,
thirdIdColumn: false, thirdIdColumn: false,
editQuery: { editQuery: {
@ -258,7 +283,7 @@ export default {
selectSingleUnitVisible: false, selectSingleUnitVisible: false,
list: [], list: [],
sysList: [], sysList: [],
loading:false, loading: false,
total: 0, total: 0,
multipleSelection: [], multipleSelection: [],
thirdSys: [], thirdSys: [],
@ -301,7 +326,7 @@ export default {
this.total = 0; this.total = 0;
}); });
}, },
getSystemParamConfig(){ getSystemParamConfig() {
getSystemParamConfig().then((req) => { getSystemParamConfig().then((req) => {
this.erpIdColumn = req.data.BUMErpIdValue == "1" ? true : false; this.erpIdColumn = req.data.BUMErpIdValue == "1" ? true : false;
this.thirdIdColumn = req.data.BUMThirdIdValue == "1" ? true : false; this.thirdIdColumn = req.data.BUMThirdIdValue == "1" ? true : false;
@ -322,7 +347,6 @@ export default {
}, },
// //
hideForm() { hideForm() {
debugger
// //
this.formVisible = !this.formVisible; this.formVisible = !this.formVisible;
// this.getList(); // this.getList();
@ -398,7 +422,6 @@ export default {
} }
// //
this.resetForm(); this.resetForm();
this.getList();
}) })
.catch(() => { .catch(() => {
this.formLoading = false; this.formLoading = false;

@ -94,7 +94,12 @@
<script> <script>
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import modifyDialog from "@/views/system/param/busTypeChangeModify.vue"; import modifyDialog from "@/views/system/param/busTypeChangeModify.vue";
import {getBusTypeChangeList, updateBusTypeChange, addBusTypeChange, deleteBusTypeChange} from "@/api/basic/busTypeChange"; import {
getBusTypeChangeList,
updateBusTypeChange,
addBusTypeChange,
deleteBusTypeChange
} from "@/api/basic/busTypeChange";
export default { export default {
data() { data() {
@ -209,15 +214,10 @@ export default {
addBusTypeChange(this.inputQuery).then((res) => { addBusTypeChange(this.inputQuery).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.loading = false; this.loading = false;
this.cancelDialog();
this.getList(); this.getList();
} else {
this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.loading = false; this.loading = false;
this.$message.error(error.message);
this.cancelDialog();
}); });
} else { } else {
updateBusTypeChange(this.inputQuery).then((res) => { updateBusTypeChange(this.inputQuery).then((res) => {
@ -238,6 +238,15 @@ export default {
handleAddClick() { handleAddClick() {
this.formName = 'add'; this.formName = 'add';
this.inputQuery = {
id: null,
originName: null,
originAction: null,
targetAction: null,
name: null,
enable: null,
remark: null
};
this.modifyDialogVisible = true; this.modifyDialogVisible = true;
}, },

Loading…
Cancel
Save