二线字段修改

snowy-admin-web/src/views/yqyc/general-ledger/two/goods.vue

@@ -30,6 +30,11 @@
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
+							<a-form-item label="账册类型：" name="accountType">
+								<a-select v-model:value="formData.accountType" :disabled="true" :options="tzlxOptions" show-search allow-clear optionFilterProp="label"/>
+							</a-form-item>
+						</a-col>
+						<a-col :span="8">
 							<a-form-item label="企业编码" name="companyCode">
 								<a-input v-model:value="formData.companyCode" :disabled="true"/>
 							</a-form-item>
@@ -129,12 +134,12 @@
 				<a-form ref="formRef" :model="formData">
 					<a-row :gutter="16">
 						<a-col :span="8">
-							<a-form-item label="物料编号" name="wlbh">
+							<a-form-item label="商品编号" name="wlbh">
 								<a-input v-model:value="formData.wlbh" :disabled="true"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="8">
-							<a-form-item label="物料名称" name="wlmc">
+							<a-form-item label="商品名称" name="wlmc">
 								<a-input v-model:value="formData.wlmc" :disabled="true"/>
 							</a-form-item>
 						</a-col>
@@ -230,27 +235,27 @@
 						</a-col>
 					</a-row>
 				</a-form>
-				<a-table
-					style="margin-top: 10px"
-					bordered
-					:dataSource="[formData]"
-					:columns="[
-              {title: '物料编号',dataIndex: 'wlbh',key: 'wlbh'},
-              {title: '物料名称',dataIndex: 'wlmc',key: 'wlmc'},
-              {title: '规格型号',dataIndex: 'ggxh',key: 'ggxh'},
-              {title: '出库数量',dataIndex: 'rkNum',key: 'rkNum'},
-              {title: '计量单位',dataIndex: 'measurementUnit',key: 'measurementUnit'},
-              {title: '单价',dataIndex: 'unitPrice',key: 'unitPrice'},
-              {title: '操作',dataIndex: 'action',key: 'action'},
-            ]"
-					:pagination="false"
-				>
-					<template #bodyCell="{ column, record }">
-						<template v-if="column.dataIndex === 'action'">
-							<a-button type="link" primary size="small">查看</a-button>
-						</template>
-					</template>
-				</a-table>
+<!--				<a-table-->
+<!--					style="margin-top: 10px"-->
+<!--					bordered-->
+<!--					:dataSource="[formData]"-->
+<!--					:columns="[-->
+<!--              {title: '物料编号',dataIndex: 'wlbh',key: 'wlbh'},-->
+<!--              {title: '物料名称',dataIndex: 'wlmc',key: 'wlmc'},-->
+<!--              {title: '规格型号',dataIndex: 'ggxh',key: 'ggxh'},-->
+<!--              {title: '出库数量',dataIndex: 'rkNum',key: 'rkNum'},-->
+<!--              {title: '计量单位',dataIndex: 'measurementUnit',key: 'measurementUnit'},-->
+<!--              {title: '单价',dataIndex: 'unitPrice',key: 'unitPrice'},-->
+<!--              {title: '操作',dataIndex: 'action',key: 'action'},-->
+<!--            ]"-->
+<!--					:pagination="false"-->
+<!--				>-->
+<!--					<template #bodyCell="{ column, record }">-->
+<!--						<template v-if="column.dataIndex === 'action'">-->
+<!--							<a-button type="link" primary size="small">查看</a-button>-->
+<!--						</template>-->
+<!--					</template>-->
+<!--				</a-table>-->
 			</a-card>
 		</div>
 		<template #footer></template>
@@ -268,6 +273,7 @@ const formRef = ref()
 // 表单数据
 const formData = ref({})
 const currencyOptions = ref([])
+const tzlxOptions = ref([])
 
 // 打开抽屉
 const onOpen = (record, view = false) => {
@@ -315,7 +321,7 @@ const onOpen = (record, view = false) => {
 		})
 	}
 	currencyOptions.value = tool.dictList('hbdm')
-
+	tzlxOptions.value = tool.dictList('tzlx')
 }
 // 关闭抽屉
 const onClose = () => {

snowy-admin-web/src/views/yqyc/general-ledger/two/index.vue

@@ -226,6 +226,11 @@ const columns = ref([
     sorter: true,
   },
   {
+    title: '库存数量',
+    dataIndex: 'kcNumber',
+    sorter: true,
+  },
+  {
     title: '法定计量单位',
     dataIndex: 'measurementUnit',
   },