Browse Source

2024-04-29 ecn审核

master
fengyuan_yang 2 years ago
parent
commit
16f3fdf00b
  1. 14
      src/api/changeManagement/changeManagement.js
  2. 6
      src/api/customer/customerInformation.js
  3. 28
      src/api/processManagement/processManagement.js
  4. 120
      src/views/modules/changeManagement/changeRecord.vue
  5. 14
      src/views/modules/changeManagement/changeRequest.vue
  6. 53
      src/views/modules/customer/customerInformationManagement.vue
  7. 639
      src/views/modules/part/partInformation.vue
  8. 318
      src/views/modules/processManagement/processBindingInfo.vue
  9. 298
      src/views/modules/project/projectInfo/com_project_info_part.vue
  10. 42
      src/views/modules/sys/user-add-or-update.vue

14
src/api/changeManagement/changeManagement.js

@ -179,6 +179,20 @@ export const countersignatureSearch = data => createAPI(`/plm/changeManagement/c
*/
export const countersignatureUpdate = data => createAPI(`/plm/changeManagement/countersignatureUpdate`,'post',data)
/**
* 下达
* @param data
* @returns {*}
*/
export const issueChange = data => createAPI(`/plm/changeManagement/issueChange`,'post',data)
/**
* 提交
* @param data
* @returns {*}
*/
export const submitChange = data => createAPI(`/plm/changeManagement/submitChange`,'post',data)

6
src/api/customer/customerInformation.js

@ -26,3 +26,9 @@ export const customerInformationEdit = data => createAPI(`/plm/customerInformati
export const customerInformationDelete = data => createAPI(`/plm/customerInformation/customerInformationDelete`,'post',data)
export const customerInformationSearchForCheck= data => createAPI(`/plm/customerInformation/customerInformationSearchForCheck`,'post',data)
/**
* 客户组ID输入校验
* @param data
* @returns {*}
*/
export const checkCustomerGroup = data => createAPI(`/plm/customerInformation/checkCustomerGroup`,'post',data)

28
src/api/processManagement/processManagement.js

@ -56,5 +56,33 @@ export const saveRequestNodeDetail = data => createAPI(`/plm/request/saveRequest
**/
export const deleteRequestNodeDetailByLine = data => createAPI(`/plm/request/deleteRequestNodeDetailByLine`,'post',data)
/**
* 获取table列表
* @param data
* @returns {*}
*/
export const getTableList = data => createAPI(`/plm/request/getTableList`,'post',data)
/**
* 获取表字段
* @param data
* @returns {*}
*/
export const getFieldList = data => createAPI(`/plm/request/getFieldList`,'post',data)
/**
* 获取权限字段集合
* @param data
* @returns {*}
*/
export const getAuthorityFieldList = data => createAPI(`/plm/request/getAuthorityFieldList`,'post',data)
/**
* 保存节点权限
* @param data
* @returns {*}
*/
export const saveAuthorityList = data => createAPI(`/plm/request/saveAuthorityList`,'post',data)

120
src/views/modules/changeManagement/changeRecord.vue

@ -58,7 +58,7 @@
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
<el-link style="cursor: pointer" @click="issueModal(scope.row)">下达</el-link>
<el-link v-if="scope.row.changeStatus === '草稿'" style="cursor: pointer" @click="issueModal(scope.row)">下达</el-link>
</template>
</el-table-column>
</el-table>
@ -262,6 +262,7 @@
<el-footer style="height:25px;text-align:center">
<el-button type="primary" @click="saveData">保存</el-button>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<el-button type="primary" @click="submitDataModal">提交</el-button>
</el-footer>
</el-tab-pane>
@ -602,7 +603,6 @@
type="selection"
header-align="center"
align="center"
:selectable="selectFlag"
width="50">
</el-table-column>
<el-table-column
@ -802,10 +802,28 @@
</el-footer>
</el-dialog>
<!-- 提交 -->
<el-dialog title="提交" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="submitModalFlag" width="226px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'节点结论'">
<el-select filterable v-model="modalData.nodeConclusion" style="width: 200px" placeholder="请选择节点结论">
<el-option label="同意" value="Y"></el-option>
<el-option label="驳回" value="N"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="submitData">确定</el-button>
<el-button type="primary" @click="submitModalFlag = false">取消</el-button>
</el-footer>
</el-dialog>
<ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>
<!-- 上传文件的modal -->
<changeUploadFile ref="changeUploadFile" @refreshPageTables="getChangeFileList" v-drag></changeUploadFile>
<upload-file-list folder="change" title="工程变更文件上传" :label="'变更单号:'" :no="currentRow.changeNo" :file-list.sync="chooseFileList" :upload-dialog.sync="uploadDialog" path="/upload/test"></upload-file-list>
</div>
</template>
@ -828,13 +846,17 @@
executionUpdate, //
countersignatureSearch, //
countersignatureUpdate, //
issueChange, //
submitChange, //
} from '@/api/changeManagement/changeManagement.js'
import ChooseList from '@/views/modules/common/Chooselist'
import changeUploadFile from "../base/upload_file.vue";
import {downLoadQuotationFile} from '@/api/quotation/quotationInformation.js'
import DictDataSelect from "../sys/dict-data-select.vue";
import UploadFileList from "../common/uploadFileList.vue";
export default {
components: {
UploadFileList,
DictDataSelect,
changeUploadFile,
ChooseList,
@ -875,7 +897,13 @@
}
}
},
uploadDialog (newValue,oldValue) {
if (newValue === false) {
this.getChangeFileList()
}
},
},
data () {
return {
//
@ -938,7 +966,8 @@
cqcOperatorId: '',
cqcOperatorName: '',
faiOperatorId: '',
faiOperatorName: ''
faiOperatorName: '',
nodeConclusion: ''
},
costImpactData: {
site: this.$store.state.user.site,
@ -1011,6 +1040,7 @@
form: [],
modelList: [],
itemList: [],
chooseFileList: [],
// ======== ========
columnList: [
{
@ -1184,7 +1214,7 @@
columnProp: 'partNo',
headerAlign: 'center',
align: 'center',
columnLabel: '物料编码',
columnLabel: '正式物料编码',
columnHidden: false,
columnImage: false,
status: true,
@ -1364,7 +1394,7 @@
columnProp: 'partNo',
headerAlign: 'center',
align: 'center',
columnLabel: '物料编码',
columnLabel: '正式物料编码',
columnHidden: false,
columnImage: false,
status: true,
@ -1662,7 +1692,9 @@
modalFlag: false,
modalDisableFlag: false,
ecnTypeModalFlag: false,
chooseModelFlag: false
chooseModelFlag: false,
uploadDialog: false,
submitModalFlag: false
}
},
@ -1686,6 +1718,10 @@
},
methods: {
//
getNodeAuthority () {
},
// ======= =======
handleInput (value, type) {
@ -1982,10 +2018,11 @@
fileRemark: '',
folder: 'change',
}
this.uploadDialog = true
//
this.$nextTick(() => {
this.$refs.changeUploadFile.init(currentData);
})
// this.$nextTick(() => {
// this.$refs.changeUploadFile.init(currentData);
// })
},
//
@ -2076,7 +2113,8 @@
cqcOperatorId: row.cqcOperatorId,
cqcOperatorName: row.cqcOperatorName,
faiOperatorId: row.faiOperatorId,
faiOperatorName: row.faiOperatorName
faiOperatorName: row.faiOperatorName,
nodeConclusion: ''
}
this.changeTitle = '变更申请-' + this.modalData.changeNo
// ECN
@ -2096,7 +2134,61 @@
//
issueModal (row) {
let tempData = {
site: row.site,
userName: this.$store.state.user.name,
changeNo: row.changeNo,
menuId: this.$route.meta.menuId
}
issueChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({message: '操作成功', type: 'success'})
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
},
//
submitDataModal () {
this.modalData.nodeConclusion = 'Y'
this.submitModalFlag = true
},
//
submitData () {
if (this.modalData.nodeConclusion == null || this.modalData.nodeConclusion === '') {
this.$message.warning('请选择节点结论!')
return
}
this.$confirm(`是否确认提交?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
let tempData = {
site: this.modalData.site,
userName: this.$store.state.user.name,
changeNo: this.modalData.changeNo,
menuId: this.$route.meta.menuId,
nodeConclusion: this.modalData.nodeConclusion
}
submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
this.$message({message: '操作成功', type: 'success'})
this.submitModalFlag = false
this.modalFlag = false
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'
})
}
})
})
},
// ECN
@ -2286,10 +2378,10 @@
this.$message.warning('请选择CQC或者FAI人员!')
return
}
if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) {
this.$message.warning('CQC和FAI人员只能选一个!')
return
}
// if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) {
// this.$message.warning('CQCFAI')
// return
// }
this.modalData.detailList = this.chooseDataList
this.modalData.ecnTypeData = this.form
changeRequestUpdate(this.modalData).then(({data}) => {

14
src/views/modules/changeManagement/changeRequest.vue

@ -3,7 +3,7 @@
<!-- 查询条件 -->
<el-form :inline="true" label-position="top" :model="searchData">
<el-form-item label="物料编码">
<el-form-item label="正式物料编码">
<el-input v-model="searchData.partNo" clearable style="width: 120px"/>
</el-form-item>
<el-form-item label="物料名称">
@ -1049,7 +1049,7 @@
columnProp: 'partNo',
headerAlign: 'center',
align: 'center',
columnLabel: '物料编码',
columnLabel: '正式物料编码',
columnHidden: false,
columnImage: false,
status: true,
@ -1195,7 +1195,7 @@
columnProp: 'partNo',
headerAlign: 'center',
align: 'center',
columnLabel: '物料编码',
columnLabel: '正式物料编码',
columnHidden: false,
columnImage: false,
status: true,
@ -2069,10 +2069,10 @@
this.$message.warning('请选择CQC或者FAI人员!')
return
}
if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) {
this.$message.warning('CQC和FAI人员只能选一个!')
return
}
// if (this.modalData.cqcOperatorId !== '' && this.modalData.cqcOperatorId != null && this.modalData.faiOperatorId !== '' && this.modalData.faiOperatorId != null) {
// this.$message.warning('CQCFAI')
// return
// }
this.modalData.detailList = this.chooseDataList
this.modalData.ecnTypeData = this.form
this.fileData.orderRef1 = this.modalData.site

53
src/views/modules/customer/customerInformationManagement.vue

@ -149,12 +149,12 @@
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(120)"><a herf="#">客户组1</a></span>
<el-input v-model="modalData.customerGroupId1" style="width: 124px"></el-input>
<el-input v-model="modalData.customerGroupId1" clearable @blur="customerGroupBlur" style="width: 124px"></el-input>
<el-input v-model="modalData.customerGroupName1" disabled style="width: 330px"></el-input>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(121)"><a herf="#">客户组2</a></span>
<el-input v-model="modalData.customerGroupId2" style="width: 124px"></el-input>
<el-input v-model="modalData.customerGroupId2" clearable @blur="customerGroupBlur2" style="width: 124px"></el-input>
<el-input v-model="modalData.customerGroupName2" disabled style="width: 330px"></el-input>
</el-form-item>
</el-form>
@ -694,6 +694,7 @@
customerInformationSave, //
customerInformationEdit, //
customerInformationDelete, //
checkCustomerGroup, // ID
} from '@/api/customer/customerInformation.js'
import {
customerContactSearch, //
@ -742,6 +743,14 @@
deep: true,
handler: function (newV, oldV) {
this.modalData.customerNo = this.modalData.customerNo.toUpperCase()
this.modalData.customerGroupId1 = this.modalData.customerGroupId1.toUpperCase()
this.modalData.customerGroupId2 = this.modalData.customerGroupId2.toUpperCase()
if (this.modalData.customerGroupId1 == null || this.modalData.customerGroupId1 === '') {
this.modalData.customerGroupName1 = ''
}
if (this.modalData.customerGroupId2 == null || this.modalData.customerGroupId2 === '') {
this.modalData.customerGroupName2 = ''
}
}
}
},
@ -812,6 +821,7 @@
customerGroupId2: '',
customerGroupName1: '',
customerGroupName2: '',
type: ''
},
contactModalData: {
flag: '',
@ -2069,7 +2079,8 @@
defaultAddress: '',
addressStatus: '启用',
addressType: '类型一',
createBy: this.$store.state.user.name
createBy: this.$store.state.user.name,
type: ''
}
this.modalDisableFlag = false
this.detailModalFlag = false
@ -2200,7 +2211,8 @@
contactStatus: row.contactStatus,
addressName: row.addressName,
defaultAddress: 'Y',
updateBy: this.$store.state.user.name
updateBy: this.$store.state.user.name,
type: ''
}
this.modalDisableFlag = true
this.detailModalFlag = false
@ -2352,7 +2364,8 @@
companyName: row.companyName,
jobDescription: row.jobDescription,
contactStatus: row.contactStatus,
addressName: row.addressName
addressName: row.addressName,
type: ''
}
this.modalDisableFlag = true
this.detailModalFlag = true
@ -2932,6 +2945,36 @@
this.projectInformationSelections = val
},
// ID
customerGroupBlur () {
if (this.modalData.customerGroupId1 != null && this.modalData.customerGroupId1 !== '') {
this.modalData.type = '1'
checkCustomerGroup(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.modalData.customerGroupId1 = data.rows.customerGroupId
this.modalData.customerGroupName1 = data.rows.customerGroupName
} else {
this.modalData.customerGroupName1 = ''
}
})
}
},
// ID
customerGroupBlur2 () {
if (this.modalData.customerGroupId2 != null && this.modalData.customerGroupId2 !== '') {
this.modalData.type = '2'
checkCustomerGroup(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.modalData.customerGroupId12 = data.rows.customerGroupId
this.modalData.customerGroupName2 = data.rows.customerGroupName
} else {
this.modalData.customerGroupName2 = ''
}
})
}
},
// ======== chooseList ========
/**
* 获取基础数据列表S

639
src/views/modules/part/partInformation.vue
File diff suppressed because it is too large
View File

318
src/views/modules/processManagement/processBindingInfo.vue

@ -171,10 +171,11 @@
fixed="right"
header-align="center"
align="center"
width="100"
width="130"
label="操作">
<template slot-scope="scope">
<el-link style="cursor: pointer" @click="subDetailModal(scope.row)">出口配置</el-link>
<el-link style="cursor: pointer" @click="authorityModal(scope.row)">权限配置</el-link>
</template>
</el-table-column>
</el-table>
@ -202,29 +203,63 @@
style="width: 100%;">
<el-table-column type="selection" align="center" width="50"></el-table-column>
<el-table-column label="序号" align="center" prop="xh" width="50"></el-table-column>
<el-table-column prop="plmField" header-align="center" align="center" :required="true" label="PLM字段名" width="150">
<el-table-column prop="plmTable" header-align="center" align="center" :required="true" label="PLM数据表" width="240">
<template slot-scope="{row}">
<el-input :ref="`${row.xh-1}` + `a`" v-model="tableData[row.xh-1].plmField" placeholder="请输入PLM字段名"></el-input>
<el-select :ref="`${row.xh-1}` + `a`" v-model="tableData[row.xh-1].plmTable" placeholder="请选择数据表名" @change="tableChange(row.xh-1)" style="width: 220px">
<el-option
v-for = "i in tableList"
:key = "i.tableId"
:label = "i.tableId"
:value = "i.tableId">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="plmTable" header-align="center" align="center" :required="true" label="PLM字段名" width="220">
<template slot-scope="{row}">
<el-select :ref="`${row.xh-1}` + `a`" v-model="tableData[row.xh-1].plmField" placeholder="请选择PLM字段名" style="width: 200px">
<el-option
v-for = "i in fieldList"
:key = "i.fieldId"
:label = "i.fieldName"
:value = "i.fieldId">
</el-option>
</el-select>
</template>
</el-table-column>
<!-- <el-table-column prop="plmField" header-align="center" align="center" :required="true" label="PLM字段名" width="150">-->
<!-- <template slot-scope="{row}">-->
<!-- <el-input :ref="`${row.xh-1}` + `b`" v-model="tableData[row.xh-1].plmField" placeholder="请输入PLM字段名"></el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column prop="oaField" header-align="center" align="center" :required="true" label="OA字段名" width="150">
<template slot-scope="{row}">
<el-input :ref="`${row.xh-1}` + `b`" v-model="tableData[row.xh-1].oaField" placeholder="请输入OA字段名"></el-input>
<el-input :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].oaField" placeholder="请输入OA字段名"></el-input>
</template>
</el-table-column>
<el-table-column prop="plmTable" header-align="center" align="center" :required="true" label="PLM字段类型" width="150">
<template slot-scope="{row}">
<el-select :ref="`${row.xh-1}` + `a`" v-model="tableData[row.xh-1].fieldType" placeholder="请选择字段类型" style="width: 130px">
<el-option label="人员参数" value="A"></el-option>
<el-option label="其他参数" value="B"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="fieldValue" header-align="center" align="center" :required="true" label="默认值" width="200">
<template slot-scope="{row}">
<el-input :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].fieldValue" placeholder="请输入默认值"></el-input>
<el-input :ref="`${row.xh-1}` + `d`" v-model="tableData[row.xh-1].fieldValue" placeholder="请输入默认值"></el-input>
</template>
</el-table-column>
<el-table-column prop="fieldDesc" header-align="center" align="center" :required="true" label="字段描述" width="200">
<template slot-scope="{row}">
<el-input :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].fieldDesc" placeholder="请输入字段描述"></el-input>
<el-input :ref="`${row.xh-1}` + `e`" v-model="tableData[row.xh-1].fieldDesc" placeholder="请输入字段描述"></el-input>
</template>
</el-table-column>
<el-table-column prop="remark" header-align="center" align="center" :required="true" label="备注" width="200">
<template slot-scope="{row}">
<el-input :ref="`${row.xh-1}` + `c`" v-model="tableData[row.xh-1].remark" placeholder="请输入备注"></el-input>
<el-input :ref="`${row.xh-1}` + `f`" v-model="tableData[row.xh-1].remark" placeholder="请输入备注"></el-input>
</template>
</el-table-column>
</el-table>
@ -235,6 +270,57 @@
</el-footer>
</el-dialog>
<el-dialog width="730px" title="权限" :close-on-click-modal="false" :visible.sync="authorityFlag">
<el-select v-model="authorityData.tableId" placeholder="请选择数据表名" @change="tableChange3" style="width: 220px">
<el-option
v-for = "i in tableList"
:key = "i.tableId"
:label = "i.tableId"
:value = "i.tableId">
</el-option>
</el-select>
<!-- <el-table-->
<!-- :data="authorityData.fieldList"-->
<!-- border-->
<!-- :height="300"-->
<!-- style="width: 100%;">-->
<el-table
:data="authorityData.fieldList"
border
:height="300"
ref="authorityTable"
@row-click="authorityClickRow"
@selection-change="selectionAuthority"
style="width: 100%;">
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="fieldId"
header-align="center"
align="center"
min-width="200"
label="字段编码">
</el-table-column>
<el-table-column
prop="fieldName"
header-align="center"
align="center"
min-width="200"
label="字段描述">
</el-table-column>
</el-table>
<span slot="footer" class="dialog-footer">
<div style="margin-top: 5px">
<el-button type="primary" @click="saveAuthorityList">应用</el-button>
<el-button type="primary" @click="authorityFlag = false">关闭</el-button>
</div>
</span>
</el-dialog>
<!-- chooseList模态框 -->
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
@ -250,6 +336,10 @@
getNodeDetail,//
saveRequestNodeDetail,//
deleteRequestNodeDetailByLine,//
getTableList, // table
getFieldList, //
getAuthorityFieldList, //
saveAuthorityList, //
} from '@/api/processManagement/processManagement.js'
import Chooselist from '@/views/modules/common/Chooselist'
import DictDataSelect from '../sys/dict-data-select.vue'
@ -312,11 +402,25 @@
updateDate: '',
updateBy: ''
},
authorityData: {
site: this.$store.state.user.site,
bu: '',
classificationNo: '',
nodeId: '',
nodeName: '',
fieldId: '',
tableId: '',
fieldList: [],
createBy: '',
},
// ======== ========
dataList: [],
checkedDetail: [],
nodeList: [],
tableData: [],
tableList: [],
fieldList: [],
authoritySelections: [],
// ======== ========
columnList: [
{
@ -427,7 +531,6 @@
fixed: '',
columnWidth: 60
},
{
userId: this.$store.state.user.name,
functionId: 109001,
@ -684,7 +787,6 @@
},*/
],
// ======== ========
rules: {
classificationName: [
@ -725,7 +827,7 @@
subDetailFlag: false,
maintenanceFlag: false,
modalFlag: false,
authorityFlag: false
}
},
@ -738,10 +840,135 @@
},
created () {
//
this.getDataList()
},
methods: {
//
authorityClickRow (row) {
this.$refs.authorityTable.toggleRowSelection(row)
},
//
selectionAuthority (val) {
this.authoritySelections = val
},
//
authorityModal (row) {
this.authorityData = {
site: row.site,
bu: '',
classificationNo: row.classificationNo,
nodeId: row.nodeId,
nodeName: row.nodeName,
fieldId: '',
tableId: this.tableList.length > 0 ? this.tableList[0].tableId : '',
fieldList: [],
createBy: this.$store.state.user.name
}
//
this.$nextTick(() => this.$refs.authorityTable.clearSelection())
getAuthorityFieldList(this.authorityData).then(({data}) => {
if (data && data.code === 0) {
this.authorityData.fieldList = data.rows
this.authorityData.fieldList.forEach(val => {
//
if (val.updateCheck) {
this.$nextTick(() => this.$refs.authorityTable.toggleRowSelection(val, true))
}
})
} else {
this.authorityData.fieldList = []
}
})
this.authorityFlag = true
},
//
tableChange3 () {
getAuthorityFieldList(this.authorityData).then(({data}) => {
if (data && data.code === 0) {
this.authorityData.fieldList = data.rows
this.authorityData.fieldList.forEach(val => {
//
if (val.updateCheck) {
this.$nextTick(() => this.$refs.authorityTable.toggleRowSelection(val, true))
}
})
} else {
this.authorityData.fieldList = []
}
})
},
//
saveAuthorityList () {
let tempData = {
site: this.authorityData.site,
bu: '',
classificationNo: this.authorityData.classificationNo,
nodeId: this.authorityData.nodeId,
nodeName: this.authorityData.nodeName,
fieldId: '',
tableId: this.authorityData.tableId,
fieldList: this.authoritySelections,
createBy: this.$store.state.user.name
}
saveAuthorityList(tempData).then(({data}) => {
if (data && data.code === 0) {
this.$message.success( '操作成功')
} else {
this.$message.error(data.msg)
}
})
},
//
tableChange (index) {
let tempData = {
tableId: this.tableData[index].plmTable
}
getFieldList(tempData).then(({data}) => {
if (data && data.code === 0) {
this.fieldList = data.rows
} else {
this.fieldList = []
}
})
this.tableData[index].plmField = ''
},
//
tableChange2 (index) {
let tempData = {
tableId: this.tableData[index].plmTable
}
getFieldList(tempData).then(({data}) => {
if (data && data.code === 0) {
this.fieldList = data.rows
} else {
this.fieldList = []
}
})
},
// Table
getTableList (type) {
let tempData = {
tableType: type
}
getTableList(tempData).then(({data}) => {
if (data && data.code === 0) {
this.tableList = data.rows
} else {
this.tableList = []
}
})
},
// ======= =======
handleInput (value, type) {
// 04
@ -802,6 +1029,12 @@
this.requestCurrentRow = JSON.parse(JSON.stringify(row))
//
this.refreshCurrentTabTable()
this.tableList = []
this.fieldList = []
if (row.menuId === '108002') {
this.getTableList('plm_change')
}
}
},
/**
@ -823,22 +1056,40 @@
},
//
handleAddBtn () {
let obj = {}
obj.site = this.$store.state.user.site,
obj.classificationNo = this.nodeCurrentRow.classificationNo,
obj.workflowId = this.nodeCurrentRow.workflowId,
obj.nodeId = this.nodeCurrentRow.nodeId,
obj.nodeName = this.nodeCurrentRow.nodeName,
obj.createBy = this.$store.state.user.name,
obj.remark = "",
obj.plmField = "",
obj.oaField = "",
obj.fieldValue = "",
obj.fieldDesc = "",
obj.orderRef1 = "",
obj.orderRef2 = "",
obj.orderRef3 = "",
obj.orderRef4 = ""
let obj = {
site: this.$store.state.user.site,
classificationNo: this.nodeCurrentRow.classificationNo,
workflowId: this.nodeCurrentRow.workflowId,
nodeId: this.nodeCurrentRow.nodeId,
nodeName: this.nodeCurrentRow.nodeName,
createBy: this.$store.state.user.name,
remark: '',
plmField: '',
oaField: '',
fieldValue: '',
fieldDesc: '',
orderRef1: '',
orderRef2: '',
orderRef3: '',
orderRef4: '',
plmTable: '',
fieldType: 'B'
}
// obj.site = this.$store.state.user.site
// obj.classificationNo = this.nodeCurrentRow.classificationNo
// obj.workflowId = this.nodeCurrentRow.workflowId
// obj.nodeId = this.nodeCurrentRow.nodeId
// obj.nodeName = this.nodeCurrentRow.nodeName
// obj.createBy = this.$store.state.user.name
// obj.remark = ""
// obj.plmField = ""
// obj.oaField = ""
// obj.fieldValue = ""
// obj.fieldDesc = ""
// obj.orderRef1 = ""
// obj.orderRef2 = ""
// obj.orderRef3 = ""
// obj.orderRef4 = ""
this.tableData.push(obj)
},
@ -899,6 +1150,9 @@
getNodeDetail(tempData).then(({data}) => {
if (data && data.code === 0) {
this.tableData = data.rows
for (let i = 0; i < this.tableData.length; i++) {
this.tableChange2(i)
}
} else {
this.tableData = []
}
@ -1030,12 +1284,20 @@
checkDataBySubDetail(){
for (let i = 0; i < this.tableData.length; i++) {
if(this.tableData[i].plmTable === '' || this.tableData[i].plmTable == null){
this.$message.warning('序号' + (i+1) +'未选择PLM数据表,数据表为必填项!')
return
}
if(this.tableData[i].plmField === '' || this.tableData[i].plmField == null){
this.$message.warning('序号' + (i+1) +'未选择PLM字段名,字段名为必填项!')
return
}
if(this.tableData[i].oaField === '' || this.tableData[i].oaField == null){
this.$message.warning('序号' + (i+1) +'未填写OA字段名,字段名为必填项!')
return
}
if(this.tableData[i].plmField === '' || this.tableData[i].plmField == null){
this.$message.warning('序号' + (i+1) +'未填写PLM字段名,字段名为必填项!')
if(this.tableData[i].fieldType === '' || this.tableData[i].fieldType == null){
this.$message.warning('序号' + (i+1) +'未选择PLM字段类型,字段类型为必填项!')
return
}
}

298
src/views/modules/project/projectInfo/com_project_info_part.vue

@ -781,41 +781,8 @@
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4PartType',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "partType",
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: 101002001,
serialNumber: '101002001Table4PartTypeDesc',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "partTypeDesc",
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: 101002001,
serialNumber: '101002001Table4PartDesc',
@ -832,7 +799,62 @@
status: true,
fixed: '',
columnWidth: 120
},{
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4StatusDesc',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "statusDesc",
headerAlign: "center",
align: "center",
columnLabel: "物料状态",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 100
},
// {
// userId: this.$store.state.user.name,
// functionId: 101002001,
// serialNumber: '101002001Table4PartType',
// tableId: "101002001Table4",
// tableName: "",
// columnProp: "partType",
// 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: 101002001,
serialNumber: '101002001Table4PartTypeDesc',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "partTypeDesc",
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: 101002001,
serialNumber: '101002001Table4CodeNo',
@ -849,7 +871,8 @@
status: true,
fixed: '',
columnWidth: 80
},{
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4CodeDesc',
@ -866,94 +889,117 @@
status: true,
fixed: '',
columnWidth: 100
},{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4Remark',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "remark",
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: 101002001,
serialNumber: '101002001Table4CreateDate',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "createDate",
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: 101002001,
serialNumber: '101002001Table4CreateBy',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "createBy",
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: 101002001,
serialNumber: '101002001Table4UpdateDate',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "updateDate",
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: 101002001,
serialNumber: '101002001Table4UpdateBy',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "updateBy",
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: 101002001,
serialNumber: '101002001Table4Remark',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "remark",
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: 101002001,
serialNumber: '101002001Table4PlmPartNo',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "plmPartNo",
headerAlign: "center",
align: "center",
columnLabel: "PLM料号",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 120
},
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4CreateDate',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "createDate",
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: 101002001,
serialNumber: '101002001Table4CreateBy',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "createBy",
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: 101002001,
serialNumber: '101002001Table4UpdateDate',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "updateDate",
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: 101002001,
serialNumber: '101002001Table4UpdateBy',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "updateBy",
headerAlign: "center",
align: "left",
columnLabel: "修改人",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 80
},
],
dataForm:{
dataForm: {
id:'',
site: '',
projectId: '',
@ -1675,7 +1721,7 @@
this.modalDisableFlag = false
this.inventoryPartTable = 'General'
} else {
this.$message.error('获取项目物料编码失败,请重试!')
this.$message.error('获取项目物料编码失败!')
}
})
},
@ -1903,7 +1949,7 @@
this.modalDisableFlag = false
this.inventoryPartTable = 'General'
} else {
this.$message.error('获取项目物料失败,请重试!')
this.$message.error('获取项目物料编码失败!')
}
})
},

42
src/views/modules/sys/user-add-or-update.vue

@ -7,9 +7,7 @@
:visible.sync="visible"
@close="closeDataDialog">
<!-- 取消 :rules="dataRule"-->
<el-form :inline="true" :model="dataForm" label-position="top" ref="dataForm"
@keyup.enter.native="dataFormSubmit()"
label-width="80px">
<el-form :inline="true" :model="dataForm" label-position="top" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form>
<el-form-item :label="buttons.username||'用户账号'" prop="userName">
<el-input v-model="dataForm.userName" style="width: 150px;" placeholder="登录帐号"></el-input>
@ -18,8 +16,7 @@
<el-input v-model="dataForm.password" style="width: 150px;" type="password" ></el-input>
</el-form-item>
<el-form-item :label="buttons.comfirmPassword||'确认密码'" prop="comfirmPassword" :class="{ 'is-required': !dataForm.id }">
<el-input v-model="dataForm.comfirmPassword" style="width: 150px;" type="password"
></el-input>
<el-input v-model="dataForm.comfirmPassword" style="width: 150px;" type="password"></el-input>
</el-form-item>
</el-form>
<el-form>
@ -86,12 +83,14 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="buttons.domainControlAccount||'域控账号'" prop="domainControlAccount">
<el-input v-model="dataForm.domainControlAccount" style="width: 150px;" ></el-input>
</el-form-item>
</el-form>
<el-form>
<el-form-item label="角色" size="mini" prop="roleIdList">
<el-checkbox-group v-model="dataForm.roleIdList">
<el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{
role.roleName
}}
</el-checkbox>
<el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{role.roleName}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item label="状态" size="mini" prop="status">
@ -159,7 +158,8 @@ export default {
siteID: '',
bu:'',
siteName:'',
userDisplay: ''
userDisplay: '',
domainControlAccount: ''
},
buttons: {
add: '添加',
@ -181,6 +181,7 @@ export default {
siteID: '工厂',
siteName:'工厂名称',
language: '语言',
domainControlAccount: '域控账号'
},
}
},
@ -314,6 +315,7 @@ export default {
this.dataForm.departmentName = data.user.departmentName
this.dataForm.post = data.user.post
this.dataForm.postNo = data.user.postNo
this.dataForm.domainControlAccount = data.user.domainControlAccount
this.getBDPList()
}
})
@ -328,19 +330,20 @@ export default {
salt: '',
email: '',
mobile: '',
bu:'',
department:'',
departmentNo:'',
departmentName:'',
post:'',
postNo:'',
postName:'',
bu: '',
department: '',
departmentNo: '',
departmentName: '',
post: '',
postNo: '',
postName: '',
roleIdList: [],
status: 1,
site: '',
siteID: '',
siteName:'',
userDisplay: ''
siteName: '',
userDisplay: '',
domainControlAccount: ''
}
}
})
@ -367,6 +370,7 @@ export default {
'buNo': this.dataForm.buNo,
'departmentNo': this.dataForm.departmentNo,
'postNo': this.dataForm.postNo,
'domainControlAccount': this.dataForm.domainControlAccount
})
}).then(({data}) => {
if (data && data.code === 0) {

Loading…
Cancel
Save