From 338a9f24adb3833d5e2ed3be726b2f252184b301 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Sat, 12 Oct 2024 16:14:39 +0800
Subject: [PATCH] 2024-10-12

---
 src/assets/scss/global.scss                   |  4 ++++
 .../modules/proofing/requestForProofing.vue   | 22 ++++++++++++++++--
 .../modules/quotation/requestForQuote.vue     | 23 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss
index 0310841..f91960d 100644
--- a/src/assets/scss/global.scss
+++ b/src/assets/scss/global.scss
@@ -513,3 +513,7 @@ input[type="number"] {
   -moz-appearance: textfield; /* Firefox */
   text-align: right;
 }
+.auto .el-form-item__content{
+  height: auto;
+  line-height: 1.5;
+}
diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue
index 5eb5b73..87d52bc 100644
--- a/src/views/modules/proofing/requestForProofing.vue
+++ b/src/views/modules/proofing/requestForProofing.vue
@@ -313,7 +313,7 @@
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
         <el-button v-if="modalData.proofingStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="modalData.proofingStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectSubmit">驳回</el-button>
+        <el-button v-if="modalData.proofingStatus === '审批中' && modalData.isReject === 'Y'" @click="rejectVisible = true" type="primary">驳回</el-button>
       </el-footer>
     </el-dialog>
 
@@ -1016,7 +1016,17 @@
         <el-button type="primary" @click="delegateAccessVisible=false">关闭</el-button>
       </el-footer>
     </el-dialog>
-
+    <el-dialog title="驳回" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="rejectVisible" width="500px">
+      <el-form  label-position="top">
+        <el-form-item label="驳回意见" class="auto">
+          <el-input type="textarea" v-model="rejectOpinion" :rows="3"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="text-align:center;height: 30px;line-height: 30px;">
+        <el-button type="primary" @click="rejectSubmit">确定</el-button>
+        <el-button type="primary" @click="rejectVisible = false">取消</el-button>
+      </el-footer>
+    </el-dialog>
     <!-- 上传文件的modal -->
     <proofingUploadFile ref="proofingUploadFile" @refreshPageTables="getFileContentData()" v-drag></proofingUploadFile>
   </div>
@@ -1120,6 +1130,11 @@ export default {
         this.$refs.projectPartTable.clearSelection();
       }
     },
+    rejectVisible(newVal,oldVal){
+      if (newVal === false){
+        this.rejectOpinion = ''
+      }
+    }
   },
   computed: {
     delegateAccessName: {
@@ -2277,6 +2292,8 @@ export default {
           columnWidth: 140
         }
       ],
+      rejectVisible: false,
+      rejectOpinion: '',
     }
   },
   mounted() {
@@ -3638,6 +3655,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.modalData.rejectOpinion = this.rejectOpinion
         this.modalData.nodeConclusion = 'N'
         this.submitData()
       })
diff --git a/src/views/modules/quotation/requestForQuote.vue b/src/views/modules/quotation/requestForQuote.vue
index 6237105..f684a7d 100644
--- a/src/views/modules/quotation/requestForQuote.vue
+++ b/src/views/modules/quotation/requestForQuote.vue
@@ -370,7 +370,7 @@
         <el-button type="primary" @click="saveData()">保存</el-button>
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
         <el-button v-if="modalData.quotationStatus === '审批中'" type="primary" @click="agreeSubmit">同意</el-button>
-        <el-button v-if="modalData.quotationStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectSubmit">驳回</el-button>
+        <el-button v-if="modalData.quotationStatus === '审批中' && modalData.isReject === 'Y'" type="primary" @click="rejectVisible = true">驳回</el-button>
       </el-footer>
     </el-dialog>
     <!--选择项目模态框-->
@@ -561,6 +561,19 @@
       </el-footer>
     </el-dialog>
 
+
+    <el-dialog title="驳回" top="30vh" :close-on-click-modal="false" v-drag :visible.sync="rejectVisible" width="500px">
+      <el-form  label-position="top">
+        <el-form-item label="驳回意见" class="auto">
+          <el-input type="textarea" v-model="rejectOpinion" :rows="3"></el-input>
+        </el-form-item>
+      </el-form>
+      <el-footer style="text-align:center;height: 30px;line-height: 30px;">
+        <el-button type="primary" @click="rejectSubmit">确定</el-button>
+        <el-button type="primary" @click="rejectVisible = false">取消</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- 页签 -->
     <el-tabs v-model="activeTable" type="border-card" style="margin-top: 0px;"
              @tab-click="tabClick" class="customer-tab">
@@ -993,6 +1006,11 @@ export default {
         this.$refs.projectPartTable.clearSelection();
       }
     },
+    rejectVisible(newVal,oldVal){
+      if (newVal === false){
+        this.rejectOpinion = ''
+      }
+    }
 
   },
   data() {
@@ -2080,6 +2098,8 @@ export default {
           columnWidth: 140
         }
       ],
+      rejectVisible:false,
+      rejectOpinion:'',
     }
   },
   mounted() {
@@ -3386,6 +3406,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        this.modalData.rejectOpinion = this.rejectOpinion
         this.modalData.nodeConclusion = 'N'
         this.submitData()
       })