From 8cf735c7102920a22f64826b6527fb5bef440e72 Mon Sep 17 00:00:00 2001
From: xushilin <1354769781@qq.com>
Date: Fri, 21 Mar 2025 15:55:59 +0800
Subject: [PATCH] =?UTF-8?q?init(projects):=20=E6=95=B4=E4=BD=93=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/system-logo.vue         |   5 +-
 src/typings/plan.d.ts                         |   1 +
 .../pointInspection/upkeepRecord/index.vue    |  60 ++--
 src/views/md/plant/plantOutinLog/index.vue    |  16 -
 src/views/md/workgroup/index.vue              |   1 +
 src/views/plan/drawingWorkOrder/index.vue     | 105 +++----
 src/views/plan/enamelEoverPlanAdmin/index.vue |   2 +-
 src/views/plan/paintJobOrder/index.vue        | 128 ++------
 src/views/plan/produceOrder/index.vue         |  64 +---
 src/views/procure/saleReturnRecord/index.vue  |  42 +--
 src/views/produce/feedRecords/index.vue       |  24 +-
 .../enamellingProcessCheckRecord/index.vue    |   4 +-
 .../quality/rawMaterialSummary/index.vue      | 292 +++++++++---------
 .../storage/finishedProductWarning/index.vue  |  16 +-
 src/views/storage/productInventory/index.vue  |  12 +-
 src/views/storage/rawMaterial/index.vue       |  63 ++--
 src/views/storage/semiProduct/index.vue       |  40 +--
 .../technology/technologyEnter/index.vue      |  27 +-
 .../technology/technologyExamine/index.vue    |  12 +-
 .../technology/technologySearch/index.vue     | 156 +++++-----
 20 files changed, 455 insertions(+), 615 deletions(-)

diff --git a/src/components/common/system-logo.vue b/src/components/common/system-logo.vue
index d3b2841..447c342 100644
--- a/src/components/common/system-logo.vue
+++ b/src/components/common/system-logo.vue
@@ -5,8 +5,9 @@
   <!-- <icon-local-ak-logo v-if="fill" />
   <icon-local-ak-logo v-else /> -->
   <!-- 加载图标 -->
-  <img src="../../assets/img/sys.png" alt="" style="width: 64px; height: 34px" />
-  <div></div>
+  <div>
+    <img src="../../assets/img/sys.png" alt="" style="width: 64px; height: 34px" />
+  </div>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/typings/plan.d.ts b/src/typings/plan.d.ts
index 3824605..4524fa2 100644
--- a/src/typings/plan.d.ts
+++ b/src/typings/plan.d.ts
@@ -86,6 +86,7 @@ declare namespace planWorkOrder {
     wireDiscNumber: number | null;
     wireDiscId: number | null;
     plantNameList: any;
+    attr2?: number | null;
   }
 
   type SelectMixedOption = {
diff --git a/src/views/device/pointInspection/upkeepRecord/index.vue b/src/views/device/pointInspection/upkeepRecord/index.vue
index cbc55f1..4a1ae73 100644
--- a/src/views/device/pointInspection/upkeepRecord/index.vue
+++ b/src/views/device/pointInspection/upkeepRecord/index.vue
@@ -183,42 +183,42 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
     width: 140,
     key: 'planCode'
   },
-  {
-    title: '计划名称',
-    align: 'center',
-    width: 160,
-    key: 'planName'
-  },
-  {
-    title: '设备编码',
-    align: 'center',
-    width: 100,
-    key: 'equipmentCode'
-  },
-  {
-    title: '设备名称',
-    align: 'center',
-    width: 140,
-    key: 'equipmentName'
-  },
+  // {
+  //   title: '计划名称',
+  //   align: 'center',
+  //   width: 160,
+  //   key: 'planName'
+  // },
+  // {
+  //   title: '设备编码',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'equipmentCode'
+  // },
+  // {
+  //   title: '设备名称',
+  //   align: 'center',
+  //   width: 140,
+  //   key: 'equipmentName'
+  // },
   {
     title: '设备类型',
     align: 'center',
     width: 180,
     key: 'equipmentModel'
   },
-  {
-    title: '保养类型',
-    align: 'center',
-    width: 140,
-    key: 'itemTypeName'
-  },
-  {
-    title: '保养组别',
-    align: 'center',
-    width: 140,
-    key: 'workgroupName'
-  },
+  // {
+  //   title: '保养类型',
+  //   align: 'center',
+  //   width: 140,
+  //   key: 'itemTypeName'
+  // },
+  // {
+  //   title: '保养组别',
+  //   align: 'center',
+  //   width: 140,
+  //   key: 'workgroupName'
+  // },
   {
     title: '负责人',
     align: 'center',
diff --git a/src/views/md/plant/plantOutinLog/index.vue b/src/views/md/plant/plantOutinLog/index.vue
index 6c47c89..44e3889 100644
--- a/src/views/md/plant/plantOutinLog/index.vue
+++ b/src/views/md/plant/plantOutinLog/index.vue
@@ -390,16 +390,6 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
     render(row: any) {
       return (
         <n-space>
-          <n-button
-            v-show={row.status === '0'}
-            size="small"
-            type="info"
-            onClick={() => {
-              openSelectSocket(row);
-            }}
-          >
-            补打标签
-          </n-button>
           <n-button
             v-show={row.status === '0'}
             size="small"
@@ -454,12 +444,6 @@ function deletePlantIn(deleteId: number) {
     }
   });
 }
-
-function openSelectSocket(row: DataType) {
-  rawMaterial1Row.value = row;
-  reprintShow.value = true;
-}
-
 function submitReprint() {
   if (!formReprintRef.value) return;
   formReprintRef.value.validate(errors => {
diff --git a/src/views/md/workgroup/index.vue b/src/views/md/workgroup/index.vue
index 97040f1..8d9c880 100644
--- a/src/views/md/workgroup/index.vue
+++ b/src/views/md/workgroup/index.vue
@@ -78,6 +78,7 @@
             <n-form-item label="是否启用：" path="ifEnable">
               <n-select
                 v-model:value="addForm.ifEnable"
+                style="width: 200px"
                 :options="[
                   { label: '启用', value: 1 },
                   { label: '禁用', value: 0 }
diff --git a/src/views/plan/drawingWorkOrder/index.vue b/src/views/plan/drawingWorkOrder/index.vue
index e85984b..94d3d72 100644
--- a/src/views/plan/drawingWorkOrder/index.vue
+++ b/src/views/plan/drawingWorkOrder/index.vue
@@ -216,21 +216,21 @@ const columns: Ref<DataTableColumns<drawingWorkOrder.tabelList>> = ref([
       tooltip: true
     }
   },
-  {
-    title: '开始机台',
-    width: 160,
-    align: 'center',
-    key: 'equipmentCode',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '结束机台',
-    width: 100,
-    align: 'center',
-    key: 'enamellingEquipmentCode'
-  },
+  // {
+  //   title: '开始机台',
+  //   width: 160,
+  //   align: 'center',
+  //   key: 'equipmentCode',
+  //   ellipsis: {
+  //     tooltip: true
+  //   }
+  // },
+  // {
+  //   title: '结束机台',
+  //   width: 100,
+  //   align: 'center',
+  //   key: 'enamellingEquipmentCode'
+  // },
   {
     title: '产品型号',
     width: 100,
@@ -316,29 +316,10 @@ const columns: Ref<DataTableColumns<drawingWorkOrder.tabelList>> = ref([
     title: '操作',
     key: 'action',
     fixed: 'right',
-    width: 320,
+    width: 120,
     render: row => {
       return (
         <n-space>
-          {/* <n-button type="info" onClick={() => updateEquipmentCode(row)}>
-            修改LS机台
-          </n-button> */}
-          <n-button
-            type="info"
-            size="small"
-            v-show={row.status !== '3' && row.status !== '2'}
-            onClick={() => updateEquipmentCode(row, 1)}
-          >
-            下发换规单
-          </n-button>
-          <n-button
-            size="small"
-            type="warning"
-            v-show={row.status !== '2' && row.status !== '3'}
-            onClick={() => updateEquipmentCode(row, 0)}
-          >
-            修改开始机台
-          </n-button>
           <n-button size="small" type="error" v-show={row.status === '1'} onClick={() => completeWorkOrder(row.id)}>
             工单完工
           </n-button>
@@ -409,33 +390,33 @@ function submitUpdateInit(msg: string) {
   formModelData.value.equipmentList = [];
 }
 
-function updateEquipmentCode(row: drawingWorkOrder.tabelList, type: number) {
-  actionType.value = type;
-  machineList.value = [];
-  showDialog.value = true;
-  rowDetail.value = JSON.parse(JSON.stringify(row));
-  const equipmentList = rowDetail.value.equipmentId.split(',');
-  formModelData.value.equipmentList = [];
-  equipmentList.forEach(item => {
-    formModelData.value.equipmentList.push(Number(item));
-  });
-  if (type === 0) {
-    machineListAll.value.forEach(item => {
-      machineList.value.push({
-        label: item.label,
-        value: item.value
-      });
-    });
-  } else {
-    const equipmentCodeList = rowDetail.value.equipmentCode.split(',');
-    equipmentCodeList.forEach((item, index) => {
-      machineList.value.push({
-        label: item,
-        value: Number(equipmentList[index])
-      });
-    });
-  }
-}
+// function updateEquipmentCode(row: drawingWorkOrder.tabelList, type: number) {
+//   actionType.value = type;
+//   machineList.value = [];
+//   showDialog.value = true;
+//   rowDetail.value = JSON.parse(JSON.stringify(row));
+//   const equipmentList = rowDetail.value.equipmentId.split(',');
+//   formModelData.value.equipmentList = [];
+//   equipmentList.forEach(item => {
+//     formModelData.value.equipmentList.push(Number(item));
+//   });
+//   if (type === 0) {
+//     machineListAll.value.forEach(item => {
+//       machineList.value.push({
+//         label: item.label,
+//         value: item.value
+//       });
+//     });
+//   } else {
+//     const equipmentCodeList = rowDetail.value.equipmentCode.split(',');
+//     equipmentCodeList.forEach((item, index) => {
+//       machineList.value.push({
+//         label: item,
+//         value: Number(equipmentList[index])
+//       });
+//     });
+//   }
+// }
 
 // const sleep = row =>
 //   new Promise(resolve => {
diff --git a/src/views/plan/enamelEoverPlanAdmin/index.vue b/src/views/plan/enamelEoverPlanAdmin/index.vue
index 36f4e12..bc10a70 100644
--- a/src/views/plan/enamelEoverPlanAdmin/index.vue
+++ b/src/views/plan/enamelEoverPlanAdmin/index.vue
@@ -137,7 +137,7 @@ import {
 } from '~/src/service/api/plan/enamellingWorkOrder';
 const { loading, startLoading, endLoading } = useLoading();
 
-const title = ref<string>('漆包计划管理列表');
+const title = ref<string>('计划管理列表');
 const searchForm = ref<enamelEoverPlanAdmin.searchForm>({
   status: 1,
   pageNum: 1,
diff --git a/src/views/plan/paintJobOrder/index.vue b/src/views/plan/paintJobOrder/index.vue
index 2eba869..3a4f223 100644
--- a/src/views/plan/paintJobOrder/index.vue
+++ b/src/views/plan/paintJobOrder/index.vue
@@ -10,7 +10,7 @@
             :options="workOrderStatus"
           ></n-select>
         </n-form-item>
-        <n-form-item label="机台">
+        <!-- <n-form-item label="机台">
           <n-select
             v-model:value="searchForm.deviceId"
             placeholder="请选择机台"
@@ -21,15 +21,15 @@
             searchForm.equipmentCode = item.label;
           }"
           ></n-select>
-        </n-form-item>
-        <n-form-item label="位置">
+        </n-form-item> -->
+        <!-- <n-form-item label="位置">
           <n-select
             v-model:value="searchForm.axleNumber"
             placeholder="请选择位置"
             :options="localList"
             class="w-160px"
           ></n-select>
-        </n-form-item>
+        </n-form-item> -->
         <n-form-item label="订单类型">
           <n-select
             v-model:value="searchForm.orderType"
@@ -475,11 +475,10 @@ const orderTypeList = ref<{ label: string; value: number }[]>([
   { label: '客户订单', value: 0 },
   { label: '备库订单', value: 1 }
 ]);
-const localList = ref<{ label: string; value: string }[]>([
-  { label: '左', value: '左' },
-  { label: '右', value: '右' }
-]);
-const plantIds = ref<Array<number>>([]);
+// const localList = ref<{ label: string; value: string }[]>([
+//   { label: '左', value: '左' },
+//   { label: '右', value: '右' }
+// ]);
 const data = ref<paintJobOrder.tabelList[]>([]);
 
 const columns: Ref<DataTableColumns<paintJobOrder.tabelList>> = ref([
@@ -490,12 +489,12 @@ const columns: Ref<DataTableColumns<paintJobOrder.tabelList>> = ref([
     width: 100,
     render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
   },
-  {
-    title: '结束机台',
-    width: 100,
-    align: 'center',
-    key: 'equipmentCode'
-  },
+  // {
+  //   title: '结束机台',
+  //   width: 100,
+  //   align: 'center',
+  //   key: 'equipmentCode'
+  // },
   // {
   //   title: '位置',
   //   width: 160,
@@ -629,38 +628,22 @@ const columns: Ref<DataTableColumns<paintJobOrder.tabelList>> = ref([
     title: '操作',
     key: 'action',
     fixed: 'right',
-    width: 280,
+    width: 180,
     render: row => {
+      if (row.status === '2') {
+        return '已完工不可操作';
+      }
       return (
         <div>
-          <n-button
-            type="info"
-            size="small"
-            class="mr-10px"
-            onClick={() => drawbenchScheduling(row)}
-            v-show={row.attr1 !== 'Y' && row.status === '0'}
-          >
-            金属排产
-          </n-button>
           <n-button
             type="error"
             size="small"
             class="mr-10px"
-            onClick={() => completeWorkOrder(row.id)}
             v-show={row.status === '1' || (row.attr1 === 'Y' && row.status === '0')}
+            onClick={() => completeWorkOrder(row.id)}
           >
             工单完工
           </n-button>
-          <n-button
-            class="mr-10px"
-            type="warning"
-            size="small"
-            onClick={() => edit(row)}
-            v-show={row}
-            v-show={row.status === '0'}
-          >
-            编辑
-          </n-button>
           <n-button
             type="error"
             size="small"
@@ -751,42 +734,6 @@ const detailColumns: Ref<DataTableColumns<paintJobOrder.tabelList>> = ref([
   }
 ]);
 
-function edit(row: paintJobOrder.tabelList) {
-  console.time('运行时长');
-  editData.value = row;
-  editShow.value = true;
-  plantIds.value = [];
-  const plantNameList = row.plantName.split(',');
-  plantNameList.forEach(item => {
-    const plant = plantListOptions.value.find(ele => item === ele.label);
-    if (plant) {
-      plantIds.value.push(plant.value);
-    }
-  });
-  const index = machineList.value.findIndex(item => item.id === row.equipmentId);
-  if (index === -1) return;
-  const axleNumberList = machineList.value[index].axleNumber.split(/[，,]/g);
-  locationOptions.value = [];
-  for (let i = 0; i < axleNumberList.length; i += 1) {
-    locationOptions.value.push({
-      value: i,
-      label: axleNumberList[i]
-    });
-  }
-  const axleNumberIds = row.axleNumber.split(',');
-  axleNumberId.value = [];
-  axleNumberIds.forEach(item => {
-    const axleNumberItem = locationOptions.value.find(ele => item === ele.label);
-    if (axleNumberItem && axleNumberId.value !== null) {
-      axleNumberId.value.push(axleNumberItem.value);
-    }
-  });
-  if (axleNumberId.value && axleNumberId.value.length > 0) {
-    detailData.value = [];
-    getDetailData();
-  }
-}
-
 function completeWorkOrder(id: number) {
   const d = dialog.warning({
     title: '提示',
@@ -829,41 +776,6 @@ function handleDeleteItemTypeLs(id: number) {
   });
 }
 
-function drawbenchScheduling(row: paintJobOrder.tabelList) {
-  showDialog.value = true;
-  for (const key in drawBenchData.value) {
-    if (drawBenchData.value !== null) {
-      drawBenchData.value[key] = null;
-    }
-  }
-
-  for (const key in formModel.value) {
-    if (row[key] !== null) {
-      formModel.value[key] = row[key];
-    }
-  }
-  formModel.value.onlyReadWeight = row.weight;
-  formModel.value.qbEquipmentCode = row.equipmentCode;
-  drawBenchData.value.enamellingEquipmentCode = row.equipmentCode;
-  drawBenchData.value.enamellingEquipmentId = row.equipmentId;
-  drawBenchData.value.weight = row.weight;
-
-  const spec = Number(row.specification);
-  drawBenchOptions.value = [];
-  drawBenchOptionsData.value.forEach(item => {
-    const upper = item.productionUpperLimit;
-    const lower = item.productionLowerLimit;
-    if (spec) {
-      if ((spec < upper || spec === upper) && (spec > lower || spec === lower)) {
-        drawBenchOptions.value.push({
-          label: item.equipmentCode,
-          value: item.id
-        });
-      }
-    }
-  });
-}
-
 function handleUpdateValue(value: number, option: planWorkOrder.SelectMixedOption) {
   editData.value.equipmentCode = option.label;
   const index: number = machineList.value.findIndex(item => item.id === value);
@@ -1065,8 +977,8 @@ function init() {
       searchForm.value.total = res.total;
       data.value = res.rows;
     }
+    endLoading();
   });
-  endLoading();
 }
 onMounted(() => {
   init();
diff --git a/src/views/plan/produceOrder/index.vue b/src/views/plan/produceOrder/index.vue
index ba40ea4..3d89fe6 100644
--- a/src/views/plan/produceOrder/index.vue
+++ b/src/views/plan/produceOrder/index.vue
@@ -99,16 +99,14 @@
               label-width="70px"
             >
               <n-grid :cols="2" :x-gap="20">
-                <n-form-item-grid-item label="机台" path="equipmentId">
+                <n-form-item-grid-item label="工单类型" path="attr2">
                   <n-space>
                     <n-select
-                      v-model:value="enamelCoverData.equipmentId"
-                      :options="drillingCrewoptions"
+                      v-model:value="enamelCoverData.attr2"
+                      :options="workOrderType"
                       :style="{ width: formItemWidth }"
-                      placeholder="请选择机台"
-                      :disabled="getDetailComplete"
+                      placeholder="请选择工单类型"
                       filterable
-                      @update:value="handleUpdateValue"
                     ></n-select>
                   </n-space>
                 </n-form-item-grid-item>
@@ -276,10 +274,15 @@ const enamelCoverData = ref<planWorkOrder.enamelCoverData>({
   standardValue: null,
   standardName: '',
   wireDiscId: null,
-  plantNameList: null
+  plantNameList: null,
+  attr2: null
 });
 
 // const lsFormModel = ref<FormInst | null>(null);
+const workOrderType = [
+  { label: '金属工单', value: 0 },
+  { label: '板材工单', value: 1 }
+];
 const range = ref<[number, number] | null>(null);
 const qbFormModel = ref<FormInst | null>(null);
 
@@ -297,8 +300,6 @@ const isActive = ref<number>(1);
 
 // const drawBenchOptions = ref<planWorkOrder.SelectMixedOption[]>([]);
 
-const locationOptions = ref<planWorkOrder.SelectMixedOption[]>([]);
-
 const standardList = ref<planWorkOrder.SelectMixedOption[]>([]);
 
 // const timer = ref<any>(null);
@@ -326,7 +327,7 @@ const workOrderStatus = [
 ];
 
 const qbRules = {
-  equipmentId: createRequiredFormRule('请选择机台'),
+  attr2: createRequiredFormRule('请选择工单类型'),
   axleNumber: createRequiredFormRule('请选择位置'),
   plantName: createRequiredFormRule('请选择板料'),
   discNumber: createRequiredFormRule('请输入插针数'),
@@ -704,9 +705,9 @@ function submitRepetitiom(submitForModel: any, obj: any, func: any) {
           return;
         }
       }
-      if (!isInteter(obj.value.plantNumber, '油漆')) return;
+      if (!isInteter(obj.value.plantNumber, '板料')) return;
       // if (!isInteter(obj.value.wireDiscNumber, '线盘')) return;
-      if (!isInteter(obj.value.discNumber, '盘数')) return;
+      if (!isInteter(obj.value.discNumber, '插针数')) return;
       isRequestAccomplish.value = false;
       const res = await func({ ...obj.value, ...formModel.value });
       isRequestAccomplish.value = true;
@@ -720,24 +721,6 @@ function submitRepetitiom(submitForModel: any, obj: any, func: any) {
 }
 
 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);
 }
 
@@ -787,27 +770,6 @@ function getList(): void {
   });
 }
 
-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]
-    });
-  }
-}
-
-// watch(showDialog, () => {
-//   changeActive(1);
-// });
-
 function init(): void {
   startLoading();
   getWorkOrderArrange({ ...searchForm.value }).then(res => {
diff --git a/src/views/procure/saleReturnRecord/index.vue b/src/views/procure/saleReturnRecord/index.vue
index f29d79c..f20f1fc 100644
--- a/src/views/procure/saleReturnRecord/index.vue
+++ b/src/views/procure/saleReturnRecord/index.vue
@@ -170,33 +170,33 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
     key: 'quantityUnit',
     width: 120
   },
-  {
-    title: '退货二维码',
-    align: 'center',
-    key: 'returnSnCode',
-    width: 180
-  },
+  // {
+  //   title: '退货二维码',
+  //   align: 'center',
+  //   key: 'returnSnCode',
+  //   width: 180
+  // },
   {
     title: '退货名称',
     align: 'center',
     key: 'returnName',
     width: 140
   },
-  {
-    title: '退货型号',
-    align: 'center',
-    key: 'returnModel',
-    width: 140,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '退货规格',
-    align: 'center',
-    key: 'returnSpecification',
-    width: 100
-  },
+  // {
+  //   title: '退货型号',
+  //   align: 'center',
+  //   key: 'returnModel',
+  //   width: 140,
+  //   ellipsis: {
+  //     tooltip: true
+  //   }
+  // },
+  // {
+  //   title: '退货规格',
+  //   align: 'center',
+  //   key: 'returnSpecification',
+  //   width: 100
+  // },
   {
     title: '退货供应商',
     align: 'center',
diff --git a/src/views/produce/feedRecords/index.vue b/src/views/produce/feedRecords/index.vue
index 49116fd..0d494e5 100644
--- a/src/views/produce/feedRecords/index.vue
+++ b/src/views/produce/feedRecords/index.vue
@@ -128,18 +128,18 @@ const columns: Ref<DataTableColumns<feedRecords.TabelList>> = ref([
     align: 'center',
     width: 100
   },
-  {
-    title: '轴号',
-    key: 'axleNumber',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '轴位置数',
-    key: 'alexPositionNumber',
-    align: 'center',
-    width: 100
-  },
+  // {
+  //   title: '轴号',
+  //   key: 'axleNumber',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '轴位置数',
+  //   key: 'alexPositionNumber',
+  //   align: 'center',
+  //   width: 100
+  // },
   {
     title: '订单类型',
     key: 'orderType',
diff --git a/src/views/quality/enamellingProcessCheckRecord/index.vue b/src/views/quality/enamellingProcessCheckRecord/index.vue
index ef5f88d..fc1b538 100644
--- a/src/views/quality/enamellingProcessCheckRecord/index.vue
+++ b/src/views/quality/enamellingProcessCheckRecord/index.vue
@@ -79,7 +79,7 @@
         </n-form-item>
       </n-form>
     </my-card>
-    <my-card title="漆包过程检列表">
+    <my-card title="过程检列表">
       <template #right>
         <div>
           <CxColumns v-model:columns="columns" />
@@ -153,7 +153,7 @@ const columns: Ref<DataTableColumns<enamellingProcessCheckRecord.TableList>> = r
     align: 'center',
     width: 100,
     render: row => {
-      return row.workOrdeType === '0' ? '拉丝' : '漆包';
+      return row.workOrdeType === '0' ? '金属' : '板材';
     }
   },
   {
diff --git a/src/views/quality/rawMaterialSummary/index.vue b/src/views/quality/rawMaterialSummary/index.vue
index d0eb443..3205cfa 100644
--- a/src/views/quality/rawMaterialSummary/index.vue
+++ b/src/views/quality/rawMaterialSummary/index.vue
@@ -8,9 +8,9 @@
         <n-form-item label="型号">
           <n-input v-model:value="searchForm.variety1" type="text" placeholder="型号" />
         </n-form-item>
-        <n-form-item label="线盘">
+        <!-- <n-form-item label="线盘">
           <n-input v-model:value="searchForm.im1" type="text" placeholder="线盘" />
-        </n-form-item>
+        </n-form-item> -->
         <n-form-item label="工号">
           <n-input v-model:value="searchForm.im3" type="text" placeholder="工号" />
         </n-form-item>
@@ -105,18 +105,18 @@ const columns: Ref<DataTableColumns<rawMaterialSummary.TableList>> = ref([
     align: 'center',
     width: 100
   },
-  {
-    title: '线盘',
-    key: 'im1',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '线盘数量',
-    key: 'im2',
-    width: 100,
-    align: 'center'
-  },
+  // {
+  //   title: '线盘',
+  //   key: 'im1',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '线盘数量',
+  //   key: 'im2',
+  //   width: 100,
+  //   align: 'center'
+  // },
   {
     title: '工号',
     key: 'im3',
@@ -129,12 +129,12 @@ const columns: Ref<DataTableColumns<rawMaterialSummary.TableList>> = ref([
     align: 'center',
     width: 100
   },
-  {
-    title: '轴号',
-    key: 'im5',
-    align: 'center',
-    width: 70
-  },
+  // {
+  //   title: '轴号',
+  //   key: 'im5',
+  //   align: 'center',
+  //   width: 70
+  // },
   {
     title: '班次',
     key: 'im6',
@@ -165,132 +165,132 @@ const columns: Ref<DataTableColumns<rawMaterialSummary.TableList>> = ref([
     align: 'center',
     width: 180
   },
-  {
-    title: '最大外径',
-    key: 'size5',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '导体偏差',
-    key: 'size6',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '导体f值',
-    key: 'size4',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '漆膜厚度',
-    key: 'size8',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '仲长率1',
-    key: 'elongation2',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '回弹角1',
-    key: 'resilience2',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '电阻率',
-    key: 'resilience3',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '击穿电压1',
-    key: 'voltage1',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '击穿电压2',
-    key: 'voltage2',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '击穿电压3',
-    key: 'voltage3',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '击穿电压4',
-    key: 'voltage4',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '击穿电压5',
-    key: 'voltage5',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '漆膜连续性',
-    key: 'pinhole4',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '圆棒卷绕',
-    key: 'winding1',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '拉伸',
-    key: 'tensile1',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '急拉断',
-    key: 'fastPull1',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '剥离',
-    key: 'thermalShock1',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '剥离2',
-    key: 'thermalShock2',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '盐水针孔',
-    key: 'pinhole5',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '耐融性',
-    key: 'directWelding1',
-    align: 'center',
-    width: 100
-  },
-  {
-    title: '锡焊性',
-    key: 'directWelding2',
-    align: 'center',
-    width: 100
-  },
+  // {
+  //   title: '最大外径',
+  //   key: 'size5',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '导体偏差',
+  //   key: 'size6',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '导体f值',
+  //   key: 'size4',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '漆膜厚度',
+  //   key: 'size8',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '仲长率1',
+  //   key: 'elongation2',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '回弹角1',
+  //   key: 'resilience2',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '电阻率',
+  //   key: 'resilience3',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '击穿电压1',
+  //   key: 'voltage1',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '击穿电压2',
+  //   key: 'voltage2',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '击穿电压3',
+  //   key: 'voltage3',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '击穿电压4',
+  //   key: 'voltage4',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '击穿电压5',
+  //   key: 'voltage5',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '漆膜连续性',
+  //   key: 'pinhole4',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '圆棒卷绕',
+  //   key: 'winding1',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '拉伸',
+  //   key: 'tensile1',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '急拉断',
+  //   key: 'fastPull1',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '剥离',
+  //   key: 'thermalShock1',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '剥离2',
+  //   key: 'thermalShock2',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '盐水针孔',
+  //   key: 'pinhole5',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '耐融性',
+  //   key: 'directWelding1',
+  //   align: 'center',
+  //   width: 100
+  // },
+  // {
+  //   title: '锡焊性',
+  //   key: 'directWelding2',
+  //   align: 'center',
+  //   width: 100
+  // },
   {
     title: '外观',
     key: 'surface2',
diff --git a/src/views/storage/finishedProductWarning/index.vue b/src/views/storage/finishedProductWarning/index.vue
index 1cf0d23..492c31f 100644
--- a/src/views/storage/finishedProductWarning/index.vue
+++ b/src/views/storage/finishedProductWarning/index.vue
@@ -8,9 +8,9 @@
         <n-form-item label="规格">
           <n-input v-model:value="searchForm.specification" placeholder="请输入规格" />
         </n-form-item>
-        <n-form-item label="线盘">
+        <!-- <n-form-item label="线盘">
           <n-input v-model:value="searchForm.wireDisc" placeholder="请输入线盘" />
-        </n-form-item>
+        </n-form-item> -->
         <n-form-item>
           <n-button class="mr-5px" type="primary" @click="handleSearch">
             <icon-tdesign-search class="mr-2px" />
@@ -116,12 +116,12 @@ const columns: Ref<DataTableColumns<finishedProductWarning.tableList>> = ref([
     width: 100,
     align: 'center'
   },
-  {
-    title: '线盘',
-    key: 'wireDisc',
-    width: 200,
-    align: 'center'
-  },
+  // {
+  //   title: '线盘',
+  //   key: 'wireDisc',
+  //   width: 200,
+  //   align: 'center'
+  // },
   {
     title: '预警最低箱数',
     key: 'warningNumberMin',
diff --git a/src/views/storage/productInventory/index.vue b/src/views/storage/productInventory/index.vue
index 85ef7b5..1a70447 100644
--- a/src/views/storage/productInventory/index.vue
+++ b/src/views/storage/productInventory/index.vue
@@ -155,12 +155,12 @@ const columns: Ref<DataTableColumns<any>> = ref([
     align: 'center',
     width: 100
   },
-  {
-    title: '轴型型号',
-    key: 'axisTypeModel',
-    align: 'center',
-    width: 100
-  },
+  // {
+  //   title: '轴型型号',
+  //   key: 'axisTypeModel',
+  //   align: 'center',
+  //   width: 100
+  // },
   {
     title: '检验员号',
     key: 'inspectorId',
diff --git a/src/views/storage/rawMaterial/index.vue b/src/views/storage/rawMaterial/index.vue
index 4e684dc..66b7ee6 100644
--- a/src/views/storage/rawMaterial/index.vue
+++ b/src/views/storage/rawMaterial/index.vue
@@ -57,7 +57,7 @@
             :style="{ width: formItemWidth }"
           ></n-input>
         </n-form-item>
-        <n-form-item label="合计件数">
+        <!-- <n-form-item label="合计件数">
           <n-input v-model:value="totalNumber" :disabled="true" :style="{ width: formItemWidth }"></n-input>
         </n-form-item>
         <n-form-item label="合计净重">
@@ -65,7 +65,7 @@
         </n-form-item>
         <n-form-item label="合计皮重">
           <n-input v-model:value="tareNumber" :disabled="true" :style="{ width: formItemWidth }"></n-input>
-        </n-form-item>
+        </n-form-item> -->
         <n-form-item>
           <component
             :is="
@@ -396,23 +396,23 @@ const columns: Ref<DataTableColumns<rawMaterial1.tabelList>> = ref([
     }
   },
 
-  {
-    title: '毛重',
-    width: 100,
-    key: 'grossWeight'
-  },
-
-  {
-    title: '净重',
-    width: 100,
-    key: 'netWeight'
-  },
-
-  {
-    title: '皮重',
-    width: 100,
-    key: 'tareWeight'
-  },
+  // {
+  //   title: '毛重',
+  //   width: 100,
+  //   key: 'grossWeight'
+  // },
+
+  // {
+  //   title: '净重',
+  //   width: 100,
+  //   key: 'netWeight'
+  // },
+
+  // {
+  //   title: '皮重',
+  //   width: 100,
+  //   key: 'tareWeight'
+  // },
   {
     title: '单位',
     width: 100,
@@ -467,9 +467,6 @@ const columns: Ref<DataTableColumns<rawMaterial1.tabelList>> = ref([
     render: (row: any) => {
       return (
         <n-space justify={'center'}>
-          <n-button size="small" type="info" onClick={() => openSelectSocket(row)}>
-            补打标签
-          </n-button>
           <n-button size="small" type="warning" onClick={() => editRow(row)}>
             编辑
           </n-button>
@@ -554,13 +551,13 @@ function submitEdit() {
 //       searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
 //     }
 //   }
-//  if (forModel.value.inDate) {
-//    if (isAddQuestionMask) {
-//      searchValue += `&inDate=${forModel.value.inDate}`;
-//    } else {
-//      searchValue = `?inDate=${forModel.value.inDate}`;
-//    }
-//  }
+//   //  if (forModel.value.inDate) {
+//   //    if (isAddQuestionMask) {
+//   //      searchValue += `&inDate=${forModel.value.inDate}`;
+//   //    } else {
+//   //      searchValue = `?inDate=${forModel.value.inDate}`;
+//   //    }
+//   //  }
 //   url += searchValue;
 //   window.open(url, 'rawMaterial');
 // }
@@ -645,10 +642,10 @@ function reset() {
   search();
 }
 
-function openSelectSocket(row: rawMaterial1.tabelList) {
-  rawMaterial1Row.value = row;
-  reprintShow.value = true;
-}
+// function openSelectSocket(row: rawMaterial1.tabelList) {
+//   rawMaterial1Row.value = row;
+//   reprintShow.value = true;
+// }
 
 function getList() {
   getMaterialList({ pageSize: 999 }).then(res => {
diff --git a/src/views/storage/semiProduct/index.vue b/src/views/storage/semiProduct/index.vue
index e654713..52ed699 100644
--- a/src/views/storage/semiProduct/index.vue
+++ b/src/views/storage/semiProduct/index.vue
@@ -50,7 +50,7 @@
         <n-form-item label="规格" path="itemSpecification">
           <n-input v-model:value="searchForm.itemSpecification" placeholder="请输入规格"></n-input>
         </n-form-item>
-        <n-form-item label="合计件数">
+        <!-- <n-form-item label="合计件数">
           <n-input v-model:value="totalNumber" :disabled="true" :style="{ width: formItemWidth }"></n-input>
         </n-form-item>
         <n-form-item label="合计净重">
@@ -58,7 +58,7 @@
         </n-form-item>
         <n-form-item label="合计皮重">
           <n-input v-model:value="tareNumber" :disabled="true" :style="{ width: formItemWidth }"></n-input>
-        </n-form-item>
+        </n-form-item> -->
         <n-form-item>
           <component
             :is="
@@ -308,26 +308,26 @@ const columns: Ref<DataTableColumns<semiProduct.tabelList>> = ref([
     key: 'partNumber'
   },
 
-  {
-    title: '毛重',
-    align: 'center',
-    width: 100,
-    key: 'outputGrossWeight'
-  },
+  // {
+  //   title: '毛重',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'outputGrossWeight'
+  // },
 
-  {
-    title: '净重',
-    align: 'center',
-    width: 100,
-    key: 'outputWeight'
-  },
+  // {
+  //   title: '净重',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'outputWeight'
+  // },
 
-  {
-    title: '皮重',
-    align: 'center',
-    width: 100,
-    key: 'outputTareWeight'
-  },
+  // {
+  //   title: '皮重',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'outputTareWeight'
+  // },
   {
     title: '单位',
     align: 'center',
diff --git a/src/views/technology/technologyEnter/index.vue b/src/views/technology/technologyEnter/index.vue
index 7e50e53..f1f6b54 100644
--- a/src/views/technology/technologyEnter/index.vue
+++ b/src/views/technology/technologyEnter/index.vue
@@ -50,6 +50,7 @@
           <CxColumns v-model:columns="columns" />
         </div>
       </template>
+
       <n-data-table
         :data="data"
         :loading="loading"
@@ -140,7 +141,7 @@
                   @update:value="equipmentHandleChange"
                 />
               </n-form-item-grid-item>
-              <n-form-item-grid-item label="位置" path="axleNumber" :span="8">
+              <!-- <n-form-item-grid-item label="位置" path="axleNumber" :span="8">
                 <n-select
                   v-model:value="addForm.attr1"
                   placeholder="请选择位置"
@@ -148,7 +149,7 @@
                   multiple
                   filterable
                 ></n-select>
-              </n-form-item-grid-item>
+              </n-form-item-grid-item> -->
             </n-grid>
             <n-divider />
             <n-grid :cols="24" :x-gap="20">
@@ -242,10 +243,10 @@ const formItemWidth = ref<string>('220px');
 const uploadShow = ref<boolean>(false);
 const exportLoading = ref<boolean>(false);
 const uploadFormData = ref<any | null>(null);
-const locationOptions = ref<Array<{ label: string; value: string }>>([
-  { label: '左', value: '左' },
-  { label: '右', value: '右' }
-]);
+// const locationOptions = ref<Array<{ label: string; value: string }>>([
+//   { label: '左', value: '左' },
+//   { label: '右', value: '右' }
+// ]);
 const flag = ref<boolean>(true);
 const data = ref<DataType[]>([]);
 const searchForm = ref<searchType>({
@@ -548,12 +549,12 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
     key: 'equipmentCode',
     width: 120
   },
-  {
-    title: '位置',
-    align: 'center',
-    key: 'attr1',
-    width: 120
-  },
+  // {
+  //   title: '位置',
+  //   align: 'center',
+  //   key: 'attr1',
+  //   width: 120
+  // },
   {
     title: '审批状态',
     align: 'center',
@@ -667,8 +668,8 @@ function init() {
   getMesProcessEnterList(searchForm.value).then(res => {
     data.value = res.rows;
     searchForm.value.total = res.total;
+    endLoading();
   });
-  endLoading();
 }
 onMounted(() => {
   selectAllWorkbenchEnamellingList(null).then(res => {
diff --git a/src/views/technology/technologyExamine/index.vue b/src/views/technology/technologyExamine/index.vue
index c93b022..cd6cd36 100644
--- a/src/views/technology/technologyExamine/index.vue
+++ b/src/views/technology/technologyExamine/index.vue
@@ -149,12 +149,12 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
     key: 'equipmentCode',
     width: 120
   },
-  {
-    title: '位置',
-    align: 'center',
-    key: 'attr1',
-    width: 120
-  },
+  // {
+  //   title: '位置',
+  //   align: 'center',
+  //   key: 'attr1',
+  //   width: 120
+  // },
   {
     title: '审批状态',
     align: 'center',
diff --git a/src/views/technology/technologySearch/index.vue b/src/views/technology/technologySearch/index.vue
index 0f8ea73..431c254 100644
--- a/src/views/technology/technologySearch/index.vue
+++ b/src/views/technology/technologySearch/index.vue
@@ -200,90 +200,90 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
   //   width: 100,
   //   key: 'deliveryTime'
   // },
-  {
-    title: '软化控温上层',
-    align: 'center',
-    width: 120,
-    key: 'softenTemperatureUp'
-  },
-  {
-    title: '软化控温下层',
-    align: 'center',
-    width: 120,
-    key: 'softenTemperatureDown'
-  },
-  {
-    title: '烘炉控温进口',
-    align: 'center',
-    width: 120,
-    key: 'ovenTemperatureEnter'
-  },
-  {
-    title: '烘炉控温炉中',
-    align: 'center',
-    width: 120,
-    key: 'ovenTemperatureMiddle'
-  },
-  {
-    title: '烘炉控温出口',
-    align: 'center',
-    width: 120,
-    key: 'ovenTemperatureOut'
-  },
+  // {
+  //   title: '软化控温上层',
+  //   align: 'center',
+  //   width: 120,
+  //   key: 'softenTemperatureUp'
+  // },
+  // {
+  //   title: '软化控温下层',
+  //   align: 'center',
+  //   width: 120,
+  //   key: 'softenTemperatureDown'
+  // },
+  // {
+  //   title: '烘炉控温进口',
+  //   align: 'center',
+  //   width: 120,
+  //   key: 'ovenTemperatureEnter'
+  // },
+  // {
+  //   title: '烘炉控温炉中',
+  //   align: 'center',
+  //   width: 120,
+  //   key: 'ovenTemperatureMiddle'
+  // },
+  // {
+  //   title: '烘炉控温出口',
+  //   align: 'center',
+  //   width: 120,
+  //   key: 'ovenTemperatureOut'
+  // },
   // {
   //   title: '催化后第一次',
   //   align: 'center',
   //   width: 120,
   //   key: 'catalyzeFirst'
   // },、
-  {
-    title: '催化前控温',
-    align: 'center',
-    width: 100,
-    key: 'catalyzeBefore'
-  },
-  {
-    title: '催化后控温',
-    align: 'center',
-    width: 120,
-    key: 'catalyzeSecond'
-  },
-  {
-    title: '交换热风速度',
-    align: 'center',
-    width: 150,
-    key: 'changeWindSpeed'
-  },
-  {
-    title: '循环风机速度',
-    align: 'center',
-    width: 150,
-    key: 'circulatingFanSpeed'
-  },
-  {
-    title: '排废风机速度',
-    align: 'center',
-    width: 150,
-    key: 'exhaustFanSpeed'
-  },
-  {
-    title: '线速',
-    align: 'center',
-    width: 100,
-    key: 'wireSpeed'
-  },
-  {
-    title: '粘粘度4号杯',
-    align: 'center',
-    width: 120,
-    key: 'viscosityCup'
-  },
-  {
-    title: '收线轴型号',
-    align: 'center',
-    width: 100,
-    key: 'putReelModel'
-  },
+  // {
+  //   title: '催化前控温',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'catalyzeBefore'
+  // },
+  // {
+  //   title: '催化后控温',
+  //   align: 'center',
+  //   width: 120,
+  //   key: 'catalyzeSecond'
+  // },
+  // {
+  //   title: '交换热风速度',
+  //   align: 'center',
+  //   width: 150,
+  //   key: 'changeWindSpeed'
+  // },
+  // {
+  //   title: '循环风机速度',
+  //   align: 'center',
+  //   width: 150,
+  //   key: 'circulatingFanSpeed'
+  // },
+  // {
+  //   title: '排废风机速度',
+  //   align: 'center',
+  //   width: 150,
+  //   key: 'exhaustFanSpeed'
+  // },
+  // {
+  //   title: '线速',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'wireSpeed'
+  // },
+  // {
+  //   title: '粘粘度4号杯',
+  //   align: 'center',
+  //   width: 120,
+  //   key: 'viscosityCup'
+  // },
+  // {
+  //   title: '收线轴型号',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'putReelModel'
+  // },
   {
     title: '创建时间',
     align: 'center',