diff --git a/src/typings/md.d.ts b/src/typings/md.d.ts
index 3985b1e..6fa6302 100644
--- a/src/typings/md.d.ts
+++ b/src/typings/md.d.ts
@@ -1,210 +1,212 @@
 declare namespace Md {
-  interface CopperBar {
-    weightMeasureName: string;
-    id: number;
-    weightMeasureId: string;
-    copperbarName: string;
-    copperbarDiameter: string;
-    unitWeight: string;
-    createBy: string;
-    createTime: string;
-  }
-  interface CopperBarSearch {
-    copperbarName: string;
-    copperbarDiameter: string;
-    weightMeasureId: string | null;
-    pageNum: number;
-    pageSize: number;
-    total: number;
-  }
-  interface CopperBarAdd {
-    weightMeasureName: string;
-    id?: number;
-    copperbarDiameter: string;
-    copperbarName: string;
-    unitWeight: string;
-    weightMeasureId: string | null;
-  }
-  interface WorkGroupMember {
-    memberName: string;
-    memberId: string;
-    workgroupName: string;
-    orkgroupCode: string;
-    headName: string;
-    ifEnable: number;
-    createTime: string;
-  }
-  interface WorkMember {
-    userId: number;
-    userName: string;
-    nickName: string;
-    email: string;
-    phonenumber: string;
-  }
-  interface WorkGroupSearch {
-    workgroupId?: string;
-    memberName: string;
-    memberId: string;
-    pageNum: number;
-    pageSize: number;
-    total: number;
-  }
-  interface workUser {
-    phonenumber: string;
-    userName: string | null;
-    pageNum: number;
-    pageSize: number;
-    total: number | undefined;
-  }
+	interface CopperBar {
+		weightMeasureName: string;
+		id: number;
+		weightMeasureId: string;
+		copperbarName: string;
+		copperbarDiameter: string;
+		unitWeight: string;
+		createBy: string;
+		createTime: string;
+	}
+	interface CopperBarSearch {
+		copperbarName: string;
+		copperbarDiameter: string;
+		weightMeasureId: string | null;
+		pageNum: number;
+		pageSize: number;
+		total: number;
+	}
+	interface CopperBarAdd {
+		weightMeasureName: string;
+		id?: number;
+		copperbarDiameter: string;
+		copperbarName: string;
+		unitWeight: string;
+		weightMeasureId: string | null;
+	}
+	interface WorkGroupMember {
+		memberName: string;
+		memberId: string;
+		workgroupName: string;
+		orkgroupCode: string;
+		headName: string;
+		ifEnable: number;
+		createTime: string;
+	}
+	interface WorkMember {
+		userId: number;
+		userName: string;
+		nickName: string;
+		email: string;
+		phonenumber: string;
+	}
+	interface WorkGroupSearch {
+		workgroupId?: string;
+		memberName: string;
+		memberId: string;
+		pageNum: number;
+		pageSize: number;
+		total: number;
+	}
+	interface workUser {
+		phonenumber: string;
+		userName: string | null;
+		pageNum: number;
+		pageSize: number;
+		total: number | undefined;
+	}
 }
 declare namespace List {
-  type DataForm = {
-    productId: number | string | null;
-    id: number;
-    processRouteId: string | null;
-    productTypeId: string;
-    productTypeName: string;
-    productName: string;
-    productCode: string;
-    productSize: string;
-    productSizeInternational: string;
-    numMeasureId: string;
-    weightMeasureId: string;
-    specification: string;
-    processRouteName: string;
-    numMeasureName: string;
-    weightMeasureName: string;
-    createTime: string;
-    remark: string;
-    ifEnable: number;
-  };
-  type SearchForm = {
-    productTypeId: string;
-    productName: string;
-    specification: string;
-    pageNum: number;
-    pageSize: number;
-    total: number;
-  };
-  type AddForm = {
-    processRouteName: string;
-    id?: number;
-    productTypeId: string;
-    productSize: string;
-    productSizeInternational: string;
-    specification: string;
-    processRouteId: string | null;
-    productName: string;
-    productTypeName?: string;
-    weightMeasureId: string | null;
-    weightMeasureName?: string;
-    remark: string;
-    ifEnable: number;
-  };
+	type DataForm = {
+		productId: number | string | null;
+		id: number;
+		processRouteId: string | null;
+		productTypeId: string;
+		productTypeName: string;
+		productName: string;
+		productCode: string;
+		productSize: string;
+		productSizeInternational: string;
+		numMeasureId: string;
+		weightMeasureId: string;
+		specification: string;
+		processRouteName: string;
+		numMeasureName: string;
+		weightMeasureName: string;
+		createTime: string;
+		remark: string;
+		ifEnable: number;
+	};
+	type SearchForm = {
+		productTypeId: string;
+		productName: string;
+		specification: string;
+		pageNum: number;
+		pageSize: number;
+		total: number;
+	};
+	type AddForm = {
+		processRouteName: string;
+		id?: number;
+		productTypeId: string;
+		productSize: string;
+		productSizeInternational: string;
+		specification: string;
+		processRouteId: string | null;
+		productName: string;
+		productTypeName?: string;
+		weightMeasureId: string | null;
+		weightMeasureName?: string;
+		remark: string;
+		ifEnable: number;
+	};
 }
 declare namespace Type {
-  interface searchForm {
-    id: string | null;
-    typeCode: string;
-    ifEnable: number | null;
-    pageNum: number;
-    pageSize: number;
-    total: number;
-  }
-  interface addForm {
-    id?: number;
-    typeName: string;
-    typeCode: string;
-    parentTypeId: number | null;
-    ifEnable: number;
-  }
-  interface DataForm {
-    createBy: string;
-    createTime: string;
-    updateBy: string;
-    updateTime: string;
-    remark: string;
-    id: number;
-    typeName: string;
-    typeCode: string;
-    parentTypeId: number;
-    ancestors: string;
-    ifEnable: number;
-    version: number;
-    isDeleted: number;
-    attr1: string | null;
-    attr2: string | null;
-    attr3: string | null;
-    children?: DataForm[];
-  }
+	interface searchForm {
+		id: string | null;
+		typeCode: string;
+		ifEnable: number | null;
+		pageNum: number;
+		pageSize: number;
+		total: number;
+	}
+	interface addForm {
+		id?: number;
+		typeName: string;
+		typeCode: string;
+		parentTypeId: number | null;
+		ifEnable: number;
+	}
+	interface DataForm {
+		createBy: string;
+		createTime: string;
+		updateBy: string;
+		updateTime: string;
+		remark: string;
+		id: number;
+		typeName: string;
+		typeCode: string;
+		parentTypeId: number;
+		ancestors: string;
+		ifEnable: number;
+		version: number;
+		isDeleted: number;
+		attr1: string | null;
+		attr2: string | null;
+		attr3: string | null;
+		children?: DataForm[];
+	}
 }
 declare namespace Item {
-  interface List {
-    id: number;
-    itemCode: string;
-    itemName: string;
-    itemTypeName: string;
-    itemTypeCode?: string;
-    itemTypeId: string | null | number;
-    workstageId: string | null;
-    workstageName: string;
-    numMeasureName: string;
-    minStock: string;
-    maxStock: string;
-    createTime: string;
-    remark: string;
-    ifEnable: number;
-    attr1: string | null;
-    attr2: string | null;
-    attr3: string | null;
-  }
-  interface SearchForm {
-    itemCode: string;
-    numMeasureId?: string | null;
-    itemName: string;
-    numMeasureName?: string;
-    itemTypeName?: string;
-    itemTypeId?: string | number | null;
-    pageNum: number;
-    pageSize: number;
-    total: number;
-    weightMeasureId?: string | null;
-  }
-  interface AddForm {
-    remark: string;
-    id?: number | null;
-    specification?: string;
-    itemTypeId: string | number | null;
-    itemTypeName?: string;
-    workstageId: string | null;
-    workstageName?: string;
-    itemName: string;
-    weightMeasureId?: string | null;
-    weightMeasureName?: string;
-    ifEnable: number;
-  }
+	interface List {
+		id: number;
+		itemCode: string;
+		itemName: string;
+		itemTypeName: string;
+		itemTypeCode?: string;
+		itemTypeId: string | null | number;
+		workstageId: string | null;
+		workstageName: string;
+		numMeasureName: string;
+		minStock: string;
+		maxStock: string;
+		createTime: string;
+		remark: string;
+		color: string,
+		ifEnable: number;
+		attr1: string | null;
+		attr2: string | null;
+		attr3: string | null;
+	}
+	interface SearchForm {
+		itemCode: string;
+		numMeasureId?: string | null;
+		itemName: string;
+		numMeasureName?: string;
+		itemTypeName?: string;
+		itemTypeId?: string | number | null;
+		pageNum: number;
+		pageSize: number;
+		total: number;
+		weightMeasureId?: string | null;
+	}
+	interface AddForm {
+		remark: string;
+		id?: number | null;
+		specification?: string;
+		itemTypeId: string | number | null;
+		itemTypeName?: string;
+		workstageId: string | null;
+		workstageName?: string;
+		itemName: string;
+		color?: string;
+		weightMeasureId?: string | null;
+		weightMeasureName?: string;
+		ifEnable: number;
+	}
 }
 
 declare namespace PrintTemplate {
-  interface Data {
-    clientCode: null | string;
-    clientId: null | string;
-    clientName: null | string;
-    code: null | string;
-    content: null | string;
-    createBy: null | string;
-    createTime: null | string;
-    defaultPrinterName: null | string;
-    enableFlag: null | string;
-    remark: null | string;
-    status: null | string;
-    templateCode: null | string;
-    templateId: null | string;
-    templateName: null | string;
-    type: null | string;
-    updateBy: null | string;
-    updateTime: null | string;
-    userId: null | string;
-    userNickName: null | string;
-  }
+	interface Data {
+		clientCode: null | string;
+		clientId: null | string;
+		clientName: null | string;
+		code: null | string;
+		content: null | string;
+		createBy: null | string;
+		createTime: null | string;
+		defaultPrinterName: null | string;
+		enableFlag: null | string;
+		remark: null | string;
+		status: null | string;
+		templateCode: null | string;
+		templateId: null | string;
+		templateName: null | string;
+		type: null | string;
+		updateBy: null | string;
+		updateTime: null | string;
+		userId: null | string;
+		userNickName: null | string;
+	}
 }
diff --git a/src/typings/page-route.d.ts b/src/typings/page-route.d.ts
index 5517272..db8ce04 100644
--- a/src/typings/page-route.d.ts
+++ b/src/typings/page-route.d.ts
@@ -170,6 +170,7 @@ declare namespace PageRoute {
     | 'scm_accessorySupplier'
     | 'storage'
     | 'storage_copperWire'
+		| 'storage_auxiliaryProduceinfo'
     | 'storage_earlyWarning'
     | 'storage_enamelCover'
     | 'storage_finishedProductInventory'
diff --git a/src/views/auxiliaryProduceinfo/components/table-action-modal.vue b/src/views/auxiliaryProduceinfo/components/table-action-modal.vue
index 084ae20..eedeff3 100644
--- a/src/views/auxiliaryProduceinfo/components/table-action-modal.vue
+++ b/src/views/auxiliaryProduceinfo/components/table-action-modal.vue
@@ -1,100 +1,100 @@
 <template>
-  <my-dialog
-    v-model:show="modalVisible"
-    :title="title"
-    :loading="subDialog"
-    width="1000px"
-    @submit="submit"
-    @cancel="cancel"
-  >
-    <template #content>
-      <div>
-        <n-form ref="formRef" label-placement="left" :label-width="100" :model="formModel" :rules="rules">
-          <n-grid :cols="24" :x-gap="18">
-            <!-- <n-form-item-grid-item :span="8" label="入库单ID" path="recptId">
-              <n-input v-model:value="formModel.recptId" placeholder="请输入入库单ID" />
-            </n-form-item-grid-item> -->
-            <!-- <n-form-item-grid-item :span="8" label="产品物料ID" path="itemId">
-              <n-input v-model:value="formModel.itemId" placeholder="请输入产品物料ID" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="产品物料编码" path="itemCode">
-              <n-input v-model:value="formModel.itemCode" placeholder="请输入产品物料编码" />
-            </n-form-item-grid-item> -->
-            <n-form-item-grid-item :span="8" label="产品物料名称" path="itemName">
-              <n-input v-model:value="formModel.itemName" disabled placeholder="请输入产品物料名称" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="规格型号" path="specification">
-              <n-input v-model:value="formModel.specification" placeholder="请输入规格型号" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="单位" path="unitOfMeasure">
-              <n-input v-model:value="formModel.unitOfMeasure" placeholder="请输入单位" />
-            </n-form-item-grid-item>
-            <!-- <n-form-item-grid-item :span="8" label="应入数量" path="quantityRecived">
-              <n-input v-model:value="formModel.quantityRecived" placeholder="请输入应入数量" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="验收数量" path="quantityChecked">
-              <n-input v-model:value="formModel.quantityChecked" placeholder="请输入验收数量" />
-            </n-form-item-grid-item> -->
-            <n-form-item-grid-item :span="8" label="入库数量" path="quantitySaved">
-              <n-input v-model:value="formModel.quantitySaved" placeholder="请输入上架数量" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="入库批次号" path="batchCode">
-              <n-input v-model:value="formModel.batchCode" placeholder="请输入入库批次号" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="仓库名称" path="warehouseName">
-              <n-input v-model:value="formModel.warehouseName" disabled />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="库区名称" path="locationName">
-              <n-select v-model:value="formModel.locationId" :options="locationOptions" @update:value="locationSelect">
-                <template #empty>
-                  <div>
-                    <n-empty v-if="locationOptions.length === 0" description="暂无数据" />
-                  </div>
-                </template>
-              </n-select>
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="库位名称" path="locationName">
-              <n-select v-model:value="formModel.areaId" :options="areaOptions" @update:value="areaSelect">
-                <template #empty>
-                  <div>
-                    <n-empty v-if="areaOptions.length === 0" description="暂无数据" />
-                    <n-empty v-if="!formModel.locationId && areaOptions.length > 0" description="请选择库区" />
-                  </div>
-                </template>
-              </n-select>
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="有效期" path="expireDate">
-              <n-date-picker v-model:value="formModel.expireDate" type="date" placeholder="请选择有效期" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="备注" path="remark">
-              <n-input v-model:value="formModel.remark" placeholder="请输入备注" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="来料检验单ID" path="iqcId">
-              <n-input v-model:value="formModel.iqcId" placeholder="请输入来料检验单ID" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="来料检验单编号" path="iqcCode">
-              <n-input v-model:value="formModel.iqcCode" placeholder="请输入来料检验单编号" />
-            </n-form-item-grid-item>
-            <!-- <n-form-item-grid-item :span="8" label="净重" path="weight">
-              <n-input-number v-model:value="formModel.weight" placeholder="请输入净重" />
-            </n-form-item-grid-item> -->
-            <!-- <n-form-item-grid-item :span="8" label="应入重量" path="weightRecived">
-              <n-input-number v-model:value="formModel.weightRecived" placeholder="请输入应入重量" />
-            </n-form-item-grid-item> -->
-            <n-form-item-grid-item :span="8" label="入库重量" path="totalWeight">
-              <n-input-number v-model:value="formModel.totalWeight" placeholder="请输入毛重" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="重量单位" path="weightUnit">
-              <n-input v-model:value="formModel.weightUnit" placeholder="请输入重量单位" />
-            </n-form-item-grid-item>
-            <n-form-item-grid-item :span="8" label="容器码" path="containerCode">
-              <n-input v-model:value="formModel.containerCode" placeholder="请输入容器码" />
-            </n-form-item-grid-item>
-          </n-grid>
-        </n-form>
-      </div>
-    </template>
-  </my-dialog>
+	<my-dialog
+		v-model:show="modalVisible"
+		:title="title"
+		:loading="subDialog"
+		width="1000px"
+		@submit="submit"
+		@cancel="cancel"
+	>
+		<template #content>
+			<div>
+				<n-form ref="formRef" label-placement="left" :label-width="100" :model="formModel" :rules="rules">
+					<n-grid :cols="24" :x-gap="18">
+						<!-- <n-form-item-grid-item :span="8" label="入库单ID" path="recptId">
+							<n-input v-model:value="formModel.recptId" placeholder="请输入入库单ID" />
+						</n-form-item-grid-item> -->
+						<!-- <n-form-item-grid-item :span="8" label="产品物料ID" path="itemId">
+							<n-input v-model:value="formModel.itemId" placeholder="请输入产品物料ID" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="产品物料编码" path="itemCode">
+							<n-input v-model:value="formModel.itemCode" placeholder="请输入产品物料编码" />
+						</n-form-item-grid-item> -->
+						<n-form-item-grid-item :span="8" label="产品物料名称" path="itemName">
+							<n-input v-model:value="formModel.itemName" disabled placeholder="请输入产品物料名称" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="规格型号" path="specification">
+							<n-input v-model:value="formModel.specification" placeholder="请输入规格型号" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="单位" path="unitOfMeasure">
+							<n-input v-model:value="formModel.unitOfMeasure" placeholder="请输入单位" />
+						</n-form-item-grid-item>
+						<!-- <n-form-item-grid-item :span="8" label="应入数量" path="quantityRecived">
+							<n-input v-model:value="formModel.quantityRecived" placeholder="请输入应入数量" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="验收数量" path="quantityChecked">
+							<n-input v-model:value="formModel.quantityChecked" placeholder="请输入验收数量" />
+						</n-form-item-grid-item> -->
+						<n-form-item-grid-item :span="8" label="入库数量" path="quantitySaved">
+							<n-input v-model:value="formModel.quantitySaved" placeholder="请输入上架数量" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="入库批次号" path="batchCode">
+							<n-input v-model:value="formModel.batchCode" placeholder="请输入入库批次号" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="仓库名称" path="warehouseName">
+							<n-input v-model:value="formModel.warehouseName" disabled />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="库区名称" path="locationName">
+							<n-select v-model:value="formModel.locationId" :options="locationOptions" @update:value="locationSelect">
+								<template #empty>
+									<div>
+										<n-empty v-if="locationOptions.length === 0" description="暂无数据" />
+									</div>
+								</template>
+							</n-select>
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="库位名称" path="locationName">
+							<n-select v-model:value="formModel.areaId" :options="areaOptions" @update:value="areaSelect">
+								<template #empty>
+									<div>
+										<n-empty v-if="areaOptions.length === 0" description="暂无数据" />
+										<n-empty v-if="!formModel.locationId && areaOptions.length > 0" description="请选择库区" />
+									</div>
+								</template>
+							</n-select>
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="有效期" path="expireDate">
+							<n-date-picker v-model:value="formModel.expireDate" type="date" placeholder="请选择有效期" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="备注" path="remark">
+							<n-input v-model:value="formModel.remark" placeholder="请输入备注" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="来料检验单ID" path="iqcId">
+							<n-input v-model:value="formModel.iqcId" placeholder="请输入来料检验单ID" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="来料检验单编号" path="iqcCode">
+							<n-input v-model:value="formModel.iqcCode" placeholder="请输入来料检验单编号" />
+						</n-form-item-grid-item>
+						<!-- <n-form-item-grid-item :span="8" label="净重" path="weight">
+							<n-input-number v-model:value="formModel.weight" placeholder="请输入净重" />
+						</n-form-item-grid-item> -->
+						<!-- <n-form-item-grid-item :span="8" label="应入重量" path="weightRecived">
+							<n-input-number v-model:value="formModel.weightRecived" placeholder="请输入应入重量" />
+						</n-form-item-grid-item> -->
+						<n-form-item-grid-item :span="8" label="入库重量" path="totalWeight">
+							<n-input-number v-model:value="formModel.totalWeight" placeholder="请输入毛重" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="重量单位" path="weightUnit">
+							<n-input v-model:value="formModel.weightUnit" placeholder="请输入重量单位" />
+						</n-form-item-grid-item>
+						<n-form-item-grid-item :span="8" label="容器码" path="containerCode">
+							<n-input v-model:value="formModel.containerCode" placeholder="请输入容器码" />
+						</n-form-item-grid-item>
+					</n-grid>
+				</n-form>
+			</div>
+		</template>
+	</my-dialog>
 </template>
 
 <script setup lang="ts">
@@ -103,22 +103,20 @@ import { useMessage } from 'naive-ui';
 import type { FormInst } from 'naive-ui';
 // import { createRequiredFormRule } from '@/utils';
 import { editWmsItemRecptLine, addWmsItemRecptLine } from '@/service/api/wms/recptLine';
-import { selectAllWmsStorageLocationList } from '@/service/api/wms/location';
-import { selectAllWmsStorageAreaList } from '@/service/api/wms/area';
 const locationOptions = ref<{ value: string; label: string }[]>([]);
 const areaOptions = ref<{ value: string; label: string }[]>([]);
 export interface Props {
-  /** 弹窗可见性 */
-  visible: boolean;
-  /**
-   * 弹窗类型
-   * add: 新增
-   * edit: 编辑
-   */
-  type?: 'add' | 'edit';
-  /** 编辑的表格行数据 */
-  editData?: any;
-  getList;
+	/** 弹窗可见性 */
+	visible: boolean;
+	/**
+	 * 弹窗类型
+	 * add: 新增
+	 * edit: 编辑
+	 */
+	type?: 'add' | 'edit';
+	/** 编辑的表格行数据 */
+	editData?: any;
+	getList;
 }
 
 export type ModalType = NonNullable<Props['type']>;
@@ -127,224 +125,194 @@ const subDialog = ref<boolean>(false);
 defineOptions({ name: 'TableActionModal' });
 
 const props = withDefaults(defineProps<Props>(), {
-  type: 'add',
-  editData: null
+	type: 'add',
+	editData: null
 });
 
 interface Emits {
-  (e: 'update:visible', visible: boolean): void;
+	(e: 'update:visible', visible: boolean): void;
 }
 
 const emit = defineEmits<Emits>();
 const message = useMessage();
 const modalVisible = computed({
-  get() {
-    return props.visible;
-  },
-  set(visible) {
-    emit('update:visible', visible);
-  }
+	get() {
+		return props.visible;
+	},
+	set(visible) {
+		emit('update:visible', visible);
+	}
 });
 const cancel = () => {
-  modalVisible.value = false;
+	modalVisible.value = false;
 };
 
 const title = computed(() => {
-  const titles: Record<ModalType, string> = {
-    add: '添加物料入库单行',
-    edit: '编辑物料入库单行'
-  };
-  return titles[props.type];
+	const titles: Record<ModalType, string> = {
+		add: '添加物料入库单行',
+		edit: '编辑物料入库单行'
+	};
+	return titles[props.type];
 });
 
 const formRef = ref<HTMLElement & FormInst>();
 
 const formModel = ref<wms.recptLineRawType.columns>({
-  lineId: null,
-  recptId: null,
-  itemId: null,
-  itemCode: null,
-  itemName: null,
-  specification: null,
-  unitOfMeasure: null,
-  quantityRecived: null,
-  quantityChecked: null,
-  quantitySaved: null,
-  batchCode: null,
-  warehouseId: null,
-  warehouseCode: null,
-  warehouseName: null,
-  locationId: null,
-  locationCode: null,
-  locationName: null,
-  areaId: null,
-  areaCode: null,
-  areaName: null,
-  expireDate: null,
-  remark: null,
-  attr1: null,
-  attr2: null,
-  attr3: null,
-  attr4: null,
-  createBy: null,
-  createTime: null,
-  updateBy: null,
-  updateTime: null,
-  iqcId: null,
-  iqcCode: null,
-  weight: null,
-  weightRecived: null,
-  totalWeight: null,
-  weightUnit: null,
-  containerCode: null
+	lineId: null,
+	recptId: null,
+	itemId: null,
+	itemCode: null,
+	itemName: null,
+	specification: null,
+	unitOfMeasure: null,
+	quantityRecived: null,
+	quantityChecked: null,
+	quantitySaved: null,
+	batchCode: null,
+	warehouseId: null,
+	warehouseCode: null,
+	warehouseName: null,
+	locationId: null,
+	locationCode: null,
+	locationName: null,
+	areaId: null,
+	areaCode: null,
+	areaName: null,
+	expireDate: null,
+	remark: null,
+	attr1: null,
+	attr2: null,
+	attr3: null,
+	attr4: null,
+	createBy: null,
+	createTime: null,
+	updateBy: null,
+	updateTime: null,
+	iqcId: null,
+	iqcCode: null,
+	weight: null,
+	weightRecived: null,
+	totalWeight: null,
+	weightUnit: null,
+	containerCode: null
 });
 
 const rules = {};
 
 function handleUpdateFormModelByModalType() {
-  const handlers: Record<ModalType, () => void> = {
-    add: () => {
-      reset();
-    },
-    edit: () => {
-      reset();
-      if (props.editData) {
-        Object.assign(formModel.value, props.editData);
-        init();
-      }
-    }
-  };
+	const handlers: Record<ModalType, () => void> = {
+		add: () => {
+			reset();
+		},
+		edit: () => {
+			reset();
+			if (props.editData) {
+				Object.assign(formModel.value, props.editData);
+				init();
+			}
+		}
+	};
 
-  handlers[props.type]();
+	handlers[props.type]();
 }
 
 async function submit() {
-  await formRef.value?.validate(vaild => {
-    if (!vaild) {
-      if (formModel.value.lineId) {
-        editWmsItemRecptLine(formModel.value)
-          .then(res => {
-            if (res.code === 200) {
-              message.success('修改成功');
-              subDialog.value = false;
-              props.getList();
-              cancel();
-            }
-          })
-          .catch(() => {
-            message.success('修改失败');
-          });
-      } else {
-        addWmsItemRecptLine(formModel.value)
-          .then(res => {
-            if (res.code === 200) {
-              message.success('新增成功');
-              props.getList();
-              subDialog.value = false;
-              cancel();
-            }
-          })
-          .catch(() => {
-            message.success('修改失败');
-          });
-      }
-    }
-  });
+	await formRef.value?.validate(vaild => {
+		if (!vaild) {
+			if (formModel.value.lineId) {
+				editWmsItemRecptLine(formModel.value)
+					.then(res => {
+						if (res.code === 200) {
+							message.success('修改成功');
+							subDialog.value = false;
+							props.getList();
+							cancel();
+						}
+					})
+					.catch(() => {
+						message.success('修改失败');
+					});
+			} else {
+				addWmsItemRecptLine(formModel.value)
+					.then(res => {
+						if (res.code === 200) {
+							message.success('新增成功');
+							props.getList();
+							subDialog.value = false;
+							cancel();
+						}
+					})
+					.catch(() => {
+						message.success('修改失败');
+					});
+			}
+		}
+	});
 }
 function reset() {
-  formModel.value = {
-    lineId: null,
-    recptId: null,
-    itemId: null,
-    itemCode: null,
-    itemName: null,
-    specification: null,
-    unitOfMeasure: null,
-    quantityRecived: null,
-    quantityChecked: null,
-    quantitySaved: null,
-    batchCode: null,
-    warehouseId: null,
-    warehouseCode: null,
-    warehouseName: null,
-    locationId: null,
-    locationCode: null,
-    locationName: null,
-    areaId: null,
-    areaCode: null,
-    areaName: null,
-    expireDate: null,
-    remark: null,
-    attr1: null,
-    attr2: null,
-    attr3: null,
-    attr4: null,
-    createBy: null,
-    createTime: null,
-    updateBy: null,
-    updateTime: null,
-    iqcId: null,
-    iqcCode: null,
-    weight: null,
-    weightRecived: null,
-    totalWeight: null,
-    weightUnit: null,
-    containerCode: null
-  };
+	formModel.value = {
+		lineId: null,
+		recptId: null,
+		itemId: null,
+		itemCode: null,
+		itemName: null,
+		specification: null,
+		unitOfMeasure: null,
+		quantityRecived: null,
+		quantityChecked: null,
+		quantitySaved: null,
+		batchCode: null,
+		warehouseId: null,
+		warehouseCode: null,
+		warehouseName: null,
+		locationId: null,
+		locationCode: null,
+		locationName: null,
+		areaId: null,
+		areaCode: null,
+		areaName: null,
+		expireDate: null,
+		remark: null,
+		attr1: null,
+		attr2: null,
+		attr3: null,
+		attr4: null,
+		createBy: null,
+		createTime: null,
+		updateBy: null,
+		updateTime: null,
+		iqcId: null,
+		iqcCode: null,
+		weight: null,
+		weightRecived: null,
+		totalWeight: null,
+		weightUnit: null,
+		containerCode: null
+	};
 }
 watch(
-  () => props.visible,
-  newValue => {
-    if (newValue) {
-      handleUpdateFormModelByModalType();
-    }
-  }
+	() => props.visible,
+	newValue => {
+		if (newValue) {
+			handleUpdateFormModelByModalType();
+		}
+	}
 );
 
 function locationSelect(_val, item) {
-  formModel.value.locationId = item.locationId;
-  formModel.value.locationCode = item.locationCode;
-  formModel.value.locationName = item.locationName;
-  // console.log(formModel.value, item, '------');
-  selectAllWmsStorageAreaList({ locationId: item.locationId }).then(res => {
-    areaOptions.value = [];
-    res.data.forEach(listItem => {
-      areaOptions.value.push({
-        value: listItem.areaId,
-        label: listItem.areaName,
-        ...listItem
-      });
-    });
-  });
+	formModel.value.locationId = item.locationId;
+	formModel.value.locationCode = item.locationCode;
+	formModel.value.locationName = item.locationName;
+	// console.log(formModel.value, item, '------');
 }
 function areaSelect(_val, item) {
-  formModel.value.areaId = item.areaId;
-  formModel.value.areaCode = item.areaCode;
-  formModel.value.areaName = item.areaName;
-  // console.log(formModel.value, item, '------');
+	formModel.value.areaId = item.areaId;
+	formModel.value.areaCode = item.areaCode;
+	formModel.value.areaName = item.areaName;
+	// console.log(formModel.value, item, '------');
 }
 function init() {
-  // console.log(formModel.value, '------');
-  selectAllWmsStorageLocationList({ warehouseId: formModel.value.warehouseId }).then(res => {
-    locationOptions.value = [];
-    res.data.forEach(listItem => {
-      locationOptions.value.push({
-        value: listItem.locationId,
-        label: listItem.locationName,
-        ...listItem
-      });
-    });
-  });
-  selectAllWmsStorageAreaList({ locationId: formModel.value.locationId }).then(res => {
-    areaOptions.value = [];
-    res.data.forEach(listItem => {
-      areaOptions.value.push({
-        value: listItem.areaId,
-        label: listItem.areaName,
-        ...listItem
-      });
-    });
-  });
+	// console.log(formModel.value, '------');
 }
 </script>
 
diff --git a/src/views/auxiliaryProduceinfo/index.vue b/src/views/auxiliaryProduceinfo/index.vue
index 881802a..4d28f06 100644
--- a/src/views/auxiliaryProduceinfo/index.vue
+++ b/src/views/auxiliaryProduceinfo/index.vue
@@ -1,134 +1,134 @@
 <template>
-  <div class="h-full">
-    <my-card title="订单信息">
-      <template #right>
-        <div>
-          <component :is="useBackBtn()"></component>
-          <component :is="useBtn(submitInfo, 'lock', 'small', '保存入库', '#646fff')" v-if="!info"></component>
-        </div>
-      </template>
-      <n-descriptions label-width="100px" label-placement="left" :column="3" bordered>
-        <n-descriptions-item :span="1" label="入库单编号：">
-          {{ RecptInfo.recptCode }}
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="单据状态：">
-          <dict-tag :options="wms_item_recpt_status" :value="RecptInfo.status"></dict-tag>
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="订单类型：">
-          采购订单
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="入库单名称：">
-          {{ RecptInfo.recptName }}
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="应入数量：">
-          {{ RecptInfo.quantityRecived }}
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="应入重量：">
-          {{ RecptInfo.weightRecived }}
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="入库数量：">
-          {{ num }}
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="入库重量：">
-          {{ weight }}
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="入库仓库：">
-          <n-select
-            v-model:value="RecptInfo.warehouseId"
-            disabled
-            class="w-210px"
-            :options="storageOptions"
-            @update:value="storageSelect"
-          ></n-select>
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="入库日期：">
-          <n-date-picker
-            v-model:value="RecptInfo.recptDate"
-            :disabled="info"
-            type="date"
-            placeholder="请选择入库日期"
-          />
-        </n-descriptions-item>
+	<div class="h-full">
+		<my-card title="订单信息">
+			<template #right>
+				<div>
+					<component :is="useBackBtn()"></component>
+					<component :is="useBtn(submitInfo, 'lock', 'small', '保存入库', '#646fff')" v-if="!info"></component>
+				</div>
+			</template>
+			<n-descriptions label-width="100px" label-placement="left" :column="3" bordered>
+				<n-descriptions-item :span="1" label="入库单编号：">
+					{{ RecptInfo.recptCode }}
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="单据状态：">
+					<dict-tag :options="wms_item_recpt_status" :value="RecptInfo.status"></dict-tag>
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="订单类型：">
+					采购订单
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="入库单名称：">
+					{{ RecptInfo.recptName }}
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="应入数量：">
+					{{ RecptInfo.quantityRecived }}
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="应入重量：">
+					{{ RecptInfo.weightRecived }}
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="入库数量：">
+					{{ num }}
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="入库重量：">
+					{{ weight }}
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="入库仓库：">
+					<n-select
+						v-model:value="RecptInfo.warehouseId"
+						disabled
+						class="w-210px"
+						:options="storageOptions"
+						@update:value="storageSelect"
+					></n-select>
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="入库日期：">
+					<n-date-picker
+						v-model:value="RecptInfo.recptDate"
+						:disabled="info"
+						type="date"
+						placeholder="请选择入库日期"
+					/>
+				</n-descriptions-item>
 
-        <n-descriptions-item :span="1" label="保管人：">
-          <n-select
-            v-model:value="RecptInfo.manageBy"
-            :disabled="info"
-            class="w-210px"
-            :options="userOptions"
-            @update:value="manageSelect"
-          ></n-select>
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="负责人：">
-          <n-select class="w-210px" :disabled="info" :options="userOptions" @update:value="headSelect"></n-select>
-        </n-descriptions-item>
-        <!-- <n-descriptions-item :span="1" label="业务部门：">
-          <n-tree-select
-            v-model:value="RecptInfo.salseDeptId"
-            :options="menuOptions"
-            label-field="label"
-            key-field="id"
-            @update:value="deptSelect"
-          ></n-tree-select>
-        </n-descriptions-item>
-        <n-descriptions-item :span="1" label="业务员：">
-          <n-select
-            v-model:value="RecptInfo.salseBy"
-            class="w-210px"
-            :options="salesOptions"
-            @update:value="salseSelect"
-          ></n-select>
-        </n-descriptions-item> -->
-        <n-descriptions-item :span="1" label="备注：">
-          <!-- {{ RecptInfo.remark }} -->
-          <n-input v-model:value="RecptInfo.remark" :disabled="info"></n-input>
-        </n-descriptions-item>
-      </n-descriptions>
-    </my-card>
-    <!-- <my-card title="搜索条件" search>
-      <n-form ref="formRef" inline label-width="auto" :model="searchForm" size="medium">
-        <n-form-item>
-          <component :is="useSearchBtn(search, reset)"></component>
-        </n-form-item>
-      </n-form>
-    </my-card> -->
-    <my-card title="产品(物料)信息">
-      <template #right>
-        <div class="flex-center">
-          <component
-            :is="useDelBtn(delSelect, undefined, '确定要删除所有已选中的数据吗？', Boolean(!selectKeys.length))"
-            v-hasPermi="['wms:recptLine:remove']"
-          ></component>
-          <!-- <component :is="useAddBtn(handleAddTable, undefined, '新增')" v-hasPermi="['wms:recptLine:add']"></component> -->
-          <!-- <component :is="useDownBtn(handleExport)"></component> -->
-          <n-button size="small" class="mr-5px" type="primary" @click="getWmsItemRecptLineData">
-            <icon-mdi-refresh class="mr-4px text-16px" :class="{ 'animate-spin': loading }" />
-            刷新表格
-          </n-button>
-        </div>
-      </template>
-      <div>
-        <n-form ref="dataRef" :model="data" :rules="rules">
-          <n-data-table
-            :row-key="row => row.lineId"
-            :columns="columns"
-            :data="data"
-            :loading="loading"
-            :scroll-x="1600"
-            @update-checked-row-keys="handleSelect"
-          />
-        </n-form>
+				<n-descriptions-item :span="1" label="保管人：">
+					<n-select
+						v-model:value="RecptInfo.manageBy"
+						:disabled="info"
+						class="w-210px"
+						:options="userOptions"
+						@update:value="manageSelect"
+					></n-select>
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="负责人：">
+					<n-select class="w-210px" :disabled="info" :options="userOptions" @update:value="headSelect"></n-select>
+				</n-descriptions-item>
+				<!-- <n-descriptions-item :span="1" label="业务部门：">
+					<n-tree-select
+						v-model:value="RecptInfo.salseDeptId"
+						:options="menuOptions"
+						label-field="label"
+						key-field="id"
+						@update:value="deptSelect"
+					></n-tree-select>
+				</n-descriptions-item>
+				<n-descriptions-item :span="1" label="业务员：">
+					<n-select
+						v-model:value="RecptInfo.salseBy"
+						class="w-210px"
+						:options="salesOptions"
+						@update:value="salseSelect"
+					></n-select>
+				</n-descriptions-item> -->
+				<n-descriptions-item :span="1" label="备注：">
+					<!-- {{ RecptInfo.remark }} -->
+					<n-input v-model:value="RecptInfo.remark" :disabled="info"></n-input>
+				</n-descriptions-item>
+			</n-descriptions>
+		</my-card>
+		<!-- <my-card title="搜索条件" search>
+			<n-form ref="formRef" inline label-width="auto" :model="searchForm" size="medium">
+				<n-form-item>
+					<component :is="useSearchBtn(search, reset)"></component>
+				</n-form-item>
+			</n-form>
+		</my-card> -->
+		<my-card title="产品(物料)信息">
+			<template #right>
+				<div class="flex-center">
+					<component
+						:is="useDelBtn(delSelect, undefined, '确定要删除所有已选中的数据吗？', Boolean(!selectKeys.length))"
+						v-hasPermi="['wms:recptLine:remove']"
+					></component>
+					<!-- <component :is="useAddBtn(handleAddTable, undefined, '新增')" v-hasPermi="['wms:recptLine:add']"></component> -->
+					<!-- <component :is="useDownBtn(handleExport)"></component> -->
+					<n-button size="small" class="mr-5px" type="primary" @click="getWmsItemRecptLineData">
+						<icon-mdi-refresh class="mr-4px text-16px" :class="{ 'animate-spin': loading }" />
+						刷新表格
+					</n-button>
+				</div>
+			</template>
+			<div>
+				<n-form ref="dataRef" :model="data" :rules="rules">
+					<n-data-table
+						:row-key="row => row.lineId"
+						:columns="columns"
+						:data="data"
+						:loading="loading"
+						:scroll-x="1600"
+						@update-checked-row-keys="handleSelect"
+					/>
+				</n-form>
 
-        <my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
-      </div>
-      <!-- <table-action-modal
-        v-model:visible="showModal"
-        :type="modalType"
-        :edit-data="editData"
-        :get-list="getWmsItemRecptLineData"
-      /> -->
-    </my-card>
-  </div>
+				<my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
+			</div>
+			<!-- <table-action-modal
+				v-model:visible="showModal"
+				:type="modalType"
+				:edit-data="editData"
+				:get-list="getWmsItemRecptLineData"
+			/> -->
+		</my-card>
+	</div>
 </template>
 
 <script lang="tsx" setup>
@@ -163,15 +163,15 @@ const message = useMessage();
 const total = ref();
 // const page = ref(1);
 const searchForm = ref<{
-  pageNum: number;
-  pageSize: number;
-  total: number;
-  recptId: null | string | number;
+	pageNum: number;
+	pageSize: number;
+	total: number;
+	recptId: null | string | number;
 }>({
-  pageNum: 1,
-  pageSize: 10,
-  total: 0,
-  recptId: null
+	pageNum: 1,
+	pageSize: 10,
+	total: 0,
+	recptId: null
 });
 
 // const editData = ref<wms.recptLineRawType.columns>({
@@ -216,7 +216,7 @@ const searchForm = ref<{
 
 const selectKeys = ref<DataTableRowKey[]>([]);
 function handleSelect(keys: DataTableRowKey[]) {
-  selectKeys.value = keys;
+	selectKeys.value = keys;
 }
 // const list = ref<{ data: wms.recptLineRawType.columns[] }>({ data: [] });
 const data = ref<wms.recptLineRawType.columns[]>([]);
@@ -227,17 +227,17 @@ const userOptions = ref<any[]>([]);
 // const deptId = ref();
 
 function getUser() {
-  allUserList({ deptId: null }).then(res => {
-    // console.log(res.data, '----');
-    if (!Array.isArray(res.data)) return;
-    res.data.forEach(item => {
-      userOptions.value.push({
-        label: item.nickName,
-        value: item.userId,
-        ...item
-      });
-    });
-  });
+	allUserList({ deptId: null }).then(res => {
+		// console.log(res.data, '----');
+		if (!Array.isArray(res.data)) return;
+		res.data.forEach(item => {
+			userOptions.value.push({
+				label: item.nickName,
+				value: item.userId,
+				...item
+			});
+		});
+	});
 }
 // function salesUser(_val) {
 //   salesOptions.value = [];
@@ -257,180 +257,180 @@ function getUser() {
 // }
 
 const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
-  {
-    type: 'selection',
-    align: 'center',
-    disabled: _row => {
-      return info.value;
-    }
-  },
-  {
-    title: '物料类型',
-    key: 'itemTypeName',
-    width: 120,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '物料编码',
-    key: 'itemCode',
-    width: 120,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '物料名称',
-    key: 'itemName',
-    width: 120,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '规格型号',
-    key: 'specification',
-    width: 120
-  },
-  // {
-  //   title: '应入数量',
-  //   key: 'quantityRecived',
-  //   width: 120
-  // },
-  // {
-  //   title: '验收数量',
-  //   key: 'quantityChecked',
-  //   width: 120
-  // },
-  // {
-  //   title: '已入库数量',
-  //   key: 'quantitySavedTemp',
-  //   width: 120,
-  //   render: row => {
-  //     return `${row.quantitySavedTemp}`;
-  //   }
-  // },
-  // {
-  //   title: '已入库重量',
-  //   key: 'weightSavedTemp',
-  //   width: 120,
-  //   render: row => {
-  //     return `${row.weightSavedTemp}`;
-  //   }
-  // },
-  {
-    title: '入库数量',
-    key: 'quantitySaved',
-    width: 180,
-    render: row => {
-      return (
-        <div class="flex-center">
-          <sapn class="color-red mr-5px">*</sapn>
-          <n-form-item path={`quantitySaved${row.recptId}`}>
-            <n-input disabled={info.value} v-model:value={row.quantitySaved}></n-input>
-          </n-form-item>
-        </div>
-      );
-    }
-  },
-  {
-    title: '入库重量',
-    key: 'weight',
-    width: 180,
-    render: row => {
-      return (
-        <div class="flex-center">
-          <sapn class="color-red mr-5px">*</sapn>
-          <n-form-item path={`weight${row.recptId}`}>
-            <n-input disabled={info.value} v-model:value={row.weight}></n-input>
-          </n-form-item>
-        </div>
-      );
-    }
-  },
-  {
-    title: '仓库名称',
-    key: 'warehouseName',
-    width: 180,
-    render: row => {
-      return (
-        <n-cascader
-          disabled={info.value}
-          options={options.value}
-          label-field="pname"
-          value-field="id"
-          children-field="children"
-          ellipsis-tag-popover-props={true}
-          v-model:value={row.areaName}
-          placeholder="请选择仓库"
-          clearable
-          check-strategy="child"
-          cascade={false}
-          onUpdateValue={(_value, item) => {
-            // row.warehouseId = value;
-            row.areaId = item.id;
-            row.locationId = item.pid;
-            row.areaName = item.pname;
-          }}
-        ></n-cascader>
-      );
-    }
-  },
-  {
-    title: '入库批次号',
-    key: 'batchCode',
-    width: 190,
-    ellipsis: {
-      tooltip: true
-    }
-  },
+	{
+		type: 'selection',
+		align: 'center',
+		disabled: _row => {
+			return info.value;
+		}
+	},
+	{
+		title: '物料类型',
+		key: 'itemTypeName',
+		width: 120,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '物料编码',
+		key: 'itemCode',
+		width: 120,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '物料名称',
+		key: 'itemName',
+		width: 120,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '规格型号',
+		key: 'specification',
+		width: 120
+	},
+	// {
+	//   title: '应入数量',
+	//   key: 'quantityRecived',
+	//   width: 120
+	// },
+	// {
+	//   title: '验收数量',
+	//   key: 'quantityChecked',
+	//   width: 120
+	// },
+	// {
+	//   title: '已入库数量',
+	//   key: 'quantitySavedTemp',
+	//   width: 120,
+	//   render: row => {
+	//     return `${row.quantitySavedTemp}`;
+	//   }
+	// },
+	// {
+	//   title: '已入库重量',
+	//   key: 'weightSavedTemp',
+	//   width: 120,
+	//   render: row => {
+	//     return `${row.weightSavedTemp}`;
+	//   }
+	// },
+	{
+		title: '入库数量',
+		key: 'quantitySaved',
+		width: 180,
+		render: row => {
+			return (
+				<div class="flex-center">
+					<sapn class="color-red mr-5px">*</sapn>
+					<n-form-item path={`quantitySaved${row.recptId}`}>
+						<n-input disabled={info.value} v-model:value={row.quantitySaved}></n-input>
+					</n-form-item>
+				</div>
+			);
+		}
+	},
+	{
+		title: '入库重量',
+		key: 'weight',
+		width: 180,
+		render: row => {
+			return (
+				<div class="flex-center">
+					<sapn class="color-red mr-5px">*</sapn>
+					<n-form-item path={`weight${row.recptId}`}>
+						<n-input disabled={info.value} v-model:value={row.weight}></n-input>
+					</n-form-item>
+				</div>
+			);
+		}
+	},
+	{
+		title: '仓库名称',
+		key: 'warehouseName',
+		width: 180,
+		render: row => {
+			return (
+				<n-cascader
+					disabled={info.value}
+					options={options.value}
+					label-field="pname"
+					value-field="id"
+					children-field="children"
+					ellipsis-tag-popover-props={true}
+					v-model:value={row.areaName}
+					placeholder="请选择仓库"
+					clearable
+					check-strategy="child"
+					cascade={false}
+					onUpdateValue={(_value, item) => {
+						row.warehouseId = _value;
+						row.areaId = item.id;
+						row.locationId = item.pid;
+						row.areaName = item.pname;
+					}}
+				></n-cascader>
+			);
+		}
+	},
+	{
+		title: '入库批次号',
+		key: 'batchCode',
+		width: 190,
+		ellipsis: {
+			tooltip: true
+		}
+	},
 
-  // {
-  //   title: '库区名称',
-  //   key: 'locationName',
-  //   width: 120
-  // },
-  // {
-  //   title: '库位名称',
-  //   key: 'areaName',
-  //   width: 120
-  // },
-  // {
-  //   title: '来料检验单编号',
-  //   key: 'iqcCode',
-  //   width: 130
-  // },
-  // {
-  //   title: '应入重量',
-  //   key: 'weightRecived',
-  //   width: 120
-  // },
-  {
-    title: '操作',
-    key: 'action',
-    fixed: 'right',
-    width: 220,
-    align: 'center',
-    render: (_row, index) => {
-      return [
-        info.value
-          ? ''
-          : // useEditBtn(() => handleEditTable(row.lineId as number)),
-            useDelBtn(() => {
-              // delWmsItemRecptLine(row.lineId as number).then(res => {
-              //   if (res.code === 200) {
-              //     window.$message?.success('删除成功');
-              //     init();
-              //   }
-              // });
-              // console.log(index);
-              data.value.splice(index, 1);
-              // console.log(data.value);
-            })
-      ];
-    }
-  }
+	// {
+	//   title: '库区名称',
+	//   key: 'locationName',
+	//   width: 120
+	// },
+	// {
+	//   title: '库位名称',
+	//   key: 'areaName',
+	//   width: 120
+	// },
+	// {
+	//   title: '来料检验单编号',
+	//   key: 'iqcCode',
+	//   width: 130
+	// },
+	// {
+	//   title: '应入重量',
+	//   key: 'weightRecived',
+	//   width: 120
+	// },
+	{
+		title: '操作',
+		key: 'action',
+		fixed: 'right',
+		width: 220,
+		align: 'center',
+		render: (_row, index) => {
+			return [
+				info.value
+					? ''
+					: // useEditBtn(() => handleEditTable(row.lineId as number)),
+					useDelBtn(() => {
+						// delWmsItemRecptLine(row.lineId as number).then(res => {
+						//   if (res.code === 200) {
+						//     window.$message?.success('删除成功');
+						//     init();
+						//   }
+						// });
+						// console.log(index);
+						data.value.splice(index, 1);
+						// console.log(data.value);
+					})
+			];
+		}
+	}
 ]) as Ref<DataTableColumns<any>>;
 
 const { loading, startLoading, endLoading } = useLoading(false);
@@ -481,127 +481,127 @@ const { loading, startLoading, endLoading } = useLoading(false);
 
 // 获取信息
 function getWmsItemRecptLineData() {
-  searchForm.value.recptId = route.query.id as string;
-  startLoading();
-  selectWmsItemRecptLineList({ params: searchForm.value }).then(res => {
-    data.value = res.rows;
-    if (!Array.isArray(res.rows)) return;
-    data.value.forEach(item => {
-      item.quantitySavedTemp = item.quantitySaved;
-      item.weightSavedTemp = item.weight as string;
-      // item.quantitySaved = '0';
-      // item.weight = 0;
-      // 生成表单校验
-      rules[`quantitySaved${item.recptId}`] = {
-        trigger: ['input', 'blur'],
-        validator: (rule, _value, callback) => {
-          const tempRecptId = rule.field.split('quantitySaved')[1] as string;
-          if (parseInt(tempRecptId, 10) === item.recptId && (Number(item.weight) || Number(item.quantitySaved))) {
-            return callback();
-          }
-          return callback('数量和重量必须有一个大于0');
-        }
-      };
-      rules[`weight${item.recptId}`] = {
-        trigger: ['input', 'blur'],
-        validator: (rule, _value, callback) => {
-          const tempRecptId = rule.field.split('weight')[1] as string;
-          if (parseInt(tempRecptId, 10) === item.recptId && (Number(item.weight) || Number(item.quantitySaved))) {
-            return callback();
-          }
-          return callback('数量和重量必须有一个大于0');
-        }
-      };
-    });
-    // list.value.data = res.rows;
-    total.value = res.total;
-    searchForm.value.total = res.total;
-    if (data.value) {
-      setTimeout(() => {
-        endLoading();
-      }, 200);
-    }
-  });
+	searchForm.value.recptId = route.query.id as string;
+	startLoading();
+	selectWmsItemRecptLineList({ params: searchForm.value }).then(res => {
+		data.value = res.rows;
+		if (!Array.isArray(res.rows)) return;
+		data.value.forEach(item => {
+			item.quantitySavedTemp = item.quantitySaved;
+			item.weightSavedTemp = item.weight as string;
+			// item.quantitySaved = '0';
+			// item.weight = 0;
+			// 生成表单校验
+			rules[`quantitySaved${item.recptId}`] = {
+				trigger: ['input', 'blur'],
+				validator: (rule, _value, callback) => {
+					const tempRecptId = rule.field.split('quantitySaved')[1] as string;
+					if (parseInt(tempRecptId, 10) === item.recptId && (Number(item.weight) || Number(item.quantitySaved))) {
+						return callback();
+					}
+					return callback('数量和重量必须有一个大于0');
+				}
+			};
+			rules[`weight${item.recptId}`] = {
+				trigger: ['input', 'blur'],
+				validator: (rule, _value, callback) => {
+					const tempRecptId = rule.field.split('weight')[1] as string;
+					if (parseInt(tempRecptId, 10) === item.recptId && (Number(item.weight) || Number(item.quantitySaved))) {
+						return callback();
+					}
+					return callback('数量和重量必须有一个大于0');
+				}
+			};
+		});
+		// list.value.data = res.rows;
+		total.value = res.total;
+		searchForm.value.total = res.total;
+		if (data.value) {
+			setTimeout(() => {
+				endLoading();
+			}, 200);
+		}
+	});
 }
 
 // 删除
 function delSelect() {
-  delWmsItemRecptLine(selectKeys.value.join(',') as string).then(() => {
-    getWmsItemRecptLineData();
-    message.success('删除成功');
-  });
+	delWmsItemRecptLine(selectKeys.value.join(',') as string).then(() => {
+		getWmsItemRecptLineData();
+		message.success('删除成功');
+	});
 }
 
 // function handleExport() {
 //   show.value = true;
 // }
 const RecptInfo = ref<wms.recptRawType.columns>({
-  recptId: null,
-  recptCode: null,
-  recptName: null,
-  iqcId: null,
-  iqcCode: null,
-  poCode: null,
-  vendorId: null,
-  vendorCode: null,
-  vendorName: null,
-  vendorNick: null,
-  warehouseId: null,
-  warehouseCode: null,
-  warehouseName: null,
-  locationId: null,
-  locationCode: null,
-  locationName: null,
-  areaId: null,
-  areaCode: null,
-  areaName: null,
-  recptDate: null,
-  status: null,
-  remark: null,
-  attr1: null,
-  attr2: null,
-  attr3: null,
-  attr4: null,
-  createBy: null,
-  createTime: null,
-  updateBy: null,
-  updateTime: null,
-  type: null,
-  fromBillId: null,
-  fromBillCode: null,
-  fromBillName: null,
-  snidCode: null,
-  createByNick: null,
-  manageBy: null,
-  manageByNick: null,
-  headBy: null,
-  headByNick: null,
-  salseDeptId: null,
-  salseDeptName: null,
-  salseBy: null,
-  salseByNick: null
+	recptId: null,
+	recptCode: null,
+	recptName: null,
+	iqcId: null,
+	iqcCode: null,
+	poCode: null,
+	vendorId: null,
+	vendorCode: null,
+	vendorName: null,
+	vendorNick: null,
+	warehouseId: null,
+	warehouseCode: null,
+	warehouseName: null,
+	locationId: null,
+	locationCode: null,
+	locationName: null,
+	areaId: null,
+	areaCode: null,
+	areaName: null,
+	recptDate: null,
+	status: null,
+	remark: null,
+	attr1: null,
+	attr2: null,
+	attr3: null,
+	attr4: null,
+	createBy: null,
+	createTime: null,
+	updateBy: null,
+	updateTime: null,
+	type: null,
+	fromBillId: null,
+	fromBillCode: null,
+	fromBillName: null,
+	snidCode: null,
+	createByNick: null,
+	manageBy: null,
+	manageByNick: null,
+	headBy: null,
+	headByNick: null,
+	salseDeptId: null,
+	salseDeptName: null,
+	salseBy: null,
+	salseByNick: null
 });
 const num = computed(() => {
-  // 计算data中quantitySaved的相加的值使用bigNumber进行计算
+	// 计算data中quantitySaved的相加的值使用bigNumber进行计算
 
-  const val = data.value.reduce((acc, cur) => {
-    const num1 = new BigNumber(acc);
-    const num2 = new BigNumber(cur.quantitySaved || 0);
-    return num1.plus(num2).toNumber();
-  }, 0);
-  // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-  RecptInfo.value.quantitySaved = val;
-  return val;
+	const val = data.value.reduce((acc, cur) => {
+		const num1 = new BigNumber(acc);
+		const num2 = new BigNumber(cur.quantitySaved || 0);
+		return num1.plus(num2).toNumber();
+	}, 0);
+	// eslint-disable-next-line vue/no-side-effects-in-computed-properties
+	RecptInfo.value.quantitySaved = val;
+	return val;
 });
 const weight = computed(() => {
-  const val = data.value.reduce((acc, cur) => {
-    const num1 = new BigNumber(acc);
-    const num2 = new BigNumber(cur.weight || 0);
-    return num1.plus(num2).toNumber();
-  }, 0);
-  // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-  RecptInfo.value.weightSaved = val;
-  return val;
+	const val = data.value.reduce((acc, cur) => {
+		const num1 = new BigNumber(acc);
+		const num2 = new BigNumber(cur.weight || 0);
+		return num1.plus(num2).toNumber();
+	}, 0);
+	// eslint-disable-next-line vue/no-side-effects-in-computed-properties
+	RecptInfo.value.weightSaved = val;
+	return val;
 });
 // function deptSelect(_val, item) {
 //   // console.log(_val, item, '11');
@@ -609,83 +609,83 @@ const weight = computed(() => {
 //   RecptInfo.value.salseDeptName = item.label;
 // }
 function getRecptInfo() {
-  getWmsItemRecpt(route.query.id as string).then(res => {
-    // console.log(res, res.data.salseDeptId, '11');
-    RecptInfo.value = res.data;
-    RecptInfo.value.recptDate = new Date(RecptInfo.value.recptDate as unknown as string).getTime();
-    // salesUser(res.data.salseDeptId);
-  });
+	getWmsItemRecpt(route.query.id as string).then(res => {
+		// console.log(res, res.data.salseDeptId, '11');
+		RecptInfo.value = res.data;
+		RecptInfo.value.recptDate = new Date(RecptInfo.value.recptDate as unknown as string).getTime();
+		// salesUser(res.data.salseDeptId);
+	});
 }
 function storageSelect(_val, item) {
-  RecptInfo.value.warehouseId = item.warehouseId;
-  RecptInfo.value.warehouseCode = item.warehouseCode;
-  RecptInfo.value.warehouseName = item.warehouseName;
-  // console.log(formModel.value, item, '------');
-  // selectAllWmsStorageLocationList({ warehouseId: item.warehouseId }).then(res => {
-  //   locationOptions.value = [];
-  //   res.data.forEach(listItem => {
-  //     locationOptions.value.push({
-  //       value: listItem.locationId,
-  //       label: listItem.locationName,
-  //       ...listItem
-  //     });
-  //   });
-  // });
+	RecptInfo.value.warehouseId = item.warehouseId;
+	RecptInfo.value.warehouseCode = item.warehouseCode;
+	RecptInfo.value.warehouseName = item.warehouseName;
+	// console.log(formModel.value, item, '------');
+	// selectAllWmsStorageLocationList({ warehouseId: item.warehouseId }).then(res => {
+	//   locationOptions.value = [];
+	//   res.data.forEach(listItem => {
+	//     locationOptions.value.push({
+	//       value: listItem.locationId,
+	//       label: listItem.locationName,
+	//       ...listItem
+	//     });
+	//   });
+	// });
 }
 function manageSelect(_val, item) {
-  RecptInfo.value.manageBy = item.userId;
-  RecptInfo.value.manageByNick = item.nickName;
+	RecptInfo.value.manageBy = item.userId;
+	RecptInfo.value.manageByNick = item.nickName;
 }
 function headSelect(_val, item) {
-  RecptInfo.value.headBy = item.userId;
-  RecptInfo.value.headByNick = item.nickName;
-  // console.log(item, '1');
+	RecptInfo.value.headBy = item.userId;
+	RecptInfo.value.headByNick = item.nickName;
+	// console.log(item, '1');
 }
 // function salseSelect(_val, item) {
 //   RecptInfo.value.salseBy = item.userId;
 //   RecptInfo.value.salseByNick = item.nickName;
 // }
 function getStorage(val) {
-  if (!val) return;
-  getWarehouseAreaList(val).then(res => {
-    options.value = res.data;
-  });
+	if (!val) return;
+	getWarehouseAreaList(val).then(res => {
+		options.value = res.data;
+	});
 }
 function submitInfo() {
-  dataRef.value?.validate(err => {
-    if (!err) {
-      console.log('校验通过');
-      RecptInfo.value.lineList = data.value;
-      executeWmsItemRecpt(RecptInfo.value).then(res => {
-        // console.log(res);
-        if (res.code === 200) {
-          message.success('入库成功');
-          router.go(-1);
-        }
-      });
-    }
-  });
-  // console.log(RecptInfo.value, data.value, '--------');
+	dataRef.value?.validate(err => {
+		if (!err) {
+			console.log('校验通过', data.value);
+			RecptInfo.value.lineList = data.value;
+			executeWmsItemRecpt(RecptInfo.value).then(res => {
+				// console.log(res);
+				if (res.code === 200) {
+					message.success('入库成功');
+					router.go(-1);
+				}
+			});
+		}
+	});
+	// console.log(RecptInfo.value, data.value, '--------');
 }
 
 function init() {
-  info.value = Boolean(route.query.info);
-  getWmsItemRecptLineData();
-  getRecptInfo();
-  getlist({}).then(res => {
-    if (!Array.isArray(res.data)) return;
-    res.data.forEach(item => {
-      storageOptions.value.push({
-        value: item.warehouseId,
-        label: item.warehouseName,
-        ...item
-      });
-    });
-  });
-  getStorage(route.query.warehouseId as string);
-  getUser();
-  // 获取部门信息
-  // getDeptTree();
+	info.value = Boolean(route.query.info);
+	getWmsItemRecptLineData();
+	getRecptInfo();
+	getlist({}).then(res => {
+		if (!Array.isArray(res.data)) return;
+		res.data.forEach(item => {
+			storageOptions.value.push({
+				value: item.warehouseId,
+				label: item.warehouseName,
+				...item
+			});
+		});
+	});
+	getStorage(route.query.warehouseId as string);
+	getUser();
+	// 获取部门信息
+	// getDeptTree();
 }
 init();
 </script>
diff --git a/src/views/client/information/index.vue b/src/views/client/information/index.vue
index ed1970d..dee5976 100644
--- a/src/views/client/information/index.vue
+++ b/src/views/client/information/index.vue
@@ -1,240 +1,240 @@
 <template>
-  <div>
-    <my-card title="搜索条件" search>
-      <n-form inline label-placement="top" :model="searchForm">
-        <n-form-item label="客户名称" path="clientName">
-          <n-input v-model:value="searchForm.clientName" placeholder="请输入客户名称"></n-input>
-        </n-form-item>
-        <n-form-item label="统一社会代码" path="creditCode">
-          <n-input v-model:value="searchForm.creditCode" placeholder="请输入统一社会代码"></n-input>
-        </n-form-item>
-        <n-form-item label="业务员" path="salesmanName">
-          <n-input v-model:value="searchForm.salesmanName" placeholder="请输入业务员"></n-input>
-        </n-form-item>
-        <n-form-item label="跟进状态">
-          <n-select
-            v-model:value="searchForm.attr1"
-            placeholder="请选择跟进状态"
-            class="w-180px"
-            :options="followUpStatusList"
-            filterable
-          ></n-select>
-        </n-form-item>
-        <n-form-item label="客户类型">
-          <n-select
-            v-model:value="searchForm.attr2"
-            placeholder="请选择客户类型"
-            class="w-180px"
-            :options="clientTypeList"
-            filterable
-          ></n-select>
-        </n-form-item>
-        <n-form-item>
-          <n-button type="primary" class="mr-10px" @click="handleSearch">
-            <icon-ic-round-search class="mr-4px text-20px" />
-            搜索
-          </n-button>
-          <n-button @click="handleReset">
-            <icon-ic-round-refresh class="mr-4px text-20px" />
-            重置
-          </n-button>
-        </n-form-item>
-      </n-form>
-    </my-card>
-    <my-card title="用户列表">
-      <template #right>
-        <div class="flex-center">
-          <cx-columns v-model:columns="columns"></cx-columns>
-          <n-button type="warning" size="small" class="ml-5px" @click="synchronization">
-            <icon-ic-round-plus class="mr-4px text-20px" />
-            同步erp客户
-          </n-button>
-          <n-button type="primary" size="small" class="ml-5px" @click="openDialog">
-            <icon-ic-round-plus class="mr-4px text-20px" />
-            新增客户
-          </n-button>
-        </div>
-      </template>
-      <n-data-table
-        :loading="loading"
-        :data="data"
-        :columns="columns"
-        :max-height="dataTableConfig.maxHeight"
-        :scroll-x="dataTableConfig.scrollWidth(columns)"
-        :row-props="rowProps"
-      ></n-data-table>
-      <my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
-    </my-card>
-
-    <my-dialog
-      v-model:show="flag"
-      width="1200px"
-      :title="editFlag ? '编辑客户' : '新增客户'"
-      @cancel="cancel"
-      @submit="submit"
-    >
-      <template #content>
-        <div style="width: 100%">
-          <n-form ref="addFormRef" :model="addForm" :rules="rules" label-placement="left" label-width="130px">
-            <n-grid :cols="3" :x-gap="10" :y-gap="10">
-              <n-form-item-grid-item :span="1" label="客户名称" path="clientName">
-                <n-input v-model:value="addForm.clientName" placeholder="请输入客户名称" style="width: 100%" />
-              </n-form-item-grid-item>
-              <!-- <n-form-item-grid-item :span="1" label="开户银行" path="bankAccount">
-                <n-input v-model:value="addForm.bankAccount" placeholder="请输入开户银行" />
-              </n-form-item-grid-item> -->
-              <n-form-item-grid-item :span="1" label="客户简称" path="clientNick">
-                <n-input v-model:value="addForm.clientNick" placeholder="请输入客户简称" style="width: 100%" />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="客户编码" path="clientCode">
-                <n-input v-model:value="addForm.clientCode" placeholder="请输入客户编码" style="width: 100%" />
-              </n-form-item-grid-item>
-              <!-- <n-form-item-grid-item :span="1" label="统一信用社代码" path="creditCode">
-                <n-input v-model:value="addForm.creditCode" placeholder="请输入统一信用社代码"></n-input>
-              </n-form-item-grid-item> -->
-              <n-form-item-grid-item :span="1" label="地址" path="addressId">
-                <!-- <n-input v-model:value="addForm.address" placeholder="请输入地址" /> -->
-                <div style="display: flex; flex-wrap: wrap; width: 100%">
-                  <n-cascader
-                    v-model:value="addForm.addressId"
-                    style="width: 100%"
-                    :expand-trigger="'click'"
-                    :options="addressOptions"
-                    :check-strategy="checkStrategyIsChild ? 'child' : 'all'"
-                    :show-path="showPath"
-                    remote
-                    placeholder="请选择省市区"
-                  />
-                  <n-input
-                    v-model:value="addForm.contact2Tel"
-                    placeholder="请输入详细地址"
-                    style="width: 100%"
-                    class="mt-10px"
-                    type="textarea"
-                  />
-                </div>
-              </n-form-item-grid-item>
-
-              <!-- <n-form-item-grid-item :span="1" label="法人姓名">
-                <n-input v-model:value="addForm.legalPersonName" placeholder="请输入法人姓名" />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="法人电话" path="legalPersonPhone">
-                <n-input v-model:value="addForm.legalPersonPhone" placeholder="请输入法人电话" />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="法人身份证">
-                <n-input v-model:value="addForm.legalPersonIdcard" placeholder="请输入法人身份证"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="联系人">
-                <n-input v-model:value="addForm.contact1" placeholder="请输入联系人"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="联系人职务">
-                <n-input v-model:value="addForm.contact1Title" placeholder="请输入联系人职务"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="联系人电话">
-                <n-input v-model:value="addForm.contact1Tel" placeholder="请输入联系人电话"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="联系人手机">
-                <n-input v-model:value="addForm.contact1Phone" placeholder="请输入联系人手机"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="联系人传真">
-                <n-input v-model:value="addForm.contact1Fax" placeholder="请输入联系人传真"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="联系人邮箱">
-                <n-input v-model:value="addForm.contact1Email" placeholder="请输入联系人邮箱"></n-input>
-              </n-form-item-grid-item> -->
-              <!-- <n-form-item-grid-item :span="1" label="公司成立时间">
-                <n-input v-model:value="addForm.foundingTime" placeholder="请输入公司成立时间"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="注册资金">
-                <n-input v-model:value="addForm.registeredCapital" placeholder="请输入注册资金"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="经营范围">
-                <n-input v-model:value="addForm.businessScope" placeholder="请输入经营范围"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="终端/经销商">
-                <n-select
-                  v-model:value="addForm.ifDistributor"
-                  :options="[
-                    { label: '终端', value: 0 },
-                    { label: '经销商', value: 1 }
-                  ]"
-                  placeholder="请选择"
-                ></n-select>
-              </n-form-item-grid-item> -->
-              <n-form-item-grid-item :span="1" label="客户来源">
-                <n-select
-                  v-model:value="addForm.leadSource"
-                  :options="[
+	<div>
+		<my-card title="搜索条件" search>
+			<n-form inline label-placement="top" :model="searchForm">
+				<n-form-item label="客户名称" path="clientName">
+					<n-input v-model:value="searchForm.clientName" placeholder="请输入客户名称"></n-input>
+				</n-form-item>
+				<n-form-item label="统一社会代码" path="creditCode">
+					<n-input v-model:value="searchForm.creditCode" placeholder="请输入统一社会代码"></n-input>
+				</n-form-item>
+				<n-form-item label="业务员" path="salesmanName">
+					<n-input v-model:value="searchForm.salesmanName" placeholder="请输入业务员"></n-input>
+				</n-form-item>
+				<n-form-item label="跟进状态">
+					<n-select
+						v-model:value="searchForm.attr1"
+						placeholder="请选择跟进状态"
+						class="w-180px"
+						:options="followUpStatusList"
+						filterable
+					></n-select>
+				</n-form-item>
+				<n-form-item label="客户类型">
+					<n-select
+						v-model:value="searchForm.attr2"
+						placeholder="请选择客户类型"
+						class="w-180px"
+						:options="clientTypeList"
+						filterable
+					></n-select>
+				</n-form-item>
+				<n-form-item>
+					<n-button type="primary" class="mr-10px" @click="handleSearch">
+						<icon-ic-round-search class="mr-4px text-20px" />
+						搜索
+					</n-button>
+					<n-button @click="handleReset">
+						<icon-ic-round-refresh class="mr-4px text-20px" />
+						重置
+					</n-button>
+				</n-form-item>
+			</n-form>
+		</my-card>
+		<my-card title="用户列表">
+			<template #right>
+				<div class="flex-center">
+					<cx-columns v-model:columns="columns"></cx-columns>
+					<!--          <n-button type="warning" size="small" class="ml-5px" @click="synchronization">-->
+					<!--            <icon-ic-round-plus class="mr-4px text-20px" />-->
+					<!--            同步erp客户-->
+					<!--          </n-button>-->
+					<n-button type="primary" size="small" class="ml-5px" @click="openDialog">
+						<icon-ic-round-plus class="mr-4px text-20px" />
+						新增客户
+					</n-button>
+				</div>
+			</template>
+			<n-data-table
+				:loading="loading"
+				:data="data"
+				:columns="columns"
+				:max-height="dataTableConfig.maxHeight"
+				:scroll-x="dataTableConfig.scrollWidth(columns)"
+				:row-props="rowProps"
+			></n-data-table>
+			<my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
+		</my-card>
+
+		<my-dialog
+			v-model:show="flag"
+			width="1200px"
+			:title="editFlag ? '编辑客户' : '新增客户'"
+			@cancel="cancel"
+			@submit="submit"
+		>
+			<template #content>
+				<div style="width: 100%">
+					<n-form ref="addFormRef" :model="addForm" :rules="rules" label-placement="left" label-width="130px">
+						<n-grid :cols="3" :x-gap="10" :y-gap="10">
+							<n-form-item-grid-item :span="1" label="客户名称" path="clientName">
+								<n-input v-model:value="addForm.clientName" placeholder="请输入客户名称" style="width: 100%" />
+							</n-form-item-grid-item>
+							<!-- <n-form-item-grid-item :span="1" label="开户银行" path="bankAccount">
+								<n-input v-model:value="addForm.bankAccount" placeholder="请输入开户银行" />
+							</n-form-item-grid-item> -->
+							<n-form-item-grid-item :span="1" label="客户简称" path="clientNick">
+								<n-input v-model:value="addForm.clientNick" placeholder="请输入客户简称" style="width: 100%" />
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="客户编码" path="clientCode">
+								<n-input v-model:value="addForm.clientCode" placeholder="请输入客户编码" style="width: 100%" />
+							</n-form-item-grid-item>
+							<!-- <n-form-item-grid-item :span="1" label="统一信用社代码" path="creditCode">
+								<n-input v-model:value="addForm.creditCode" placeholder="请输入统一信用社代码"></n-input>
+							</n-form-item-grid-item> -->
+							<n-form-item-grid-item :span="1" label="地址" path="addressId">
+								<!-- <n-input v-model:value="addForm.address" placeholder="请输入地址" /> -->
+								<div style="display: flex; flex-wrap: wrap; width: 100%">
+									<n-cascader
+										v-model:value="addForm.addressId"
+										style="width: 100%"
+										:expand-trigger="'click'"
+										:options="addressOptions"
+										:check-strategy="checkStrategyIsChild ? 'child' : 'all'"
+										:show-path="showPath"
+										remote
+										placeholder="请选择省市区"
+									/>
+									<n-input
+										v-model:value="addForm.contact2Tel"
+										placeholder="请输入详细地址"
+										style="width: 100%"
+										class="mt-10px"
+										type="textarea"
+									/>
+								</div>
+							</n-form-item-grid-item>
+
+							<!-- <n-form-item-grid-item :span="1" label="法人姓名">
+								<n-input v-model:value="addForm.legalPersonName" placeholder="请输入法人姓名" />
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="法人电话" path="legalPersonPhone">
+								<n-input v-model:value="addForm.legalPersonPhone" placeholder="请输入法人电话" />
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="法人身份证">
+								<n-input v-model:value="addForm.legalPersonIdcard" placeholder="请输入法人身份证"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="联系人">
+								<n-input v-model:value="addForm.contact1" placeholder="请输入联系人"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="联系人职务">
+								<n-input v-model:value="addForm.contact1Title" placeholder="请输入联系人职务"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="联系人电话">
+								<n-input v-model:value="addForm.contact1Tel" placeholder="请输入联系人电话"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="联系人手机">
+								<n-input v-model:value="addForm.contact1Phone" placeholder="请输入联系人手机"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="联系人传真">
+								<n-input v-model:value="addForm.contact1Fax" placeholder="请输入联系人传真"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="联系人邮箱">
+								<n-input v-model:value="addForm.contact1Email" placeholder="请输入联系人邮箱"></n-input>
+							</n-form-item-grid-item> -->
+							<!-- <n-form-item-grid-item :span="1" label="公司成立时间">
+								<n-input v-model:value="addForm.foundingTime" placeholder="请输入公司成立时间"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="注册资金">
+								<n-input v-model:value="addForm.registeredCapital" placeholder="请输入注册资金"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="经营范围">
+								<n-input v-model:value="addForm.businessScope" placeholder="请输入经营范围"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="终端/经销商">
+								<n-select
+									v-model:value="addForm.ifDistributor"
+									:options="[
+										{ label: '终端', value: 0 },
+										{ label: '经销商', value: 1 }
+									]"
+									placeholder="请选择"
+								></n-select>
+							</n-form-item-grid-item> -->
+							<n-form-item-grid-item :span="1" label="客户来源">
+								<n-select
+									v-model:value="addForm.leadSource"
+									:options="[
                     { label: '电话来访', value: 1 },
                     { label: '客户介绍', value: 2 },
                     { label: '上门拜访', value: 3 },
                     { label: '销售自拓', value: 4 },
                     { label: '其他', value: 5 }
                   ]"
-                  style="width: 100%"
-                  placeholder="请选择"
-                ></n-select>
-              </n-form-item-grid-item>
-
-              <n-form-item-grid-item :span="1" label="客户级别">
-                <n-select
-                  v-model:value="addForm.contact2"
-                  :options="clientGradeList"
-                  placeholder="请选择"
-                  style="width: 100%"
-                ></n-select>
-              </n-form-item-grid-item>
-              <!-- <n-form-item-grid-item :span="1" label="价格模式">
-                <n-select
-                  v-model:value="addForm.pricingModel"
-                  :options="[
-                    { label: '报价', value: '报价' },
-                    { label: '固定', value: '固定' },
-                    { label: '其他', value: '其他' }
-                  ]"
-                  placeholder="请选择"
-                ></n-select>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="需求产品">
-                <n-input v-model:value="addForm.products" placeholder="请输入需求产品"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="月需求量">
-                <n-input v-model:value="addForm.productsNum" placeholder="请输入月需求量"></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="付款方式">
-                <n-select
-                  v-model:value="addForm.paymentMethod"
-                  :options="paymentMethodOptions"
-                  placeholder="请输入付款方式"
-                ></n-select>
-              </n-form-item-grid-item> -->
-
-              <n-form-item-grid-item v-show="addForm.attr2 === 1" :span="1" label="业务员">
-                <n-input v-model:value="addForm.salesmanName" placeholder="请输入业务员" />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item v-show="addForm.attr2 === 1" :span="1" label="业务员电话" path="salesmanPhone">
-                <n-input v-model:value="addForm.salesmanPhone" placeholder="请输入业务员电话" />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="跟进状态">
-                <n-select
-                  v-model:value="addForm.attr1"
-                  placeholder="请选择跟进状态"
-                  style="width: 100%"
-                  :options="followUpStatusList"
-                  filterable
-                ></n-select>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item :span="1" label="客户类型">
-                <n-select v-model:value="addForm.attr2" :options="clientTypeList" placeholder="请选择"></n-select>
-              </n-form-item-grid-item>
-            </n-grid>
-          </n-form>
-        </div>
-      </template>
-    </my-dialog>
-
-    <archives v-show="archivesShow" :from-data="archivesForm" @close-archives="closeArchives" @save="save" />
-  </div>
+									style="width: 100%"
+									placeholder="请选择"
+								></n-select>
+							</n-form-item-grid-item>
+
+							<n-form-item-grid-item :span="1" label="客户级别">
+								<n-select
+									v-model:value="addForm.contact2"
+									:options="clientGradeList"
+									placeholder="请选择"
+									style="width: 100%"
+								></n-select>
+							</n-form-item-grid-item>
+							<!-- <n-form-item-grid-item :span="1" label="价格模式">
+								<n-select
+									v-model:value="addForm.pricingModel"
+									:options="[
+										{ label: '报价', value: '报价' },
+										{ label: '固定', value: '固定' },
+										{ label: '其他', value: '其他' }
+									]"
+									placeholder="请选择"
+								></n-select>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="需求产品">
+								<n-input v-model:value="addForm.products" placeholder="请输入需求产品"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="月需求量">
+								<n-input v-model:value="addForm.productsNum" placeholder="请输入月需求量"></n-input>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="付款方式">
+								<n-select
+									v-model:value="addForm.paymentMethod"
+									:options="paymentMethodOptions"
+									placeholder="请输入付款方式"
+								></n-select>
+							</n-form-item-grid-item> -->
+
+							<n-form-item-grid-item v-show="addForm.attr2 === 1" :span="1" label="业务员">
+								<n-input v-model:value="addForm.salesmanName" placeholder="请输入业务员" />
+							</n-form-item-grid-item>
+							<n-form-item-grid-item v-show="addForm.attr2 === 1" :span="1" label="业务员电话" path="salesmanPhone">
+								<n-input v-model:value="addForm.salesmanPhone" placeholder="请输入业务员电话" />
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="跟进状态">
+								<n-select
+									v-model:value="addForm.attr1"
+									placeholder="请选择跟进状态"
+									style="width: 100%"
+									:options="followUpStatusList"
+									filterable
+								></n-select>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item :span="1" label="客户类型">
+								<n-select v-model:value="addForm.attr2" :options="clientTypeList" placeholder="请选择"></n-select>
+							</n-form-item-grid-item>
+						</n-grid>
+					</n-form>
+				</div>
+			</template>
+		</my-dialog>
+
+		<archives v-show="archivesShow" :from-data="archivesForm" @close-archives="closeArchives" @save="save" />
+	</div>
 </template>
 
 <script setup lang="tsx">
@@ -243,12 +243,12 @@ import { ref, onMounted } from 'vue';
 import { useMessage, useDialog } from 'naive-ui';
 import type { DataTableColumns, FormInst } from 'naive-ui';
 import {
-  getUserList,
-  addUser,
-  deleteUser,
-  editUserFach,
-  getSyncClientList
-  // getProvinces
+	getUserList,
+	addUser,
+	deleteUser,
+	editUserFach,
+	getSyncClientList
+	// getProvinces
 } from '@/service/api/sale/userManage';
 import { useEditBtn, useDelBtn } from '@/hooks/common/useBtn';
 import { dataTableConfig } from '@/config/dataTableConfig';
@@ -258,28 +258,28 @@ import { proCityList } from './options/address';
 import archives from './archives/index.vue';
 
 const paymentMethodOptions = ref([
-  { label: '款到发货', value: 1 },
-  { label: '货到付款', value: 0 }
+	{ label: '款到发货', value: 1 },
+	{ label: '货到付款', value: 0 }
 ]);
 
 const followUpStatusList = ref([
-  { label: '待跟进', value: '待跟进' },
-  { label: '潜在客户', value: '潜在客户' },
-  { label: '有意向', value: '有意向' },
-  { label: '高意向', value: '高意向' },
-  { label: '未成交', value: '未成交' },
-  { label: '已成交', value: '已成交' }
+	{ label: '待跟进', value: '待跟进' },
+	{ label: '潜在客户', value: '潜在客户' },
+	{ label: '有意向', value: '有意向' },
+	{ label: '高意向', value: '高意向' },
+	{ label: '未成交', value: '未成交' },
+	{ label: '已成交', value: '已成交' }
 ]);
 
 const clientGradeList = ref<Array<{ label: string; value: string }>>([
-  { label: '普通客户', value: '1' },
-  { label: '重要客户', value: '2' },
-  { label: '战略客户', value: '3' }
+	{ label: '普通客户', value: '1' },
+	{ label: '重要客户', value: '2' },
+	{ label: '战略客户', value: '3' }
 ]);
 
 const clientTypeList = ref([
-  { label: '海量客户', value: 0 },
-  { label: '个人客户', value: 1 }
+	{ label: '海量客户', value: 0 },
+	{ label: '个人客户', value: 1 }
 ]);
 
 const checkStrategyIsChild = ref(true);
@@ -291,15 +291,15 @@ const addressOptions = ref<Array<any>>(JSON.parse(JSON.stringify(proCityList)));
 const rowClickTimer = ref<any>(null);
 
 const archivesForm = ref({
-  bankAccount: '',
-  creditCode: '',
-  foundingTime: null,
-  registeredCapital: '',
-  businessScope: '',
-  ifDistributor: null,
-  pricingModel: null,
-  products: '',
-  productsNum: ''
+	bankAccount: '',
+	creditCode: '',
+	foundingTime: null,
+	registeredCapital: '',
+	businessScope: '',
+	ifDistributor: null,
+	pricingModel: null,
+	products: '',
+	productsNum: ''
 });
 
 const dialog = useDialog();
@@ -314,222 +314,222 @@ const { bool: flag, setFalse: closeDialog, setTrue: openDialog } = useBoolean();
 const { loading, startLoading, endLoading } = useLoading();
 const editFlag = ref<boolean>(false);
 const addForm = ref<UserManage.addForm>({
-  paymentMethod: '',
-  productsNum: '',
-  products: '',
-  pricingModel: null,
-  leadSource: null,
-  ifDistributor: null,
-  businessScope: '',
-  registeredCapital: '',
-  foundingTime: '',
-  contact1Email: '',
-  contact1Fax: '',
-  contact1Phone: '',
-  contact1Tel: '',
-  contact1Title: '',
-  contact1: '',
-  legalPersonIdcard: '',
-  bankAccount: '', // 银行账号
-  clientName: '',
-  clientCode: '',
-  creditCode: '',
-  clientNick: '',
-  address: '',
-  legalPersonName: '',
-  legalPersonPhone: '',
-  salesmanName: '',
-  salesmanPhone: '',
-  attr1: null,
-  attr2: null,
-  contact2: null,
-  addressId: null,
-  contact2Tel: ''
+	paymentMethod: '',
+	productsNum: '',
+	products: '',
+	pricingModel: null,
+	leadSource: null,
+	ifDistributor: null,
+	businessScope: '',
+	registeredCapital: '',
+	foundingTime: '',
+	contact1Email: '',
+	contact1Fax: '',
+	contact1Phone: '',
+	contact1Tel: '',
+	contact1Title: '',
+	contact1: '',
+	legalPersonIdcard: '',
+	bankAccount: '', // 银行账号
+	clientName: '',
+	clientCode: '',
+	creditCode: '',
+	clientNick: '',
+	address: '',
+	legalPersonName: '',
+	legalPersonPhone: '',
+	salesmanName: '',
+	salesmanPhone: '',
+	attr1: null,
+	attr2: null,
+	contact2: null,
+	addressId: null,
+	contact2Tel: ''
 });
 
 const rules = {
-  clientCode: createRequiredFormRule('客户编码'),
-  clientName: createRequiredFormRule('客户名称'),
-  addressId: createRequiredFormRule('请选择地址'),
-  creditCode: [
-    {
-      required: false,
-      message: '请输入统一社会信用代码',
-      trigger: 'blur'
-    },
-    {
-      pattern: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/,
-      message: '统一社会信用代码格式不正确',
-      trigger: 'blur'
-    }
-  ],
-  legalPersonPhone: [
-    {
-      required: false,
-      message: '请输入法人电话',
-      trigger: 'blur'
-    },
-    {
-      pattern: / ^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9]))\d{8}$/,
-      message: '手机号格式错误',
-      trigger: 'change'
-    }
-  ],
-  salesmanName: createRequiredFormRule('请输入业务员'),
-  salesmanPhone: [
-    {
-      required: false,
-      message: '请输入业务员电话',
-      trigger: 'blur'
-    },
-    {
-      pattern: /^((1[0-9]))\d{9}$/,
-      message: '手机号格式错误',
-      trigger: 'change'
-    }
-  ]
+	clientCode: createRequiredFormRule('客户编码'),
+	clientName: createRequiredFormRule('客户名称'),
+	addressId: createRequiredFormRule('请选择地址'),
+	creditCode: [
+		{
+			required: false,
+			message: '请输入统一社会信用代码',
+			trigger: 'blur'
+		},
+		{
+			pattern: /^[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}$/,
+			message: '统一社会信用代码格式不正确',
+			trigger: 'blur'
+		}
+	],
+	legalPersonPhone: [
+		{
+			required: false,
+			message: '请输入法人电话',
+			trigger: 'blur'
+		},
+		{
+			pattern: / ^((13[0-9])|(14[0-9])|(15[0-9])|(17[0-9])|(18[0-9]))\d{8}$/,
+			message: '手机号格式错误',
+			trigger: 'change'
+		}
+	],
+	salesmanName: createRequiredFormRule('请输入业务员'),
+	salesmanPhone: [
+		{
+			required: false,
+			message: '请输入业务员电话',
+			trigger: 'blur'
+		},
+		{
+			pattern: /^((1[0-9]))\d{9}$/,
+			message: '手机号格式错误',
+			trigger: 'change'
+		}
+	]
 };
 const searchForm = ref<UserManage.searchForm>({
-  creditCode: '',
-  clientName: '',
-  salesmanName: '',
-  pageNum: 1,
-  pageSize: 10,
-  total: 0,
-  attr1: null,
-  attr2: null
+	creditCode: '',
+	clientName: '',
+	salesmanName: '',
+	pageNum: 1,
+	pageSize: 10,
+	total: 0,
+	attr1: null,
+	attr2: null
 });
 const data = ref<UserManage.columns[]>([]);
 
 const columns: Ref<DataTableColumns<UserManage.columns>> = ref([
-  {
-    title: '序号',
-    key: 'index',
-    align: 'center',
-    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1,
-    width: 120
-  },
-  {
-    title: '客户名称',
-    key: 'clientName',
-    width: 200,
-    align: 'center',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '客户简称',
-    align: 'center',
-    key: 'clientNick',
-    width: 200,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '客户编码',
-    align: 'center',
-    key: 'clientCode',
-    width: 120
-  },
-  {
-    title: '客户来源',
-    align: 'center',
-    key: 'leadSource',
-    width: 120,
-    render: row => {
-      return getLeadSource(row.leadSource);
-    }
-  },
-  {
-    title: '客户级别',
-    align: 'center',
-    key: 'contact2',
-    width: 120,
-    render: row => {
-      return getGrade(row.contact2);
-    }
-  },
-
-  // {
-  //   title: '统一社会信用代码',
-  //   align: 'center',
-  //   key: 'creditCode',
-  //   width: 200,
-  //   ellipsis: {
-  //     tooltip: true
-  //   }
-  // },
-  {
-    title: '地址',
-    align: 'center',
-    key: 'address',
-    width: 200,
-    ellipsis: {
-      tooltip: true
-    },
-    render: row => {
-      return (row.address || '') + (row.contact2Tel || '');
-    }
-  },
-  // {
-  //   title: '法人姓名',
-  //   key: 'legalPersonName',
-  //   align: 'center',
-  //   width: 200,
-  //   ellipsis: {
-  //     tooltip: true
-  //   }
-  // },
-  // {
-  //   title: '法人电话',
-  //   align: 'center',
-  //   key: 'legalPersonPhone',
-  //   width: 150
-  // },
-  {
-    title: '业务员',
-    align: 'center',
-    width: 120,
-    key: 'salesmanName'
-  },
-  {
-    title: '业务员电话',
-    align: 'center',
-    width: 150,
-    key: 'salesmanPhone'
-  },
-  {
-    title: '客户类型',
-    align: 'center',
-    key: '',
-    width: 100,
-    fixed: 'right',
-    render: row => getClientTypeText(row.attr2).text
-  },
-  {
-    title: '跟进状态',
-    align: 'center',
-    width: 100,
-    key: 'attr1',
-    fixed: 'right',
-    render: row => (
-      <n-tag type={attr1Style(row.attr1).type} v-show={row.attr1}>
-        {row.attr1}
-      </n-tag>
-    )
-  },
-  {
-    title: '操作',
-    key: 'action',
-    align: 'center',
-    width: 180,
-    fixed: 'right',
-    render: row => {
-      return (
-        <div class="flex">
-          {/* <n-button
+	{
+		title: '序号',
+		key: 'index',
+		align: 'center',
+		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1,
+		width: 120
+	},
+	{
+		title: '客户名称',
+		key: 'clientName',
+		width: 200,
+		align: 'center',
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '客户简称',
+		align: 'center',
+		key: 'clientNick',
+		width: 200,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '客户编码',
+		align: 'center',
+		key: 'clientCode',
+		width: 120
+	},
+	{
+		title: '客户来源',
+		align: 'center',
+		key: 'leadSource',
+		width: 120,
+		render: row => {
+			return getLeadSource(row.leadSource);
+		}
+	},
+	{
+		title: '客户级别',
+		align: 'center',
+		key: 'contact2',
+		width: 120,
+		render: row => {
+			return getGrade(row.contact2 + '');
+		}
+	},
+
+	// {
+	//   title: '统一社会信用代码',
+	//   align: 'center',
+	//   key: 'creditCode',
+	//   width: 200,
+	//   ellipsis: {
+	//     tooltip: true
+	//   }
+	// },
+	{
+		title: '地址',
+		align: 'center',
+		key: 'address',
+		width: 200,
+		ellipsis: {
+			tooltip: true
+		},
+		render: row => {
+			return (row.address || '') + (row.contact2Tel || '');
+		}
+	},
+	// {
+	//   title: '法人姓名',
+	//   key: 'legalPersonName',
+	//   align: 'center',
+	//   width: 200,
+	//   ellipsis: {
+	//     tooltip: true
+	//   }
+	// },
+	// {
+	//   title: '法人电话',
+	//   align: 'center',
+	//   key: 'legalPersonPhone',
+	//   width: 150
+	// },
+	{
+		title: '业务员',
+		align: 'center',
+		width: 120,
+		key: 'salesmanName'
+	},
+	{
+		title: '业务员电话',
+		align: 'center',
+		width: 150,
+		key: 'salesmanPhone'
+	},
+	{
+		title: '客户类型',
+		align: 'center',
+		key: '',
+		width: 100,
+		fixed: 'right',
+		render: row => getClientTypeText(row.attr2).text
+	},
+	{
+		title: '跟进状态',
+		align: 'center',
+		width: 100,
+		key: 'attr1',
+		fixed: 'right',
+		render: row => (
+			<n-tag type={attr1Style(row.attr1).type} v-show={row.attr1}>
+				{row.attr1}
+			</n-tag>
+		)
+	},
+	{
+		title: '操作',
+		key: 'action',
+		align: 'center',
+		width: 180,
+		fixed: 'right',
+		render: row => {
+			return (
+				<div class="flex">
+					{/* <n-button
             type="info"
             size="small"
             class="mr-10px"
@@ -539,287 +539,287 @@ const columns: Ref<DataTableColumns<UserManage.columns>> = ref([
           >
             走访记录
           </n-button> */}
-          {useEditBtn(() => {
-            editUser(row);
-          }, 'small')}
-
-          {useDelBtn(() => {
-            deleteById(row);
-          }, 'small')}
-        </div>
-      );
-    }
-  }
+					{useEditBtn(() => {
+						editUser(row);
+					}, 'small')}
+
+					{useDelBtn(() => {
+						deleteById(row);
+					}, 'small')}
+				</div>
+			);
+		}
+	}
 ]);
 
 function synchronization() {
-  const d = dialog.warning({
-    title: '提示',
-    content: '确认要同步数据吗吗?',
-    positiveText: '确认',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      d.loading = true;
-      return new Promise(resolve => {
-        getSyncClientList().then(res => {
-          if (res.code === 200) {
-            init();
-            window.$message?.success('同步成功');
-          }
-          resolve(true);
-        });
-      });
-    }
-  });
+	const d = dialog.warning({
+		title: '提示',
+		content: '确认要同步数据吗吗?',
+		positiveText: '确认',
+		negativeText: '取消',
+		onPositiveClick: () => {
+			d.loading = true;
+			return new Promise(resolve => {
+				getSyncClientList().then(res => {
+					if (res.code === 200) {
+						init();
+						window.$message?.success('同步成功');
+					}
+					resolve(true);
+				});
+			});
+		}
+	});
 }
 
 function getLeadSource(leadSource: number) {
-  switch (leadSource) {
-    case 1:
-      return '电话来访';
-    case 2:
-      return '客户介绍';
-    case 3:
-      return '上门拜访';
-    case 4:
-      return '销售自拓';
-    case 5:
-      return '其他';
-    default:
-      return '';
-  }
+	switch (leadSource) {
+		case 1:
+			return '电话来访';
+		case 2:
+			return '客户介绍';
+		case 3:
+			return '上门拜访';
+		case 4:
+			return '销售自拓';
+		case 5:
+			return '其他';
+		default:
+			return '';
+	}
 }
 
-function getGrade(grade: number) {
-  switch (grade) {
-    case 1:
-      return '普通客户';
-    case 2:
-      return '重要客户';
-    case 3:
-      return '战略客户';
-    default:
-      return '';
-  }
+function getGrade(grade: String) {
+	switch (grade) {
+		case "1":
+			return '普通客户';
+		case "2":
+			return '重要客户';
+		case "3":
+			return '战略客户';
+		default:
+			return '普通客户';
+	}
 }
 
 function rowProps(row: UserManage.columns) {
-  return {
-    style: 'cursor: pointer;',
-    onClick: () => {
-      if (rowClickTimer.value) {
-        clearTimeout(rowClickTimer.value);
-        rowClickTimer.value = null;
-        archivesShow.value = true;
-        addForm.value = JSON.parse(JSON.stringify(row));
-        for (const key in archivesForm.value) {
-          if (Object.hasOwn(archivesForm.value, key)) {
-            archivesForm.value[key] = row[key];
-          }
-        }
-        return;
-      }
-      rowClickTimer.value = setTimeout(() => {
-        rowClickTimer.value = null;
-      }, 300);
-    }
-  };
+	return {
+		style: 'cursor: pointer;',
+		onClick: () => {
+			if (rowClickTimer.value) {
+				clearTimeout(rowClickTimer.value);
+				rowClickTimer.value = null;
+				archivesShow.value = true;
+				addForm.value = JSON.parse(JSON.stringify(row));
+				for (const key in archivesForm.value) {
+					if (Object.hasOwn(archivesForm.value, key)) {
+						archivesForm.value[key] = row[key];
+					}
+				}
+				return;
+			}
+			rowClickTimer.value = setTimeout(() => {
+				rowClickTimer.value = null;
+			}, 300);
+		}
+	};
 }
 
 function closeArchives() {
-  archivesShow.value = false;
+	archivesShow.value = false;
 }
 
 function getPaymentMethod() {
-  for (let i = 2; i <= 30; i += 1) {
-    paymentMethodOptions.value.push({ label: `到货${i}天付款`, value: i });
-  }
+	for (let i = 2; i <= 30; i += 1) {
+		paymentMethodOptions.value.push({ label: `到货${i}天付款`, value: i });
+	}
 }
 
 function getClientTypeText(num: number) {
-  switch (num) {
-    case 0:
-      return {
-        text: '海量客户'
-      };
-    case 1:
-      return {
-        text: '个人客户'
-      };
-    default:
-      return { text: '' };
-  }
+	switch (num) {
+		case 0:
+			return {
+				text: '海量客户'
+			};
+		case 1:
+			return {
+				text: '个人客户'
+			};
+		default:
+			return { text: '个人客户' };
+	}
 }
 
 function attr1Style(str: string) {
-  switch (str) {
-    case '待跟进':
-      return {
-        type: 'warning'
-      };
-    case '潜在客户':
-      return {
-        type: 'info'
-      };
-    case '有意向':
-      return {
-        type: 'info'
-      };
-    case '高意向':
-      return {
-        type: 'success'
-      };
-    case '未成交':
-      return {
-        type: 'error'
-      };
-    case '已成交':
-      return {
-        type: 'success'
-      };
-    default:
-      return {
-        type: ''
-      };
-  }
+	switch (str) {
+		case '待跟进':
+			return {
+				type: 'warning'
+			};
+		case '潜在客户':
+			return {
+				type: 'info'
+			};
+		case '有意向':
+			return {
+				type: 'info'
+			};
+		case '高意向':
+			return {
+				type: 'success'
+			};
+		case '未成交':
+			return {
+				type: 'error'
+			};
+		case '已成交':
+			return {
+				type: 'success'
+			};
+		default:
+			return {
+				type: ''
+			};
+	}
 }
 
 function save(e) {
-  for (const key in e.value) {
-    if (Object.hasOwn(e.value, key)) {
-      addForm.value[key] = e.value[key];
-    }
-  }
-  editUserFach(addForm.value).then(res => {
-    if (res.code === 200) {
-      message.success(e.tip);
-      init();
-    }
-  });
+	for (const key in e.value) {
+		if (Object.hasOwn(e.value, key)) {
+			addForm.value[key] = e.value[key];
+		}
+	}
+	editUserFach(addForm.value).then(res => {
+		if (res.code === 200) {
+			message.success(e.tip);
+			init();
+		}
+	});
 }
 
 function handleSearch() {
-  init();
+	init();
 }
 function handleReset() {
-  searchForm.value = {
-    creditCode: '',
-    clientName: '',
-    salesmanName: '',
-    pageNum: 1,
-    pageSize: 10,
-    total: 0,
-    attr1: null,
-    attr2: null
-  };
-  init();
+	searchForm.value = {
+		creditCode: '',
+		clientName: '',
+		salesmanName: '',
+		pageNum: 1,
+		pageSize: 10,
+		total: 0,
+		attr1: null,
+		attr2: null
+	};
+	init();
 }
 function cancel() {
-  addForm.value = {
-    paymentMethod: '',
-    productsNum: '',
-    products: '',
-    pricingModel: null,
-    leadSource: null,
-    ifDistributor: null,
-    businessScope: '',
-    registeredCapital: '',
-    foundingTime: '',
-    contact1Email: '',
-    contact1Fax: '',
-    contact1Phone: '',
-    contact1Tel: '',
-    contact1Title: '',
-    contact1: '',
-    legalPersonIdcard: '',
-    bankAccount: '', // 银行账号
-    clientName: '',
-    clientCode: '',
-    creditCode: '',
-    clientNick: '',
-    address: '',
-    legalPersonName: '',
-    legalPersonPhone: '',
-    salesmanName: '',
-    salesmanPhone: '',
-    attr1: null,
-    attr2: null,
-    contact2: null,
-    addressId: null,
-    contact2Tel: ''
-  };
-  closeDialog();
+	addForm.value = {
+		paymentMethod: '',
+		productsNum: '',
+		products: '',
+		pricingModel: null,
+		leadSource: null,
+		ifDistributor: null,
+		businessScope: '',
+		registeredCapital: '',
+		foundingTime: '',
+		contact1Email: '',
+		contact1Fax: '',
+		contact1Phone: '',
+		contact1Tel: '',
+		contact1Title: '',
+		contact1: '',
+		legalPersonIdcard: '',
+		bankAccount: '', // 银行账号
+		clientName: '',
+		clientCode: '',
+		creditCode: '',
+		clientNick: '',
+		address: '',
+		legalPersonName: '',
+		legalPersonPhone: '',
+		salesmanName: '',
+		salesmanPhone: '',
+		attr1: null,
+		attr2: null,
+		contact2: null,
+		addressId: null,
+		contact2Tel: ''
+	};
+	closeDialog();
 }
 function editUser(row) {
-  row.addressId = row.addressId?.toString();
-  addForm.value = { ...row };
-  editFlag.value = true;
-  openDialog();
+	row.addressId = row.addressId?.toString();
+	addForm.value = { ...row };
+	editFlag.value = true;
+	openDialog();
 }
 function deleteById(row: UserManage.columns) {
-  // dialog.warn(() => {
-  //   console.log(row);
-
-  // });
-  deleteUser(row.id).then(res => {
-    if (res.code === 200) {
-      init();
-    }
-  });
+	// dialog.warn(() => {
+	//   console.log(row);
+
+	// });
+	deleteUser(row.id).then(res => {
+		if (res.code === 200) {
+			init();
+		}
+	});
 }
 function submit() {
-  addFormRef.value?.validate(errors => {
-    if (!errors) {
-      if (addForm.value.addressId !== null) {
-        addForm.value.address = getAddressName(addForm.value.addressId);
-      }
-      if (addForm.value.id) {
-        editUserFach(addForm.value).then(res => {
-          if (res.code === 200) {
-            message.success('修改成功！');
-            cancel();
-            init();
-          }
-        });
-      } else {
-        addUser(addForm.value).then(res => {
-          if (res.code === 200) {
-            message.success('新增成功！');
-            cancel();
-            init();
-          }
-        });
-      }
-    }
-  });
+	addFormRef.value?.validate(errors => {
+		if (!errors) {
+			if (addForm.value.addressId !== null) {
+				addForm.value.address = getAddressName(addForm.value.addressId);
+			}
+			if (addForm.value.id) {
+				editUserFach(addForm.value).then(res => {
+					if (res.code === 200) {
+						message.success('修改成功！');
+						cancel();
+						init();
+					}
+				});
+			} else {
+				addUser(addForm.value).then(res => {
+					if (res.code === 200) {
+						message.success('新增成功！');
+						cancel();
+						init();
+					}
+				});
+			}
+		}
+	});
 }
 
 function getAddressName(code: string) {
-  const provinceCode = `${code.slice(0, 2)}0000`;
-  const cityCode = `${code.slice(0, 4)}00`;
-  const provinceItem = proCityList.find(item => item.value === provinceCode);
-  if (!provinceItem) return '';
-  if (!provinceItem.children) return provinceItem.label;
-  const cityItem = provinceItem.children.find(item => item.value === cityCode);
-  if (!cityItem) return provinceItem.label;
-  const districtItem = cityItem.children.find(item => item.value === code);
-  return provinceItem.label + cityItem.label + (districtItem?.label || '');
+	const provinceCode = `${code.slice(0, 2)}0000`;
+	const cityCode = `${code.slice(0, 4)}00`;
+	const provinceItem = proCityList.find(item => item.value === provinceCode);
+	if (!provinceItem) return '';
+	if (!provinceItem.children) return provinceItem.label;
+	const cityItem = provinceItem.children.find(item => item.value === cityCode);
+	if (!cityItem) return provinceItem.label;
+	const districtItem = cityItem.children.find(item => item.value === code);
+	return provinceItem.label + cityItem.label + (districtItem?.label || '');
 }
 
 function init() {
-  startLoading();
-  getUserList(searchForm.value).then(res => {
-    endLoading();
-    if (res.code === 200) {
-      data.value = res.rows;
-      searchForm.value.total = res.total;
-    }
-  });
+	startLoading();
+	getUserList(searchForm.value).then(res => {
+		endLoading();
+		if (res.code === 200) {
+			data.value = res.rows;
+			searchForm.value.total = res.total;
+		}
+	});
 }
 
 onMounted(() => {
-  init();
-  getPaymentMethod();
+	init();
+	getPaymentMethod();
 });
 </script>
 
diff --git a/src/views/md/itemlist/index.vue b/src/views/md/itemlist/index.vue
index e24627c..97c0665 100644
--- a/src/views/md/itemlist/index.vue
+++ b/src/views/md/itemlist/index.vue
@@ -1,141 +1,144 @@
 <template>
-  <div>
-    <my-card title="搜索条件" search>
-      <n-form inline>
-        <n-form-item label="物料名称">
-          <n-input v-model:value="searchForm.itemName" placeholder="请输入物料名称" />
-        </n-form-item>
-        <n-form-item label="物料编码">
-          <n-input v-model:value="searchForm.itemCode" placeholder="请输入物料名称" />
-        </n-form-item>
-        <n-form-item label="物料类型">
-          <n-tree-select
-            v-model:value="searchForm.itemTypeId"
-            :options="OptionsData"
-            label-field="itemTypeName"
-            key-field="id"
-            style="width: 180px"
-          ></n-tree-select>
-          <!-- <n-input v-model:value="searchForm.itemTypeId" placeholder="请输入物料类型" /> -->
-        </n-form-item>
-        <n-form-item label="单位" style="width: 180px">
-          <n-select v-model:value="searchForm.numMeasureId" :options="primaryOptions" placeholder="请输入单位" />
-        </n-form-item>
-        <n-form-item>
-          <n-button type="primary" class="mr-10px" @click="handleSearch">
-            <icon-ic-round-search class="mr-4px text-20px" />
-            搜索
-          </n-button>
-          <n-button @click="handleReset">
-            <icon-ic-round-refresh class="mr-4px text-20px" />
-            重置
-          </n-button>
-        </n-form-item>
-      </n-form>
-    </my-card>
-    <my-card title="物料列表">
-      <template #right>
-        <div class="flex-center">
-          <n-button :loading="exportLoading" size="small" type="warning" @click="exportList">
-            <icon-uil:export class="mr-4px text-20px" />
-            导出
-          </n-button>
-          <n-button size="small" type="primary" class="mr-5px ml-5px" @click="setShow">
-            <icon-ic-round-plus class="mr-4px text-20px" />
-            新增
-          </n-button>
-          <cx-columns v-model:columns="columns"></cx-columns>
-        </div>
-      </template>
-      <n-data-table
-        :loading="loading"
-        :data="data"
-        :columns="columns"
-        :max-height="dataTableConfig.maxHeight"
-      ></n-data-table>
-      <!-- <n-pagination
-        :page="searchForm.pageNum"
-        :item-count="searchForm.total"
-        :page-size="searchForm.pageSize"
-        style="margin-top: 20px; float: right"
-        @update:page="changePage"
-      /> -->
-      <my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
-    </my-card>
-    <my-dialog
-      :title="addForm.id ? '编辑物料' : '新增物料'"
-      :show="show"
-      width="750px"
-      @cancel="cancel"
-      @submit="submit"
-    >
-      <template #content>
-        <div>
-          <n-form
-            ref="addFormRef"
-            label-placement="left"
-            label-align="left"
-            :label-width="100"
-            :model="addForm"
-            :rules="rules"
-          >
-            <n-grid :cols="24" :x-gap="20">
-              <n-form-item-grid-item label="物料类型" :span="11" path="itemTypeName">
-                <n-tree-select
-                  v-model:value="addForm.itemTypeId"
-                  style="width: 200px"
-                  :options="OptionsData"
-                  label-field="itemTypeName"
-                  key-field="id"
-                  @update:value="handleChange"
-                ></n-tree-select>
-                <!-- <n-input v-model:value="addForm.itemTypeId" placeholder="请输入物料类型" /> -->
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="物料名称" :span="11" path="itemName">
-                <n-input v-model:value="addForm.itemName" placeholder="请输入物料名称" />
-              </n-form-item-grid-item>
+	<div>
+		<my-card title="搜索条件" search>
+			<n-form inline>
+				<n-form-item label="物料名称">
+					<n-input v-model:value="searchForm.itemName" placeholder="请输入物料名称" />
+				</n-form-item>
+				<n-form-item label="物料编码">
+					<n-input v-model:value="searchForm.itemCode" placeholder="请输入物料名称" />
+				</n-form-item>
+				<n-form-item label="物料类型">
+					<n-tree-select
+						v-model:value="searchForm.itemTypeId"
+						:options="OptionsData"
+						label-field="itemTypeName"
+						key-field="id"
+						style="width: 180px"
+					></n-tree-select>
+					<!-- <n-input v-model:value="searchForm.itemTypeId" placeholder="请输入物料类型" /> -->
+				</n-form-item>
+				<n-form-item label="单位" style="width: 180px">
+					<n-select v-model:value="searchForm.numMeasureId" :options="primaryOptions" placeholder="请输入单位" />
+				</n-form-item>
+				<n-form-item>
+					<n-button type="primary" class="mr-10px" @click="handleSearch">
+						<icon-ic-round-search class="mr-4px text-20px" />
+						搜索
+					</n-button>
+					<n-button @click="handleReset">
+						<icon-ic-round-refresh class="mr-4px text-20px" />
+						重置
+					</n-button>
+				</n-form-item>
+			</n-form>
+		</my-card>
+		<my-card title="物料列表">
+			<template #right>
+				<div class="flex-center">
+					<n-button :loading="exportLoading" size="small" type="warning" @click="exportList">
+						<icon-uil:export class="mr-4px text-20px" />
+						导出
+					</n-button>
+					<n-button size="small" type="primary" class="mr-5px ml-5px" @click="setShow">
+						<icon-ic-round-plus class="mr-4px text-20px" />
+						新增
+					</n-button>
+					<cx-columns v-model:columns="columns"></cx-columns>
+				</div>
+			</template>
+			<n-data-table
+				:loading="loading"
+				:data="data"
+				:columns="columns"
+				:max-height="dataTableConfig.maxHeight"
+			></n-data-table>
+			<!-- <n-pagination
+				:page="searchForm.pageNum"
+				:item-count="searchForm.total"
+				:page-size="searchForm.pageSize"
+				style="margin-top: 20px; float: right"
+				@update:page="changePage"
+			/> -->
+			<my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
+		</my-card>
+		<my-dialog
+			:title="addForm.id ? '编辑物料' : '新增物料'"
+			:show="show"
+			width="750px"
+			@cancel="cancel"
+			@submit="submit"
+		>
+			<template #content>
+				<div>
+					<n-form
+						ref="addFormRef"
+						label-placement="left"
+						label-align="left"
+						:label-width="100"
+						:model="addForm"
+						:rules="rules"
+					>
+						<n-grid :cols="24" :x-gap="20">
+							<n-form-item-grid-item label="物料类型" :span="11" path="itemTypeName">
+								<n-tree-select
+									v-model:value="addForm.itemTypeId"
+									style="width: 200px"
+									:options="OptionsData"
+									label-field="itemTypeName"
+									key-field="id"
+									@update:value="handleChange"
+								></n-tree-select>
+								<!-- <n-input v-model:value="addForm.itemTypeId" placeholder="请输入物料类型" /> -->
+							</n-form-item-grid-item>
+							<n-form-item-grid-item label="物料名称" :span="11" path="itemName">
+								<n-input v-model:value="addForm.itemName" placeholder="请输入物料名称" />
+							</n-form-item-grid-item>
 
-              <n-form-item-grid-item label="规格" :span="11" path="specification">
-                <n-input
-                  v-model:value="addForm.specification"
-                  placeholder="请输入规格"
-                  :disabled="addForm.id !== null"
-                ></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="重量单位" :span="11" path="weightMeasureId">
-                <n-select
-                  v-model:value="addForm.weightMeasureId"
-                  class="w-200px"
-                  :options="primaryOptions"
-                  placeholder="请输入重量单位"
-                  @update:value="weightHandleChange"
-                />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="工序名称" :span="11" path="workstageId">
-                <n-select
-                  v-model:value="addForm.workstageId"
-                  class="w-200px"
-                  :options="workstageOptions"
-                  placeholder="请选择工序名称"
-                  @update:value="workstageHandleChange"
-                />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="是否启用" :span="11">
-                <n-switch v-model:value="addForm.ifEnable" :checked-value="1" :unchecked-value="0" />
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="备注" :span="25">
-                <n-input v-model:value="addForm.remark" type="textarea" placeholder="请输入备注" />
-              </n-form-item-grid-item>
-            </n-grid>
-          </n-form>
-        </div>
-      </template>
-    </my-dialog>
-  </div>
+							<n-form-item-grid-item label="规格" :span="11" path="specification">
+								<n-input
+									v-model:value="addForm.specification"
+									placeholder="请输入规格"
+									:disabled="addForm.id !== null"
+								></n-input>
+							</n-form-item-grid-item>
+							<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="weightMeasureId">
+								<n-select
+									v-model:value="addForm.weightMeasureId"
+									class="w-200px"
+									:options="primaryOptions"
+									placeholder="请输入单位"
+									@update:value="weightHandleChange"
+								/>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item label="工序名称" :span="11" path="workstageId">
+								<n-select
+									v-model:value="addForm.workstageId"
+									class="w-200px"
+									:options="workstageOptions"
+									placeholder="请选择工序名称"
+									@update:value="workstageHandleChange"
+								/>
+							</n-form-item-grid-item>
+							<n-form-item-grid-item label="是否启用" :span="11">
+								<n-switch v-model:value="addForm.ifEnable" :checked-value="1" :unchecked-value="0" />
+							</n-form-item-grid-item>
+							<n-form-item-grid-item label="备注" :span="25">
+								<n-input v-model:value="addForm.remark" type="textarea" placeholder="请输入备注" />
+							</n-form-item-grid-item>
+						</n-grid>
+					</n-form>
+				</div>
+			</template>
+		</my-dialog>
+	</div>
 </template>
 
 <script setup lang="tsx">
-import type { Ref } from 'vue';
+import { getCurrentInstance, Ref } from 'vue';
 import { ref, onMounted } from 'vue';
 import { useMessage } from 'naive-ui';
 import type { DataTableColumns, FormInst } from 'naive-ui';
@@ -148,6 +151,9 @@ import { download } from '@/service/request/helpers';
 import { dataTableConfig } from '@/config/dataTableConfig';
 import { useLoading, useWarning, useBoolean } from '~/src/hooks';
 
+const { proxy } = getCurrentInstance() as any;
+const { corlor_types } = proxy.useDict('corlor_types');
+
 const message = useMessage();
 const { bool: show, setTrue: setShow, setFalse: setHide } = useBoolean();
 const { loading, startLoading, endLoading } = useLoading();
@@ -155,109 +161,111 @@ const dialog = useWarning();
 
 const addFormRef = ref<FormInst | null>(null);
 const rules = {
-  itemName: createRequiredFormRule('请输入物料名称'),
-  itemTypeName: createRequiredFormRule('请输入物料类型'),
-  workstageId: createRequiredFormRule('请选择工序'),
-  specification: createRequiredFormRule('请输入规格')
+	itemName: createRequiredFormRule('请输入物料名称'),
+	itemTypeName: createRequiredFormRule('请输入物料类型'),
+	workstageId: createRequiredFormRule('请选择工序'),
+	specification: createRequiredFormRule('请输入规格')
 };
 const addForm = ref<Item.AddForm>({
-  id: null,
-  remark: '',
-  itemName: '',
-  itemTypeId: null,
-  itemTypeName: '',
-  workstageId: null,
-  workstageName: '',
-  specification: '',
-  weightMeasureId: null,
-  weightMeasureName: '',
-  ifEnable: 1
+	id: null,
+	remark: '',
+	itemName: '',
+	itemTypeId: null,
+	itemTypeName: '',
+	workstageId: null,
+	workstageName: '',
+	specification: '',
+	weightMeasureId: null,
+	weightMeasureName: '',
+	color: '',
+	ifEnable: 1
 });
 function cancel() {
-  setHide();
-  addForm.value = {
-    id: null,
-    remark: '',
-    itemName: '',
-    itemTypeId: null,
-    itemTypeName: '',
-    workstageId: null,
-    workstageName: '',
-    weightMeasureId: null,
-    weightMeasureName: '',
-    ifEnable: 1
-  };
+	setHide();
+	addForm.value = {
+		id: null,
+		remark: '',
+		itemName: '',
+		itemTypeId: null,
+		itemTypeName: '',
+		workstageId: null,
+		workstageName: '',
+		weightMeasureId: null,
+		color: '',
+		weightMeasureName: '',
+		ifEnable: 1
+	};
 }
 async function changeStatus(row: any, val: number) {
-  row.ifEnable = val;
-  await editMaterial(row).then(res => {
-    if (res.code === 200) {
-      message.success(res.msg);
-      cancel();
-    }
-  });
-  init();
+	row.ifEnable = val;
+	await editMaterial(row).then(res => {
+		if (res.code === 200) {
+			message.success(res.msg);
+			cancel();
+		}
+	});
+	init();
 }
 function handleChange(val, item) {
-  addForm.value.itemTypeId = val;
-  addForm.value.itemTypeName = item.itemTypeName;
+	addForm.value.itemTypeId = val;
+	addForm.value.itemTypeName = item.itemTypeName;
 }
 function weightHandleChange(val, item) {
-  addForm.value.weightMeasureId = val;
-  addForm.value.weightMeasureName = item.label;
+	addForm.value.weightMeasureId = val;
+	addForm.value.weightMeasureName = item.label;
 }
 function workstageHandleChange(val, item) {
-  addForm.value.workstageId = val;
-  addForm.value.workstageName = item.label;
+	addForm.value.workstageId = val;
+	addForm.value.workstageName = item.label;
 }
 function submit() {
-  if (!addFormRef.value) return;
-  addFormRef.value.validate(errors => {
-    if (!errors) {
-      if (!addForm.value.id) {
-        addMaterial(addForm.value).then(res => {
-          if (res.code === 200) {
-            message.success(res.msg);
-            cancel();
-            init();
-          }
-        });
-      } else {
-        editMaterial(addForm.value).then(res => {
-          if (res.code === 200) {
-            message.success(res.msg);
-            cancel();
-            init();
-          }
-        });
-      }
-    }
-  });
+	if (!addFormRef.value) return;
+	addFormRef.value.validate(errors => {
+		if (!errors) {
+			if (!addForm.value.id) {
+				addMaterial(addForm.value).then(res => {
+					if (res.code === 200) {
+						message.success(res.msg);
+						cancel();
+						init();
+					}
+				});
+			} else {
+				editMaterial(addForm.value).then(res => {
+					if (res.code === 200) {
+						message.success(res.msg);
+						cancel();
+						init();
+					}
+				});
+			}
+		}
+	});
 }
 const searchForm = ref<Item.SearchForm>({
-  itemCode: '',
-  itemName: '',
-  itemTypeId: null,
-  numMeasureId: null,
-  pageNum: 1,
-  pageSize: 10,
-  total: 0
+	itemCode: '',
+	itemName: '',
+	itemTypeId: null,
+	numMeasureId: null,
+	pageNum: 1,
+	pageSize: 10,
+	total: 0
 });
 function handleSearch() {
-  searchForm.value.pageNum = 1;
-  init();
+	searchForm.value.pageNum = 1;
+	init();
 }
 function handleReset() {
-  searchForm.value = {
-    itemCode: '',
-    itemName: '',
-    itemTypeId: null,
-    numMeasureId: '',
-    pageNum: 1,
-    pageSize: 10,
-    total: 0
-  };
-  init();
+	searchForm.value = {
+		itemCode: '',
+		itemName: '',
+		itemTypeId: null,
+		numMeasureId: '',
+		pageNum: 1,
+		pageSize: 10,
+		total: 0
+	};
+	init();
 }
 // function changePage(page: number) {
 //   searchForm.value.pageNum = page;
@@ -265,181 +273,198 @@ function handleReset() {
 // }
 const data = ref<Item.List[]>([]);
 function init() {
-  startLoading();
-  getMaterialList(searchForm.value).then(res => {
-    data.value = res.rows;
-    searchForm.value.total = res.total;
-    endLoading();
-  });
+	startLoading();
+	getMaterialList(searchForm.value).then(res => {
+		data.value = res.rows;
+		searchForm.value.total = res.total;
+		endLoading();
+	});
 }
 const columns: Ref<DataTableColumns<Item.List>> = ref([
-  {
-    title: '序号',
-    key: 'index',
-    align: 'center',
-    width: 60,
-    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
-  },
-  {
-    title: '物料编码',
-    key: 'itemCode',
-    align: 'center',
-    width: 200
-  },
-  {
-    title: '物料名称',
-    align: 'center',
-    key: 'itemName'
-  },
-  {
-    title: '类型名称',
-    align: 'center',
-    key: 'itemTypeName'
-  },
-  {
-    title: '规格',
-    align: 'center',
-    key: 'specification'
-  },
-  {
-    title: '工序名称',
-    align: 'center',
-    key: 'workstageName'
-  },
-  {
-    title: '单位',
-    align: 'center',
-    key: 'weightMeasureName'
-  },
-  {
-    title: '是否启用',
-    key: 'ifEnable',
-    render(row) {
-      return (
-        <my-switch
-          v-model:value={row.ifEnable}
-          checked={1}
-          unchecked={0}
-          onChecked={val => {
-            changeStatus(row, val);
-          }}
-          onUnchecked={val => {
-            changeStatus(row, val);
-          }}
-        />
-      );
-    }
-  },
-  {
-    title: '备注',
-    key: 'remark'
-  },
-  {
-    title: '创建时间',
-    key: 'createTime',
-    width: 170
-  },
-  {
-    title: '操作',
-    key: 'action',
-    width: 170,
-    render(row) {
-      return (
-        <div>
-          <n-button
-            type="warning"
-            size="small"
-            class="mr-10px"
-            onClick={() => {
-              addForm.value = deepClone(row);
-              setShow();
-            }}
-          >
-            <icon-tdesign-edit class="mr-1px text-15px " />
-            编辑
-          </n-button>
-          <n-button
-            type="error"
-            size="small"
-            onClick={() => {
-              dialog.warn(() => {
-                console.log(row);
-                deleteMaterial(row.id).then(res => {
-                  if (res.code === 200) {
-                    message.success(res.msg);
-                    init();
-                  }
-                });
-              });
-            }}
-          >
-            <icon-tdesign-delete class="mr-1px text-15px " />
-            删除
-          </n-button>
-        </div>
-      );
-    }
-  }
+	{
+		title: '序号',
+		key: 'index',
+		align: 'center',
+		width: 60,
+		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
+	},
+	{
+		title: '物料编码',
+		key: 'itemCode',
+		align: 'center',
+		width: 200
+	},
+	{
+		title: '物料名称',
+		align: 'center',
+		key: 'itemName'
+	},
+	{
+		title: '类型名称',
+		align: 'center',
+		key: 'itemTypeName'
+	},
+	{
+		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: '规格',
+		align: 'center',
+		key: 'specification'
+	},
+	{
+		title: '工序名称',
+		align: 'center',
+		key: 'workstageName'
+	},
+	{
+		title: '单位',
+		align: 'center',
+		key: 'weightMeasureName'
+	},
+	{
+		title: '是否启用',
+		key: 'ifEnable',
+		render(row) {
+			return (
+				<my-switch
+					v-model:value={row.ifEnable}
+					checked={1}
+					unchecked={0}
+					onChecked={val => {
+						changeStatus(row, val);
+					}}
+					onUnchecked={val => {
+						changeStatus(row, val);
+					}}
+				/>
+			);
+		}
+	},
+	{
+		title: '备注',
+		key: 'remark'
+	},
+	{
+		title: '创建时间',
+		key: 'createTime',
+		width: 170
+	},
+	{
+		title: '操作',
+		key: 'action',
+		width: 170,
+		render(row) {
+			return (
+				<div>
+					<n-button
+						type="warning"
+						size="small"
+						class="mr-10px"
+						onClick={() => {
+							addForm.value = deepClone(row);
+							setShow();
+						}}
+					>
+						<icon-tdesign-edit class="mr-1px text-15px " />
+						编辑
+					</n-button>
+					<n-button
+						type="error"
+						size="small"
+						onClick={() => {
+							dialog.warn(() => {
+								console.log(row);
+								deleteMaterial(row.id).then(res => {
+									if (res.code === 200) {
+										message.success(res.msg);
+										init();
+									}
+								});
+							});
+						}}
+					>
+						<icon-tdesign-delete class="mr-1px text-15px " />
+						删除
+					</n-button>
+				</div>
+			);
+		}
+	}
 ]);
 const workstageOptions = ref<any[]>([]);
 const exportLoading = ref<boolean>(false);
 function exportList() {
-  exportLoading.value = true;
-  download('md/mes/md/mdItem/export', searchForm.value, `itemlist_${new Date().getTime()}.xlsx`, undefined)
-    .then(() => {
-      exportLoading.value = false;
-    })
-    .catch(() => {
-      exportLoading.value = false;
-    });
-  console.log('导出');
+	exportLoading.value = true;
+	download('md/mes/md/mdItem/export', searchForm.value, `itemlist_${new Date().getTime()}.xlsx`, undefined)
+		.then(() => {
+			exportLoading.value = false;
+		})
+		.catch(() => {
+			exportLoading.value = false;
+		});
+	console.log('导出');
 }
 const primaryOptions = ref<{ value: string; label: string }[]>([]);
 const weightOptions = ref<{ value: string; label: string }[]>([]);
 const OptionsData = ref<ApiItemTypeManagement.ItemType[]>([]);
 function setTableData(list: ApiItemTypeManagement.ItemType[]) {
-  OptionsData.value = list;
+	OptionsData.value = list;
 }
 onMounted(async () => {
-  const typeData = await fetchItemTypeList({});
-  if (typeData) {
-    setTimeout(() => {
-      setTableData(typeData.data);
-      console.log(OptionsData.value, '11');
-      // endLoading();
-      // allRowKeysArr = typeData.allParentIDArr;
-      // expandedRows.value = typeData.allParentIDArr;
-    }, 100);
-  }
-  init();
-  getAllTechnologyList().then(res => {
-    if (res.code === 200) {
-      workstageOptions.value = [];
-      res.data.forEach((item: any) => {
-        workstageOptions.value.push({
-          label: item.workstageName,
-          value: item.id
-        });
-      });
-    }
-  });
-  getAllUnit().then(res => {
-    primaryOptions.value = [];
-    weightOptions.value = [];
-    if (res.code === 200) {
-      res.data.forEach((item: any) => {
-        primaryOptions.value.push({
-          label: item.measureName,
-          value: item.id
-        });
+	const typeData = await fetchItemTypeList({});
+	if (typeData) {
+		setTimeout(() => {
+			setTableData(typeData.data);
+			console.log(OptionsData.value, '11');
+			// endLoading();
+			// allRowKeysArr = typeData.allParentIDArr;
+			// expandedRows.value = typeData.allParentIDArr;
+		}, 100);
+	}
+	init();
+	getAllTechnologyList().then(res => {
+		if (res.code === 200) {
+			workstageOptions.value = [];
+			res.data.forEach((item: any) => {
+				workstageOptions.value.push({
+					label: item.workstageName,
+					value: item.id
+				});
+			});
+		}
+	});
+	getAllUnit().then(res => {
+		primaryOptions.value = [];
+		weightOptions.value = [];
+		if (res.code === 200) {
+			res.data.forEach((item: any) => {
+				primaryOptions.value.push({
+					label: item.measureName,
+					value: item.id
+				});
 
-        weightOptions.value.push({
-          label: item.measureName,
-          value: item.id
-        });
-      });
-    }
-  });
+				weightOptions.value.push({
+					label: item.measureName,
+					value: item.id
+				});
+			});
+		}
+	});
 });
 </script>
 
diff --git a/src/views/procure/procureOrder/index.vue b/src/views/procure/procureOrder/index.vue
index 03f591b..ddd3b58 100644
--- a/src/views/procure/procureOrder/index.vue
+++ b/src/views/procure/procureOrder/index.vue
@@ -355,7 +355,7 @@ function getListTotal(total, num, price) {
 	// }
 	// eslint-disable-next-line no-param-reassign, @typescript-eslint/no-unused-vars
 
-	return total.form.totalPrice.toFixed(4);
+	return total.form.totalPrice;
 }
 const editFlag = ref(false);
 const getTotalPric = computed(() => {
diff --git a/src/views/produce/feed/index.vue b/src/views/produce/feed/index.vue
index f321b2c..939ef70 100644
--- a/src/views/produce/feed/index.vue
+++ b/src/views/produce/feed/index.vue
@@ -1,24 +1,24 @@
 <template>
-  <div>
-    <my-card :title="title">
-      <template #right>
-        <div style="display: flex; align-items: center">
-          <CxColumns v-model:columns="columns" />
-          <n-button class="ml-5px" type="primary" size="small" attr-type="button" style="width: 80px" @click="back">
-            返回
-          </n-button>
-        </div>
-      </template>
-      <n-data-table
-        :loading="loading"
-        :columns="columns"
-        :data="data"
-        :max-height="dataTableConfig.maxHeight"
-        :scroll-x="dataTableConfig.scrollWidth(columns)"
-      ></n-data-table>
-      <my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
-    </my-card>
-  </div>
+	<div>
+		<my-card :title="title">
+			<template #right>
+				<div style="display: flex; align-items: center">
+					<CxColumns v-model:columns="columns" />
+					<n-button class="ml-5px" type="primary" size="small" attr-type="button" style="width: 80px" @click="back">
+						返回
+					</n-button>
+				</div>
+			</template>
+			<n-data-table
+				:loading="loading"
+				:columns="columns"
+				:data="data"
+				:max-height="dataTableConfig.maxHeight"
+				:scroll-x="dataTableConfig.scrollWidth(columns)"
+			></n-data-table>
+			<my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
+		</my-card>
+	</div>
 </template>
 
 <script setup lang="ts">
@@ -37,163 +37,163 @@ const router = useRouter();
 const title = ref<string>('投料记录');
 
 const searchForm = ref<{
-  pageNum: number;
-  pageSize: number;
-  total: number;
-  taskId: number;
-  taskType: string;
+	pageNum: number;
+	pageSize: number;
+	total: number;
+	taskId: number;
+	taskType: string;
 }>({
-  pageNum: 1,
-  pageSize: 10,
-  total: 0,
-  taskId: 0,
-  taskType: '0'
+	pageNum: 1,
+	pageSize: 10,
+	total: 0,
+	taskId: 0,
+	taskType: '0'
 });
 
 const data = ref<feedRecords.TabelList[]>([]);
 
 const columns: Ref<DataTableColumns<feedRecords.TabelList>> = ref([
-  {
-    title: '序号',
-    key: 'index',
-    align: 'center',
-    width: 70,
-    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
-  },
-  {
-    title: '工单类型',
-    key: 'taskType',
-    width: 100,
-    render: row => {
-      return row.taskType === '0' ? '拉丝' : '漆包';
-    }
-  },
-  {
-    title: '机台',
-    key: 'workstationCode',
-    width: 100
-  },
-  {
-    title: '订单类型',
-    key: 'orderType',
-    width: 100,
-    render: row => {
-      return row.orderType === '0' ? '客户订单' : '备库订单';
-    }
-  },
-  // {
-  //   title: '订单编号',
-  //   key: 'orderSn',
-  //   width: 100
-  // },
-  {
-    title: '客户',
-    key: 'clientName',
-    width: 100
-  },
-  {
-    title: '生产工单号',
-    key: 'taskSn',
-    width: 100,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '二维码编号',
-    key: 'inputSn',
-    width: 100,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '产品型号',
-    key: 'productModel',
-    width: 100
-  },
-  {
-    title: '产品规格',
-    key: 'productSpecification',
-    width: 100
-  },
-  {
-    title: '厂家料号',
-    key: 'partNumber',
-    width: 100,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '投料重量',
-    key: 'inputWeight',
-    width: 100
-  },
-  {
-    title: '入库批号',
-    key: 'batchCode',
-    width: 100
-  },
-  {
-    title: '单位',
-    key: 'measureName',
-    width: 100
-  },
-  {
-    title: '投料规格',
-    key: 'itemSpecification',
-    width: 100
-  },
-  {
-    title: '投料时间',
-    key: 'createTime',
-    width: 180
-  },
-  {
-    title: '操作人',
-    key: 'createBy',
-    width: 100
-  }
+	{
+		title: '序号',
+		key: 'index',
+		align: 'center',
+		width: 70,
+		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
+	},
+	{
+		title: '工单类型',
+		key: 'taskType',
+		width: 100,
+		render: row => {
+			return row.taskType === '0' ? '拉丝' : '漆包';
+		}
+	},
+	{
+		title: '机台',
+		key: 'workstationCode',
+		width: 100
+	},
+	{
+		title: '订单类型',
+		key: 'orderType',
+		width: 100,
+		render: row => {
+			return row.orderType === '0' ? '客户订单' : '备库订单';
+		}
+	},
+	// {
+	//   title: '订单编号',
+	//   key: 'orderSn',
+	//   width: 100
+	// },
+	{
+		title: '客户',
+		key: 'clientName',
+		width: 100
+	},
+	{
+		title: '生产工单号',
+		key: 'taskSn',
+		width: 100,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '二维码编号',
+		key: 'inputSn',
+		width: 100,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '产品型号',
+		key: 'productModel',
+		width: 100
+	},
+	{
+		title: '产品规格',
+		key: 'productSpecification',
+		width: 100
+	},
+	{
+		title: '厂家料号',
+		key: 'partNumber',
+		width: 100,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '投料数量',
+		key: 'inputWeight',
+		width: 100
+	},
+	{
+		title: '入库批号',
+		key: 'batchCode',
+		width: 100
+	},
+	{
+		title: '单位',
+		key: 'measureName',
+		width: 100
+	},
+	{
+		title: '投料规格',
+		key: 'itemSpecification',
+		width: 100
+	},
+	{
+		title: '投料时间',
+		key: 'createTime',
+		width: 180
+	},
+	{
+		title: '操作人',
+		key: 'createBy',
+		width: 100
+	}
 ]);
 
 async function init() {
-  startLoading();
-  getItputLog({ ...searchForm.value }).then(res => {
-    if (res.code === 200) {
-      data.value = res.rows;
-      searchForm.value.total = res.total;
-    }
-    endLoading();
-  });
+	startLoading();
+	getItputLog({ ...searchForm.value }).then(res => {
+		if (res.code === 200) {
+			data.value = res.rows;
+			searchForm.value.total = res.total;
+		}
+		endLoading();
+	});
 }
 
 function back() {
-  router.go(-1);
+	router.go(-1);
 }
 
 onMounted(() => {
-  title.value = `${route.query.title}-${title.value}`;
-  searchForm.value.taskId = Number(route.query.id);
-  if (route.query.title === '漆包') {
-    searchForm.value.taskType = '1';
-    columns.value = [
-      ...columns.value,
-      ...[
-        {
-          title: '轴号',
-          key: 'axleNumber',
-          width: 100
-        },
-        {
-          title: '轴位置数',
-          key: 'alexPositionNumber',
-          width: 100
-        }
-      ]
-    ];
-  }
-  init();
+	title.value = `${route.query.title}-${title.value}`;
+	searchForm.value.taskId = Number(route.query.id);
+	if (route.query.title === '漆包') {
+		searchForm.value.taskType = '1';
+		columns.value = [
+			...columns.value,
+			...[
+				{
+					title: '轴号',
+					key: 'axleNumber',
+					width: 100
+				},
+				{
+					title: '轴位置数',
+					key: 'alexPositionNumber',
+					width: 100
+				}
+			]
+		];
+	}
+	init();
 });
 </script>
 
diff --git a/src/views/produce/report/index.vue b/src/views/produce/report/index.vue
index 155807c..70f6321 100644
--- a/src/views/produce/report/index.vue
+++ b/src/views/produce/report/index.vue
@@ -1,24 +1,24 @@
 <template>
-  <div>
-    <my-card :title="title">
-      <template #right>
-        <div style="display: flex; align-items: center">
-          <CxColumns v-model:columns="columns" />
-          <n-button class="ml-5px" type="primary" size="small" attr-type="button" style="width: 80px" @click="back">
-            返回
-          </n-button>
-        </div>
-      </template>
-      <n-data-table
-        :loading="loading"
-        :columns="columns"
-        :data="data"
-        :max-height="dataTableConfig.maxHeight"
-        :scroll-x="dataTableConfig.scrollWidth(columns)"
-      ></n-data-table>
-      <my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
-    </my-card>
-  </div>
+	<div>
+		<my-card :title="title">
+			<template #right>
+				<div style="display: flex; align-items: center">
+					<CxColumns v-model:columns="columns" />
+					<n-button class="ml-5px" type="primary" size="small" attr-type="button" style="width: 80px" @click="back">
+						返回
+					</n-button>
+				</div>
+			</template>
+			<n-data-table
+				:loading="loading"
+				:columns="columns"
+				:data="data"
+				:max-height="dataTableConfig.maxHeight"
+				:scroll-x="dataTableConfig.scrollWidth(columns)"
+			></n-data-table>
+			<my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
+		</my-card>
+	</div>
 </template>
 
 <script setup lang="tsx">
@@ -32,17 +32,17 @@ import { getOutputLog } from '~/src/service/api/produre/workRecords/index';
 const { loading, startLoading, endLoading } = useLoading();
 
 const searchForm = ref<{
-  taskId: number;
-  pageNum: number;
-  pageSize: number;
-  total: number;
-  taskType: string;
+	taskId: number;
+	pageNum: number;
+	pageSize: number;
+	total: number;
+	taskType: string;
 }>({
-  taskId: 0,
-  pageNum: 1,
-  pageSize: 10,
-  total: 0,
-  taskType: '0'
+	taskId: 0,
+	pageNum: 1,
+	pageSize: 10,
+	total: 0,
+	taskType: '0'
 });
 
 const route = useRoute();
@@ -54,160 +54,160 @@ const title = ref<string>('报工记录');
 const data = ref<workRecords.TabelList[]>([]);
 
 const columns: Ref<DataTableColumns<workRecords.TabelList>> = ref([
-  {
-    title: '序号',
-    key: 'index',
-    align: 'center',
-    width: 70,
-    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
-  },
-  {
-    title: '工单类型',
-    key: 'taskType',
-    width: 100,
-    render: row => {
-      return row.taskType === '0' ? '拉丝' : '漆包';
-    }
-  },
-  {
-    title: '机台',
-    key: 'workstationCode',
-    width: 100
-  },
+	{
+		title: '序号',
+		key: 'index',
+		align: 'center',
+		width: 70,
+		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
+	},
+	{
+		title: '工单类型',
+		key: 'taskType',
+		width: 100,
+		render: row => {
+			return row.taskType === '0' ? '拉丝' : '漆包';
+		}
+	},
+	{
+		title: '机台',
+		key: 'workstationCode',
+		width: 100
+	},
 
-  {
-    title: '订单类型',
-    key: 'orderType',
-    width: 100,
-    render: row => {
-      return row.orderType === '0' ? '客户订单' : '备库订单';
-    }
-  },
-  // {
-  //   title: '订单编号',
-  //   key: 'orderSn',
-  //   width: 100
-  // },
-  {
-    title: '客户',
-    key: 'clientName',
-    width: 100
-  },
-  {
-    title: '生产工单号',
-    key: 'taskSn',
-    width: 100,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '二维码编号',
-    key: 'outputSn',
-    width: 100,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '产品型号',
-    key: 'productModel',
-    width: 100
-  },
-  {
-    title: '产品规格',
-    key: 'productSpecification',
-    width: 100
-  },
-  {
-    title: '报工重量',
-    key: 'outputWeight',
-    width: 100
-  },
-  {
-    title: '报工规格',
-    key: 'itemSpecification',
-    width: 100
-  },
-  {
-    title: '单位',
-    key: 'measureName',
-    width: 100
-  },
-  {
-    title: '报工时间',
-    key: 'createTime',
-    width: 180
-  },
-  {
-    title: '报工人',
-    key: 'createBy',
-    width: 100
-  },
-  {
-    title: '报工工号',
-    key: 'jobNumber',
-    width: 100
-  },
-  {
-    title: '批号',
-    key: 'batchCode',
-    width: 100
-  },
-  {
-    title: '贸易商',
-    key: 'ingredientsName',
-    width: 100
-  },
-  {
-    title: '材料厂家',
-    key: 'manufacturerName',
-    width: 100
-  },
-  {
-    title: '称重时间',
-    key: 'weightTime',
-    width: 100
-  }
+	{
+		title: '订单类型',
+		key: 'orderType',
+		width: 100,
+		render: row => {
+			return row.orderType === '0' ? '客户订单' : '备库订单';
+		}
+	},
+	// {
+	//   title: '订单编号',
+	//   key: 'orderSn',
+	//   width: 100
+	// },
+	{
+		title: '客户',
+		key: 'clientName',
+		width: 100
+	},
+	{
+		title: '生产工单号',
+		key: 'taskSn',
+		width: 100,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '二维码编号',
+		key: 'outputSn',
+		width: 100,
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '产品型号',
+		key: 'productModel',
+		width: 100
+	},
+	{
+		title: '产品规格',
+		key: 'productSpecification',
+		width: 100
+	},
+	{
+		title: '报工数量（副）',
+		key: 'outputWeight',
+		width: 100
+	},
+	{
+		title: '报工规格',
+		key: 'itemSpecification',
+		width: 100
+	},
+	{
+		title: '单位',
+		key: 'measureName',
+		width: 100
+	},
+	{
+		title: '报工时间',
+		key: 'createTime',
+		width: 180
+	},
+	{
+		title: '报工人',
+		key: 'createBy',
+		width: 100
+	},
+	{
+		title: '报工工号',
+		key: 'jobNumber',
+		width: 100
+	},
+	{
+		title: '批号',
+		key: 'batchCode',
+		width: 100
+	},
+	{
+		title: '贸易商',
+		key: 'ingredientsName',
+		width: 100
+	},
+	{
+		title: '材料厂家',
+		key: 'manufacturerName',
+		width: 100
+	},
+	{
+		title: '称重时间',
+		key: 'weightTime',
+		width: 100
+	}
 ]);
 
 function init() {
-  startLoading();
-  getOutputLog({ ...searchForm.value }).then(res => {
-    if (res.code === 200) {
-      data.value = res.rows;
-      searchForm.value.total = res.total;
-    }
-    endLoading();
-  });
+	startLoading();
+	getOutputLog({ ...searchForm.value }).then(res => {
+		if (res.code === 200) {
+			data.value = res.rows;
+			searchForm.value.total = res.total;
+		}
+		endLoading();
+	});
 }
 
 function back() {
-  router.go(-1);
+	router.go(-1);
 }
 
 onMounted(() => {
-  title.value = `${route.query.title}-${title.value}`;
-  searchForm.value.taskId = Number(route.query.id);
-  if (route.query.title === '漆包') {
-    searchForm.value.taskType = '1';
-    columns.value = [
-      ...columns.value,
-      ...[
-        {
-          title: '轴位置数',
-          key: 'alexPositionNumber',
-          width: 100
-        },
-        {
-          title: '批次',
-          key: 'alexLot',
-          width: 100
-        }
-      ]
-    ];
-  }
-  init();
+	title.value = `${route.query.title}-${title.value}`;
+	searchForm.value.taskId = Number(route.query.id);
+	if (route.query.title === '漆包') {
+		searchForm.value.taskType = '1';
+		columns.value = [
+			...columns.value,
+			...[
+				{
+					title: '轴位置数',
+					key: 'alexPositionNumber',
+					width: 100
+				},
+				{
+					title: '批次',
+					key: 'alexLot',
+					width: 100
+				}
+			]
+		];
+	}
+	init();
 });
 </script>
 
diff --git a/src/views/produce/workOrderArrange/index.vue b/src/views/produce/workOrderArrange/index.vue
index e2e5472..3488974 100644
--- a/src/views/produce/workOrderArrange/index.vue
+++ b/src/views/produce/workOrderArrange/index.vue
@@ -1,52 +1,52 @@
 <template>
-  <div>
-    <my-card title="搜索条件" search>
-      <n-form inline>
-        <n-form-item label="工单类型：">
-          <n-select
-            v-model:value="searchForm.workOrderType"
-            placeholder="请选择工单类型"
-            class="w-180px"
-            :options="workOrderType"
-            @update-value="changeWorkOrderStatus"
-          ></n-select>
-        </n-form-item>
+	<div>
+		<my-card title="搜索条件" search>
+			<n-form inline>
+				<n-form-item label="工单类型：">
+					<n-select
+						v-model:value="searchForm.workOrderType"
+						placeholder="请选择工单类型"
+						class="w-180px"
+						:options="workOrderType"
+						@update-value="changeWorkOrderStatus"
+					></n-select>
+				</n-form-item>
 
-        <n-form-item label="工单状态：">
-          <div>
-            <n-button
-              v-for="item in workOrderStatusList"
-              :key="item.value"
-              :class="isActive === item.value ? 'active' : ''"
-              @click="changeActive(item.value)"
-            >
-              {{ item.label }}
-            </n-button>
-          </div>
-        </n-form-item>
+				<n-form-item label="工单状态：">
+					<div>
+						<n-button
+							v-for="item in workOrderStatusList"
+							:key="item.value"
+							:class="isActive === item.value ? 'active' : ''"
+							@click="changeActive(item.value)"
+						>
+							{{ item.label }}
+						</n-button>
+					</div>
+				</n-form-item>
 
-        <n-form-item label="工序工单号">
-          <n-input
-            v-show="searchForm.workOrderType === 0"
-            v-model:value="searchForm.wiredrawingCode"
-            type="text"
-            placeholder="请输入工序工单号"
-          />
-          <n-input
-            v-show="searchForm.workOrderType === 1"
-            v-model:value="searchForm.enamellingCode"
-            type="text"
-            placeholder="请输入工序工单号"
-          />
-        </n-form-item>
+				<n-form-item label="工序工单号">
+					<n-input
+						v-show="searchForm.workOrderType === 0"
+						v-model:value="searchForm.wiredrawingCode"
+						type="text"
+						placeholder="请输入工序工单号"
+					/>
+					<n-input
+						v-show="searchForm.workOrderType === 1"
+						v-model:value="searchForm.enamellingCode"
+						type="text"
+						placeholder="请输入工序工单号"
+					/>
+				</n-form-item>
 
-        <n-form-item label="规格">
-          <n-input v-model:value="searchForm.specification" type="text" placeholder="请输入规格" />
-        </n-form-item>
+				<n-form-item label="规格">
+					<n-input v-model:value="searchForm.specification" type="text" placeholder="请输入规格" />
+				</n-form-item>
 
-        <n-form-item>
-          <component
-            :is="
+				<n-form-item>
+					<component
+						:is="
               useSearchBtn(
                 () => {
                   search();
@@ -56,63 +56,63 @@
                 }
               )
             "
-          />
-        </n-form-item>
-      </n-form>
-      <n-form inline>
-        <n-form-item label="时间">
-          <n-date-picker v-model:value="range" type="datetimerange" clearable />
-        </n-form-item>
-        <n-form-item label="机台名称">
-          <n-input v-model:value="searchForm.equipmentCode" type="text" placeholder="请输入机台名称" />
-        </n-form-item>
-      </n-form>
-    </my-card>
-    <my-card v-show="workOrderTypeValue === 0" :title="title">
-      <template #right>
-        <div>
-          <CxColumns v-model:columns="lsColumns" />
-        </div>
-      </template>
-      <n-data-table
-        :loading="loading"
-        :columns="lsColumns"
-        :data="lsData"
-        :max-height="dataTableConfig.maxHeight"
-        :scroll-x="dataTableConfig.scrollWidth(lsColumns)"
-      ></n-data-table>
-      <my-pagination v-model:search-form="searchForm" @init="init()"></my-pagination>
-    </my-card>
+					/>
+				</n-form-item>
+			</n-form>
+			<n-form inline>
+				<n-form-item label="时间">
+					<n-date-picker v-model:value="range" type="datetimerange" clearable />
+				</n-form-item>
+				<n-form-item label="机台名称">
+					<n-input v-model:value="searchForm.equipmentCode" type="text" placeholder="请输入机台名称" />
+				</n-form-item>
+			</n-form>
+		</my-card>
+		<my-card v-show="workOrderTypeValue === 0" :title="title">
+			<template #right>
+				<div>
+					<CxColumns v-model:columns="lsColumns" />
+				</div>
+			</template>
+			<n-data-table
+				:loading="loading"
+				:columns="lsColumns"
+				:data="lsData"
+				:max-height="dataTableConfig.maxHeight"
+				:scroll-x="dataTableConfig.scrollWidth(lsColumns)"
+			></n-data-table>
+			<my-pagination v-model:search-form="searchForm" @init="init()"></my-pagination>
+		</my-card>
 
-    <my-card v-show="workOrderTypeValue === 1" :title="title">
-      <template #right>
-        <div>
-          <CxColumns v-model:columns="qbColumns" />
-        </div>
-      </template>
-      <n-data-table
-        :loading="loading"
-        :columns="qbColumns"
-        :data="qbData"
-        :max-height="dataTableConfig.maxHeight"
-        :scroll-x="dataTableConfig.scrollWidth(qbColumns)"
-      ></n-data-table>
-      <my-pagination v-model:search-form="searchForm" @init="init()"></my-pagination>
-    </my-card>
+		<my-card v-show="workOrderTypeValue === 1" :title="title">
+			<template #right>
+				<div>
+					<CxColumns v-model:columns="qbColumns" />
+				</div>
+			</template>
+			<n-data-table
+				:loading="loading"
+				:columns="qbColumns"
+				:data="qbData"
+				:max-height="dataTableConfig.maxHeight"
+				:scroll-x="dataTableConfig.scrollWidth(qbColumns)"
+			></n-data-table>
+			<my-pagination v-model:search-form="searchForm" @init="init()"></my-pagination>
+		</my-card>
 
-    <my-dialog v-model:show="showInputDialog" title="排产" width="800px" @cancel="cancel" @submit="submit">
-      <template #content>
-        <div>
-          <lsIndex :form-model="lsFormModel"></lsIndex>
-        </div>
-      </template>
-    </my-dialog>
-  </div>
+		<my-dialog v-model:show="showInputDialog" title="排产" width="800px" @cancel="cancel" @submit="submit">
+			<template #content>
+				<div>
+					<lsIndex :form-model="lsFormModel"></lsIndex>
+				</div>
+			</template>
+		</my-dialog>
+	</div>
 </template>
 
 <script setup lang="tsx">
 defineOptions({
-  name: 'WorkOrderArrange'
+	name: 'WorkOrderArrange'
 });
 import type { Ref } from 'vue';
 import { ref, onMounted, reactive } from 'vue';
@@ -123,10 +123,10 @@ import { useSearchBtn } from '~/src/hooks/common/useBtn';
 import { useLoading } from '~/src/hooks';
 import { getWiredrawingWorkorder, getEnamellingWorkorderList } from '~/src/service/api/plan';
 import {
-  enamellingUpdateSort,
-  wiredrawingUpdateSort,
-  wiredrawingWorkorderCancel,
-  enamellingWorkorderCancel
+	enamellingUpdateSort,
+	wiredrawingUpdateSort,
+	wiredrawingWorkorderCancel,
+	enamellingWorkorderCancel
 } from '~/src/service/api/produre/workOrderArrange/index';
 import { getStatusName } from '~/src/utils/common/workOrder';
 import { formatDate } from '~/src/utils/form/rule';
@@ -135,28 +135,28 @@ const title = ref<string>('金属眼镜工单-所有');
 const router = useRouter();
 // 工单状态
 const workOrderStatusList = ref<{ label: string; value: number | undefined }[]>([
-  { label: '所有', value: undefined },
-  { label: '已排产', value: 0 },
-  { label: '生产中', value: 1 },
-  { label: '完工', value: 2 },
-  { label: '已作废', value: 3 }
+	{ label: '所有', value: undefined },
+	{ label: '已排产', value: 0 },
+	{ label: '生产中', value: 1 },
+	{ label: '完工', value: 2 },
+	{ label: '已作废', value: 3 }
 ]);
 // 工单类型
 const workOrderType = [
-  { label: '金属眼镜工单', value: 0 },
-  { label: '板材眼镜工单', value: 1 }
+	{ label: '金属眼镜工单', value: 0 },
+	{ label: '板材眼镜工单', value: 1 }
 ];
 
 const searchForm = ref<workOrderArrange.searchForm>({
-  status: undefined,
-  pageNum: 1,
-  pageSize: 10,
-  total: 0,
-  workOrderType: 0,
-  wiredrawingCode: '',
-  specification: '',
-  equipmentCode: '',
-  enamellingCode: ''
+	status: undefined,
+	pageNum: 1,
+	pageSize: 10,
+	total: 0,
+	workOrderType: 0,
+	wiredrawingCode: '',
+	specification: '',
+	equipmentCode: '',
+	enamellingCode: ''
 });
 
 const isActive = ref<number | undefined>(undefined);
@@ -168,513 +168,513 @@ const showInputDialog = ref<boolean>(false);
 const lsData = ref<workOrderArrange.lsTabelList[]>([]);
 
 const lsFormModel = reactive<feedRecords.TabelList>({
-  id: null,
-  taskType: '',
-  workstationName: '',
-  orderType: '', // 订单类型
-  orderSn: '',
-  clientName: '',
-  workorderSn: '',
-  taskSn: '',
-  productModel: '',
-  productSpecification: '',
-  inputWeight: null,
-  measureName: '',
-  createTime: '',
-  createBy: '',
-  partNumber: '',
-  batchCode: '',
-  itemSpecification: '',
-  axleNumber: '',
-  alexPositionNumber: ''
+	id: null,
+	taskType: '',
+	workstationName: '',
+	orderType: '', // 订单类型
+	orderSn: '',
+	clientName: '',
+	workorderSn: '',
+	taskSn: '',
+	productModel: '',
+	productSpecification: '',
+	inputWeight: null,
+	measureName: '',
+	createTime: '',
+	createBy: '',
+	partNumber: '',
+	batchCode: '',
+	itemSpecification: '',
+	axleNumber: '',
+	alexPositionNumber: ''
 });
 
 const message = useMessage();
 
 const lsColumns: Ref<DataTableColumns<workOrderArrange.lsTabelList>> = ref([
-  {
-    title: '序号',
-    key: 'index',
-    align: 'center',
-    width: 70,
-    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
-  },
-  {
-    title: '创建时间',
-    align: 'center',
-    width: 170,
-    key: 'createTime'
-  },
-  {
-    title: '工单类型',
-    align: 'center',
-    width: 120,
-    key: '',
-    render: () => {
-      return '金属眼镜工单';
-    }
-  },
-  {
-    title: '订单类型',
-    key: 'orderType',
-    align: 'center',
-    width: 100,
-    render: row => {
-      return row.orderType === '0' ? '客户订单' : '备库订单';
-    }
-  },
-  {
-    title: '客户',
-    align: 'center',
-    width: 160,
-    key: 'customerName',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '工序工单',
-    align: 'center',
-    width: 180,
-    key: 'wiredrawingCode',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '开始机台',
-    align: 'center',
-    width: 160,
-    key: 'equipmentCode',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '产品型号',
-    align: 'center',
-    width: 100,
-    key: 'model'
-  },
+	{
+		title: '序号',
+		key: 'index',
+		align: 'center',
+		width: 70,
+		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
+	},
+	{
+		title: '创建时间',
+		align: 'center',
+		width: 170,
+		key: 'createTime'
+	},
+	{
+		title: '工单类型',
+		align: 'center',
+		width: 120,
+		key: '',
+		render: () => {
+			return '金属眼镜工单';
+		}
+	},
+	{
+		title: '订单类型',
+		key: 'orderType',
+		align: 'center',
+		width: 100,
+		render: row => {
+			return row.orderType === '0' ? '客户订单' : '备库订单';
+		}
+	},
+	{
+		title: '客户',
+		align: 'center',
+		width: 160,
+		key: 'customerName',
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '工序工单',
+		align: 'center',
+		width: 180,
+		key: 'wiredrawingCode',
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '开始机台',
+		align: 'center',
+		width: 160,
+		key: 'equipmentCode',
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '产品型号',
+		align: 'center',
+		width: 100,
+		key: 'model'
+	},
 
-  {
-    title: '产品规格',
-    align: 'center',
-    width: 100,
-    key: 'specification'
-  },
+	{
+		title: '产品规格',
+		align: 'center',
+		width: 100,
+		key: 'specification'
+	},
 
-  {
-    title: '重量(kg)',
-    align: 'center',
-    width: 100,
-    key: 'weight'
-  },
+	{
+		title: '数量(付)',
+		align: 'center',
+		width: 100,
+		key: 'weight'
+	},
 
-  {
-    title: '盘数',
-    align: 'center',
-    width: 100,
-    key: 'discNumber'
-  },
-  {
-    title: '开始时间',
-    align: 'center',
-    width: 180,
-    key: 'startTime'
-  },
-  {
-    title: '结束时间',
-    align: 'center',
-    width: 180,
-    key: 'endTime'
-  },
-  {
-    title: '特殊要求',
-    align: 'center',
-    width: 100,
-    key: 'remark'
-  },
-  {
-    title: '状态',
-    align: 'center',
-    width: 100,
-    key: 'status',
-    fixed: 'right',
-    render: row => {
-      const statusInfo = getStatusName(row.status);
-      return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
-    }
-  },
-  {
-    title: '操作',
-    align: 'center',
-    width: 220,
-    key: 'action',
-    fixed: 'right',
-    render: row => {
-      if (row.status === '0') {
-        return (
-          <n-space>
-            <n-popconfirm onPositiveClick={() => priority(row.id, wiredrawingUpdateSort)}>
-              {{
-                default: () => '确认优先吗>',
-                trigger: () => <n-button type="success">优先</n-button>
-              }}
-            </n-popconfirm>
-            <n-popconfirm onPositiveClick={() => handleDeleteItemTypeLs(row.id, wiredrawingWorkorderCancel)}>
-              {{
-                default: () => '确认作废吗>',
-                trigger: () => <n-button type="warning">作废</n-button>
-              }}
-            </n-popconfirm>
-          </n-space>
-        );
-      }
-      return (
-        <n-space>
-          <n-button
-            type="info"
-            v-show={row.status === '1' || row.status === '2'}
-            onClick={() => {
-              router.push({
-                name: 'produce_feed',
-                query: { id: row.id, title: '金属眼镜' }
-              });
-            }}
-          >
-            投料记录
-          </n-button>
-          <n-button
-            type="info"
-            v-show={row.status === '1' || row.status === '2'}
-            onClick={() => {
-              router.push({
-                name: 'produce_report',
-                query: { id: row.id, title: '金属眼镜' }
-              });
-            }}
-          >
-            报工记录
-          </n-button>
-        </n-space>
-      );
-    }
-  }
+	// {
+	//   title: '盘数',
+	//   align: 'center',
+	//   width: 100,
+	//   key: 'discNumber'
+	// },
+	{
+		title: '开始时间',
+		align: 'center',
+		width: 180,
+		key: 'startTime'
+	},
+	{
+		title: '结束时间',
+		align: 'center',
+		width: 180,
+		key: 'endTime'
+	},
+	{
+		title: '特殊要求',
+		align: 'center',
+		width: 100,
+		key: 'remark'
+	},
+	{
+		title: '状态',
+		align: 'center',
+		width: 100,
+		key: 'status',
+		fixed: 'right',
+		render: row => {
+			const statusInfo = getStatusName(row.status);
+			return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
+		}
+	},
+	{
+		title: '操作',
+		align: 'center',
+		width: 220,
+		key: 'action',
+		fixed: 'right',
+		render: row => {
+			if (row.status === '0') {
+				return (
+					<n-space>
+						<n-popconfirm onPositiveClick={() => priority(row.id, wiredrawingUpdateSort)}>
+							{{
+								default: () => '确认优先吗>',
+								trigger: () => <n-button type="success">优先</n-button>
+							}}
+						</n-popconfirm>
+						<n-popconfirm onPositiveClick={() => handleDeleteItemTypeLs(row.id, wiredrawingWorkorderCancel)}>
+							{{
+								default: () => '确认作废吗>',
+								trigger: () => <n-button type="warning">作废</n-button>
+							}}
+						</n-popconfirm>
+					</n-space>
+				);
+			}
+			return (
+				<n-space>
+					<n-button
+						type="info"
+						v-show={row.status === '1' || row.status === '2'}
+						onClick={() => {
+							router.push({
+								name: 'produce_feed',
+								query: { id: row.id, title: '金属眼镜' }
+							});
+						}}
+					>
+						投料记录
+					</n-button>
+					<n-button
+						type="info"
+						v-show={row.status === '1' || row.status === '2'}
+						onClick={() => {
+							router.push({
+								name: 'produce_report',
+								query: { id: row.id, title: '金属眼镜' }
+							});
+						}}
+					>
+						报工记录
+					</n-button>
+				</n-space>
+			);
+		}
+	}
 ]);
 
 const qbData = ref<workOrderArrange.qbTabelList[]>([]);
 
 const qbColumns: Ref<DataTableColumns<workOrderArrange.qbTabelList>> = ref([
-  {
-    title: '序号',
-    key: 'index',
-    align: 'center',
-    width: 70,
-    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
-  },
-  {
-    title: '创建时间',
-    align: 'center',
-    width: 170,
-    key: 'createTime'
-  },
-  {
-    title: '工单类型',
-    align: 'center',
-    width: 120,
-    key: '',
-    render: () => {
-      return <n-space>{'板材眼镜工单'}</n-space>;
-    }
-  },
-  {
-    title: '订单类型',
-    align: 'center',
-    width: 100,
-    key: 'orderType',
-    render: row => {
-      return <n-space>{row.orderType === '0' ? '客户订单' : '备库订单'}</n-space>;
-    }
-  },
-  {
-    title: '客户',
-    align: 'center',
-    width: 140,
-    key: 'customerName',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '工序工单',
-    align: 'center',
-    width: 140,
-    key: 'enamellingCode',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '结束机台',
-    align: 'center',
-    width: 100,
-    key: 'equipmentCode'
-  },
-  // {
-  //   title: '位置',
-  //   align: 'center',
-  //   width: 100,
-  //   key: 'axleNumber'
-  // },
-  // {
-  //   title: '线盘',
-  //   align: 'center',
-  //   width: 150,
-  //   key: 'wireDisc'
-  // },
-  // {
-  //   title: '油漆',
-  //   align: 'center',
-  //   width: 140,
-  //   key: 'plantName',
-  //   ellipsis: {
-  //     tooltip: true
-  //   }
-  // },
-  {
-    title: '型号',
-    align: 'center',
-    width: 140,
-    key: 'model',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '产品规格',
-    align: 'center',
-    width: 100,
-    key: 'specification'
-  },
+	{
+		title: '序号',
+		key: 'index',
+		align: 'center',
+		width: 70,
+		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
+	},
+	{
+		title: '创建时间',
+		align: 'center',
+		width: 170,
+		key: 'createTime'
+	},
+	{
+		title: '工单类型',
+		align: 'center',
+		width: 120,
+		key: '',
+		render: () => {
+			return <n-space>{'板材眼镜工单'}</n-space>;
+		}
+	},
+	{
+		title: '订单类型',
+		align: 'center',
+		width: 100,
+		key: 'orderType',
+		render: row => {
+			return <n-space>{row.orderType === '0' ? '客户订单' : '备库订单'}</n-space>;
+		}
+	},
+	{
+		title: '客户',
+		align: 'center',
+		width: 140,
+		key: 'customerName',
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '工序工单',
+		align: 'center',
+		width: 140,
+		key: 'enamellingCode',
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '结束机台',
+		align: 'center',
+		width: 100,
+		key: 'equipmentCode'
+	},
+	// {
+	//   title: '位置',
+	//   align: 'center',
+	//   width: 100,
+	//   key: 'axleNumber'
+	// },
+	// {
+	//   title: '线盘',
+	//   align: 'center',
+	//   width: 150,
+	//   key: 'wireDisc'
+	// },
+	// {
+	//   title: '油漆',
+	//   align: 'center',
+	//   width: 140,
+	//   key: 'plantName',
+	//   ellipsis: {
+	//     tooltip: true
+	//   }
+	// },
+	{
+		title: '型号',
+		align: 'center',
+		width: 140,
+		key: 'model',
+		ellipsis: {
+			tooltip: true
+		}
+	},
+	{
+		title: '产品规格',
+		align: 'center',
+		width: 100,
+		key: 'specification'
+	},
 
-  {
-    title: '重量(kg)',
-    align: 'center',
-    width: 100,
-    key: 'weight'
-  },
+	{
+		title: '重量(kg)',
+		align: 'center',
+		width: 100,
+		key: 'weight'
+	},
 
-  {
-    title: '盘数',
-    align: 'center',
-    width: 100,
-    key: 'discNumber'
-  },
-  {
-    title: '开始时间',
-    align: 'center',
-    width: 180,
-    key: 'startTime'
-  },
-  {
-    title: '结束时间',
-    align: 'center',
-    width: 180,
-    key: 'endTime'
-  },
-  {
-    title: '特殊要求',
-    align: 'center',
-    width: 100,
-    key: 'remark'
-  },
-  {
-    title: '状态',
-    align: 'center',
-    width: 100,
-    key: 'status',
-    fixed: 'right',
-    render: row => {
-      const statusInfo = getStatusName(row.status);
-      return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
-    }
-  },
-  {
-    title: '操作',
-    align: 'center',
-    width: 220,
-    key: 'action',
-    fixed: 'right',
-    render: row => {
-      if (row.status === '0') {
-        return (
-          <n-space>
-            <n-popconfirm onPositiveClick={() => priority(row.id, enamellingUpdateSort)}>
-              {{
-                default: () => '确认优先吗>',
-                trigger: () => <n-button type="success">优先</n-button>
-              }}
-            </n-popconfirm>
-            <n-popconfirm onPositiveClick={() => handleDeleteItemTypeLs(row.id, enamellingWorkorderCancel)}>
-              {{
-                default: () => '确认作废吗>',
-                trigger: () => <n-button type="warning">作废</n-button>
-              }}
-            </n-popconfirm>
-          </n-space>
-        );
-      }
-      return (
-        <n-space>
-          <n-button
-            type="info"
-            v-show={row.status === '1' || row.status === '2'}
-            onClick={() => {
-              router.push({
-                name: 'produce_feed',
-                query: { id: row.id, title: '板材眼镜' }
-              });
-            }}
-          >
-            投料记录
-          </n-button>
-          <n-button
-            type="info"
-            v-show={row.status === '1' || row.status === '2'}
-            onClick={() => {
-              router.push({
-                name: 'produce_report',
-                query: { id: row.id, title: '板材眼镜' }
-              });
-            }}
-          >
-            报工记录
-          </n-button>
-        </n-space>
-      );
-    }
-  }
+	{
+		title: '盘数',
+		align: 'center',
+		width: 100,
+		key: 'discNumber'
+	},
+	{
+		title: '开始时间',
+		align: 'center',
+		width: 180,
+		key: 'startTime'
+	},
+	{
+		title: '结束时间',
+		align: 'center',
+		width: 180,
+		key: 'endTime'
+	},
+	{
+		title: '特殊要求',
+		align: 'center',
+		width: 100,
+		key: 'remark'
+	},
+	{
+		title: '状态',
+		align: 'center',
+		width: 100,
+		key: 'status',
+		fixed: 'right',
+		render: row => {
+			const statusInfo = getStatusName(row.status);
+			return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
+		}
+	},
+	{
+		title: '操作',
+		align: 'center',
+		width: 220,
+		key: 'action',
+		fixed: 'right',
+		render: row => {
+			if (row.status === '0') {
+				return (
+					<n-space>
+						<n-popconfirm onPositiveClick={() => priority(row.id, enamellingUpdateSort)}>
+							{{
+								default: () => '确认优先吗>',
+								trigger: () => <n-button type="success">优先</n-button>
+							}}
+						</n-popconfirm>
+						<n-popconfirm onPositiveClick={() => handleDeleteItemTypeLs(row.id, enamellingWorkorderCancel)}>
+							{{
+								default: () => '确认作废吗>',
+								trigger: () => <n-button type="warning">作废</n-button>
+							}}
+						</n-popconfirm>
+					</n-space>
+				);
+			}
+			return (
+				<n-space>
+					<n-button
+						type="info"
+						v-show={row.status === '1' || row.status === '2'}
+						onClick={() => {
+							router.push({
+								name: 'produce_feed',
+								query: { id: row.id, title: '板材眼镜' }
+							});
+						}}
+					>
+						投料记录
+					</n-button>
+					<n-button
+						type="info"
+						v-show={row.status === '1' || row.status === '2'}
+						onClick={() => {
+							router.push({
+								name: 'produce_report',
+								query: { id: row.id, title: '板材眼镜' }
+							});
+						}}
+					>
+						报工记录
+					</n-button>
+				</n-space>
+			);
+		}
+	}
 ]);
 
 function search(): void {
-  workOrderTypeValue.value = searchForm.value.workOrderType;
-  if (searchForm.value.status !== undefined) {
-    title.value = `${workOrderType[searchForm.value.workOrderType].label}-${
-      workOrderStatusList.value[searchForm.value.status + 1].label
-    }`;
-  } else {
-    title.value = `${workOrderType[searchForm.value.workOrderType].label}-全部`;
-  }
-  if (range.value !== null) {
-    searchForm.value['params[beginTime]'] = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
-    searchForm.value['params[endTime]'] = formatDate(new Date(range.value[1]), 'yyyy-MM-dd');
-  } else {
-    searchForm.value['params[beginTime]'] = null;
-    searchForm.value['params[endTime]'] = null;
-  }
-  init();
+	workOrderTypeValue.value = searchForm.value.workOrderType;
+	if (searchForm.value.status !== undefined) {
+		title.value = `${workOrderType[searchForm.value.workOrderType].label}-${
+			workOrderStatusList.value[searchForm.value.status + 1].label
+		}`;
+	} else {
+		title.value = `${workOrderType[searchForm.value.workOrderType].label}-全部`;
+	}
+	if (range.value !== null) {
+		searchForm.value['params[beginTime]'] = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
+		searchForm.value['params[endTime]'] = formatDate(new Date(range.value[1]), 'yyyy-MM-dd');
+	} else {
+		searchForm.value['params[beginTime]'] = null;
+		searchForm.value['params[endTime]'] = null;
+	}
+	init();
 }
 function reset(): void {
-  searchForm.value = {
-    status: undefined,
-    pageNum: 1,
-    pageSize: 10,
-    total: 0,
-    workOrderType: 0,
-    wiredrawingCode: '',
-    specification: '',
-    equipmentCode: '',
-    enamellingCode: ''
-  };
-  isActive.value = undefined;
-  range.value = null;
-  search();
+	searchForm.value = {
+		status: undefined,
+		pageNum: 1,
+		pageSize: 10,
+		total: 0,
+		workOrderType: 0,
+		wiredrawingCode: '',
+		specification: '',
+		equipmentCode: '',
+		enamellingCode: ''
+	};
+	isActive.value = undefined;
+	range.value = null;
+	search();
 }
 
 function cancel() {
-  showInputDialog.value = false;
+	showInputDialog.value = false;
 }
 
 function submit() {
-  showInputDialog.value = false;
+	showInputDialog.value = false;
 }
 
 function changeWorkOrderStatus(val): void {
-  if (searchForm.value.workOrderType === val) return;
-  if (val === 0) {
-    workOrderStatusList.value = [
-      { label: '全部', value: undefined },
-      { label: '已排产', value: 0 },
-      { label: '生产中', value: 1 },
-      { label: '已完工', value: 2 },
-      { label: '已作废', value: 3 }
-    ];
-  } else {
-    workOrderStatusList.value = [
-      { label: '全部', value: undefined },
-      { label: '已排产', value: 0 },
-      { label: '生产中', value: 1 },
-      { label: '已完工', value: 2 },
-      { label: '已作废', value: 3 }
-    ];
-  }
-  searchForm.value.workOrderType = val;
-  search();
+	if (searchForm.value.workOrderType === val) return;
+	if (val === 0) {
+		workOrderStatusList.value = [
+			{ label: '全部', value: undefined },
+			{ label: '已排产', value: 0 },
+			{ label: '生产中', value: 1 },
+			{ label: '已完工', value: 2 },
+			{ label: '已作废', value: 3 }
+		];
+	} else {
+		workOrderStatusList.value = [
+			{ label: '全部', value: undefined },
+			{ label: '已排产', value: 0 },
+			{ label: '生产中', value: 1 },
+			{ label: '已完工', value: 2 },
+			{ label: '已作废', value: 3 }
+		];
+	}
+	searchForm.value.workOrderType = val;
+	search();
 }
 
 async function priority(id: number, func: any) {
-  const res = await func(id);
-  if (res.code === 200) {
-    message.success('优先成功');
-    init();
-  }
+	const res = await func(id);
+	if (res.code === 200) {
+		message.success('优先成功');
+		init();
+	}
 }
 
 function handleDeleteItemTypeLs(id: number, func: any) {
-  func(id).then(res => {
-    if (res.code === 200) {
-      message.success('作废成功');
-      init();
-    }
-  });
+	func(id).then(res => {
+		if (res.code === 200) {
+			message.success('作废成功');
+			init();
+		}
+	});
 }
 
 function changeActive(num: number | undefined): void {
-  isActive.value = num;
-  searchForm.value.status = num;
-  search();
+	isActive.value = num;
+	searchForm.value.status = num;
+	search();
 }
 
 function init(): void {
-  startLoading();
-  if (searchForm.value.workOrderType === 0) {
-    getWiredrawingWorkorder({ ...searchForm.value }).then(res => {
-      if (res.code === 200) {
-        searchForm.value.total = res.total;
-        lsData.value = res.rows;
-      }
-      endLoading();
-    });
-  } else {
-    getEnamellingWorkorderList({ ...searchForm.value }).then(res => {
-      if (res.code === 200) {
-        searchForm.value.total = res.total;
-        qbData.value = res.rows;
-      }
-      endLoading();
-    });
-  }
+	startLoading();
+	if (searchForm.value.workOrderType === 0) {
+		getWiredrawingWorkorder({ ...searchForm.value }).then(res => {
+			if (res.code === 200) {
+				searchForm.value.total = res.total;
+				lsData.value = res.rows;
+			}
+			endLoading();
+		});
+	} else {
+		getEnamellingWorkorderList({ ...searchForm.value }).then(res => {
+			if (res.code === 200) {
+				searchForm.value.total = res.total;
+				qbData.value = res.rows;
+			}
+			endLoading();
+		});
+	}
 }
 
 onMounted(() => {
-  init();
+	init();
 });
 </script>
 
 <style scoped>
 .active {
-  background-color: blue !important;
-  color: #fff !important;
+	background-color: blue !important;
+	color: #fff !important;
 }
 </style>
diff --git a/src/views/storage/materialstock/index.vue b/src/views/storage/materialstock/index.vue
index d8b990e..029eeb4 100644
--- a/src/views/storage/materialstock/index.vue
+++ b/src/views/storage/materialstock/index.vue
@@ -1,151 +1,151 @@
 <template>
-  <div class="h-full">
-    <n-card title="库存查询" :bordered="false" class="h-full rounded-8px shadow-sm">
-      <n-space vertical>
-        <n-space>
-          <n-form
-            ref="formRef"
-            inline
-            :model="formValue"
-            label-placement="left"
-            label-align="center"
-            label-width="auto"
-            require-mark-placement="right-hanging"
-          >
-            <n-form-item label="物料编码" path="Item.ItemCode" :label-style="labelStyle">
-              <n-input v-model:value="formValue.itemCode" placeholder="请输入物料编码" />
-            </n-form-item>
-            <n-form-item label="物料名称" path="Item.ItemName" :label-style="labelStyle">
-              <n-input v-model:value="formValue.itemName" placeholder="请输入物料名称" />
-            </n-form-item>
-            <n-form-item label="入库批次号" path="Item.batchCode" :label-style="labelStyle">
-              <n-input v-model:value="formValue.batchCode" placeholder="请输入库批次号" />
-            </n-form-item>
-            <!-- <n-form-item label="仓库名称" path="Item.warehouseName" :label-style="labelStyle">
-              <n-input v-model:value="formValue.warehouseName" placeholder="请输入仓库名称" />
-            </n-form-item> -->
+	<div class="h-full">
+		<n-card title="库存查询" :bordered="false" class="h-full rounded-8px shadow-sm">
+			<n-space vertical>
+				<n-space>
+					<n-form
+						ref="formRef"
+						inline
+						:model="formValue"
+						label-placement="left"
+						label-align="center"
+						label-width="auto"
+						require-mark-placement="right-hanging"
+					>
+						<n-form-item label="物料编码" path="Item.ItemCode" :label-style="labelStyle">
+							<n-input v-model:value="formValue.itemCode" placeholder="请输入物料编码" />
+						</n-form-item>
+						<n-form-item label="物料名称" path="Item.ItemName" :label-style="labelStyle">
+							<n-input v-model:value="formValue.itemName" placeholder="请输入物料名称" />
+						</n-form-item>
+						<n-form-item label="入库批次号" path="Item.batchCode" :label-style="labelStyle">
+							<n-input v-model:value="formValue.batchCode" placeholder="请输入库批次号" />
+						</n-form-item>
+						<!-- <n-form-item label="仓库名称" path="Item.warehouseName" :label-style="labelStyle">
+							<n-input v-model:value="formValue.warehouseName" placeholder="请输入仓库名称" />
+						</n-form-item> -->
 
-            <!-- <n-form-item label="入库日期" path="Item.recptDate" :label-style="labelStyle">
-              <n-date-picker v-model:value="formValue.recptDate" type="date" :format="format" />
-            </n-form-item> -->
-            <n-form-item label="仓库名称">
-              <n-select
-                v-model:value="formValue.warehouseId"
-                :options="opetions"
-                class="w-180px"
-                placeholder="请选择仓库名称"
-              ></n-select>
-            </n-form-item>
-            <n-form-item label="规格型号" path="Item.specification" :label-style="labelStyle">
-              <n-input v-model:value="formValue.specification" placeholder="请输入规格型号" />
-            </n-form-item>
-            <n-form-item label="类型" :label-style="labelStyle">
-              <n-select
-                v-model:value="formValue.attr1"
-                placeholder="请选择类型"
-                class="w-180px"
-                :options="statusList"
-              ></n-select>
-            </n-form-item>
-            <n-form-item label="入库日期" path="daterange" :label-style="labelStyle">
-              <n-date-picker v-model:value="daterange" type="daterange" :format="format" />
-            </n-form-item>
-            <n-form-item>
-              <n-button type="primary" attr-type="button" @click="handleSearchClick">搜索</n-button>
-            </n-form-item>
-            <n-form-item>
-              <n-button type="default" attr-type="button" @click="handleResetClick">重置</n-button>
-            </n-form-item>
-          </n-form>
-        </n-space>
-        <div>
-          <n-data-table
-            :loading="loading"
-            :columns="columns"
-            :data="tableData"
-            :expanded-row-keys="expandedRows"
-            :max-height="dataTableConfig.maxHeight"
-            :scroll-x="dataTableConfig.scrollWidth(columns)"
-            striped
-          />
-        </div>
-        <my-pagination v-model:search-form="formValue" class="mr-10" @init="getTableData"></my-pagination>
-      </n-space>
-    </n-card>
+						<!-- <n-form-item label="入库日期" path="Item.recptDate" :label-style="labelStyle">
+							<n-date-picker v-model:value="formValue.recptDate" type="date" :format="format" />
+						</n-form-item> -->
+						<n-form-item label="仓库名称">
+							<n-select
+								v-model:value="formValue.warehouseId"
+								:options="opetions"
+								class="w-180px"
+								placeholder="请选择仓库名称"
+							></n-select>
+						</n-form-item>
+						<n-form-item label="规格型号" path="Item.specification" :label-style="labelStyle">
+							<n-input v-model:value="formValue.specification" placeholder="请输入规格型号" />
+						</n-form-item>
+						<!--            <n-form-item label="类型" :label-style="labelStyle">-->
+						<!--              <n-select-->
+						<!--                v-model:value="formValue.attr1"-->
+						<!--                placeholder="请选择类型"-->
+						<!--                class="w-180px"-->
+						<!--                :options="statusList"-->
+						<!--              ></n-select>-->
+						<!--            </n-form-item>-->
+						<n-form-item label="入库日期" path="daterange" :label-style="labelStyle">
+							<n-date-picker v-model:value="daterange" type="daterange" :format="format" />
+						</n-form-item>
+						<n-form-item>
+							<n-button type="primary" attr-type="button" @click="handleSearchClick">搜索</n-button>
+						</n-form-item>
+						<n-form-item>
+							<n-button type="default" attr-type="button" @click="handleResetClick">重置</n-button>
+						</n-form-item>
+					</n-form>
+				</n-space>
+				<div>
+					<n-data-table
+						:loading="loading"
+						:columns="columns"
+						:data="tableData"
+						:expanded-row-keys="expandedRows"
+						:max-height="dataTableConfig.maxHeight"
+						:scroll-x="dataTableConfig.scrollWidth(columns)"
+						striped
+					/>
+				</div>
+				<my-pagination v-model:search-form="formValue" class="mr-10" @init="getTableData"></my-pagination>
+			</n-space>
+		</n-card>
 
-    <my-dialog
-      v-model:show="detail"
-      sub-text="关闭"
-      width="1200px"
-      title="订单明细"
-      :show-cancel="false"
-      @cancel="closeDetail"
-      @submit="closeDetail"
-    >
-      <template #content>
-        <div>
-          <n-data-table
-            class="w-1000px"
-            :loading="detailLoading"
-            :columns="detailColumns"
-            :data="detailData"
-          ></n-data-table>
-        </div>
-      </template>
-    </my-dialog>
-    <my-dialog v-model:show="flag" title="设置预警值" width="600px" @cancel="cancel" @submit="submit">
-      <template #content>
-        <n-form label-placement="left" label-width="90px" label-align="left">
-          <n-form-item label="物料名称：">
-            <span>{{ formData.itemName }}</span>
-          </n-form-item>
-          <n-form-item label="预警值">
-            <n-input-number v-model:value="formData.waringValue" type="number" :min="0" placeholder="请输入预警值" />
-          </n-form-item>
-        </n-form>
-      </template>
-    </my-dialog>
+		<my-dialog
+			v-model:show="detail"
+			sub-text="关闭"
+			width="1200px"
+			title="订单明细"
+			:show-cancel="false"
+			@cancel="closeDetail"
+			@submit="closeDetail"
+		>
+			<template #content>
+				<div>
+					<n-data-table
+						class="w-1000px"
+						:loading="detailLoading"
+						:columns="detailColumns"
+						:data="detailData"
+					></n-data-table>
+				</div>
+			</template>
+		</my-dialog>
+		<my-dialog v-model:show="flag" title="设置预警值" width="600px" @cancel="cancel" @submit="submit">
+			<template #content>
+				<n-form label-placement="left" label-width="90px" label-align="left">
+					<n-form-item label="物料名称：">
+						<span>{{ formData.itemName }}</span>
+					</n-form-item>
+					<n-form-item label="预警值">
+						<n-input-number v-model:value="formData.waringValue" type="number" :min="0" placeholder="请输入预警值" />
+					</n-form-item>
+				</n-form>
+			</template>
+		</my-dialog>
 
-    <my-dialog
-      v-model:show="handleEditShow"
-      sub-text="关闭"
-      width="500px"
-      title="编辑"
-      :show-cancel="true"
-      @cancel="handleEditShow = false"
-      @submit="submitHandleEdit"
-    >
-      <template #content>
-        <n-form
-          ref="handleEditRef"
-          label-placement="left"
-          label-width="90px"
-          label-align="left"
-          :rules="rules"
-          :model="handleEditRow"
-        >
-          <n-form-item label="库存重量" path="afterWeight">
-            <n-input-number
-              v-model:value="handleEditRow.afterWeight"
-              type="number"
-              :min="0"
-              placeholder="请输入库存重量"
-              class="w-300px"
-            />
-          </n-form-item>
-          <n-form-item label="库存数量" path="afterQuantity">
-            <n-input-number
-              v-model:value="handleEditRow.afterQuantity"
-              type="number"
-              :min="0"
-              placeholder="请输入库存数量"
-              class="w-300px"
-            />
-          </n-form-item>
-        </n-form>
-      </template>
-    </my-dialog>
-  </div>
+		<my-dialog
+			v-model:show="handleEditShow"
+			sub-text="关闭"
+			width="500px"
+			title="编辑"
+			:show-cancel="true"
+			@cancel="handleEditShow = false"
+			@submit="submitHandleEdit"
+		>
+			<template #content>
+				<n-form
+					ref="handleEditRef"
+					label-placement="left"
+					label-width="90px"
+					label-align="left"
+					:rules="rules"
+					:model="handleEditRow"
+				>
+					<n-form-item label="库存重量" path="afterWeight">
+						<n-input-number
+							v-model:value="handleEditRow.afterWeight"
+							type="number"
+							:min="0"
+							placeholder="请输入库存重量"
+							class="w-300px"
+						/>
+					</n-form-item>
+					<n-form-item label="库存数量" path="afterQuantity">
+						<n-input-number
+							v-model:value="handleEditRow.afterQuantity"
+							type="number"
+							:min="0"
+							placeholder="请输入库存数量"
+							class="w-300px"
+						/>
+					</n-form-item>
+				</n-form>
+			</template>
+		</my-dialog>
+	</div>
 </template>
 
 <script lang="tsx" setup>
@@ -155,10 +155,10 @@ import { useMessage, NTag, useDialog } from 'naive-ui';
 import { useLoading } from '@/hooks';
 import { formatDate, addDateRange, createRequiredFormRule } from '@/utils';
 import {
-  fetchMaterialStockList,
-  selectAll,
-  updateWaringValue,
-  deleteTransaction
+	fetchMaterialStockList,
+	selectAll,
+	updateWaringValue,
+	deleteTransaction
 } from '@/service/api/wms/materialstock';
 import { dataTableConfig } from '@/config/dataTableConfig';
 import { useInfoBtn } from '@/hooks/common/useBtn';
@@ -168,8 +168,8 @@ const { loading, startLoading, endLoading } = useLoading(false);
 
 // let allRowKeysArr: string[] = [];
 type selectList = {
-  label: string;
-  value: number;
+	label: string;
+	value: number;
 };
 const expandedRows = ref(['200']);
 const expandedSwitchshow = ref(true);
@@ -181,61 +181,60 @@ const tableData = ref<ApiMaterialStockManagement.materialStock[]>([]);
 const itemName = ref<string>('');
 const message = useMessage();
 function setTableData(data: ApiMaterialStockManagement.materialStock[]) {
-  tableData.value = data;
+	tableData.value = data;
 }
 const formData = ref<any>({
-  itemName: '',
-  itemCode: '',
-  waringValue: null
+	itemName: '',
+	itemCode: '',
+	waringValue: null
 });
 const formValue = ref({
-  pageNum: 1,
-  pageSize: 10,
-  total: 0,
-  itemName: '',
-  itemCode: '',
-  batchCode: '',
-  warehouseName: '',
-  vendorCode: '',
-  vendorName: '',
-  recptDate: null,
-  specification: '',
-  attr1: null,
-  warehouseId: null
+	pageNum: 1,
+	pageSize: 10,
+	total: 0,
+	itemName: '',
+	itemCode: '',
+	batchCode: '',
+	warehouseName: '',
+	vendorCode: '',
+	vendorName: '',
+	recptDate: null,
+	specification: '',
+	attr1: null,
+	warehouseId: null
 });
 function changeType(str: any) {
-  if (str === '0') {
-    return 'default';
-  } else if (str === '1') {
-    return 'warning';
-  } else if (str === '2') {
-    return 'info';
-  } else if (str === '3') {
-    return 'success';
-  }
-  return 'error';
+	if (str === '0') {
+		return 'default';
+	} else if (str === '1') {
+		return 'warning';
+	} else if (str === '2') {
+		return 'info';
+	} else if (str === '3') {
+		return 'success';
+	}
+	return 'error';
 }
 function getStatus(status: string) {
-  if (status === '0') return '铜丝在制品';
-  if (status === '1') return '漆包在制品';
-  if (status === '2') return '辅料';
-  if (status === '3') return '成品';
-  return '';
+	if (status === '0' || status === '1') return '半成品';
+	if (status === '2') return '辅料';
+	if (status === '3') return '成品';
+	return '';
 }
 const labelStyle = reactive({
-  backgroundColor: '#F8F8F8',
-  border: '1px solid #E0E0E6',
-  borderRight: 'none',
-  marginRight: '-2px',
-  padding: '0 15px',
-  width: '140px'
+	backgroundColor: '#F8F8F8',
+	border: '1px solid #E0E0E6',
+	borderRight: 'none',
+	marginRight: '-2px',
+	padding: '0 15px',
+	width: '140px'
 });
-const statusList = ref<Array<{ label: string; value: string }>>([
-  { label: '铜丝在制品', value: '0' },
-  { label: '漆包在制品', value: '1' },
-  { label: '辅料', value: '2' },
-  { label: '成品', value: '3' }
-]);
+// const statusList = ref<Array<{ label: string; value: string }>>([
+//   { label: '铜丝在制品', value: '0' },
+//   { label: '漆包在制品', value: '1' },
+//   { label: '辅料', value: '2' },
+//   { label: '成品', value: '3' }
+// ]);
 const detailLoading = ref<boolean>(false);
 const detail = ref<boolean>(false);
 const dialog = useDialog();
@@ -243,366 +242,366 @@ const handleEditRow = ref<any>(null);
 const handleEditShow = ref<boolean>(false);
 const handleEditRef = ref<FormInst | null>(null);
 const rules = {
-  afterWeight: createRequiredFormRule('请输入库存重量'),
-  afterQuantity: createRequiredFormRule('请输入库存数量')
+	afterWeight: createRequiredFormRule('请输入库存重量'),
+	afterQuantity: createRequiredFormRule('请输入库存数量')
 };
 
 function closeDetail() {
-  detail.value = false;
+	detail.value = false;
 }
 const detailData = ref<Procure.rawProcureList.listType[]>([]);
 
 const statusMap = {
-  1: {
-    key: 'error',
-    label: '出库'
-  },
-  2: {
-    key: 'success',
-    label: '入库'
-  }
+	1: {
+		key: 'error',
+		label: '出库'
+	},
+	2: {
+		key: 'success',
+		label: '入库'
+	}
 };
 
 const changeStatus = (row: any, type: string): string => {
-  if (row.transactionType === null || row.transactionType === null) {
-    return '';
-  }
-  if (type === 'key') {
-    return statusMap[row.transactionType === 'ITEM_RECPT' ? 2 : 1].key;
-  }
-  return statusMap[row.transactionType === 'ITEM_RECPT' ? 2 : 1].label;
+	if (row.transactionType === null || row.transactionType === null) {
+		return '';
+	}
+	if (type === 'key') {
+		return statusMap[row.transactionType === 'ITEM_RECPT' ? 2 : 1].key;
+	}
+	return statusMap[row.transactionType === 'ITEM_RECPT' ? 2 : 1].label;
 };
 
 const columns: DataTableColumns<ApiMaterialStockManagement.materialStock> = [
-  {
-    title: '物料编码',
-    key: 'itemCode',
-    align: 'center',
-    width: 160
-  },
-  {
-    title: '物料名称',
-    key: 'itemName',
-    align: 'center',
-    width: 140
-  },
-  {
-    title: '规格型号',
-    key: 'specification',
-    align: 'center',
-    width: 120
-  },
+	{
+		title: '物料编码',
+		key: 'itemCode',
+		align: 'center',
+		width: 160
+	},
+	{
+		title: '物料名称',
+		key: 'itemName',
+		align: 'center',
+		width: 140
+	},
+	{
+		title: '规格型号',
+		key: 'specification',
+		align: 'center',
+		width: 120
+	},
 
-  {
-    title: '库存重量',
-    key: 'afterWeight',
-    align: 'center',
-    width: 120,
-    render(row) {
-      if (row.afterWeight > 0) {
-        return <span style="color: green;font-weight: bold;font-size: 16px;">{row.afterWeight}</span>;
-      }
-      return <span style="color: red;font-weight: bold;font-size: 16px;">{row.afterWeight}</span>;
-    }
-  },
-  {
-    title: '库存数量',
-    key: 'afterQuantity',
-    align: 'center',
-    width: 120,
-    render(row) {
-      if (row.afterQuantity > 0) {
-        return <span style="color: green;font-weight: bold;font-size: 16px;">{row.afterQuantity}</span>;
-      }
-      return <span style="color: red;font-weight: bold;font-size: 16px;">{row.afterQuantity}</span>;
-    }
-  },
-  {
-    title: '单位',
-    key: 'unitOfMeasure',
-    align: 'center',
-    width: 120
-  },
-  {
-    title: '类型',
-    key: 'attr1',
-    align: 'center',
-    width: 160,
-    render: (row: ApiMaterialStockManagement.materialStock) => {
-      return h(
-        NTag,
-        {
-          type: changeType(row.attr1)
-        },
-        () => getStatus(row.attr1 as string)
-      );
-    }
-  },
-  {
-    title: '所在仓库',
-    key: 'warehouseName',
-    align: 'center',
-    width: 120
-  },
-  {
-    title: '预警值',
-    key: 'waringValue',
-    align: 'center',
-    width: 120
-  },
-  // {
-  //   title: '所在库区',
-  //   key: 'locationName',
-  //   align: 'center'
-  // },
-  // {
-  //   title: '所在库位',
-  //   key: 'areaName',
-  //   align: 'center'
-  // },
-  {
-    title: '操作',
-    key: 'action',
-    fixed: 'right',
-    width: 380,
-    render: row => {
-      return [
-        useInfoBtn(
-          () => {
-            detail.value = true;
-            detailLoading.value = true;
-            selectAll({
-              itemCode: row.itemCode,
-              itemName: row.itemName,
-              specification: row.specification,
-              attr1: row.attr1
-            }).then(res => {
-              detailLoading.value = false;
-              detailData.value = res.rows;
-            });
-          },
-          'small',
-          '明细'
-        ),
-        <n-button size="small" type="primary" class="ml-12px" onClick={() => handleSeeting(row)}>
-          <icon-tdesign-setting calss="mr-2" />
-          设置预警值
-        </n-button>,
-        <n-button size="small" type="warning" class="ml-12px" onClick={() => handleEdit(row)}>
-          <icon-tdesign-edit calss="mr-2" />
-          编辑
-        </n-button>,
-        <n-button size="small" type="error" class="ml-12px" onClick={() => deleteOne(row.transactionId)}>
-          <icon-tdesign-delete calss="mr-2" />
-          删除
-        </n-button>
-      ];
-    }
-  }
+	{
+		title: '库存重量',
+		key: 'afterWeight',
+		align: 'center',
+		width: 120,
+		render(row) {
+			if (row.afterWeight > 0) {
+				return <span style="color: green;font-weight: bold;font-size: 16px;">{row.afterWeight}</span>;
+			}
+			return <span style="color: red;font-weight: bold;font-size: 16px;">{row.afterWeight}</span>;
+		}
+	},
+	{
+		title: '库存数量',
+		key: 'afterQuantity',
+		align: 'center',
+		width: 120,
+		render(row) {
+			if (row.afterQuantity > 0) {
+				return <span style="color: green;font-weight: bold;font-size: 16px;">{row.afterQuantity}</span>;
+			}
+			return <span style="color: red;font-weight: bold;font-size: 16px;">{row.afterQuantity}</span>;
+		}
+	},
+	{
+		title: '单位',
+		key: 'unitOfMeasure',
+		align: 'center',
+		width: 120
+	},
+	// {
+	//   title: '类型',
+	//   key: 'attr1',
+	//   align: 'center',
+	//   width: 160,
+	//   render: (row: ApiMaterialStockManagement.materialStock) => {
+	//     return h(
+	//       NTag,
+	//       {
+	//         type: changeType(row.attr1)
+	//       },
+	//       () => getStatus(row.attr1 as string)
+	//     );
+	//   }
+	// },
+	{
+		title: '所在仓库',
+		key: 'warehouseName',
+		align: 'center',
+		width: 120
+	},
+	{
+		title: '预警值',
+		key: 'waringValue',
+		align: 'center',
+		width: 120
+	},
+	// {
+	//   title: '所在库区',
+	//   key: 'locationName',
+	//   align: 'center'
+	// },
+	// {
+	//   title: '所在库位',
+	//   key: 'areaName',
+	//   align: 'center'
+	// },
+	{
+		title: '操作',
+		key: 'action',
+		fixed: 'right',
+		width: 380,
+		render: row => {
+			return [
+				useInfoBtn(
+					() => {
+						detail.value = true;
+						detailLoading.value = true;
+						selectAll({
+							itemCode: row.itemCode,
+							itemName: row.itemName,
+							specification: row.specification,
+							attr1: row.attr1
+						}).then(res => {
+							detailLoading.value = false;
+							detailData.value = res.rows;
+						});
+					},
+					'small',
+					'明细'
+				),
+				<n-button size="small" type="primary" class="ml-12px" onClick={() => handleSeeting(row)}>
+					<icon-tdesign-setting calss="mr-2" />
+					设置预警值
+				</n-button>,
+				<n-button size="small" type="warning" class="ml-12px" onClick={() => handleEdit(row)}>
+					<icon-tdesign-edit calss="mr-2" />
+					编辑
+				</n-button>,
+				<n-button size="small" type="error" class="ml-12px" onClick={() => deleteOne(row.transactionId)}>
+					<icon-tdesign-delete calss="mr-2" />
+					删除
+				</n-button>
+			];
+		}
+	}
 ];
 
 const detailColumns: DataTableColumns<ApiMaterialStockManagement.materialStock> = [
-  {
-    title: '序号',
-    key: 'index',
-    render(_row, index) {
-      return index + 1;
-    },
-    width: 80
-  },
-  {
-    title: '物料名称',
-    key: 'itemName',
-    width: 180
-  },
-  {
-    title: '批号',
-    key: 'batchCode'
-  },
+	{
+		title: '序号',
+		key: 'index',
+		render(_row, index) {
+			return index + 1;
+		},
+		width: 80
+	},
+	{
+		title: '物料名称',
+		key: 'itemName',
+		width: 180
+	},
+	{
+		title: '批号',
+		key: 'batchCode'
+	},
 
-  {
-    title: '规格型号',
-    key: 'specification'
-  },
+	{
+		title: '规格型号',
+		key: 'specification'
+	},
 
-  {
-    title: '类型',
-    key: 'transactionType',
-    align: 'center',
-    render(row) {
-      return <n-tag type={changeStatus(row, 'key')}>{changeStatus(row, 'label')}</n-tag>;
-    }
-  },
-  {
-    title: '数量',
-    key: 'transactionQuantity',
-    align: 'center',
-    render(row) {
-      if (row.transactionQuantity > 0) {
-        return <span style="color: green;font-weight: bold;font-size: 16px;">{row.transactionQuantity}</span>;
-      }
-      return <span style="color: red;font-weight: bold;font-size: 16px;">{row.transactionQuantity}</span>;
-    }
-  },
-  {
-    title: '变化前数量',
-    key: 'beforeQuantity'
-  },
-  {
-    title: '变化后数量',
-    key: 'afterQuantity'
-  },
-  {
-    title: '变化前重量',
-    key: 'beforeWeight'
-  },
-  {
-    title: '变化后重量',
-    key: 'afterWeight'
-  },
-  {
-    title: '变化日期',
-    key: 'createTime'
-  }
+	{
+		title: '类型',
+		key: 'transactionType',
+		align: 'center',
+		render(row) {
+			return <n-tag type={changeStatus(row, 'key')}>{changeStatus(row, 'label')}</n-tag>;
+		}
+	},
+	{
+		title: '数量',
+		key: 'transactionQuantity',
+		align: 'center',
+		render(row) {
+			if (row.transactionQuantity > 0) {
+				return <span style="color: green;font-weight: bold;font-size: 16px;">{row.transactionQuantity}</span>;
+			}
+			return <span style="color: red;font-weight: bold;font-size: 16px;">{row.transactionQuantity}</span>;
+		}
+	},
+	{
+		title: '变化前数量',
+		key: 'beforeQuantity'
+	},
+	{
+		title: '变化后数量',
+		key: 'afterQuantity'
+	},
+	{
+		title: '变化前重量',
+		key: 'beforeWeight'
+	},
+	{
+		title: '变化后重量',
+		key: 'afterWeight'
+	},
+	{
+		title: '变化日期',
+		key: 'createTime'
+	}
 ];
 
 function handleEdit(row: ApiMaterialStockManagement.materialStock) {
-  handleEditShow.value = true;
-  handleEditRow.value = JSON.parse(JSON.stringify(row));
+	handleEditShow.value = true;
+	handleEditRow.value = JSON.parse(JSON.stringify(row));
 }
 
 function submitHandleEdit() {
-  handleEditRef.value?.validate(errors => {
-    if (!errors) {
-      updateWaringValue(handleEditRow.value).then(res => {
-        if (res.code === 200) {
-          message.success('修改成功');
-          handleEditShow.value = false;
-          getTableData();
-        }
-      });
-    }
-  });
+	handleEditRef.value?.validate(errors => {
+		if (!errors) {
+			updateWaringValue(handleEditRow.value).then(res => {
+				if (res.code === 200) {
+					message.success('修改成功');
+					handleEditShow.value = false;
+					getTableData();
+				}
+			});
+		}
+	});
 }
 
 function deleteOne(deleteId: number) {
-  const d = dialog.warning({
-    title: '删除',
-    content: '确认要删除吗?',
-    positiveText: '确认',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      d.loading = true;
-      return new Promise(resolve => {
-        deleteTransaction(deleteId).then(res => {
-          if (res.code === 200) {
-            window.$message?.success('删除成功');
-            getTableData();
-          }
-          resolve(true);
-        });
-      });
-    }
-  });
+	const d = dialog.warning({
+		title: '删除',
+		content: '确认要删除吗?',
+		positiveText: '确认',
+		negativeText: '取消',
+		onPositiveClick: () => {
+			d.loading = true;
+			return new Promise(resolve => {
+				deleteTransaction(deleteId).then(res => {
+					if (res.code === 200) {
+						window.$message?.success('删除成功');
+						getTableData();
+					}
+					resolve(true);
+				});
+			});
+		}
+	});
 }
 
 async function getTableData() {
-  startLoading();
-  let dateArr;
-  if (daterange.value) {
-    dateArr = daterange.value.map(item => {
-      return formatDate(new Date(item), format);
-    });
-  }
+	startLoading();
+	let dateArr;
+	if (daterange.value) {
+		dateArr = daterange.value.map(item => {
+			return formatDate(new Date(item), format);
+		});
+	}
 
-  const data = await fetchMaterialStockList({
-    params: addDateRange(formValue.value, dateArr, undefined)
-  });
-  // console.log(data.rows);
-  if (data) {
-    setTimeout(() => {
-      formValue.value.total = data.total;
-      setTableData(data.rows);
-      endLoading();
-      // allRowKeysArr = data.allParentIDArr;
-      // expandedRows.value = data.allParentIDArr;
-    }, 100);
-  }
+	const data = await fetchMaterialStockList({
+		params: addDateRange(formValue.value, dateArr, undefined)
+	});
+	// console.log(data.rows);
+	if (data) {
+		setTimeout(() => {
+			formValue.value.total = data.total;
+			setTableData(data.rows);
+			endLoading();
+			// allRowKeysArr = data.allParentIDArr;
+			// expandedRows.value = data.allParentIDArr;
+		}, 100);
+	}
 }
 function handleSeeting(row: any) {
-  formData.value = JSON.parse(JSON.stringify(row));
-  itemName.value = row.itemName;
-  flag.value = true;
+	formData.value = JSON.parse(JSON.stringify(row));
+	itemName.value = row.itemName;
+	flag.value = true;
 }
 function submit() {
-  if (!formData.value.waringValue) {
-    message.error('请输入预警值');
-  } else {
-    updateWaringValue(formData.value).then(res => {
-      flag.value = false;
-      formData.value.waringValue = 0;
-      itemName.value = '';
-      if (res.code === 200) {
-        message.success('设置成功');
-      } else {
-        message.error('设置预警值失败');
-      }
-      getTableData();
-    });
-  }
+	if (!formData.value.waringValue) {
+		message.error('请输入预警值');
+	} else {
+		updateWaringValue(formData.value).then(res => {
+			flag.value = false;
+			formData.value.waringValue = 0;
+			itemName.value = '';
+			if (res.code === 200) {
+				message.success('设置成功');
+			} else {
+				message.error('设置预警值失败');
+			}
+			getTableData();
+		});
+	}
 }
 function cancel() {
-  formData.value.waringValue = 0;
-  flag.value = false;
-  itemName.value = '';
+	formData.value.waringValue = 0;
+	flag.value = false;
+	itemName.value = '';
 }
 function handleSearchClick() {
-  formValue.value.pageNum = 1;
-  getTableData();
-  expandedSwitchshow.value = true;
+	formValue.value.pageNum = 1;
+	getTableData();
+	expandedSwitchshow.value = true;
 }
 
 function getWarehouseList() {
-  getlist({}).then(res => {
-    opetions.value = res.data.map(item => {
-      return {
-        label: item.warehouseName,
-        value: item.warehouseId
-      };
-    });
-  });
+	getlist({}).then(res => {
+		opetions.value = res.data.map(item => {
+			return {
+				label: item.warehouseName,
+				value: item.warehouseId
+			};
+		});
+	});
 }
 function handleResetClick() {
-  formValue.value.pageNum = 1;
-  formValue.value.pageSize = 10;
-  formValue.value.total = 0;
-  formValue.value.itemName = '';
-  formValue.value.itemCode = '';
-  formValue.value.batchCode = '';
-  formValue.value.warehouseName = '';
-  formValue.value.vendorCode = '';
-  formValue.value.vendorName = '';
-  formValue.value.recptDate = null;
-  formValue.value.specification = '';
-  formValue.value.attr1 = null;
-  formValue.value.warehouseId = null;
-  daterange.value = null;
-  getTableData();
+	formValue.value.pageNum = 1;
+	formValue.value.pageSize = 10;
+	formValue.value.total = 0;
+	formValue.value.itemName = '';
+	formValue.value.itemCode = '';
+	formValue.value.batchCode = '';
+	formValue.value.warehouseName = '';
+	formValue.value.vendorCode = '';
+	formValue.value.vendorName = '';
+	formValue.value.recptDate = null;
+	formValue.value.specification = '';
+	formValue.value.attr1 = null;
+	formValue.value.warehouseId = null;
+	daterange.value = null;
+	getTableData();
 }
 
 onMounted(() => {
-  getTableData();
-  getWarehouseList();
+	getTableData();
+	getWarehouseList();
 });
 </script>
 
 <style>
 .width110 {
-  width: 110px;
+	width: 110px;
 }
 
 .n-form {
-  display: flex;
-  flex-wrap: wrap;
+	display: flex;
+	flex-wrap: wrap;
 }
 </style>