Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWare...

liuying

2024-04-26 6567b4f21b306d8cf1e0290ad44d74401e8f7215

Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsWarehouse/index.vue

@@ -16,17 +16,17 @@
                <a-input v-model="queryParam.name" allow-clear placeholder="请输入仓库名称"/>
              </a-form-item>
            </a-col><template v-if="advanced">
              <a-col :md="8" :sm="24">
              <!-- <a-col :md="8" :sm="24">
                <a-form-item label="仓库地址">
                  <a-input v-model="queryParam.address" allow-clear placeholder="请输入仓库地址"/>
                </a-form-item>
              </a-col>
              </a-col> -->
              <a-col :md="8" :sm="24">
                <a-form-item label="工厂编号">
                  <a-input v-model="queryParam.factoryCode" allow-clear placeholder="请输入工厂编号"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
              <!-- <a-col :md="8" :sm="24">
                <a-form-item label="长">
                  <a-input v-model="queryParam.length" allow-clear placeholder="请输入长"/>
                </a-form-item>
@@ -50,7 +50,7 @@
                <a-form-item label="定位">
                  <a-input v-model="queryParam.position" allow-clear placeholder="请输入定位"/>
                </a-form-item>
              </a-col>
              </a-col> -->
            <a-col :md="8" :sm="24">
                <a-form-item label="是否禁用">
                    <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled" placeholder="请选择是否禁用">
@@ -59,11 +59,14 @@
                </a-form-item>
            </a-col>
        
              <a-col :md="8" :sm="24">
              <!-- <a-col :md="8" :sm="24">
                <a-form-item label="备注">
                  <a-input v-model="queryParam.remarks" allow-clear placeholder="请输入备注"/>
                </a-form-item>
              </a-col>          <!--年月日时分秒-->
              </a-col>         -->
			  
			 
            <!--年月日时分秒-->
            <!--时间范围-->

                <a-col :md="8" :sm="24">
@@ -84,7 +87,7 @@
                    </a-form-item>
                </a-col>
            
              <a-col :md="8" :sm="24">
              <!-- <a-col :md="8" :sm="24">
                <a-form-item label="创建人">
                  <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建人"/>
                </a-form-item>
@@ -93,7 +96,8 @@
                <a-form-item label="修改人">
                  <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改人"/>
                </a-form-item>
              </a-col>    </template>
              </a-col>     -->
            </template>

            <a-col :md="8" :sm="24" >
              <span class="table-page-search-submitButtons">