|  | @@ -120,6 +120,7 @@
 | 
	
		
			
				|  |  |            style="width: 200px"
 | 
	
		
			
				|  |  |            clearable
 | 
	
		
			
				|  |  |            size="small"
 | 
	
		
			
				|  |  | +          placeholder="请选择分组条件"
 | 
	
		
			
				|  |  |          >
 | 
	
		
			
				|  |  |            <el-option
 | 
	
		
			
				|  |  |              v-for="(dict, index) in isCntrnoOptions"
 | 
	
	
		
			
				|  | @@ -148,15 +149,28 @@
 | 
	
		
			
				|  |  |              size="small"
 | 
	
		
			
				|  |  |          />
 | 
	
		
			
				|  |  |        </el-form-item>
 | 
	
		
			
				|  |  | -      <el-form-item>
 | 
	
		
			
				|  |  | -        <el-button
 | 
	
		
			
				|  |  | -          type="cyan"
 | 
	
		
			
				|  |  | -          icon="el-icon-search"
 | 
	
		
			
				|  |  | -          size="mini"
 | 
	
		
			
				|  |  | -          @click="handleQuery"
 | 
	
		
			
				|  |  | -          >搜索</el-button>
 | 
	
		
			
				|  |  | -        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 | 
	
		
			
				|  |  | +      <el-form-item label="显示库存" prop="isMblno">
 | 
	
		
			
				|  |  | +        <el-select
 | 
	
		
			
				|  |  | +          v-model="queryParams.isMblno"
 | 
	
		
			
				|  |  | +          filterable
 | 
	
		
			
				|  |  | +          remote
 | 
	
		
			
				|  |  | +          style="width: 200px"
 | 
	
		
			
				|  |  | +          clearable
 | 
	
		
			
				|  |  | +          size="small"
 | 
	
		
			
				|  |  | +        >
 | 
	
		
			
				|  |  | +          <el-option
 | 
	
		
			
				|  |  | +            label="是"
 | 
	
		
			
				|  |  | +            :value="1"
 | 
	
		
			
				|  |  | +          ></el-option>
 | 
	
		
			
				|  |  | +          <el-option
 | 
	
		
			
				|  |  | +            label="否"
 | 
	
		
			
				|  |  | +            :value="0"
 | 
	
		
			
				|  |  | +          ></el-option>
 | 
	
		
			
				|  |  | +        </el-select>
 | 
	
		
			
				|  |  |        </el-form-item>
 | 
	
		
			
				|  |  | +<!--      <el-form-item>-->
 | 
	
		
			
				|  |  | +<!--        -->
 | 
	
		
			
				|  |  | +<!--      </el-form-item>-->
 | 
	
		
			
				|  |  |      </el-form>
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      <el-row :gutter="10" class="mb8">
 | 
	
	
		
			
				|  | @@ -170,6 +184,13 @@
 | 
	
		
			
				|  |  |              v-hasPermi="['warehouseBusiness:whgenleg:export']"
 | 
	
		
			
				|  |  |              >导出</el-button
 | 
	
		
			
				|  |  |            >
 | 
	
		
			
				|  |  | +          <el-button
 | 
	
		
			
				|  |  | +            type="cyan"
 | 
	
		
			
				|  |  | +            icon="el-icon-search"
 | 
	
		
			
				|  |  | +            size="mini"
 | 
	
		
			
				|  |  | +            @click="handleQuery"
 | 
	
		
			
				|  |  | +          >搜索</el-button>
 | 
	
		
			
				|  |  | +          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
 | 
	
		
			
				|  |  |          </el-col>
 | 
	
		
			
				|  |  |          <right-toolbar
 | 
	
		
			
				|  |  |            :showSearch.sync="showSearch"
 | 
	
	
		
			
				|  | @@ -265,7 +286,8 @@
 | 
	
		
			
				|  |  |        >
 | 
	
		
			
				|  |  |          <template slot-scope="scope">
 | 
	
		
			
				|  |  |            <span v-if="item.label == 'fMblno'">
 | 
	
		
			
				|  |  | -            <el-link :underline="false" type="primary"
 | 
	
		
			
				|  |  | +            <span v-if="queryParams.isCntrno == 2">{{ scope.row.fMblno }}</span>
 | 
	
		
			
				|  |  | +            <el-link v-else :underline="false" type="primary"
 | 
	
		
			
				|  |  |                ><div @click="goDetail(scope.row)">
 | 
	
		
			
				|  |  |                  {{ scope.row.fMblno }}
 | 
	
		
			
				|  |  |                </div></el-link
 | 
	
	
		
			
				|  | @@ -464,7 +486,7 @@ export default {
 | 
	
		
			
				|  |  |          pageNum: 1,
 | 
	
		
			
				|  |  |          pageSize: 50,
 | 
	
		
			
				|  |  |          fOriginalbillno: null,
 | 
	
		
			
				|  |  | -        isCntrno: 1,
 | 
	
		
			
				|  |  | +        isCntrno: null,
 | 
	
		
			
				|  |  |          fPreqty: null,
 | 
	
		
			
				|  |  |          fLocalcntrno: null,
 | 
	
		
			
				|  |  |          fPregrossweight: null,
 |