Merge branch 'master' of https://gitee.com/tangziqi/ktg-mes-ui

src/views/mes/pro/feedback/index.vue

@@ -426,11 +426,11 @@ export default {
         itemCode: null,
         itemName: null,
         specification: null,
-        quantity: null,
+        quantity: 0,
-        quantityUncheck: null,
+        quantityUncheck: 0,
-        quantityFeedback: null,
+        quantityFeedback: 0,
-        quantityQualified: null,
+        quantityQualified: 0,
-        quantityUnquanlified: null,
+        quantityUnquanlified: 0,
         userName: null,
         nickName: null,
         feedbackChannel: null,
@@ -533,7 +533,7 @@ export default {
         }
       });
     },
-    //执行
+    //审批通过执行
     handleExecute(){
       const recordIds = this.form.recordId;
       this.$modal.confirm('确认执行报工？').then(function() {
@@ -544,6 +544,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;

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"

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>