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

payne

2024-04-26 bac077fc7f67a1002b4dafa64e069cbbaabc646a

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

@@ -23,10 +23,18 @@
                        </a-col>
                        <a-col :md="8" :sm="24">
                           <a-form-item label="物料类型名称">
                              <a-input v-model="queryParam.materialTypeName" allow-clear
                                 placeholder="请输入物料类型名称" />
                              <!-- <a-input v-model="queryParam.materialTypeName" allow-clear
                                 placeholder="请输入物料类型名称" /> -->
                                 <a-select style="width: 100%" placeholder="请选择物料类型"
                                    v-model="queryParam.materialTypeName">
                                    <a-select-option v-for="(item, index) in materialTypeData" :key="index"
                                       :value="item.materialTypeName">{{
                                          item.materialTypeName }}</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.materialTypeDescr" allow-clear
@@ -44,17 +52,25 @@
                              <a-input v-model="queryParam.materialGroup" allow-clear placeholder="请输入物料组" />
                           </a-form-item>
                        </a-col>
                        <a-col :md="8" :sm="24">
                        <!-- <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-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-input-number v-model="queryParam.abcClassName" style="width: 100%" allow-clear
                                 placeholder="请输入ABC分类" /> -->
											
                                 <a-select style="width: 100%" placeholder="请选择ABC分类" v-model="queryParam.abcClass" >
                                    <a-select-option v-for="(item, index) in materialTypeData2" :key="index" :value="item.code">{{
                                    item.name }}</a-select-option>
                                 </a-select>

											
                           </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.materialSpec" allow-clear placeholder="请输入物料规格" />
                           </a-form-item>
@@ -98,7 +114,7 @@
                           <a-form-item label="批次属性规则">
                              <a-input v-model="queryParam.batchRuleId" 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.controlRuleId" allow-clear placeholder="请输入控制属性规则" />
@@ -114,14 +130,15 @@
                           </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.materialDesc" allow-clear placeholder="请输入描述" />
                           </a-form-item>
                        </a-col> <!--年月日时分秒-->
                        </a-col>  -->
                        <!--年月日时分秒-->
                        <!--时间范围-->

                        <a-col :md="8" :sm="24">
                        <!-- <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')]
@@ -129,11 +146,11 @@
                                 @change="onChangecreatedTime" />

                           </a-form-item>
                        </a-col>
                        </a-col> -->
                        <!--年月日时分秒-->
                        <!--时间范围-->

                        <a-col :md="8" :sm="24">
                        <!-- <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')]
@@ -144,15 +161,16 @@
                        </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>
                        </a-col>  -->
                     </template>

                     <a-col :md="8" :sm="24">
                        <span class="table-page-search-submitButtons">
@@ -223,7 +241,7 @@
<script>
import { STable } from '@/components'
import moment from 'moment'
import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel } from '@/api/modular/main/WmsBase/WmsMaterialManage'
import { WmsMaterialPage, WmsMaterialDelete, WmsMaterialToExcel ,materialTypeDataList} from '@/api/modular/main/WmsBase/WmsMaterialManage'
//自定义table高度
import setTableHtMixin from '@/mixins/handleTableHt.js'
import addForm from './addForm.vue'
@@ -398,28 +416,8 @@
               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分类',
               title: 'ABC分类名称',
               align: 'center',
               customHeaderCell: () => {
                  return {
@@ -436,8 +434,28 @@
                  }
               },
               sorter: true,
               dataIndex: 'abcClass'
               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',
@@ -598,26 +616,26 @@
               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: 'batchRuleId'
            // },
            // {
            //    title: '控制属性规则',
            //    align: 'center',
@@ -720,7 +738,7 @@
               dataIndex: 'updatedTime'
            },
            {
               title: '创建者名称',
               title: '创建人',
               align: 'center',
               customHeaderCell: () => {
                  return {
@@ -740,7 +758,7 @@
               dataIndex: 'createdUserName'
            },
            {
               title: '修改者名称',
               title: '修改人',
               align: 'center',
               customHeaderCell: () => {
                  return {
@@ -768,7 +786,8 @@
            })
         },
         selectedRowKeys: [],
         selectedRows: []
         selectedRows: [],
         materialTypeData:[]
      }
   },
   created() {
@@ -796,6 +815,9 @@
      const isDisabledOption = this.$options
      this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')

      const materialTypeOption = this.$options
      this.materialTypeData2 = materialTypeOption.filters['dictData']('abc_class_type')

      this.handleTableHt() //设置主表表格高度
      window.addEventListener(
         'resize',
@@ -804,7 +826,11 @@
         },
         false
      )
      materialTypeDataList().then((d) => {
         this.materialTypeData = d.data || []
      }).catch(() => {

      })
   },
   methods: {
      moment,