wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

plm BMM

master
ruanqi 1 year ago
parent
af9a7320a9
commit
53060438df
5 changed files with 134 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 105
      src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
  2. 12
      src/views/modules/project/projectInfo/projectInfo.vue
  3. 10
      src/views/modules/project/projectPart/searchProjectPart.vue
  4. 17
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  5. 20
      src/views/modules/sys/user.vue

105
src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
View File

@ -72,7 +72,13 @@
<!-- <span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>--> <!-- <span slot="label" style="" @click="getBaseList(102,2)"><a herf="#">终端客户</a></span>-->
<!-- <el-input v-model="dataForm.finalCustomerId" @blur="getCustomerName(2)"></el-input>--> <!-- <el-input v-model="dataForm.finalCustomerId" @blur="getCustomerName(2)"></el-input>-->
<dict-data-select v-model="dataForm.finalCustomerId" clearable filterable dict-type="finalCustomer" :use-default-value="false"></dict-data-select>
<dict-data-select v-model="dataForm.finalCustomerId" clearable filterable dict-type="finalCustomer" :use-default-value="true"></dict-data-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="Product set">
<dict-data-select v-model="dataForm.productSet" clearable filterable dict-type="productSet" :use-default-value="true"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -312,6 +318,7 @@
projectManagerList:[], projectManagerList:[],
projectOwnerList:[], projectOwnerList:[],
userRoleList:[], userRoleList:[],
productSet:'',
}, },
userRoleForm:{ userRoleForm:{
username:'', username:'',
@ -530,16 +537,18 @@
id: 0, id: 0,
site:this.$store.state.user.site, site:this.$store.state.user.site,
projectLevel:1, projectLevel:1,
customerProjectNo:'',
projectId:'', projectId:'',
projectTypeDb:'', projectTypeDb:'',
projectType:'', projectType:'',
customerName:'', customerName:'',
finalCustomerName:'',
customerId:'', customerId:'',
finalCustomerId:'',
projectName:'', projectName:'',
projectDesc:'', projectDesc:'',
needDate:'', needDate:'',
priority:'', priority:'',
customerProjectNo:'',
projectSource:'', projectSource:'',
priorityDesc:'', priorityDesc:'',
projectSourceDesc:'', projectSourceDesc:'',
@ -550,12 +559,10 @@
userRoleName:'', userRoleName:'',
projectManagerList:[], projectManagerList:[],
projectOwnerList:[], projectOwnerList:[],
buNo:'',
buDesc:'',
finalCustomerId:'',
finalCustomerName:'',
userRoleList:[],
productSet:'',
} }
this.searchUserRollAll();
// this.searchUserRollAll();
} }
if (requestCustomer){ if (requestCustomer){
@ -572,6 +579,36 @@
} }
searchUserRoll(inData3).then(({data}) => { searchUserRoll(inData3).then(({data}) => {
this.userRoleList=data.rows; this.userRoleList=data.rows;
for (let j = 0; j <this.userRoleList.length?this.userRoleList.length:-1 ; j++) {
let checkData=this.dataForm.userRoleList.filter(item => item.username === this.userRoleList[j].username)
if(checkData.length>0){
this.userRoleList[j].deleteCheck=checkData[0].deleteCheck
this.userRoleList[j].deleteFlag=checkData[0].deleteFlag
this.userRoleList[j].downCheck=checkData[0].downCheck
this.userRoleList[j].downFlag=checkData[0].downFlag
this.userRoleList[j].searchCheck=checkData[0].searchCheck
this.userRoleList[j].searchFlag=checkData[0].searchFlag
this.userRoleList[j].updateCheck=checkData[0].updateCheck
this.userRoleList[j].checkAll=checkData[0].checkAll
}else {
this.userRoleList[j].deleteCheck=false
this.userRoleList[j].deleteFlag='N'
this.userRoleList[j].downCheck=false
this.userRoleList[j].downFlag='N'
this.userRoleList[j].searchCheck=false
this.userRoleList[j].searchFlag='N'
this.userRoleList[j].updateCheck=false
this.userRoleList[j].checkAll=false
}
}
for (let i = 0; i <this.userRoleList.length ; i++) {
if(this.userRoleList[i].username===this.$store.state.user.name){
this.userRoleList[i].checkAll=true;
// this.changeAll(this.userRoleList[i])
}
}
// this.userRollModal(); // this.userRollModal();
}) })
}, },
@ -602,6 +639,7 @@
let select= this.operatorList.filter(item => item.operatorId === this.projectManagerList[i]) let select= this.operatorList.filter(item => item.operatorId === this.projectManagerList[i])
if(select.length>0){ if(select.length>0){
projectManagerName+=select[0].operatorName+';' projectManagerName+=select[0].operatorName+';'
this.addRollForUsername(select[0].operatorId,select[0].operatorName);
} }
} }
this.dataForm.projectManagerName=projectManagerName this.dataForm.projectManagerName=projectManagerName
@ -625,22 +663,61 @@
let select= this.operatorList.filter(item => item.operatorId === this.projectOwnerList[i]) let select= this.operatorList.filter(item => item.operatorId === this.projectOwnerList[i])
if(select.length>0){ if(select.length>0){
projectOwnerName+=select[0].operatorName+';' projectOwnerName+=select[0].operatorName+';'
this.addRollForUsername(select[0].operatorId,select[0].operatorName);
} }
} }
this.dataForm.projectOwnerName=projectOwnerName this.dataForm.projectOwnerName=projectOwnerName
this.dataForm.projectOwnerList=JSON.parse(JSON.stringify(this.projectOwnerList)); this.dataForm.projectOwnerList=JSON.parse(JSON.stringify(this.projectOwnerList));
this.ownerFlag=false this.ownerFlag=false
},
addRollForUsername(username,userDisplay){
console.log(username)
console.log(userDisplay)
console.log(this.dataForm.userRoleList.length)
debugger
if(this.dataForm.userRoleList.length>0) {
let checkList = this.dataForm.userRoleList.filter(item => item.username === username)
if (checkList.length === 0) {
this.dataForm.userRoleList.push({
checkAll: true,
deleteCheck: true,
deleteFlag: 'Y',
downCheck: true,
downFlag: 'Y',
searchCheck: true,
searchFlag: 'Y',
updateCheck: true,
updateFlag: 'Y',
userDisplay: userDisplay,
username: username,
})
this.dataForm.userRoleName += userDisplay + ';'
}
}else {
console.log(username)
console.log(userDisplay)
this.dataForm.userRoleList=[{
checkAll: true,
deleteCheck: true,
deleteFlag: 'Y',
downCheck: true,
downFlag: 'Y',
searchCheck: true,
searchFlag: 'Y',
updateCheck: true,
updateFlag: 'Y',
userDisplay: userDisplay,
username: username,
}]
this.dataForm.userRoleName = userDisplay + ';'
}
}, },
userRollModal(){ userRollModal(){
// this.userRoleList=JSON.parse(JSON.stringify(this.dataForm.userRoleList)); // this.userRoleList=JSON.parse(JSON.stringify(this.dataForm.userRoleList));
this.searchUserRoll() this.searchUserRoll()
for (let i = 0; i <this.userRoleList.length ; i++) {
if(this.userRoleList[i].username===this.$store.state.user.name){
this.userRoleList[i].checkAll=true;
this.changeAll(this.userRoleList[i])
}
}
this.userRoleFlag=true this.userRoleFlag=true

12
src/views/modules/project/projectInfo/projectInfo.vue
View File

@ -121,7 +121,7 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="10"><div class="grid-content bg-purple">
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'项目描述'"> <el-form-item :label="'项目描述'">
<el-input v-model="projectData.projectDesc" readonly style="" ></el-input> <el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
</el-form-item> </el-form-item>
@ -131,11 +131,16 @@
<el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input> <el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'客户项目料号'">
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'客户项目编号'">
<el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input> <el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'Product Set'">
<el-input v-model="projectData.productSet" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
@ -976,6 +981,7 @@
userRoleName:'', userRoleName:'',
customerProjectNo:'', customerProjectNo:'',
finalCustomerName:'', finalCustomerName:'',
productSet:'',
}, },
customerData:{ customerData:{
site: '', site: '',

10
src/views/modules/project/projectPart/searchProjectPart.vue
View File

@ -121,7 +121,7 @@
</el-form-item> </el-form-item>
</div> </div>
</el-col> </el-col>
<el-col :span="10"><div class="grid-content bg-purple">
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'项目描述'"> <el-form-item :label="'项目描述'">
<el-input v-model="projectData.projectDesc" readonly style="" ></el-input> <el-input v-model="projectData.projectDesc" readonly style="" ></el-input>
</el-form-item> </el-form-item>
@ -131,11 +131,16 @@
<el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input> <el-input v-model="projectData.finalCustomerName" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-col :span="5"><div class="grid-content bg-purple">
<el-form-item :label="'客户项目料号'"> <el-form-item :label="'客户项目料号'">
<el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input> <el-input v-model="projectData.customerProjectNo" readonly style="" ></el-input>
</el-form-item> </el-form-item>
</div></el-col> </div></el-col>
<el-col :span="4"><div class="grid-content bg-purple">
<el-form-item :label="'Product Set'">
<el-input v-model="projectData.productSet" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
@ -564,6 +569,7 @@
userRoleName:'', userRoleName:'',
buDesc:'', buDesc:'',
buNo:'', buNo:'',
productSet:'',
}, },
customerData: { customerData: {
site: '', site: '',

17
src/views/modules/sampleManagement/com_technical-add-or-update.vue
View File

@ -13,14 +13,14 @@
<el-form-item label=" " > <el-form-item label=" " >
<el-checkbox v-model="jumpFlag">保存后跳转至详情</el-checkbox> <el-checkbox v-model="jumpFlag">保存后跳转至详情</el-checkbox>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="testPartNo" style="margin-left: 12px" :label="'正式料号'">-->
<!--&lt;!&ndash; <span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">正式料号</a></span>&ndash;&gt;-->
<!-- <el-form-item prop="testPartNo" style="margin-left: 12px" :label="'IFS料号'">-->
<!--&lt;!&ndash; <span slot="label" style="" @click="getBaseList(134,1)" ><a herf="#">IFS料号</a></span>&ndash;&gt;-->
<!-- <el-input v-model="dataForm.testPartNo" @change="changeTestDesc" style="width: 130px" disabled ></el-input>--> <!-- <el-input v-model="dataForm.testPartNo" @change="changeTestDesc" style="width: 130px" disabled ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
</el-form> </el-form>
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole"> <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
<el-form-item :rules="dataRole.testPartNo"> <el-form-item :rules="dataRole.testPartNo">
<span slot="label" style="" @click="choosePartModel()"><a herf="#">正式料号</a></span>
<span slot="label" style="" @click="choosePartModel()"><a herf="#">IFS料号</a></span>
<el-input v-model="dataForm.finalPartNo" style="width: 130px" readonly></el-input> <el-input v-model="dataForm.finalPartNo" style="width: 130px" readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="'项目号'"> <el-form-item :label="'项目号'">
@ -261,7 +261,7 @@
<el-input v-model="partSearch.projectId" style="width: 130px" ></el-input> <el-input v-model="partSearch.projectId" style="width: 130px" ></el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 0px" label="正式料号">
<el-form-item style="margin-left: 0px" label="IFS料号">
<el-input v-model="partSearch.finalPartNo" style="width: 130px" ></el-input> <el-input v-model="partSearch.finalPartNo" style="width: 130px" ></el-input>
</el-form-item> </el-form-item>
<el-form-item style="margin-left: 0px" label="物料编码"> <el-form-item style="margin-left: 0px" label="物料编码">
@ -270,7 +270,10 @@
<el-form-item style="margin-left: 0px" label="物料描述"> <el-form-item style="margin-left: 0px" label="物料描述">
<el-input v-model="partSearch.partDesc" style="width: 130px" ></el-input> <el-input v-model="partSearch.partDesc" style="width: 130px" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label=" ">
<el-form-item style="margin-left: 0px" label="客户料号">
<el-input v-model="partSearch.customerPartNo" style="width: 130px" ></el-input>
</el-form-item>
<el-form-item >
<el-button type="primary" @click="refreshPartList()">{{'查询'}}</el-button> <el-button type="primary" @click="refreshPartList()">{{'查询'}}</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -286,7 +289,7 @@
align="left" align="left"
min-width="120" min-width="120"
style="font-size: 20px" style="font-size: 20px"
label="正式料号">
label="IFS料号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="testPartNo" prop="testPartNo"
@ -412,6 +415,7 @@
partDesc:'', partDesc:'',
site:this.$store.state.user.site, site:this.$store.state.user.site,
username:this.$store.state.user.name, username:this.$store.state.user.name,
customerPartNo:'',
}, },
quotationOfficerList:[], quotationOfficerList:[],
engineerList:[], engineerList:[],
@ -755,6 +759,7 @@
this.partSearch={ this.partSearch={
projectId:'', projectId:'',
finalPartNo:'', finalPartNo:'',
customerPartNo:'',
partDesc:'', partDesc:'',
testPartNo:'', testPartNo:'',
site:this.$store.state.user.site, site:this.$store.state.user.site,

20
src/views/modules/sys/user.vue
View File

@ -2,7 +2,13 @@
<div class="mod-user"> <div class="mod-user">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()"> <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item> <el-form-item>
<el-input v-model="searchData.userName" placeholder="用户账号" clearable></el-input>
<el-input v-model="searchData.userName" placeholder="用户账号" ></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.userDisplay" placeholder="用户名称" ></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.domainControlAccount" placeholder="域控账号" ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()" type="primary">{{ buttons.search || '查询' }}</el-button> <el-button @click="getDataList()" type="primary">{{ buttons.search || '查询' }}</el-button>
@ -138,7 +144,7 @@
layout="total, sizes, prev, pager, next, jumper"> layout="total, sizes, prev, pager, next, jumper">
</el-pagination> </el-pagination>
<!-- 权限清单 --> <!-- 权限清单 -->
<el-dialog title="权限清单" @close="closeDataDialog" @open="getUserAccessSiteInfoList" :close-on-click-modal="false" v-drag :visible.sync="permissionFlag" width="900px">
<el-dialog title="权限清单" @close="closeDataDialog" @open="getUserAccessSiteInfoList" :close-on-click-modal="false" v-drag v-if="permissionFlag" width="900px">
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"> <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
用户： <el-input v-model="selectUser.username" style="width: 130px" readonly></el-input> 用户： <el-input v-model="selectUser.username" style="width: 130px" readonly></el-input>
名称： <el-input v-model="selectUser.userDisplay" style="width: 130px" readonly></el-input> 名称： <el-input v-model="selectUser.userDisplay" style="width: 130px" readonly></el-input>
@ -421,7 +427,7 @@
width="600px" width="600px"
title="功能清单" title="功能清单"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="functionFlag">
v-if="functionFlag">
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;"> <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
用户： <el-input v-model="selectUser.username" style="width: 130px" readonly></el-input> 用户： <el-input v-model="selectUser.username" style="width: 130px" readonly></el-input>
名称： <el-input v-model="selectUser.userDisplay" style="width: 130px" readonly></el-input> 名称： <el-input v-model="selectUser.userDisplay" style="width: 130px" readonly></el-input>
@ -675,6 +681,8 @@ export default {
return { return {
searchData:{ searchData:{
userName:'', userName:'',
domainControlAccount:'',
userDisplay:'',
}, },
saveCheckAll:'N', saveCheckAll:'N',
accessSiteVisible: false, accessSiteVisible: false,
@ -1184,7 +1192,7 @@ export default {
}, },
// 选中行 // 选中行
handleCurrentChange(val) { handleCurrentChange(val) {
this.selectUser = val
this.selectUser =JSON.parse(JSON.stringify(val))
this.showButton = false this.showButton = false
}, },
saveUserRoleFlag() { saveUserRoleFlag() {
@ -1271,7 +1279,9 @@ export default {
params: this.$http.adornParams({ params: this.$http.adornParams({
'page': this.pageIndex, 'page': this.pageIndex,
'limit': this.pageSize, 'limit': this.pageSize,
'username': this.searchData.userName
'username': this.searchData.userName,
'userDisplay': this.searchData.userDisplay,
'domainControlAccount': this.searchData.domainControlAccount,
}) })
}).then(({data}) => { }).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

Write Preview
Loading…
Cancel
Save