【nev-pc】不合格转合格原因需求更改

fe/PC/src/views/rawMaterialManage/quality/unqualifiedToQualified.vue

@@ -43,6 +43,22 @@
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
     ></curren-Drawer>
+    <!-- 批量原因弹窗 -->
+    <el-dialog 
+      title="不合格转合格原因" 
+      :visible="convertReasonShow"
+      :append-to-body="true"
+    >
+      <el-form :model="convertReasonForm" v-if="convertReasonShow">
+        <el-form-item>
+          <el-input v-model="convertReasonForm.reason" :rows="3" type="textarea"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="convertClose">取 消</el-button>
+        <el-button type="primary" @click="convertList()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -77,12 +93,15 @@ export default {
           label: "批量转合格",
           name: "custom",
           size: "mini",
-          customHandle: this.convertList()
+          // customHandle: this.convertList()
+          customHandle:(()=>{this.convertShow()})
         },
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
+      convertReasonShow:false,//批量原因弹窗
+      convertReasonForm:{reason:null},
     };
   },
   mounted () {
@@ -105,15 +124,23 @@ export default {
     handleSelectionChange(val) {
       this.selectionData = val
     },
+    convertShow(){
+      if(this.selectionData && this.selectionData.length > 0){
+        this.convertReasonShow = true
+      }else{
+        this.$message.warning('请至少选择一条数据！')
+      }
+    },
+    convertClose(){
+      this.convertReasonShow = false;
+      this.convertReasonForm.reason = ''
+    },
     // 批量转合格
     convertList() {
-      if (this.selectionData != undefined ) {
-        if (this.selectionData.length > 0) {
       this.Loading.appMainLoading = true
-          // 20230407
       let params = {
         tenantId: null,
-            remark: null,
+        remark: this.convertReasonForm.reason,
         extraProperties: null,
         worker: store.getters.name.userName,
         activeDate: new Date(),
@@ -179,16 +206,13 @@ export default {
       convertOk(params).then(res => {
         this.$message.success('已成功转为合格')
         this.paging()
+        this.convertClose()
         this.Loading.appMainLoading = false
       }).catch(err => {
         this.Loading.appMainLoading = false
         console.log(err)
       })
-        } else {
-          this.$message.warning('请至少选择一条数据！')
-        }
-      }
-      return this.convertList
+      // return this.convertList
     }
   }
 };