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

Merge remote-tracking branch 'origin/master'

Browse Source
prod
郑明梁 2 years ago
parent 9dc05b3112 07017c3802
commit 5f31d9f3a7
5 changed files with 92 additions and 35 deletions
Show Stats Download Patch File Download Diff File

15
src/views/biz/orderUploadLog/index.vue
Unescape Escape View File

@ -434,13 +434,18 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除biz编号为"' + ids + '"的数据项？').then(() => { this.$modal.confirm('是否确认删除？').then(() => {
this.loading = true; this.loading = true;
return delOrderUploadLog(ids); return delOrderUploadLog(ids);
}).then(() => { }).then((res) => {
this.loading = false; if (res.code == 20000) {
this.getList(); this.loading = false;
this.$modal.msgSuccess("删除成功"); this.getList();
this.$modal.msgSuccess("删除成功");
} else {
this.$modal.msgError(res.message);
}
}).catch(() => { }).catch(() => {
}).finally(() => { }).finally(() => {
this.loading = false; this.loading = false;

45
src/views/inout/IoAuditedOrder.vue
Unescape Escape View File

@ -164,6 +164,15 @@
>撤回 >撤回
</el-button </el-button
> >
<el-button
type="text"
size="small"
@click.native="generOrder(scope.row)"
>复制
</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small"--> <!-- size="small"-->
@ -355,6 +364,22 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<el-dialog
title="根据当前单据生成新单据"
:visible.sync="stockChangeVisible"
width="85%"
v-if="stockChangeVisible"
@close='closeDialog'
:close-on-click-modal="false"
:close-on-press-escape="false"
>
<DialogcChangeNewOrder
:closeDialog="closeDialog"
:curRow="curRow"
></DialogcChangeNewOrder>
</el-dialog>
</div> </div>
</template> </template>
@ -371,6 +396,7 @@ import {getResultDetailList} from "@/api/inout/orderDetailResult";
import {getCodeDetailList} from "@/api/inout/orderDetailCode"; import {getCodeDetailList} from "@/api/inout/orderDetailCode";
import {getCodeList} from "@/api/inout/code"; import {getCodeList} from "@/api/inout/code";
import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint" import {inspectionOrderPDFFromTemplateFile, orderPDFFromTemplateFile} from "@/api/itextpdf/orderPrint"
import DialogcChangeNewOrder from "@/views/inout/DialogcChangeNewOrder";
const formJson = { const formJson = {
@ -499,9 +525,11 @@ export default {
resultTotal: 0, resultTotal: 0,
resultDetailLoading: false, resultDetailLoading: false,
resultDetailList: [], resultDetailList: [],
stockChangeVisible: false,
curRow: null,
}; };
}, },
components: {}, components: {DialogcChangeNewOrder},
methods: { methods: {
onReset() { onReset() {
this.$router.push({ this.$router.push({
@ -833,6 +861,21 @@ export default {
// this.$message.info('回退失败'); // this.$message.info('回退失败');
}); });
}, },
generOrder(row) {
this.stockChangeVisible = true;
this.curRow = row;
},
closeDialog(type) {
this.stockChangeVisible = false;
this.getList();
if (this.$isNotBlank(type)) {
this.detailList = [];
}
},
statusFilterType(status) { statusFilterType(status) {
const statusMap = { const statusMap = {
5: "warning", 5: "warning",

9
src/views/inout/IoEditOrder.vue
Unescape Escape View File

@ -694,7 +694,7 @@ export default {
page: 1, page: 1,
limit: 10 limit: 10
}; };
if(!isBlank(this.currentRow.billNo)) { if (!isBlank(this.currentRow.billNo)) {
this.getBizDetailList(); this.getBizDetailList();
} }
}, },
@ -733,7 +733,7 @@ export default {
limit: 10 limit: 10
}; };
if(!isBlank(this.currentRow.billNo)) { if (!isBlank(this.currentRow.billNo)) {
this.getCodeDetailList(); this.getCodeDetailList();
} }
}, },
@ -774,7 +774,7 @@ export default {
limit: 10 limit: 10
}; };
if(!isBlank(this.currentRow.billNo)) { if (!isBlank(this.currentRow.billNo)) {
this.getResultDetailList(); this.getResultDetailList();
} }
}, },
@ -838,8 +838,7 @@ export default {
}, },
}, },
filters: { filters: {},
},
mounted() { mounted() {
document.body.ondrop = function (event) { document.body.ondrop = function (event) {
event.preventDefault(); event.preventDefault();

44
src/views/system/role/index.vue
Unescape Escape View File

@ -16,6 +16,7 @@
placeholder="请选择角色状态" placeholder="请选择角色状态"
clearable clearable
> >
<el-option label="全部" value=""></el-option>
<el-option label="正常" :value="0"/> <el-option label="正常" :value="0"/>
<el-option label="禁用" :value="1"/> <el-option label="禁用" :value="1"/>
</el-select> </el-select>
@ -58,6 +59,7 @@
<!-- ></el-switch>--> <!-- ></el-switch>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- :disabled="scope.row.roleId == 1"-->
<el-table-column label="创建时间" align="center" prop="createTime"> <el-table-column label="创建时间" align="center" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.createTime) }}</span>
@ -66,14 +68,12 @@
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:disabled="scope.row.roleId == 1"
type="text" type="text"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
:disabled="scope.row.roleId == 1"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除 >删除
</el-button> </el-button>
@ -121,7 +121,7 @@
<el-form-item label="角色顺序" prop="roleSort"> <el-form-item label="角色顺序" prop="roleSort">
<el-input-number v-model="form.roleSort" controls-position="right" :min="0"/> <el-input-number v-model="form.roleSort" controls-position="right" :min="0"/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio label="0">正常</el-radio> <el-radio label="0">正常</el-radio>
<el-radio label="1">禁用</el-radio> <el-radio label="1">禁用</el-radio>
@ -277,7 +277,7 @@ export default {
limit: 10, limit: 10,
roleName: undefined, roleName: undefined,
roleKey: undefined, roleKey: undefined,
status: undefined status: 0
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -293,7 +293,7 @@ export default {
// roleKey: [ // roleKey: [
// {required: true, message: "权限字符不能为空", trigger: "blur"} // {required: true, message: "权限字符不能为空", trigger: "blur"}
// ], // ],
menuOptions:[ menuOptions: [
{required: true, message: "角色列表不能为空", trigger: "blur"} {required: true, message: "角色列表不能为空", trigger: "blur"}
], ],
roleSort: [ roleSort: [
@ -378,8 +378,13 @@ export default {
let text = row.status === "0" ? "启用" : "禁用"; let text = row.status === "0" ? "启用" : "禁用";
this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function () { this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function () {
return changeRoleStatus(row.roleId, row.status); return changeRoleStatus(row.roleId, row.status);
}).then(() => { }).then((res) => {
this.$modal.msgSuccess(text + "成功"); if (res.code == 20000) {
this.$modal.msgSuccess(text + "成功");
} else {
this.$modal.msgError(res.message);
}
}).catch(function () { }).catch(function () {
row.status = row.status === "0" ? "1" : "0"; row.status = row.status === "0" ? "1" : "0";
}); });
@ -538,22 +543,22 @@ export default {
if (valid) { if (valid) {
if (this.form.roleId != undefined) { if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys();
if( this.form.menuIds.length==0){ if (this.form.menuIds.length == 0) {
this.$message.error("菜单权限不能为空"); this.$message.error("菜单权限不能为空");
return return
} }
updateRole(this.form).then(response => { updateRole(this.form).then(response => {
if(response.code === 20000){ if (response.code === 20000) {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}else{ } else {
this.$message.error(response.message); this.$message.error(response.message);
} }
}); });
} else { } else {
this.form.menuIds = this.getMenuAllCheckedKeys(); this.form.menuIds = this.getMenuAllCheckedKeys();
if(this.form.menuIds.length==0){ if (this.form.menuIds.length == 0) {
this.$message.error("菜单权限不能为空"); this.$message.error("菜单权限不能为空");
return return
} }
@ -582,9 +587,14 @@ export default {
const roleIds = row.roleId || this.ids; const roleIds = row.roleId || this.ids;
this.$modal.confirm('是否确认删除该角色？').then(function () { this.$modal.confirm('是否确认删除该角色？').then(function () {
return delRole(roleIds); return delRole(roleIds);
}).then(() => { }).then((res) => {
this.getList(); if (res.code == 20000) {
this.$modal.msgSuccess("删除成功"); this.getList();
this.$modal.msgSuccess("删除成功");
} else {
this.$modal.msgError(res.message);
}
}).catch(() => { }).catch(() => {
}); });
}, },

14
src/views/system/user/authUser.vue
Unescape Escape View File

@ -71,7 +71,7 @@
</el-button> </el-button>
<el-button <el-button
type="text" type="text"
:disabled="scope.row.id === 1 || !configParms.sysUser" :disabled="scope.row.id === '1' || !configParms.sysUser"
@click.native="handleDel(scope.$index, scope.row)" @click.native="handleDel(scope.$index, scope.row)"
v-hasPermi="['system:user:remove']" v-hasPermi="['system:user:remove']"
>删除 >删除
@ -102,13 +102,13 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="用户账号" prop="userName"> <el-form-item label="用户账号" prop="userName">
<el-input v-model="formData.userName" size="small" style="width: 90%"></el-input> <el-input v-model="formData.userName" size="small" style="width: 90%" :disabled="formData.id == 1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="11" class="el-col"> <el-col :span="11" class="el-col">
<el-form-item label="用户名称" prop="employeeName"> <el-form-item label="用户名称" prop="employeeName">
<el-input v-model="formData.employeeName" size="small" <el-input v-model="formData.employeeName" size="small"
style="width: 90%"></el-input> style="width: 90%" :disabled="formData.id == 1"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -167,7 +167,7 @@
</el-col> </el-col>
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<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">
<el-radio :label="1">正常</el-radio> <el-radio :label="1">正常</el-radio>
<el-radio :label="0">禁用</el-radio> <el-radio :label="0">禁用</el-radio>
@ -206,7 +206,7 @@
<el-row :gutter="20" type="flex"> <el-row :gutter="20" type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="角色"> <el-form-item label="角色">
<el-checkbox-group v-model="formData.roles" :disabled="formData.id === 1" > <el-checkbox-group v-model="formData.roles" :disabled="formData.id == 1" >
<el-checkbox <el-checkbox
v-for="item in roles" v-for="item in roles"
:key="item.roleId" :key="item.roleId"
@ -294,7 +294,7 @@ export default {
roles: [], roles: [],
query: { query: {
userName: "", userName: "",
userFlag: "", userFlag: "1",
page: 1, page: 1,
limit: 10, limit: 10,
roleId: "", roleId: "",
@ -362,7 +362,7 @@ export default {
}); });
this.query = { this.query = {
userName: "", userName: "",
userFlag: "", userFlag: "1",
page: 1, page: 1,
limit: 10, limit: 10,
roleId: "", roleId: "",

Write Preview
Loading…
Cancel
Save