|  | @@ -80,10 +80,10 @@
 | 
	
		
			
				|  |  |          </el-col>
 | 
	
		
			
				|  |  |          <el-col :span="19">
 | 
	
		
			
				|  |  |            <!-- <basic-container> -->
 | 
	
		
			
				|  |  | -          <avue-crud :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="cruds"
 | 
	
		
			
				|  |  | +          <avue-crud :search.sync="query" :option="optionTwo" :table-loading="loading" :data="goodsListShow" ref="cruds"
 | 
	
		
			
				|  |  |              :reserve-selection="true" @refresh-change="refreshChangeCost" @selection-change="selectionChangeCost"
 | 
	
		
			
				|  |  | -            @search-change="goodsSearchCost" :page.sync="pages" @on-load="onLoad" @saveColumn="saveGoodsColumn"
 | 
	
		
			
				|  |  | -            @resetColumn="resetGoodsColumn">
 | 
	
		
			
				|  |  | +            @search-change="goodsSearchCost" @search-reset="goodsresetChange" :page.sync="pages" @on-load="onLoad"
 | 
	
		
			
				|  |  | +            @saveColumn="saveGoodsColumn" @resetColumn="resetGoodsColumn">
 | 
	
		
			
				|  |  |              <template slot="menuLeft">
 | 
	
		
			
				|  |  |                <el-tabs v-model="activeName" @tab-click="tabHandle">
 | 
	
		
			
				|  |  |                  <el-tab-pane label="查询结果" name="searchList" />
 | 
	
	
		
			
				|  | @@ -136,8 +136,7 @@
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |              <template slot-scope="scope" slot="menu">
 | 
	
		
			
				|  |  |                <el-button type="text" icon="el-icon-edit" size="small" @click.stop="importStagList(scope.row, scope.index)"
 | 
	
		
			
				|  |  | -                v-if="activeName == 'searchList'"
 | 
	
		
			
				|  |  | -                :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
 | 
	
		
			
				|  |  | +                v-if="activeName == 'searchList'" :disabled="goodsListSave.findIndex(item => item.id == scope.row.id) !== -1">选择
 | 
	
		
			
				|  |  |                </el-button>
 | 
	
		
			
				|  |  |                <el-button type="text" icon="el-icon-delete" size="small"
 | 
	
		
			
				|  |  |                  @click.stop="removeStagList(scope.row, scope.index)" v-else>移除
 | 
	
	
		
			
				|  | @@ -215,13 +214,15 @@ export default {
 | 
	
		
			
				|  |  |    name: "index",
 | 
	
		
			
				|  |  |    data() {
 | 
	
		
			
				|  |  |      return {
 | 
	
		
			
				|  |  | +      query: {
 | 
	
		
			
				|  |  | +        whether: 0
 | 
	
		
			
				|  |  | +      },
 | 
	
		
			
				|  |  |        action: "/api/blade-resource/oss/endpoint/put-file",
 | 
	
		
			
				|  |  |        headers: { "Blade-Auth": "Bearer " + getToken() },
 | 
	
		
			
				|  |  |        orderList: [],
 | 
	
		
			
				|  |  |        enclosure: false,
 | 
	
		
			
				|  |  |        dataId: 0,
 | 
	
		
			
				|  |  |        rowImg: [],
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |        data: [],
 | 
	
		
			
				|  |  |        sharedCompanyoptions: [],
 | 
	
		
			
				|  |  |        activeName: 'searchList',
 | 
	
	
		
			
				|  | @@ -672,7 +673,7 @@ export default {
 | 
	
		
			
				|  |  |        this.selectionList = list
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      selectionChangeCost(list) {
 | 
	
		
			
				|  |  | -      this.goodsListSave = list
 | 
	
		
			
				|  |  | +      // this.goodsListSave = list
 | 
	
		
			
				|  |  |        this.tableData = list
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      //新增
 | 
	
	
		
			
				|  | @@ -697,10 +698,10 @@ export default {
 | 
	
		
			
				|  |  |      // 标签页切换
 | 
	
		
			
				|  |  |      tabHandle(data) {
 | 
	
		
			
				|  |  |        if (data.name == 'searchList') {
 | 
	
		
			
				|  |  | -        this.goodsListShow = this.data;
 | 
	
		
			
				|  |  | +        this.goodsListShow =this.data ;
 | 
	
		
			
				|  |  |          this.page.total = this.pageList.total
 | 
	
		
			
				|  |  |        } else if (data.name == 'importStaging') {
 | 
	
		
			
				|  |  | -        this.goodsListShow = this.goodsListSave;
 | 
	
		
			
				|  |  | +        this.goodsListShow =this.goodsListSave;
 | 
	
		
			
				|  |  |          this.page.total = 0
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
	
		
			
				|  | @@ -720,6 +721,7 @@ export default {
 | 
	
		
			
				|  |  |            this.$set(this.optionPolicy, 'menu', true)
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |        } else {
 | 
	
		
			
				|  |  | +        console.log(row)
 | 
	
		
			
				|  |  |          this.goodsListSave.splice(row.$index, 1)
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
	
		
			
				|  | @@ -774,11 +776,15 @@ export default {
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      resetChange() {
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |        if (document.getElementsByClassName("is-current")[0]) {
 | 
	
		
			
				|  |  |          let selected = document.getElementsByClassName("is-current")[0]
 | 
	
		
			
				|  |  |          selected.classList.remove("is-current")
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | +    goodsresetChange() {
 | 
	
		
			
				|  |  | +      this.query = this.$options.data().query;
 | 
	
		
			
				|  |  | +    },
 | 
	
		
			
				|  |  |      check(row) {
 | 
	
		
			
				|  |  |        batchOperationProductLaunch({
 | 
	
		
			
				|  |  |          flag: row.upAndDownShelves,
 |