1

liuying

2024-04-25 aa5c2185f0e249d42f7bb2a198d23a420cf92bc5

1

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/addForm.vue

@@ -13,7 +13,7 @@
        </a-form-item>
        <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入类型" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入类型ID！'}]}]" /> -->
          <a-select style="width: 100%" placeholder="请选择类型" v-decorator="['containerTypeId']">
          <a-select style="width: 100%" placeholder="请选择类型" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入类型！'}]}]">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.id">{{
              item.typeName }}</a-select-option>
          </a-select>
@@ -24,10 +24,9 @@
        </a-form-item> -->
        <a-form-item label="容器关系" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入容器关系ID"
            v-decorator="['packagingId', { rules: [{ required: true, message: '请输入容器关系ID！' }] }]" /> -->

          <a-select style="width: 100%" placeholder="请选择容器关系" v-decorator="['packagingId']">
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.containerTypeId">{{
            v-decorator="['packagingId', { rules: [{ required: true, message: '请输入容器关系！' }] }]" /> -->
          <a-select style="width: 100%" placeholder="请选择容器关系" v-decorator="['packagingId', { rules: [{ required: true, message: '请输入容器关系！' }] }]">
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.id">{{
              item.containerTypeName }}</a-select-option>
          </a-select>

@@ -60,7 +59,8 @@
          <a-input placeholder="请输入父容器Id" v-decorator="['parentContainerId']" />
        </a-form-item> -->
        <a-form-item label="是否虚拟" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-input-number placeholder="请输入是否虚拟" style="width: 100%" v-decorator="['isVirtually']" />
          <!-- <a-input-number placeholder="请输入是否虚拟" style="width: 100%" v-decorator="['isVirtually']" /> -->
          <a-switch v-decorator="['isVirtually', { valuePropName: 'checked' }]" />
        </a-form-item>
        <a-form-item label="是否禁用" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <a-switch v-decorator="['isDisabled', { valuePropName: 'checked' }]" />

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainer/editForm.vue

@@ -13,8 +13,8 @@
        </a-form-item>
        <a-form-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入类型" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入类型ID！'}]}]" /> -->
          <a-select style="width: 100%" placeholder="请选择类型" v-decorator="['containerTypeId']">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.typeCode">{{
          <a-select style="width: 100%" placeholder="请选择类型" v-decorator="['containerTypeId', {rules: [{required: true, message: '请输入类型！'}]}]">
            <a-select-option v-for="(item, index) in selectTypeData" :key="index" :value="item.id">{{
              item.typeName }}</a-select-option>
          </a-select>

@@ -25,8 +25,7 @@
        <a-form-item label="容器关系" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
          <!-- <a-input placeholder="请输入容器关系ID"
            v-decorator="['packagingId', { rules: [{ required: true, message: '请输入容器关系ID！' }] }]" /> -->

          <a-select style="width: 100%" placeholder="请选择容器关系" v-decorator="['packagingId']">
          <a-select style="width: 100%" placeholder="请选择容器关系" v-decorator="['packagingId', { rules: [{ required: true, message: '请输入容器关系ID！' }] }]">
            <a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.containerTypeId">{{
              item.containerTypeName }}</a-select-option>
          </a-select>

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

@@ -68,22 +68,27 @@
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="父容器名称">
                  <a-input v-model="queryParam.parentContainerName" allow-clear placeholder="请输入父容器名称"/>
                                        <a-input v-model="queryParam.parentContainerName" allow-clear
                                            placeholder="请输入父容器名称" />
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="父容器Id">
                  <a-input v-model="queryParam.parentContainerId" allow-clear placeholder="请输入父容器Id"/>
                                        <a-input v-model="queryParam.parentContainerId" allow-clear
                                            placeholder="请输入父容器Id" />
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="是否虚拟">
                  <a-input-number v-model="queryParam.isVirtually" style="width: 100%" allow-clear placeholder="请输入是否虚拟"/>
                                        <a-input-number v-model="queryParam.isVirtually" style="width: 100%" allow-clear
                                            placeholder="请输入是否虚拟" />
                </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.isDisabled" placeholder="请选择是否禁用">
                        <a-select-option v-for="(item,index) in isDisabledData" :key="index" :value="item.code">{{ item.name }}</a-select-option>
                                        <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isDisabled"
                                            placeholder="请选择是否禁用">
                                            <a-select-option v-for="(item, index) in isDisabledData" :key="index"
                                                :value="item.code">{{ item.name }}</a-select-option>
                    </a-select>
                </a-form-item>
            </a-col>
@@ -93,7 +98,10 @@
                <a-col :md="8" :sm="24">
                    <a-form-item label="创建时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.createdTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangecreatedTime"/>
                                            format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                                        }"
                                            v-model="queryParam.createdTime" value-format="YYYY-MM-DD HH:mm:ss"
                                            format="YYYY-MM-DD HH:mm:ss" @change="onChangecreatedTime" />

                    </a-form-item>
                </a-col>
@@ -103,7 +111,10 @@
                <a-col :md="8" :sm="24">
                    <a-form-item label="更新时间">
                        <a-range-picker style="width: 100%" :placeholder="['开始时间', '结束时间']"  :show-time="{
format: 'HH:mm:ss',  defaultValue: [moment('00:00:00', 'HH:mm:ss'),moment('23:59:59', 'HH:mm:ss')]}" v-model="queryParam.updatedTime"  value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss"   @change="onChangeupdatedTime"/>
                                            format: 'HH:mm:ss', defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                                        }"
                                            v-model="queryParam.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
                                            format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />

                    </a-form-item>
                </a-col>
@@ -135,27 +146,33 @@
    </a-card>
    </div>
    <a-card :bordered="false">
      <s-table
        ref="table"
        :columns="columns"
        :data="loadData"
        :alert="true"
        @changeTablePage="pageInfo = $event"
        :scroll="{x: true,y:tableHeight}"
        :rowKey="(record) => record.id"
            <s-table ref="table" :columns="columns" :data="loadData" :alert="true" @changeTablePage="pageInfo = $event"
                :scroll="{ x: true, y: tableHeight }" :rowKey="(record) => record.id"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
        <template class="table-operator" slot="operator" v-if="hasPerm('WmsContainer:add')" >
        <div ref="actionBar" class="actionBar">
            <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
                        <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload"
                            @click="$refs.excelForm.index()">
            导入
          </a-button>
          <a-button type="info" v-if="hasPerm('WmsContainer:exportExcel')" icon="download" @click="WmsContainerToExcel()">
                        <a-button type="info" v-if="hasPerm('WmsContainer:exportExcel')" icon="download"
                            @click="WmsContainerToExcel()">
            导出
          </a-button>
            <a-button type="primary" v-if="hasPerm('WmsContainer:add')" icon="plus" @click="$refs.addForm.add()">新增容器信息</a-button>
                        <a-button type="primary" v-if="hasPerm('WmsContainer:add')" icon="plus"
                            @click="$refs.addForm.add()">新增容器信息</a-button>
        </div>
        </template>
          <span slot="isDisabledscopedSlots" slot-scope="text">
                    <div v-if="text === true">
                        <a-tag color="green">是</a-tag>
                    </div>
                    <div v-else-if="text == false">
                        <a-tag color="volcano">否</a-tag>
                    </div>
                    <div v-else=""></div>
                </span>
                <span slot="isVirtuallyscopedSlots" slot-scope="text">
            <div v-if="text===true ">
                <a-tag color="green">是</a-tag>
            </div>
@@ -168,7 +185,8 @@
            
            <a v-if="hasPerm('WmsContainer:edit')" @click="$refs.editForm.edit(record)">编辑</a>
          <a-divider type="vertical" v-if="hasPerm('WmsContainer:edit') & hasPerm('WmsContainer:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsContainer:delete')" placement="topRight" title="确认删除？" @confirm="() => WmsContainerDelete(record)">
                    <a-popconfirm v-if="hasPerm('WmsContainer:delete')" placement="topRight" title="确认删除？"
                        @confirm="() => WmsContainerDelete(record)">
            <a>删除</a>
          </a-popconfirm>
        </span>
@@ -253,26 +271,26 @@
    sorter: true,
    dataIndex: 'containerName'
    },
    {
    title: '类型ID',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'containerTypeId'
    },
                // {
                //     title: '类型ID',
                //     align: 'center',
                //     customHeaderCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     customCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     sorter: true,
                //     dataIndex: 'containerTypeId'
                // },
    {
    title: '类型名称',
    align: 'center',
@@ -473,45 +491,46 @@
    sorter: true,
    dataIndex: 'parentContainerName'
    },
    {
    title: '父容器Id',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'parentContainerId'
    },
                // {
                //     title: '父容器Id',
                //     align: 'center',
                //     customHeaderCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     customCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     sorter: true,
                //     dataIndex: 'parentContainerId'
                // },
    {
    title: '是否虚拟',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '80px'//最小列宽设置
                                'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '80px'//最小列宽设置
                                'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'isVirtually'
                    dataIndex: 'isVirtually',
                    scopedSlots: { customRender: 'isVirtuallyscopedSlots' }
    },
    {
    title: '是否禁用',
@@ -756,7 +775,7 @@
  .table-operator {
    margin-bottom: 18px;
  }

  button {
    margin-right: 8px;
  }
</style>
}</style>