snowy-admin-web/src/views/biz/goodsConf/editForm.vue

@@ -64,6 +64,7 @@
 		if (record) {
 			let recordData = cloneDeep(record)
 			formData.value = Object.assign({}, recordData)
+			formData.value.confWeight = Number(formData.value.confWeight) / 1000
 		}
 	}
 	// 关闭抽屉

snowy-admin-web/src/views/biz/goodsConf/index.vue

@@ -63,10 +63,9 @@
 						<a @click="editFormRef.onOpen(record)" v-if="hasPerm('goodsConfEdit') && Number(record.usedWeight) == 0">编辑</a>
 
 						<a-divider type="vertical" v-if="hasPerm(['goodsConfEdit', 'goodsConfDelete'], 'and') && Number(record.usedWeight) == 0" />
-						<a-button type="link" danger size="small" v-if="hasPerm('goodsConfDelete')" @click="deleteConfig(record)">删除</a-button>
+						<a-button type="link" danger size="small" v-if="hasPerm('goodsConfDelete') && Number(record.usedWeight) == 0" @click="deleteConfig(record)">删除</a-button>
 						
-						<a-divider type="vertical" v-if="(hasPerm(['goodsConfEdit', 'goodsConfDelete'], 'or') && Number(record.usedWeight) == 0) && hasPerm('goodsConfWeight')" />
-						<a @click="weightFormRef.onOpen(record)" v-if="hasPerm('goodsConfWeight')">重量</a>
+						<a @click="weightFormRef.onOpen(record)" v-if="hasPerm('goodsConfWeight') && Number(record.usedWeight) != 0">重量</a>
 					</a-space>
 				</template>
 			</template>