Browse Source

2025-05-12

优化
master
fengyuan_yang 1 year ago
parent
commit
85135ce479
  1. 16
      src/views/modules/changeManagement/changeRecord.vue
  2. 4
      src/views/modules/proofing/requestForProofing.vue
  3. 4
      src/views/modules/quotation/requestForQuote.vue
  4. 6
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_bom.vue
  5. 30
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_customerInformation.vue
  6. 10
      src/views/modules/sampleManagement/technicalSpecificationDetail/com_bm_demoSlot.vue
  7. 15
      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
  10. 4
      src/views/modules/tooling/searchToolApply.vue

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

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

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

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

4
src/views/modules/quotation/requestForQuote.vue

@ -389,7 +389,9 @@
</el-tabs>
</el-form>
<el-footer style="height:35px;margin-top: 10px;padding-bottom:5px;text-align:center">
<el-button type="primary" v-if="!detailVisible" @click="saveData">保存</el-button>
<template v-if="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>
<template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
<template v-if="isAuth('102001001:submit')">

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

@ -17,10 +17,10 @@
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="searchTable(true)" >刷新</el-button>
<el-button type="primary" v-if="!ifDisableFlag" @click="changeBomRev()" >变更</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 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 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>-->
</el-form-item>
</el-col>

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

@ -4,23 +4,25 @@
<el-row :gutter="20">
<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'))||(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-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 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>
</el-col>
<el-col :span="3"><div class="grid-content bg-purple">
<el-form-item :label="'当前节点'" style="width: 100%">
<el-input v-model="spForm.nodeName" disabled ></el-input>
</el-form-item>
</div>
<el-col :span="3">
<div class="grid-content bg-purple">
<el-form-item :label="'当前节点'" style="width: 100%">
<el-input v-model="spForm.nodeName" disabled></el-input>
</el-form-item>
</div>
</el-col>
<el-col :span="3"><div class="grid-content bg-purple">
<el-form-item :label="'当前节点审批人'" style="width: 100%">
<el-input v-model="spForm.sp" disabled ></el-input>
</el-form-item>
</div>
<el-col :span="3">
<div class="grid-content bg-purple">
<el-form-item :label="'当前节点审批人'" style="width: 100%">
<el-input v-model="spForm.sp" disabled></el-input>
</el-form-item>
</div>
</el-col>
</el-row>
</el-form>

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

@ -10,12 +10,12 @@
<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="searchTable()" >刷新数据</el-button>
<el-button type="primary" @click="saveTable()" v-if="(!ifDisableFlag&&isAuth('103002:bmSave'))||(superAdmin)">保存数据</el-button>
<el-button type="primary" @click="refreshBMPageModal()" v-if="!ifDisableFlag && isAuth('103002:bmModel')">更新模板</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>
<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>
<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>
</template>
</el-form-item>
</el-col>

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

@ -15,9 +15,9 @@
<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'))||(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-button type="primary" @click="updateBMProcess()" v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username)) || (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>
</el-col>
<el-col :span="3"><div class="grid-content bg-purple">
@ -190,11 +190,10 @@
<el-form-item label="替代编码">
<el-input v-model="routeData.alternativeNo" readonly style="width: 120px"></el-input>
</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">变更</el-button>
<el-button type="primary" @click="jumpRoute()" >跳转至Routing</el-button>
<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="jumpRoute()">跳转至Routing</el-button>
</el-form-item>
</el-form>
<el-table

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

@ -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')) || (superAdmin)">
<template v-if="(!ifDisableFlag && isAuth('103002:bmSave') && spForm.sp.includes(searchData.username)) || (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

@ -359,7 +359,9 @@
</el-tabs>
</div>
<el-footer style="height:30px;text-align:center;margin-top: 8px">
<el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1' && !detailFlag">保存</el-button>
<template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
<el-button type="primary" @click="saveData()" v-if="modalData.flag !== '1' && !detailFlag">保存</el-button>
</template>
<el-button type="primary" @click="modalFlag = false">关闭</el-button>
<template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
<template v-if="isAuth('107001:submit')">

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

@ -497,8 +497,8 @@
<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 type="primary" @click="saveData" class="bigButton">保存</el-button>
<el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>
<el-button type="primary" @click="saveData" class="bigButton">保存</el-button>
<el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit" class="bigButton">同意</el-button>
<el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal" class="bigButton">驳回</el-button>
</span>
</el-dialog>

Loading…
Cancel
Save