2024-09-29

优化

src/api/tool/toolApply.js

@@ -22,3 +22,5 @@ export const cancelProjectToolApply = data => createAPI(`/plm/projectToolingAppl
 export const saveProjectHeaderMessage = data => createAPI(`/plm/projectToolingApplication/saveProjectHeaderMessage`,'post',data)
 
 export const editToolApplication= data => createAPI(`/plm/projectToolingApplication/editToolApplication`,'post',data)
+
+export const submitChange= data => createAPI(`/plm/projectToolingApplication/submitChange`,'post',data)

src/views/modules/changeManagement/changeRecord.vue

@@ -369,7 +369,7 @@
             <el-button type="primary" @click="saveData">保存</el-button>
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
             <el-button v-if="modalData.changeStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-            <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectSubmit">驳回</el-button>
+            <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button>
           </el-footer>
         </el-tab-pane>
 
@@ -519,7 +519,7 @@
             <el-button type="primary" @click="saveData">保存</el-button>
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
             <el-button v-if="modalData.changeStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-            <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectSubmit">驳回</el-button>
+            <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button>
           </el-footer>
         </el-tab-pane>
 
@@ -573,7 +573,7 @@
             <el-button type="primary" @click="saveData">保存</el-button>
             <el-button type="primary" @click="modalFlag = false">关闭</el-button>
             <el-button v-if="modalData.changeStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-            <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectSubmit">驳回</el-button>
+            <el-button v-if="modalData.changeStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button>
           </el-footer>
         </el-tab-pane>
       </el-tabs>
@@ -1245,6 +1245,7 @@
           rejectStepId: '',
           isReject: '',
           menuId: this.$route.meta.menuId,
+          userName: this.$store.state.user.name,
           rejectOpinion: ''
         },
         costImpactData: {
@@ -2950,11 +2951,13 @@
           faiOperatorId: row.faiOperatorId,
           faiOperatorName: row.faiOperatorName,
           nodeConclusion: '',
+          rejectOpinion: '',
           stepId: row.stepId,
           rejectFlag: row.rejectFlag,
           rejectStepId: row.rejectStepId,
           isReject: row.isReject,
-          menuId: this.$route.meta.menuId
+          menuId: this.$route.meta.menuId,
+          userName: this.$store.state.user.name,
         }
         this.changeTitle = '变更申请-' + this.modalData.changeNo
         // 查选择的ECN种类

src/views/modules/tooling/searchToolApply.vue

@@ -304,6 +304,8 @@
       <span slot="footer" class="dialog-footer">
         <el-button type="primary" @click="saveData()">{{'保存'}}</el-button>
         <el-button type="primary" @click="visible = false">{{'取消'}}</el-button>
+        <el-button v-if="dataForm.status === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
+        <el-button v-if="dataForm.status === '审批中' && dataForm.isReject === 'Y'" type="primary" @click="submitDataModal">驳回</el-button>
       </span>
     </el-dialog>
 
@@ -355,6 +357,20 @@
         <el-button type="primary" @click="modelFlag = false">{{'取消'}}</el-button>
       </span>
     </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>
+
     <!-- 上传文件的modal   -->
     <projectUploadFile  ref="projectUploadFile" @refreshPageTables="getFileContentData()" v-drag></projectUploadFile>
 
@@ -373,7 +389,8 @@
     comfirmProjectToolApply,
     cancelProjectToolApply,
     saveProjectHeaderMessage,
-    editToolApplication
+    editToolApplication,
+    submitChange
   } from "@/api/tool/toolApply.js"
   import {
     deleteProjectFile,
@@ -422,6 +439,11 @@
           remark:'',
           createBy:'',
           detailList:[],
+          status: '',
+          rejectOpinion: '',
+          nodeConclusion: '',
+          menuId: this.$route.meta.menuId,
+          userName: this.$store.state.user.name,
         },
         modelData:{
           site:'',
@@ -923,6 +945,8 @@
           },
         ],
         approvalList: [],
+        rejectOpinion: '',
+        submitModalFlag: false,
       }
     },
     watch: {
@@ -1133,17 +1157,22 @@
           this.detailList =[]
         }
       },
-      editModal(row){
-        this.dataForm={
+      editModal (row) {
+        this.dataForm = {
           site: row.site,
           applyNo: row.applyNo,
-          applyBy:row.applyBy,
-          applyDate:row.applyDate,
-          applySumQty:row.applySumQty,
-          applyReason:row.applyReason,
-          remark:row.remark,
-          createBy:row.createBy,
-          detailList:[],
+          applyBy: row.applyBy,
+          applyDate: row.applyDate,
+          applySumQty: row.applySumQty,
+          applyReason: row.applyReason,
+          remark: row.remark,
+          createBy: row.createBy,
+          detailList: [],
+          status: row.status,
+          rejectOpinion: '',
+          nodeConclusion: '',
+          menuId: this.$route.meta.menuId,
+          userName: this.$store.state.user.name,
         }
         searchProjectToolApplyDetail({ site: row.site,
           applyNo: row.applyNo,}).then(({data}) => {
@@ -1332,19 +1361,55 @@
           })
         })
       },
-      saveData(){
-        this.dataForm.detailList=this.toolData
-        editToolApplication(this.dataForm).then(({data}) => {
-          if (data && data.code == 0) {
+
+      // 同意提交
+      agreeSubmit () {
+        this.$confirm(`是否确认提交?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.dataForm.nodeConclusion = 'Y'
+          this.submitData()
+        })
+      },
+
+      // 打开提交模态框
+      submitDataModal () {
+        this.rejectOpinion = ''
+        this.submitModalFlag = true
+      },
+
+      // 驳回提交
+      rejectSubmit () {
+        this.$confirm(`是否确认驳回?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.dataForm.rejectOpinion = this.rejectOpinion
+          this.dataForm.nodeConclusion = 'N'
+          this.submitData()
+        })
+      },
+
+      // 提交
+      submitData () {
+        this.dataForm.userName = this.$store.state.user.name
+        this.dataForm.menuId = this.$route.meta.menuId
+        this.dataForm.detailList = this.toolData
+        submitChange(this.dataForm).then(({data}) => {
+          if (data && data.code === 0) {
             for (let i = 0; i <this.dataList1.length ; i++) {
-              if(this.dataList1[i].applyNo===this.dataForm.applyNo){
-                this.dataList1[i].remark=this.dataForm.remark
-                this.dataList1[i].applySumQty=this.dataForm.applySumQty
-                this.dataList1[i].applyReason=this.dataForm.applyReason
+              if (this.dataList1[i].applyNo === this.dataForm.applyNo) {
+                this.dataList1[i].remark = this.dataForm.remark
+                this.dataList1[i].applySumQty = this.dataForm.applySumQty
+                this.dataList1[i].applyReason = this.dataForm.applyReason
               }
             }
-            this.visible=false;
-            this.refreshCurrentTabTable ()
+            this.refreshCurrentTabTable()
+            this.submitModalFlag = false
+            this.visible = false
             this.$message({
               message: '操作成功',
               type: 'success',
@@ -1358,7 +1423,34 @@
             })
           }
         })
+      },
 
+      saveData () {
+        this.dataForm.detailList = this.toolData
+        editToolApplication(this.dataForm).then(({data}) => {
+          if (data && data.code === 0) {
+            for (let i = 0; i <this.dataList1.length ; i++) {
+              if (this.dataList1[i].applyNo === this.dataForm.applyNo) {
+                this.dataList1[i].remark = this.dataForm.remark
+                this.dataList1[i].applySumQty = this.dataForm.applySumQty
+                this.dataList1[i].applyReason = this.dataForm.applyReason
+              }
+            }
+            this.visible = false
+            this.refreshCurrentTabTable()
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
       },
       jumpBM(row){
         if (this.$router.resolve(`/sampleManagement-technicalSpecificationList`).resolved.name === '404'){