|  | @@ -2226,7 +2226,16 @@
 | 
											
												
													
														|  |                />
 |  |                />
 | 
											
												
													
														|  |              </el-form-item>
 |  |              </el-form-item>
 | 
											
												
													
														|  |            </el-col>
 |  |            </el-col>
 | 
											
												
													
														|  | -          <el-col :span="10">
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <el-col :span="5">
 | 
											
												
													
														|  | 
 |  | +            <el-form-item label="属性详情" prop="fMarks" label-width="70px">
 | 
											
												
													
														|  | 
 |  | +              <el-input
 | 
											
												
													
														|  | 
 |  | +                v-model="whgenlegParams.fMarks"
 | 
											
												
													
														|  | 
 |  | +                placeholder="请输入属性详情"
 | 
											
												
													
														|  | 
 |  | +                clearable
 | 
											
												
													
														|  | 
 |  | +              />
 | 
											
												
													
														|  | 
 |  | +            </el-form-item>
 | 
											
												
													
														|  | 
 |  | +          </el-col>
 | 
											
												
													
														|  | 
 |  | +          <el-col :span="9">
 | 
											
												
													
														|  |              <el-form-item
 |  |              <el-form-item
 | 
											
												
													
														|  |                  label="入库日期区间"
 |  |                  label="入库日期区间"
 | 
											
												
													
														|  |                  prop="orgStorageDate"
 |  |                  prop="orgStorageDate"
 | 
											
										
											
												
													
														|  | @@ -2244,22 +2253,24 @@
 | 
											
												
													
														|  |                </el-date-picker>
 |  |                </el-date-picker>
 | 
											
												
													
														|  |              </el-form-item>
 |  |              </el-form-item>
 | 
											
												
													
														|  |            </el-col>
 |  |            </el-col>
 | 
											
												
													
														|  | -          <el-col :span="2">
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +        </el-row>
 | 
											
												
													
														|  | 
 |  | +        <el-row :gutter="10">
 | 
											
												
													
														|  | 
 |  | +          <div class="tabSetting">
 | 
											
												
													
														|  |              <el-button
 |  |              <el-button
 | 
											
												
													
														|  | -                type="cyan"
 |  | 
 | 
											
												
													
														|  | -                icon="el-icon-search"
 |  | 
 | 
											
												
													
														|  | -                @click="getDetailsList()"
 |  | 
 | 
											
												
													
														|  | 
 |  | +              type="cyan"
 | 
											
												
													
														|  | 
 |  | +              icon="el-icon-search"
 | 
											
												
													
														|  | 
 |  | +              @click="getDetailsList()"
 | 
											
												
													
														|  | 
 |  | +              style="margin-right: 10px"
 | 
											
												
													
														|  |              >搜索
 |  |              >搜索
 | 
											
												
													
														|  |              </el-button
 |  |              </el-button
 | 
											
												
													
														|  |              >
 |  |              >
 | 
											
												
													
														|  | -          </el-col>
 |  | 
 | 
											
												
													
														|  | -          <el-col :span="2" style="display: flex; justify-content: flex-end">
 |  | 
 | 
											
												
													
														|  |              <el-button
 |  |              <el-button
 | 
											
												
													
														|  | -                icon="el-icon-setting"
 |  | 
 | 
											
												
													
														|  | -                circle
 |  | 
 | 
											
												
													
														|  | -                @click="showSetting2 = !showSetting2"
 |  | 
 | 
											
												
													
														|  | 
 |  | +              icon="el-icon-setting"
 | 
											
												
													
														|  | 
 |  | +              circle
 | 
											
												
													
														|  | 
 |  | +              @click="showSetting2 = !showSetting2"
 | 
											
												
													
														|  |              ></el-button>
 |  |              ></el-button>
 | 
											
												
													
														|  | -          </el-col>
 |  | 
 | 
											
												
													
														|  | 
 |  | +          </div>
 | 
											
												
													
														|  |          </el-row>
 |  |          </el-row>
 | 
											
												
													
														|  |        </el-form>
 |  |        </el-form>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -3780,6 +3791,7 @@ export default {
 | 
											
												
													
														|  |          fCntrno: null,
 |  |          fCntrno: null,
 | 
											
												
													
														|  |          fMblno: null,
 |  |          fMblno: null,
 | 
											
												
													
														|  |          orgStorageDate: null,
 |  |          orgStorageDate: null,
 | 
											
												
													
														|  | 
 |  | +        fMarks: null
 | 
											
												
													
														|  |        },
 |  |        },
 | 
											
												
													
														|  |        stockoi: null,
 |  |        stockoi: null,
 | 
											
												
													
														|  |        fSalesmanId: [],
 |  |        fSalesmanId: [],
 |