From c77a9fc8831d811d8210ed46519a0866a48e1919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?=
 <411641505@qq.com>
Date: Mon, 20 Nov 2023 22:40:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9D=83=E9=99=90=E4=B8=BB?=
 =?UTF-8?q?=E8=A6=81=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/pro/feedback/index.vue    | 23 +++++++++++++++++------
 src/views/mes/pro/schedule/proTask.vue  |  2 +-
 src/views/mes/qc/defectrecord/index.vue | 10 ++++------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/mes/pro/feedback/index.vue b/src/views/mes/pro/feedback/index.vue
index 75be9eb..d75427e 100644
--- a/src/views/mes/pro/feedback/index.vue
+++ b/src/views/mes/pro/feedback/index.vue
@@ -428,11 +428,11 @@ export default {
         itemCode: null,
         itemName: null,
         specification: null,
-        quantity: null,
-        quantityUncheck: null,
-        quantityFeedback: null,
-        quantityQualified: null,
-        quantityUnquanlified: null,
+        quantity: 0,
+        quantityUncheck: 0,
+        quantityFeedback: 0,
+        quantityQualified: 0,
+        quantityUnquanlified: 0,
         userName: null,
         nickName: null,
         feedbackChannel: null,
@@ -535,7 +535,7 @@ export default {
         }
       });
     },
-    //执行
+    //审批通过执行
     handleExecute(){
       const recordIds = this.form.recordId;
       this.$modal.confirm('确认执行报工？').then(function() {
@@ -546,6 +546,17 @@ export default {
         this.open = false;
       }).catch(() => {});
     },
+    //审批不通过，拒绝
+    handleReject(){
+      this.form.status = "PREPARE";
+      if (this.form.recordId != null) {
+        updateFeedback(this.form).then(response => {
+          this.$modal.msgSuccess("提交成功");
+          this.open = false;
+          this.getList();
+        });
+      }
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const recordIds = row.recordId || this.ids;
diff --git a/src/views/mes/pro/schedule/proTask.vue b/src/views/mes/pro/schedule/proTask.vue
index e2f2c4a..bc7ed19 100644
--- a/src/views/mes/pro/schedule/proTask.vue
+++ b/src/views/mes/pro/schedule/proTask.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" v-if="optType !='view'" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
diff --git a/src/views/mes/qc/defectrecord/index.vue b/src/views/mes/qc/defectrecord/index.vue
index 9eff8ac..acf1e7a 100644
--- a/src/views/mes/qc/defectrecord/index.vue
+++ b/src/views/mes/qc/defectrecord/index.vue
@@ -6,7 +6,7 @@
     width="80%"
     center
   >
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" v-if="optType !='view'" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -14,7 +14,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['mes:qc:defectrecord:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -25,7 +24,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['mes:qc:defectrecord:edit']"
         >常见缺陷</el-button>
       </el-col>      
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -54,7 +52,7 @@
             <el-input-number :min="1" v-model="scope.row.defectQuantity" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" v-if="optType !='view'" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -62,7 +60,7 @@
             icon="el-icon-delete"
             v-if="optType !='view'"
             @click="handleDelete(scope.$index, scope.row)"
-            v-hasPermi="['mes:qc:defectrecord:remove']"
+
           >删除</el-button>
         </template>
       </el-table-column>
@@ -77,7 +75,7 @@
     />
     <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
-        <el-button type="primary" v-hasPermi="['mes:qc:defectrecord:update']" v-else @click="confirm">确 定</el-button>
+        <el-button type="primary"  v-else @click="confirm">确 定</el-button>
         <el-button @click="showFlag=false">取 消</el-button>
     </div>
   </el-dialog>