Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js

@@ -1,84 +1,91 @@
 import request from '@/utils/request'
 
 export default {
-  // 查询分页列表
+    // 查询分页列表
-  listPage: function(data) {
+    listPage: function(data) {
-    return request({
+        return request({
-      url: '/scm/v1/scmvehrebate/listPage',
+            url: '/scm/v1/scmvehrebate/listPage',
-      method: 'post',
+            method: 'post',
-      data: data,
+            data: data,
-      headers: { 'Content-Type': 'application/json' }
+            headers: { 'Content-Type': 'application/json' }
-    })
+        })
-  },
+    },
-  // 查询不分页
+    // 查询不分页
-  listAll: function(data) {
+    listAll: function(data) {
-    return request({
+        return request({
-      url: '/scm/v1/scmvehrebate/listAll',
+            url: '/scm/v1/scmvehrebate/listAll',
-      method: 'post',
+            method: 'post',
-      data: data,
+            data: data,
-      headers: { 'Content-Type': 'application/json' }
+            headers: { 'Content-Type': 'application/json' }
-    })
+        })
-  },
+    },
-  // 选择车辆信息--查询分页列表
+    // 选择车辆信息--查询分页列表
-  pageList: function(data) {
+    pageList: function(data) {
-    return request({
+        return request({
-      url: '/base/v1/basevehicle/vehicleRebateList',
+            url: '/base/v1/basevehicle/vehicleRebateList',
-      method: 'post',
+            method: 'post',
-      data: data,
+            data: data,
-      headers: { 'Content-Type': 'application/json' }
+            headers: { 'Content-Type': 'application/json' }
-    })
+        })
-  },
+    },
-  // 删除
+    // 清空
-  delete: function(params) {
+    clear: function(data) {
-    return request({
+        return request({
-      url: '/scm/v1/scmvehrebate/delBySids',
+            url: '/scm/v1/scmvehrebate/clear/' + data,
-      method: 'DELETE',
+            method: 'get'
-      data: params,
+        })
-      headers: { 'Content-Type': 'application/json' }
+    },
-    })
+    // 删除
-  },
+    delete: function(params) {
-  // 新增保存修改记录
+        return request({
-  save: function(data) {
+            url: '/scm/v1/scmvehrebate/delBySids',
-    return request({
+            method: 'DELETE',
-      url: '/scm/v1/scmvehrebate/save',
+            data: params,
-      method: 'post',
+            headers: { 'Content-Type': 'application/json' }
-      data: data,
+        })
-      headers: { 'Content-Type': 'application/json' }
+    },
-    })
+    // 新增保存修改记录
-  },
+    save: function(data) {
-  // 编辑保存修改记录
+        return request({
-  update: function(data) {
+            url: '/scm/v1/scmvehrebate/save',
-    return request({
+            method: 'post',
-      url: '/scm/v1/scmvehrebate/update',
+            data: data,
-      method: 'post',
+            headers: { 'Content-Type': 'application/json' }
-      data: data,
+        })
-      headers: { 'Content-Type': 'application/json' }
+    },
-    })
+    // 编辑保存修改记录
-  },
+    update: function(data) {
-  // 通过sid查询一条记录
+        return request({
-  fetchBySid: function(data) {
+            url: '/scm/v1/scmvehrebate/update',
-    return request({
+            method: 'post',
-      url: '/scm/v1/scmvehrebate/fetchDetailsBySid/' + data,
+            data: data,
-      method: 'get'
+            headers: { 'Content-Type': 'application/json' }
-    })
+        })
-  },
+    },
-  // 导出
+    // 通过sid查询一条记录
-  exportExcel: function(data) {
+    fetchBySid: function(data) {
-    return request({
+        return request({
-      url: '/scm/v1/scmvehrebate/excelList',
+            url: '/scm/v1/scmvehrebate/fetchDetailsBySid/' + data,
-      method: 'post',
+            method: 'get'
-      data: data,
+        })
-      responseType: 'blob', // 表明返回服务器返回的数据类型
+    },
-      headers: { 'Content-Type': 'application/json' }
+    // 导出
-    })
+    exportExcel: function(data) {
-  },
+        return request({
-  // 下载模板
+            url: '/scm/v1/scmvehrebate/excelList',
-  downloadExcel: function() {
+            method: 'post',
-    return request({
+            data: data,
-      url: '/scm/v1/scmvehrebate/download',
+            responseType: 'blob', // 表明返回服务器返回的数据类型
-      method: 'post',
+            headers: { 'Content-Type': 'application/json' }
-      responseType: 'blob', // 表明返回服务器返回的数据类型
+        })
-      headers: { 'Content-Type': 'application/json' }
+    },
-    })
+    // 下载模板
-  }
+    downloadExcel: function() {
+        return request({
+            url: '/scm/v1/scmvehrebate/download',
+            method: 'post',
+            responseType: 'blob', // 表明返回服务器返回的数据类型
+            headers: { 'Content-Type': 'application/json' }
+        })
+    }
 }

anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js

@@ -44,6 +44,13 @@ export default {
       method: 'get'
     })
   },
+  // 清空
+  clear: function(data) {
+    return request({
+      url: '/scm/v1/scmspecialrebate/clear/' + data,
+      method: 'get'
+    })
+  },
   // 导出
   exportExcel: function(data) {
     return request({

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@@ -7,6 +7,7 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleClear()">清空</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
@@ -335,6 +336,32 @@ export default {
         this.formobj.adjustmentRemarks = ''
       }
     },
+    handleClear() {
+      const tip = '请确认是否清空上传数据!'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        this.submitdisabled = true
+        req.clear(this.formobj.sid).then((resp) => {
+          if (resp.success) {
+            this.$message({ showClose: true, type: 'success', message: '操作成功' })
+            this.handleReturn('true')
+          }
+          loading.close()
+        }).catch(e => {
+          this.submitdisabled = false
+          loading.close()
+        })
+      })
+    },
     handleSave() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

@@ -7,6 +7,7 @@
         <div>{{ viewTitle }}</div>
         <!--start 添加修改按钮-->
         <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleClear()">清空</el-button>
           <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存</el-button>
           <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
         </div>
@@ -323,6 +324,32 @@ export default {
         this.formobj.adjustmentRemarks = ''
       }
     },
+    handleClear() {
+      const tip = '请确认是否清空上传数据!'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        this.submitdisabled = true
+        req.clear(this.formobj.sid).then((resp) => {
+          if (resp.success) {
+            this.$message({ showClose: true, type: 'success', message: '操作成功' })
+            this.handleReturn('true')
+          }
+          loading.close()
+        }).catch(e => {
+          this.submitdisabled = false
+          loading.close()
+        })
+      })
+    },
     handleSave() {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {