From ad9e2c083037484a0d3b4018fb02f4b5dd4523bd Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Fri, 7 Apr 2023 13:44:02 +0800
Subject: [PATCH] 移除容器类型与货主的绑定关系，库存详情移除唯一号，转由库存明细保存唯一号
---
ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue | 14 +++++++-------
ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue | 3 ---
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue | 10 +++++-----
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue | 5 +----
5 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue b/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
index 8a6d993..7fbc700 100644
--- a/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
@@ -177,13 +177,13 @@ export default {
align: 'center',
dataIndex: 'name'
},
- {
- title: '货主',
- align: 'center',
- dataIndex: 'companyCode',
- key: 'companyCode',
- scopedSlots: {customRender: 'companyCode'}
- },
+ // {
+ // title: '货主',
+ // align: 'center',
+ // dataIndex: 'companyCode',
+ // key: 'companyCode',
+ // scopedSlots: {customRender: 'companyCode'}
+ // },
{
title: '绑定的库位类型',
align: 'center',
diff --git a/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue b/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
index 5e2b395..437e79e 100644
--- a/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
@@ -13,7 +13,7 @@
<a-input v-model="model.name" placeholder="请输入名称"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="24">
+ <!-- <a-col :span="24">
<a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode">
<a-select
show-search
@@ -25,7 +25,7 @@
</a-select-option>
</a-select>
</a-form-model-item>
- </a-col>
+ </a-col> -->
<a-col :span="24">
<a-form-model-item label="绑定的库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationType">
<j-select-multiple
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
index 58cdc72..f417a11 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
@@ -143,12 +143,9 @@
下载
</a-button>
</template>
-
<span slot="action" slot-scope="text, record">
<a v-has="'inventoryChild:edit'" @click="handleEdit(record)">编辑</a>
-
</span>
-
</a-table>
</div>
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
index 5660d08..d1cad40 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
@@ -195,11 +195,11 @@ export default {
align: "center",
dataIndex: 'batch'
},
- {
- title: '唯一号',
- align: "center",
- dataIndex: 'uniqueCode'
- },
+ // {
+ // title: '唯一号',
+ // align: "center",
+ // dataIndex: 'uniqueCode'
+ // },
{
title: '入库日期',
align: "center",
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
index cf60c89..0bee69c 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
@@ -143,11 +143,8 @@
下载
</a-button>
</template>
-
<span slot="action" slot-scope="text, record">
- <a v-has="'inventoryDetail:edit'"@click="handleEdit(record)">编辑</a>
-
- <a-divider type="vertical" />
+ <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a>
<a-popconfirm v-has="'inventoryDetail:delete'" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
--
libgit2 0.22.2