rq 2 years ago
parent
commit
ced5e8d2b4
  1. 8
      src/api/base/site.js
  2. 2
      src/assets/scss/rq.scss
  3. 60
      src/views/modules/base/benchmark/workCenterBM.vue
  4. 30
      src/views/modules/base/propertiesItem/bmPropertiesModel.vue
  5. 454
      src/views/modules/base/roleInfo.vue
  6. 4
      src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
  7. 4
      src/views/modules/project/projectInfo/com_project_info_purchase_request.vue
  8. 2
      src/views/modules/project/projectInfo/com_project_puotation.vue
  9. 2
      src/views/modules/project/projectInfo/com_project_sample.vue
  10. 2
      src/views/modules/project/projectInfo/com_project_technicalSpecification.vue
  11. 2
      src/views/modules/project/projectInfo/com_project_test.vue
  12. 10
      src/views/modules/sys/user.vue

8
src/api/base/site.js

@ -77,3 +77,11 @@ export const searchWorkCenterBMType= data => createAPI(`/properties/searchWorkCe
export const updateWorkCenterBMType= data => createAPI(`/properties/updateWorkCenterBMType`,'post',data)
export const getPlmRouteItemType= data => createAPI(`/properties/getPlmRouteItemType`,'post',data)
export const getUserAccessSite= data => createAPI(`/base/getUserAccessSite`,'post',data)
export const saveAccessRoleListForRole= data => createAPI(`/base/saveAccessRoleListForRole`,'post',data)
export const searchUserListForRole= data => createAPI(`/base/searchUserListForRole`,'post',data)
export const getRoleList= data => createAPI(`/base/getRoleList`,'post',data)

2
src/assets/scss/rq.scss

@ -89,7 +89,7 @@
//}
.highlight {
border-color: #08c2bc;
background-color: #96ea93;
background-color: #E0F7FA;
}
.auto .el-upload{
width: 100%;

60
src/views/modules/base/benchmark/workCenterBM.vue

@ -2,21 +2,35 @@
<div class="mod-config">
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<el-button type="primary" @click="searchTable">刷新</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
<el-form-item :label="'加工中心编码'">
<el-input v-model="searchData.workCenterNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'加工中心名称'">
<el-input v-model="searchData.workCenterDesc" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'Benchmark模块'" >
<el-select v-model="searchData.itemType" style="width: 130px" placeholder="请选择">
<el-option label="全部" value=""></el-option>
<el-option v-for="item in itemList" :key="index" :label="item.typeDesc" :value="item.itemType"></el-option>
</el-select>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable">刷新</el-button>
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
</el-form-item>
</el-form>
</el-form>
<el-table
@ -67,7 +81,7 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item :label="'模板'" required="required">
<el-form-item :label="'Benchmark模块'" required="required">
<el-select v-model="dataForm.itemType" style="width: 130px" placeholder="请选择">
<el-option v-for="item in itemList" :key="index" :label="item.typeDesc" :value="item.itemType"></el-option>
</el-select>
@ -100,7 +114,10 @@
height:300,
dataList: [],
searchData: {
site:this.$store.state.user.site
site:this.$store.state.user.site,
workCenterNo:'',
workCenterDesc:'',
itemType:'',
},
exportList:[],
visible:false,
@ -167,7 +184,7 @@
columnProp: "typeDesc",
headerAlign: "center",
align: "left",
columnLabel: "BenchMark模板",
columnLabel: "Benchmark模块",
columnHidden: false,
columnImage: false,
columnSortable: false,
@ -234,6 +251,13 @@
this.dataList = [];
}
});
this.dataForm={
site: this.$store.state.user.site,
}
getPlmRouteItemType(this.dataForm).then(({data})=>{
this.itemList=data.rows
})
},
updateModel(row){
this.dataForm={

30
src/views/modules/base/propertiesItem/bmPropertiesModel.vue

@ -11,6 +11,13 @@
:key="index"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'模块类型'">
<el-select clearable v-model="searchData.codeType" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="主页页签" value="主页页签"></el-option>
<el-option label="工序" value="工序"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'是否启用'">
<!-- <el-select clearable v-model="searchData.active" style="width: 120px">-->
<!-- <el-option label="Y" value="Y"></el-option>-->
@ -155,7 +162,7 @@
</el-form>
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="是否启用:">
<el-select clearable v-model="editData.active" style="width: 120px">
<el-select clearable v-model="editData.active" :disabled="editData.codeType==='工序'" style="width: 120px">
<el-option label="Y" value="Y"></el-option>
<el-option label="N" value="N"></el-option>
</el-select>
@ -264,6 +271,7 @@
site: this.$store.state.user.site,
codeNo: '',
codeDesc: '',
codeType: '',
buNo:'',
active:'Y',
functionType:'',
@ -361,6 +369,24 @@
fixed: '',
columnWidth: 100
},
{
userId: this.$store.state.user.name,
functionId: 100003001,
serialNumber: '100003001TableCodeType',
tableId: "100003001Table",
tableName: "BM模板表",
columnProp: 'codeType',
headerAlign: "center",
align: "center",
columnLabel: '模块类型',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 60
},
{
userId: this.$store.state.user.name,
functionId: 100003001,
@ -554,6 +580,7 @@
},
editData:{
site:'',
codeType:'',
buNo:'',
codeNo:'',
codeDesc:'',
@ -833,6 +860,7 @@
site:row.site,
buNo:row.buNo,
codeDesc:row.codeDesc,
codeType:row.codeType,
codeNo:row.codeNo,
editFlag:row.editFlag,
active:row.active,

454
src/views/modules/base/roleInfo.vue

@ -0,0 +1,454 @@
<template>
<div class="mod-config">
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-form :inline="true" label-position="top" style="margin-top: 0px">
<el-button type="primary" @click="searchTable()">查询</el-button>
<!-- <el-button type="primary" @click="addModal()">新增</el-button>-->
<download-excel
:fields="fields()"
:data="exportData"
type="xls"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{ '导出' }}
</download-excel>
</el-form>
</el-form>
<el-table
:data="dataList"
:height="height"
border
v-loading="dataListLoading"
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnList1" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
<el-table-column
header-align="center"
align="center"
width="150"
fixed="right"
label="操作">
<template slot-scope="scope">
<a type="text" size="small" @click="accessModel(scope.row)">岗位授权</a>
<!-- <a type="text" size="small" @click="updateModel(scope.row)">修改</a>-->
<!-- <a type="text" size="small" @click="deleteData(scope.row)">删除</a>-->
</template>
</el-table-column>
</el-table>
<!-- <el-dialog-->
<!-- width="460px"-->
<!-- :title="!dataForm.id ? '添加' :'编辑'"-->
<!-- :close-on-click-modal="false"-->
<!-- :visible.sync="visible">-->
<!-- <el-form label-position="top" label-width="100px" :rules="dataRole">-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="8">-->
<!-- <el-form-item :label="'BU编码'" prop="buNo" :rules="dataRole.buNo">-->
<!-- <el-input v-model="dataForm.buNo" :disabled="this.dataForm.id!=0"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item :label="'BU名称'" prop="buDesc" :rules="dataRole.buDesc">-->
<!-- <el-input v-model="dataForm.buDesc" ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="在用">-->
<!-- <el-select filterable v-model="dataForm.active" >-->
<!-- <el-option label="Y" value="Y"></el-option>-->
<!-- <el-option label="N" value="N"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row :gutter="20">-->
<!-- <el-col :span="24">-->
<!-- <el-form-item :label="'备注'">-->
<!-- <el-input v-model="dataForm.remark" style="" ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- <span slot="footer" class="dialog-footer">-->
<!-- <el-button type="primary" @click="saveData()">{{'确定'}}</el-button>-->
<!-- <el-button type="primary" @click="visible = false">{{'关闭'}}</el-button>-->
<!-- </span>-->
<!-- </el-dialog>-->
<el-dialog
style="font-size: 12px"
v-drag
:title="'岗位授权'"
:visible.sync="accessModelFlag"
width="518px"
:close-on-click-modal="false"
:append-to-body="true">
<el-transfer v-model="accessRoleList" class="rq" filterable :props="{
key: 'username',
label: 'userDisplay'
}" :data="userList" :titles="['未选择', '已选择']"></el-transfer>
<span slot="footer" class="dialog-footer">
<div style="margin-top: 5px">
<el-button type="primary" @click="saveAccessBuListForRole()">确定</el-button>
<el-button @click="accessModelFlag = false" type="primary">取消</el-button>
</div>
</span>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
<script>
import {
getRoleList,
searchUserListForRole,
saveAccessRoleListForRole,
searchAccessBuListForUser,
saveAccessBuListForBu,
} from "@/api/base/site.js"
import Chooselist from '@/views/modules/common/Chooselist'
export default {
components: {
Chooselist
},
data() {
return {
rowRoleNo:'',
accessModelFlag:false,
userList:[],
accessRoleList:[],
dataList: [],
height:200,
searchData: {
site:this.$store.state.user.site,
username: this.$store.state.user.name,
},
visible:false,
dataListLoading: false,
currentRow:'',
columnList1:[
{
userId: this.$store.state.user.name,
functionId: 100001005,
serialNumber: '100001005Table1Site',
tableId: "100001005Table1",
tableName: "岗位列表",
columnProp: "site",
headerAlign: "center",
align: "left",
columnLabel: "工厂编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 100001005,
serialNumber: '100001005Table1RoleNo',
tableId: "100001005Table1",
tableName: "岗位列表",
columnProp: "roleNo",
headerAlign: "center",
align: "left",
columnLabel: "岗位编码",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},{
userId: this.$store.state.user.name,
functionId: 100001005,
serialNumber: '100001005Table1RoleDesc',
tableId: "100001005Table1",
tableName: "岗位列表",
columnProp: "roleDesc",
headerAlign: "center",
align: "left",
columnLabel: "岗位名称",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},{
userId: this.$store.state.user.name,
functionId: 100001005,
serialNumber: '100001005Table1Active',
tableId: "100001005Table1",
tableName: "岗位列表",
columnProp: "active",
headerAlign: "center",
align: "left",
columnLabel: "是否在用",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
// },{
// userId: this.$store.state.user.name,
// functionId: 100001005,
// serialNumber: '100001005Table1Remark',
// tableId: "100001005Table1",
// tableName: "",
// columnProp: "remark",
// headerAlign: "center",
// align: "left",
// columnLabel: "",
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// columnWidth: 120
},
],
dataForm:{
id:'',
site: '',
buNo:'',
buDesc:'',
active:'Y',
remark:'',
username:'',
},
dataRole: {
buNo: [
{
required: true,
message: ' ',
trigger: 'change'
}
],
buDesc: [
{
required: true,
message: ' ',
trigger: 'change'
}
],
},
// start
exportData: [],
exportName: 'BU清单'+this.dayjs().format('YYYYMMDDHHmmss'),
exportHeader: ["BU清单"],
exportFooter: [],
// end
}
},
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight - 140;
})
this.searchTable()
},
watch: {
dataForm: {
deep: true,
handler: function (newV, oldV) {
this.dataForm.buNo = this.dataForm.buNo.toUpperCase()
}
},
},
activated() {
this.$store.commit("sift/commitSearchFunction",this.getBuDemo)
},
methods: {
getBuDemo(params){
this.$message.success("这里是BU")
},
// S
getBaseList (val, type) {
this.tagNo = val
this.tagNo1 = type
this.$nextTick(() => {
let strVal = ''
if (val === 1013) {
if(type==1) {
strVal = this.dataForm.partType
}
}
this.$refs.baseList.init(val, strVal)
})
},
/* 列表方法的回调 */
getBaseData (val) {
if (this.tagNo === 1013) {
if(this.tagNo1==1) {
this.dataForm.partType = val.Base_id
this.dataForm.partTypeDesc = val.Base_desc
}
}
},
searchTable(){
getRoleList(this.searchData).then(({data}) => {
//
if (data && data.code == 0) {
this.dataList = data.rows;
} else {
this.dataList = [];
}
});
},
// addModal(){
// this.dataForm={
// id:0,
// site: this.$store.state.user.site,
// buNo:'',
// buDesc:'',
// active:'Y',
// remark:'',
// username:this.$store.state.user.name,
// }
// this.visible=true;
// },
// updateModel(row){
// this.dataForm={
// id:row.id,
// site: row.site,
// buNo:row.buNo,
// buDesc:row.buDesc,
// active:row.active,
// remark:row.remark,
// username:this.$store.state.user.name,
// }
// this.visible=true;
// },
// saveData(){
// if(this.dataForm.buNo==''||this.dataForm.buNo==null){
// this.$alert('BU', '', {
// confirmButtonText: ''
// })
// return false;
// }
// if(this.dataForm.buDesc==''||this.dataForm.buDesc==null){
// this.$alert('BU', '', {
// confirmButtonText: ''
// })
// return false;
// }
// saveBU(this.dataForm).then(({data}) => {
// if (data && data.code === 0) {
// this.$message.success( '')
// this.visible = false
// this.searchTable();
// } else {
// this.$message.error(data.msg)
// }
// })
// },
// deleteData(row){
// this.$confirm('?', '', {
// confirmButtonText: '',
// cancelButtonText: '',
// type: 'warning'
// }).then(() => {
// deleteBU(row).then(({data}) => {
// if (data && data.code === 0) {
// this.$message.success( '')
// this.searchTable();
// } else {
// this.$message.error(data.msg)
// }
// })
// }).catch(() => {
// })
// },
accessModel(row){
searchUserListForRole({site:this.$store.state.user.site,
roleNo: row.roleNo,
active:'Y'}).then(({data}) => {
this.accessRoleList = data.searchUserListForRole
this.userList=data.userList
})
this.rowRoleNo=row.roleNo
this.accessModelFlag=true
},
saveAccessBuListForRole(){
let inList=[];
for (let i = 0; i < this.accessRoleList.length; i++) {
let inData={
site:this.$store.state.user.site,
username:this.accessRoleList[i],
roleNo:this.rowRoleNo
}
inList.push(inData)
}
let saveData={
site:this.$store.state.user.site,
roleNo:this.rowRoleNo,
accessRoleList:inList,
}
saveAccessRoleListForRole(saveData).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
this.accessModelFlag = false
} else {
this.$message.error(data.msg)
}
})
},
//excel
async createExportData() {
return this.dataList;
},
startDownload() {
// this.exportData = this.dataList
},
finishDownload() {
},
fields() {
let json = "{"
this.columnList1.forEach((item, index) => {
if (index == this.columnList1.length - 1) {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
} else {
json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
}
})
json += "}"
let s = eval("(" + json + ")")
return s
},
},
}
</script>
<style scoped>
</style>

4
src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue

@ -34,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="求日期:" prop="needDate">
<el-form-item label="求日期:" prop="needDate">
<el-date-picker
style="width: 100%"
v-model="dataForm.needDate"
@ -770,7 +770,7 @@
// return false;
// }
if(!this.dataForm.needDate){
this.$alert('请选择求日期!', '错误', {
this.$alert('请选择求日期!', '错误', {
confirmButtonText: '确定'
})
return false;

4
src/views/modules/project/projectInfo/com_project_info_purchase_request.vue

@ -68,7 +68,7 @@
<el-input v-model="dataForm.orderNo" disabled style="width: 130px" ></el-input>
</el-form-item>
<el-form-item :label="'项目料号'" prop="testPartNo" :rules="dataRole.testPartNo">
<el-form-item :label="'物料编码'" prop="testPartNo" :rules="dataRole.testPartNo">
<el-select v-model="dataForm.testPartNo" placeholder="请选择" style="width: 130px" @change="getPartName">
<el-option v-for="item in projectPartList " :key="index" :label="item.testPartNo"
:value="item.testPartNo" >
@ -198,7 +198,7 @@
columnProp: "testPartNo",
headerAlign: "center",
align: "left",
columnLabel: "项目料号",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,

2
src/views/modules/project/projectInfo/com_project_puotation.vue

@ -151,7 +151,7 @@
columnProp: 'testPartNo',
headerAlign: 'center',
align: 'center',
columnLabel: '项目料号',
columnLabel: '物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,

2
src/views/modules/project/projectInfo/com_project_sample.vue

@ -150,7 +150,7 @@
columnProp: 'testPartNo',
headerAlign: 'center',
align: 'center',
columnLabel: '项目料号',
columnLabel: '物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,

2
src/views/modules/project/projectInfo/com_project_technicalSpecification.vue

@ -129,7 +129,7 @@
columnProp: "testPartNo",
headerAlign: "center",
align: "left",
columnLabel: "项目料号",
columnLabel: "物料编码",
columnHidden: false,
columnImage: false,
columnSortable: false,

2
src/views/modules/project/projectInfo/com_project_test.vue

@ -132,7 +132,7 @@ export default {
columnProp: 'testPartNo',
headerAlign: 'center',
align: 'center',
columnLabel: '项目料号',
columnLabel: '物料编码',
columnHidden: false,
columnImage: false,
columnSortable: false,

10
src/views/modules/sys/user.vue

@ -32,7 +32,7 @@
</el-button>
<el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
@click="roleAuthorize()"
> {{ buttons.roleAuthorization || '角色授权' }}
> {{ buttons.roleAuthorization || '岗位授权' }}
</el-button>
</el-form-item>
</el-form>
@ -480,18 +480,18 @@
</div>
</span>
</el-dialog>
<!-- 角色授权 -->
<!-- 岗位授权 -->
<el-dialog
style="font-size: 12px"
v-drag
:title="'角色授权'"
:title="'岗位授权'"
:visible.sync="roleVisible"
width="518px"
:append-to-body="true">
<el-transfer class="rq" filterable v-model="selectRoleList" :props="{
key: 'roleNo',
label: 'roleDesc'
}" :data="roleList" :titles="['未授权角色', '已授权角色']"></el-transfer>
}" :data="roleList" :titles="['未授权岗位', '已授权岗位']"></el-transfer>
<span slot="footer" class="dialog-footer">
<div style="margin-top: 5px">
<el-button type="primary" @click="saveRoleAssessSite()">确定</el-button>
@ -750,7 +750,7 @@ export default {
specialCompetencies: '特殊权限',
factoryAuthorization: '工厂授权',
buAuthorization: 'BU授权',
roleAuthorization: '角色授权',
roleAuthorization: '岗位授权',
projectAuthorization: '项目授权',
createTime: '创建时间',
username: '用户账号',

Loading…
Cancel
Save