1

liuying

2024-04-25 4b9a6f3c7ed2a6e94b28459eac5f1f64eb36826d

1

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

@@ -73,7 +73,7 @@
  WmsAreaAdd
} from '@/api/modular/main/WmsBase/WmsAreaManage'

import { WmsWarehousePage, WmsWarehouseDelete, WmsWarehouseToExcel } from '@/api/modular/main/WmsBase/WmsWarehouseManage'


export default {
  data() {
@@ -92,12 +92,7 @@
      form: this.$form.createForm(this)
    }
  },
  created() {
    WmsWarehousePage().then((d) => {
        this.warehouseIdData = d.data.rows || []
      }).catch(() => {
      })
  },

  methods: {
    moment,
    // 初始化方法

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

@@ -31,12 +31,13 @@
                                    <a-form-item label="库区描述">
                                        <a-input v-model="queryParam.areaDesc" allow-clear placeholder="请输入库区描述" />
                                    </a-form-item>
                                </a-col><a-col :md="8" :sm="24">
                                </a-col>
                                <!-- <a-col :md="8" :sm="24">
                                    <a-form-item label="库区状态">
                                        <a-input-number v-model="queryParam.areaStatus" style="width: 100%" allow-clear
                                            placeholder="请输入库区状态" />
                                    </a-form-item>
                                </a-col>
                                </a-col> -->
                                <a-col :md="8" :sm="24">
                                    <a-form-item label="ERP代码">
                                        <a-input v-model="queryParam.erpCode" allow-clear placeholder="请输入ERP代码" />
@@ -126,9 +127,8 @@
                                    <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" />
                                        }" 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>
@@ -139,9 +139,8 @@
                                    <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" />
                                        }" 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>
@@ -283,6 +282,9 @@
import { downloadFile } from '@/utils/util'
import editForm from './editForm.vue'
import excelForm from './excelForm.vue'

import { WmsWarehousePage, WmsWarehouseDelete, WmsWarehouseToExcel } from '@/api/modular/main/WmsBase/WmsWarehouseManage'

export default {
    mixins: [setTableHtMixin],
    components: {
@@ -729,8 +731,8 @@
                }
            });
        }
        const warehouseIdOption = this.$options
        this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
        // const warehouseIdOption = this.$options
        // this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
        const isBarcodeLevelControlOption = this.$options
        this.isBarcodeLevelControlData = isBarcodeLevelControlOption.filters['dictData']('yes_true_false')
        const isFIFOOption = this.$options
@@ -754,6 +756,14 @@
            },
            false
        )


        WmsWarehousePage().then((d) => {
            this.warehouseIdData = d.data.rows || []
            this.$refs.addForm.warehouseIdData = d.data.rows || []
        }).catch(() => {
        })


    },
    methods: {
@@ -847,10 +857,12 @@
    }
}
</script>
<style lang="less">.table-operator {
<style lang="less">
.table-operator {
    margin-bottom: 18px;
}

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

 iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabItem/WmsSubstituteGood/addFormWmsSubstituteGood.vue

@@ -220,10 +220,6 @@
    onClose() {
      this.close()
    },
    setData(data){
      alert(1)
      this.list = data;
    },
    close() {
      this.$emit('update:visible', false)
    },

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

@@ -115,9 +115,17 @@
                                        <a-input v-model="queryParam.areaCode" allow-clear placeholder="请输入库区编号" />
                                    </a-form-item>
                                </a-col>

                                <a-col :md="8" :sm="24">
                                    <a-form-item label="所在库区">
                                        <a-input v-model="queryParam.areaId" allow-clear placeholder="请输入所在库区" />
                                        <!-- <a-input v-model="queryParam.areaId" allow-clear placeholder="请输入所在库区" /> -->

                                        <a-select v-model="queryParam.areaCode"  style="width: 100%" placeholder="请选择所在库区">
                                            <a-select-option  v-for="(item, index) in WmsAreaData" :key="index"
                                                :value="item.id">{{ item.areaName
                                                }}</a-select-option>
                                        </a-select>

                                    </a-form-item>
                                </a-col>
                                <!-- <a-col :md="8" :sm="24">
@@ -221,9 +229,8 @@
                                    <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" />
                                        }" 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>
@@ -234,9 +241,8 @@
                                    <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" />
                                        }" 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>
@@ -381,6 +387,7 @@
import { downloadFile } from '@/utils/util'
import editForm from './editForm.vue'
import excelForm from './excelForm.vue'
import { WmsAreaPage, WmsAreaDelete, WmsAreaToExcel } from '@/api/modular/main/WmsBase/WmsAreaManage'
export default {
    mixins: [setTableHtMixin],
    components: {
@@ -751,26 +758,26 @@
                    sorter: true,
                    dataIndex: 'areaCode'
                },
                {
                    title: '所在库区',
                    align: 'center',
                    customHeaderCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    customCell: () => {
                        return {
                            style: {
                                'min-width': '120px'//最小列宽设置
                            }
                        }
                    },
                    sorter: true,
                    dataIndex: 'areaId'
                },
                // {
                //     title: '所在库区',
                //     align: 'center',
                //     customHeaderCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     customCell: () => {
                //         return {
                //             style: {
                //                 'min-width': '120px'//最小列宽设置
                //             }
                //         }
                //     },
                //     sorter: true,
                //     dataIndex: 'areaId'
                // },
                // {
                //     title: '库区名称',
                //     align: 'center',
@@ -1204,7 +1211,8 @@
            placeTypeData: [],
            placeStatusData: [],
            selectedRowKeys: [],
            selectedRows: []
            selectedRows: [],
            WmsAreaData: []
        }
    },
    created() {
@@ -1256,7 +1264,10 @@
            },
            false
        )

        WmsAreaPage().then(res => {
            this.WmsAreaData = res.data.rows
            this.$refs.addForm.WmsAreaData = d.data.rows || []
        })
    },
    methods: {
        moment,
@@ -1349,10 +1360,12 @@
    }
}
</script>
<style lang="less">.table-operator {
<style lang="less">
.table-operator {
    margin-bottom: 18px;
}

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