Skip to content

K
klck
Commit 30f26c0c authored by dongjg's avatar dongjg
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
#	ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
#	ruoyi-ui/src/views/system/suppliesrole/index.vue
#	ruoyi-ui/src/views/system/suppliesroledetail/index.vue
parents 185d3983 015cc9cc
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 140 deletions
ruoyi-ui/src/views/system/ActSuppliesDetails/ActSuppliesDetails/index.vue
View file @ 30f26c0c
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="父ID" prop="sid">
<el-form-item label="ID" prop="id" :rules="idRules">
<el-input
v-model="queryParams.sid"
placeholder="请输入父ID"
v-model="queryParams.id"
placeholder="请输入ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="上级分类" prop="fname">
<el-input
v-model="queryParams.fname"
placeholder="请输入上级分类"
clearable
size="small"
@keyup.enter.native="handleQuery"
......@@ -29,13 +38,10 @@
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
<el-option label="在用" value="0"></el-option>
<el-option label="禁用" value="1"></el-option>
<el-option label="删除" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -92,11 +98,36 @@
<el-table v-loading="loading" :data="ActSuppliesDetailsList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料ID" align="center" prop="id" />
<el-table-column label="父ID" align="center" prop="fname" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="上级分类" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.fname === null">
其他
</template>
<template v-else>
{{ scope.row.fname }}
</template>
</div>
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" prop="detailsName" />
<el-table-column label="所属系统" align="center" prop="sysclassify" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.status === 0">
启用
</template>
<template v-else-if="scope.row.status === 1">
禁用
</template>
<template v-else-if="scope.row.status === 2">
删除
</template>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -128,8 +159,8 @@
<!-- 添加或修改物料细分类管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="上级ID" prop="sid">
<el-select v-model="form.sid" filterable placeholder="请选择上级ID" >
<el-form-item label="上级分类" prop="sid">
<el-select v-model="form.sid" filterable placeholder="请选择上级分类" >
<el-option
v-for="option in options2"
:key="option.suppliesName"
......@@ -145,14 +176,11 @@
<el-form-item label="所属系统" prop="sysclassify">
<el-input v-model="form.sysclassify" placeholder="请输入所属系统" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="parseInt(dict.dictValue)"
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
<el-form-item label="状态" prop="">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -188,8 +216,7 @@ export default {
ActSuppliesDetailsList: [],
options2:[],//初始化空数组
// 状态数据字典
statusOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -199,12 +226,15 @@ export default {
pageNum: 1,
pageSize: 10,
sid: null,
fname:null,
detailsName: null,
sysclassify: null,
status: null,
},
// 表单参数
form: {},
form: {
status:'0'
},
// 表单校验
rules: {
sid: [
......@@ -213,14 +243,17 @@ export default {
detailsName: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
],
}
sysclassify: [
{ required: true, message: "物料名称不能为空", trigger: "blur" }
]
},
idRules:[
{ pattern: /^\d+$/, message: 'ID只能输入数字', trigger: 'blur' }
]
};
},
created() {
this.getList();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
},
mounted() {
this.fetchOptions();
......@@ -244,11 +277,6 @@ export default {
this.loading = false;
});
},
// 岗位状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
},
// 取消按钮
cancel() {
this.open = false;
......
ruoyi-ui/src/views/system/Actsupplies/Actsupplies/index.vue
View file @ 30f26c0c
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="父ID" prop="pid">
<el-form-item label="ID" prop="id" :rules="idRules">
<el-input
v-model="queryParams.pid"
placeholder="请输入父ID"
v-model="queryParams.id"
placeholder="请输入ID"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-form-item label="上级分类" prop="fname">
<el-input
v-model="queryParams.materialName"
v-model="queryParams.fname"
placeholder="请输入上级分类"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="suppliesName">
<el-input
v-model="queryParams.suppliesName"
placeholder="请输入物料名称"
clearable
size="small"
......@@ -20,18 +29,10 @@
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<!--<el-select v-model="queryParams.status" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable @keyup.enter.native="handleQuery">
<el-option label="在用" value="0"></el-option>
<el-option label="禁用" value="1"></el-option>
<el-option label="删除" value="2"></el-option>
</el-select>-->
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
<el-option label="禁用" value="1"></el-option>
<el-option label="删除" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -88,11 +89,35 @@
<el-table v-loading="loading" :data="suppliesList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="物料ID" align="center" prop="id" />
<el-table-column label="父ID" align="center" prop="pid" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="上级分类" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.fname === null">
最高级
</template>
<template v-else>
{{ scope.row.fname }}
</template>
</div>
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" prop="suppliesName" />
<el-table-column label="显示排序" align="center" prop="orderNum" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.status === 0">
启用
</template>
<template v-else-if="scope.row.status === 1">
禁用
</template>
<template v-else-if="scope.row.status === 2">
删除
</template>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -125,8 +150,8 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="父ID" prop="pid">
<el-select v-model="form.pid" placeholder="请输入父ID" >
<el-option label="无上级分类" value="0"></el-option>
<el-select v-model="form.pid" placeholder="请输入上级分类" >
<el-option label="最高级" value="0"></el-option>
<el-option
v-for="option in options"
:key="option.suppliesName"
......@@ -135,20 +160,14 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-form-item label="物料名称" prop="suppliesName">
<el-input v-model="form.suppliesName" placeholder="请输入物料名称" />
</el-form-item>
<el-form-item label="显示排序" prop="orderNum">
<el-input v-model="form.orderNum" placeholder="请输入显示排序" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="parseInt(dict.dictValue)"
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
<el-select v-model="form.status" placeholder="请选择状态">
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -167,6 +186,8 @@ export default {
components: {
},
data() {
let checkId =(rule,value,callback) => {
};
return {
// 遮罩层
loading: true,
......@@ -182,21 +203,27 @@ export default {
total: 0,
// 物料总分类管理表格数据
suppliesList: [],
// 初始化空数组
options: [],
// 选中的选项
selectedOption: '' ,
// 状态数据字典
statusOptions: [],
options: [], // 初始化空数组
selectedOption: '' ,// 选中的选项
mydict:{
0:'启用',
1:'禁用',
2:'删除'
},
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
id: null,
pageNum: 1,
pageSize: 10,
pid: null,
fname:null,
suppliesName: null,
orderNum: null,
status: null,
......@@ -205,16 +232,21 @@ export default {
form: {},
// 表单校验
rules: {
}
pid: [
{ required: true, message: "关联id不能为空", trigger: "change" },
],
suppliesName:[
{ required: true, message: "物料名称不能为空", trigger: "blur" }
],
},
idRules:[
{ pattern: /^\d+$/, message: 'ID只能输入数字', trigger: 'blur' }
]
};
},
created() {
this.getList();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
},
mounted() {
this.fetchOptions();
},
......@@ -237,11 +269,6 @@ export default {
this.loading = false;
});
},
// 状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
},
// 取消按钮
cancel() {
this.open = false;
......@@ -252,6 +279,7 @@ export default {
this.form = {
id: null,
pid: null,
fname:null,
suppliesName: null,
orderNum: null,
status: 0,
......@@ -264,8 +292,13 @@ export default {
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
if ('最高级'.indexOf(this.queryParams.fname) !== -1){
this.queryParams.pid = 0;
}
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
......@@ -332,7 +365,6 @@ export default {
this.msgSuccess("删除成功");
}
}).catch(()=>{
// this.msgSuccess("删除失败")
})
},
/** 导出按钮操作 */
......
ruoyi-ui/src/views/system/supplies/index_template.vue
View file @ 30f26c0c
......@@ -134,8 +134,8 @@
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择状态">
<el-option label="启用" value="0"></el-option>
<el-option label="禁用" value="1"></el-option>
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
</el-form-item>
......
ruoyi-ui/src/views/system/suppliesrole/index.vue
View file @ 30f26c0c
......@@ -20,13 +20,10 @@
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
<el-select v-model="queryParams.status" placeholder="请选择状态">
<el-option label="启用" value="0"></el-option>
<el-option label="禁用" value="1"></el-option>
<el-option label="删除" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -86,7 +83,21 @@
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="模板ID" align="center" prop="tempId" />
<el-table-column label="规则名称" align="center" prop="roleName" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.status === 0">
启动
</template>
<template v-else-if="scope.row.status === 1">
禁用
</template>
<template v-else-if="scope.row.status === 2">
删除
</template>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -132,13 +143,10 @@
<el-input v-model="form.roleName" placeholder="请输入规则名称" />
</el-form-item>
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="parseInt(dict.dictValue)"
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
<el-select v-model="form.status">
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -174,12 +182,11 @@ export default {
suppliesroleList: [],
options:[],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 状态数据字典
statusOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
......@@ -201,11 +208,10 @@ export default {
created() {
this.getList();
this.getnameid();
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
},
methods: {
/** 查询上级id*/
getnameid(){
saveSid().then(response =>{
......@@ -222,10 +228,6 @@ export default {
this.loading = false;
});
},
// 岗位状态字典翻译
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
},
// 取消按钮
cancel() {
this.open = false;
......
ruoyi-ui/src/views/system/suppliesroledetail/index.vue
View file @ 30f26c0c
......@@ -20,17 +20,14 @@
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable size="small">
<el-option
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
/>
<el-select v-model="queryParams.status" placeholder="请选择状态">
<el-option label="启用" value="0"></el-option>
<el-option label="禁用" value="1"></el-option>
<el-option label="删除" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否物料转换" prop="convertStatus">
<el-select v-model="queryParams.convertStatus" placeholder="请选择状态" clearable size="small">
<el-select v-model="queryParams.convertStatus" placeholder="请选择状态">
<el-option label="启用" value="0"></el-option>
<el-option label="禁用" value="1"></el-option>
</el-select>
......@@ -93,8 +90,33 @@
<el-table-column label="导入规则ID" align="center" prop="roleId" />
<el-table-column label="规则名称" align="center" prop="detailName" />
<el-table-column label="规则内容" align="center" prop="detailContent" />
<el-table-column label="是否物料转换" align="center" prop="convertStatus" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
<el-table-column label="是否物料转换" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.convertStatus === 0">
是
</template>
<template v-else-if="scope.row.convertStatus === 1">
否
</template>
</div>
</template>
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<div>
<template v-if="scope.row.status === 0">
启动
</template>
<template v-else-if="scope.row.status === 1">
禁用
</template>
<template v-else-if="scope.row.status === 2">
删除
</template>
</div>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
......@@ -151,19 +173,16 @@
<el-form-item label="导入列行坐标" prop="detailYL">
<el-input-number size="medium" v-model="form.detailYL" :min="1" :step="1">1</el-input-number>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in statusOptions"
:key="dict.dictValue"
:label="parseInt(dict.dictValue)"
>{{dict.dictLabel}}</el-radio>
</el-radio-group>
<el-form-item label="状态">
<el-select v-model="form.status">
<el-option label="启用" :value="0"></el-option>
<el-option label="禁用" :value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否物料转换" prop="convertStatus">
<el-select v-model="form.convertStatus">
<el-option label="启用物料转换" value="0"></el-option>
<el-option label="禁用物料转换" value="1"></el-option>
<el-option label="启用物料转换" :value="0"></el-option>
<el-option label="禁用物料转换" :value="1"></el-option>
</el-select>
</el-form-item>
</el-form>
......@@ -210,8 +229,7 @@ export default {
suppliesroledetailList: [],
options:[],//上级ID
// 状态数据字典
statusOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -226,6 +244,8 @@ export default {
status: null,
converStatus: null,
},
namenn: '杨木',
form1:{},
// 表单参数
form: {
},
......@@ -246,7 +266,7 @@ export default {
detailYL:[
{required: true, message: '导入表列坐标不能为空', trigger: 'change'},
],
converStatus:[
convertStatus:[
{required: true, message: '是否物料转换不能为空', trigger: 'change'},
]
}
......@@ -259,9 +279,6 @@ export default {
this.form.detailML=1;
this.form.detailYH=1;
this.form.detailYL=1;
this.getDicts("sys_normal_disable").then(response => {
this.statusOptions = response.data;
});
},
methods: {
......@@ -282,9 +299,6 @@ export default {
this.loading = false;
});
},
statusFormat(row, column) {
return this.selectDictLabel(this.statusOptions, row.status);
},
// 取消按钮
cancel() {
this.open = false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment