Browse Source

plm BMM

master
ruanqi 1 year ago
parent
commit
11bd8abf41
  1. 27
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  2. 29
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  3. 27
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
  4. 27
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
  5. 30
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  6. 8
      src/views/modules/sampleManagement/technicalSpecificationList.vue
  7. 1
      src/views/modules/tooling/searchToolApply.vue

27
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue

@ -18,7 +18,7 @@
<el-button type="primary" v-if="!ifDisableFlag" @click="changeBomRev()" >变更</el-button>
<el-button type="primary" @click="jumpBom()" >跳转至BOM</el-button>
<el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
<!-- <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>-->
</el-form-item>
@ -119,7 +119,18 @@
<el-button type="primary" @click="modalFlag=false">取消</el-button>
</el-footer>
</el-dialog>
<!-- 提交 -->
<el-dialog title="驳回" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="submitModalFlag" width="500px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'驳回意见'">
<el-input type="textarea" v-model="rejectOpinion" :rows="3" resize='none' show-word-limit style="width: 479px;height: 30px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:30px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="rejectSubmit">确定</el-button>
<el-button type="primary" @click="submitModalFlag = false">取消</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -370,7 +381,8 @@
ifDisableFlag:false,
rejectOpinion: '',
submitModalFlag: false,
}
},
mounted () {
@ -556,7 +568,8 @@
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
menuId: '103002',
nodeConclusion: 'N'
nodeConclusion: 'N',
rejectOpinion : this.rejectOpinion
}
this.submitData(tempData)
})
@ -564,6 +577,7 @@
submitData (tempData) {
submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.submitModalFlag = false
this.$message({message: '操作成功', type: 'success'})
} else {
this.$alert(data.msg, '错误', {
@ -573,6 +587,11 @@
})
},
//
submitDataModal () {
this.rejectOpinion = ''
this.submitModalFlag = true
},
},
}
</script>

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

@ -4,7 +4,7 @@
<el-button type="primary" @click="refresh()" >刷新数据</el-button>
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
<el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-row :gutter="20">
@ -160,7 +160,18 @@
<el-form label-position="top" style="margin-top: 60px; margin-left: 0px;text-align:center">
<!-- <el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>-->
</el-form>
<!-- 提交 -->
<el-dialog title="驳回" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="submitModalFlag" width="500px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'驳回意见'">
<el-input type="textarea" v-model="rejectOpinion" :rows="3" resize='none' show-word-limit style="width: 479px;height: 30px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:30px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="rejectSubmit">确定</el-button>
<el-button type="primary" @click="submitModalFlag = false">取消</el-button>
</el-footer>
</el-dialog>
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
</div>
</template>
@ -229,7 +240,9 @@
trigger: 'change'
}
],
}
},
rejectOpinion: '',
submitModalFlag: false,
}
},
methods: {
@ -378,7 +391,11 @@
this.submitData(tempData)
})
},
//
submitDataModal () {
this.rejectOpinion = ''
this.submitModalFlag = true
},
//
rejectSubmit () {
this.$confirm(`是否确认驳回?`, '提示', {
@ -391,7 +408,8 @@
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
menuId: '103002',
nodeConclusion: 'N'
nodeConclusion: 'N',
rejectOpinion : this.rejectOpinion
}
this.submitData(tempData)
})
@ -402,6 +420,7 @@
if (data && data.code === 0) {
submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.submitModalFlag = false
this.$message({message: '操作成功', type: 'success'})
} else {
this.$alert(data.msg, '错误', {

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

@ -12,7 +12,7 @@
<el-button type="primary" @click="searchTable()" >刷新数据</el-button>
<el-button type="primary" @click="saveTable()" v-if="!ifDisableFlag">保存数据</el-button>
<el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form-item>
<div class="rq ">
<el-table
@ -87,7 +87,18 @@
</el-table>
</div>
</el-form>
<!-- 提交 -->
<el-dialog title="驳回" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="submitModalFlag" width="500px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'驳回意见'">
<el-input type="textarea" v-model="rejectOpinion" :rows="3" resize='none' show-word-limit style="width: 479px;height: 30px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:30px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="rejectSubmit">确定</el-button>
<el-button type="primary" @click="submitModalFlag = false">取消</el-button>
</el-footer>
</el-dialog>
</div>
</template>
@ -129,6 +140,8 @@
status:'',
isReject:'',
},
rejectOpinion: '',
submitModalFlag: false,
}
},
mounted () {
@ -289,7 +302,11 @@
this.submitData(tempData)
})
},
//
submitDataModal () {
this.rejectOpinion = ''
this.submitModalFlag = true
},
//
rejectSubmit () {
this.$confirm(`是否确认驳回?`, '提示', {
@ -302,7 +319,8 @@
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
menuId: '103002',
nodeConclusion: 'N'
nodeConclusion: 'N',
rejectOpinion : this.rejectOpinion
}
this.submitData(tempData)
})
@ -313,6 +331,7 @@
if (data && data.code === 0) {
submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.submitModalFlag = false
this.$message({message: '操作成功', type: 'success'})
this.$emit("closeModel")
} else {

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

@ -15,7 +15,7 @@
<el-form-item label=" ">
<el-button type="primary" @click="updateBMProcess()" v-if="!ifDisableFlag">保存</el-button>
<el-button v-if="baseForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
<el-button v-if="baseForm.status === 'spz' && baseForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form-item>
</el-form>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;" v-if="searchData.buNo=='RDC'">
@ -429,7 +429,18 @@
</el-footer>
</el-dialog>
<ChooseUser ref="baseList" @getBaseData="getBaseData"></ChooseUser>
<!-- 提交 -->
<el-dialog title="驳回" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="submitModalFlag" width="500px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'驳回意见'">
<el-input type="textarea" v-model="rejectOpinion" :rows="3" resize='none' show-word-limit style="width: 479px;height: 30px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:30px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="rejectSubmit">确定</el-button>
<el-button type="primary" @click="submitModalFlag = false">取消</el-button>
</el-footer>
</el-dialog>
</div>
</template>
@ -866,6 +877,8 @@
currentRoute:null,
tagNo:'',
tagNo1:'',
rejectOpinion: '',
submitModalFlag: false,
}
},
mounted () {
@ -1450,7 +1463,11 @@
}
})
},
//
submitDataModal () {
this.rejectOpinion = ''
this.submitModalFlag = true
},
//
agreeSubmit () {
this.$confirm(`是否确认提交?`, '提示', {
@ -1481,7 +1498,8 @@
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
menuId: '103002',
nodeConclusion: 'N'
nodeConclusion: 'N',
rejectOpinion : this.rejectOpinion
}
this.submitData(tempData)
})
@ -1511,6 +1529,7 @@
})
await submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.submitModalFlag = false
this.$message({message: '操作成功', type: 'success'})
} else {
this.$alert(data.msg, '错误', {

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

@ -4,7 +4,7 @@
<el-button type="primary" @click="refresh()" >刷新数据</el-button>
<el-button type="primary" @click="saveData()" v-if="!ifDisableFlag">保存</el-button>
<el-button v-if="dataForm.status === 'spz'&&!ifDisableFlag" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="rejectSubmit">驳回</el-button>
<el-button v-if="dataForm.status === 'spz' && dataForm.isReject === 'Y' &&!ifDisableFlag" type="primary" @click="submitDataModal">驳回</el-button>
</el-form>
<el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
<el-row :gutter="20">
@ -232,6 +232,19 @@
</el-dialog>
<ChooseUser ref="baseList" @getBaseData="getBaseData"></ChooseUser>
<!-- 提交 -->
<el-dialog title="驳回" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="submitModalFlag" width="500px">
<el-form :inline="true" label-position="top">
<el-form-item :label="'驳回意见'">
<el-input type="textarea" v-model="rejectOpinion" :rows="3" resize='none' show-word-limit style="width: 479px;height: 30px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:30px;margin-top: 50px;text-align:center">
<el-button type="primary" @click="rejectSubmit">确定</el-button>
<el-button type="primary" @click="submitModalFlag = false">取消</el-button>
</el-footer>
</el-dialog>
</div>
</template>
@ -326,7 +339,9 @@
trigger: 'change'
}
],
}
},
rejectOpinion: '',
submitModalFlag: false,
}
},
methods: {
@ -695,6 +710,13 @@
})
},
//
submitDataModal () {
this.rejectOpinion = ''
this.submitModalFlag = true
},
//
rejectSubmit () {
this.$confirm(`是否确认驳回?`, '提示', {
@ -707,7 +729,8 @@
userName: this.$store.state.user.name,
codeNo: this.searchData.codeNo,
menuId: '103002',
nodeConclusion: 'N'
nodeConclusion: 'N',
rejectOpinion : this.rejectOpinion
}
this.submitData(tempData)
})
@ -718,6 +741,7 @@
if (data && data.code === 0) {
submitChange(tempData).then(({data}) => {
if (data && data.code === 0) {
this.submitModalFlag = false
this.$message({message: '操作成功', type: 'success'})
} else {
this.$alert(data.msg, '错误', {

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

@ -1,6 +1,9 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
<el-form-item label="BU">
<bu-select v-model="searchData.buNo" style="width: 120px"></bu-select>
</el-form-item>
<el-form-item :label="'参数卡编码'">
<el-input v-model="searchData.oriCodeNo" style="width: 130px"></el-input>
</el-form-item>
@ -321,10 +324,12 @@
} from "@/api/sampleManagement/technicalSpecificationList.js"
import Chooselist from '@/views/modules/common/Chooselist'
import AddOrUpdate from './com_technical-add-or-update'
import BuSelect from "../base/BuSelect.vue";
export default {
components: {
Chooselist,
AddOrUpdate,
BuSelect,
},
data() {
return {
@ -336,11 +341,12 @@
page: 1,
limit: 100,
site: this.$store.state.user.site,
username: this.$store.state.user.name,
userName: this.$store.state.user.name,
testPartNo: '',
oriCodeNo: '',
statusDesc: '',
codeNo:'',
buNo:'',
},
pageIndex: 1,
pageSize: 100,

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

@ -410,6 +410,7 @@
import ApprovalInformation from "../changeManagement/approvalInformation.vue";
import OssComponents from "../oss/ossComponents";
import DictDataSelect from "../sys/dict-data-select.vue"
/*組件*/
export default {
components: {

Loading…
Cancel
Save