2025-02-17

src/views/modules/proofing/requestForProofing.vue

@@ -357,11 +357,13 @@
       <el-footer style="height:30px;text-align:center;margin-top: 8px">
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-        <template v-if="isAuth('103001:submit')">
-          <el-button v-if="modalData.proofingStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-        </template>
-        <template v-if="isAuth('103001:rejected')">
-          <el-button v-if="modalData.proofingStatus === '审批中' && modalData.isReject === 'Y'" @click="rejectVisible = true" type="primary">驳回</el-button>
+        <template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
+          <template v-if="isAuth('103001:submit')">
+            <el-button v-if="modalData.proofingStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
+          </template>
+          <template v-if="isAuth('103001:rejected')">
+            <el-button v-if="modalData.proofingStatus === '审批中' && modalData.isReject === 'Y'" @click="rejectVisible = true" type="primary">驳回</el-button>
+          </template>
         </template>
       </el-footer>
     </el-dialog>
@@ -1492,6 +1494,24 @@ export default {
           fixed: '',
           columnWidth: 150
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 103001,
+          serialNumber: '103001Table1ApprovalUsername',
+          tableId: '103001Table1',
+          tableName: '打样信息表',
+          columnProp: 'approvalUsername',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '当前节点审批人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 103001,
@@ -2442,7 +2462,8 @@ export default {
         rejectFlag: row.rejectFlag,
         rejectStepId: row.rejectStepId,
         isReject: row.isReject,
-        nodeId: row.nodeId
+        nodeId: row.nodeId,
+        approvalUsername: row.approvalUsername,
       }
       this.searchDelegateAccessByUser();
       this.modalDisableFlag = true

src/views/modules/quotation/requestForQuote.vue

@@ -389,11 +389,13 @@
       <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>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-        <template v-if="isAuth('102001001:submit')">
-          <el-button v-if="modalData.quotationStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-        </template>
-        <template v-if="isAuth('102001001:rejected')">
-          <el-button v-if="modalData.quotationStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectVisible = true">驳回</el-button>
+        <template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
+          <template v-if="isAuth('102001001:submit')">
+            <el-button v-if="modalData.quotationStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
+          </template>
+          <template v-if="isAuth('102001001:rejected')">
+            <el-button v-if="modalData.quotationStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectVisible = true">驳回</el-button>
+          </template>
         </template>
       </el-footer>
     </el-dialog>
@@ -1484,6 +1486,24 @@ export default {
           fixed: '',
           columnWidth: 150
         },
+        {
+          userId: this.$store.state.user.name,
+          functionId: 102001,
+          serialNumber: '102001Table1ApprovalUsername',
+          tableId: '102001Table1',
+          tableName: '询价信息表',
+          columnProp: 'approvalUsername',
+          headerAlign: 'center',
+          align: 'left',
+          columnLabel: '当前节点审批人',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 150
+        },
         {
           userId: this.$store.state.user.name,
           functionId: 102001,
@@ -2426,7 +2446,8 @@ export default {
         rejectFlag: row.rejectFlag,
         rejectStepId: row.rejectStepId,
         isReject: row.isReject,
-        nodeId: row.nodeId
+        nodeId: row.nodeId,
+        approvalUsername: row.approvalUsername,
       }
       if (this.modalData.flag !== '1'){
         this.projectPartData.testPartNo = this.modalData.testPartNo

src/views/modules/test/requestForTest.vue

@@ -354,11 +354,13 @@
       <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>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
-        <template v-if="isAuth('107001:submit')">
-          <el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button>
-        </template>
-        <template v-if="isAuth('107001:rejected')">
-          <el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y' && !detailFlag" @click="rejectVisible = true" type="primary">驳回</el-button>
+        <template v-if="modalData.approvalUsername && modalData.approvalUsername.split(';').includes($store.state.user.name)">
+          <template v-if="isAuth('107001:submit')">
+            <el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button>
+          </template>
+          <template v-if="isAuth('107001:rejected')">
+            <el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y' && !detailFlag" @click="rejectVisible = true" type="primary">驳回</el-button>
+          </template>
         </template>
       </el-footer>
     </el-dialog>
@@ -1509,6 +1511,24 @@
             fixed: '',
             columnWidth: 150
           },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 103001,
+            serialNumber: '103001Table1ApprovalUsername',
+            tableId: '103001Table1',
+            tableName: '测试信息表',
+            columnProp: 'approvalUsername',
+            headerAlign: 'center',
+            align: 'left',
+            columnLabel: '当前节点审批人',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 150
+          },
           {
             userId: this.$store.state.user.name,
             functionId: 103001,
@@ -2484,7 +2504,8 @@
           rejectFlag: row.rejectFlag,
           rejectStepId: row.rejectStepId,
           isReject: row.isReject,
-          nodeId: row.nodeId
+          nodeId: row.nodeId,
+          approvalUsername: row.approvalUsername,
         }
         this.activeTabList = ['product','process','attribute','partAttribute','file']
         // this.$nextTick(()=>{