Commit ad9e2c083037484a0d3b4018fb02f4b5dd4523bd
1 parent
e3bb2a1c
移除容器类型与货主的绑定关系,库存详情移除唯一号,转由库存明细保存唯一号
Signed-off-by: TanYibin <5491541@qq.com>
Showing
5 changed files
with
15 additions
and
21 deletions
ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
@@ -177,13 +177,13 @@ export default { | @@ -177,13 +177,13 @@ export default { | ||
177 | align: 'center', | 177 | align: 'center', |
178 | dataIndex: 'name' | 178 | dataIndex: 'name' |
179 | }, | 179 | }, |
180 | - { | ||
181 | - title: '货主', | ||
182 | - align: 'center', | ||
183 | - dataIndex: 'companyCode', | ||
184 | - key: 'companyCode', | ||
185 | - scopedSlots: {customRender: 'companyCode'} | ||
186 | - }, | 180 | + // { |
181 | + // title: '货主', | ||
182 | + // align: 'center', | ||
183 | + // dataIndex: 'companyCode', | ||
184 | + // key: 'companyCode', | ||
185 | + // scopedSlots: {customRender: 'companyCode'} | ||
186 | + // }, | ||
187 | { | 187 | { |
188 | title: '绑定的库位类型', | 188 | title: '绑定的库位类型', |
189 | align: 'center', | 189 | align: 'center', |
ant-design-vue-jeecg/src/views/system/config/modules/ContainerTypeForm.vue
@@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
13 | <a-input v-model="model.name" placeholder="请输入名称"></a-input> | 13 | <a-input v-model="model.name" placeholder="请输入名称"></a-input> |
14 | </a-form-model-item> | 14 | </a-form-model-item> |
15 | </a-col> | 15 | </a-col> |
16 | - <a-col :span="24"> | 16 | + <!-- <a-col :span="24"> |
17 | <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode"> | 17 | <a-form-model-item label="货主" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="companyCode"> |
18 | <a-select | 18 | <a-select |
19 | show-search | 19 | show-search |
@@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
25 | </a-select-option> | 25 | </a-select-option> |
26 | </a-select> | 26 | </a-select> |
27 | </a-form-model-item> | 27 | </a-form-model-item> |
28 | - </a-col> | 28 | + </a-col> --> |
29 | <a-col :span="24"> | 29 | <a-col :span="24"> |
30 | <a-form-model-item label="绑定的库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationType"> | 30 | <a-form-model-item label="绑定的库位类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="locationType"> |
31 | <j-select-multiple | 31 | <j-select-multiple |
ant-design-vue-jeecg/src/views/system/inventory/InventoryChildList.vue
@@ -143,12 +143,9 @@ | @@ -143,12 +143,9 @@ | ||
143 | 下载 | 143 | 下载 |
144 | </a-button> | 144 | </a-button> |
145 | </template> | 145 | </template> |
146 | - | ||
147 | <span slot="action" slot-scope="text, record"> | 146 | <span slot="action" slot-scope="text, record"> |
148 | <a v-has="'inventoryChild:edit'" @click="handleEdit(record)">编辑</a> | 147 | <a v-has="'inventoryChild:edit'" @click="handleEdit(record)">编辑</a> |
149 | - | ||
150 | </span> | 148 | </span> |
151 | - | ||
152 | </a-table> | 149 | </a-table> |
153 | </div> | 150 | </div> |
154 | 151 |
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
@@ -195,11 +195,11 @@ export default { | @@ -195,11 +195,11 @@ export default { | ||
195 | align: "center", | 195 | align: "center", |
196 | dataIndex: 'batch' | 196 | dataIndex: 'batch' |
197 | }, | 197 | }, |
198 | - { | ||
199 | - title: '唯一号', | ||
200 | - align: "center", | ||
201 | - dataIndex: 'uniqueCode' | ||
202 | - }, | 198 | + // { |
199 | + // title: '唯一号', | ||
200 | + // align: "center", | ||
201 | + // dataIndex: 'uniqueCode' | ||
202 | + // }, | ||
203 | { | 203 | { |
204 | title: '入库日期', | 204 | title: '入库日期', |
205 | align: "center", | 205 | align: "center", |
ant-design-vue-jeecg/src/views/system/inventory/SimpleInventoryDetailList.vue
@@ -143,11 +143,8 @@ | @@ -143,11 +143,8 @@ | ||
143 | 下载 | 143 | 下载 |
144 | </a-button> | 144 | </a-button> |
145 | </template> | 145 | </template> |
146 | - | ||
147 | <span slot="action" slot-scope="text, record"> | 146 | <span slot="action" slot-scope="text, record"> |
148 | - <a v-has="'inventoryDetail:edit'"@click="handleEdit(record)">编辑</a> | ||
149 | - | ||
150 | - <a-divider type="vertical" /> | 147 | + <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑<a-divider type="vertical" /></a> |
151 | <a-popconfirm v-has="'inventoryDetail:delete'" title="确定删除吗?" @confirm="() => handleDelete(record.id)"> | 148 | <a-popconfirm v-has="'inventoryDetail:delete'" title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
152 | <a>删除</a> | 149 | <a>删除</a> |
153 | </a-popconfirm> | 150 | </a-popconfirm> |