diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
index 5a3d148..2e3574b 100644
--- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
+++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
@@ -53,32 +53,32 @@
                 <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled" placeholder="请选择是否启用"  />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.multiUnitType == '1'">
+						<a-col :span="8">
 							<a-form-item label="一级单位" v-bind="validateInfos.oneUnit" id="ConfigMaterialInfoForm-oneUnit" name="oneUnit">
 								<a-input v-model:value="formData.oneUnit" placeholder="请输入一级单位"  maxlength="10" ></a-input>
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.multiUnitType == '1'">
+						<a-col :span="8">
 							<a-form-item label="一级单位兑换比例" v-bind="validateInfos.oneUnitProportion" id="ConfigMaterialInfoForm-oneUnitProportion" name="oneUnitProportion">
 								<a-input-number v-model:value="formData.oneUnitProportion" maxlength="10" placeholder="请输入一级单位兑换比例" style="width: 100%" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.multiUnitType == '1'">
+						<a-col :span="8">
 							<a-form-item label="一级单位价格" v-bind="validateInfos.oneUnitPrice" id="ConfigMaterialInfoForm-oneUnitPrice" name="oneUnitPrice">
 								<a-input-number v-model:value="formData.oneUnitPrice" maxlength="10" placeholder="请输入一级单位价格" style="width: 100%" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
+						<a-col :span="8">
 							<a-form-item label="二级单位" v-bind="validateInfos.twoUnit" id="ConfigMaterialInfoForm-twoUnit" name="twoUnit">
 								<a-input v-model:value="formData.twoUnit" placeholder="请输入二级单位" maxlength="10"  ></a-input>
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
+						<a-col :span="8">
 							<a-form-item label="二级单位兑换比例" v-bind="validateInfos.twoUnitProportion" id="ConfigMaterialInfoForm-twoUnitProportion" name="twoUnitProportion">
 								<a-input-number v-model:value="formData.twoUnitProportion" maxlength="10" placeholder="请输入二级单位兑换比例" style="width: 100%" />
 							</a-form-item>
 						</a-col>
-						<a-col :span="8" v-if="formData.multiUnitType == '1' || formData.multiUnitType == '2'">
+						<a-col :span="8">
 							<a-form-item label="二级单位价格" v-bind="validateInfos.twoUnitPrice" id="ConfigMaterialInfoForm-twoUnitPrice" name="twoUnitPrice">
 								<a-input-number v-model:value="formData.twoUnitPrice" maxlength="10" placeholder="请输入二级单位价格" style="width: 100%" />
 							</a-form-item>
diff --git a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts
index 88df662..0b9e89a 100644
--- a/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts
+++ b/src/views/invoicing/warehouseMaterialInfo/BlWarehouseMaterialInfo.data.ts
@@ -8,7 +8,7 @@ export const columns: BasicColumn[] = [
   {
     title: '库房',
     align: "center",
-    dataIndex: 'nuId_dictText'
+    dataIndex: 'nuName'
   },
   {
     title: '物料',