前端: 日常评价删除方式由popover改为弹框提示

src/dashoo.cn/frontend_web/src/api/oilcontract/contractReview.js

@@ -1,64 +1,61 @@
-export default {
+export default {
 
-    // 编辑后的评价内容
-    contractEvaluationTree(formData,myAxios) {
-      return myAxios({
-        url: '/contract-evaluation/tree',
-        method: 'post',
-        data: formData
-      });
-    },
+  // 编辑后的评价内容
+  contractEvaluationTree (formData, myAxios) {
+    return myAxios({
+      url: '/contract-evaluation/tree',
+      method: 'post',
+      data: formData
+    })
+  },
 
-    //评价新增
-    addContractEvaluate(formData, myAxios) {
-      return myAxios({
-        url: '/contract-review/add',
-        method: 'post',
-        data: formData
-      });
-    },
-    //评价编辑
-    updateContractEvaluate(entityId,formData, myAxios) {
-      return myAxios({
-        url: '/contract-review/update/'+entityId,
-        method: 'post',
-        data: formData
-      });
-    },
+  // 评价新增
+  addContractEvaluate (formData, myAxios) {
+    return myAxios({
+      url: '/contract-review/add',
+      method: 'post',
+      data: formData
+    })
+  },
+  // 评价编辑
+  updateContractEvaluate (entityId, formData, myAxios) {
+    return myAxios({
+      url: '/contract-review/update/' + entityId,
+      method: 'post',
+      data: formData
+    })
+  },
 
-    //评价查询审评流程参数
-    getEntityAndCert(entityId, myAxios) {
-      return myAxios({
-        url: '/contract-review/get/'+entityId,
-        method: 'GET',
-      })
-    },
+  // 评价查询审评流程参数
+  getEntityAndCert (entityId, myAxios) {
+    return myAxios({
+      url: '/contract-review/get/' + entityId,
+      method: 'GET'
+    })
+  },
 
+  // 审核确定
+  contractUnitAudit (entityId, params, myAxios) {
+    return myAxios({
+      url: '/contract-review/unit-audit/' + entityId,
+      method: 'post',
+      params: params
+    })
+  },
 
-    //审核确定
-    contractUnitAudit(entityId,params, myAxios) {
-      return myAxios({
-        url: '/contract-review/unit-audit/'+entityId,
-        method: 'post',
-        params: params
-      });
-    },
+  // 评价列表
+  getReviewList (CreateOn, params, myAxios) {
+    return myAxios({
+      url: '/contract-review/list?CreateOn=' + CreateOn,
+      method: 'GET',
+      params: params
+    })
+  },
+  deleteEntity (entityId, myAxios) {
+    return myAxios({
+      url: '/contract-review/delete/' + entityId,
+      method: 'delete'
+    })
+  }
 
-
-    //评价列表
-    getReviewList(CreateOn, params, myAxios) {
-      return myAxios({
-        url: '/contract-review/list?CreateOn='+ CreateOn,
-        method: 'GET',
-        params: params
-      });
-    },
-    deleteEntity(entityId, myAxios) {
-      return myAxios({
-        url: '/contract-review/delete/'+entityId,
-        method: 'delete'
-      })
-    },
-
-
-}
+}

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -74,21 +74,14 @@
             <el-button v-else type="text" title="查看" size="small" icon="el-icon-edit"
                        @click="onNavigateEvaluate(scope.row)">查看
             </el-button>
-            <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`"
-                         :disabled="!deleteBoolean || scope.row.Status > 0">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
-              </el-alert>
-              <br/>
-              <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" :disabled="!deleteBoolean || scope.row.Status > 0" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="text" :disabled="!deleteBoolean || (scope.row.Status > 0 && !(scope.row.Status == 8 && delAuditProf))" style="margin-left:3px" icon="el-icon-delete" size="small">删除
-              </el-button>
-            </el-popover>
+            <el-button
+              slot="reference"
+              type="text"
+              :disabled="!deleteBoolean || (scope.row.Status > 0 && !(scope.row.Status == 8 && delAuditProf))"
+              style="margin-left:3px" icon="el-icon-delete" size="small"
+              @click="deleteEntity(scope.row)"
+            >删除
+            </el-button>
           </template>
         </el-table-column>
 
@@ -746,23 +739,38 @@ export default {
       this.currentPage = 1
       this.initDatas()
     },
-    deleteEntity (row, index) {
-      this.$refs['popover-' + `${index}`].doClose()
-      apiReview.deleteEntity(row.Id, this.$axios).then(res => {
-        if (res.data.code === 0) {
-          this.initDatas()
-          this.$message({
-            type: 'success',
-            message: res.data.message
-          })
-        } else {
-          this.$message({
-            type: 'warning',
-            message: res.data.message
-          })
-        }
-      }).catch(err => {
-        console.error(err)
+    deleteEntity (row) {
+      // this.$refs['popover-' + `${index}`].doClose()
+      this.$confirm('确认删除该承包商日常评价吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableLoading = true
+        apiReview.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.tableLoading = false
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+            this.tableLoading = false
+          }
+        }).catch(err => {
+          console.error(err)
+          this.tableLoading = false
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
       })
     },
     jstimehandle (val) {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -73,21 +73,14 @@
             </el-button>
             <el-button type="text" v-else size="small" icon="el-icon-edit" @click="onNavigateEvaluate(scope.row)">查看
             </el-button>
-
-            <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
-              </el-alert>
-              <br/>
-              <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" :disabled="!deleteBoolean || scope.row.Status > 0" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="text" :disabled="!deleteBoolean || (scope.row.Status > 0 && !(scope.row.Status == 8 && delAuditProf))" style="margin-left:3px" icon="el-icon-delete" size="small">删除
-              </el-button>
-            </el-popover>
+            <el-button
+              slot="reference"
+              type="text"
+              :disabled="!deleteBoolean || (scope.row.Status > 0 && !(scope.row.Status == 8 && delAuditProf))"
+              style="margin-left:3px" icon="el-icon-delete" size="small"
+              @click="deleteEntity(scope.row)"
+            >删除
+            </el-button>
           </template>
         </el-table-column>
 
@@ -734,22 +727,36 @@ export default {
       this.initDatas()
     },
     deleteEntity (row, index) {
-      this.$refs['popover-' + `${index}`].doClose()
-      apiReview.deleteEntity(row.Id, this.$axios).then(res => {
-        if (res.data.code === 0) {
-          this.initDatas()
-          this.$message({
-            type: 'success',
-            message: res.data.message
-          })
-        } else {
-          this.$message({
-            type: 'warning',
-            message: res.data.message
-          })
-        }
-      }).catch(err => {
-        console.error(err)
+      this.$confirm('确认删除该供应商日常评价吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableLoading = true
+        apiReview.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.tableLoading = false
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+            this.tableLoading = false
+          }
+        }).catch(err => {
+          console.error(err)
+          this.tableLoading = false
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
       })
     },
 

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index.vue

@@ -73,21 +73,14 @@
             <el-button v-else type="text" title="查看" size="small" icon="el-icon-edit"
                        @click="onNavigateEvaluate(scope.row)">查看
             </el-button>
-
-            <el-popover placement="top" title="提示" :ref="'popover-' + `${scope.$index}`">
-              <el-alert
-                title=""
-                description="确认要删除吗？"
-                type="warning"
-                :closable="false">
-              </el-alert>
-              <br/>
-              <div style="text-align: right; margin: 0">
-                <el-button type="primary" size="mini" :disabled="!deleteBoolean || scope.row.Status > 0" @click="deleteEntity(scope.row,scope.$index)">删除</el-button>
-              </div>
-              <el-button slot="reference" type="text" :disabled="!deleteBoolean || (scope.row.Status > 0 && !(scope.row.Status == 8 && delAuditProf))" style="margin-left:3px" icon="el-icon-delete" size="small">删除
-              </el-button>
-            </el-popover>
+            <el-button
+              slot="reference"
+              type="text"
+              :disabled="!deleteBoolean || (scope.row.Status > 0 && !(scope.row.Status == 8 && delAuditProf))"
+              style="margin-left:3px" icon="el-icon-delete" size="small"
+              @click="deleteEntity(scope.row)"
+            >删除
+            </el-button>
           </template>
         </el-table-column>
 
@@ -740,23 +733,37 @@ export default {
       this.currentPage = 1
       this.initDatas()
     },
-    deleteEntity (row, index) {
-      this.$refs['popover-' + `${index}`].doClose()
-      apiReview.deleteEntity(row.Id, this.$axios).then(res => {
-        if (res.data.code === 0) {
-          this.initDatas()
-          this.$message({
-            type: 'success',
-            message: res.data.message
-          })
-        } else {
-          this.$message({
-            type: 'warning',
-            message: res.data.message
-          })
-        }
-      }).catch(err => {
-        console.error(err)
+    deleteEntity (row) {
+      this.$confirm('确认删除该服务商日常评价吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableLoading = true
+        apiReview.deleteEntity(row.Id, this.$axios).then(res => {
+          if (res.data.code === 0) {
+            this.initDatas()
+            this.$message({
+              type: 'success',
+              message: res.data.message
+            })
+            this.tableLoading = false
+          } else {
+            this.$message({
+              type: 'warning',
+              message: res.data.message
+            })
+            this.tableLoading = false
+          }
+        }).catch(err => {
+          console.error(err)
+          this.tableLoading = false
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
       })
     },