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

2025-05-13 

优化
master
fengyuan_yang 8 months ago
parent
8683137f10
commit
3547cdb930
9 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/views/modules/changeManagement/changeRecord.vue
  2. 2
      src/views/modules/proofing/requestForProofing.vue
  3. 2
      src/views/modules/quotation/requestForQuote.vue
  4. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  5. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  6. 8
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
  7. 4
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
  8. 2
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
  9. 4
      src/views/modules/test/requestForTest.vue

8
src/views/modules/changeManagement/changeRecord.vue
View File

@ -285,7 +285,7 @@
</el-form>
</div>
<el-footer style="height:25px;text-align:center">
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -392,7 +392,7 @@
</el-form>
</div>
<el-footer style="height:25px;text-align:center">
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -550,7 +550,7 @@
</div>
</div>
<el-footer style="height:25px;text-align:center">
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
@ -612,7 +612,7 @@
</div>
</div>
<el-footer style="height:25px;text-align:center">
<template v-if="modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2)">
<template v-if="modalData.changeStatus === '草稿' || (modalData.createBy2 && modalData.createBy2.split(';').includes(createBy2) && modalData.changeStatus === '审批中')">
<el-button type="primary" :loading="saveLoading" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>

2
src/views/modules/proofing/requestForProofing.vue
View File

@ -354,7 +354,7 @@
layout="total, sizes, prev, pager, next, jumper">
</el-pagination>
<el-footer style="height:30px;text-align:center;margin-top: 8px">
<template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
<template v-if="modalData.proofingStatus === '草稿' || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name) && modalData.proofingStatus === '审批中')">
<el-button type="primary" @click="saveData()">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>

2
src/views/modules/quotation/requestForQuote.vue
View File

@ -389,7 +389,7 @@
</el-tabs>
</el-form>
<el-footer style="height:35px;margin-top: 10px;padding-bottom:5px;text-align:center">
<template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
<template v-if="modalData.quotationStatus === '草稿' || (modalData.quotationStatus === '审批中' && modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name))">
<el-button type="primary" v-if="!detailVisible" @click="saveData">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
View File

@ -17,8 +17,8 @@
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable(true)" >刷新</el-button>
<el-button type="primary" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username)) || superAdmin)" @click="changeBomRev()">变更</el-button>
<el-button type="primary" @click="jumpBom()" >跳转至BOM</el-button>
<el-button type="primary" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin)" @click="changeBomRev()">变更</el-button>
<el-button type="primary" @click="jumpBom()">跳转至BOM</el-button>
<el-button v-if="baseForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && ((baseForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="submitDataModal">驳回</el-button>
<!-- <el-button type="primary" @click="newData()" v-if="!ifDisableFlag">新增</el-button>-->

2
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
View File

@ -5,7 +5,7 @@
<el-col :span="18">
<el-form-item label=" " style="width: 100%">
<el-button type="primary" @click="refresh()" >刷新数据</el-button>
<el-button type="primary" @click="saveData()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username)) || (superAdmin)">保存数据</el-button>
<el-button type="primary" @click="saveData()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin">保存数据</el-button>
<el-button v-if="baseForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && ((baseForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="submitDataModal">驳回</el-button>
</el-form-item>

8
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
View File

@ -1,18 +1,18 @@
<template>
<div class="mod-config" v-highlight-container>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 1px; margin-left: 0px;" >
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 1px; margin-left: 0px;" >
<!-- <el-form-item :label="'技术参数卡编码'">-->
<!-- <el-input v-model="searchData.oriCodeNo" readonly style="width: 150px" ></el-input>-->
<!-- </el-form-item>-->
<el-row :gutter="20">
<el-col :span="18">
<el-form-item :label="'属性模板编码'">
<el-input v-model="searchData.propertiesCodeNo" readonly style="width: 150px" ></el-input>
<el-input v-model="searchData.propertiesCodeNo" readonly style="width: 150px"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag && isAuth('103002:bmModel')">更新模板</el-button>
<el-button type="primary" @click="refreshBMPageModal()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin">更新模板</el-button>
<el-button type="primary" @click="searchTable()">刷新数据</el-button>
<el-button type="primary" @click="saveTable()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username)) || (superAdmin)">保存数据</el-button>
<el-button type="primary" @click="saveTable()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin">保存数据</el-button>
<template v-if="defaultValue">
<el-button v-if="baseForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && (( baseForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="submitDataModal">驳回</el-button>

4
src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_routing.vue
View File

@ -15,7 +15,7 @@
<el-input v-model="sheetData.printOperatorName" ref="printOperatorName" placeholder="请选择人员" readonly style="width: 120px" ></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="updateBMProcess()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username)) || (superAdmin)">保存数据</el-button>
<el-button type="primary" @click="updateBMProcess()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin">保存数据</el-button>
<el-button v-if="baseForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="agreeSubmit">同意</el-button>
<el-button v-if="baseForm.status === 'spz' && ((baseForm.isReject === 'Y' && !ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))" type="primary" @click="submitDataModal">驳回</el-button>
</el-form-item>
@ -192,7 +192,7 @@
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable(true)">刷新</el-button>
<el-button type="primary" @click="changeRouteRev()" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username)) || superAdmin)">变更</el-button>
<el-button type="primary" @click="changeRouteRev()" v-if="((!ifDisableFlag && spForm.sp.includes(searchData.username) && baseForm.status === 'spz') || baseForm.status === 'cg' || superAdmin)">变更</el-button>
<el-button type="primary" @click="jumpRoute()">跳转至Routing</el-button>
</el-form-item>
</el-form>

2
src/views/modules/sampleManagement/technicalSpecificationDetail/com_tsd_basicInformation.vue
View File

@ -6,7 +6,7 @@
<div class="grid-content bg-purple">
<el-form-item :label="' '">
<el-button type="primary" @click="refresh()">刷新数据</el-button>
<template v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username)) || (superAdmin)">
<template v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username) && dataForm.status === 'spz') || dataForm.status === 'cg' || (superAdmin)">
<el-button type="primary" @click="saveData()">保存数据 </el-button>
</template>
<template v-if="dataForm.status === 'spz' && ((!ifDisableFlag && spForm.sp.includes(searchData.username)) || (superAdmin))">

4
src/views/modules/test/requestForTest.vue
View File

@ -171,7 +171,7 @@
</el-pagination>
<!-- 测试模态框 -->
<el-dialog :title="modalData.title" @close="closeModalDiaLog" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" top="10vh" width="60%">
<el-dialog :title="modalData.title" @close="closeModalDiaLog" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" top="10vh" width="60%">
<el-form label-position="top" ref="modalForm" :model="modalData" :rules="rules">
<el-row :gutter="15">
<el-col :span="8">
@ -359,7 +359,7 @@
</el-tabs>
</div>
<el-footer style="height:30px;text-align:center;margin-top: 8px">
<template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
<template v-if="modalData.testStatus === '草稿' || (modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name) && modalData.testStatus === '审批中')">
<el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1' && !detailFlag">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>

Write Preview
Loading…
Cancel
Save