Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!504

src/api/business/spd/task_management/visitingPlan/visitingPlan.js

@@ -2,70 +2,63 @@ import request from '@/utils/request'
 
 //拜访计划列表
 export function getPlanList(data) {
-    return request({
-        url: '/mk/bo/plan/list',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: '/mk/bo/plan/list',
+    method: 'get',
+    params: data
+  })
 }
 //拜访计划新增
 export function addPlan(data) {
-    return request({
-        url: '/mk/bo/plan/',
-        method: 'post',
-        data: data
-    })
+  return request({
+    url: '/mk/bo/plan/',
+    method: 'post',
+    data: data
+  })
 }
 //拜访计划编辑
 export function editPlan(data) {
-    return request({
-        url: '/mk/bo/plan/edit',
-        method: 'put',
-        data: data
-    })
+  return request({
+    url: '/mk/bo/plan/edit',
+    method: 'put',
+    data: data
+  })
 }
 //拜访计划提交
 export function submitPlan(data) {
-    return request({
-      url: `/mk/bo/plan/submit`,
-      method: 'post',
-      data: data
-    })
+  return request({
+    url: `/mk/bo/plan/submit`,
+    method: 'post',
+    data: data
+  })
 }
 //拜访计划基本信息详情
 export function getPlanDetail(id) {
-    return request({
-      url: '/mk/bo/plan/' + id,
-      method: 'get',
-    })
+  return request({
+    url: '/mk/bo/plan/' + id,
+    method: 'get',
+  })
 }
 //拜访计划基本子表详情
 export function getPlanSonDetail(planId) {
-    return request({
-      url: `/mk/bo/item/` + planId,
-      method: 'get',
-    })
+  return request({
+    url: `/mk/bo/item/` + planId,
+    method: 'get',
+  })
 }
 //拜访计划删除
 export function delPlan(id) {
-    return request({
-        url: '/mk/bo/plan/' + id,
-        method: 'delete'
-    })
-}
-//拜访计划明细删除
-export function delPlanItem(id) {
-    return request({
-        url: '/mk/bo/item/' + id,
-        method: 'delete'
-    })
+  return request({
+    url: '/mk/bo/plan/' + id,
+    method: 'delete'
+  })
 }
 //拜访计划导出
 export function exportPlan(data) {
-    return request({
-      url: `/mk/bo/plan/export`,
-      method: 'post',
-      data: data,
-      responseType: 'blob'
-    })
-}
+  return request({
+    url: `/mk/bo/plan/export`,
+    method: 'post',
+    data: data,
+    responseType: 'blob'
+  })
+}

src/views/business/spd/bo/plan/add.vue

@@ -98,7 +98,7 @@
           <div>
             <el-button type="primary" size="mini" @click="addLine" v-if="!sonDisable">增行</el-button>
             <el-button type="primary" size="mini" @click="copy" v-if="sonPageStu == 'check'">复制</el-button>
-            <el-button type="primary" size="mini" @click="delItems" v-if="sonPageStu == 'edit'">批量删除</el-button>
+            <el-button type="primary" size="mini" @click="delItems" v-if="sonPageStu != 'check'">批量删除</el-button>
             <el-button type="primary" size="mini" @click="edit" v-if="sonPageStu == 'check' && basicForm.state == '0'">
               编辑</el-button>
           </div>
@@ -220,8 +220,7 @@
   import {
     addPlan,
     getPlanDetail,
-    editPlan,
-    delPlanItem
+    editPlan
   } from '@/api/business/spd/task_management/visitingPlan/visitingPlan.js'
   import Refers from '@/components/Refers/refers.vue'
   // 用于回显参照框数据
@@ -280,6 +279,7 @@
         deptOptions: [],
         customerOptions: [],
         salesAreaOptions: [],
+        selection: [],
         //定义主表开始时间的范围不能早于今天
         pickerOptionsStart: {
           disabledDate: (time) => {
@@ -313,6 +313,7 @@
         console.log('数据', this.row)
         this.getDetails(this.row)
       } else if (this.pageStu == 'edit') {
+        console.log('数据', this.row)
         this.getDetails(this.row)
       } else if (this.pageStu == 'add') {
         //新增时默认带出7条明细行
@@ -374,7 +375,6 @@
       getDetails(row) {
         getPlanDetail(row.id).then(res => {
           if (res.code === 200) {
-            // console.log('res', res)
             this.basicForm = res.data
             this.basicForm.startDate = this.basicForm.startDate + ' 00:00:00'
             this.basicForm.deadlineTime = this.basicForm.deadlineTime + ' 00:00:00'
@@ -473,16 +473,12 @@
       // 批量删除按钮
       delItems() {
         if (this.ids.length == 0) {
-          this.$modal.msgWarning("请选中至少一条数据");
+          this.$modal.msgWarning("请至少选择一条数据");
         } else {
-          let param = this.ids.join()
           this.$modal.confirm('确认信息').then(() => {
-            delPlanItem(param).then(res => {
-              if (res.code === 200) {
-                this.$modal.notifySuccess("删除成功");
-                this.getDetails(this.row)
-              }
-            })
+            for (let i = 0; i < this.selection.length; i++) {
+              this.delLine({}, this.selection[i]);
+            }
           }).catch(() => {})
         }
       },
@@ -523,6 +519,7 @@
       },
       handleSelectionChange(selection) {
         console.log('选中', selection)
+        this.selection = selection;
         this.ids = selection.map(item => item.id)
         console.log('选中数组', this.ids.join())
       },

src/views/business/spd/bo/plan/index.vue

@@ -122,16 +122,6 @@
         <div class="btn_grooup">
           <el-button type="primary" size="mini" @click="addDivision">新增</el-button>
 
-          <!-- <el-dropdown size="mini" @command="handleCommand">
-            <el-button size="mini" type="primary" style="margin-left: 10px;">
-            导入<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="数据导入">数据导入</el-dropdown-item>
-            <el-dropdown-item command="模板下载">模板下载</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown> -->
-
           <el-dropdown size="mini" @command="handleExport">
             <el-button size="mini" type="primary" style="margin: 0 10px;">
               导出<i class="el-icon-arrow-down el-icon--right"></i>
@@ -142,7 +132,7 @@
             </el-dropdown-menu>
           </el-dropdown>
 
-          <el-button type="primary" size="mini" @click="delItems">删除</el-button>
+          <el-button type="primary" size="mini" @click="delItems">批量删除</el-button>
           <!-- <el-button type="primary" size="mini">打印</el-button> -->
         </div>
 
@@ -330,73 +320,10 @@
         this.ids = selection.map(item => item.id)
         console.log('选中数组', this.ids.join())
       },
-      // mbDownload() {
-      //   downLoadDemand(this.download).then(res => {
-      //     console.log('下载的文件流', res)
-      //     const blob = new Blob([res], {
-      //       type: "application/vnd.ms-excel;charset=UTF-8",
-      //     });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
-      //     const downloadElement = document.createElement("a"); //创建a标签
-      //     const href = window.URL.createObjectURL(blob); // 创建下载的链接
-      //     // var temp = res.headers["content-disposition"]; 
-      //     // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码）
-      //     // var name = fileName.split(";")[0]; //切割成文件名
-      //     downloadElement.href = href;  //下载地址
-      //     downloadElement.download = '模板'; // 下载后文件名
-      //     document.body.appendChild(downloadElement);
-      //     downloadElement.click(); // 点击下载
-      //     document.body.removeChild(downloadElement); // 下载完成移除元素
-      //     window.URL.revokeObjectURL(href); // 释放blob对象
-      //     this.download.open = false
-      //   })
-      // },
-      // // 关闭模板下载弹窗清空参数
-      // clearDownload() {
-      //   // 模板下载参数
-      //   this.download =  {
-      //     open: false,
-      //     customer: '',
-      //     warehouse: '',
-      //     warehouseId: '',
-      //     cargoSpace: '',
-      //     category: ''
-      //   }
-      // },
-      handleCommand(command) {
-        // alert(command)
-        if (command == '模板下载') {
-          this.download.open = true
-        }
-        if (command == '数据导入') {
-          this.upload.title = "用户导入"
-          this.upload.open = true
-        }
-      },
-      // 文件上传中处理
-      handleFileUploadProgress(event, file, fileList) {
-        this.upload.isUploading = true;
-      },
-      // 文件上传成功处理
-      handleFileSuccess(response, file, fileList) {
-        this.upload.open = false;
-        this.upload.isUploading = false;
-        this.$refs.upload.clearFiles();
-        this.$alert(response.msg, "导入结果", {
-          dangerouslyUseHTMLString: true
-        });
-        this.getList(this.queryParams);
-      },
-      errorFile(err) {
-        this.$modal.notifyError("文件已变动，请重新上传");
-      },
-      // 提交上传文件
-      submitFileForm() {
-        this.$refs.upload.submit();
-      },
       handleExport(command) {
         if (command == '选中导出') {
           if (this.ids.length == 0) {
-            this.$modal.msgWarning("请选中至少一条数据");
+            this.$modal.msgWarning("请至少选择一条数据");
           } else {
             let param = {
               all: false,
@@ -486,7 +413,7 @@
       // 批量删除按钮
       delItems() {
         if (this.ids.length == 0) {
-          this.$modal.msgWarning("请选中至少一条数据");
+          this.$modal.msgWarning("请至少选择一条数据");
         } else {
           let param = this.ids.join()
           this.$modal.confirm('确认信息').then(() => {