Browse Source

plm BM

master
ruanqi 2 years ago
parent
commit
02d6422754
  1. 1
      src/api/base/site.js
  2. 1
      src/api/sampleManagement/technicalSpecificationList.js
  3. 11
      src/assets/scss/rq.scss
  4. 45
      src/views/main-navbar.vue
  5. 6
      src/views/modules/changeManagement/changeRecord.vue
  6. 9
      src/views/modules/proofing/requestForProofing.vue
  7. 17
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  8. 20
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  9. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
  10. 41
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
  11. 38
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

1
src/api/base/site.js

@ -75,3 +75,4 @@ export const searchAccessRoleList = data => createAPI(`/base/searchAccessRoleLis
export const searchWorkCenterBMType= data => createAPI(`/properties/searchWorkCenterBMType`,'post',data)
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)

1
src/api/sampleManagement/technicalSpecificationList.js

@ -97,3 +97,4 @@ export const updateBMRouteRev= data => createAPI(`/technicalSpecification/update
export const searchBMRemarkPage= data => createAPI(`/technicalSpecification/searchBMRemarkPage`,'post',data)
export const updateBMRemarkPage= data => createAPI(`/technicalSpecification/updateBMRemarkPage`,'post',data)
export const updateBMProcess= data => createAPI(`/technicalSpecification/updateBMProcess`,'post',data)

11
src/assets/scss/rq.scss

@ -66,3 +66,14 @@
display: flex;
justify-content: center; /* 水平居中 */
}
.superInput {
border-bottom: 1px solid #00fff7; /* 下划线样式 */
font-weight: bold; /* 加粗文字 */
color: #00fff7; /* 文字颜色 */
}
.blue-input .el-input__inner {
font-weight: bold;
color: dodgerblue;
}

45
src/views/main-navbar.vue

@ -22,7 +22,7 @@
class="site-navbar__menu site-navbar__menu--right"
mode="horizontal">
<el-menu-item class="site-navbar__avatar" index="2">
<span>{{siteNow}}</span>
<span @click="siteModel()">{{siteNow}}</span>
</el-menu-item>
<el-menu-item class="site-navbar__avatar" index="0">
<span @click="favoriteFunction()">
@ -79,7 +79,23 @@
<update-language v-if="updateLanguageVisible" ref="updateLanguage"></update-language>
<!-- 文件列表 -->
<FileListView ref="fileListView" v-if="helpFileVisible"></FileListView>
<el-dialog title="变更工厂" :close-on-click-modal="false" v-drag :visible.sync="siteFlag" width="200px" :modal="false">
<el-form :inline="true" label-position="top" style="margin-left: 24px">
<el-form-item :label="'当前账号'">
<el-input v-model="$store.state.user.name" disabled style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'工厂'">
<el-select filterable v-model="site" style="width: 130px" clearable>
<el-option :label="item.siteName" :value="item.siteID" v-for="(item,index) in siteList "
:key="index"></el-option>
</el-select>
</el-form-item>
</el-form>
<el-footer style="height:30px;margin-top: 5px;text-align:center">
<el-button type="primary" @click="changeSite">确定</el-button>
<el-button type="primary" @click="siteFlag = false">取消</el-button>
</el-footer>
</el-dialog>
<!-- 动态列 -->
<column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
@ -102,6 +118,7 @@ import {
import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
import {
getSiteData,
getUserAccessSite,
} from "@/api/base/site.js"
export default {
inject: ['refresh'],
@ -114,7 +131,9 @@ export default {
updatePassowrdVisible: false,
updateLanguageVisible: false,
helpFileVisible: false,
site:'',
siteList:'',
siteFlag:false,
message: this.$t('language.name'),
languageList: [],
pageLanguage: {
@ -413,7 +432,25 @@ export default {
}
}
})
}
},
siteModel(){
this.site=this.$store.state.user.site
getUserAccessSite({username:this.$store.state.user.name}).then(({data})=>{
this.siteList=data.rows
})
this.siteFlag=true
},
changeSite(){
// 2
this.$store.commit('user/updateSite', this.site)
localStorage.setItem('accessSite', this.site)
this.siteFlag=false
this.getNowSite()
this.$nextTick(function () {
// DOM
window.location.reload()
});
},
},
created() {
this.getLanguageList()

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

@ -1469,6 +1469,7 @@
},
created () {
this.getDataList()
this.getEcnModel()
},
@ -1665,6 +1666,11 @@
//
getDataList () {
if(localStorage.getItem('ecnData')!=undefined){
let data=JSON.parse(localStorage.getItem('ecnData'));
this.searchData.changeNo=data.ecnNo
localStorage.removeItem('ecnData');
}
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
changeRecordSearch(this.searchData).then(({data}) => {

9
src/views/modules/proofing/requestForProofing.vue

@ -2,6 +2,9 @@
<div class="mod-config">
<!-- 查询条件 -->
<el-form :inline="true" label-position="top" :model="searchData" @keyup.enter.native="getDataList()">
<el-form-item :label="'打样单号'">
<el-input v-model="searchData.proofingNo" clearable style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'客户编码'">
<el-input v-model="searchData.customerNo" clearable style="width: 120px"></el-input>
</el-form-item>
@ -1033,6 +1036,7 @@
projectName: '',
engineerName: '',
priorityLevel: '',
proofingNo:'',
page: 1,
limit: 10
},
@ -2025,6 +2029,11 @@
* 获取数据列表
*/
getDataList () {
if(localStorage.getItem('proofingData')!=undefined){
let data=JSON.parse(localStorage.getItem('proofingData'));
this.searchData.proofingNo=data.proofingNo
localStorage.removeItem('proofingData');
}
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
proofingInformationSearch(this.searchData).then(({data}) => {

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

@ -10,6 +10,9 @@
<span slot="label" style="" @click="chooseProofingModel()"><a herf="#">打样单号</a></span>
<el-input v-model="dataForm.proofingNo" style="width: 130px" @change="changeProofingNoChange" :disabled="dataForm.id!=0"></el-input>
</el-form-item>
<el-form-item label=" " >
<el-checkbox v-model="jumpFlag">保存后跳转至详情</el-checkbox>
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
<el-form-item prop="testPartNo" :rules="dataRole.testPartNo">
@ -181,6 +184,7 @@
},
data () {
return {
jumpFlag:false,
tagNo:'',
tagNo1:'',
visible: false,
@ -316,6 +320,7 @@
}
},
init (id) {
this.jumpFlag=false
this.dataForm.id = id || 0
if(this.dataForm.id!=0){
let inData={
@ -511,6 +516,18 @@
this.$message.success( '操作成功')
this.visible = false
this.$emit('refreshDataList')
if(this.jumpFlag){
this.$nextTick(function () {
let inData={
site:this.$store.state.user.site,
codeNo:data.row.codeNo,
buNo:data.row.buNo,
username:this.$store.state.user.name};
localStorage.setItem('tsfData', JSON.stringify(inData))
window.open('#/BMPage');
})
}
} else {
this.$message.error(data.msg)
}

20
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue

@ -12,16 +12,16 @@
<el-input v-model="dataForm.finalCustomerDesc" disabled ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'直接客户/Direct Customer'" >
<el-input v-model="dataForm.directCustomerNo" disabled ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'客户名称'">
<el-input v-model="dataForm.directCustomerDesc" disabled ></el-input>
</el-form-item>
</div></el-col>
<!-- <el-col :span="6"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'直接客户/Direct Customer'" >-->
<!-- <el-input v-model="dataForm.directCustomerNo" disabled ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<!-- <el-col :span="6"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'客户名称'">-->
<!-- <el-input v-model="dataForm.directCustomerDesc" disabled ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
</el-row>
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue

@ -135,7 +135,9 @@
}
//this.searchData.type= JSON.parse(JSON.stringify(this.type));
//
this.$nextTick(()=>{this.searchTable();} )
this.$nextTick(()=>{
this.searchTable();
} )
},

41
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue

@ -1,5 +1,13 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" style="margin-top: 1px; margin-left: 0px;" >
<el-form-item label="Process">
<el-input v-model="process" style="width: 520px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="updateBMProcess()" >保存</el-button>
</el-form-item>
</el-form>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo=='RDC'">
<el-row :gutter="20" >
<el-col :span="24"><div class="grid-content bg-purple">
@ -415,6 +423,8 @@
searchBMRoute,
searchRouteDetail,
updateBMRouteRev,
tsdBasicInformationSearch,
updateBMProcess,
} from "@/api/sampleManagement/technicalSpecificationList.js"
import Chooselist from '@/views/modules/common/Chooselist'
import {
@ -479,6 +489,7 @@
tableData:'',
partList:[],
ifDisableFlag:false,
process:"",
dataForm:{
site: '',
codeNo:'',
@ -858,6 +869,14 @@
},
searchTable(){
tsdBasicInformationSearch(this.searchData).then(({data}) => {
if(data.row){
this.process=data.row.process
}else {
}
});
if(this.searchData.buNo==='RDC'){
searchBMRoutingDetail(this.searchData).then(({data}) => {
if(data.rows.length>0){
@ -1240,6 +1259,28 @@
getRow(row){
this.currentRoute=row
},
updateBMProcess(){
let inData={
site:this.searchData.site,
codeNo:this.searchData.codeNo,
process:this.process
}
updateBMProcess(inData).then(({data}) => {
if (data && data.code === 0) {
tsdBasicInformationSearch(this.searchData).then(({data}) => {
if(data.row){
this.process=data.row.process
}else {
}
});
this.$message.success('操作成功')
} else {
this.$message.error(data.msg)
}
})
},
updateBMRouteRev(){
if(this.currentRoute==null){
this.$alert('请点击选择Route版本!', '错误', {

38
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue

@ -48,12 +48,12 @@
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'Process'">
<el-input v-model="dataForm.workCenterNo" readonly style="" ></el-input>
<el-input v-model="dataForm.process" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'ECN Number'">
<el-input v-model="dataForm.ecnNo" readonly style="" ></el-input>
<el-input @focus="jumpPage('A')" class="blue-input" v-model="dataForm.ecnNo" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
<el-col :span="12"><div class="grid-content bg-purple">
@ -65,14 +65,17 @@
<el-row :gutter="20">
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'ECN是否需要变更图纸'">
<el-input v-model="dataForm.ecnFlag" style="" ></el-input>
</el-form-item>
</div></el-col>
<!-- <el-col :span="6"><div class="grid-content bg-purple">-->
<!-- <el-form-item :label="'ECN是否需要变更图纸'">-->
<!-- <el-input v-model="dataForm.ecnFlag" style="" ></el-input>-->
<!-- </el-form-item>-->
<!-- </div></el-col>-->
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'Production Stage'">
<el-input v-model="dataForm.stage" :disabled="ifDisableFlag" style="" ></el-input>
<el-select v-model="dataForm.stage" :disabled="ifDisableFlag">
<el-option label="Sample" value="Sample"></el-option>
<el-option label="MassProduction" value="N"></el-option>
</el-select>
</el-form-item>
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
@ -82,7 +85,7 @@
</div></el-col>
<el-col :span="6"><div class="grid-content bg-purple">
<el-form-item :label="'Sample Application No'">
<el-input v-model="dataForm.proofingNo" disabled style="" ></el-input>
<el-input @focus="jumpPage('B')" class="blue-input" v-model="dataForm.proofingNo" readonly style="" ></el-input>
</el-form-item>
</div></el-col>
</el-row>
@ -190,6 +193,7 @@
engineerList:[],
technicianList:[],
dataForm:{
process:'',
site: '',
codeNo:'',
revNo:'',
@ -398,6 +402,22 @@
return
})
},
jumpPage(type){
if(type==="A"&& this.dataForm.ecnNo!==null&&this.dataForm.ecnNo!==''){
let inData={
ecnNo:this.dataForm.ecnNo
}
localStorage.setItem('ecnData', JSON.stringify(inData))
window.open('#/changeManagement-changeRecord');
}
if(type==="B"&& this.dataForm.proofingNo!==null&&this.dataForm.proofingNo!==''){
let inData={
proofingNo:this.dataForm.proofingNo
}
localStorage.setItem('proofingData', JSON.stringify(inData))
window.open('#/proofing-requestForProofing');
}
}
},
}
</script>

Loading…
Cancel
Save