diff --git a/src/App.vue b/src/App.vue
index cbf302d..3284eec 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -62,7 +62,10 @@ watch(
   async newValue => {
     // console.log('newValue ==> ', newValue);
     // console.log('JSON.parse(newValue) ==> ', JSON.parse(newValue));
-
+    if (!window.hiwebSocket.opened && !window.hiwebSocket.printerList?.length) {
+      window.$message?.error('打印失败,请连接打印机');
+      return;
+    }
     if (!newValue) return;
     if (isValidJSON(newValue)) {
       // const msgData = JSON.parse(JSON.parse(newValue));
diff --git a/src/assets/img/sys.png b/src/assets/img/sys.png
index efcf3d1..bea3d32 100644
Binary files a/src/assets/img/sys.png and b/src/assets/img/sys.png differ
diff --git a/src/components/common/system-logo.vue b/src/components/common/system-logo.vue
index f8aaaed..d3b2841 100644
--- a/src/components/common/system-logo.vue
+++ b/src/components/common/system-logo.vue
@@ -5,7 +5,7 @@
   <!-- <icon-local-ak-logo v-if="fill" />
   <icon-local-ak-logo v-else /> -->
   <!-- 加载图标 -->
-  <!-- <img src="../../assets/img/sys.png" alt="" style="width: 65px; height: 65px" /> -->
+  <img src="../../assets/img/sys.png" alt="" style="width: 64px; height: 34px" />
   <div></div>
 </template>
 
diff --git a/src/layouts/common/global-logo/index.vue b/src/layouts/common/global-logo/index.vue
index 44eeac6..4b40e3d 100644
--- a/src/layouts/common/global-logo/index.vue
+++ b/src/layouts/common/global-logo/index.vue
@@ -1,6 +1,6 @@
 <template>
   <router-link :to="routeHomePath" class="flex-center w-full nowrap-hidden">
-    <!-- <system-logo class="text-60px text-primary" /> -->
+    <system-logo class="text-60px text-primary" />
     <h2 v-show="showTitle" class="pl-8px text-16px font-bold text-primary transition duration-300 ease-in-out">
       {{ $t('system.title') }}
     </h2>
diff --git a/src/typings/page-route.d.ts b/src/typings/page-route.d.ts
index 3d08ea1..a98164f 100644
--- a/src/typings/page-route.d.ts
+++ b/src/typings/page-route.d.ts
@@ -170,6 +170,8 @@ declare namespace PageRoute {
     | 'sale_saleOrder'
     | 'scm'
     | 'scm_accessorySupplier'
+    | 'scm_linkman'
+    | 'scm_register'
     | 'storage'
     | 'storage_auxiliaryProduceinfo'
     | 'storage_copperWire'
@@ -362,6 +364,8 @@ declare namespace PageRoute {
     | 'rapidmining_deviceRealtime'
     | 'sale_saleOrder'
     | 'scm_accessorySupplier'
+    | 'scm_linkman'
+    | 'scm_register'
     | 'storage_auxiliaryProduceinfo'
     | 'storage_copperWire'
     | 'storage_earlyWarning'
diff --git a/src/views/index.ts b/src/views/index.ts
index 241f186..babebfb 100644
--- a/src/views/index.ts
+++ b/src/views/index.ts
@@ -137,6 +137,8 @@ export const views: Record<
   rapidmining_deviceRealtime: () => import('./rapidmining/deviceRealtime/index.vue'),
   sale_saleOrder: () => import('./sale/saleOrder/index.vue'),
   scm_accessorySupplier: () => import('./scm/accessorySupplier/index.vue'),
+  scm_linkman: () => import('./scm/linkman/index.vue'),
+  scm_register: () => import('./scm/register/index.vue'),
   storage_auxiliaryProduceinfo: () => import('./storage/auxiliaryProduceinfo/index.vue'),
   storage_copperWire: () => import('./storage/copperWire/index.vue'),
   storage_earlyWarning: () => import('./storage/earlyWarning/index.vue'),
diff --git a/src/views/plan/produceOrder/index.vue b/src/views/plan/produceOrder/index.vue
index ff7e589..2366ed1 100644
--- a/src/views/plan/produceOrder/index.vue
+++ b/src/views/plan/produceOrder/index.vue
@@ -1,33 +1,33 @@
 <template>
-	<div>
-		<my-card title="搜索条件" search>
-			<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-select
-						v-model:value="searchForm.status"
-						placeholder="请选择工单状态"
-						class="w-180px"
-						:options="workOrderStatus"
-					></n-select>
-				</n-form-item>
-				<n-form-item label="订单类型">
-					<n-select
-						v-model:value="searchForm.orderType"
-						placeholder="请选择订单类型"
-						:options="orderTypeList"
-						class="w-160px"
-					></n-select>
-				</n-form-item>
-
-				<n-form-item label="生产工单号">
-					<n-input v-model:value="searchForm.workorderCode" type="text" placeholder="请输入生产工单号" />
-				</n-form-item>
-				<n-form-item>
-					<component
-						:is="
+  <div>
+    <my-card title="搜索条件" search>
+      <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-select
+            v-model:value="searchForm.status"
+            placeholder="请选择工单状态"
+            class="w-180px"
+            :options="workOrderStatus"
+          ></n-select>
+        </n-form-item>
+        <n-form-item label="订单类型">
+          <n-select
+            v-model:value="searchForm.orderType"
+            placeholder="请选择订单类型"
+            :options="orderTypeList"
+            class="w-160px"
+          ></n-select>
+        </n-form-item>
+
+        <n-form-item label="生产工单号">
+          <n-input v-model:value="searchForm.workorderCode" type="text" placeholder="请输入生产工单号" />
+        </n-form-item>
+        <n-form-item>
+          <component
+            :is="
               useSearchBtn(
                 () => {
                   search();
@@ -37,92 +37,92 @@
                 }
               )
             "
-					/>
-				</n-form-item>
-			</n-form>
-
-			<n-form inline>
-				<n-form-item label="产品型号">
-					<n-input v-model:value="searchForm.model" type="text" placeholder="请输入产品型号" />
-				</n-form-item>
-				<n-form-item label="规格">
-					<n-input v-model:value="searchForm.productSpecification" type="text" placeholder="请输入规格" />
-				</n-form-item>
-			</n-form>
-		</my-card>
-		<my-card :title="title">
-			<template #right>
-				<div>
-					<CxColumns v-model:columns="columns" />
-				</div>
-			</template>
-			<n-data-table
-				:loading="loading"
-				:columns="columns"
-				:data="data"
-				:scroll-x="dataTableConfig.scrollWidth(columns)"
-				:max-height="dataTableConfig.maxHeight"
-			></n-data-table>
-			<my-pagination v-model:search-form="searchForm" @init="init()"></my-pagination>
-		</my-card>
-		<my-dialog v-model:show="showDialog" title=" 排产" width="1000px" @cancel="cancel" @submit="submit">
-			<template #content>
-				<div>
-					<n-form style="width: 900px" :model="formModel" label-placement="left" label-width="auto">
-						<n-grid :cols="2" :x-gap="20">
-							<n-form-item-grid-item label="订单编号: ">
-								<n-space>{{ formModel.orderCode }}</n-space>
-							</n-form-item-grid-item>
-							<n-form-item-grid-item label="产品型号: ">
-								<n-space>{{ formModel.productModel }}</n-space>
-							</n-form-item-grid-item>
-							<n-form-item-grid-item label="产品规格: ">
-								<n-space>{{ formModel.productSpecification }}</n-space>
-							</n-form-item-grid-item>
-							<n-form-item-grid-item label="数量: ">
-								<n-space>{{ formModel.onlyReadWeight }}</n-space>
-							</n-form-item-grid-item>
-							<n-form-item-grid-item label="交付时间: ">
-								<n-space>{{ formModel.payTime }}</n-space>
-							</n-form-item-grid-item>
-						</n-grid>
-
-						<div class="divider"></div>
-
-						<n-form
-							v-show="isActive === 1"
-							ref="qbFormModel"
-							style="width: 900px"
-							:rules="qbRules"
-							:model="enamelCoverData"
-							label-placement="left"
-							label-width="70px"
-						>
-							<n-grid :cols="2" :x-gap="20">
-								<n-form-item-grid-item label="机台" path="equipmentId">
-									<n-space>
-										<n-select
-											v-model:value="enamelCoverData.equipmentId"
-											:options="drillingCrewoptions"
-											:style="{ width: formItemWidth }"
-											placeholder="请选择机台"
-											:disabled="getDetailComplete"
-											filterable
-											@update:value="handleUpdateValue"
-										></n-select>
-									</n-space>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="位置" path="axleNumber">
-									<n-space vertical>
-										<n-select
-											v-model:value="axleNumberId"
-											:style="{ width: formItemWidth }"
-											placeholder="请选择位置"
-											:options="locationOptions"
-											:disabled="getDetailComplete"
-											multiple
-											filterable
-											@update-value="(val, item: any) => {
+          />
+        </n-form-item>
+      </n-form>
+
+      <n-form inline>
+        <n-form-item label="产品型号">
+          <n-input v-model:value="searchForm.model" type="text" placeholder="请输入产品型号" />
+        </n-form-item>
+        <n-form-item label="规格">
+          <n-input v-model:value="searchForm.productSpecification" type="text" placeholder="请输入规格" />
+        </n-form-item>
+      </n-form>
+    </my-card>
+    <my-card :title="title">
+      <template #right>
+        <div>
+          <CxColumns v-model:columns="columns" />
+        </div>
+      </template>
+      <n-data-table
+        :loading="loading"
+        :columns="columns"
+        :data="data"
+        :scroll-x="dataTableConfig.scrollWidth(columns)"
+        :max-height="dataTableConfig.maxHeight"
+      ></n-data-table>
+      <my-pagination v-model:search-form="searchForm" @init="init()"></my-pagination>
+    </my-card>
+    <my-dialog v-model:show="showDialog" title=" 排产" width="1000px" @cancel="cancel" @submit="submit">
+      <template #content>
+        <div>
+          <n-form style="width: 900px" :model="formModel" label-placement="left" label-width="auto">
+            <n-grid :cols="2" :x-gap="20">
+              <n-form-item-grid-item label="订单编号: ">
+                <n-space>{{ formModel.orderCode }}</n-space>
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="产品型号: ">
+                <n-space>{{ formModel.productModel }}</n-space>
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="产品规格: ">
+                <n-space>{{ formModel.productSpecification }}</n-space>
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="数量: ">
+                <n-space>{{ formModel.onlyReadWeight }}</n-space>
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="交付时间: ">
+                <n-space>{{ formModel.payTime }}</n-space>
+              </n-form-item-grid-item>
+            </n-grid>
+
+            <div class="divider"></div>
+
+            <n-form
+              v-show="isActive === 1"
+              ref="qbFormModel"
+              style="width: 900px"
+              :rules="qbRules"
+              :model="enamelCoverData"
+              label-placement="left"
+              label-width="70px"
+            >
+              <n-grid :cols="2" :x-gap="20">
+                <n-form-item-grid-item label="机台" path="equipmentId">
+                  <n-space>
+                    <n-select
+                      v-model:value="enamelCoverData.equipmentId"
+                      :options="drillingCrewoptions"
+                      :style="{ width: formItemWidth }"
+                      placeholder="请选择机台"
+                      :disabled="getDetailComplete"
+                      filterable
+                      @update:value="handleUpdateValue"
+                    ></n-select>
+                  </n-space>
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="位置" path="axleNumber">
+                  <n-space vertical>
+                    <n-select
+                      v-model:value="axleNumberId"
+                      :style="{ width: formItemWidth }"
+                      placeholder="请选择位置"
+                      :options="locationOptions"
+                      :disabled="getDetailComplete"
+                      multiple
+                      filterable
+                      @update-value="(val, item: any) => {
                         enamelCoverData.axleNumber = null;
                         let axleNumber = '';
                         item.forEach(ele => {
@@ -133,25 +133,25 @@
                           getDetailData()
                         }
                       }"
-										></n-select>
-									</n-space>
-								</n-form-item-grid-item>
-							</n-grid>
-							<n-form-item v-show="enamelCoverData.equipmentId && enamelCoverData.axleNumber">
-								<div style="overflow: auto; max-height: 350px">
-									<n-data-table :loading="rowsLoading" :columns="detailColumns" :data="detailData"></n-data-table>
-								</div>
-							</n-form-item>
-							<n-grid :cols="2" :x-gap="20">
-								<n-form-item-grid-item label="板料" path="plantName">
-									<n-space vertical>
-										<n-select
-											:options="plantListOptions"
-											:style="{ width: formItemWidth }"
-											:multiple="true"
-											placeholder="请选择板料"
-											filterable
-											@update-value="(val, itemList: any) => {
+                    ></n-select>
+                  </n-space>
+                </n-form-item-grid-item>
+              </n-grid>
+              <n-form-item v-show="enamelCoverData.equipmentId && enamelCoverData.axleNumber">
+                <div style="overflow: auto; max-height: 350px">
+                  <n-data-table :loading="rowsLoading" :columns="detailColumns" :data="detailData"></n-data-table>
+                </div>
+              </n-form-item>
+              <n-grid :cols="2" :x-gap="20">
+                <n-form-item-grid-item label="板料" path="plantName">
+                  <n-space vertical>
+                    <n-select
+                      :options="plantListOptions"
+                      :style="{ width: formItemWidth }"
+                      :multiple="true"
+                      placeholder="请选择板料"
+                      filterable
+                      @update-value="(val, itemList: any) => {
                         let plantName = '';
                         if (itemList.length > 0) {
                           itemList.forEach(item => {
@@ -161,84 +161,84 @@
                         }
                         enamelCoverData.plantName = plantName
                       }"
-										></n-select>
-									</n-space>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="板料数量" path="plantNumber">
-									<n-input-number
-										v-model:value="enamelCoverData.plantNumber"
-										:style="{ width: formItemWidth }"
-										placeholder="请输入板料数量"
-									/>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="插针" path="wireDisc">
-									<n-space vertical>
-										<n-select
-											v-model:value="enamelCoverData.wireDiscId"
-											:style="{ width: formItemWidth }"
-											placeholder="请选择镜片"
-											filterable
-											:options="accessoryListOptions"
-											@update-value="(val, item: any) => {
+                    ></n-select>
+                  </n-space>
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="板料数量" path="plantNumber">
+                  <n-input-number
+                    v-model:value="enamelCoverData.plantNumber"
+                    :style="{ width: formItemWidth }"
+                    placeholder="请输入板料数量"
+                  />
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="插针" path="wireDisc">
+                  <n-space vertical>
+                    <n-select
+                      v-model:value="enamelCoverData.wireDiscId"
+                      :style="{ width: formItemWidth }"
+                      placeholder="请选择镜片"
+                      filterable
+                      :options="accessoryListOptions"
+                      @update-value="(val, item: any) => {
                         enamelCoverData.wireDisc = item.label
                       }"
-										></n-select>
-									</n-space>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="插针数" path="discNumber">
-									<n-input-number
-										v-model:value="enamelCoverData.discNumber"
-										:style="{ width: formItemWidth }"
-										placeholder="请输入盘数"
-									/>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="开始时间" path="startTime">
-									<n-date-picker
-										v-model:formatted-value="enamelCoverData.startTime"
-										type="datetime"
-										:style="{ width: formItemWidth }"
-									/>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="结束时间" path="endTime">
-									<n-date-picker
-										v-model:formatted-value="enamelCoverData.endTime"
-										type="datetime"
-										:style="{ width: formItemWidth }"
-									/>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="标准" path="standardValue">
-									<n-space vertical>
-										<n-select
-											v-model:value="enamelCoverData.standardValue"
-											:style="{ width: formItemWidth }"
-											placeholder="请选择标准"
-											filterable
-											:options="standardList"
-											@update-value="(val, item: any) => {
+                    ></n-select>
+                  </n-space>
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="插针数" path="discNumber">
+                  <n-input-number
+                    v-model:value="enamelCoverData.discNumber"
+                    :style="{ width: formItemWidth }"
+                    placeholder="请输入盘数"
+                  />
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="开始时间" path="startTime">
+                  <n-date-picker
+                    v-model:formatted-value="enamelCoverData.startTime"
+                    type="datetime"
+                    :style="{ width: formItemWidth }"
+                  />
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="结束时间" path="endTime">
+                  <n-date-picker
+                    v-model:formatted-value="enamelCoverData.endTime"
+                    type="datetime"
+                    :style="{ width: formItemWidth }"
+                  />
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="标准" path="standardValue">
+                  <n-space vertical>
+                    <n-select
+                      v-model:value="enamelCoverData.standardValue"
+                      :style="{ width: formItemWidth }"
+                      placeholder="请选择标准"
+                      filterable
+                      :options="standardList"
+                      @update-value="(val, item: any) => {
                         enamelCoverData.standardName = item.label;
                       }"
-										></n-select>
-									</n-space>
-								</n-form-item-grid-item>
-								<n-form-item-grid-item label="特殊要求">
-									<n-input
-										v-model:value="enamelCoverData.remark"
-										placeholder="请输入特殊要求"
-										:style="{ width: formItemWidth }"
-									></n-input>
-								</n-form-item-grid-item>
-							</n-grid>
-						</n-form>
-					</n-form>
-				</div>
-			</template>
-		</my-dialog>
-	</div>
+                    ></n-select>
+                  </n-space>
+                </n-form-item-grid-item>
+                <n-form-item-grid-item label="特殊要求">
+                  <n-input
+                    v-model:value="enamelCoverData.remark"
+                    placeholder="请输入特殊要求"
+                    :style="{ width: formItemWidth }"
+                  ></n-input>
+                </n-form-item-grid-item>
+              </n-grid>
+            </n-form>
+          </n-form>
+        </div>
+      </template>
+    </my-dialog>
+  </div>
 </template>
 
 <script setup lang="tsx">
 defineOptions({
-	name: 'ProduceOrder'
+  name: 'ProduceOrder'
 });
 import type { Ref } from 'vue';
 import { ref, onMounted } from 'vue';
@@ -258,22 +258,22 @@ import { addEnamellingWorkorder } from '~/src/service/api/plan/enamellingWorkOrd
 import { formatDate } from '~/src/utils/form/rule';
 import { getStatusName, getPlanStatusName } from '~/src/utils/common/workOrder';
 const enamelCoverData = ref<planWorkOrder.enamelCoverData>({
-	equipmentCode: null,
-	equipmentId: null,
-	axleNumber: null,
-	wireDisc: null,
-	plantName: null,
-	startTime: null,
-	endTime: null,
-	discNumber: null,
-	remark: '',
-	weight: null,
-	plantNumber: null,
-	wireDiscNumber: null,
-	standardValue: null,
-	standardName: '',
-	wireDiscId: null,
-	plantNameList: null
+  equipmentCode: null,
+  equipmentId: null,
+  axleNumber: null,
+  wireDisc: null,
+  plantName: null,
+  startTime: null,
+  endTime: null,
+  discNumber: null,
+  remark: '',
+  weight: null,
+  plantNumber: null,
+  wireDiscNumber: null,
+  standardValue: null,
+  standardName: '',
+  wireDiscId: null,
+  plantNameList: null
 });
 
 // const lsFormModel = ref<FormInst | null>(null);
@@ -307,40 +307,40 @@ const plantListOptions = ref<planWorkOrder.SelectMixedOption[]>([]);
 const accessoryListOptions = ref<planWorkOrder.SelectMixedOption[]>([]);
 
 const orderTypeList = ref<{ label: string; value: number }[]>([
-	{ label: '客户订单', value: 0 },
-	{ label: '备库订单', value: 1 }
+  { label: '客户订单', value: 0 },
+  { label: '备库订单', value: 1 }
 ]);
 
 const title = ref<string>('生产工单-全部');
 // 工单状态
 const workOrderStatus = [
-	{ label: '全部', value: undefined },
-	{ label: '未排产', value: 0 },
-	{ label: '排产中', value: 1 },
-	{ label: '生产中', value: 2 },
-	{ label: '已完成', value: 3 },
-	{ label: '已作废', value: 4 }
+  { label: '全部', value: undefined },
+  { label: '未排产', value: 0 },
+  { label: '排产中', value: 1 },
+  { label: '生产中', value: 2 },
+  { label: '已完成', value: 3 },
+  { label: '已作废', value: 4 }
 ];
 
 const qbRules = {
-	equipmentId: createRequiredFormRule('请选择机台'),
-	axleNumber: createRequiredFormRule('请选择位置'),
-	plantName: createRequiredFormRule('请选择板料'),
-	discNumber: createRequiredFormRule('请输入插针数'),
-	wireDisc: createRequiredFormRule('请选择插针'),
-	startTime: createRequiredFormRule('请选择开始时间'),
-	endTime: createRequiredFormRule('请选择结束时间')
+  equipmentId: createRequiredFormRule('请选择机台'),
+  axleNumber: createRequiredFormRule('请选择位置'),
+  plantName: createRequiredFormRule('请选择板料'),
+  discNumber: createRequiredFormRule('请输入插针数'),
+  wireDisc: createRequiredFormRule('请选择插针'),
+  startTime: createRequiredFormRule('请选择开始时间'),
+  endTime: createRequiredFormRule('请选择结束时间')
 };
 
 const searchForm = ref<planWorkOrder.searchForm>({
-	status: undefined,
-	pageNum: 1,
-	pageSize: 10,
-	total: 0,
-	orderType: null,
-	model: '',
-	workorderCode: '',
-	productSpecification: ''
+  status: undefined,
+  pageNum: 1,
+  pageSize: 10,
+  total: 0,
+  orderType: null,
+  model: '',
+  workorderCode: '',
+  productSpecification: ''
 });
 
 const showDialog = ref<boolean>(false);
@@ -359,443 +359,443 @@ const isRequestAccomplish = ref<boolean>(true);
 const rowsData = ref<any>({});
 
 const columns: Ref<DataTableColumns<planWorkOrder.planWorkOrderList>> = ref([
-	{
-		title: '序号',
-		key: 'index',
-		align: 'center',
-		width: 120,
-		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
-	},
-	{
-		title: '创建时间',
-		width: 180,
-		key: 'createTime'
-	},
-	{
-		title: '订单类型',
-		key: 'orderType',
-		width: 100,
-		render: row => {
-			return <n-space>{row.orderType === '0' ? '客户订单' : '备库订单'}</n-space>;
-		}
-	},
-	{
-		title: '客户',
-		key: 'customerName',
-		width: 100,
-		ellipsis: {
-			tooltip: true
-		}
-	},
-	{
-		title: '订单编号',
-		key: 'orderCode',
-		width: 100,
-		ellipsis: {
-			tooltip: true
-		}
-	},
-	{
-		title: '生产工单',
-		key: 'workorderCode',
-		width: 150
-	},
-	{
-		title: '产品型号',
-		key: 'productModel',
-		width: 100
-	},
-	{
-		title: '规格',
-		key: 'productSpecification',
-		width: 100
-	},
-	{
-		title: '关联工艺路线',
-		key: 'routingName',
-		width: 120
-	},
-	{
-		title: '数量',
-		key: 'weight',
-		width: 100
-	},
-	// {
-	//   title: '拉丝已排产数量',
-	//   key: 'wiredrawingSchedulingWeight',
-	//   width: 140
-	// },
-	// {
-	//   title: ' 已排产数量',
-	//   key: 'enamellingSchedulingWeight',
-	//   width: 140
-	// },
-	{
-		title: '交付时间',
-		key: 'payTime',
-		width: 180
-	},
-	{
-		title: '状态',
-		key: 'status',
-		width: 100,
-		fixed: 'right',
-		render: row => {
-			const statusInfo = getPlanStatusName(row.status);
-			return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
-		}
-	},
-	{
-		title: '操作',
-		key: 'action',
-		fixed: 'right',
-		width: 180,
-		render: row => {
-			if (row.status === '4') return '已作废,不可操作';
-			return (
-				<n-space>
-					<n-button type="info" v-show={row.status === '0'} onClick={() => changeShowDialog(row)}>
-						排产
-					</n-button>
-					<n-popconfirm onPositiveClick={() => handleDeleteItemType(row.id)}>
-						{{
-							default: () => '确认作废吗>',
-							trigger: () => (
-								<n-button type="warning" v-show={row.status === '1' || row.status === '0'}>
-									作废
-								</n-button>
-							)
-						}}
-					</n-popconfirm>
-				</n-space>
-			);
-		}
-	}
+  {
+    title: '序号',
+    key: 'index',
+    align: 'center',
+    width: 120,
+    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
+  },
+  {
+    title: '创建时间',
+    width: 180,
+    key: 'createTime'
+  },
+  {
+    title: '订单类型',
+    key: 'orderType',
+    width: 100,
+    render: row => {
+      return <n-space>{row.orderType === '0' ? '客户订单' : '备库订单'}</n-space>;
+    }
+  },
+  {
+    title: '客户',
+    key: 'customerName',
+    width: 100,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '订单编号',
+    key: 'orderCode',
+    width: 100,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '生产工单',
+    key: 'workorderCode',
+    width: 150
+  },
+  {
+    title: '产品型号',
+    key: 'productModel',
+    width: 100
+  },
+  {
+    title: '规格',
+    key: 'productSpecification',
+    width: 100
+  },
+  {
+    title: '关联工艺路线',
+    key: 'routingName',
+    width: 120
+  },
+  {
+    title: '数量',
+    key: 'weight',
+    width: 100
+  },
+  // {
+  //   title: '拉丝已排产数量',
+  //   key: 'wiredrawingSchedulingWeight',
+  //   width: 140
+  // },
+  // {
+  //   title: ' 已排产数量',
+  //   key: 'enamellingSchedulingWeight',
+  //   width: 140
+  // },
+  {
+    title: '交付时间',
+    key: 'payTime',
+    width: 180
+  },
+  {
+    title: '状态',
+    key: 'status',
+    width: 100,
+    fixed: 'right',
+    render: row => {
+      const statusInfo = getPlanStatusName(row.status);
+      return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
+    }
+  },
+  {
+    title: '操作',
+    key: 'action',
+    fixed: 'right',
+    width: 180,
+    render: row => {
+      if (row.status === '4') return '已作废,不可操作';
+      return (
+        <n-space>
+          <n-button type="info" v-show={row.status === '0'} onClick={() => changeShowDialog(row)}>
+            排产
+          </n-button>
+          <n-popconfirm onPositiveClick={() => handleDeleteItemType(row.id)}>
+            {{
+              default: () => '确认作废吗>',
+              trigger: () => (
+                <n-button type="warning" v-show={row.status === '1' || row.status === '0'}>
+                  作废
+                </n-button>
+              )
+            }}
+          </n-popconfirm>
+        </n-space>
+      );
+    }
+  }
 ]);
 
 const detailData = ref<paintJobOrder.tabelList[]>([]);
 
 const detailColumns: Ref<DataTableColumns<paintJobOrder.tabelList>> = ref([
-	{
-		title: '工单号',
-		width: 100,
-		key: 'enamellingCode'
-	},
-	{
-		title: '机台',
-		width: 100,
-		key: 'equipmentCode'
-	},
-	{
-		title: '位置',
-		width: 100,
-		key: 'axleNumber'
-	},
-	{
-		title: '油漆',
-		width: 100,
-		key: 'plantName'
-	},
-	{
-		title: '型号',
-		width: 100,
-		key: 'model'
-	},
-	{
-		title: '产品规格',
-		width: 100,
-		key: 'specification'
-	},
-	{
-		title: '创建时间',
-		key: 'createTime',
-		width: 180
-	},
-	{
-		title: '数量',
-		width: 100,
-		key: 'weight'
-	},
-
-	{
-		title: '盘数',
-		width: 100,
-		key: 'discNumber'
-	},
-	{
-		title: '开始时间',
-		width: 180,
-		key: 'startTime'
-	},
-	{
-		title: '结束时间',
-		width: 180,
-		key: 'endTime'
-	},
-	{
-		title: '特殊要求',
-		width: 100,
-		key: 'remark'
-	},
-	{
-		title: '状态',
-		width: 100,
-		key: 'status',
-		render: row => {
-			const statusInfo = getStatusName(row.status);
-			return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
-		}
-	}
+  {
+    title: '工单号',
+    width: 100,
+    key: 'enamellingCode'
+  },
+  {
+    title: '机台',
+    width: 100,
+    key: 'equipmentCode'
+  },
+  {
+    title: '位置',
+    width: 100,
+    key: 'axleNumber'
+  },
+  {
+    title: '油漆',
+    width: 100,
+    key: 'plantName'
+  },
+  {
+    title: '型号',
+    width: 100,
+    key: 'model'
+  },
+  {
+    title: '产品规格',
+    width: 100,
+    key: 'specification'
+  },
+  {
+    title: '创建时间',
+    key: 'createTime',
+    width: 180
+  },
+  {
+    title: '数量',
+    width: 100,
+    key: 'weight'
+  },
+
+  {
+    title: '盘数',
+    width: 100,
+    key: 'discNumber'
+  },
+  {
+    title: '开始时间',
+    width: 180,
+    key: 'startTime'
+  },
+  {
+    title: '结束时间',
+    width: 180,
+    key: 'endTime'
+  },
+  {
+    title: '特殊要求',
+    width: 100,
+    key: 'remark'
+  },
+  {
+    title: '状态',
+    width: 100,
+    key: 'status',
+    render: row => {
+      const statusInfo = getStatusName(row.status);
+      return <n-tag type={statusInfo.bgColor}>{statusInfo.statusName}</n-tag>;
+    }
+  }
 ]);
 
 const formModel = ref<planWorkOrder.FormModel>({
-	orderCode: null,
-	productModel: null,
-	productSpecification: null,
-	payTime: null,
-	orderType: null, // 订单类型
-	customerName: null, // 客户
-	workorderCode: null, // 生产工单
-	workorderId: null,
-	model: null, // 产品型号
-	specification: null, // 产品规格
-	measureId: null,
-	measureName: null,
-	onlyReadWeight: null,
-	residueWeight: null, // 剩余数量
-	productId: null //
+  orderCode: null,
+  productModel: null,
+  productSpecification: null,
+  payTime: null,
+  orderType: null, // 订单类型
+  customerName: null, // 客户
+  workorderCode: null, // 生产工单
+  workorderId: null,
+  model: null, // 产品型号
+  specification: null, // 产品规格
+  measureId: null,
+  measureName: null,
+  onlyReadWeight: null,
+  residueWeight: null, // 剩余数量
+  productId: null //
 });
 
 function search(): void {
-	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;
-	}
-	if (searchForm.value.status !== undefined) {
-		title.value = `生产工单-${workOrderStatus[searchForm.value.status].label}`;
-	} else {
-		title.value = `生产工单-全部`;
-	}
-	init();
+  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;
+  }
+  if (searchForm.value.status !== undefined) {
+    title.value = `生产工单-${workOrderStatus[searchForm.value.status].label}`;
+  } else {
+    title.value = `生产工单-全部`;
+  }
+  init();
 }
 function reset(): void {
-	searchForm.value = {
-		status: undefined,
-		pageNum: 1,
-		pageSize: 10,
-		total: 0,
-		orderType: null,
-		model: '',
-		workorderCode: '',
-		productSpecification: ''
-	};
-	if (searchForm.value.status !== undefined) {
-		title.value = `生产工单-${workOrderStatus[searchForm.value.status].label}`;
-	} else {
-		title.value = `生产工单-全部`;
-	}
-	range.value = null;
-	search();
+  searchForm.value = {
+    status: undefined,
+    pageNum: 1,
+    pageSize: 10,
+    total: 0,
+    orderType: null,
+    model: '',
+    workorderCode: '',
+    productSpecification: ''
+  };
+  if (searchForm.value.status !== undefined) {
+    title.value = `生产工单-${workOrderStatus[searchForm.value.status].label}`;
+  } else {
+    title.value = `生产工单-全部`;
+  }
+  range.value = null;
+  search();
 }
 
 function getDetailData() {
-	if (timer.value) {
-		clearTimeout(timer.value);
-	}
-	timer.value = setTimeout(() => {
-		if (enamelCoverData.value.equipmentId === null || enamelCoverData.value.axleNumber === null) return;
-		const params = { equipmentId: enamelCoverData.value.equipmentId, axleNumber: enamelCoverData.value.axleNumber };
-		rowsLoading.value = true;
-		getDetailComplete.value = true;
-		getListByEquipmentId(params).then(res => {
-			rowsLoading.value = false;
-			getDetailComplete.value = false;
-			if (res.code === 200) {
-				detailData.value = res.data;
-			}
-		});
-	}, 1000);
+  if (timer.value) {
+    clearTimeout(timer.value);
+  }
+  timer.value = setTimeout(() => {
+    if (enamelCoverData.value.equipmentId === null || enamelCoverData.value.axleNumber === null) return;
+    const params = { equipmentId: enamelCoverData.value.equipmentId, axleNumber: enamelCoverData.value.axleNumber };
+    rowsLoading.value = true;
+    getDetailComplete.value = true;
+    getListByEquipmentId(params).then(res => {
+      rowsLoading.value = false;
+      getDetailComplete.value = false;
+      if (res.code === 200) {
+        detailData.value = res.data;
+      }
+    });
+  }, 1000);
 }
 
 // 打开排产
 function changeShowDialog(row: planWorkOrder.planWorkOrderList): void {
-	for (const key in formModel.value) {
-		if (row[key] !== null) {
-			formModel.value[key] = row[key];
-		}
-	}
-	getDetailComplete.value = false;
-	formModel.value.workorderId = row.id;
-	formModel.value.model = row.productModel;
-	formModel.value.specification = row.productSpecification;
-	formModel.value.onlyReadWeight = row.weight;
-	axleNumberId.value = null;
-	rowsData.value = row;
-	showDialog.value = true;
-	for (const key in enamelCoverData.value) {
-		if (enamelCoverData.value[key] !== null) {
-			enamelCoverData.value[key] = null;
-		}
-	}
-	selectProductionId.value = row.id;
-	enamelCoverData.value.weight = row.weight;
-
-	const spec = Number(row.productSpecification);
-	drillingCrewoptions.value = [];
-	rowsWorkbenchEnamellingList.value.forEach(item => {
-		const upper = item.productionUpperLimit;
-		const lower = item.productionLowerLimit;
-		if (spec) {
-			if ((spec < upper || spec === upper) && (spec > lower || spec === lower)) {
-				drillingCrewoptions.value.push({ label: item.equipmentCode, value: item.id });
-			}
-		}
-	});
+  for (const key in formModel.value) {
+    if (row[key] !== null) {
+      formModel.value[key] = row[key];
+    }
+  }
+  getDetailComplete.value = false;
+  formModel.value.workorderId = row.id;
+  formModel.value.model = row.productModel;
+  formModel.value.specification = row.productSpecification;
+  formModel.value.onlyReadWeight = row.weight;
+  axleNumberId.value = null;
+  rowsData.value = row;
+  showDialog.value = true;
+  for (const key in enamelCoverData.value) {
+    if (enamelCoverData.value[key] !== null) {
+      enamelCoverData.value[key] = null;
+    }
+  }
+  selectProductionId.value = row.id;
+  enamelCoverData.value.weight = row.weight;
+
+  const spec = Number(row.productSpecification);
+  drillingCrewoptions.value = [];
+  rowsWorkbenchEnamellingList.value.forEach(item => {
+    const upper = item.productionUpperLimit;
+    const lower = item.productionLowerLimit;
+    if (spec) {
+      if ((spec < upper || spec === upper) && (spec > lower || spec === lower)) {
+        drillingCrewoptions.value.push({ label: item.equipmentCode, value: item.id });
+      }
+    }
+  });
 }
 
 function handleDeleteItemType(id: number): void {
-	cancellation(id).then(res => {
-		if (res.code === 200) {
-			message.success('作废成功');
-			init();
-		}
-	});
+  cancellation(id).then(res => {
+    if (res.code === 200) {
+      message.success('作废成功');
+      init();
+    }
+  });
 }
 
 function isInteter(count: number | null, msg: string): boolean {
-	console.log('count ==> ', count);
-	console.log('msg ==> ', msg);
-	if (count === null) return false;
-	const inteters = count.toString().split('.');
-	if (inteters.length > 1) {
-		message.warning(`${msg}数量只能为整数`);
-		return false;
-	}
-	if (count < 0 || count === 0) {
-		message.warning(`${msg}不能小于或等于0`);
-		return false;
-	}
-	return true;
+  console.log('count ==> ', count);
+  console.log('msg ==> ', msg);
+  if (count === null) return false;
+  const inteters = count.toString().split('.');
+  if (inteters.length > 1) {
+    message.warning(`${msg}数量只能为整数`);
+    return false;
+  }
+  if (count < 0 || count === 0) {
+    message.warning(`${msg}不能小于或等于0`);
+    return false;
+  }
+  return true;
 }
 
 function cancel(): void {
-	showDialog.value = false;
+  showDialog.value = false;
 }
 function submitRepetitiom(submitForModel: any, obj: any, func: any) {
-	if (!submitForModel.value) return;
-	submitForModel.value.validate(async errors => {
-		console.log('errors ==> ', errors);
-
-		if (!errors) {
-			if (obj.value.startTime && obj.value.endTime) {
-				const startTime = new Date(obj.value.startTime).getTime();
-				const endTime = new Date(obj.value.endTime).getTime();
-				if (startTime > endTime) {
-					message.warning('开始时间不能大于结束时间');
-					return;
-				}
-			}
-			if (!isInteter(obj.value.plantNumber, '油漆')) return;
-			// if (!isInteter(obj.value.wireDiscNumber, '线盘')) return;
-			if (!isInteter(obj.value.discNumber, '盘数')) return;
-			isRequestAccomplish.value = false;
-			const res = await func({ ...obj.value, ...formModel.value });
-			isRequestAccomplish.value = true;
-			if (res.code === 200) {
-				message.success('排产成功');
-				init();
-				showDialog.value = false;
-			}
-		}
-	});
+  if (!submitForModel.value) return;
+  submitForModel.value.validate(async errors => {
+    console.log('errors ==> ', errors);
+
+    if (!errors) {
+      if (obj.value.startTime && obj.value.endTime) {
+        const startTime = new Date(obj.value.startTime).getTime();
+        const endTime = new Date(obj.value.endTime).getTime();
+        if (startTime > endTime) {
+          message.warning('开始时间不能大于结束时间');
+          return;
+        }
+      }
+      if (!isInteter(obj.value.plantNumber, '油漆')) return;
+      // if (!isInteter(obj.value.wireDiscNumber, '线盘')) return;
+      if (!isInteter(obj.value.discNumber, '盘数')) return;
+      isRequestAccomplish.value = false;
+      const res = await func({ ...obj.value, ...formModel.value });
+      isRequestAccomplish.value = true;
+      if (res.code === 200) {
+        message.success('排产成功');
+        init();
+        showDialog.value = false;
+      }
+    }
+  });
 }
 
 function submit(): void {
-	// if (!isRequestAccomplish.value) return;
-	// if (isActive.value === 0) {
-	//   if (drawBenchData.value.equipmentIdList !== null) {
-	//     drawBenchData.value.equipmentCode = '';
-	//     drawBenchData.value.equipmentId = '';
-	//     drawBenchData.value.equipmentIdList.forEach(item => {
-	//       const index = drawBenchOptions.value.findIndex(ele => ele.value === item);
-	//       drawBenchData.value.equipmentCode += `${drawBenchOptions.value[index].label},`;
-	//       drawBenchData.value.equipmentId += `${item},`;
-	//     });
-	//     drawBenchData.value.equipmentCode = drawBenchData.value.equipmentCode.slice(0, -1);
-	//     drawBenchData.value.equipmentId = drawBenchData.value.equipmentId.slice(0, -1);
-	//   }
-
-	//   submitRepetitiom(lsFormModel, drawBenchData, addWiredrawingWorkOrder);
-	// } else {
-	//   submitRepetitiom(qbFormModel, enamelCoverData, addEnamellingWorkorder);
-	// }
-	submitRepetitiom(qbFormModel, enamelCoverData, addEnamellingWorkorder);
+  // if (!isRequestAccomplish.value) return;
+  // if (isActive.value === 0) {
+  //   if (drawBenchData.value.equipmentIdList !== null) {
+  //     drawBenchData.value.equipmentCode = '';
+  //     drawBenchData.value.equipmentId = '';
+  //     drawBenchData.value.equipmentIdList.forEach(item => {
+  //       const index = drawBenchOptions.value.findIndex(ele => ele.value === item);
+  //       drawBenchData.value.equipmentCode += `${drawBenchOptions.value[index].label},`;
+  //       drawBenchData.value.equipmentId += `${item},`;
+  //     });
+  //     drawBenchData.value.equipmentCode = drawBenchData.value.equipmentCode.slice(0, -1);
+  //     drawBenchData.value.equipmentId = drawBenchData.value.equipmentId.slice(0, -1);
+  //   }
+
+  //   submitRepetitiom(lsFormModel, drawBenchData, addWiredrawingWorkOrder);
+  // } else {
+  //   submitRepetitiom(qbFormModel, enamelCoverData, addEnamellingWorkorder);
+  // }
+  submitRepetitiom(qbFormModel, enamelCoverData, addEnamellingWorkorder);
 }
 
 function getList(): void {
-	getWorkbenchEnamellingList({ pageSize: 999, isEnable: 1 }).then(res => {
-		rowsWorkbenchEnamellingList.value = res.rows;
-		res.rows.forEach((item: { equipmentCode: any; id: any }) => {
-			drillingCrewoptions.value.push({
-				label: item.equipmentCode,
-				value: item.id
-			});
-		});
-	});
-
-	getPlantList({ pageSize: 999 }).then(res => {
-		res.rows.forEach(item => {
-			plantListOptions.value.push({
-				label: `${item.plantName} + ${item.plantTypeName}`,
-				value: item.id,
-				...item
-			});
-		});
-	});
-
-	getAccessoryList({
-		itemTypeId: 24,
-		total: 2,
-		pageSize: 999
-	}).then(res => {
-		res.rows.forEach((item: { model: any; id: any }) => {
-			accessoryListOptions.value.push({
-				label: item.model,
-				value: item.id
-			});
-		});
-	});
-
-	getDictDataList({ pageSize: 999, dictType: 'technology_client_norm' }).then(res => {
-		if (res.code === 200) {
-			res.rows.forEach(item => {
-				standardList.value.push({
-					label: item.dictLabel,
-					value: item.dictValue
-				});
-			});
-		}
-	});
+  getWorkbenchEnamellingList({ pageSize: 999, isEnable: 1 }).then(res => {
+    rowsWorkbenchEnamellingList.value = res.rows;
+    res.rows.forEach((item: { equipmentCode: any; id: any }) => {
+      drillingCrewoptions.value.push({
+        label: item.equipmentCode,
+        value: item.id
+      });
+    });
+  });
+
+  getPlantList({ pageSize: 999 }).then(res => {
+    res.rows.forEach(item => {
+      plantListOptions.value.push({
+        label: `${item.plantName} + ${item.plantTypeName}`,
+        value: item.id,
+        ...item
+      });
+    });
+  });
+
+  getAccessoryList({
+    itemTypeId: 24,
+    total: 2,
+    pageSize: 999
+  }).then(res => {
+    res.rows.forEach((item: { model: any; id: any }) => {
+      accessoryListOptions.value.push({
+        label: item.model,
+        value: item.id
+      });
+    });
+  });
+
+  getDictDataList({ pageSize: 999, dictType: 'technology_client_norm' }).then(res => {
+    if (res.code === 200) {
+      res.rows.forEach(item => {
+        standardList.value.push({
+          label: item.dictLabel,
+          value: item.dictValue
+        });
+      });
+    }
+  });
 }
 
 function handleUpdateValue(value: number, option: planWorkOrder.SelectMixedOption) {
-	enamelCoverData.value.equipmentCode = option.label;
-	const index: number = rowsWorkbenchEnamellingList.value.findIndex(item => item.id === value);
-	if (index === -1) return;
-	const axleNumberList = rowsWorkbenchEnamellingList.value[index].axleNumber.split(/[，,]/g);
-
-	locationOptions.value = [];
-	enamelCoverData.value.axleNumber = null;
-	axleNumberId.value = null;
-	for (let i = 0; i < axleNumberList.length; i += 1) {
-		locationOptions.value.push({
-			value: i,
-			label: axleNumberList[i]
-		});
-	}
+  enamelCoverData.value.equipmentCode = option.label;
+  const index: number = rowsWorkbenchEnamellingList.value.findIndex(item => item.id === value);
+  if (index === -1) return;
+  const axleNumberList = rowsWorkbenchEnamellingList.value[index].axleNumber.split(/[，,]/g);
+
+  locationOptions.value = [];
+  enamelCoverData.value.axleNumber = null;
+  axleNumberId.value = null;
+  for (let i = 0; i < axleNumberList.length; i += 1) {
+    locationOptions.value.push({
+      value: i,
+      label: axleNumberList[i]
+    });
+  }
 }
 
 // watch(showDialog, () => {
@@ -803,29 +803,29 @@ function handleUpdateValue(value: number, option: planWorkOrder.SelectMixedOptio
 // });
 
 function init(): void {
-	startLoading();
-	getWorkOrderArrange({ ...searchForm.value }).then(res => {
-		if (res.code === 200) {
-			searchForm.value.total = res.total;
-			data.value = res.rows;
-		}
-		endLoading();
-	});
+  startLoading();
+  getWorkOrderArrange({ ...searchForm.value }).then(res => {
+    if (res.code === 200) {
+      searchForm.value.total = res.total;
+      data.value = res.rows;
+    }
+    endLoading();
+  });
 }
 onMounted(() => {
-	init();
-	getList();
+  init();
+  getList();
 });
 </script>
 
 <style scoped>
 :deep(.n-form-item-label) {
-	width: 100px !important;
+  width: 100px !important;
 }
 
 .divider {
-	height: 1px;
-	background-color: #ddd;
-	margin-bottom: 30px;
+  height: 1px;
+  background-color: #ddd;
+  margin-bottom: 30px;
 }
 </style>
diff --git a/src/views/procure/procureOrder/index.vue b/src/views/procure/procureOrder/index.vue
index 23c1585..c25cb9a 100644
--- a/src/views/procure/procureOrder/index.vue
+++ b/src/views/procure/procureOrder/index.vue
@@ -130,6 +130,9 @@
                   <n-form-item-grid-item :span="1" label="单位">
                     <n-input v-model:value="panel.form.numMeasureName" disabled placeholder="请选择物品单位"></n-input>
                   </n-form-item-grid-item>
+                  <n-form-item-grid-item :span="1" label="颜色">
+                    <n-input v-model:value="panel.form.color" disabled placeholder="请选择物品颜色"></n-input>
+                  </n-form-item-grid-item>
                   <n-form-item-grid-item :span="1" label="数量">
                     <n-input-number v-model:value="panel.form.quantity" class="w-full" :min="0">
                       <template #suffix>
@@ -146,13 +149,13 @@
                       </template>
                     </n-input-number>
                   </n-form-item-grid-item>
-                  <n-form-item-grid-item :span="1" label="数量">
+                  <!-- <n-form-item-grid-item :span="1" label="数量">
                     <n-input-number v-model:value="panel.form.weight" class="w-full" :min="0">
                       <template #suffix>
                         <div>(kg)</div>
                       </template>
                     </n-input-number>
-                  </n-form-item-grid-item>
+                  </n-form-item-grid-item> -->
                   <n-form-item-grid-item :span="1" label="计划交货日期">
                     <n-date-picker
                       v-model:value="panel.form.deliveryDate"
@@ -226,8 +229,8 @@ import { getMaterialAllAccessory } from '@/service/api/md/itemlist/index';
 import { useLoading } from '~/src/hooks';
 const rules = {
   deptId: createRequiredFormRule('请选择部门'),
-  vendorId: createRequiredFormRule('请选择供应商'),
-  planId: createRequiredFormRule('请选择计划')
+  vendorId: createRequiredFormRule('请选择供应商')
+  // planId: createRequiredFormRule('请选择订单')
 };
 const addFormRef = ref<FormInst | null>(null);
 const message = useMessage();
@@ -273,11 +276,11 @@ const detailColumns: DataTableColumns<Procure.rawProcureList.listType> = [
     key: 'weight',
     width: 80
   },
-  {
-    title: '数量',
-    key: 'quantity',
-    width: 80
-  },
+  // {
+  //   title: '数量',
+  //   key: 'quantity',
+  //   width: 80
+  // },
   {
     title: '规格型号',
     key: 'specification',
@@ -750,8 +753,8 @@ function init() {
   getPurchaseList(searchForm.value).then(res => {
     data.value = res.rows;
     searchForm.value.total = res.total;
+    endLoading();
   });
-  endLoading();
 }
 const itemOptions = ref<
   {
@@ -773,7 +776,6 @@ function selectItem(form) {
       } else {
         form.numMeasureName = item.weightMeasureName;
       }
-      console.log('form.unitType', form.unitType);
     }
   });
 }
diff --git a/src/views/produce/feed/index.vue b/src/views/produce/feed/index.vue
index e73868e..8e8f591 100644
--- a/src/views/produce/feed/index.vue
+++ b/src/views/produce/feed/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <my-card :title="title">
+    <my-card :title="'投料记录列表'">
       <template #right>
         <div style="display: flex; align-items: center">
           <CxColumns v-model:columns="columns" />
@@ -34,7 +34,7 @@ const { loading, startLoading, endLoading } = useLoading();
 const route = useRoute();
 
 const router = useRouter();
-const title = ref<string>('投料记录');
+const title = ref<string>('');
 
 const searchForm = ref<{
   pageNum: number;
@@ -64,8 +64,8 @@ const columns: Ref<DataTableColumns<feedRecords.TabelList>> = ref([
     title: '工单类型',
     key: 'taskType',
     width: 100,
-    render: row => {
-      return row.taskType === '0' ? '拉丝' : '漆包';
+    render: () => {
+      return title.value;
     }
   },
   {
@@ -173,25 +173,25 @@ function back() {
 }
 
 onMounted(() => {
-  title.value = `${route.query.title}-${title.value}`;
+  title.value = `${route.query.title}`;
   searchForm.value.taskId = Number(route.query.id);
-  if (route.query.title === '漆包') {
+  if (route.query.title === '板材眼镜') {
     searchForm.value.taskType = '1';
-    columns.value = [
-      ...columns.value,
-      ...[
-        {
-          title: '轴号',
-          key: 'axleNumber',
-          width: 100
-        },
-        {
-          title: '轴位置数',
-          key: 'alexPositionNumber',
-          width: 100
-        }
-      ]
-    ];
+    // columns.value = [
+    //   ...columns.value,
+    //   ...[
+    //     {
+    //       title: '轴号',
+    //       key: 'axleNumber',
+    //       width: 100
+    //     },
+    //     {
+    //       title: '轴位置数',
+    //       key: 'alexPositionNumber',
+    //       width: 100
+    //     }
+    //   ]
+    // ];
   }
   init();
 });
diff --git a/src/views/produce/report/index.vue b/src/views/produce/report/index.vue
index adc96e3..cf99652 100644
--- a/src/views/produce/report/index.vue
+++ b/src/views/produce/report/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <my-card :title="title">
+    <my-card :title="'报工记录列表'">
       <template #right>
         <div style="display: flex; align-items: center">
           <CxColumns v-model:columns="columns" />
@@ -65,8 +65,8 @@ const columns: Ref<DataTableColumns<workRecords.TabelList>> = ref([
     title: '工单类型',
     key: 'taskType',
     width: 100,
-    render: row => {
-      return row.taskType === '0' ? '拉丝' : '漆包';
+    render: () => {
+      return title.value;
     }
   },
   {
@@ -187,25 +187,25 @@ function back() {
 }
 
 onMounted(() => {
-  title.value = `${route.query.title}-${title.value}`;
+  title.value = `${route.query.title}`;
   searchForm.value.taskId = Number(route.query.id);
-  if (route.query.title === '漆包') {
+  if (route.query.title === '板材眼镜') {
     searchForm.value.taskType = '1';
-    columns.value = [
-      ...columns.value,
-      ...[
-        {
-          title: '轴位置数',
-          key: 'alexPositionNumber',
-          width: 100
-        },
-        {
-          title: '批次',
-          key: 'alexLot',
-          width: 100
-        }
-      ]
-    ];
+    // columns.value = [
+    //   ...columns.value,
+    //   ...[
+    //     {
+    //       title: '轴位置数',
+    //       key: 'alexPositionNumber',
+    //       width: 100
+    //     },
+    //     {
+    //       title: '批次',
+    //       key: 'alexLot',
+    //       width: 100
+    //     }
+    //   ]
+    // ];
   }
   init();
 });
diff --git a/src/views/quality/dailyInspectionPlan/index.vue b/src/views/quality/dailyInspectionPlan/index.vue
index a52a019..4d461d2 100644
--- a/src/views/quality/dailyInspectionPlan/index.vue
+++ b/src/views/quality/dailyInspectionPlan/index.vue
@@ -71,7 +71,7 @@
             label-width="120px"
           >
             <n-grid :cols="2" :x-gap="20">
-              <n-form-item-grid-item label="QB机台" path="dailyplanDevice">
+              <n-form-item-grid-item label="机台" path="dailyplanDevice">
                 <n-space>
                   <n-select
                     v-model:value="dailyplanDeviceId"
@@ -83,7 +83,7 @@
                   ></n-select>
                 </n-space>
               </n-form-item-grid-item>
-              <n-form-item-grid-item label="轴号" path="dailyplanAxle">
+              <!-- <n-form-item-grid-item label="轴号" path="dailyplanAxle">
                 <n-space vertical>
                   <n-select
                     v-model:value="axleNumberId"
@@ -96,7 +96,7 @@
             }"
                   ></n-select>
                 </n-space>
-              </n-form-item-grid-item>
+              </n-form-item-grid-item> -->
               <n-form-item-grid-item label="调换前规格" path="dailyplanBeforeSpec">
                 <n-space vertical>
                   <n-input-number
@@ -258,17 +258,17 @@ const data = ref<dailyInspectionPlan.TableList[]>([]);
 
 const columns: Ref<DataTableColumns<dailyInspectionPlan.TableList>> = ref([
   {
-    title: 'QB机台',
+    title: '机台',
     key: 'dailyplanDevice',
     align: 'center',
     width: 100
   },
-  {
-    title: '轴号',
-    key: 'dailyplanAxle',
-    align: 'center',
-    width: 100
-  },
+  // {
+  //   title: '轴号',
+  //   key: 'dailyplanAxle',
+  //   align: 'center',
+  //   width: 100
+  // },
   {
     title: '换规前规格',
     key: 'dailyplanBeforeSpec',
diff --git a/src/views/scm/linkman/index.vue b/src/views/scm/linkman/index.vue
new file mode 100644
index 0000000..349ccf8
--- /dev/null
+++ b/src/views/scm/linkman/index.vue
@@ -0,0 +1,404 @@
+<template>
+  <div>
+    <my-card title="搜索">
+      <n-form inline>
+        <n-form-item label="供应商全称">
+          <n-input v-model:value="searchForm.supplierName" placeholder="请输入供应商全称" />
+        </n-form-item>
+        <n-form-item label="名称">
+          <n-input v-model:value="searchForm.name" 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 type="info" size="small" class="mr-10px" @click="addOrEdit(0)">
+            <icon-mdi-add />
+            新增
+          </n-button>
+          <CxColumns v-model:columns="columns" />
+        </div>
+      </template>
+      <n-data-table
+        :data="data"
+        :loading="loading"
+        :columns="columns"
+        :scroll-x="dataTableConfig.scrollWidth(columns)"
+      ></n-data-table>
+    </my-card>
+
+    <my-dialog
+      v-model:show="show"
+      :title="addOrEditForm.id ? '编辑联系人' : '新增联系人'"
+      width="900px"
+      @cancel="show = false"
+      @submit="submit"
+    >
+      <template #content>
+        <div>
+          <n-form
+            ref="formModel"
+            style="width: 800px"
+            :rules="rules"
+            :model="addOrEditForm"
+            label-placement="left"
+            label-width="120px"
+          >
+            <n-grid :cols="2" :x-gap="20">
+              <n-form-item-grid-item label="供应商全称" path="supplierName">
+                <n-input v-model:value="addOrEditForm.supplierName" placeholder="请输入供应商全称" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="名称" path="name">
+                <n-input v-model:value="addOrEditForm.name" placeholder="请输入联系人名称" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="职位" path="position">
+                <n-input v-model:value="addOrEditForm.position" placeholder="请输入联系人职位" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="电话">
+                <n-input v-model:value="addOrEditForm.phone" placeholder="请输入职务" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="邮箱">
+                <n-input v-model:value="addOrEditForm.email" placeholder="请输入邮箱" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="地址">
+                <n-input v-model:value="addOrEditForm.address" 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 { ref, onMounted } from 'vue';
+import type { FormInst, DataTableColumns } from 'naive-ui';
+// import { useDialog } from 'naive-ui';
+import { createRequiredFormRule } from '@/utils';
+import { dataTableConfig } from '@/config/dataTableConfig';
+import { useResetSearch } from '~/src/utils/common/searchReset';
+import { useLoading } from '~/src/hooks/index';
+
+const linkmanList = ref<Array<any>>([
+  {
+    id: 8,
+    supplierName: '江西中爱',
+    name: '吴正爱',
+    address: '江西省鹰潭市余江区',
+    phone: '18606617777',
+    position: '销售',
+    email: '405871887@qq.com'
+  },
+  {
+    id: 3,
+    supplierName: '金亮',
+    name: '刘忠亮',
+    phone: '18151618656',
+    position: '销售',
+    email: '1276085660@qq.com',
+    address: '安徽省淮南市寿县大顺镇工业集中区'
+  },
+  {
+    id: 4,
+    supplierName: '金余',
+    name: '池仁昌',
+    phone: '13667019229',
+    position: '销售',
+    email: '290588860@qq.com',
+    address: '江西省鹰潭市余江县'
+  },
+  {
+    id: 1,
+    supplierName: '集美',
+    name: '李授钱',
+    position: '销售',
+    phone: '021-68873368',
+    email: 'info@gmay.com.cn',
+    address: '上海市'
+  },
+  {
+    id: 2,
+    supplierName: '温州启诚',
+    name: '冯永故',
+    phone: '15888663672',
+    position: '销售',
+    email: '15888663672@qq.com',
+    address: '浙江省温州市鹿城区'
+  },
+  {
+    id: 5,
+    supplierName: '华意',
+    name: '柴茂根',
+    phone: '15070935774',
+    position: '销售',
+    email: '1054894481@qq.com',
+    address: '浙江省杭州市余杭区'
+  },
+  {
+    id: 6,
+    supplierName: '中奥',
+    name: '陆韵',
+    phone: '13758283096',
+    position: '销售',
+    email: 'huangyp@chinaoly.com',
+    address: '浙江省杭州市拱墅区'
+  },
+  {
+    id: 7,
+    supplierName: '玉环凯达',
+    name: '黄德凯',
+    phone: '0576-89906355',
+    position: '销售',
+    email: 'Y033@163.com',
+    address: '浙江省玉环市'
+  }
+]);
+
+const { searchForm, reset } = useResetSearch({
+  pageNum: 1,
+  pageSize: 10,
+  total: 0,
+  supplierName: '',
+  name: ''
+});
+
+const addOrEditForm = ref({
+  id: null,
+  supplierName: '',
+  name: '',
+  position: '',
+  phone: '',
+  email: '',
+  address: ''
+});
+
+const rules = {
+  supplierName: createRequiredFormRule('请输入供应商全称'),
+  name: createRequiredFormRule('请输入名称')
+};
+
+const formModel = ref<FormInst | null>(null);
+
+const addOrEditType = ref<number>(0); // 0 : 添加， 1 : 编辑
+
+const show = ref<boolean>(false);
+
+const { loading, startLoading, endLoading } = useLoading();
+
+const data = ref<contactPerson.TableList[]>([]);
+
+const columns: Ref<DataTableColumns<contactPerson.TableList>> = ref([
+  {
+    title: '序号',
+    key: 'index',
+    align: 'center',
+    render: (_row, index) => index + 1,
+    width: 100
+  },
+  {
+    title: '供应商全称',
+    key: 'supplierName',
+    align: 'center',
+    width: 180,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '名称',
+    key: 'name',
+    align: 'center',
+    width: 180,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '职位',
+    key: 'position',
+    align: 'center',
+    width: 180,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '电话',
+    key: 'phone',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '邮箱',
+    key: 'email',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '地址',
+    key: 'address',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '操作',
+    key: 'actions',
+    width: 180,
+    align: 'center',
+    fixed: 'right',
+    render: row => {
+      return (
+        <n-space justify={'center'}>
+          <n-button
+            attr-type="button"
+            size={'small'}
+            type="warning"
+            onClick={() => {
+              addOrEdit(1, row);
+            }}
+          >
+            <icon-mdi-edit />
+            编辑
+          </n-button>
+
+          <n-button
+            type="error"
+            size={'small'}
+            onClick={() => {
+              console.log('1');
+            }}
+          >
+            <icon-mdi-delete />
+            删除
+          </n-button>
+        </n-space>
+      );
+    }
+  }
+]);
+
+// function handleUpdateValue(val, option) {
+//   console.log('val ==>', val);
+//   addOrEditForm.value.clientName = option.clientName;
+//   addOrEditForm.value.clientCode = option.clientCode;
+// }
+
+function addOrEdit(num: number, row?: contactPerson.TableList) {
+  addOrEditType.value = num;
+  show.value = true;
+  addOrEditForm.value = {
+    id: null,
+    supplierName: '',
+    name: '',
+    position: '',
+    phone: '',
+    email: '',
+    address: ''
+  };
+  if (num === 1) {
+    if (!row) return;
+    for (const key in addOrEditForm.value) {
+      if (row[key] || row[key] === '0') {
+        addOrEditForm.value[key] = row[key];
+      }
+    }
+  }
+}
+
+// function handleDeleteItemType(id: number) {
+//   const d = dialog.warning({
+//     title: '删除',
+//     content: '确认要删除吗?',
+//     positiveText: '确认',
+//     negativeText: '取消',
+//     onPositiveClick: () => {
+//       d.loading = true;
+//       return new Promise(resolve => {
+//         deleteCrmContactPerson(id).then(res => {
+//           if (res.code === 200) {
+//             init();
+//             window.$message?.success('删除成功');
+//           }
+//           resolve(true);
+//         });
+//       });
+//     }
+//   });
+// }
+
+function submitSame(func: any, msg: string): void {
+  func(addOrEditForm.value).then(res => {
+    if (res.code === 200) {
+      linkmanList.value.unshift(addOrEditForm.value);
+      show.value = false;
+      window.$message?.success(msg);
+      init();
+    }
+  });
+}
+
+function add() {
+  console.log('add');
+  return new Promise(reslove => {
+    reslove({ code: 200 });
+  });
+}
+
+function edit() {
+  console.log('edit');
+}
+
+function submit(): void {
+  if (!formModel.value) return;
+  formModel.value.validate(errors => {
+    if (!errors) {
+      if (addOrEditType.value === 0) {
+        submitSame(add, '添加成功');
+      } else {
+        submitSame(edit, '编辑成功');
+      }
+    }
+  });
+}
+
+function handleSearch() {
+  init();
+}
+function handleReset() {
+  reset();
+  init();
+}
+
+function init() {
+  startLoading();
+  setTimeout(() => {
+    // for (const key in addOrEditForm.value) {
+    //   if (Object.hasOwn(addOrEditForm.value, key)) {
+    //    if ()
+    //   }
+    // }
+    data.value = linkmanList.value;
+    endLoading();
+  }, 300);
+}
+
+onMounted(() => {
+  init();
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/scm/register/index.vue b/src/views/scm/register/index.vue
new file mode 100644
index 0000000..7aee5e6
--- /dev/null
+++ b/src/views/scm/register/index.vue
@@ -0,0 +1,424 @@
+<template>
+  <div>
+    <my-card title="搜索">
+      <n-form inline>
+        <n-form-item label="供应商全称">
+          <n-input v-model:value="searchForm.supplierName" placeholder="请输入供应商全称" />
+        </n-form-item>
+        <n-form-item label="名称">
+          <n-input v-model:value="searchForm.name" 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 type="info" size="small" class="mr-10px" @click="addOrEdit(0)">
+            <icon-mdi-add />
+            新增
+          </n-button>
+          <CxColumns v-model:columns="columns" />
+        </div>
+      </template>
+      <n-data-table
+        :data="data"
+        :loading="loading"
+        :columns="columns"
+        :scroll-x="dataTableConfig.scrollWidth(columns)"
+      ></n-data-table>
+    </my-card>
+
+    <my-dialog
+      v-model:show="show"
+      :title="addOrEditForm.id ? '编辑注册' : '新增注册'"
+      width="900px"
+      @cancel="show = false"
+      @submit="submit"
+    >
+      <template #content>
+        <div>
+          <n-form
+            ref="formModel"
+            style="width: 800px"
+            :rules="rules"
+            :model="addOrEditForm"
+            label-placement="left"
+            label-width="120px"
+          >
+            <n-grid :cols="2" :x-gap="20">
+              <n-form-item-grid-item label="供应商全称" path="supplierName">
+                <n-input v-model:value="addOrEditForm.supplierName" placeholder="请输入供应商全称" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="名称" path="name">
+                <n-input v-model:value="addOrEditForm.name" placeholder="请输入名称" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="开户行" path="bank">
+                <n-input v-model:value="addOrEditForm.bank" placeholder="请输入开户行" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="地址">
+                <n-input v-model:value="addOrEditForm.address" placeholder="请输入地址" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="主要供应产品">
+                <n-input v-model:value="addOrEditForm.product" placeholder="请输入主要供应产品" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="稅种">
+                <n-input v-model:value="addOrEditForm.totalTax" placeholder="请输入稅种" />
+              </n-form-item-grid-item>
+              <n-form-item-grid-item label="税率">
+                <n-input v-model:value="addOrEditForm.taxRate" 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 { ref, onMounted } from 'vue';
+import type { FormInst, DataTableColumns } from 'naive-ui';
+// import { useDialog } from 'naive-ui';
+import { createRequiredFormRule } from '@/utils';
+import { dataTableConfig } from '@/config/dataTableConfig';
+import { useResetSearch } from '~/src/utils/common/searchReset';
+import { useLoading } from '~/src/hooks/index';
+
+const linkmanList = ref<Array<any>>([
+  {
+    id: 1,
+    supplierName: '江西中爱',
+    name: '江西中爱',
+    address: '江西省鹰潭市余江区',
+    bank: '中国银行',
+    product: '五金配件',
+    totalTax: '增值税',
+    taxRate: '13%'
+  },
+  {
+    id: 2,
+    supplierName: '金亮',
+    name: '金亮',
+    address: '安徽省淮南市寿县大顺镇工业集中区',
+    bank: '中国建设银行',
+    product: '汇川变频器',
+    totalTax: '印花税,增值税',
+    taxRate: '13%'
+  },
+  {
+    id: 3,
+    supplierName: '金余',
+    name: '金余',
+    address: '江西省鹰潭市',
+    bank: '中国银行',
+    product: '拉丝模具、镀锡模、绞线模',
+    totalTax: '印花税,土地使用税,车船使用税',
+    taxRate: '13%'
+  },
+  {
+    id: 4,
+    supplierName: '集美',
+    name: '集美',
+    address: '上海市',
+    bank: '浦发银行',
+    product: '单孔模具、I型模具维修',
+    totalTax: '增值税,土地使用税',
+    taxRate: '13%'
+  },
+  {
+    id: 5,
+    supplierName: '温州启诚',
+    name: '温州启诚',
+    address: '浙江省温州市',
+    bank: '中国工商银行',
+    product: '5寸、8寸、9寸线轴',
+    totalTax: '印花税,土地使用税',
+    taxRate: '13%'
+  },
+  {
+    id: 6,
+    supplierName: '华意',
+    name: '华意',
+    address: '浙江省杭州市',
+    bank: '中国银行',
+    product: '拉丝模具租赁、钻石镀锡模',
+    totalTax: '印花税,土地使用税,车船使用税',
+    taxRate: '13%'
+  },
+
+  {
+    id: 7,
+    supplierName: '中奥',
+    name: '中奥',
+    address: '浙江省杭州市',
+    bank: '‌中国建设银行',
+    product: '5寸、8寸、9寸线轴',
+    totalTax: '增值税普通发票',
+    taxRate: '9%'
+  },
+  {
+    id: 8,
+    supplierName: '玉环凯达',
+    name: '玉环凯达',
+    address: '浙江省玉环市',
+    bank: '‌中国建设银行',
+    product: '5寸、8寸、9寸线轴',
+    totalTax: '400#线盘',
+    taxRate: '13%'
+  }
+]);
+
+const { searchForm, reset } = useResetSearch({
+  pageNum: 1,
+  pageSize: 10,
+  total: 0,
+  supplierName: '',
+  name: ''
+});
+
+const addOrEditForm = ref({
+  id: null,
+  supplierName: '',
+  name: '',
+  address: '',
+  bank: '',
+  product: '',
+  totalTax: '',
+  taxRate: ''
+});
+
+const rules = {
+  supplierName: createRequiredFormRule('请输入供应商全称'),
+  name: createRequiredFormRule('请输入名称')
+};
+
+const formModel = ref<FormInst | null>(null);
+
+const addOrEditType = ref<number>(0); // 0 : 添加， 1 : 编辑
+
+const show = ref<boolean>(false);
+
+const { loading, startLoading, endLoading } = useLoading();
+
+const data = ref<contactPerson.TableList[]>([]);
+
+const columns: Ref<DataTableColumns<contactPerson.TableList>> = ref([
+  {
+    title: '序号',
+    key: 'index',
+    align: 'center',
+    render: (_row, index) => index + 1,
+    width: 100
+  },
+  {
+    title: '供应商全称',
+    key: 'supplierName',
+    align: 'center',
+    width: 180,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '简称',
+    key: 'name',
+    align: 'center',
+    width: 180,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '开户行',
+    key: 'bank',
+    align: 'center',
+    width: 180,
+    ellipsis: {
+      tooltip: true
+    }
+  },
+  {
+    title: '地址',
+    key: 'address',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '主要供应产品',
+    key: 'product',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '稅种',
+    key: 'totalTax',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '税率',
+    key: 'taxRate',
+    align: 'center',
+    width: 120
+  },
+  {
+    title: '操作',
+    key: 'actions',
+    width: 180,
+    align: 'center',
+    fixed: 'right',
+    render: row => {
+      return (
+        <n-space justify={'center'}>
+          <n-button
+            attr-type="button"
+            size={'small'}
+            type="warning"
+            onClick={() => {
+              addOrEdit(1, row);
+            }}
+          >
+            <icon-mdi-edit />
+            编辑
+          </n-button>
+
+          <n-button
+            type="error"
+            size={'small'}
+            onClick={() => {
+              console.log('1');
+            }}
+          >
+            <icon-mdi-delete />
+            删除
+          </n-button>
+        </n-space>
+      );
+    }
+  }
+]);
+
+// function handleUpdateValue(val, option) {
+//   console.log('val ==>', val);
+//   addOrEditForm.value.clientName = option.clientName;
+//   addOrEditForm.value.clientCode = option.clientCode;
+// }
+
+function addOrEdit(num: number, row?: contactPerson.TableList) {
+  addOrEditType.value = num;
+  show.value = true;
+  addOrEditForm.value = {
+    id: null,
+    supplierName: '',
+    name: '',
+    address: '',
+    bank: '',
+    product: '',
+    totalTax: '',
+    taxRate: ''
+  };
+  if (num === 1) {
+    if (!row) return;
+    for (const key in addOrEditForm.value) {
+      if (row[key] || row[key] === '0') {
+        addOrEditForm.value[key] = row[key];
+      }
+    }
+  }
+}
+
+// function handleDeleteItemType(id: number) {
+//   const d = dialog.warning({
+//     title: '删除',
+//     content: '确认要删除吗?',
+//     positiveText: '确认',
+//     negativeText: '取消',
+//     onPositiveClick: () => {
+//       d.loading = true;
+//       return new Promise(resolve => {
+//         deleteCrmContactPerson(id).then(res => {
+//           if (res.code === 200) {
+//             init();
+//             window.$message?.success('删除成功');
+//           }
+//           resolve(true);
+//         });
+//       });
+//     }
+//   });
+// }
+
+function submitSame(func: any, msg: string): void {
+  func(addOrEditForm.value).then(res => {
+    if (res.code === 200) {
+      linkmanList.value.unshift(addOrEditForm.value);
+      show.value = false;
+      window.$message?.success(msg);
+      init();
+    }
+  });
+}
+
+function add() {
+  console.log('add');
+  return new Promise(reslove => {
+    reslove({ code: 200 });
+  });
+}
+
+function edit() {
+  console.log('edit');
+}
+
+function submit(): void {
+  if (!formModel.value) return;
+  formModel.value.validate(errors => {
+    if (!errors) {
+      if (addOrEditType.value === 0) {
+        submitSame(add, '添加成功');
+      } else {
+        submitSame(edit, '编辑成功');
+      }
+    }
+  });
+}
+
+function handleSearch() {
+  init();
+}
+function handleReset() {
+  reset();
+  init();
+}
+
+function init() {
+  startLoading();
+  setTimeout(() => {
+    // for (const key in addOrEditForm.value) {
+    //   if (Object.hasOwn(addOrEditForm.value, key)) {
+    //    if ()
+    //   }
+    // }
+    data.value = linkmanList.value;
+    endLoading();
+  }, 300);
+}
+
+onMounted(() => {
+  init();
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/storage/finishedProductInventory/index.vue b/src/views/storage/finishedProductInventory/index.vue
index af0dcc4..54a2ad7 100644
--- a/src/views/storage/finishedProductInventory/index.vue
+++ b/src/views/storage/finishedProductInventory/index.vue
@@ -2,20 +2,20 @@
   <div>
     <my-card title="搜索条件" search>
       <n-form inline>
-        <n-form-item label="筛选">
+        <!-- <n-form-item label="筛选">
           <n-button class="mr-10px" :type="searchForm.type === '1' ? 'primary' : 'default'" @click="selectCondition()">
             线盘
           </n-button>
-        </n-form-item>
+        </n-form-item> -->
         <n-form-item label="型号">
           <n-input v-model:value="searchForm.model" placeholder="请输入型号" />
         </n-form-item>
         <n-form-item label="规格">
           <n-input v-model:value="searchForm.specification" placeholder="请输入规格" />
         </n-form-item>
-        <n-form-item v-show="searchForm.type === '1'" label="线盘">
+        <!-- <n-form-item v-show="searchForm.type === '1'" label="线盘">
           <n-input v-model:value="searchForm.wireDisc" placeholder="请输入线盘" />
-        </n-form-item>
+        </n-form-item> -->
         <n-form-item label="预警状态">
           <n-select
             v-model:value="searchForm.warningValue"
@@ -276,12 +276,12 @@ const columns: Ref<DataTableColumns<finishedProductInventory.tableList>> = ref([
     width: 100,
     align: 'center'
   },
-  {
-    title: '线盘',
-    key: 'wireDisc',
-    width: 200,
-    align: 'center'
-  },
+  // {
+  //   title: '线盘',
+  //   key: 'wireDisc',
+  //   width: 200,
+  //   align: 'center'
+  // },
   {
     title: '箱数',
     key: 'totalNumber',
@@ -441,19 +441,19 @@ function warningStatus(status: string) {
   }
 }
 
-function selectCondition() {
-  if (!searchRequestComplete.value) {
-    window.$message?.warning('搜索中请稍等');
-    return;
-  }
-  if (searchForm.value.type === '1') {
-    searchForm.value.type = '0';
-  } else {
-    searchForm.value.type = '1';
-  }
-
-  init();
-}
+// function selectCondition() {
+//   if (!searchRequestComplete.value) {
+//     window.$message?.warning('搜索中请稍等');
+//     return;
+//   }
+//   if (searchForm.value.type === '1') {
+//     searchForm.value.type = '0';
+//   } else {
+//     searchForm.value.type = '1';
+//   }
+
+//   init();
+// }
 
 // function clearData() {
 //   const d = dialog.warning({
diff --git a/src/views/storage/stockTaking/index.vue b/src/views/storage/stockTaking/index.vue
index d164913..0b85e0e 100644
--- a/src/views/storage/stockTaking/index.vue
+++ b/src/views/storage/stockTaking/index.vue
@@ -127,6 +127,7 @@ import {
   outWmsTakeStock,
   deleteWmsTakeStock
 } from '@/service/api/storage/stockTaking/index';
+import { getDictDataList } from '@/service/api/system/dictData';
 import { useLoading } from '~/src/hooks';
 import { useResetSearch } from '~/src/utils/common/searchReset';
 type DataType = {
@@ -155,7 +156,7 @@ type DataType = {
 
 type selectList = {
   label: string;
-  value: number;
+  value: string;
 };
 const { loading, startLoading, endLoading } = useLoading();
 const { searchForm, reset } = useResetSearch({
@@ -169,11 +170,7 @@ const { searchForm, reset } = useResetSearch({
   itemName: '',
   warehouseName: ''
 });
-const statusList = ref<Array<selectList>>([
-  { label: '拉丝在制品', value: 0 },
-  { label: '漆包在制品', value: 1 },
-  { label: '油漆', value: 2 }
-]);
+const statusList = ref<Array<selectList>>([]);
 const showDialog = ref<boolean>(false);
 const requestMiddle = ref<boolean>(false);
 const addForm = ref<{
@@ -350,16 +347,18 @@ function handleReset() {
 }
 
 function getStatusName(wmsType: string) {
-  switch (wmsType) {
-    case '0':
-      return '拉丝在制品';
-    case '1':
-      return '漆包在制品';
-    case '2':
-      return '油漆';
-    default:
-      return '';
-  }
+  return statusList.value.find(item => item.value === wmsType)?.label;
+}
+
+async function getList() {
+  await getDictDataList({ dictType: 'material_type', pageSize: 999 }).then(res => {
+    if (res.code === 200) {
+      const resultDat = res?.rows || [];
+      for (const item of resultDat) {
+        statusList.value.push({ label: item.dictLabel, value: item.dictValue });
+      }
+    }
+  });
 }
 
 function init() {
@@ -373,7 +372,8 @@ function init() {
     }
   });
 }
-onMounted(() => {
+onMounted(async () => {
+  await getList();
   init();
 });
 </script>
diff --git a/src/views/technology/operatingSpecification/index.vue b/src/views/technology/operatingSpecification/index.vue
index 393d9c7..d3c3860 100644
--- a/src/views/technology/operatingSpecification/index.vue
+++ b/src/views/technology/operatingSpecification/index.vue
@@ -59,13 +59,13 @@
                   :style="{ width: formItemWidth }"
                 />
               </n-form-item-grid-item>
-              <n-form-item-grid-item label="关联漆包机机型" path="enanellingWorkbenchId">
+              <n-form-item-grid-item label="关联机台机型" path="enanellingWorkbenchId">
                 <n-space vertical>
                   <n-select
                     v-model:value="addForm.enanellingWorkbenchId"
                     :options="enanellingWorkbenchList"
                     :style="{ width: formItemWidth }"
-                    placeholder="请选择关联漆包机机型"
+                    placeholder="请选择关联机台机型"
                     filterable
                     @update:value="handleUpdateValue"
                   ></n-select>
@@ -87,7 +87,7 @@
                   :headers="{ Authorization: 'Bearer ' + useAuthStore().token }"
                   :default-upload="true"
                   :max="1"
-                  :action="baseurl + '/file/upload'"
+                  :action="baseurl + 'file/upload'"
                   :on-error="errorFile"
                   @finish="finish"
                   @remove="removeFile"
@@ -173,7 +173,7 @@ const enanellingWorkbenchList = ref<SelectMixedOption[]>([]);
 const rules = {
   operationName: createRequiredFormRule('请输入操作规范名称'),
   operationCode: createRequiredFormRule('请输入操作规范编码'),
-  enanellingWorkbenchId: createRequiredFormRule('请选择关联漆包机机型'),
+  enanellingWorkbenchId: createRequiredFormRule('请选择关联机台机型'),
   ableTime: createRequiredFormRule('请输入生效日期'),
   filePath: createRequiredFormRule('请选择上传文件')
 };
@@ -201,7 +201,7 @@ const columns: Ref<DataTableColumns<operationInstruction.columns>> = ref([
     width: 100
   },
   {
-    title: '关联漆包机机型',
+    title: '关联机台机型',
     key: 'enanellingWorkbenchName',
     align: 'center',
     width: 100
diff --git a/src/views/technology/operationInstruction/index.vue b/src/views/technology/operationInstruction/index.vue
index a12146e..01830e7 100644
--- a/src/views/technology/operationInstruction/index.vue
+++ b/src/views/technology/operationInstruction/index.vue
@@ -59,13 +59,13 @@
                   :style="{ width: formItemWidth }"
                 />
               </n-form-item-grid-item>
-              <n-form-item-grid-item label="关联漆包机机型" path="enanellingWorkbenchId">
+              <n-form-item-grid-item label="关联机台机型" path="enanellingWorkbenchId">
                 <n-space vertical>
                   <n-select
                     v-model:value="addForm.enanellingWorkbenchId"
                     :options="enanellingWorkbenchList"
                     :style="{ width: formItemWidth }"
-                    placeholder="请选择关联漆包机机型"
+                    placeholder="请选择关联机台机型"
                     filterable
                     @update:value="handleUpdateValue"
                   ></n-select>
@@ -168,7 +168,7 @@ const enanellingWorkbenchList = ref<SelectMixedOption[]>([]);
 const rules = {
   operationName: createRequiredFormRule('请输入作业指导书名称'),
   operationCode: createRequiredFormRule('请输入作业指导书编码'),
-  enanellingWorkbenchId: createRequiredFormRule('请选择关联漆包机机型'),
+  enanellingWorkbenchId: createRequiredFormRule('请选择关联机台机型'),
   ableTime: createRequiredFormRule('请输入生效日期'),
   filePath: createRequiredFormRule('请选择上传文件')
 };
@@ -196,7 +196,7 @@ const columns: Ref<DataTableColumns<operationInstruction.columns>> = ref([
     width: 100
   },
   {
-    title: '关联漆包机机型',
+    title: '关联机台机型',
     key: 'enanellingWorkbenchName',
     align: 'center',
     width: 100