first

src/typings/md.d.ts

@@ -75,6 +75,7 @@ declare namespace List {
 		numMeasureName: string;
 		weightMeasureName: string;
 		createTime: string;
+		color?: string;
 		remark: string;
 		ifEnable: number;
 	};
@@ -95,6 +96,7 @@ declare namespace List {
 		specification: string;
 		processRouteId: string | null;
 		productName: string;
+		color?: string;
 		productTypeName?: string;
 		weightMeasureId: string | null;
 		weightMeasureName?: string;
@@ -153,7 +155,7 @@ declare namespace Item {
 		maxStock: string;
 		createTime: string;
 		remark: string;
-		color: string,
+		color?: string,
 		ifEnable: number;
 		attr1: string | null;
 		attr2: string | null;

src/views/md/list/index.vue

@@ -83,11 +83,14 @@
 							<n-form-item-grid-item label="产品规格" :span="11" path="specification">
 								<n-input v-model:value="addForm.specification" placeholder="请输入产品规格" />
 							</n-form-item-grid-item>
-              <n-form-item-grid-item label="重量单位" :span="11" path="weightMeasureName">
+							<n-form-item-grid-item label="颜色" :span="11" path="color">
+								<n-select v-model:value="addForm.color" class="w-200px" :options="corlor_types" placeholder="请选择颜色" ></n-select>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item label="单位" :span="11" path="weightMeasureName">
 								<n-select
 									v-model:value="addForm.weightMeasureId"
 									:options="unitOptions"
-                  placeholder="请输入重量单位"
+									placeholder="请输入单位"
 									@update:value="
                     (val, item:any) => {
                       addForm.weightMeasureName = item.label;
@@ -128,7 +131,7 @@ const addFormRef = ref<FormInst | null>(null);
 const routeOptions = ref<{ label: string; value: number }[]>([]);
 
 const { proxy } = getCurrentInstance() as any;
-const { product_model_standard } = proxy.useDict('product_model_standard');
+const { product_model_standard, corlor_types } = proxy.useDict('product_model_standard', "corlor_types");
 
 const dictionaryOptions = product_model_standard;
 
@@ -140,6 +143,7 @@ const addForm = ref<List.AddForm>({
 	processRouteId: '',
 	specification: '',
 	productName: '',
+	color: '',
 	weightMeasureId: null,
 	remark: '',
 	ifEnable: 1
@@ -161,6 +165,7 @@ function cancel() {
 		productSizeInternational: '',
 		specification: '',
 		processRouteId: '',
+		color: '',
 		weightMeasureId: null,
 		remark: '',
 		ifEnable: 1
@@ -258,6 +263,23 @@ const columns: Ref<DataTableColumns<List.DataForm>> = ref([
 		align: 'center',
 		width: 120
 	},
+	{
+		title: '颜色',
+		align: 'center',
+		key: 'color'
+	},
+	{
+		title: '颜色名称',
+		key: 'status',
+		align: 'center',
+		render: row => {
+			return <dict-tag options={corlor_types.value} value={row.color}></dict-tag>;
+		},
+		width: 110,
+		ellipsis: {
+			tooltip: true
+		}
+	},
 	{
 		title: '国际型号',
 		key: 'productSizeInternational',