bug
liuying
2024-04-25 9bf5dc5bc503172bf71b898434d8a23362aa789b
bug
已修改2个文件
1794 ■■■■ 文件已修改
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue 1751 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue 43 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/index.vue
@@ -1,898 +1,907 @@
<template>
  <div ref="boxOutWrap" class="boxOutWrap">
    <div ref="boxForm" class="boxForm">
    <a-card :bordered="false" :bodyStyle="tstyle">
    <div ref="boxOutWrap" class="boxOutWrap">
        <div ref="boxForm" class="boxForm">
            <a-card :bordered="false" :bodyStyle="tstyle">
      <div class="table-page-search-wrapper" v-if="hasPerm('WmsMaterial:page')">
        <a-form layout="inline">
          <a-row :gutter="48">
            <a-col :md="8" :sm="24">
              <a-form-item label="物料名称">
                <a-input v-model="queryParam.materialName" allow-clear placeholder="请输入物料名称"/>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="24">
              <a-form-item label="物料编号">
                <a-input v-model="queryParam.materialCode" allow-clear placeholder="请输入物料编号"/>
              </a-form-item>
            </a-col><template v-if="advanced">
              <a-col :md="8" :sm="24">
                <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-input v-model="queryParam.materialTypeName" allow-clear placeholder="请输入物料类型名称"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="物料类型描述">
                  <a-input v-model="queryParam.materialTypeDescr" allow-clear placeholder="请输入物料类型描述"/>
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="物料类型">
                  <a-input-number v-model="queryParam.materialType" style="width: 100%" allow-clear placeholder="请输入物料类型"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="物料组">
                  <a-input v-model="queryParam.materialGroup" allow-clear placeholder="请输入物料组"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="ABC分类名称">
                  <a-input v-model="queryParam.aBCClassName" allow-clear placeholder="请输入ABC分类名称"/>
                </a-form-item>
              </a-col><a-col :md="8" :sm="24">
                <a-form-item label="ABC分类">
                  <a-input-number v-model="queryParam.aBCClass" style="width: 100%" allow-clear placeholder="请输入ABC分类"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="物料规格">
                  <a-input v-model="queryParam.materialSpec" allow-clear placeholder="请输入物料规格"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="默认入库库位">
                  <a-input v-model="queryParam.inPlaceCode" allow-clear placeholder="请输入默认入库库位"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="库存单位">
                  <a-input v-model="queryParam.materialUnit" allow-clear placeholder="请输入库存单位"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="采购单位">
                  <a-input v-model="queryParam.pOUnit" allow-clear placeholder="请输入采购单位"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="颜色">
                  <a-input v-model="queryParam.color" allow-clear placeholder="请输入颜色"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="重量">
                  <a-input v-model="queryParam.weight" allow-clear placeholder="请输入重量"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="标包数量">
                  <a-input v-model="queryParam.sNP" allow-clear placeholder="请输入标包数量"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="换算率">
                  <a-input v-model="queryParam.translateRate" allow-clear placeholder="请输入换算率"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="批次属性规则">
                  <a-input v-model="queryParam.batchRuleId" allow-clear placeholder="请输入批次属性规则"/>
                </a-form-item>
              </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="控制属性规则">
                  <a-input v-model="queryParam.controlRuleId" 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>
                </a-form-item>
            </a-col>
              <a-col :md="8" :sm="24">
                <a-form-item label="描述">
                  <a-input v-model="queryParam.materialDesc" allow-clear placeholder="请输入描述"/>
                </a-form-item>
              </a-col>          <!--年月日时分秒-->
            <!--时间范围-->
                <div class="table-page-search-wrapper" v-if="hasPerm('WmsMaterial:page')">
                    <a-form layout="inline">
                        <a-row :gutter="48">
                            <a-col :md="8" :sm="24">
                                <a-form-item label="物料名称">
                                    <a-input v-model="queryParam.materialName" allow-clear placeholder="请输入物料名称" />
                                </a-form-item>
                            </a-col>
                            <a-col :md="8" :sm="24">
                                <a-form-item label="物料编号">
                                    <a-input v-model="queryParam.materialCode" allow-clear placeholder="请输入物料编号" />
                                </a-form-item>
                            </a-col><template v-if="advanced">
                                <a-col :md="8" :sm="24">
                                    <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-input v-model="queryParam.materialTypeName" allow-clear
                                            placeholder="请输入物料类型名称" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="物料类型描述">
                                        <a-input v-model="queryParam.materialTypeDescr" allow-clear
                                            placeholder="请输入物料类型描述" />
                                    </a-form-item>
                                </a-col><a-col :md="8" :sm="24">
                                    <a-form-item label="物料类型">
                                        <a-input-number v-model="queryParam.materialType" style="width: 100%" allow-clear
                                            placeholder="请输入物料类型" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="物料组">
                                        <a-input v-model="queryParam.materialGroup" allow-clear placeholder="请输入物料组" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="ABC分类名称">
                                        <a-input v-model="queryParam.abcClassName" allow-clear placeholder="请输入ABC分类名称" />
                                    </a-form-item>
                                </a-col><a-col :md="8" :sm="24">
                                    <a-form-item label="ABC分类">
                                        <a-input-number v-model="queryParam.abcClass" style="width: 100%" allow-clear
                                            placeholder="请输入ABC分类" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="物料规格">
                                        <a-input v-model="queryParam.materialSpec" allow-clear placeholder="请输入物料规格" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="默认入库库位">
                                        <a-input v-model="queryParam.inPlaceCode" allow-clear placeholder="请输入默认入库库位" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="库存单位">
                                        <a-input v-model="queryParam.materialUnit" allow-clear placeholder="请输入库存单位" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="采购单位">
                                        <a-input v-model="queryParam.pOUnit" allow-clear placeholder="请输入采购单位" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="颜色">
                                        <a-input v-model="queryParam.color" allow-clear placeholder="请输入颜色" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="重量">
                                        <a-input v-model="queryParam.weight" allow-clear placeholder="请输入重量" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="标包数量">
                                        <a-input v-model="queryParam.sNP" allow-clear placeholder="请输入标包数量" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="换算率">
                                        <a-input v-model="queryParam.translateRate" allow-clear placeholder="请输入换算率" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="批次属性规则">
                                        <a-input v-model="queryParam.batchRuleId" allow-clear placeholder="请输入批次属性规则" />
                                    </a-form-item>
                                </a-col>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="控制属性规则">
                                        <a-input v-model="queryParam.controlRuleId" 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>
                                    </a-form-item>
                                </a-col>
                <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"/>
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="描述">
                                        <a-input v-model="queryParam.materialDesc" allow-clear placeholder="请输入描述" />
                                    </a-form-item>
                                </a-col> <!--年月日时分秒-->
                                <!--时间范围-->
                    </a-form-item>
                </a-col>
                      <!--年月日时分秒-->
            <!--时间范围-->
                                <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" />
                <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"/>
                                    </a-form-item>
                                </a-col>
                                <!--年月日时分秒-->
                                <!--时间范围-->
                    </a-form-item>
                </a-col>
              <a-col :md="8" :sm="24">
                <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>
              </a-col>    </template>
                                <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" />
            <a-col :md="8" :sm="24" >
              <span class="table-page-search-submitButtons">
                <a-button type="primary" @click="$refs.table.refresh(true)" >查询</a-button>
                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
                <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '收起' : '展开' }}
                  <a-icon :type="advanced ? 'up' : 'down'"/>
                </a>
              </span>
            </a-col>
                                    </a-form-item>
                                </a-col>
          </a-row>
        </a-form>
      </div>
    </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"
        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
        <template class="table-operator" slot="operator" v-if="hasPerm('WmsMaterial:add')" >
        <div ref="actionBar" class="actionBar">
            <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload" @click="$refs.excelForm.index()">
            导入
          </a-button>
          <a-button type="info" v-if="hasPerm('WmsMaterial:exportExcel')" icon="download" @click="WmsMaterialToExcel()">
            导出
          </a-button>
            <!-- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">新增物料信息表</a-button> -->
            <!-- 自定义 -->
            <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.tabForm.add()">新增物料信息</a-button>
                                <a-col :md="8" :sm="24">
                                    <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>
                                </a-col> </template>
                            <a-col :md="8" :sm="24">
                                <span class="table-page-search-submitButtons">
                                    <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
                                    <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
                                    <a @click="toggleAdvanced" style="margin-left: 8px"> {{ advanced ? '收起' : '展开' }}
                                        <a-icon :type="advanced ? 'up' : 'down'" />
                                    </a>
                                </span>
                            </a-col>
                        </a-row>
                    </a-form>
                </div>
            </a-card>
        </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="action" slot-scope="text, record">
            <!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">编辑</a> -->
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">编辑</a>
            <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
            <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record,'详情')">详情</a>
          <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')"/>
          <a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="确认删除?" @confirm="() => WmsMaterialDelete(record)">
            <a>删除</a>
          </a-popconfirm>
        </span>
      </s-table>
      <add-form ref="addForm" @ok="handleOk" />
      <edit-form ref="editForm" @ok="handleOk" />
      <excel-form ref="excelForm" @ok="handleOk" />
      <!-- 自定义 -->
      <tab-form ref="tabForm" @ok="handleOk" />
        <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"
                :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
                <template class="table-operator" slot="operator" v-if="hasPerm('WmsMaterial:add')">
                    <div ref="actionBar" class="actionBar">
                        <a-button type="info" v-if="hasPerm('sysExcelTemplate:importExcel')" icon="upload"
                            @click="$refs.excelForm.index()">
                            导入
                        </a-button>
                        <a-button type="info" v-if="hasPerm('WmsMaterial:exportExcel')" icon="download"
                            @click="WmsMaterialToExcel()">
                            导出
                        </a-button>
                        <!-- <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus" @click="$refs.addForm.add()">新增物料信息表</a-button> -->
                        <!-- 自定义 -->
                        <a-button type="primary" v-if="hasPerm('WmsMaterial:add')" icon="plus"
                            @click="$refs.tabForm.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="action" slot-scope="text, record">
    </a-card>
  </div>
                    <!-- <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.editForm.edit(record)">编辑</a> -->
                    <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record)">编辑</a>
                    <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')" />
                    <a v-if="hasPerm('WmsMaterial:edit')" @click="$refs.tabForm.add(record, '详情')">详情</a>
                    <a-divider type="vertical" v-if="hasPerm('WmsMaterial:edit') & hasPerm('WmsMaterial:delete')" />
                    <a-popconfirm v-if="hasPerm('WmsMaterial:delete')" placement="topRight" title="确认删除?"
                        @confirm="() => WmsMaterialDelete(record)">
                        <a>删除</a>
                    </a-popconfirm>
                </span>
            </s-table>
            <add-form ref="addForm" @ok="handleOk" />
            <edit-form ref="editForm" @ok="handleOk" />
            <excel-form ref="excelForm" @ok="handleOk" />
            <!-- 自定义 -->
            <tab-form ref="tabForm" @ok="handleOk" />
        </a-card>
    </div>
</template>
<script>
    import { STable } from '@/components'
    import moment from 'moment'
    import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
    //自定义table高度
    import setTableHtMixin from '@/mixins/handleTableHt.js'
    import addForm from './addForm.vue'
import { STable } from '@/components'
import moment from 'moment'
import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
//自定义table高度
import setTableHtMixin from '@/mixins/handleTableHt.js'
import addForm from './addForm.vue'
//自定义
    import tabForm from './tabForm.vue'
import tabForm from './tabForm.vue'
    import { exportExcel } from '@/utils/exportToExcel'
    import { downloadFile } from '@/utils/util'
    import editForm from './editForm.vue'
    import excelForm from './excelForm.vue'
    export default {
import { exportExcel } from '@/utils/exportToExcel'
import { downloadFile } from '@/utils/util'
import editForm from './editForm.vue'
import excelForm from './excelForm.vue'
export default {
    mixins: [setTableHtMixin],
    components: {
    STable,
    addForm,
    editForm,
    excelForm,
    tabForm //自定义
        STable,
        addForm,
        editForm,
        excelForm,
        tabForm //自定义
    },
    data () {
    return {
    advanced: false, // 高级搜索 展开/关闭
    queryParam: {},
     pageInfo: {
        current: 1,
        pageSize: 10
      },
    columns: [
    {
    title:'序号',
    width: '60px',
    align: 'center',
    customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
    data() {
        return {
            advanced: false, // 高级搜索 展开/关闭
            queryParam: {},
            pageInfo: {
                current: 1,
                pageSize: 10
            },
            columns: [
                {
                    title: '序号',
                    width: '60px',
                    align: 'center',
                    customRender: (text, record, index) => `${index + 1 + (this.pageInfo.current - 1) * this.pageInfo.pageSize}`
                },
                {
                    title: '物料名称',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialName'
                },
                {
                    title: '物料编号',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialCode'
                },
                {
                    title: 'ERP编号',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'erpCode'
                },
                {
                    title: '物料类型名称',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialTypeName'
                },
                {
                    title: '物料类型描述',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialTypeDescr'
                },
                {
                    title: '物料类型',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialType'
                },
                {
                    title: '物料组',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialGroup'
                },
                {
                    title: 'ABC分类名称',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'abcClassName'
                },
                {
                    title: 'ABC分类',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'abcClass'
                },
                {
                    title: '物料规格',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialSpec'
                },
                {
                    title: '默认入库库位',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'inPlaceCode'
                },
                {
                    title: '库存单位',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialUnit'
                },
                {
                    title: '采购单位',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'pOUnit'
                },
                {
                    title: '颜色',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'color'
                },
                {
                    title: '重量',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'weight'
                },
                {
                    title: '标包数量',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'sNP'
                },
                {
                    title: '换算率',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'translateRate'
                },
                {
                    title: '批次属性规则',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'batchRuleId'
                },
                {
                    title: '控制属性规则',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'controlRuleId'
                },
                {
                    title: '是否禁用',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'isDisabled',
                    scopedSlots: { customRender: 'isDisabledscopedSlots' }
                },
                {
                    title: '描述',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'materialDesc'
                },
                {
                    title: '创建时间',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'createdTime'
                },
                {
                    title: '更新时间',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'updatedTime'
                },
                {
                    title: '创建者名称',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'createdUserName'
                },
                {
                    title: '修改者名称',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'updatedUserName'
                }
            ],
            tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
            // 加载数据方法 必须为 Promise 对象
            loadData: parameter => {
                return WmsMaterialPage(Object.assign(parameter, this.switchingDate())).then((res) => {
                    return res.data
                })
            },
            selectedRowKeys: [],
            selectedRows: []
        }
    },
    {
    title: '物料名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialName'
    },
    {
    title: '物料编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialCode'
    },
    {
    title: 'ERP编号',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'erpCode'
    },
    {
    title: '物料类型名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialTypeName'
    },
    {
    title: '物料类型描述',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialTypeDescr'
    },
    {
    title: '物料类型',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialType'
    },
    {
    title: '物料组',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialGroup'
    },
    {
    title: 'ABC分类名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'aBCClassName'
    },
    {
    title: 'ABC分类',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'aBCClass'
    },
    {
    title: '物料规格',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialSpec'
    },
    {
    title: '默认入库库位',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'inPlaceCode'
    },
    {
    title: '库存单位',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialUnit'
    },
    {
    title: '采购单位',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'pOUnit'
    },
    {
    title: '颜色',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'color'
    },
    {
    title: '重量',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'weight'
    },
    {
    title: '标包数量',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'sNP'
    },
    {
    title: '换算率',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'translateRate'
    },
    {
    title: '批次属性规则',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'batchRuleId'
    },
    {
    title: '控制属性规则',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'controlRuleId'
    },
    {
    title: '是否禁用',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'isDisabled',
    scopedSlots: { customRender: 'isDisabledscopedSlots' }
    },
    {
    title: '描述',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'materialDesc'
    },
    {
    title: '创建时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdTime'
    },
    {
    title: '更新时间',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedTime'
    },
    {
    title: '创建者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'createdUserName'
    },
    {
    title: '修改者名称',
    align: 'center',
    customHeaderCell: () => {
    return {
     style: {
    'min-width': '120px'//最小列宽设置
     }
     }
    },
    customCell: () => {
    return {
    style: {
    'min-width': '120px'//最小列宽设置
    }
    }
    },
    sorter: true,
    dataIndex: 'updatedUserName'
    }
    ],
    tstyle: { 'padding-bottom': '0px', 'margin-bottom': '10px' },
    // 加载数据方法 必须为 Promise 对象
    loadData: parameter => {
    return WmsMaterialPage(Object.assign(parameter, this.switchingDate())).then((res) => {
    return res.data
    })
    },
    selectedRowKeys: [],
    selectedRows: []
    }
    },
    created () {
    if (this.hasPerm('WmsMaterial:edit') || this.hasPerm('WmsMaterial:delete')) {
    this.columns.push({
    title: '操作',
    width: '150px',
    dataIndex: 'action',
    scopedSlots: { customRender: 'action' }
    })
    }
    const path = this.$route.path
    const columnStr = window.localStorage.getItem(path)
    if(columnStr) {
    var _columns = JSON.parse(columnStr)
    this.columns.forEach(element => {
    var fObj = _columns.find((item, index) => {
    return item.dataIndex === element.dataIndex;
    })
    if(fObj!=undefined && fObj!=null){
    element.checked=fObj.checked;
    }
    });
    }
    const isDisabledOption = this.$options
    this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
    created() {
        if (this.hasPerm('WmsMaterial:edit') || this.hasPerm('WmsMaterial:delete')) {
            this.columns.push({
                title: '操作',
                width: '150px',
                dataIndex: 'action',
                scopedSlots: { customRender: 'action' }
            })
        }
        const path = this.$route.path
        const columnStr = window.localStorage.getItem(path)
        if (columnStr) {
            var _columns = JSON.parse(columnStr)
            this.columns.forEach(element => {
                var fObj = _columns.find((item, index) => {
                    return item.dataIndex === element.dataIndex;
                })
                if (fObj != undefined && fObj != null) {
                    element.checked = fObj.checked;
                }
            });
        }
        const isDisabledOption = this.$options
        this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
    this.handleTableHt() //设置主表表格高度
    window.addEventListener(
    'resize',
    () => {
    this.handleTableHt() // 监听屏幕大小改变表格高度
    },
    false
    )
        this.handleTableHt() //设置主表表格高度
        window.addEventListener(
            'resize',
            () => {
                this.handleTableHt() // 监听屏幕大小改变表格高度
            },
            false
        )
    },
    methods: {
    moment,
    /**
    * 查询参数组装
    */
    switchingDate () {
    const obj = JSON.parse(JSON.stringify(this.queryParam))
    return obj
    },
    WmsMaterialDelete (record) {
    WmsMaterialDelete(record).then((res) => {
    if (res.success) {
    this.$message.success('删除成功')
    this.$refs.table.refresh()
    } else {
    this.$message.error('删除失败') // + res.message
    }
    })
    },
        moment,
        /**
        * 查询参数组装
        */
        switchingDate() {
            const obj = JSON.parse(JSON.stringify(this.queryParam))
            return obj
        },
        WmsMaterialDelete(record) {
            WmsMaterialDelete(record).then((res) => {
                if (res.success) {
                    this.$message.success('删除成功')
                    this.$refs.table.refresh()
                } else {
                    this.$message.error('删除失败') // + res.message
                }
            })
        },
    WmsMaterialToExcel() {
    this.loading = true
    let entozh = {};
    const path = this.$route.path;
    if (window.localStorage.getItem(path)) {
    JSON.parse(window.localStorage.getItem(path)).forEach(item => {
    if (item.dataIndex != 'action' && item.checked) {
    entozh[item.dataIndex] = item.title
    }
    })
    } else { //直接点导出
    this.columns.forEach(item => {
    if (item.dataIndex != 'action') {
    entozh[item.dataIndex] = item.title
    }
    })
    }
    WmsMaterialPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
    this.loading = false;
    //需要截取日期的字段
    var arrDataCutout = this.columns.filter(v => v.customCutout == true);
    res.data.rows.forEach(item => {
    var arrKeys = Object.keys(item);
    arrKeys.forEach(key => {
    var strFieldDic = key + 'Data';
    //枚举转值
    if (this[strFieldDic] && this[strFieldDic].length > 0) {
    let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
    if (arrFieldDic.length > 0) {
    item[key] = arrFieldDic[0]?.name || '没有枚举值';
    }
    }
    // 日期截取
    if (arrDataCutout.length > 0) {
    arrDataCutout.forEach(itemIn => {
    if (key == itemIn.dataIndex && item[key]) {
    item[key] = item[key].split(" ")[0]
    }
    })
    }
    });
    })
    exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
    }).catch((err) => {
    this.loading = false
    this.$message.error('下载错误:获取文件流错误' + err)
    })
    },
        WmsMaterialToExcel() {
            this.loading = true
            let entozh = {};
            const path = this.$route.path;
            if (window.localStorage.getItem(path)) {
                JSON.parse(window.localStorage.getItem(path)).forEach(item => {
                    if (item.dataIndex != 'action' && item.checked) {
                        entozh[item.dataIndex] = item.title
                    }
                })
            } else { //直接点导出
                this.columns.forEach(item => {
                    if (item.dataIndex != 'action') {
                        entozh[item.dataIndex] = item.title
                    }
                })
            }
            WmsMaterialPage(Object.assign({ pageSize: 100000, pageIndex: 1 }, this.queryParam)).then((res) => {
                this.loading = false;
                //需要截取日期的字段
                var arrDataCutout = this.columns.filter(v => v.customCutout == true);
                res.data.rows.forEach(item => {
                    var arrKeys = Object.keys(item);
                    arrKeys.forEach(key => {
                        var strFieldDic = key + 'Data';
                        //枚举转值
                        if (this[strFieldDic] && this[strFieldDic].length > 0) {
                            let arrFieldDic = this[strFieldDic].filter(v => String(v.code) == String(item[key]));
                            if (arrFieldDic.length > 0) {
                                item[key] = arrFieldDic[0]?.name || '没有枚举值';
                            }
                        }
                        // 日期截取
                        if (arrDataCutout.length > 0) {
                            arrDataCutout.forEach(itemIn => {
                                if (key == itemIn.dataIndex && item[key]) {
                                    item[key] = item[key].split(" ")[0]
                                }
                            })
                        }
                    });
                })
                exportExcel(res.data.rows, entozh, "xlsx", `${this.$route.meta.title}`)
            }).catch((err) => {
                this.loading = false
                this.$message.error('下载错误:获取文件流错误' + err)
            })
        },
    toggleAdvanced () {
    this.advanced = !this.advanced
    this.handleTableHt() //设置主表表格高度
    },
    onChangecreatedTime(date, dateString) {
      this.queryParam.createdTime = dateString
    },
    onChangeupdatedTime(date, dateString) {
      this.queryParam.updatedTime = dateString
    },
    handleOk () {
    this.$refs.table.refresh()
    },
    onSelectChange (selectedRowKeys, selectedRows) {
    this.selectedRowKeys = selectedRowKeys
    this.selectedRows = selectedRows
        toggleAdvanced() {
            this.advanced = !this.advanced
            this.handleTableHt() //设置主表表格高度
        },
        onChangecreatedTime(date, dateString) {
            this.queryParam.createdTime = dateString
        },
        onChangeupdatedTime(date, dateString) {
            this.queryParam.updatedTime = dateString
        },
        handleOk() {
            this.$refs.table.refresh()
        },
        onSelectChange(selectedRowKeys, selectedRows) {
            this.selectedRowKeys = selectedRowKeys
            this.selectedRows = selectedRows
        }
    }
    }
    }
}
</script>
<style lang="less">
  .table-operator {
    margin-bottom: 18px;
  }
  button {
    margin-right: 8px;
  }
</style>
<style lang="less">.table-operator {
    margin-bottom: 18px;
}
button {
    margin-right: 8px;
}</style>
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -29,8 +29,8 @@
            <a-form-item label="物料类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-select style="width: 100%" placeholder="请选择物料类型" v-decorator="['materialType']">
                <a-select-option v-for="(item, index) in materialTypeData" :key="index"
                  :value="item.materialTypeCode">{{ item.materialTypeName }}</a-select-option>
                <a-select-option v-for="(item, index) in materialTypeData" :key="index" :value="item.materialTypeCode">{{
                  item.materialTypeName }}</a-select-option>
              </a-select>
            </a-form-item>
@@ -104,7 +104,7 @@
          </a-form>
        </a-tab-pane>
        <a-tab-pane key="2" tab="控制属性" force-render>
          <add-control-rule v-if="visible" ref="WmsControlRule" />
          <add-control-rule v-if="visible" ref="WmsControlRuleRef" />
        </a-tab-pane>
        <a-tab-pane key="3" tab="批次属性">
          需求待定
@@ -127,14 +127,14 @@
<script>
import {
  WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList,materialTypeDataList
  WmsMaterialAdd, WmsMaterialEdit, WmsMaterialDetailList, materialTypeDataList
} from '@/api/modular/main/WmsBase/WmsMaterialManage'
import addForm from './tabItem/addForm.vue'
import addFormBaseCustomer from './tabItem/addFormBaseCustomer/addFormBaseCustomer.vue'
import addFormContainerPackaging from './tabItem/WmsContainerPackaging/addFormContainerPackaging.vue'
import addFormSub from './tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue'
import addControlRule from './tabItem/WmsControlRule/addForm.vue'
import { WmsUnitPage} from '@/api/modular/main/WmsBase/WmsUnitManage'
import { WmsUnitPage } from '@/api/modular/main/WmsBase/WmsUnitManage'
export default {
  components: {
    addForm,
@@ -169,8 +169,8 @@
      confirmLoading: false,
      form: this.$form.createForm(this),
      materialTypeData2: [],
      selectTypeData2:[],
      selectTypeData1:[]
      selectTypeData2: [],
      selectTypeData1: []
    }
  },
  methods: {
@@ -209,10 +209,10 @@
      // 替代品
      if (e == 4) {
        this.$nextTick(() => {
        // let materialCode = this.form.getFieldValue('materialCode');
        // let materialName = this.form.getFieldValue('materialName');
        this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
      })
          // let materialCode = this.form.getFieldValue('materialCode');
          // let materialName = this.form.getFieldValue('materialName');
          this.$refs.addFormWmsSubstituteGoodRef.initShowSubstituteGood()
        })
      }
    },
    handleOk() { },
@@ -235,15 +235,18 @@
        })
          .then(res => {
            if (res.success) {
              console.log("666666666666")
              console.log(res)
              this.$refs.WmsControlRule.list = res.data.baseCustomerList || []
              this.$refs.addFormBaseCustomer.list = res.data.controlRuleDetailList || []
              this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
              // this.$message.success('编辑成功')
              // this.confirmLoading = false
              // this.$emit('ok', values)
              // this.handleCancel()
              this.$nextTick(() => {
                if (res.data.controlRuleDetailList && res.data.controlRuleDetailList.length > 0) {
                  this.$refs.WmsControlRuleRef.form.setFieldsValue({
                    ...res.data.controlRuleDetailList[0]
                  })
                }
                this.$refs.addFormWmsSubstituteGoodRef.list = res.data.substituteGoodList || []
                this.$refs.addFormBaseCustomer.list = res.data.baseCustomerList || []
              })
            } else {
              this.$message.error('详情失败:' + JSON.stringify(res.message))
            }
@@ -296,7 +299,7 @@
          // }
          console.log(6666666666666 + '控制属性')
          var ControlRuleld = this.$refs.WmsControlRule.form.getFieldValue('id') || ''
          var ControlRuleld = this.$refs.WmsControlRuleRef.form.getFieldValue('id') || ''
          let SubstituteGoodList = []
          if (this.$refs.addFormWmsSubstituteGoodRef && this.$refs.addFormWmsSubstituteGoodRef.list.length > 0) {