Browse Source

plm BMM

master
ruanqi 1 year ago
parent
commit
1299a58fe7
  1. 2
      src/api/sampleManagement/technicalSpecificationList.js
  2. 12
      src/views/modules/project/projectInfo/com_project_toolApplyCation.vue
  3. 18
      src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue
  4. 9
      src/views/modules/sampleManagement/com_technical-add-or-update.vue
  5. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  6. 7
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
  7. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  8. 104
      src/views/modules/sampleManagement/technicalSpecificationList.vue
  9. 44
      src/views/modules/tooling/searchToolApply.vue

2
src/api/sampleManagement/technicalSpecificationList.js

@ -123,3 +123,5 @@ export const getFinalPartData= data => createAPI(`/technicalSpecification/getFin
export const getOADetailForBM= data => createAPI(`/technicalSpecification/getOADetailForBM`,'post',data)
export const searchCopyPart= data => createAPI(`/technicalSpecification/searchCopyPart`,'post',data)

12
src/views/modules/project/projectInfo/com_project_toolApplyCation.vue

@ -36,7 +36,7 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<div v-if="item.columnProp === 'quotationNo'">
<div v-if="item.columnProp === 'applyNo'">
<el-link v-if="!item.columnHidden" @click="handleClick(scope.row)">{{ scope.row[item.columnProp] }}</el-link>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
@ -431,10 +431,16 @@
return s
},
handleClick(row){
if (this.$router.resolve(`/quotation-requestForQuote`).resolved.name === '404'){
if (this.$router.resolve(`/tooling-searchToolApply`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`quotation-requestForQuote`,params:{quotationNo:row.quotationNo},})
let inData = {
site: this.$store.state.user.site,
applyNo: row.applyNo,
username: this.$store.state.user.name
};
localStorage.setItem('ToolApplyData', JSON.stringify(inData))
this.$router.push({name:`tooling-searchToolApply`})
}
}
},

18
src/views/modules/project/projectPart/com_projectPart_technicalSpecification.vue

@ -36,9 +36,14 @@
: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>
<div v-if="item.columnProp === 'codeNo'">
<el-link style="cursor:pointer;" v-if="!item.columnHidden" @click="handleClick(scope.row)"> {{ scope.row[item.columnProp] }}</el-link>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</div>
<div v-else>
<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>
</div>
</template>
</el-table-column>
<!-- <el-table-column-->
@ -449,6 +454,13 @@
return s
},
handleClick(row){
if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404'){
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',});
}else {
this.$router.push({name:`sampleManagement-technicalSpecificationList`,params:{codeNo:row.codeNo?row.codeNo:' '},})
}
}
},
}
</script>

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

@ -252,7 +252,7 @@
</el-table>
</el-dialog>
<el-dialog
width="700px"
width="750px"
title="选择物料"
:close-on-click-modal="false"
:visible.sync="partModelFlag">
@ -318,6 +318,13 @@
min-width="120"
label="物料名称">
</el-table-column>
<el-table-column
prop="buNo"
header-align="center"
align="left"
min-width="70"
label="BU">
</el-table-column>
</el-table>
</el-dialog>

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

@ -333,9 +333,7 @@
searchBMcustomerInfo(this.searchData).then(({data}) => {
if(data.rows.length>0){
this.dataForm = data.rows[0];
this.$alert('操作成功', '成功', {
confirmButtonText: '确定'
})
this.$message.success( '操作成功')
}else {
this.dataForm.site=this.searchData.site
this.dataForm.codeNo=this.searchData.codeNo

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

@ -198,6 +198,13 @@
searchBMPropertiesValue(this.searchData).then(({data}) => {
this.tableData = data.rows;
this.$message({
message: '操作成功',
type: 'success',
duration: 1500,
onClose: () => {
}
})
});
searchBMPropertiesHeaderForBM(this.searchData).then(({data}) => {
// this.searchData.propertiesCodeNo = data.row.propertiesCodeNo;

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

@ -508,9 +508,7 @@
if (data && data.code == 0) {
this.getNodeAuthority(data.row)
this.dataForm = data.row
this.$alert('操作成功', '成功', {
confirmButtonText: '确定'
})
this.$message.success( '操作成功')
let inData = {
site: this.dataForm.site,
codeNo: this.dataForm.codeNo,

104
src/views/modules/sampleManagement/technicalSpecificationList.vue

@ -70,6 +70,7 @@
<!-- <a type="text" size="small" @click="addOrUpdateHandle(scope.row.id)" v-if="scope.row.statusDesc!=='已完成'">修改</a>-->
<a type="text" size="small" @click="deleteData(scope.row)" v-if="scope.row.statusDesc!=='已完成'&&scope.row.statusDesc!=='已升版'">删除</a>
<a type="text" size="small" v-if="scope.row.status === 'cg'" @click="issueModal(scope.row)">下达</a>
<!-- <a type="text" size="small" @click="copyBM(scope.row)">拷贝</a>-->
</template>
</el-table-column>
</el-table>
@ -320,7 +321,79 @@
<el-button type="primary" @click="revNoFlag = false">{{'关闭'}}</el-button>
</el-form>
</el-dialog>
<el-dialog
width="750px"
title="选择物料"
:close-on-click-modal="false"
:visible.sync="partModelFlag">
<el-form :inline="true" label-position="top" label-width="100px" >
<el-form-item style="margin-left: 0px" label="技术参数卡">
<el-input v-model="copyData.oriCodeNo" style="width: 130px" disabled ></el-input>
</el-form-item>
<el-form-item style="margin-left: 0px" label="版本">
<el-input v-model="copyData.revNo" style="width: 130px" disabled ></el-input>
</el-form-item>
<el-form-item style="margin-left: 0px" label="项目料号">
<el-input v-model="copyData.testPartNo" style="width: 130px" disabled ></el-input>
</el-form-item>
<el-form-item style="margin-left: 0px" label="项目编码">
<el-input v-model="copyData.projectId" style="width: 130px" disabled ></el-input>
</el-form-item>
</el-form>
<el-table
height="450"
:data="partList"
border
@row-dblclick="choosePartNo"
style="width: 100%;">
<el-table-column
prop="finalPartNo"
header-align="center"
align="left"
min-width="120"
style="font-size: 20px"
label="正式料号">
</el-table-column>
<el-table-column
prop="testPartNo"
header-align="center"
align="left"
min-width="120"
style="font-size: 20px"
label="项目料号">
</el-table-column>
<el-table-column
prop="projectId"
header-align="center"
align="left"
min-width="120"
style="font-size: 20px"
label="项目编码">
</el-table-column>
<el-table-column
prop="customerPartNo"
header-align="center"
align="left"
min-width="120"
label="客户料号">
</el-table-column>
<el-table-column
prop="partDesc"
header-align="center"
align="left"
min-width="120"
label="物料名称">
</el-table-column>
<el-table-column
prop="buNo"
header-align="center"
align="left"
min-width="70"
label="BU">
</el-table-column>
</el-table>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -332,6 +405,7 @@
deleteTechnicalSpecificationList,
upBMRevNo,
issueChange, //
searchCopyPart,
} from "@/api/sampleManagement/technicalSpecificationList.js"
import Chooselist from '@/views/modules/common/Chooselist'
import AddOrUpdate from './com_technical-add-or-update'
@ -357,6 +431,17 @@
addOrUpdateVisible:false,
height:200,
dataList1: [],
partList:[],
copyData:{
site:'',
codeNo:'',
oriCodeNo:'',
testPartNo:'',
projectId:'',
revNo:'',
newPartNo:'',
},
partModelFlag:false,
searchData: {
page: 1,
limit: 100,
@ -819,6 +904,7 @@
if(this.dataList1.length>0){
this.$refs.mainTable.setCurrentRow(this.dataList1[0]);
this.changeData(this.dataList1[0])
this.jumpDetail(this.dataList1[0])
}
}
this.dataListLoading = false
@ -1064,6 +1150,24 @@
})
}
},
copyBM(row){
this.copyData={
site:row.site,
codeNo:row.codeNo,
oriCodeNo:row.oriCodeNo,
testPartNo:row.testPartNo,
projectId:row.projectId,
revNo:row.revNo,
newPartNo:'',
}
searchCopyPart(this.copyData).then(({data}) => {
if (data.code == 0) {
this.partList=data.rows
}
this.dataListLoading = false
})
this.partModelFlag=true
},
},
}
</script>

44
src/views/modules/tooling/searchToolApply.vue

@ -332,9 +332,9 @@
</el-form>
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="saveData()">{{'保存'}}</el-button>
<el-button type="primary" @click="visibleU = false">{{'取消'}}</el-button>
<span slot="footer" class="dialog-footer" style="height: 40px">
<el-button type="primary" @click="saveData()" class="bigButton">{{'保存'}}</el-button>
<el-button type="primary" @click="visibleU = false" class="bigButton">{{'取消'}}</el-button>
</span>
</el-dialog>
@ -396,7 +396,7 @@
</el-form>
<el-tabs style="font-size: 12px;min-height: 330px;margin-top: 60px" class="customer-tab" v-model="activeModelName" type="border-card" >
<el-tab-pane label="工具明细" name="detail">
<div class="rq" style="margin-top: 60px">
<div class="rq" style="margin-top: 0px">
<el-table
height="250"
:data="toolData"
@ -478,7 +478,7 @@
</el-form>
</el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<span slot="footer" class="dialog-footer" style="height: 40px">
<!-- <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>-->
<el-button type="primary" @click="visible = false" class="bigButton">{{'取消'}}</el-button>
<el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>
@ -2068,36 +2068,8 @@
}
</script>
<style >
.el-transfer-panel {
border: 2px solid #17b3a3;
border-radius: 4px;
overflow: hidden;
background: #fff;
display: inline-block;
vertical-align: middle;
width: 200px;
max-height: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
position: relative;
}
.el-transfer-panel .el-transfer-panel__header {
height: 40px;
line-height: 40px;
background: #17b3a3;
margin: 0;
padding-left: 15px;
border-bottom: 1px solid #17b3a3;
-webkit-box-sizing: border-box;
box-sizing: border-box;
color: #000;
}
.el-transfer-panel .el-transfer-panel__header .el-checkbox .el-checkbox__label {
font-size: 14px;
color: #303133;
font-weight: 400;
<style scoped>
/deep/ .el-dialog__footer{
height: 50px !important;
}
</style>
Loading…
Cancel
Save