From e71b6863f4c75a79fbc7f0cc6785fa5147afa106 Mon Sep 17 00:00:00 2001
From: xushilin <1354769781@qq.com>
Date: Thu, 20 Mar 2025 09:54:15 +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/App.vue                                   | 12 +---
 src/store/modules/socket/index.ts             |  6 ++
 .../md/printTemplate/component/EditDialog.vue |  6 +-
 src/views/md/printTemplate/index.vue          |  1 +
 src/views/md/workbench/enamelling/index.vue   | 58 ++++++++--------
 src/views/md/workbench/wiredrawing/index.vue  | 24 +++----
 src/views/monitor/connectSocket/index.vue     | 15 ++--
 src/views/plan/produceOrder/index.vue         | 68 ++++++++++---------
 src/views/procure/procureOrder/index.vue      | 27 +++-----
 src/views/produce/feedRecords/index.vue       |  2 +-
 .../storage/auxiliaryProduceinfo/index.vue    | 32 +++++++--
 src/views/storage/rawProduceIn/index.vue      |  9 +++
 12 files changed, 146 insertions(+), 114 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 3284eec..647fd53 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,17 +71,9 @@ watch(
       // const msgData = JSON.parse(JSON.parse(newValue));
       const msgData = JSON.parse(newValue);
       const data = JSON.parse(JSON.stringify(msgData));
+      console.log('data ==>', data);
+
       socketStore.setMsg(null);
-      let baclkTemp;
-      // 漆包打印空白页，
-      if (data.templateType.includes('enamelCoverReport') && !data.reprintData) {
-        const result = await getPrintTemplateList({ templateCode: 'enamelCoverBlank' });
-        baclkTemp = JSON.parse(result.rows[0].content);
-        hiprintTemplate.value = await new hiprint.PrintTemplate({
-          template: baclkTemp
-        });
-        print({}, '');
-      }
 
       getPrintTemplateList({ templateCode: data.templateType }).then(async res => {
         if (res.code === 200) {
diff --git a/src/store/modules/socket/index.ts b/src/store/modules/socket/index.ts
index bcbd861..c3cf586 100644
--- a/src/store/modules/socket/index.ts
+++ b/src/store/modules/socket/index.ts
@@ -29,6 +29,9 @@ export const useSocketStore = defineStore('socket-store', {
   actions: {
     setOpenSocket(socket: string) {
       if (!socket) return;
+      if (this.connected) {
+        this.setCloseScoket();
+      }
       // const url = `${wsUrl + socket}?userId=${socket}`;
       const url = `${wsUrl + socket}`;
       this.ws = new WebSocket(url);
@@ -37,6 +40,7 @@ export const useSocketStore = defineStore('socket-store', {
         this.socket = socket;
         localStorage.setItem('socket', socket);
         console.log('连接服务器端成功');
+        window.$message?.success('连接成功');
         this.ws.onmessage = res => {
           console.log('res ==> ', res);
           this.msg = res.data;
@@ -45,6 +49,8 @@ export const useSocketStore = defineStore('socket-store', {
         this.ws.onclose = () => {
           console.log('WebSocket connection closed. Reconnecting...');
           this.stopHeartbeat();
+          window.$message?.success('关闭成功');
+          if (!this.connected) return;
           this.reconnect();
         };
       };
diff --git a/src/views/md/printTemplate/component/EditDialog.vue b/src/views/md/printTemplate/component/EditDialog.vue
index c40bfb3..37c85ef 100644
--- a/src/views/md/printTemplate/component/EditDialog.vue
+++ b/src/views/md/printTemplate/component/EditDialog.vue
@@ -7,6 +7,7 @@
             <n-select
               v-model:value="data.templateCode"
               :options="printTypeList"
+              style="width: 200px"
               placeholder="请选择模板类型"
               @update:value="(val, item: any) => {
               data.templateName = item.label;
@@ -22,14 +23,15 @@
               v-model:value="data.clientId"
               :options="clientOptions"
               placeholder="请选择客户"
+              style="width: 200px"
               @change="selectClient"
             ></n-select>
           </n-form-item>
           <n-form-item label="所属用户">
-            <n-input v-model:value="data.userNickName" placeholder="请输入客户"></n-input>
+            <n-input v-model:value="data.userNickName" placeholder="请输入客户" style="width: 200px"></n-input>
           </n-form-item>
           <n-form-item label="默认打印机">
-            <n-input v-model:value="data.defaultPrinterName" placeholder="请输入客户"></n-input>
+            <n-input v-model:value="data.defaultPrinterName" placeholder="请输入客户" style="width: 200px"></n-input>
           </n-form-item>
         </n-form>
       </div>
diff --git a/src/views/md/printTemplate/index.vue b/src/views/md/printTemplate/index.vue
index 8d7f874..611ff04 100644
--- a/src/views/md/printTemplate/index.vue
+++ b/src/views/md/printTemplate/index.vue
@@ -47,6 +47,7 @@
                 v-model:value="addForm.templateCode"
                 :options="printTypeList"
                 placeholder="请选择打印模板"
+                style="width: 200px"
               ></n-select>
             </n-form-item>
           </n-form>
diff --git a/src/views/md/workbench/enamelling/index.vue b/src/views/md/workbench/enamelling/index.vue
index c441a7b..79d05da 100644
--- a/src/views/md/workbench/enamelling/index.vue
+++ b/src/views/md/workbench/enamelling/index.vue
@@ -79,13 +79,13 @@
                 @update:value="modelHandleChange"
               />
             </n-form-item>
-            <n-form-item label="轴号" :span="15" path="axleNumber">
+            <!-- <n-form-item label="轴号" :span="15" path="axleNumber">
               <n-input v-model:value="addForm.axleNumber" placeholder="请输入轴号" />
             </n-form-item>
             <n-form-item label="轴数" :span="15" path="axleQuantity">
               <n-input-number v-model:value="addForm.axleQuantity" placeholder="请输入轴数" :min="0" :step="2" />
-            </n-form-item>
-            <n-form-item label="可生产下限" :span="15" path="productionLowerLimit">
+            </n-form-item> -->
+            <!-- <n-form-item label="可生产下限" :span="15" path="productionLowerLimit">
               <n-input-number
                 v-model:value="addForm.productionLowerLimit"
                 placeholder="请输入可生产下限"
@@ -100,7 +100,7 @@
                 step="0.01"
                 min="0"
               />
-            </n-form-item>
+            </n-form-item> -->
             <n-form-item label="所属工序" :span="15" path="process">
               <n-select
                 v-model:value="addForm.processId"
@@ -309,19 +309,19 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
     key: 'equipmentCode',
     width: 100
   },
-  {
-    title: '设备轴号',
-    align: 'center',
-    key: 'axleNumber',
-    width: 100,
-    render: row => <n-performant-ellipsis>{row.axleNumber}</n-performant-ellipsis>
-  },
-  {
-    title: '设备轴数',
-    align: 'center',
-    width: 100,
-    key: 'axleQuantity'
-  },
+  // {
+  //   title: '设备轴号',
+  //   align: 'center',
+  //   key: 'axleNumber',
+  //   width: 100,
+  //   render: row => <n-performant-ellipsis>{row.axleNumber}</n-performant-ellipsis>
+  // },
+  // {
+  //   title: '设备轴数',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'axleQuantity'
+  // },
   {
     title: '是否启用',
     key: 'isEnable',
@@ -343,18 +343,18 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
       );
     }
   },
-  {
-    title: '可生产产品规格下限',
-    align: 'center',
-    key: 'productionLowerLimit',
-    width: 220
-  },
-  {
-    title: '可生产产品规格上限',
-    align: 'center',
-    key: 'productionUpperLimit',
-    width: 220
-  },
+  // {
+  //   title: '可生产产品规格下限',
+  //   align: 'center',
+  //   key: 'productionLowerLimit',
+  //   width: 220
+  // },
+  // {
+  //   title: '可生产产品规格上限',
+  //   align: 'center',
+  //   key: 'productionUpperLimit',
+  //   width: 220
+  // },
   {
     title: '所属工序',
     align: 'center',
diff --git a/src/views/md/workbench/wiredrawing/index.vue b/src/views/md/workbench/wiredrawing/index.vue
index 4593baf..8fdb700 100644
--- a/src/views/md/workbench/wiredrawing/index.vue
+++ b/src/views/md/workbench/wiredrawing/index.vue
@@ -78,7 +78,7 @@
                 @update:value="modelHandleChange"
               />
             </n-form-item>
-            <n-form-item label="可生产下限" :span="15" path="productionLowerLimit">
+            <!-- <n-form-item label="可生产下限" :span="15" path="productionLowerLimit">
               <n-input-number
                 v-model:value="addForm.productionLowerLimit"
                 placeholder="请输入可生产下限"
@@ -93,7 +93,7 @@
                 step="0.01"
                 min="0"
               />
-            </n-form-item>
+            </n-form-item> -->
             <n-form-item label="所属工序" :span="15" path="process">
               <n-select
                 v-model:value="addForm.processId"
@@ -304,16 +304,16 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
       );
     }
   },
-  {
-    title: '可生产产品规格下限',
-    align: 'center',
-    key: 'productionLowerLimit'
-  },
-  {
-    title: '可生产产品规格上限',
-    align: 'center',
-    key: 'productionUpperLimit'
-  },
+  // {
+  //   title: '可生产产品规格下限',
+  //   align: 'center',
+  //   key: 'productionLowerLimit'
+  // },
+  // {
+  //   title: '可生产产品规格上限',
+  //   align: 'center',
+  //   key: 'productionUpperLimit'
+  // },
   {
     title: '所属工序',
     align: 'center',
diff --git a/src/views/monitor/connectSocket/index.vue b/src/views/monitor/connectSocket/index.vue
index aa7c3fe..8307309 100644
--- a/src/views/monitor/connectSocket/index.vue
+++ b/src/views/monitor/connectSocket/index.vue
@@ -44,13 +44,16 @@
 <script lang="tsx" setup>
 import { ref } from 'vue';
 import type { Ref } from 'vue';
-import { NButton, useMessage } from 'naive-ui';
+import {
+  NButton
+  // useMessage
+} from 'naive-ui';
 import type { DataTableColumns } from 'naive-ui';
 import { useLoading } from '@/hooks';
 import { getDictDataList } from '@/service/api/system/dictData';
 import { dataTableConfig } from '@/config/dataTableConfig';
 import { useSocketStore } from '@/store/modules/socket/index';
-const message = useMessage();
+// const message = useMessage();
 
 const searchForm = ref<connectSocket.searchForm>({
   pageNum: 1,
@@ -119,10 +122,10 @@ const columns: Ref<DataTableColumns<connectSocket.TableList>> = ref([
 ]);
 
 function connect(ip: string) {
-  if (socketStore.connected) {
-    message.warning('已连接，请先断开连接');
-    return;
-  }
+  // if (socketStore.connected) {
+  //   message.warning('已连接，请先断开连接');
+  //   return;
+  // }
   socketStore.setOpenSocket(ip);
 }
 
diff --git a/src/views/plan/produceOrder/index.vue b/src/views/plan/produceOrder/index.vue
index 2366ed1..ba40ea4 100644
--- a/src/views/plan/produceOrder/index.vue
+++ b/src/views/plan/produceOrder/index.vue
@@ -112,7 +112,7 @@
                     ></n-select>
                   </n-space>
                 </n-form-item-grid-item>
-                <n-form-item-grid-item label="位置" path="axleNumber">
+                <!-- <n-form-item-grid-item label="位置" path="axleNumber">
                   <n-space vertical>
                     <n-select
                       v-model:value="axleNumberId"
@@ -135,14 +135,13 @@
                       }"
                     ></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> -->
+                <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-form-item-grid-item label="板料" path="plantName">
                   <n-space vertical>
                     <n-select
@@ -189,7 +188,7 @@
                   <n-input-number
                     v-model:value="enamelCoverData.discNumber"
                     :style="{ width: formItemWidth }"
-                    placeholder="请输入盘数"
+                    placeholder="请输入插针数"
                   />
                 </n-form-item-grid-item>
                 <n-form-item-grid-item label="开始时间" path="startTime">
@@ -253,7 +252,11 @@ import { getDictDataList } from '@/service/api/system/dictData';
 import { dataTableConfig } from '@/config/dataTableConfig';
 import { useSearchBtn } from '~/src/hooks/common/useBtn';
 import { useLoading } from '~/src/hooks';
-import { getWorkOrderArrange, cancellation, getListByEquipmentId } from '~/src/service/api/plan/productOrder';
+import {
+  getWorkOrderArrange,
+  cancellation
+  // getListByEquipmentId,
+} from '~/src/service/api/plan/productOrder';
 import { addEnamellingWorkorder } from '~/src/service/api/plan/enamellingWorkOrder';
 import { formatDate } from '~/src/utils/form/rule';
 import { getStatusName, getPlanStatusName } from '~/src/utils/common/workOrder';
@@ -298,7 +301,7 @@ const locationOptions = ref<planWorkOrder.SelectMixedOption[]>([]);
 
 const standardList = ref<planWorkOrder.SelectMixedOption[]>([]);
 
-const timer = ref<any>(null);
+// const timer = ref<any>(null);
 
 // const standardItem = ref<planWorkOrder.SelectMixedOption[]>([]);
 
@@ -601,24 +604,24 @@ function reset(): void {
   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);
-}
+// 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);
+// }
 
 // 打开排产
 function changeShowDialog(row: planWorkOrder.planWorkOrderList): void {
@@ -650,7 +653,10 @@ function changeShowDialog(row: planWorkOrder.planWorkOrderList): void {
     const lower = item.productionLowerLimit;
     if (spec) {
       if ((spec < upper || spec === upper) && (spec > lower || spec === lower)) {
-        drillingCrewoptions.value.push({ label: item.equipmentCode, value: item.id });
+        drillingCrewoptions.value.push({
+          label: item.equipmentCode,
+          value: item.id
+        });
       }
     }
   });
diff --git a/src/views/procure/procureOrder/index.vue b/src/views/procure/procureOrder/index.vue
index ae40752..c749e62 100644
--- a/src/views/procure/procureOrder/index.vue
+++ b/src/views/procure/procureOrder/index.vue
@@ -271,16 +271,16 @@ const detailColumns: DataTableColumns<Procure.rawProcureList.listType> = [
     width: 80
   },
 
-  {
-    title: '数量',
-    key: 'weight',
-    width: 80
-  },
   // {
   //   title: '数量',
-  //   key: 'quantity',
+  //   key: 'weight',
   //   width: 80
   // },
+  {
+    title: '数量',
+    key: 'quantity',
+    width: 80
+  },
   {
     title: '规格型号',
     key: 'specification',
@@ -619,11 +619,11 @@ const columns: Ref<DataTableColumns<Procure.rawProcureList.columns>> = ref([
     key: 'quantity',
     width: 80
   },
-  {
-    title: '计划数量',
-    key: 'totalWeight',
-    width: 80
-  },
+  // {
+  //   title: '计划数量',
+  //   key: 'totalWeight',
+  //   width: 80
+  // },
   {
     title: '总价',
     key: 'totalPrice',
@@ -645,11 +645,6 @@ const columns: Ref<DataTableColumns<Procure.rawProcureList.columns>> = ref([
   //   key: 'planDateStart',
   //   width: 180
   // },
-  // {
-  //   title: '计划结束日期',
-  //   key: 'planDateEnd',
-  //   width: 180
-  // },
   {
     title: '创建日期',
     key: 'createTime',
diff --git a/src/views/produce/feedRecords/index.vue b/src/views/produce/feedRecords/index.vue
index 6b80a2c..49116fd 100644
--- a/src/views/produce/feedRecords/index.vue
+++ b/src/views/produce/feedRecords/index.vue
@@ -205,7 +205,7 @@ const columns: Ref<DataTableColumns<feedRecords.TabelList>> = ref([
   {
     title: '投料数量',
     align: 'center',
-    key: 'inputWeight',
+    key: 'inputNum',
     width: 100
   },
   {
diff --git a/src/views/storage/auxiliaryProduceinfo/index.vue b/src/views/storage/auxiliaryProduceinfo/index.vue
index ab9c0d7..ada6ebb 100644
--- a/src/views/storage/auxiliaryProduceinfo/index.vue
+++ b/src/views/storage/auxiliaryProduceinfo/index.vue
@@ -142,7 +142,8 @@ import { getWmsItemRecpt, executeWmsItemRecpt } from '@/service/api/wms/recpt';
 import { selectWmsItemRecptLineList, delWmsItemRecptLine } from '@/service/api/wms/recptLine';
 import { useDelBtn, useBackBtn, useBtn } from '@/hooks/common/useBtn';
 import { getlist, getWarehouseAreaList } from '@/service/api/wms/warehouse';
-
+import { useSocketStore } from '@/store/modules/socket/index';
+const socketStore = useSocketStore();
 const info = ref<boolean>(false);
 const dataRef = ref<FormInst | null>(null);
 // import { createRequiredFormRule } from '~/src/utils';
@@ -150,6 +151,7 @@ const dataRef = ref<FormInst | null>(null);
 const rules: any = {};
 const storageOptions = ref<{ value: string; label: string }[]>([]);
 const { proxy } = getCurrentInstance() as any;
+
 const { wms_item_recpt_status, wms_item_recpt_type } = proxy.useDict('wms_item_recpt_status', 'wms_item_recpt_type');
 console.log(wms_item_recpt_type);
 
@@ -359,6 +361,10 @@ const columns: Ref<DataTableColumns<wms.recptLineRawType.columns>> = ref([
     key: 'warehouseName',
     width: 180,
     render: row => {
+      row.warehouseId = options.value[0]?.id;
+      row.areaId = options.value[0]?.id;
+      row.locationId = options.value[0]?.pid;
+      row.areaName = options.value[0]?.pname;
       return (
         <n-cascader
           disabled={info.value}
@@ -490,6 +496,10 @@ function getWmsItemRecptLineData() {
   startLoading();
   selectWmsItemRecptLineList({ params: searchForm.value }).then(res => {
     data.value = res.rows;
+    // row.warehouseId = _value;
+    // row.areaId = item.id;
+    // row.locationId = item.pid;
+    // row.areaName = item.pname;
     if (!Array.isArray(res.rows)) return;
     data.value.forEach(item => {
       item.quantitySavedTemp = item.quantitySaved;
@@ -617,6 +627,8 @@ function getRecptInfo() {
   getWmsItemRecpt(route.query.id as string).then(res => {
     // console.log(res, res.data.salseDeptId, '11');
     RecptInfo.value = res.data;
+    console.log('res.data ==>', res.data);
+
     RecptInfo.value.recptDate = new Date(RecptInfo.value.recptDate as unknown as string).getTime();
     // salesUser(res.data.salseDeptId);
   });
@@ -650,20 +662,25 @@ function headSelect(_val, item) {
 //   RecptInfo.value.salseBy = item.userId;
 //   RecptInfo.value.salseByNick = item.nickName;
 // }
-function getStorage(val) {
+async function getStorage(val) {
   if (!val) return;
-  getWarehouseAreaList(val).then(res => {
+  await getWarehouseAreaList(val).then(res => {
     options.value = res.data;
   });
 }
 function submitInfo() {
   dataRef.value?.validate(err => {
     if (!err) {
-      console.log('校验通过', data.value);
       RecptInfo.value.lineList = data.value;
       executeWmsItemRecpt(RecptInfo.value).then(res => {
         // console.log(res);
         if (res.code === 200) {
+          socketStore.setMsg(
+            JSON.stringify({
+              templateType: 'YL-MB',
+              printValue: res.data.lineList
+            })
+          );
           message.success('入库成功');
           router.go(-1);
         }
@@ -673,10 +690,10 @@ function submitInfo() {
   // console.log(RecptInfo.value, data.value, '--------');
 }
 
-function init() {
+async function init() {
   info.value = Boolean(route.query.info);
   getWmsItemRecptLineData();
-  getRecptInfo();
+
   getlist({}).then(res => {
     if (!Array.isArray(res.data)) return;
     res.data.forEach(item => {
@@ -687,7 +704,8 @@ function init() {
       });
     });
   });
-  getStorage(route.query.warehouseId as string);
+  await getStorage(route.query.warehouseId as string);
+  getRecptInfo();
   getUser();
   // 获取部门信息
   // getDeptTree();
diff --git a/src/views/storage/rawProduceIn/index.vue b/src/views/storage/rawProduceIn/index.vue
index a07f44d..4bf72b3 100644
--- a/src/views/storage/rawProduceIn/index.vue
+++ b/src/views/storage/rawProduceIn/index.vue
@@ -218,6 +218,15 @@ const columns: Ref<DataTableColumns<wms.recptRawType.columns>> = ref([
       tooltip: true
     }
   },
+  {
+    title: '创建时间',
+    key: 'createTime',
+    align: 'center',
+    width: 180,
+    ellipsis: {
+      tooltip: true
+    }
+  },
   {
     title: '单据状态',
     key: 'status',