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

bug修改

Browse Source
fencang
anthonywj 3 years ago
parent e991f114d1
commit 168c7c8fc4
10 changed files with 396 additions and 410 deletions
Show Stats Download Patch File Download Diff File

9
src/router/index.js
Unescape Escape View File

@ -443,15 +443,6 @@ export const asyncRouterMap = [
// {
// path: "systemPDFTemplate",
// component: systemPDFTemplate,
// name: "打印模板管理",
// icon: "",
// meta: {
// authRule: ["param/system_pdf_template"]
// }
// },
] ]
}, },

1
src/views/basic/BasicEntrutsRece.vue
Unescape Escape View File

@ -326,6 +326,7 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
this.getSyncConfig();
this.getList(); this.getList();
}, },
}; };

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

@ -24,7 +24,7 @@
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" width="120" fixed></el-table-column> <el-table-column label="序号" type="index" width="60" fixed></el-table-column>
<el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column> <el-table-column label="业务单据类型名称" prop="name" fixed></el-table-column>
<el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column> <el-table-column label="业务单据类型代码" prop="action" fixed></el-table-column>
<el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column> <el-table-column label="第三方单据类型" prop="originAction" fixed></el-table-column>

13
src/views/basic/BussinessTypeLoclModify.vue
Unescape Escape View File

@ -240,6 +240,19 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="10" class="el-col">
<div class="text item">
<div class="itemTag">
<span>备注:&nbsp;</span>
</div>
<el-input
style="width: 200px"
size="small"
splaceholder="请输入内容"
v-model="editQuery.remark"
></el-input>
</div>
</el-col>
</el-row> </el-row>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="hideForm" size="small">取消</el-button> <el-button @click.native="hideForm" size="small">取消</el-button>

23
src/views/basic/BussinessTypeThird.vue
Unescape Escape View File

@ -237,10 +237,25 @@ export default {
onAddSubmit() { onAddSubmit() {
if (this.$isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！");
return;
}
if (this.$isBlank(this.inputQuery.action)) { if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型代码不能为空！"); this.$message.error("单据类型代码不能为空！");
return; return;
} }
if (this.$isBlank(this.inputQuery.thirdSys)) {
this.$message.error("所属系统不不能为空！");
return;
}
let numRegExp = '^[0-9]*$';
let numReg = new RegExp(numRegExp);
if (numReg.test(this.inputQuery.name)) {
this.$message.error("单据类型名称不得为纯数字类型！");
return;
}
insertBussinessType(this.inputQuery) insertBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
@ -254,10 +269,18 @@ export default {
}, },
onModifySubmit() { onModifySubmit() {
if (this.$isBlank(this.inputQuery.name)) {
this.$message.error("单据类型名称不能为空！");
return;
}
if (this.$isBlank(this.inputQuery.action)) { if (this.$isBlank(this.inputQuery.action)) {
this.$message.error("单据类型代码不能为空！"); this.$message.error("单据类型代码不能为空！");
return; return;
} }
if (this.$isBlank(this.inputQuery.thirdSys)) {
this.$message.error("所属系统不不能为空！");
return;
}
updateBussinessType(this.inputQuery) updateBussinessType(this.inputQuery)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

37
src/views/userManage/admin/authAdmin.vue
Unescape Escape View File

@ -13,14 +13,6 @@
<el-option label="未验证" value="2"></el-option> <el-option label="未验证" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!--
<el-form-item class="query-form-item">
<el-select v-model="query.roleId" placeholder="角色">
<el-option label="全部角色" value=""></el-option>
<el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
-->
<el-form-item> <el-form-item>
<el-button-group> <el-button-group>
<el-button <el-button
@ -41,6 +33,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="list" style="width: 100%"> <el-table v-loading="loading" :data="list" style="width: 100%">
<el-table-column label="序号" type="index" fixed></el-table-column>
<el-table-column label="用户账号" prop="userName" fixed></el-table-column> <el-table-column label="用户账号" prop="userName" fixed></el-table-column>
<el-table-column label="用户名称" prop="employeeName" fixed> <el-table-column label="用户名称" prop="employeeName" fixed>
</el-table-column> </el-table-column>
@ -71,6 +64,7 @@
type="text" type="text"
size="small" size="small"
@click.native="handleForm(scope.$index, scope.row)" @click.native="handleForm(scope.$index, scope.row)"
:disabled="!configParms.sysUser"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
@ -149,6 +143,17 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col" type="flex">
<div class="text item">
<el-form-item label="备注" prop="comments">
<el-input v-model="formData.comments" size="small"></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
<el-form-item label="状态" prop="userFlag"> <el-form-item label="状态" prop="userFlag">
<el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1"> <el-radio-group v-model="formData.userFlag" :disabled="formData.id === 1">
@ -205,6 +210,7 @@ const formJson = {
checkPassword: "", checkPassword: "",
employeeName: "", employeeName: "",
userFlag: 1, userFlag: 1,
comments: '',
roles: [] roles: []
}; };
export default { export default {
@ -231,7 +237,7 @@ export default {
userName: "", userName: "",
userFlag: "", userFlag: "",
page: 1, page: 1,
limit: 20, limit: 10,
roleId: "", roleId: "",
customerId: store.getters.customerId, customerId: store.getters.customerId,
}, },
@ -292,7 +298,7 @@ export default {
userName: "", userName: "",
userFlag: "", userFlag: "",
page: 1, page: 1,
limit: 20, limit: 10,
roleId: "", roleId: "",
customerId: store.getters.customerId, customerId: store.getters.customerId,
}; };
@ -354,7 +360,16 @@ export default {
this.resetForm(); this.resetForm();
this.formData = JSON.parse(JSON.stringify(formJson)); this.formData = JSON.parse(JSON.stringify(formJson));
if (row !== null) { if (row !== null) {
this.formData = Object.assign({}, row); this.formData = {
id: row.id,
passWord: row.passWord,
userName: row.userName,
checkPassword: "",
employeeName: row.employeeName,
userFlag: 1,
comments: row.comments,
roles: row.roles
};
} }
this.formName = "add"; this.formName = "add";
this.formRules = this.addRules; this.formRules = this.addRules;

2
src/views/userManage/param/systemPDFModule.vue
Unescape Escape View File

@ -432,7 +432,7 @@ export default {
this.$router.push({ this.$router.push({
path: "" path: ""
}); });
this.query = { this.moduleQuery = {
templateType: null, templateType: null,
moduleId: null, moduleId: null,
name: "", name: "",

62
src/views/userManage/param/systemPDFTemplate.vue
Unescape Escape View File

@ -99,37 +99,6 @@
> >
<el-form :model="formData" :rules="formRules" ref="dataForm"> <el-form :model="formData" :rules="formRules" ref="dataForm">
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="2">-->
<!-- <div class="ao-text">-->
<!-- <span>模板名称：</span>-->
<!-- </div>-->
<!-- <div class="ao-text">-->
<!-- <span>模板名称：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item prop="name">-->
<!-- <el-input v-model="formData.name" auto-complete="off" :disabled="false"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所属模块" prop="type">-->
<!-- <el-select v-model="formData.type" placeholder="所属模块">-->
<!-- <el-option label="订单详情" value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="2">-->
<!-- <div class="ao-text">-->
<!-- <span>备注：</span>-->
<!-- </div>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item prop="type">-->
<!-- <el-input type="textarea" v-model="formData.remark" rows=6></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="2"> <el-col :span="2">
@ -149,14 +118,6 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="module"> <el-form-item prop="module">
<!-- <el-select v-model="formData.module" placeholder="所属模块">-->
<!-- <el-option-->
<!-- v-for="item in moduleNameList"-->
<!-- :key="item.idStr"-->
<!-- :label="item.name"-->
<!-- :value="item.idStr"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<el-select v-model="formData.module" placeholder="模板类型"> <el-select v-model="formData.module" placeholder="模板类型">
<el-option label="标签" value="0"></el-option> <el-option label="标签" value="0"></el-option>
<el-option label="报表" value="1"></el-option> <el-option label="报表" value="1"></el-option>
@ -421,6 +382,7 @@ export default {
}); });
this.query = { this.query = {
name: "", name: "",
module: null,
page: 1, page: 1,
limit: 20 limit: 20
}; };
@ -635,12 +597,6 @@ export default {
this.submitTemplate(); this.submitTemplate();
// if (!this.uploadDisabled) {
// this.$refs.uploadJasper.submit();
// this.$refs.uploadJrxml.submit();
// } else {
// this.submitTemplate();
// }
} }
}); });
}, },
@ -739,19 +695,7 @@ export default {
} }
this.$message.success("操作成功"); this.$message.success("操作成功");
this.formVisible = false; this.formVisible = false;
// if (this.formName === "add") { this.getList();
// // 向头部添加数据
// if (response.data && response.data.id) {
// data.id = response.data.id;
// this.list.unshift(data);
// }
// } else {
// this.list.splice(this.index, 1, data);
// }
// // 刷新表单
// this.resetForm();
// this.getList();
// this.getModuleList();
}) })
.catch(() => { .catch(() => {
this.formLoading = false; this.formLoading = false;
@ -770,8 +714,6 @@ export default {
console.log(response) console.log(response)
if (response.code === 20000) { if (response.code === 20000) {
this.$message.success(response.data); this.$message.success(response.data);
// 刷新表单
// this.resetForm();
this.getList(); this.getList();
} else { } else {
this.$message.error(response.message); this.$message.error(response.message);

1
src/views/userManage/phoneRegisterManage.vue
Unescape Escape View File

@ -298,6 +298,7 @@ export default {
check(this.checkQuery) check(this.checkQuery)
.then((response) => { .then((response) => {
if (response.code === 20000) { if (response.code === 20000) {
this.editDialogVisible = false;
this.getList(); this.getList();
this.$message({ this.$message({
type: "success", type: "success",

2
src/views/userManage/registerManage.vue
Unescape Escape View File

@ -471,6 +471,7 @@
this.loading = true; this.loading = true;
checkPass(this.checkQuery) checkPass(this.checkQuery)
.then((response) => { .then((response) => {
this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.getList(); this.getList();
this.$message({ this.$message({
@ -479,7 +480,6 @@
}); });
} else { } else {
this.$message.warning("更新失败"); this.$message.warning("更新失败");
this.loading = false;
} }
}) })
.catch(() => { .catch(() => {

Write Preview
Loading…
Cancel
Save