修改bug

src/assets/styles/index.scss

@@ -203,7 +203,7 @@ aside {
 /**修改全局的滚动条*/
 /**滚动条的宽度*/
 ::-webkit-scrollbar {
-  width: 8px;
+  width: 12px;
 }
 ::-webkit-scrollbar-thumb {
   background-color: #eaecf1;
@@ -211,8 +211,8 @@ aside {
 }
 /*表格*/
 .el-table__body-wrapper::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
+  width: 12px;
+  height: 12px;
 }
 .el-table__body-wrapper::-webkit-scrollbar-thumb {
   background-color: #a1a3a9;

src/views/purchase/DemandSummary/index.vue

@@ -207,15 +207,9 @@
           <el-button type="primary" size="mini" v-if="lineDisable" @click="audits">审核</el-button>
           <el-button type="primary" size="mini" v-if="lineDisable" @click="closeLine">行关闭</el-button>
 
-          <el-dropdown size="mini" v-if="lineDisable" @command="handleCommand">
-            <el-button size="mini" type="primary" style="margin: 0 10px;">
-              导出<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="Excel导出">Excel导出</el-dropdown-item>
-              <el-dropdown-item command="导出明细">导出明细</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
+          <el-button size="mini" type="primary" style="margin: 0 10px;" v-if="lineDisable" @click="handleCommand">
+            导出
+          </el-button>
 
           <!-- <el-button type="primary" size="mini">转请购</el-button> -->
         </div>
@@ -587,54 +581,26 @@ export default {
       this.ids = selection.map(item => item.demandItemId)
       console.log('选中数组', this.ids.join())
     },
-    handleCommand(command) {
-      if(command == 'Excel导出') {
-        if(this.allSelection.length == 0) {
-          this.$modal.notifyWarning("请选中至少一条数据");
-        } else {
-          exportList(this.allSelection).then(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 = '导出Excel'; // 下载后文件名
-            document.body.appendChild(downloadElement);
-            downloadElement.click(); // 点击下载
-            document.body.removeChild(downloadElement); // 下载完成移除元素
-            window.URL.revokeObjectURL(href); // 释放blob对象
-          })
-        }
-      }
-
-      if (command == '导出明细') {
-        if (this.allSelection.length == 0 || this.allSelection.length > 1) {
-          this.$modal.notifyWarning("明细只能进行单条导出！");
-        } else {
-          let param = this.queryParams
-          param.sumFlag = this.allSelection[0].sumFlag
-          exportItems(param).then(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对象
-          })
-        }
-      }
+    handleCommand() {
+      this.$modal.loading("正在导出数据，请稍后...");
+      let param = this.queryParams
+      exportItems(param).then(res => {
+        this.$modal.closeLoading();
+        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 = '采购需求处理导出明细'+ this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
+        document.body.appendChild(downloadElement);
+        downloadElement.click(); // 点击下载
+        document.body.removeChild(downloadElement); // 下载完成移除元素
+        window.URL.revokeObjectURL(href); // 释放blob对象
+      })
     },
     check(row) {
       this.isList = false

src/views/purchase/PurchaseDemandList/add.vue

@@ -1182,6 +1182,7 @@ export default {
         await getRefer({ type: 'MATERIAL_PARAM', materialCodeList: rows }).then(res => {
           if (res.code === 200) {
             let rowList = res.rows
+            let newLine = []
             for (let i = 0; i<rowList.length; i++) {
             let line = {
               contacts: null,
@@ -1322,9 +1323,11 @@ export default {
               // 物料存储条件和运输条件
               line.transportationCondition = rowList[i].transportationCondition
               line.storageCondition = rowList[i].storageCondition
-              this.basicForm.puDemandItemList.push(line)
-              // console.log('临时数组', line)
+              newLine.push(line)
+              console.log('临时数组', newLine)
             }
+            // 删除指定下标
+            this.basicForm.puDemandItemList.splice(index,1,...newLine)
             this.$modal.notifySuccess("共粘贴" + rowList.length + '条数据');
           }
         }).catch(err => {
@@ -1418,6 +1421,7 @@ export default {
       // 选中骨科耗材时候的物料，需求客户不必填
       } else {
         console.log('xxxxx', selection)
+        let newLine = []
         for (let i = 0;i<selection.length;i++) {
           let line = {
             contacts: null,
@@ -1565,10 +1569,12 @@ export default {
           // 物料存储条件和运输条件
           line.transportationCondition = selection[i].transportationCondition
           line.storageCondition = selection[i].storageCondition
-          this.basicForm.puDemandItemList.push(line)
+          // this.basicForm.puDemandItemList.push(line)
+          newLine.push(line)
         }
         // 删除指定下标
-        this.basicForm.puDemandItemList.splice(this.tableIndex,1)
+        this.basicForm.puDemandItemList.splice(this.tableIndex,1,...newLine)
+        // this.basicForm.puDemandItemList.splice(this.tableIndex,1)
       }
     },
     // 明细行选择业务部门参照带出业务部门数据

src/views/purchase/PurchaseDemandList/index.vue

@@ -536,8 +536,10 @@ export default {
         if (this.ids.length == 0) {
           this.$modal.notifyWarning("请选中至少一条数据");
         } else {
+          this.$modal.loading("正在导出数据，请稍后...");
           let param = {all: false, ids: this.ids}
           exportDemand(param).then(res => {
+            this.$modal.closeLoading();
             const blob = new Blob([res], {
               type: "application/vnd.ms-excel;charset=UTF-8",
             });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
@@ -547,7 +549,7 @@ export default {
             // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码）
             // var name = fileName.split(";")[0]; //切割成文件名
             downloadElement.href = href;  //下载地址
-            downloadElement.download = '选中导出'; // 下载后文件名
+            downloadElement.download = '采购需求单选中导出' + this.parseTime(new Date().getTime()) + ".xlsx"; // 下载后文件名
             document.body.appendChild(downloadElement);
             downloadElement.click(); // 点击下载
             document.body.removeChild(downloadElement); // 下载完成移除元素
@@ -555,8 +557,10 @@ export default {
           })
         }
       } else {
+        this.$modal.loading("正在导出数据，请稍后...");
         let param2 = {all: true}
         exportDemand(param2).then(res => {
+          this.$modal.closeLoading();
           const blob = new Blob([res], {
             type: "application/vnd.ms-excel;charset=UTF-8",
           });// 创建一个类文件对象：Blob对象表示一个不可变的、原始数据的类文件对象
@@ -566,7 +570,7 @@ export default {
           // var fileName = decodeURIComponent(temp.split("filename=")[1]); // 中文需要转码 (前端乱码）
           // var name = fileName.split(";")[0]; //切割成文件名
           downloadElement.href = href;  //下载地址
-          downloadElement.download = '全部导出'; // 下载后文件名
+          downloadElement.download = '采购需求单全部导出' + this.parseTime(new Date().getTime()) + ".xlsx"; 
           document.body.appendChild(downloadElement);
           downloadElement.click(); // 点击下载
           document.body.removeChild(downloadElement); // 下载完成移除元素