2024-10-12

src/views/modules/proofing/requestForProofing.vue

@@ -2764,6 +2764,13 @@ export default {
         this.$message.warning('请勾选要删除的打样信息！')
         return
       }
+      for (let i = 0; i < this.proofingSelections.length; i++) {
+        let row = this.proofingSelections[i]
+        if (row.proofingStatus !== '草稿'){
+          this.$message.warning(row.proofingNo+"不是草稿状态，不能删除！")
+          return
+        }
+      }
       this.$confirm(`是否删除这 ` + this.proofingSelections.length + ` 条打样信息?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/modules/quotation/requestForQuote.vue

@@ -2593,6 +2593,13 @@ export default {
         this.$message.warning('请勾选要删除的询价信息！')
         return
       }
+      for (let i = 0; i < this.quotationSelections.length; i++) {
+        let row = this.quotationSelections[i]
+        if (row.quotationStatus !== '草稿'){
+          this.$message.warning(row.quotationNo+"不是草稿状态，不能删除！")
+          return
+        }
+      }
       this.$confirm(`是否删除这 ` + this.quotationSelections.length + ` 条询价信息?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/modules/test/requestForTest.vue

@@ -335,6 +335,7 @@
         <el-button type="primary" @click="modalFlag = false">关闭</el-button>
         <el-button v-if="modalData.testStatus === '审批中' && !detailFlag" type="primary" @click="agreeSubmit">同意</el-button>
         <el-button v-if="modalData.testStatus === '审批中' && modalData.isReject === 'Y' && !detailFlag" type="primary" @click="rejectSubmit">驳回</el-button>
+        <el-button @click="rejectVisible = true">驳回</el-button>
       </el-footer>
     </el-dialog>
 
@@ -909,6 +910,18 @@
       </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 -->
     <test-upload-file ref="testUploadFile" @refreshPageTables="getFileContentData()" v-drag></test-upload-file>
   </div>
@@ -1039,6 +1052,11 @@
         if (newVal === false){
           this.detailFlag = false
         }
+      },
+      rejectVisible(newVal,oldVal){
+        if (newVal === false){
+          this.rejectOpinion = ''
+        }
       }
     },
     data () {
@@ -2150,6 +2168,8 @@
           //   columnWidth: 70,
           // },
         ],
+        rejectVisible:false,
+        rejectOpinion:"",
       }
     },
     mounted () {
@@ -2677,6 +2697,13 @@
           this.$message.warning('请勾选要删除的测试信息！')
           return
         }
+        for (let i = 0; i < this.testSelections.length; i++) {
+          let row = this.testSelections[i]
+          if (row.testStatus !== '草稿'){
+            this.$message.warning(row.testNo+"不是草稿状态，不能删除！")
+            return
+          }
+        }
         this.$confirm(`是否删除这 `+ this.testSelections.length +` 条测试信息?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -3396,6 +3423,7 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          this.modalData.rejectOpinion = this.rejectOpinion
           this.modalData.nodeConclusion = 'N'
           this.submitData()
         })
@@ -3572,5 +3600,10 @@
   content: "";
   position: absolute;
 }
+
+.auto /deep/ .el-form-item__content{
+  height: auto;
+  line-height: 1.5;
+}
 </style>