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

payne

2024-04-26 8b2085e487e014303fca40a3c373b78893c7895e

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

@@ -39,12 +39,12 @@
                           </a-form-item>
                        </a-col> -->
                        <a-col :md="8" :sm="24">
                           <a-form-item label="ERP代码">
                              <a-input v-model="queryParam.erpCode" allow-clear placeholder="请输入ERP代码" />
                           <a-form-item label="ERP库存地">
                              <a-input v-model="queryParam.erpCode" allow-clear placeholder="请输入ERP库存地" />
                           </a-form-item>
                        </a-col><a-col :md="8" :sm="24">
                           <a-form-item label="所属仓库">
                              <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId"
                              <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseCode"
                                 placeholder="请选择所属仓库">
                                 <a-select-option v-for="(item, index) in warehouseIdData" :key="index"
                                    :value="item.code">{{ item.name }}</a-select-option>
@@ -146,13 +146,13 @@
                        </a-col>

                        <a-col :md="8" :sm="24">
                           <a-form-item label="创建者名称">
                              <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建者名称" />
                           <a-form-item label="创建人">
                              <a-input v-model="queryParam.createdUserName" allow-clear placeholder="请输入创建人" />
                           </a-form-item>
                        </a-col>
                        <a-col :md="8" :sm="24">
                           <a-form-item label="修改者名称">
                              <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改者名称" />
                           <a-form-item label="修改人">
                              <a-input v-model="queryParam.updatedUserName" allow-clear placeholder="请输入修改人" />
                           </a-form-item>
                        </a-col> </template>

@@ -429,7 +429,7 @@
               dataIndex: 'areaStatus'
            },
            {
               title: 'ERP代码',
               title: 'ERP库存地',
               align: 'center',
               customHeaderCell: () => {
                  return {
@@ -657,7 +657,7 @@
               dataIndex: 'updatedTime'
            },
            {
               title: '创建者名称',
               title: '创建人',
               align: 'center',
               customHeaderCell: () => {
                  return {
@@ -677,7 +677,7 @@
               dataIndex: 'createdUserName'
            },
            {
               title: '修改者名称',
               title: '修改人',
               align: 'center',
               customHeaderCell: () => {
                  return {