t Merge branch 'master' of http://git.xdadan.loc/tanex/emis-frontend

src/components/XdTable/index.vue

@@ -696,7 +696,7 @@ export default {
                       if (selDiv) {
                         xdTableObj.getElementsByClassName("el-table__body-wrapper")[0].removeChild(selDiv);
                       }
-                      selList = null, _x = null, _y = null, selDiv = null, startX = null, startY = null, evt = null;
+                      selList = [], _x = null, _y = null, selDiv = null, startX = null, startY = null, evt = null;
                       vnode.context.mouseflag = false;
                       vnode.context.handleBatchSelect();
                       // cancelContextMenu();

src/views/emis/emisQuotePrice/transQuotePriceList.vue

@@ -158,6 +158,7 @@
                   type="primary"
                   plain
                   size="mini"
+                  :disabled="batchAdd"
                   @click="handleBatchAdd"
                 >批量新增</el-button>
            </el-col>
@@ -400,6 +401,8 @@ export default {
       tmpDataList: [],
       selectionList:[],
       selectionIndexList: [],
+      //非批量新增禁用
+      batchAdd:true,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -479,6 +482,7 @@ export default {
 
     /** 搜索按钮操作 */
     handleQuery() {
+      this.batchAdd = true;
       this.queryParams.pageNum = 1;
       this.getList();
     },
@@ -531,7 +535,8 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      if( row.quoteId || this.ids.length>1){
+      //ids去掉空元素
+      if( row.quoteId || this.ids.filter(Boolean).length>1){
       this.resetRefreshId="vipquote-"+this.getUUID();
       this.currentId = row.quoteId || this.ids;
       this.openForm = true;
@@ -702,6 +707,7 @@ export default {
       loadingInstance.close()
     },
     batchImpDataForm() {
+      this.batchAdd = false;
       // 判断是否有数据
       if(this.tmpDataList.length==0){
         this.$modal.msgError('表格中没有数据');