Merge remote-tracking branch 'origin/master'

gassafetyprogress-web/src/views/operationMonitor/workOrder/index.vue

@@ -134,7 +134,7 @@
             @click="workDetail(scope.row)"
             v-hasPermi="['system:order:edit']"
           >详情</el-button>
-          <el-button v-if="scope.row.workStatus == '0' || scope.row.workStatus == '1'"
+          <el-button v-if="scope.row.workStatus == '0' || scope.row.workStatus == '1'" key="edit"
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -660,7 +660,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const workIds = row.workId || this.ids;
-      this.$confirm('是否确认删除燃气任务编号为"' + workIds + '"的数据项?', "警告", {
+      this.$confirm('是否确认删除燃气任务名称为"' + row.workTitle + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -856,12 +856,20 @@ export default {
       this.$refs["feedBookForm"].validate(valid => {
         if (valid) {
           if (this.feedBookForm.workId != null) {
-            //this.feedBookForm.workStatus = '2';
+            this.feedBookForm.workStatus = '2';
+            /*const param ={...this.feedBookForm};
+            param.workStatus = '2';*/
             updateOrder(this.feedBookForm).then(response => {
-              this.msgSuccess("反馈成功");
-              this.feedBookOpen = false;
-              this.getList();
-          });
+              if(response.code = 200){
+                this.msgSuccess("反馈成功");
+                this.feedBookOpen = false;
+                this.getList();
+              }
+              /*if(!this.feedBookOpen){
+                this.getList();
+              }*/
+              //this.getList();
+            });
           }
         }
       });