From 087b06eb3550e65603a9fbfef9e24dbf4168a09e Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周四, 25 4月 2024 17:57:13 +0800
Subject: [PATCH] bug
---
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue | 1635 +++++++++++++++++++++++++++++----------------------------
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue | 6
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue | 12
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue | 6
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/Dto/WmsAreaInput.cs | 4
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs | 13
6 files changed, 855 insertions(+), 821 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
index f709eff..e7fb087 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/addForm.vue
@@ -32,7 +32,7 @@
<a-form-item label="鎵�灞炰粨搴�" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select style="width: 100%" placeholder="璇烽�夋嫨鎵�灞炰粨搴�"
v-decorator="['warehouseId', { rules: [{ required: true, message: '璇烽�夋嫨鎵�灞炰粨搴擄紒' }] }]">
- <a-select-option v-for="(item, index) in warehouseIdData" :key="index" :value="item.code">{{ item.name
+ <a-select-option v-for="(item, index) in warehouseIdData" :key="index" :value="item.id">{{ item.name
}}</a-select-option>
</a-select>
</a-form-item>
@@ -104,7 +104,15 @@
add(record) {
this.visible = true
this.$nextTick(() => {
-
+ this.form.setFieldsValue({
+ 'isBarcodeLevelControl':false,
+ 'isFIFO':false,
+ 'isPartLevelControl':false,
+ 'isAllowConfusion':false,
+ 'isAllowNegativeInventory':false,
+ 'isVirtually':false,
+ 'isDisabled':false,
+ })
});
// const warehouseIdOption = this.$options
// this.warehouseIdData = warehouseIdOption.filters['dictData']('area_type')
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
index 4de560e..7c3cb10 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsArea/index.vue
@@ -1,837 +1,856 @@
锘�<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('WmsArea:page')">
- <a-form layout="inline">
- <a-row :gutter="48">
- <a-col :md="8" :sm="24">
- <a-form-item label="搴撳尯缂栫爜">
- <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.warehouseCode" allow-clear placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�"/>
- </a-form-item>
- </a-col>
- <template v-if="advanced">
- <!-- <a-col :md="8" :sm="24">
+ <div class="table-page-search-wrapper" v-if="hasPerm('WmsArea:page')">
+ <a-form layout="inline">
+ <a-row :gutter="48">
+ <a-col :md="8" :sm="24">
+ <a-form-item label="搴撳尯缂栫爜">
+ <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.warehouseCode" allow-clear placeholder="璇疯緭鍏ヤ粨搴撶紪鍙�" />
+ </a-form-item>
+ </a-col>
+ <template v-if="advanced">
+ <!-- <a-col :md="8" :sm="24">
<a-form-item label="浠撳簱鍚嶇О">
<a-input v-model="queryParam.warehouseName" allow-clear placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"/>
</a-form-item>
</a-col> -->
- <a-col :md="8" :sm="24">
- <a-form-item label="搴撳尯鍚嶇О">
- <a-input v-model="queryParam.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <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-form-item label="搴撳尯鐘舵��">
- <a-input-number v-model="queryParam.areaStatus" style="width: 100%" allow-clear placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�"/>
- </a-form-item>
- </a-col>
- <a-col :md="8" :sm="24">
- <a-form-item label="ERP浠ｇ爜">
- <a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP浠ｇ爜"/>
- </a-form-item>
- </a-col><a-col :md="8" :sm="24">
- <a-form-item label="鎵�灞炰粨搴�">
- <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId" placeholder="璇烽�夋嫨鎵�灞炰粨搴�">
- <a-select-option v-for="(item,index) in warehouseIdData" :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-select :allowClear="true" style="width: 100%" v-model="queryParam.isBarcodeLevelControl" placeholder="璇烽�夋嫨闆朵欢绾х鎺�">
- <a-select-option v-for="(item,index) in isBarcodeLevelControlData" :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-select :allowClear="true" style="width: 100%" v-model="queryParam.isFIFO" placeholder="璇烽�夋嫨妫�楠屽厛杩涘厛鍑�">
- <a-select-option v-for="(item,index) in isFIFOData" :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-select :allowClear="true" style="width: 100%" v-model="queryParam.isPartLevelControl" placeholder="璇烽�夋嫨闆朵欢绾х鎺�">
- <a-select-option v-for="(item,index) in isPartLevelControlData" :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-select :allowClear="true" style="width: 100%" v-model="queryParam.isAllowConfusion" placeholder="璇烽�夋嫨鍏佽娣锋穯">
- <a-select-option v-for="(item,index) in isAllowConfusionData" :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-select :allowClear="true" style="width: 100%" v-model="queryParam.isAllowNegativeInventory" placeholder="璇烽�夋嫨鍏佽璐熷簱瀛�">
- <a-select-option v-for="(item,index) in isAllowNegativeInventoryData" :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-select :allowClear="true" style="width: 100%" v-model="queryParam.isVirtually" placeholder="璇烽�夋嫨鏄惁铏氭嫙">
- <a-select-option v-for="(item,index) in isVirtuallyData" :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-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.areaName" allow-clear placeholder="璇疯緭鍏ュ簱鍖哄悕绉�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <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-form-item label="搴撳尯鐘舵��">
+ <a-input-number v-model="queryParam.areaStatus" style="width: 100%" allow-clear
+ placeholder="璇疯緭鍏ュ簱鍖虹姸鎬�" />
+ </a-form-item>
+ </a-col>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="ERP浠ｇ爜">
+ <a-input v-model="queryParam.erpCode" allow-clear placeholder="璇疯緭鍏RP浠ｇ爜" />
+ </a-form-item>
+ </a-col><a-col :md="8" :sm="24">
+ <a-form-item label="鎵�灞炰粨搴�">
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.warehouseId"
+ placeholder="璇烽�夋嫨鎵�灞炰粨搴�">
+ <a-select-option v-for="(item, index) in warehouseIdData" :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-select :allowClear="true" style="width: 100%"
+ v-model="queryParam.isBarcodeLevelControl" placeholder="璇烽�夋嫨闆朵欢绾х鎺�">
+ <a-select-option v-for="(item, index) in isBarcodeLevelControlData" :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-select :allowClear="true" style="width: 100%" v-model="queryParam.isFIFO"
+ placeholder="璇烽�夋嫨妫�楠屽厛杩涘厛鍑�">
+ <a-select-option v-for="(item, index) in isFIFOData" :key="index"
+ :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
- </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.isPartLevelControl" placeholder="璇烽�夋嫨闆朵欢绾х鎺�">
+ <a-select-option v-for="(item, index) in isPartLevelControlData" :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.updatedTime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime"/>
+ <a-col :md="8" :sm="24">
+ <a-form-item label="鍏佽娣锋穯">
+ <a-select :allowClear="true" style="width: 100%"
+ v-model="queryParam.isAllowConfusion" placeholder="璇烽�夋嫨鍏佽娣锋穯">
+ <a-select-option v-for="(item, index) in isAllowConfusionData" :key="index"
+ :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
+ </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-select :allowClear="true" style="width: 100%"
+ v-model="queryParam.isAllowNegativeInventory" placeholder="璇烽�夋嫨鍏佽璐熷簱瀛�">
+ <a-select-option v-for="(item, index) in isAllowNegativeInventoryData"
+ :key="index" :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
+ </a-form-item>
+ </a-col>
- <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-col :md="8" :sm="24">
+ <a-form-item label="鏄惁铏氭嫙">
+ <a-select :allowClear="true" style="width: 100%" v-model="queryParam.isVirtually"
+ placeholder="璇烽�夋嫨鏄惁铏氭嫙">
+ <a-select-option v-for="(item, index) in isVirtuallyData" :key="index"
+ :value="item.code">{{ item.name }}</a-select-option>
+ </a-select>
+ </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('WmsArea: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('WmsArea:exportExcel')" icon="download" @click="WmsAreaToExcel()">
- 瀵煎嚭
- </a-button>
- <a-button type="primary" v-if="hasPerm('WmsArea:add')" icon="plus" @click="$refs.addForm.add()">鏂板搴撳尯淇℃伅</a-button>
+ <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-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.updatedTime" value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss" @change="onChangeupdatedTime" />
+
+ </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">
+ <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="warehouseIdscopedSlots" slot-scope="text">
- {{ 'area_type' | dictType(text) }}
- </span>
- <span slot="isBarcodeLevelControlscopedSlots" 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="isFIFOscopedSlots" 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="isPartLevelControlscopedSlots" 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="isAllowConfusionscopedSlots" 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="isAllowNegativeInventoryscopedSlots" 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>
- <div v-else-if="text==false">
- <a-tag color="volcano">鍚�</a-tag>
- </div>
- <div v-else=""></div>
- </span>
- <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('WmsArea:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
- <a-divider type="vertical" v-if="hasPerm('WmsArea:edit') & hasPerm('WmsArea:delete')"/>
- <a-popconfirm v-if="hasPerm('WmsArea:delete')" placement="topRight" title="纭鍒犻櫎锛�" @confirm="() => WmsAreaDelete(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" />
- </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('WmsArea: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('WmsArea:exportExcel')" icon="download"
+ @click="WmsAreaToExcel()">
+ 瀵煎嚭
+ </a-button>
+ <a-button type="primary" v-if="hasPerm('WmsArea:add')" icon="plus"
+ @click="$refs.addForm.add()">鏂板搴撳尯淇℃伅</a-button>
+ </div>
+ </template>
+ <span slot="warehouseIdscopedSlots" slot-scope="text">
+ {{ 'area_type' | dictType(text) }}
+ </span>
+ <span slot="isBarcodeLevelControlscopedSlots" 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="isFIFOscopedSlots" 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="isPartLevelControlscopedSlots" 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="isAllowConfusionscopedSlots" 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="isAllowNegativeInventoryscopedSlots" 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>
+ <div v-else-if="text == false">
+ <a-tag color="volcano">鍚�</a-tag>
+ </div>
+ <div v-else=""></div>
+ </span>
+ <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('WmsArea:edit')" @click="$refs.editForm.edit(record)">缂栬緫</a>
+ <a-divider type="vertical" v-if="hasPerm('WmsArea:edit') & hasPerm('WmsArea:delete')" />
+ <a-popconfirm v-if="hasPerm('WmsArea:delete')" placement="topRight" title="纭鍒犻櫎锛�"
+ @confirm="() => WmsAreaDelete(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" />
+ </a-card>
+ </div>
</template>
<script>
- import { STable } from '@/components'
- import moment from 'moment'
- import { WmsAreaPage, WmsAreaDelete, WmsAreaToExcel } from '@/api/modular/main/WmsBase/WmsAreaManage'
- //鑷畾涔塼able楂樺害
- import setTableHtMixin from '@/mixins/handleTableHt.js'
- import addForm from './addForm.vue'
- import { exportExcel } from '@/utils/exportToExcel'
- import { downloadFile } from '@/utils/util'
- import editForm from './editForm.vue'
- import excelForm from './excelForm.vue'
- export default {
+import { STable } from '@/components'
+import moment from 'moment'
+import { WmsAreaPage, WmsAreaDelete, WmsAreaToExcel } from '@/api/modular/main/WmsBase/WmsAreaManage'
+//鑷畾涔塼able楂樺害
+import setTableHtMixin from '@/mixins/handleTableHt.js'
+import addForm from './addForm.vue'
+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
+ STable,
+ addForm,
+ editForm,
+ excelForm
},
- 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: 'areaCode'
+ },
+ {
+ title: '浠撳簱缂栧彿',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'warehouseCode'
+ },
+ {
+ title: '浠撳簱鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'warehouseName'
+ },
+ {
+ title: '搴撳尯鍚嶇О',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'areaName'
+ },
+ {
+ title: '搴撳尯鎻忚堪',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'areaDesc'
+ },
+ {
+ title: '搴撳尯鐘舵��',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'areaStatus'
+ },
+ {
+ 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: 'warehouseId',
+ // scopedSlots: { customRender: 'warehouseIdscopedSlots' }
+ // },
+ {
+ title: '闆朵欢绾х鎺�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isBarcodeLevelControl',
+ scopedSlots: { customRender: 'isBarcodeLevelControlscopedSlots' }
+ },
+ {
+ title: '妫�楠屽厛杩涘厛鍑�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isFIFO',
+ scopedSlots: { customRender: 'isFIFOscopedSlots' }
+ },
+ {
+ title: '闆朵欢绾х鎺�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isPartLevelControl',
+ scopedSlots: { customRender: 'isPartLevelControlscopedSlots' }
+ },
+ {
+ title: '鍏佽娣锋穯',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isAllowConfusion',
+ scopedSlots: { customRender: 'isAllowConfusionscopedSlots' }
+ },
+ {
+ title: '鍏佽璐熷簱瀛�',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isAllowNegativeInventory',
+ scopedSlots: { customRender: 'isAllowNegativeInventoryscopedSlots' }
+ },
+ {
+ title: '鏄惁铏氭嫙',
+ align: 'center',
+ customHeaderCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ customCell: () => {
+ return {
+ style: {
+ 'min-width': '120px'//鏈�灏忓垪瀹借缃�
+ }
+ }
+ },
+ sorter: true,
+ dataIndex: 'isVirtually',
+ scopedSlots: { customRender: 'isVirtuallyscopedSlots' }
+ },
+ {
+ 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: '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 WmsAreaPage(Object.assign(parameter, this.switchingDate())).then((res) => {
+ return res.data
+ })
+ },
+ warehouseIdData: [],
+ selectedRowKeys: [],
+ selectedRows: []
+ }
},
- {
- title: '搴撳尯缂栫爜',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'areaCode'
- },
- {
- title: '浠撳簱缂栧彿',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'warehouseCode'
- },
- {
- title: '浠撳簱鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'warehouseName'
- },
- {
- title: '搴撳尯鍚嶇О',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'areaName'
- },
- {
- title: '搴撳尯鎻忚堪',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'areaDesc'
- },
- {
- title: '搴撳尯鐘舵��',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'areaStatus'
- },
- {
- 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: 'warehouseId',
- scopedSlots: { customRender: 'warehouseIdscopedSlots' }
- },
- {
- title: '闆朵欢绾х鎺�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'isBarcodeLevelControl',
- scopedSlots: { customRender: 'isBarcodeLevelControlscopedSlots' }
- },
- {
- title: '妫�楠屽厛杩涘厛鍑�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'isFIFO',
- scopedSlots: { customRender: 'isFIFOscopedSlots' }
- },
- {
- title: '闆朵欢绾х鎺�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'isPartLevelControl',
- scopedSlots: { customRender: 'isPartLevelControlscopedSlots' }
- },
- {
- title: '鍏佽娣锋穯',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'isAllowConfusion',
- scopedSlots: { customRender: 'isAllowConfusionscopedSlots' }
- },
- {
- title: '鍏佽璐熷簱瀛�',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'isAllowNegativeInventory',
- scopedSlots: { customRender: 'isAllowNegativeInventoryscopedSlots' }
- },
- {
- title: '鏄惁铏氭嫙',
- align: 'center',
- customHeaderCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- customCell: () => {
- return {
- style: {
- 'min-width': '120px'//鏈�灏忓垪瀹借缃�
- }
- }
- },
- sorter: true,
- dataIndex: 'isVirtually',
- scopedSlots: { customRender: 'isVirtuallyscopedSlots' }
- },
- {
- 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: '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 WmsAreaPage(Object.assign(parameter, this.switchingDate())).then((res) => {
- return res.data
- })
- },
- warehouseIdData: [],
- selectedRowKeys: [],
- selectedRows: []
- }
- },
- created () {
- if (this.hasPerm('WmsArea:edit') || this.hasPerm('WmsArea: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 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
- this.isFIFOData = isFIFOOption.filters['dictData']('yes_true_false')
- const isPartLevelControlOption = this.$options
- this.isPartLevelControlData = isPartLevelControlOption.filters['dictData']('yes_true_false')
- const isAllowConfusionOption = this.$options
- this.isAllowConfusionData = isAllowConfusionOption.filters['dictData']('yes_true_false')
- const isAllowNegativeInventoryOption = this.$options
- this.isAllowNegativeInventoryData = isAllowNegativeInventoryOption.filters['dictData']('yes_true_false')
- const isVirtuallyOption = this.$options
- this.isVirtuallyData = isVirtuallyOption.filters['dictData']('yes_true_false')
- const isDisabledOption = this.$options
- this.isDisabledData = isDisabledOption.filters['dictData']('yes_true_false')
+ created() {
+ if (this.hasPerm('WmsArea:edit') || this.hasPerm('WmsArea: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 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
+ this.isFIFOData = isFIFOOption.filters['dictData']('yes_true_false')
+ const isPartLevelControlOption = this.$options
+ this.isPartLevelControlData = isPartLevelControlOption.filters['dictData']('yes_true_false')
+ const isAllowConfusionOption = this.$options
+ this.isAllowConfusionData = isAllowConfusionOption.filters['dictData']('yes_true_false')
+ const isAllowNegativeInventoryOption = this.$options
+ this.isAllowNegativeInventoryData = isAllowNegativeInventoryOption.filters['dictData']('yes_true_false')
+ const isVirtuallyOption = this.$options
+ this.isVirtuallyData = isVirtuallyOption.filters['dictData']('yes_true_false')
+ 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
- },
- WmsAreaDelete (record) {
- WmsAreaDelete(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
+ },
+ WmsAreaDelete(record) {
+ WmsAreaDelete(record).then((res) => {
+ if (res.success) {
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.$refs.table.refresh()
+ } else {
+ this.$message.error('鍒犻櫎澶辫触') // + res.message
+ }
+ })
+ },
- WmsAreaToExcel() {
- 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
- }
- })
- }
- WmsAreaPage(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)
- })
- },
+ WmsAreaToExcel() {
+ 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
+ }
+ })
+ }
+ WmsAreaPage(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 lang="less">.table-operator {
+ margin-bottom: 18px;
+}
-</style>
+button {
+ margin-right: 8px;
+}</style>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
index 295ef44..e21a1c0 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/addForm.vue
@@ -6,7 +6,7 @@
<a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" /> -->
- <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.typeCode">{{ item.typeName
}}</a-select-option>
</a-select>
@@ -16,9 +16,7 @@
<a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�" v-decorator="['containerTypeName', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉帮紒'}]}]" />
</a-form-item> -->
<a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <!-- <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" /> -->
-
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId']">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉帮紒'}]}]">
<a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
item.materialTypeName }}</a-select-option>
</a-select>
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
index 386cb6d..ffa7875 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsContainerPackaging/editForm.vue
@@ -6,7 +6,7 @@
<a-form-item label="瀹瑰櫒绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
<!-- <a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨婭D" v-decorator="['containerTypeId', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨婭D锛�'}]}]" /> -->
- <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.typeCode">{{ item.typeName
}}</a-select-option>
</a-select>
@@ -16,9 +16,7 @@
<a-input placeholder="璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉�" v-decorator="['containerTypeName', {rules: [{required: true, message: '璇疯緭鍏ュ鍣ㄧ被鍨嬪悕绉帮紒'}]}]" />
</a-form-item> -->
<a-form-item label="鐗╂枡绫诲瀷鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
- <!-- <a-input placeholder="璇疯緭鍏ョ墿鏂欑被鍨婭D" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨婭D锛�'}]}]" /> -->
-
- <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId']">
+ <a-select style="width: 100%" placeholder="璇烽�夋嫨鐗╂枡绫诲瀷鍚嶇О" v-decorator="['materialTypeId', {rules: [{required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨嬪悕绉帮紒'}]}]">
<a-select-option v-for="(item, index) in selectTypeData2" :key="index" :value="item.materialTypeCode">{{
item.materialTypeName }}</a-select-option>
</a-select>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/Dto/WmsAreaInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/Dto/WmsAreaInput.cs
index 24ed56e..8c4389b 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/Dto/WmsAreaInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/Dto/WmsAreaInput.cs
@@ -223,13 +223,13 @@
/// <summary>
/// 浠撳簱缂栧彿
/// </summary>
- [Required(ErrorMessage = "浠撳簱缂栧彿涓嶈兘涓虹┖")]
+ //[Required(ErrorMessage = "浠撳簱缂栧彿涓嶈兘涓虹┖")]
public virtual string WarehouseCode { get; set; }
/// <summary>
/// 浠撳簱鍚嶇О
/// </summary>
- [Required(ErrorMessage = "浠撳簱鍚嶇О涓嶈兘涓虹┖")]
+ //[Required(ErrorMessage = "浠撳簱鍚嶇О涓嶈兘涓虹┖")]
public virtual string WarehouseName { get; set; }
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs
index 811b48d..12c9b9d 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsArea/WmsAreaService.cs
@@ -26,6 +26,8 @@
private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep;
private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
private readonly ISysExcelTemplateService _sysExcelTemplateService;
+ private readonly IRepository<WmsWarehouse, MasterDbContextLocator> _wmsWarehouseRep;
+
private readonly static object _lock = new();
public WmsAreaService(
@@ -33,12 +35,14 @@
,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
,ISysExcelTemplateService sysExcelTemplateService
+ ,IRepository<WmsWarehouse, MasterDbContextLocator> wmsWarehouseRep
)
{
_wmsAreaRep = wmsAreaRep;
_sysDictTypeRep = sysDictTypeRep;
_sysDictDataRep = sysDictDataRep;
_sysExcelTemplateService = sysExcelTemplateService;
+ _wmsWarehouseRep = wmsWarehouseRep;
}
/// <summary>
@@ -163,7 +167,14 @@
var wmsArea = input.Adapt<WmsArea>();
//楠岃瘉
await CheckExisit(wmsArea);
-
+ //鎵�灞炰粨搴�
+ var Info = _wmsWarehouseRep.Where(x => x.Id == input.WarehouseId).FirstOrDefault();
+ if (Info == null)
+ {
+ throw Oops.Oh(errorMessage: @$"鎵�灞炰粨搴撲笉瀛樺湪锛�");
+ }
+ wmsArea.WarehouseName = Info.Name;
+ wmsArea.WarehouseCode = Info.Code;
wmsArea.CreatedUserId = wmsArea.UpdatedUserId = SysHelper.GetUserId();
wmsArea.CreatedUserName = wmsArea.UpdatedUserName = SysHelper.GetUserName();
wmsArea.CreatedTime = wmsArea.UpdatedTime = SysHelper.GetNowTime();
--
Gitblit v1.9.3