昭德app需求修改

gaoluyang

2025-12-29 89469f566f4ad8602def16aef6744d205a3d20a8

昭德app需求修改

 src/api/equipment/management/index.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
// è®¾å¤‡ç®¡ç†
import request from '@/utils/request'

// /equipmentManagement/list
// æŸ¥è¯¢è®¾å¤‡ç®¡ç†åˆ—表
export function getManagementList(query) {
  return request({
    url: '/equipmentManagement/list',
    method: 'get',
    params: query
  })
}

// /equipmentManagement/addOrEditEquipment
// æ·»åŠ æˆ–编辑设备
export function addOrEditEquipment(data) {
  return request({
    url: '/equipmentManagement/addOrEditEquipment',
    method: 'post',
    data
  })
}

// /equipmentManagement/delEquipment
// åˆ é™¤è®¾å¤‡
export function delEquipment(data) {
  return request({
    url: '/equipmentManagement/delEquipment',
    method: 'delete',
    data
  })
}

 src/api/equipment/requisition/index.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
// è®¾å¤‡ç®¡ç†
import request from '@/utils/request'


// /equipmentUsageRecord/list
// æŸ¥è¯¢è®¾å¤‡ä½¿ç”¨è®°å½•
export function getUsageRecordList(query) {
  return request({
    url: '/equipmentUsageRecord/list',
    method: 'get',
    params: query
  })
}

// /equipmentUsageRecord/addOrEditUsageRecord
// æ·»åŠ æˆ–编辑设备使用记录
export function addOrEditUsageRecord(data) {
  return request({
    url: '/equipmentUsageRecord/addOrEditUsageRecord',
    method: 'post',
    data
  })
}

// /equipmentUsageDetail/list?usageId=3
// è®¾å¤‡é¢†ç”¨å½’还记录查询
export function getUsageDetailList(usageId) {
  return request({
    url: `/equipmentUsageDetail/list?usageId=${usageId}`,
    method: 'get'
  })
}

 src/api/login.js

@@ -1,14 +1,28 @@
import request from '@/utils/request'

// ç™»å½•æ–¹æ³•
export function loginCheckFactory(username, password, factoryId) {
export function login(username, password, code, uuid) {
  const data = {
    username,
    password,
    factoryId
    code,
    uuid
  }
  return request({
    url: '/loginCheckFactory',
    url: '/login',
    headers: {
      isToken: false,
      repeatSubmit: false
    },
    method: 'post',
    data: data
  })
}

// æ³¨å†Œæ–¹æ³•
export function register(data) {
  return request({
    url: '/register',
    headers: {
      isToken: false
    },
@@ -33,11 +47,14 @@
  })
}

// èŽ·å–公司列表
export function userLoginFacotryList(params) {
// èŽ·å–验证码
export function getCodeImg() {
  return request({
    url: '/userLoginFacotryList',
    url: '/captchaImage',
    headers: {
      isToken: false
    },
    method: 'get',
    params: params
    timeout: 20000
  })
}

 src/api/publicApi/index.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
// æ–‡æ¡£ç®¡ç†
import request from '@/utils/request'


// /system/user/listAll
// æŸ¥è¯¢æ‰€æœ‰ç”¨æˆ·åˆ—表
export function userListAll() {
  return request({
    url: '/system/user/listAll',
    method: 'get'
  })
}

// /equipmentManagement/equipmentList
// æŸ¥è¯¢è®¾å¤‡åˆ—表
export function getEquipmentList(query) {
  return request({
    url: '/equipmentManagement/equipmentList',
    method: 'get',
    params: query
  })
}

// /coalInfo/coalInfoList
// æŸ¥è¯¢ç…¤ç§åˆ—表
export function getCoalInfoList(query) {
    return request({
        url: '/coalInfo/coalInfoList',
        method: 'get',
        params: query
    })
}

// /coalField/coalFieldList
// æŸ¥è¯¢ç…¤è´¨å­—段列表
export function getCoalFieldList(query) {
    return request({
        url: '/coalField/coalFieldList',
        method: 'get',
        params: query
    })
}

 src/config.js

@@ -2,9 +2,7 @@
const config = {
  //  baseUrl: 'https://vue.ruoyi.vip/prod-api',
  // baseUrl: 'http://localhost/prod-api',
  baseUrl: 'http://114.132.189.42:9066', // å®å¤æ¶¦æ³°
  // baseUrl: 'http://114.132.189.42:9068', // æ–°ç–†æµ·å·å¼€å¿ƒ
  // baseUrl: 'http://192.168.1.147:9036',
  baseUrl: 'http://192.168.1.147:7016', //
   //cloud后台网关地址
  //  baseUrl: 'http://192.168.10.3:8080',
   // åº”用信息

 src/hooks/useDelete.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,167 @@
/** 
 * é€šç”¨åˆ é™¤åŠŸèƒ½ç»„合式函数（APP版本）
 * æä¾›ç»Ÿä¸€çš„删除确认、API调用、数据更新逻辑，适配uni-app和uviewplus
 */
import { useToast } from "@/utils/uviewplus";

/**
 * åˆ›å»ºåˆ é™¤åŠŸèƒ½
 * @param {Object} options é…ç½®é€‰é¡¹
 * @param {Function|Function} options.deleteApi åˆ é™¤API函数或返回API函数的函数
 * @param {Function|Function} options.getList é‡æ–°èŽ·å–列表数据的函数或返回函数的函数
 * @param {Ref} options.selectedRows é€‰ä¸­è¡Œçš„响应式引用
 * @param {Ref} options.tableData è¡¨æ ¼æ•°æ®çš„响应式引用
 * @param {Ref} options.total æ€»æ•°çš„响应式引用
 * @param {String} options.confirmText ç¡®è®¤åˆ é™¤çš„提示文本
 * @param {String} options.successText åˆ é™¤æˆåŠŸçš„提示文本
 * @param {Boolean} options.useLocalUpdate æ˜¯å¦ä½¿ç”¨æœ¬åœ°æ›´æ–°ï¼ˆä¸é‡æ–°è¯·æ±‚接口）
 * @returns {Object} è¿”回删除相关的方法
 */
export function useDelete(options = {}) {
  const {
    deleteApi,
    getList,
    selectedRows,
    tableData,
    total,
    confirmText = "确定删除选中的数据吗？",
    successText = "删除成功",
    useLocalUpdate = false
  } = options;

  /**
   * èŽ·å–实际的删除API函数
   * æ”¯æŒç›´æŽ¥ä¼ å…¥å‡½æ•°æˆ–返回函数的函数
   */
  const getDeleteApi = () => {
    if (typeof deleteApi === 'function') {
      // å°è¯•è°ƒç”¨çœ‹æ˜¯å¦è¿”回函数
      try {
        const result = deleteApi();
        return typeof result === 'function' ? result : deleteApi;
      } catch (error) {
        // å¦‚果调用出错，说明这本身就是API函数
        return deleteApi;
      }
    }
    return deleteApi;
  };

  /**
   * èŽ·å–实际的获取列表函数
   * æ”¯æŒç›´æŽ¥ä¼ å…¥å‡½æ•°æˆ–返回函数的函数
   */
  const getListFunction = () => {
    if (typeof getList === 'function') {
      try {
        const result = getList();
        return typeof result === 'function' ? result : getList;
      } catch (error) {
        // å¦‚果调用出错，说明这本身就是列表函数
        return getList;
      }
    }
    return getList;
  };

  /**
   * æ‰¹é‡åˆ é™¤æ–¹æ³•
   * @param {Array} customIds è‡ªå®šä¹‰è¦åˆ é™¤çš„ID数组，如果不传则使用selectedRows
   */
  const handleDelete = async (customIds = null) => {
    // ç¡®å®šè¦åˆ é™¤çš„è¡Œ
    const rowsToDelete = customIds ?
      tableData.value.filter(item => customIds.includes(item.id)) :
      selectedRows.value;

    // æ£€æŸ¥æ˜¯å¦æœ‰é€‰ä¸­æ•°æ®
    if (rowsToDelete.length === 0) {
      useToast().warning("请选择要删除的数据");
      return false;
    }

    try {
      // ç¡®è®¤åˆ é™¤ - ä½¿ç”¨uni-app的showModal替代Element Plus的MessageBox
      const result = await uni.showModal({
        title: '提示',
        content: confirmText,
        confirmText: '确定',
        cancelText: '取消',
        confirmColor: '#2979ff'
      });

      // ç”¨æˆ·ç‚¹å‡»å–消
      if (!result.confirm) {
        useToast().info("已取消删除");
        return false;
      }

      // æå–ID
      const ids = rowsToDelete.map(item => item.id);
      
      // èŽ·å–当前的删除API函数
      const currentDeleteApi = getDeleteApi();
      if (!currentDeleteApi) {
        useToast().error("删除API未配置");
        return false;
      }

      // è°ƒç”¨åˆ é™¤API
      const res = await currentDeleteApi(ids);

      if (res.code === 200) {
        // æ ¹æ®é…ç½®é€‰æ‹©æ›´æ–°æ–¹å¼
        if (useLocalUpdate) {
          // æœ¬åœ°æ›´æ–°ï¼šä»Žè¡¨æ ¼æ•°æ®ä¸­ç§»é™¤å·²åˆ é™¤çš„项
          tableData.value = tableData.value.filter(item => !ids.includes(item.id));
          if (total && total.value !== undefined) {
            total.value = tableData.value.length;
          }
        } else {
          // é‡æ–°èŽ·å–数据
          const currentGetList = getListFunction();
          if (currentGetList) {
            await currentGetList();
          }
        }

        // æ¸…空选中状态
        if (selectedRows && selectedRows.value) {
          selectedRows.value = [];
        }

        useToast().success(successText);
        return true;
      } else {
        return false;
      }
    } catch (error) {
      if (error !== "cancel") {
        // å…¶ä»–错误处理
        console.error("删除操作失败:", error);
      }
      return false;
    }
  };

  /**
   * åˆ é™¤å•ä¸ªé¡¹ç›®
   * @param {Object} row è¦åˆ é™¤çš„行数据
   */
  const handleDeleteSingle = async (row) => {
    return await handleDelete([row.id]);
  };

  /**
   * åˆ é™¤å¤šä¸ªé¡¹ç›®ï¼ˆæ‰¹é‡åˆ é™¤ï¼‰
   */
  const handleDeleteBatch = async () => {
    return await handleDelete();
  };

  return {
    handleDelete,
    handleDeleteSingle,
    handleDeleteBatch
  };
}

 src/pages.json

@@ -296,7 +296,7 @@
      }
    },
    {
      "path": "pages/equipmentManagement/ledger/index",
      "path": "pages/management/index",
      "style": {
        "navigationBarTitleText": "设备台账",
        "navigationStyle": "custom"

 src/pages/index.vue

@@ -1,156 +1,16 @@
<template>
    <view class="content">
        <view class="header-section">
            <view class="currentFactory">
                <up-text type="primary" :text="userStore.currentFactoryName" @click="show = true" size="18"
                                 class="factoryName" suffixIcon="arrow-right" :iconStyle="iconStyle"></up-text>
            </view>
            <up-picker :show="show" :columns="factoryList" @confirm="changeFactory" @cancel="show = false"></up-picker>
        </view>
        
        <view class="hero-section">
            <view class="bg-img">
                <view class="hero-content">
                    <text class="hero-title">润泰生物科技</text>
                    <text class="hero-title">陕西昭德环保</text>
                </view>
                <view class="hero-wave"></view>
            </view>
        </view>
		
        <!--        <view class="notice-section">-->
        <!--            <view class="notice">-->
        <!--                <view class="notice-content">-->
        <!--                    <view class="notice-left">-->
        <!--                        <text class="notice-status">通知</text>-->
        <!--                    </view>-->
        <!--                    <view class="notice-separator"></view>-->
        <!--                    <view class="notice-right">-->
        <!--                        <text class="notice-label">{{currentStatus}}</text>-->
        <!--                        <text class="notice-text">当日销售设备数:<text class="notice-number">{{number}}<text class="notice-unit">个</text></text></text>-->
        <!--                    </view>-->
        <!--                </view>-->
        <!--            </view>-->
        <!--        </view>-->
		
        <!-- è¥é”€ç®¡ç†æ¨¡å— -->
        <view class="common-module marketing-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">营销管理</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in marketingItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
		
        <!-- é‡‡è´­ç®¡ç†æ¨¡å— -->
        <view class="common-module purchase-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">采购管理</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in purchaseItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
		
        <!-- ååŒåŠžå…¬æ¨¡å— -->
        <view class="common-module collaboration-module">
            <view class="module-header">
                <view class="module-title-container">
                    <text class="module-title">协同办公</text>
                </view>
            </view>
            <view class="module-content">
                <up-grid
                    :border="false"
                    col="4"
                >
                    <up-grid-item
                        v-for="(item, index) in collaborationItems"
                        :key="index"
                        @click="handleCommonItemClick(item)"
                    >
                        <view class="icon-container" :style="{ background: item.bgColor }">
                            <up-icon
                                :name="item.icon"
                                :size="58"
                                color="#ffffff"
                            ></up-icon>
                        </view>
                        <text class="item-label">{{item.label}}</text>
                    </up-grid-item>
                </up-grid>
            </view>
        </view>
		
        <!-- ç”Ÿäº§ç®¡æŽ§æ¨¡å— -->
<!--        <view class="common-module production-module">-->
<!--            <view class="module-header">-->
<!--                <view class="module-title-container">-->
<!--                    <text class="module-title">生产管控</text>-->
<!--                </view>-->
<!--            </view>-->
<!--            <view class="module-content">-->
<!--                <up-grid-->
<!--                    :border="false"-->
<!--                    col="4"-->
<!--                >-->
<!--                    <up-grid-item-->
<!--                        v-for="(item, index) in productionItems"-->
<!--                        :key="index"-->
<!--                        @click="handleCommonItemClick(item)"-->
<!--                    >-->
<!--                        <view class="icon-container" :style="{ background: item.bgColor }">-->
<!--                            <up-icon-->
<!--                                :name="item.icon"-->
<!--                                :size="58"-->
<!--                                color="#ffffff"-->
<!--                            ></up-icon>-->
<!--                        </view>-->
<!--                        <text class="item-label">{{item.label}}</text>-->
<!--                    </up-grid-item>-->
<!--                </up-grid>-->
<!--            </view>-->
<!--        </view>-->
        
        <!-- è®¾å¤‡ç®¡ç†æ¨¡å— -->
        <view class="common-module equipment-module">
@@ -186,7 +46,6 @@

<script setup>
import {ref, onMounted, nextTick, reactive} from 'vue';
import {userLoginFacotryList} from "@/api/login";
import modal from "@/plugins/modal";
import useUserStore from "@/store/modules/user";

@@ -214,245 +73,25 @@
    }, 3000)
}

// è¥é”€ç®¡ç†åŠŸèƒ½æ•°æ®
const marketingItems = reactive([
    {
        icon: '/static/images/icon/xiaoshoutaizhang@2x.png',
        label: '销售台账',
    },
    {
        icon: '/static/images/icon/kaipiaodengji@2x.png',
        label: '开票登记',
    },
    {
        icon: '/static/images/icon/kaipiaotaizhang@2x.png',
        label: '开票台账',
    },
    {
        icon: '/static/images/icon/huikuandengji@2x.png',
        label: '回款登记',
    },
    {
        icon: '/static/images/icon/huikuanliushui@2x.png',
        label: '回款流水',
    },
    {
        icon: '/static/images/icon/kehuwanglai@2x.png',
        label: '客户往来',
    }
]);

// é‡‡è´­ç®¡ç†åŠŸèƒ½æ•°æ®
const purchaseItems = reactive([
    {
        icon: '/static/images/icon/caigoutaizhang@2x.png',
        label: '采购台账',
    },
    {
        icon: '/static/images/icon/laipiaodengji@2x.png',
        label: '来票登记',
    },
    {
        icon: '/static/images/icon/laipiaotaizhang@2x.png',
        label: '来票台账',
    },
    {
        icon: '/static/images/icon/fukuanjingji@2x.png',
        label: '付款登记',
    },
    {
        icon: '/static/images/icon/fukuanliushui@2x.png',
        label: '付款流水',
    },
    {
        icon: '/static/images/icon/gongyingshangwanglai@2x.png',
        label: '供应商往来',
    },
]);

// ååŒåŠžå…¬åŠŸèƒ½æ•°æ®
const collaborationItems = reactive([
    {
        icon: '/static/images/icon/xietongshenpi@2x.png',
        label: '协同审批',
    },
    {
        icon: '/static/images/icon/kehubaifang@2x.png',
        label: '客户拜访',
    }
]);

// ç”Ÿäº§ç®¡æŽ§åŠŸèƒ½æ•°æ®
const productionItems = reactive([
    {
        icon: '/static/images/icon/shengchandingdan@2x.png',
        label: '生产订单',
        bgColor: '#FF9800'
    },
    {
        icon: '/static/images/icon/shengchanpaigong@2x.png',
        label: '生产派工',
        bgColor: '#FF6B35'
    },
    {
        icon: '/static/images/icon/shengchanpaichan@2x.png',
        label: '工序排产',
        bgColor: '#E91E63'
    },
    {
        icon: '/static/images/icon/shengchanbaogong@2x.png',
        label: '生产报工',
        bgColor: '#673AB7'
    },
    {
        icon: '/static/images/icon/shengchanhesuan@2x.png',
        label: '生产核算',
        bgColor: '#3F51B5'
    }
]);

// è®¾å¤‡ç®¡ç†åŠŸèƒ½æ•°æ®
const equipmentItems = reactive([
    // {
    //     icon: '/static/images/icon/shebeitaizhang@2x.png',
    //     label: '设备台账',
    // },
    {
        icon: '/static/images/icon/shbeibaoxiu@2x.png',
        label: '设备报修',
    },
    {
        icon: '/static/images/icon/shbeibaoyang@2x.png',
        label: '设备保养',
        icon: '/static/images/icon/shebeitaizhang@2x.png',
        label: '设备台账',
    },
    {
        icon: '/static/images/icon/xunjianshangchuan@2x.png',
        label: '巡检上传',
    },
    {
        icon: '/static/images/icon/guzhangfenxi@2x.png',
        label: '分析追溯',
        bgColor: '#ff9800'
    },
    {
        icon: '/static/images/icon/zhinengpaidan@2x.png',
        label: '智能派单',
        bgColor: '#ff6b35'
    },
    {
        icon: '/static/images/icon/zuoyezhidao@2x.png',
        label: '作业指导',
        bgColor: '#4caf50'
    },
    {
        icon: '/static/images/icon/jieguoyanzheng@2x.png',
        label: '结果验证',
        bgColor: '#9c27b0'
    }
]);

// å¤„理常用功能点击
const handleCommonItemClick = (item) => {
    // æ ¹æ®ä¸åŒçš„功能项进行跳转
    switch (item.label) {
        case '销售台账':
            uni.navigateTo({
                url: '/pages/sales/salesAccount/index'
            });
            break;
        case '开票登记':
            uni.navigateTo({
                url: '/pages/sales/invoicingRegistration/index'
            });
            break;
        case '开票台账':
            uni.navigateTo({
                url: '/pages/sales/invoiceLedger/index'
            });
            break;
        case '回款登记':
            uni.navigateTo({
                url: '/pages/sales/receiptPayment/index'
            });
            break;
        case '回款流水':
            uni.navigateTo({
                url: '/pages/sales/receiptPaymentHistory/index'
            });
            break;
        case '客户往来':
            uni.navigateTo({
                url: '/pages/sales/receiptPaymentLedger/index'
            });
            break;
        case '采购台账':
            uni.navigateTo({
                url: '/pages/procurementManagement/procurementLedger/index'
            });
            break;
        case '来票登记':
            uni.navigateTo({
                url: '/pages/procurementManagement/invoiceEntry/index'
            });
            break;
        case '来票台账':
            uni.navigateTo({
                url: '/pages/procurementManagement/procurementInvoiceLedger/index'
            });
            break;
        case '付款登记':
            uni.navigateTo({
                url: '/pages/procurementManagement/paymentEntry/index'
            });
            break;
        case '付款流水':
            uni.navigateTo({
                url: '/pages/procurementManagement/receiptPaymentHistory/index'
            });
            break;
        case '供应商往来':
            uni.navigateTo({
                url: '/pages/procurementManagement/paymentLedger/index'
            });
            break;
        case '协同审批':
            uni.navigateTo({
                url: '/pages/cooperativeOffice/collaborativeApproval/index'
            });
            break;
        case '客户拜访':
            uni.navigateTo({
                url: '/pages/cooperativeOffice/clientVisit/index'
            });
            break;
        case '生产订单':
            uni.navigateTo({
                url: '/pages/productionManagement/productionOrder/index'
            });
            break;
        case '生产派工':
            uni.navigateTo({
                url: '/pages/productionManagement/productionDispatching/index'
            });
            break;
        case '工序排产':
            uni.navigateTo({
                url: '/pages/productionManagement/processScheduling/index'
            });
            break;
        case '生产报工':
            uni.navigateTo({
                url: '/pages/productionManagement/productionReport/index'
            });
            break;
        case '生产核算':
            uni.navigateTo({
                url: '/pages/productionManagement/productionAccounting/index'
            });
            break;
        case '设备台账':
            uni.navigateTo({
                url: '/pages/equipmentManagement/ledger/index'
                url: '/pages/management/index'
            });
            break;
        case '设备报修':
@@ -470,26 +109,6 @@
                url: '/pages/inspectionUpload/index'
            });
            break;
        case '分析追溯':
            uni.navigateTo({
                url: '/pages/equipmentManagement/faultAnalysis/index'
            });
            break;
        case '智能派单':
            uni.navigateTo({
                url: '/pages/equipmentManagement/smartDispatch/index'
            });
            break;
        case '作业指导':
            uni.navigateTo({
                url: '/pages/equipmentManagement/sop/index'
            });
            break;
        case '结果验证':
            uni.navigateTo({
                url: '/pages/equipmentManagement/verification/index'
            });
            break;
        default:
            uni.showToast({
                title: `点击了${item.label}`,
@@ -501,43 +120,6 @@
// åˆ›å»ºå¯¹å­ç»„件的引用
const uToastRef = ref(null);

function getUserLoginFacotryList() {
    userLoginFacotryList({userName: userStore.nickName}).then(res => {
        // æ£€æŸ¥res.data是否为数组
        factoryList.value[0] = []
        if (res.data && Array.isArray(res.data)) {
            factoryListTem.value = res.data
            res.data.forEach(item => {
                factoryList.value[0].push(item.deptName)
            })
            factoryId.value = userStore.currentDeptId
        } else {
            // å¦‚æžœres.data不是数组，设置为空数组
            factoryList.value = []
        }
    }).catch(error => {
        modal.msgError('获取公司列表失败:', error)
        factoryList.value = []
    })
}
const changeFactory = async (arr) => {
    show.value = false;
    const factoryId = factoryListTem.value[arr.indexs[0]].deptId
    const loginForm = {
        username: userStore.name,
        password: uni.getStorageSync('remembered_password'),
        factoryId: factoryId,
    }
    modal.loading("刷新中，请耐心等待...")
    userStore.loginCheckFactory(loginForm).then(() => {
        modal.closeLoading()
        nextTick(() => {
            loginSuccess()
        });
    }).catch(() => {
        modal.closeLoading()
    })
}
function loginSuccess(result) {
    uni.reLaunch({
        url: '/pages/index'
@@ -554,7 +136,6 @@
onMounted(() => {
    // è®¾ç½®ç”¨æˆ·ä¿¡æ¯
    userStore.getInfo()
    getUserLoginFacotryList()
    // å¯åŠ¨é€šçŸ¥çŠ¶æ€å®šæ—¶å™¨
    startStatusTimer()
});

 src/pages/login.vue

@@ -6,22 +6,10 @@
        <view class="login-form-content">
            <view class="input-item flex align-center">
                <up-input prefixIcon="account" placeholder="请输入账号" border="bottom"
                                    @blur="getUserLoginFacotryList"
                                    maxlength="30" v-model="loginForm.userName" clearable></up-input>
            </view>
            <view class="input-item flex align-center">
                <up-input prefixIcon="lock" placeholder="请输入密码" border="bottom" maxlength="20" v-model="loginForm.password" clearable type="password"></up-input>
            </view>
            <view class="input-item flex align-center select-container">
                <up-icon name="tags" size="18"></up-icon>
                <up-picker-data
                    v-model="loginForm.factoryId"
                    title="请选择公司"
                    :options="factoryList"
                    valueKey="id"
                    style="width: 100%;"
                    labelKey="name">
                </up-picker-data>
            </view>
            <view>
                <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
@@ -50,7 +38,6 @@
        icon: 'none'
    })
}
import { userLoginFacotryList} from '@/api/login'
import { ref, onMounted } from "vue";
import useUserStore from '@/store/modules/user'
import { getWxCode } from '@/utils/geek';
@@ -63,7 +50,6 @@
const loginForm = ref({
    userName: "",
    password: "",
    factoryId: "",
    currentFatoryName: "",
});
const factoryList = ref([]) // å…¬å¸åˆ—表
@@ -109,37 +95,11 @@
    })
}

function getUserLoginFacotryList() {
    if(loginForm.value.userName){
        userLoginFacotryList({userName:loginForm.value.userName}).then(res => {
            console.log('res',res)
            // æ£€æŸ¥res.data是否为数组
            if (res.data && Array.isArray(res.data)) {
                // é‡æ–°ç»„装数据格式：deptId变成id，deptName变成name
                factoryList.value = res.data.map(item => ({
                    id: item.deptId,
                    name: item.deptName
                }))
            } else {
                // å¦‚æžœres.data不是数组，设置为空数组
                factoryList.value = []
            }
        }).catch(error => {
            showToast('获取公司列表失败:', error)
            factoryList.value = []
        })
    }else {
        factoryList.value = []
    }
}

async function handleLogin() {
    if (loginForm.value.userName === "") {
        showToast("请输入您的账号")
    } else if (loginForm.value.password === "") {
        showToast("请输入您的密码")
    } else if (loginForm.value.factoryId === "") {
        showToast("请选择公司")
    } else {
        showToast("登录中，请耐心等待...")
        pwdLogin()
@@ -147,7 +107,7 @@
};
// å¯†ç ç™»å½•
async function pwdLogin() {
    userStore.loginCheckFactory(loginForm.value).then(() => {
    userStore.login(loginForm.value).then(() => {
        modal.closeLoading()
        // ç™»å½•æˆåŠŸåŽä¿å­˜å¯†ç 
        savePassword();
@@ -168,7 +128,6 @@
// é¡µé¢åŠ è½½æ—¶æ£€æŸ¥æ˜¯å¦æœ‰ä¿å­˜çš„密码
onMounted(() => {
    loadPassword();
    getUserLoginFacotryList()
});
</script>


 src/pages/management/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,675 @@
<template>
  <view class="equipment-management">
    <!-- é¡µé¢å¤´éƒ¨ -->
    <PageHeader title="设备管理" @back="goBack"/>
    
    <!-- æœç´¢åŒºåŸŸ -->
    <view class="search-section" v-if="shouldShowSearch">
      <view class="search-bar">
        <view class="search-input">
          <up-input
            class="search-text"
            :placeholder="searchPlaceholder"
            v-model="queryParams.searchAll"
            @change="search"
            clearable
          />
        </view>
        <view class="filter-button" @click="search">
          <up-icon name="search" size="24" color="#999"></up-icon>
        </view>
      </view>
    </view>
    
    <!-- æ ‡ç­¾é¡µ -->
    <view class="tabs-section">
      <u-tabs
        :list="tabs"
        :current="activeTabIndex"
        @change="handleTabChange"
        :scrollable="false"
        lineWidth="30"
        lineColor="#2979ff"
        :activeStyle="{
          color: '#2979ff',
          fontWeight: 'bold'
        }"
      />
    </view>

    <!-- åˆ—表区域 -->
    <scroll-view 
      class="list-container"
      scroll-y
      refresher-enabled
      :refresher-triggered="refreshing"
      @refresherrefresh="onRefresh"
    >
      <!-- åŠ è½½çŠ¶æ€ -->
      <view v-if="loading" class="loading-container">
        <u-loading-icon text="加载中..." />
      </view>
      
      <!-- è®¾å¤‡åˆ—表 -->
      <view v-else-if="!loading && tableData.length > 0" class="ledger-list">
        <view v-for="(item, index) in tableData" :key="item.id || index">
          <view class="ledger-item">
            <view class="item-header">
              <view class="item-left">
                <view class="document-icon">
                  <up-icon name="file-text" size="16" color="#ffffff"></up-icon>
                </view>
                <text class="item-id">{{ item.equipmentNo || '未编号' }}</text>
              </view>
            </view>
            <up-divider></up-divider>
            
            <view class="item-details">
              <!-- è®¾å¤‡åˆ—表页面 -->
              <template v-if="activeTab === 'management'">
                <view class="detail-row">
                  <text class="detail-label">设备名称</text>
                  <text class="detail-value">{{ item.equipmentName || '-' }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">耗材</text>
                  <text class="detail-value">{{ (item.consumables !== undefined ? item.consumables : item.isConsumables) ? '是' : '否' }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">总数量</text>
                  <text class="detail-value highlight">{{ item.quantity || 0 }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">已使用数量</text>
                  <text class="detail-value">{{ item.usedNo || 0 }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">规格型号</text>
                  <text class="detail-value">{{ item.specification || '-' }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">采购日期</text>
                  <text class="detail-value">{{ item.purchaseDate || '-' }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">采购价格</text>
                  <text class="detail-value">{{ item.purchasePrice ? `Â¥${item.purchasePrice}` : '-' }}</text>
                </view>
              </template>
              
              <!-- è®¾å¤‡é¢†ç”¨é¡µé¢ -->
              <template v-else-if="activeTab === 'equipmentRequisition'">
                <view class="detail-row">
                  <text class="detail-label">领用人</text>
                  <text class="detail-value">{{ item.userName || '-' }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">设备名称</text>
                  <text class="detail-value">{{ item.equipmentName || '-' }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">领用数量</text>
                  <text class="detail-value highlight">{{ item.usageQuantity || 0 }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">归还数量</text>
                  <text class="detail-value">{{ item.returnQuantity || 0 }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">使用状态</text>
                  <text class="detail-value" :style="{ color: getStatusColor(item.equipmentStatus) }">
                    {{ getStatusText(item.equipmentStatus) }}
                  </text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">使用开始时间</text>
                  <text class="detail-value">{{ item.usageStartTime || '-' }}</text>
                </view>
                <view class="detail-row">
                  <text class="detail-label">使用结束时间</text>
                  <text class="detail-value">{{ item.usageEndTime || '-' }}</text>
                </view>
                <view class="detail-row" v-if="item.remarks">
                  <text class="detail-label">备注</text>
                  <text class="detail-value">{{ item.remarks }}</text>
                </view>
              </template>
            </view>
            
            <!-- æ“ä½œæŒ‰é’® - åªåœ¨è®¾å¤‡é¢†ç”¨é¡µé¢æ˜¾ç¤º -->
            <template v-if="activeTab === 'equipmentRequisition'">
              <up-divider></up-divider>
              <view class="action-buttons">
                <u-button
                  type="info"
                  size="small"
                  class="action-btn"
                  @click.stop="handleView(item)"
                >
                  æŸ¥çœ‹
                </u-button>
                <u-button
                  v-if="shouldShowReturnButton(item)"
                  type="success"
                  size="small"
                  class="action-btn"
                  :disabled="item.equipmentStatus === EQUIPMENT_STATUS.RETURNED"
                  @click.stop="handleReturn(item)"
                >
                  å½’还
                </u-button>
              </view>
            </template>
          </view>
        </view>
      </view>
      
      <!-- ç©ºçŠ¶æ€ -->
      <view v-else-if="!loading && tableData.length === 0" class="no-data">
        <text>暂无{{ currentTabConfig?.label || '' }}数据</text>
      </view>
    </scroll-view>
    
    <!-- æµ®åŠ¨æ“ä½œæŒ‰é’® - è®¾å¤‡é¢†ç”¨é¡µé¢æ˜¾ç¤ºé¢†ç”¨æŒ‰é’® -->
    <view 
      v-if="activeTab === 'equipmentRequisition'" 
      class="fab-button" 
      @tap="handleAdd"
    >
      <up-icon name="plus" size="24" color="#ffffff"></up-icon>
    </view>
    
    <!-- å¼¹çª—组件 -->
    <managementDialog
      v-if="activeTab == 'management'"
      v-model:copyForm="copyForm"
      v-model:managementFormDialog="manaDialog"
      :addOrEdit="addOrEdit"
      :form="form"
      @submit="getList"
    />
    <EquipmentRequisition
      v-model="equipmentRequisitionDialog"
      :formData="form"
      :maxQuantity="getMaxQuantity()"
      :addOrEdit="addOrEdit"
      :equipmentStatus="form.equipmentStatus"
      @submit="onEquipmentRequisitionSubmit"
    />
    
    <!-- æŸ¥çœ‹è¯¦æƒ…弹窗 -->
    <u-popup
      v-model="dialogTableVisible"
      :title="dialogTableTitle"
      mode="center"
      :closeable="true"
    >
      <view class="dialog-content">
        <u-table
          :data="dialogTableData"
          :columns="dialogTableColumns"
          height="400px"
        />
      </view>
    </u-popup>
  </view>
</template>

<script setup>
import { computed, onMounted, reactive, ref, nextTick, toRefs } from "vue";

// uviewplus组件导入
import { useToast } from '@/utils/uviewplus'
const { showToast } = useToast()

// ç»„件导入
import PageHeader from "@/components/PageHeader.vue";
import managementDialog from "./mould/managementDialog.vue";
import EquipmentRequisition from "./mould/equipmentRequisitionDialog.vue";

// API æœåŠ¡å¯¼å…¥
import {
  getManagementList,
} from "@/api/equipment/management/index.js";
import { getUsageRecordList, getUsageDetailList } from "@/api/equipment/requisition/index.js";

// è®¾å¤‡çŠ¶æ€æžšä¸¾
const EQUIPMENT_STATUS = {
  USING: 1,           // ä½¿ç”¨ä¸­
  PARTIAL_RETURN: 2,  // éƒ¨åˆ†å½’还
  RETURNED: 3         // å·²å½’还
};

// èŽ·å–状态文本
const getStatusText = (status) => {
  switch(status) {
    case EQUIPMENT_STATUS.USING: return "使用中";
    case EQUIPMENT_STATUS.PARTIAL_RETURN: return "部分归还";
    case EQUIPMENT_STATUS.RETURNED: return "已归还";
    default: return "未知状态";
  }
};

// èŽ·å–状态颜色
const getStatusColor = (status) => {
  switch(status) {
    case EQUIPMENT_STATUS.USING: return '#409eff';        // è“è‰²
    case EQUIPMENT_STATUS.PARTIAL_RETURN: return '#e6a23c'; // æ©™è‰²
    case EQUIPMENT_STATUS.RETURNED: return '#67c23a';     // ç»¿è‰²
    default: return '#909399';                             // ç°è‰²
  }
};

// å“åº”式状态管理 - ä½¿ç”¨è§£æž„和默认值
const initFormState = () => ({ consumables: false });

const state = reactive({
  form: initFormState(),
  title: "",
  copyForm: {},
  addOrEdit: "add",
  loading: false,
  activeTab: "management",
  tableData: [],
  // åˆ†é¡µçŠ¶æ€ï¼ˆä¿ç•™ç”¨äºŽAPI调用，但不显示分页组件）
  pageNum: 1,
  pageSize: 20,
  total: 0,
  // ä¸‹æ‹‰åˆ·æ–°çŠ¶æ€
  refreshing: false,
  // æŸ¥è¯¢å‚æ•°
  queryParams: {
    searchAll: "",
  },
});

// ä½¿ç”¨è§£æž„简化访问
const {
  form,
  title,
  copyForm,
  addOrEdit,
  loading,
  activeTab,
  tableData,
  pageNum,
  pageSize,
  total,
  queryParams,
  refreshing,
} = toRefs(state);

// æ·»åŠ ç¼ºå¤±çš„响应式变量
const manaDialog = ref(false);
const equipmentRequisitionDialog = ref(false);
const usageRecordDialog = ref(false);
const dialogTableVisible = ref(false);
const dialogTableTitle = ref('');
const dialogTableData = ref([]);
const dialogTableColumns = ref([]);

// æ ‡ç­¾é¡µé…ç½® - ä¾¿äºŽåŽç»­æ‰©å±•
const tabsConfig = {
  management: {
    label: "设备列表",
    searchPlaceholder: "设备编号/设备名称/规格型号",
    showSearch: true,
    api: getManagementList,
    columns: [
      { prop: "equipmentNo", label: "设备编号", minWidth: 100 },
      { prop: "equipmentName", label: "设备名称", minWidth: 100 },
      { prop: "consumables", label: "耗材",
        formatter: (row) => {
          const value = row.consumables !== undefined ? row.consumables : row.isConsumables;
          return value ? "是" : "否";
        }, minWidth: 100 },
      { prop: "quantity", label: "总数量", minWidth: 100 },
      { prop: "usedNo", label: "已使用数量", minWidth: 100 },
      { prop: "specification", label: "规格型号", minWidth: 100 },
      { prop: "purchaseDate", label: "采购日期", minWidth: 100 },
      { prop: "purchasePrice", label: "采购价格", minWidth: 100 },
    ],
  },
  equipmentRequisition: {
    label: "设备领用",
    searchPlaceholder: "设备编号/设备名称/规格型号",
    showSearch: true,
    api: getUsageRecordList,
    columns: [
      { prop: "userName", label: "领用人", minWidth: 100 },
      { prop: "equipmentNo", label: "设备编号", minWidth: 100 },
      { prop: "equipmentName", label: "设备名称", minWidth: 100 },
      { prop: "usageQuantity", label: "领用数量", minWidth: 100 },
      {prop: "returnQuantity" , label: "归还数量", minWidth: 100,
        formatter: (row) => row.returnQuantity || 0
      },
      {
        prop: "equipmentStatus",
        label: "使用状态",
        minWidth: 100,
        formatter: (row) => getStatusText(row.equipmentStatus),
        cellStyle: (row) => ({ color: getStatusColor(row.equipmentStatus) }),
      },
      { prop: "usageStartTime", label: "使用开始时间", minWidth: 100 },
      { prop: "usageEndTime", label: "使用结束时间", minWidth: 100 },
      { prop: "remarks", label: "备注", minWidth: 100 },
    ],
  },
};

// æ ‡ç­¾é¡µæ•°æ® - u-tabs需要name作为显示文本
const tabs = computed(() => 
  Object.entries(tabsConfig).map(([name, config]) => ({
    name: config.label,  // ä½¿ç”¨label作为显示文本
    value: name,         // ä¿å­˜åŽŸå§‹name值
  }))
);

// å½“前标签页索引 - ä½¿ç”¨ref而不是computed，确保响应式更新
const activeTabIndex = ref(0);

// å½“前标签页配置
const currentTabConfig = computed(() => tabsConfig[activeTab.value]);

// è®¡ç®—属性
const searchPlaceholder = computed(
  () => currentTabConfig.value?.searchPlaceholder || "请输入搜索信息"
);
const shouldShowSearch = computed(
  () => currentTabConfig.value?.showSearch || false
);

// åˆ¤æ–­æ˜¯å¦æ˜¾ç¤ºå½’还按钮
const shouldShowReturnButton = (item) => {
  if (activeTab.value !== 'equipmentRequisition') {
    return false;
  }
  // å¦‚果设备状态是已归还，不显示归还按钮
  if (item.equipmentStatus === EQUIPMENT_STATUS.RETURNED) {
    return false;
  }
  // å…¶ä»–状态都显示归还按钮（使用中、部分归还、或者没有状态）
  return true;
};

// åŠ¨æ€èŽ·å–自定义按钮配置（保留用于其他用途）
const getCustomButtons = () => {
  const buttons = [];
  
  // åœ¨è®¾å¤‡é¢†ç”¨é¡µé¢æ·»åŠ å½’还按钮
  if (activeTab.value === 'equipmentRequisition') {
    buttons.push({
      name: 'return',
      label: '归还',
      type: 'success',
      size: 'small',
      link: true,
      show: (row) => shouldShowReturnButton(row),
      disabled: (row) => row.equipmentStatus === EQUIPMENT_STATUS.RETURNED,
    });
  }
  
  return buttons;
};

// å¤„理自定义按钮点击事件
const handleCustomButtonClick = ({ buttonName, row }) => {
  switch (buttonName) {
    case 'return':
      handleReturn(row);
      break;
    // å¯ä»¥åœ¨è¿™é‡Œæ·»åŠ æ›´å¤šè‡ªå®šä¹‰æŒ‰é’®çš„处理逻辑
    default:
      console.warn(`未处理的自定义按钮: ${buttonName}`);
  }
};
const handleReturn = (row) => {
  // æ£€æŸ¥è®¾å¤‡çŠ¶æ€
  if (row.equipmentStatus === EQUIPMENT_STATUS.RETURNED) {
    showToast('该设备已归还完成，无需再次归还', 'warning');
    return;
  }
  
  if (row.equipmentStatus !== EQUIPMENT_STATUS.USING && row.equipmentStatus !== EQUIPMENT_STATUS.PARTIAL_RETURN) {
    showToast('该设备当前状态不支持归还操作', 'warning');
    return;
  }
  
  form.value = { ...row };
  addOrEdit.value = "return"; // è®¾ç½®ä¸ºå½’还模式
  title.value = `归还设备 - ${row.equipmentName || ''}`;
  copyForm.value = { ...row };
  equipmentRequisitionDialog.value = true;
  console.log("归还设备：", row);
};
// æ ‡ç­¾é¡µåˆ‡æ¢å¤„理 - u-tabs的@change事件传递的是对象 { index: number }
const handleTabChange = (e) => {
  const index = typeof e === 'object' && e.index !== undefined ? e.index : e;
  console.log('handleTabChange:', e, 'index:', index, 'tabs:', tabs.value);
  const selectedTab = tabs.value[index];
  if (selectedTab && selectedTab.value !== activeTab.value) {
    activeTab.value = selectedTab.value;
    activeTabIndex.value = index;
    resetState();
    getList();
  }
};


const resetState = () => {
  form.value = {
    consumables: false,
  };
  addOrEdit.value = "add";
  loading.value = true;
  tableData.value = [];
  pageNum.value = 1;
  pageSize.value = 20;
  total.value = 0;
  queryParams.value.searchAll = "";
  refreshing.value = false;
};

const resetQuery = () => {
  queryParams.value.searchAll = "";
  pageNum.value = 1;
  getList();
};

const search = () => {
  pageNum.value = 1;
  getList();
};

// å¤„理新增领用
const handleAdd = () => {
  console.log('handleAdd è¢«è°ƒç”¨', 'activeTab:', activeTab.value, 'activeTabIndex:', activeTabIndex.value);
  addOrEdit.value = "add";
  form.value = {};
  title.value = `新增${currentTabConfig.value?.label || '设备领用'}`;
  copyForm.value = {};
  console.log('准备打开弹窗，equipmentRequisitionDialog当前值:', equipmentRequisitionDialog.value);
  equipmentRequisitionDialog.value = true;
  console.log('弹窗已打开，equipmentRequisitionDialog新值:', equipmentRequisitionDialog.value);
};

const handleView = async (row) => {
  // åªå¤„理设备领用页面的查看功能
  if (activeTab.value === 'equipmentRequisition') {
    try {
      dialogTableTitle.value = `${row.equipmentName || '设备'} - æ“ä½œè®°å½•è¯¦æƒ…`;
      
      // æ˜¾ç¤ºåŠ è½½çŠ¶æ€
      dialogTableVisible.value = true;
      dialogTableData.value = [];
      
      // è°ƒç”¨è¯¦æƒ…接口获取数据
      const { data, code } = await getUsageDetailList(row.id);
      if (code === 200 && data) {
        // å¤„理数组数据，直接显示操作记录列表
        if (Array.isArray(data)) {
          dialogTableData.value = data;
          dialogTableColumns.value = [
            { prop: 'equipmentNo', label: '设备编号', minWidth: 100 },
            { prop: 'equipmentName', label: '设备名称', minWidth: 120 },
            { prop: 'specification', label: '规格型号', minWidth: 100 },
            { 
              prop: 'operationType', 
              label: '操作类型', 
              minWidth: 80,
              formatter: (row) => row.operationType === 1 ? '领用' : '归还'
            },
            { prop: 'quantity', label: '操作数量', minWidth: 80 },
            { prop: 'operator', label: '操作人', minWidth: 80 },
            { prop: 'remark', label: '备注', minWidth: 150, showOverflowTooltip: true },
            { prop: 'createTime', label: '操作时间', minWidth: 150 }
          ];
        } else {
          showToast('暂无操作记录', 'warning');
        }
      } else {
        showToast('获取详情数据失败', 'error');
        dialogTableVisible.value = false;
      }
      
    } catch (error) {
      console.error('获取详情失败:', error);
      showToast('获取详情数据失败', 'error');
      dialogTableVisible.value = false;
    }
  }
};

// ä¸‹æ‹‰åˆ·æ–°
const onRefresh = async () => {
  refreshing.value = true;
  pageNum.value = 1;
  await getList();
  refreshing.value = false;
};

// èŽ·å–设备最大可领用数量
const getMaxQuantity = () => {
  if (form.value.equipmentId) {
    const equipment = tableData.value.find(
      (item) => item.equipmentId === form.value.equipmentId
    );
    return equipment ? equipment.quantity : null;
  }
  return null;
};

// è®¾å¤‡é¢†ç”¨å¼¹çª—提交处理
const onEquipmentRequisitionSubmit = (formData) => {
  if (formData.equipmentStatus === EQUIPMENT_STATUS.RETURNED) {
    showToast("设备已完全归还", 'success');
  } else if (formData.equipmentStatus === EQUIPMENT_STATUS.PARTIAL_RETURN) {
  } else if (formData.equipmentStatus === EQUIPMENT_STATUS.USING) {
    showToast("设备领用成功", 'success');
  } else {
    showToast("操作成功", 'success');
  }
  equipmentRequisitionDialog.value = false;
  nextTick(() => {
    form.value = {};
    getList();
  });
};

// æ•°æ®èŽ·å–
const getList = async () => {
  try {
    if (!refreshing.value) {
      loading.value = true;
    }
    const apiParams = {
      current: pageNum.value,
      pageSize: pageSize.value,
      searchAll: queryParams.value.searchAll,
    };

    const response = await currentTabConfig.value.api(apiParams);
    console.log('API响应:', response);
    
    // request工具返回的是 { code, data, msg } ç»“æž„
    const { data, code } = response;

    if (code !== 200) {
      showToast("获取数据失败：" + (response?.msg || "未知错误"), 'error');
      return;
    }

    // data æ˜¯ { records: [...], total: 3, ... } ç»“æž„
    const records = data?.records || data?.rows || [];
    console.log('解析后的数据:', records);
    
    // æ•°æ®å­—段映射：将 isConsumables æ˜ å°„为 consumables
    const mappedRecords = records.map(item => ({
      ...item,
      consumables: item.isConsumables !== undefined ? item.isConsumables : item.consumables
    }));

    // å¦‚果是下拉刷新，重置数据；否则追加数据（用于上拉加载更多，但当前不实现）
    if (pageNum.value === 1) {
      tableData.value = mappedRecords;
    } else {
      tableData.value = [...tableData.value, ...mappedRecords];
    }
    total.value = data?.total || 0;
    console.log('最终表格数据:', tableData.value);
  } catch (error) {
    console.error('获取数据失败:', error);
    showToast("获取数据失败，请稍后再试", 'error');
  } finally {
    loading.value = false;
  }
};

// ç»„件挂载
onMounted(() => {
  activeTab.value = "management";
  activeTabIndex.value = 0;
  // ä¸é‡ç½®æœç´¢æ¡ä»¶ï¼Œç›´æŽ¥åŠ è½½æ•°æ®
  loading.value = true;
  getList();
});
// è¿”回上一页
const goBack = () => {
    uni.navigateBack();
};
</script>

<style scoped lang="scss">
@import '@/styles/sales-common.scss';

.equipment-management {
    min-height: 100vh;
    background: #f8f9fa;
    position: relative;
}

.tabs-section {
    background: #ffffff;
    padding: 0 20px;
}

.list-container {
    flex: 1;
    height: calc(100vh - 200px);
}

.loading-container {
    display: flex;
    justify-content: center;
    align-items: center;
    padding: 40px;
    color: #999;
}

.no-data {
    padding: 40px 0;
    text-align: center;
    color: #999;
    font-size: 14px;
}
</style>

 src/pages/management/mould/equipmentRequisitionDialog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,826 @@
<template>
  <u-popup
    :show="visible"
    mode="center"
    :closeable="true"
    @close="handleClose"
    :round="10"
    width="90%"
    :safe-area-inset-bottom="true"
  >
    <view class="popup-content">
      <view class="popup-header">
        <text class="popup-title">{{ isReturnMode ? '设备归还' : isEdit ? '编辑设备领用' : '新增设备领用' }}</text>
      </view>
      
      <scroll-view class="form-scroll" scroll-y>
        <u-form :model="form" :rules="rules" ref="formRef" label-width="110" input-align="right">
          <u-form-item label="领用人" prop="userId" border-bottom required>
            <u-input
              v-model="displayUserName"
              placeholder="请选择领用人"
              readonly
              @click="showUserPicker = true"
              :disabled="isViewMode || isReturnMode"
            />
            <template #right>
              <u-icon name="arrow-right" @click="showUserPicker = true"></u-icon>
            </template>
          </u-form-item>
          
          <u-form-item label="设备名称" prop="equipmentId" border-bottom required>
            <u-input
              v-model="displayEquipmentName"
              placeholder="请选择设备名称"
              readonly
              @click="showEquipmentPicker = true"
              :disabled="isViewMode || isReturnMode"
            />
            <template #right>
              <u-icon name="arrow-right" @click="showEquipmentPicker = true"></u-icon>
            </template>
          </u-form-item>
          
          <u-form-item label="是否为消耗品" prop="consumables" border-bottom required>
            <u-input
              v-model="displayConsumables"
              placeholder="请选择是否为消耗品"
              readonly
              @click="showConsumablesPicker = true"
              :disabled="isViewMode || isReturnMode"
            />
            <template #right>
              <u-icon name="arrow-right" @click="showConsumablesPicker = true"></u-icon>
            </template>
          </u-form-item>
          
          <u-form-item v-if="isReturnMode" label="已使用数量" border-bottom>
            <u-input
              :value="formData.usageQuantity"
              disabled
              placeholder="已使用数量"
            />
          </u-form-item>
          
          <u-form-item v-if="isReturnMode" label="已归还数量" border-bottom>
            <u-input
              :value="formData.totalReturnNo || 0"
              disabled
              placeholder="已归还数量"
            />
          </u-form-item>
          
          <u-form-item v-if="!isReturnMode && formData.status !== 2" label="领用数量" prop="usageQuantity" border-bottom required>
            <view class="number-box-wrapper">
              <u-number-box
                v-model="form.usageQuantity"
                :min="1"
                :max="maxQuantity || 999"
                :disabled="isViewMode"
                integer
                @change="onUsageQuantityChange"
              />
              <text v-if="maxQuantity !== null" class="info-text">(最多{{ maxQuantity }}台)</text>
            </view>
          </u-form-item>
          
          <u-form-item v-if="isReturnMode" label="本次归还数量" prop="returnQuantity" border-bottom required>
            <view class="number-box-wrapper">
              <u-number-box
                v-model="form.returnQuantity"
                :min="1"
                :max="Math.max(1, remainingReturnQuantity)"
                :disabled="remainingReturnQuantity <= 0"
                integer
              />
              <text class="info-text" v-if="remainingReturnQuantity > 0">(最多{{ remainingReturnQuantity }}台)</text>
              <text class="info-text" v-else>(已全部归还)</text>
            </view>
            <view
              v-if="remainingReturnQuantity > 0 && form.returnQuantity === remainingReturnQuantity"
              class="tip-text"
            >
              ðŸ’¡ æç¤ºï¼šæœ¬æ¬¡å½’还后将完成全部归还
            </view>
          </u-form-item>
          
          <u-form-item v-if="!isReturnMode" label="使用开始时间" prop="usageStartTime" border-bottom required>
            <u-input
              v-model="form.usageStartTime"
              placeholder="请选择开始时间"
              readonly
              @click="showDatePicker('usageStartTime')"
            />
            <template #right>
              <u-icon name="arrow-right" @click="showDatePicker('usageStartTime')"></u-icon>
            </template>
          </u-form-item>

          <u-form-item v-if="isReturnMode" label="归还时间" prop="returnTime" border-bottom required>
            <u-input
              v-model="form.returnTime"
              placeholder="请选择归还时间"
              readonly
              @click="showDatePicker('returnTime')"
            />
            <template #right>
              <u-icon name="arrow-right" @click="showDatePicker('returnTime')"></u-icon>
            </template>
          </u-form-item>
          
          <u-form-item label="备注" border-bottom>
            <u-textarea
              v-model="form.remarks"
              placeholder="请输入备注"
              :disabled="isViewMode"
              :autoHeight="true"
              count
            />
          </u-form-item>
        </u-form>
      </scroll-view>
      
      <view class="popup-footer">
        <u-button @click="handleClose" :customStyle="{ marginRight: '10px', flex: 1 }">取消</u-button>
        <u-button type="primary" @click="debouncedSubmit" v-if="!isViewMode" :customStyle="{ flex: 1 }">确定</u-button>
      </view>
    </view>
    
    <!-- æ—¥æœŸé€‰æ‹©å™¨ -->
    <u-datetime-picker
      :show="showDatePickerVisible"
      v-model="datePickerValue"
      mode="date"
      @confirm="onDateConfirm"
      @cancel="showDatePickerVisible = false"
    />
    
    <!-- ç”¨æˆ·é€‰æ‹©å™¨ -->
    <up-action-sheet
      :show="showUserPicker"
      :actions="userActionList"
      title="选择领用人"
      @select="onUserSelect"
      @close="showUserPicker = false"
    />
    
    <!-- è®¾å¤‡é€‰æ‹©å™¨ -->
    <up-action-sheet
      :show="showEquipmentPicker"
      :actions="equipmentActionList"
      title="选择设备名称"
      @select="onEquipmentSelect"
      @close="showEquipmentPicker = false"
    />
    
    <!-- æ¶ˆè€—品选择器 -->
    <up-action-sheet
      :show="showConsumablesPicker"
      :actions="consumablesActionList"
      title="选择是否为消耗品"
      @select="onConsumablesSelect"
      @close="showConsumablesPicker = false"
    />
  </u-popup>
</template>

<script setup>
import { ref, watch, computed, onMounted, nextTick } from "vue";
import { useToast, useModal } from "@/utils/uviewplus";
import { getEquipmentList, userListAll } from "@/api/publicApi/index.js";
import { addOrEditUsageRecord } from "@/api/equipment/requisition/index.js";

import useUserStore from "@/store/modules/user";

const { showToast } = useToast();
const { showModal } = useModal();

const userStore = useUserStore();
let userList = ref([]);

// èŽ·å–用户列表
const fetchUserList = async () => {
  try {
    const res = await userListAll();
    if (res.code === 200) {
      userList.value = res.data || res.rows || [];
      console.log('用户列表获取成功:', userList.value);
    } else {
      showToast('获取用户列表失败', 'error');
    }
  } catch (error) {
    console.error('获取用户列表失败:', error);
    showToast('获取用户列表失败', 'error');
  }
};

// é€‰æ‹©å™¨æ˜¾ç¤ºçŠ¶æ€
const showUserPicker = ref(false);
const showEquipmentPicker = ref(false);
const showConsumablesPicker = ref(false);

// ç”¨æˆ·é€‰æ‹©åˆ—表（用于 action-sheet）
const userActionList = computed(() => {
  return userList.value.map(item => ({
    name: item.nickName || item.nickname || item.userName || item.name || '未知',
    value: item.userId || item.id
  }));
});

// è®¾å¤‡é€‰æ‹©åˆ—表（用于 action-sheet）
const equipmentActionList = computed(() => {
  return equipmentList.value.map(item => ({
    name: item.equipmentName || item.name || '未知设备',
    value: item.id || item.equipmentId
  }));
});

// æ˜¾ç¤ºç”¨çš„文本（使用 ref ç¡®ä¿å“åº”式）
const displayUserName = ref('');
const displayEquipmentName = ref('');
const displayConsumables = ref('');

// æ¶ˆè€—品选择列表
const consumablesActionList = computed(() => [
  { name: '是', value: true },
  { name: '否', value: false }
]);

// ç›‘听 form å˜åŒ–，更新显示文本
watch(
  () => form.value.userId,
  (userId) => {
    if (userId) {
      const user = userList.value.find(u => {
        const uId = u.userId || u.id;
        return uId == userId || String(uId) === String(userId);
      });
      displayUserName.value = user ? (user.nickName || user.nickname || user.userName || user.name) : '';
    } else {
      displayUserName.value = '';
    }
  },
  { immediate: true }
);

watch(
  () => form.value.equipmentId,
  (equipmentId) => {
    if (equipmentId) {
      const equipment = equipmentList.value.find(e => {
        const eId = e.id || e.equipmentId;
        return eId == equipmentId || String(eId) === String(equipmentId);
      });
      displayEquipmentName.value = equipment ? (equipment.equipmentName || equipment.name) : '';
    } else {
      displayEquipmentName.value = '';
    }
  },
  { immediate: true }
);

watch(
  () => form.value.consumables,
  (consumables) => {
    if (consumables === true || consumables === 'true' || consumables === 1) {
      displayConsumables.value = '是';
    } else if (consumables === false || consumables === 'false' || consumables === 0) {
      displayConsumables.value = '否';
    } else {
      displayConsumables.value = '';
    }
  },
  { immediate: true }
);

// ç”¨æˆ·é€‰æ‹©
const onUserSelect = (item) => {
  const userId = item.value || item.userId || item.id;
  form.value.userId = userId;
  // ç«‹å³æ›´æ–°æ˜¾ç¤ºæ–‡æœ¬
  const user = userList.value.find(u => {
    const uId = u.userId || u.id;
    return uId == userId || String(uId) === String(userId);
  });
  displayUserName.value = user ? (user.nickName || user.nickname || user.userName || user.name) : '';
  showUserPicker.value = false;
  // é€‰æ‹©ç”¨æˆ·åŽèŽ·å–设备列表
  getEquipment();
  nextTick(() => {
    if (formRef.value) {
      formRef.value.validateField('userId');
    }
  });
};

// è®¾å¤‡é€‰æ‹©
const onEquipmentSelect = (item) => {
  const equipmentId = item.value || item.id || item.equipmentId;
  form.value.equipmentId = equipmentId;
  // ç«‹å³æ›´æ–°æ˜¾ç¤ºæ–‡æœ¬
  const equipment = equipmentList.value.find(e => {
    const eId = e.id || e.equipmentId;
    return eId == equipmentId || String(eId) === String(equipmentId);
  });
  displayEquipmentName.value = equipment ? (equipment.equipmentName || equipment.name) : '';
  showEquipmentPicker.value = false;
  nextTick(() => {
    if (formRef.value) {
      formRef.value.validateField('equipmentId');
    }
  });
};

// æ¶ˆè€—品选择
const onConsumablesSelect = (item) => {
  const consumables = item.value !== undefined ? item.value : (item.name === '是' ? true : false);
  form.value.consumables = consumables;
  // ç«‹å³æ›´æ–°æ˜¾ç¤ºæ–‡æœ¬
  displayConsumables.value = consumables ? '是' : '否';
  showConsumablesPicker.value = false;
  nextTick(() => {
    if (formRef.value) {
      formRef.value.validateField('consumables');
    }
  });
};

// é¢†ç”¨æ•°é‡å˜åŒ–
const onUsageQuantityChange = (value) => {
  // ç¡®ä¿å€¼æ˜¯æ•°å­—类型
  form.value.usageQuantity = Number(value) || 1;
  // è§¦å‘验证
  nextTick(() => {
    if (formRef.value) {
      formRef.value.validateField('usageQuantity');
    }
  });
};

// èŽ·å–设备列表
const equipmentList = ref([]);
// èŽ·å–最新数据
const getEquipment = async () => {
  try {
    const res = await getEquipmentList();
    if (res.code === 200) {
      equipmentList.value = res.data || res.rows || [];
      console.log('设备列表获取成功:', equipmentList.value);
    } else {
      showToast("获取设备列表失败", 'error');
    }
  } catch (error) {
    console.error("获取设备列表失败:", error);
    showToast("获取设备列表失败", 'error');
  }
};
const props = defineProps({
  modelValue: Boolean,
  formData: {
    type: Object,
    default: () => ({}),
  },
  addOrEdit: {
    type: String,
    default: "add",
  },
});

// é»˜è®¤è¡¨å•åˆå§‹å€¼
const defaultForm = {
  userId: "",
  equipmentId: "",
  consumables: false,
  usageQuantity: 1,
  usageStartTime: "",
  returnQuantity: 1,
  returnTime: "",
  remarks: "",
};
const form = ref({ ...defaultForm });

const maxQuantity = computed(() => {
  if (!form.value.equipmentId) return 0;
  const eq = equipmentList.value.find(
    (item) => item.id == form.value.equipmentId
  );
  // é˜²æ­¢ä¸º0或负数，最小为1
  return eq && eq.quantity > 0 ? eq.quantity : 999;
});
const emit = defineEmits(["update:modelValue", "submit"]);

const visible = computed({
  get: () => {
    console.log('弹窗 visible get:', props.modelValue);
    return props.modelValue;
  },
  set: (v) => {
    console.log('弹窗 visible set:', v);
    emit("update:modelValue", v);
  },
});

// ç›‘听 modelValue å˜åŒ–
watch(
  () => props.modelValue,
  (newVal) => {
    console.log('弹窗 modelValue å˜åŒ–:', newVal);
  },
  { immediate: true }
);

// ç›‘听设备选择变化
watch(
  () => form.value.equipmentId,
  (newId) => {
    if (newId) {
      const eq = equipmentList.value.find(item => item.id == newId);
    }
  }
);
const isViewMode = computed(
  () => props.addOrEdit === "view" || props.addOrEdit === "viewRow"
);

// åˆ¤æ–­æ˜¯å¦ä¸ºå½’还模式
const isReturnMode = computed(() => props.addOrEdit === "return");

// è®¡ç®—剩余可归还数量
const remainingReturnQuantity = computed(() => {
  if (!isReturnMode.value || !props.formData.usageQuantity) return 0;

  const totalUsageQuantity = props.formData.usageQuantity || 0; // æ€»ä½¿ç”¨æ•°é‡
  const alreadyReturnedQuantity = props.formData.totalReturnNo || 0; // å·²å½’还数量
  const remaining = totalUsageQuantity - alreadyReturnedQuantity; // å‰©ä½™å¯å½’还数量

  return Math.max(0, remaining); // ç¡®ä¿ä¸ä¸ºè´Ÿæ•°
});

const isEdit = computed(() => !!props.formData?.id);
const formRef = ref();

// æ—¥æœŸé€‰æ‹©å™¨
const showDatePickerVisible = ref(false);
const datePickerValue = ref(Date.now());
const currentDateField = ref('');

// æ˜¾ç¤ºæ—¥æœŸé€‰æ‹©å™¨
const showDatePicker = (field) => {
  if (isViewMode.value) return;
  currentDateField.value = field;
  if (form.value[field]) {
    datePickerValue.value = new Date(form.value[field]).getTime();
  } else {
    datePickerValue.value = Date.now();
  }
  showDatePickerVisible.value = true;
};

// æ—¥æœŸç¡®è®¤
const onDateConfirm = (e) => {
  const date = new Date(e.value);
  const year = date.getFullYear();
  const month = String(date.getMonth() + 1).padStart(2, "0");
  const day = String(date.getDate()).padStart(2, "0");
  form.value[currentDateField.value] = `${year}-${month}-${day}`;
  showDatePickerVisible.value = false;
};

// èŽ·å–当前日期（YYYY-MM-DD格式）
const getCurrentDate = () => {
  const now = new Date();
  const year = now.getFullYear();
  const month = String(now.getMonth() + 1).padStart(2, "0");
  const day = String(now.getDate()).padStart(2, "0");
  return `${year}-${month}-${day}`;
};

// ç¡®ä¿åˆå§‹åŒ–时获取数据
onMounted(() => {
  fetchUserList();
  getEquipment();
});


// æ ‡è®°æ˜¯å¦å·²ç»åˆå§‹åŒ–，避免 watch è¦†ç›–用户选择
const isInitialized = ref(false);

watch(
  () => props.formData,
  (val) => {
    // åªåœ¨åˆå§‹åŒ–时或者 formData æœ‰å®žé™…变化时才更新
    if (!isInitialized.value) {
      if (val && Object.keys(val).length > 0) {
        // åˆå¹¶çŽ°æœ‰å€¼ï¼Œé¿å…è¦†ç›–用户已选择的值
        form.value = { ...defaultForm, ...val };

        // å½’还模式初始化
        if (isReturnMode.value) {
          form.value.returnTime = getCurrentDate();
          const maxReturnQuantity = remainingReturnQuantity.value;
          form.value.returnQuantity =
            maxReturnQuantity > 0 ? Math.min(1, maxReturnQuantity) : 0;
        }
      } else {
        form.value = { ...defaultForm };
      }
      isInitialized.value = true;
      console.log('formData watch åˆå§‹åŒ–，form.value:', form.value);
    }
  },
  { immediate: true }
);

// ç›‘听弹窗打开，重置初始化标记并获取数据
watch(
  () => props.modelValue,
  (newVal) => {
    if (newVal) {
      // å¼¹çª—打开时重置初始化标记，允许 formData watch é‡æ–°åˆå§‹åŒ–
      isInitialized.value = false;
      // å¼¹çª—打开时重新获取数据
      if (userList.value.length === 0) {
        fetchUserList();
      }
      if (equipmentList.value.length === 0) {
        getEquipment();
      }
    } else {
      // å¼¹çª—关闭时重置
      isInitialized.value = false;
    }
  }
);

const rules = computed(() => {
  const baseRules = {
    userId: [
      { 
        required: true, 
        message: "请选择领用人", 
        trigger: "change",
        validator: (rule, value, callback) => {
          if (!form.value.userId) {
            callback(new Error("请选择领用人"));
          } else {
            callback();
          }
        }
      }
    ],
    equipmentId: [
      { 
        required: true, 
        message: "请选择设备名称", 
        trigger: "change",
        validator: (rule, value, callback) => {
          if (!form.value.equipmentId) {
            callback(new Error("请选择设备名称"));
          } else {
            callback();
          }
        }
      }
    ],
    consumables: [
      { 
        required: true, 
        message: "请选择是否为消耗品", 
        trigger: "change",
        validator: (rule, value, callback) => {
          if (form.value.consumables === undefined || form.value.consumables === null || form.value.consumables === '') {
            callback(new Error("请选择是否为消耗品"));
          } else {
            callback();
          }
        }
      }
    ],
  };

  if (isReturnMode.value) {
    // å½’还模式的验证规则
    return {
      ...baseRules,
      returnQuantity: [
        { required: true, message: "请输入归还数量", trigger: "blur" },
        { type: "number", min: 1, message: "至少归还1台", trigger: "blur" },
        {
          validator: (rule, value, callback) => {
            const remaining = remainingReturnQuantity.value;
            if (remaining <= 0) {
              callback(new Error("已全部归还，无法继续归还"));
            } else if (value > remaining) {
              callback(
                new Error(`归还数量不能大于剩余可归还数量(${remaining}台)`)
              );
            } else {
              callback();
            }
          },
          trigger: "blur",
        },
      ],
      returnTime: [
        { required: true, message: "请选择归还时间", trigger: "change" },
      ],
    };
  } else {
    // æ–°å¢ž/编辑模式的验证规则
    return {
      ...baseRules,
      usageQuantity: [
        { 
          required: true, 
          message: "请输入领用数量", 
          trigger: "change",
          validator: (rule, value, callback) => {
            const numValue = Number(value) || 0;
            if (!value && value !== 0) {
              callback(new Error("请输入领用数量"));
            } else if (numValue < 1) {
              callback(new Error("至少领用1台"));
            } else if (maxQuantity.value !== null && numValue > maxQuantity.value) {
              callback(new Error("领用数量不能大于设备数量"));
            } else {
              callback();
            }
          }
        },
      ],
      usageStartTime: [
        { required: true, message: "请选择开始时间", trigger: "change" },
      ],
    };
  }
});

function handleClose() {
  emit("update:modelValue", false);
}

// é€šç”¨é˜²æŠ–函数
function debounce(fn, delay = 800) {
  let timer = null;
  return function (...args) {
    if (timer) clearTimeout(timer);
    timer = setTimeout(() => {
      fn.apply(this, args);
      timer = null;
    }, delay);
  };
}

// é˜²æŠ–后的提交方法
const debouncedSubmit = debounce(handleSubmit, 800);

function handleSubmit() {
  formRef.value.validate(async (valid) => {
    if (!valid) return;

    let submitData = { ...form.value };

    // å½’还模式处理
    if (isReturnMode.value) {
      const currentReturnQuantity = form.value.returnQuantity;
      const totalUsageQuantity = props.formData.usageQuantity;
      const alreadyReturnedQuantity = props.formData.totalReturnNo || 0;
      const newTotalReturnedQuantity =
        alreadyReturnedQuantity + currentReturnQuantity;

      // åˆ¤æ–­æ˜¯å¦å…¨éƒ¨å½’还完成
      let equipmentStatus = 2; // é»˜è®¤ä¸ºéƒ¨åˆ†å½’还
      let isFullyReturned = newTotalReturnedQuantity >= totalUsageQuantity;

      if (isFullyReturned) {
        equipmentStatus = 3; // å…¨éƒ¨å½’还完成

        // å…¨éƒ¨å½’还时的确认提示
        try {
          const result = await showModal({
            title: '确认全部归还',
            content: `确认将设备"${props.formData.equipmentName || '未知设备'}"全部归还吗？归还后设备状态将变为"已归还"。`,
            confirmText: '确认归还',
            cancelText: '取消',
            type: 'success'
          });
          
          if (!result) {
            showToast('已取消归还操作', 'info');
            return;
          }
        } catch (error) {
          showToast('已取消归还操作', 'info');
          return;
        }

        console.log("设备归还完成:", {
          è®¾å¤‡åç§°: props.formData.equipmentName,
          æ€»ä½¿ç”¨æ•°é‡: totalUsageQuantity,
          æ–°çš„归还总数: newTotalReturnedQuantity,
          çŠ¶æ€: "已全部归还",
        });
      } else {
        console.log("设备部分归还:", {
          è®¾å¤‡åç§°: props.formData.equipmentName,
          æ€»ä½¿ç”¨æ•°é‡: totalUsageQuantity,
          å·²å½’还数量: newTotalReturnedQuantity,
          å‰©ä½™æœªå½’还: totalUsageQuantity - newTotalReturnedQuantity,
          çŠ¶æ€: "部分归还",
        });
      }

      submitData = {
        ...props.formData,
        totalReturnNo: newTotalReturnedQuantity,
        returnQuantity: currentReturnQuantity,
        returnTime: form.value.returnTime,
        equipmentStatus: equipmentStatus,
        remarks: form.value.remarks,
        usageQuantity: totalUsageQuantity,
      };
    }

    try {
      let { code, data } = await addOrEditUsageRecord(submitData);
      if (code !== 200) {
        showToast(data.msg || "操作失败", 'error');
        return;
      }
      if (code == 200 && data == 1) {
        emit("submit", submitData);
      }
      handleClose();
    } catch (error) {
      console.error("提交失败:", error);
      showToast("操作失败，请稍后再试", 'error');
    }
  });
}
</script>

<style scoped lang="scss">
@import '@/static/scss/form-common.scss';

.popup-content {
  width: 90vw;
  max-width: 500px;
  background-color: #fff;
  border-radius: 10px;
  overflow: hidden;
  display: flex;
  flex-direction: column;
  max-height: 80vh;
}

.popup-header {
  padding: 20px;
  text-align: center;
  border-bottom: 1px solid #f0f0f0;
  flex-shrink: 0;
}

.popup-title {
  font-size: 18px;
  font-weight: 600;
  color: #333;
}

.form-scroll {
  flex: 1;
  max-height: calc(80vh - 140px);
  overflow-y: auto;
}

.popup-footer {
  display: flex;
  justify-content: center;
  padding: 15px 20px;
  border-top: 1px solid #f0f0f0;
  background-color: #fafafa;
  flex-shrink: 0;
}

.number-box-wrapper {
  display: flex;
  align-items: center;
  gap: 12px;
  width: 100%;
  justify-content: flex-end;
}

.info-text {
  font-size: 12px;
  color: #999;
  margin-left: 8px;
}

.tip-text {
  font-size: 12px;
  color: #2979ff;
  margin-top: 8px;
  padding: 8px 12px;
  background: #f0f7ff;
  border-radius: 4px;
}
</style>

 src/pages/management/mould/managementDialog.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,260 @@
<template>
  <div>
    <u-popup
      v-model="dialogVisible"
      :title="addOrEdit === 'edit' ? '编辑' : '新增' + '设备'"
      mode="center"
      :close-on-click-overlay="false"
      :before-close="handleClose"
      :border-radius="20"
      width="90%"
    >
      <u-form
        ref="formRef"
        :model="formData"
        :rules="rules"
        label-width="auto"
      >
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="设备编号" prop="equipmentNo">
              <u-input
                v-model="formData.equipmentNo"
                placeholder="请输入设备编号"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
          <view class="form-col">
            <u-form-item label="设备名称" prop="equipmentName">
              <u-input
                v-model="formData.equipmentName"
                placeholder="请输入设备名称"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
        </view>
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="是否为耗材" prop="consumables">
              <u-select
                v-model="formData.consumables"
                :list="consumablesOptions"
                placeholder="请选择是否为耗材"
                :disabled="isViewMode"
              />
            </u-form-item>
          </view>
          <view class="form-col">
            <u-form-item label="规格型号" prop="specification">
              <u-input
                v-model="formData.specification"
                placeholder="请输入规格型号"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
        </view>
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="存放位置" prop="storageLocation">
              <u-input
                v-model="formData.storageLocation"
                placeholder="请输入存放位置"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
          <view class="form-col">
            <u-form-item label="采购价格" prop="purchasePrice">
              <u-input
                v-model="formData.purchasePrice"
                placeholder="请输入采购价格"
                :disabled="isViewMode"
                border="surround"
                type="number"
              />
            </u-form-item>
          </view>
        </view>
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="采购日期" prop="purchaseDate">
              <u-datetime-picker
                v-model="formData.purchaseDate"
                mode="date"
                placeholder="请选择采购日期"
                :disabled="isViewMode"
              />
            </u-form-item>
          </view>
        </view>
        <view class="dialog-footer">
          <u-button @click="cancelForm" type="default" size="normal">取消</u-button>
          <u-button v-if="!isViewMode" @click="submitForm" type="primary" size="normal">确定</u-button>
        </view>
      </u-form>
    </u-popup>
  </div>
</template>

<script setup>
import { ref, watch, computed, reactive } from "vue";
import { addOrEditEquipment } from "@/api/equipment/management/index.js";
import { useToast } from "@/utils/uviewplus";

const { showToast } = useToast();

const props = defineProps({
  beforeClose: {
    type: Function,
    default: () => {},
  },
  form: {
    type: Object,
    default: () => ({}),
  },
  addOrEdit: {
    type: String,
    default: "add",
  },
  title: {
    type: String,
    default: "",
  },
});

const emit = defineEmits(["submit", "handleBeforeClose"]);

// è®¡ç®—属性：统一控制是否禁用
const isViewMode = computed(() => props.addOrEdit === "viewRow");

// è¡¨å•å¼•ç”¨å’Œæ•°æ®
const formRef = ref(null);
const formData = ref({});
const copyForm = defineModel("copyForm", {
  required: true,
  type: Object,
  default: () => ({}),
});

// å¼¹çª—可见性
const dialogVisible = defineModel("managementFormDialog", {
  required: true,
  type: Boolean,
});

// è€—材选项
const consumablesOptions = reactive([
  { label: "是", value: "1" },
  { label: "否", value: "0" }
]);

// ç›‘听外部传入的表单数据变化，合并监听逻辑
watch(
  [() => props.form, () => props.addOrEdit],
  ([newForm, newAddOrEdit]) => {
    formData.value = { ...newForm };
  },
  { deep: true, immediate: true }
);

// æäº¤è¡¨å•
const submitForm = async () => {
  if (!formRef.value) return;
  
  try {
    const valid = await formRef.value.validate();
    if (!valid) return;
    
    const result = await addOrEditEquipment({ ...formData.value });
    const title = props.title.includes("新增") ? "新增" : "编辑";
    
    if (result.code === 200 && result.msg) {
      showToast({ title: `${title}成功：${result.msg}`, type: 'success' });
      emit("submit", { title, ...formData.value, result });
      closeDialog();
    } else {
      showToast({ title: `${title}失败：${result.msg}`, type: 'error' });
    }
  } catch (error) {
    console.error("提交失败:", error);
    showToast({ title: "提交失败，请重试", type: 'error' });
  }
};

// å…³é—­å¼¹çª—的统一方法
const closeDialog = () => {
  emit("update:managementFormDialog", false);
  formData.value = {};
};

// å–消表单
const cancelForm = () => {
  closeDialog();
};

// é‡ç½®è¡¨å•
const resetForm = () => {
  if (!formRef.value) return;
  formData.value = JSON.parse(JSON.stringify(copyForm.value));
};

// å…³é—­å¼¹çª—
const handleClose = () => {
  emit("handleBeforeClose");
  closeDialog();
};

const rules = reactive({
  equipmentNo: [
    { required: true, message: "请输入设备编号", trigger: "blur" },
  ],
  equipmentName: [
    { required: true, message: "请输入设备名称", trigger: "blur" },
  ],
  consumables: [
    { required: true, message: "请选择是否为耗材", trigger: "change" },
  ],
});
</script>

<style lang="scss" scoped>
.form-row {
  display: flex;
  flex-direction: row;
  justify-content: space-between;
  margin-bottom: 20rpx;
}

.form-col {
  flex: 1;
  margin-right: 20rpx;
}

.form-col:last-child {
  margin-right: 0;
}

.dialog-footer {
  display: flex;
  justify-content: flex-end;
  margin-top: 40rpx;
  flex-direction: row;
  gap: 20rpx;
}

// å¼¹çª—样式适配
:deep(.u-popup__content) {
  padding: 30rpx;
}

:deep(.u-form-item) {
  margin-bottom: 20rpx;
}
</style>

 src/pages/management/mould/usageRecord.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,265 @@
<template>
  <div>
    <u-popup
      v-model="dialogVisible"
      :title="addOrEdit === 'edit' ? '编辑' : '新增' + '设备'"
      mode="center"
      :close-on-click-overlay="false"
      :before-close="handleClose"
      :border-radius="20"
      width="90%"
    >
      <u-form
        ref="formRef"
        :model="formData"
        :rules="rules"
        label-width="auto"
      >
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="设备编号" prop="equipmentId">
              <u-input
                v-model="formData.equipmentId"
                placeholder="请输入设备编号"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
          <view class="form-col">
            <u-form-item label="设备名称" prop="equipmentName">
              <u-input
                v-model="formData.equipmentName"
                placeholder="请输入设备名称"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
        </view>
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="数量" prop="quantity">
              <u-input
                v-model="formData.quantity"
                placeholder="请输入数量"
                :disabled="isViewMode"
                border="surround"
                type="number"
              />
            </u-form-item>
          </view>
          <view class="form-col">
            <u-form-item label="规格型号" prop="specification">
              <u-input
                v-model="formData.specification"
                placeholder="请输入规格型号"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
        </view>
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="使用状态" prop="usageStatus">
              <u-select
                v-model="formData.usageStatus"
                :list="usageStatusOptions"
                placeholder="请选择使用状态"
                :disabled="isViewMode"
              />
            </u-form-item>
          </view>
          <view class="form-col">
            <u-form-item label="存放位置" prop="storageLocation">
              <u-input
                v-model="formData.storageLocation"
                placeholder="请输入存放位置"
                :disabled="isViewMode"
                border="surround"
              />
            </u-form-item>
          </view>
        </view>
        <view class="form-row">
          <view class="form-col">
            <u-form-item label="采购价格" prop="purchasePrice">
              <u-input
                v-model="formData.purchasePrice"
                placeholder="请输入采购价格"
                :disabled="isViewMode"
                border="surround"
                type="number"
              />
            </u-form-item>
          </view>
          <view class="form-col">
            <u-form-item label="采购日期" prop="purchaseDate">
              <u-datetime-picker
                v-model="formData.purchaseDate"
                mode="date"
                placeholder="请选择采购日期"
                :disabled="isViewMode"
              />
            </u-form-item>
          </view>
        </view>
        <view class="dialog-footer">
          <u-button v-if="!isViewMode" @click="cancelForm" type="default" size="normal">取消</u-button>
          <u-button v-if="!isViewMode" @click="submitForm" type="primary" size="normal">确定</u-button>
        </view>
      </u-form>
    </u-popup>
  </div>
</template>

<script setup>
import { ref, watch, computed, reactive } from "vue";
import { addOrEditEquipment } from "@/api/equipment/management/index.js";
import { useToast } from "@/utils/uviewplus";

const { showToast } = useToast();

const props = defineProps({
  beforeClose: {
    type: Function,
    default: () => {},
  },
  form: {
    type: Object,
    default: () => ({}),
  },
  addOrEdit: {
    type: String,
    default: "add",
  },
  title: {
    type: String,
    default: "",
  },
});

const emit = defineEmits(["submit", "handleBeforeClose"]);

// è®¡ç®—属性：统一控制是否禁用
const isViewMode = computed(() => props.addOrEdit === "viewRow");

// è¡¨å•å¼•ç”¨å’Œæ•°æ®
const formRef = ref(null);
const formData = ref({});
const copyForm = defineModel("copyForm", {
  required: true,
  type: Object,
  default: () => ({}),
});

// å¼¹çª—可见性
const dialogVisible = defineModel("managementFormDialog", {
  required: true,
  type: Boolean,
});

// ä½¿ç”¨çŠ¶æ€é€‰é¡¹
const usageStatusOptions = reactive([
  { label: "启用", value: "1" },
  { label: "禁用", value: "0" }
]);

// ç›‘听外部传入的表单数据变化，合并监听逻辑
watch(
  [() => props.form, () => props.addOrEdit],
  ([newForm, newAddOrEdit]) => {
    formData.value = { ...newForm };
  },
  { deep: true, immediate: true }
);

// æäº¤è¡¨å•
const submitForm = async () => {
  if (!formRef.value) return;
  
  try {
    const valid = await formRef.value.validate();
    if (!valid) return;
    
    const result = await addOrEditEquipment({ ...formData.value });
    const title = props.title.includes("新增") ? "新增" : "编辑";
    
    if (result.code === 200 && result.msg) {
      showToast({ title: `${title}成功：${result.msg}`, type: 'success' });
      emit("submit", { title, ...formData.value, result });
      closeDialog();
    } else {
      showToast({ title: `${title}失败：${result.msg}`, type: 'error' });
    }
  } catch (error) {
    console.error("提交失败:", error);
    showToast({ title: "提交失败，请重试", type: 'error' });
  }
};

// å…³é—­å¼¹çª—的统一方法
const closeDialog = () => {
  emit("update:managementFormDialog", false);
  formData.value = {};
};

// å–消表单
const cancelForm = () => {
  closeDialog();
};

// é‡ç½®è¡¨å•
const resetForm = () => {
  if (!formRef.value) return;
  formData.value = JSON.parse(JSON.stringify(copyForm.value));
};

// å…³é—­å¼¹çª—
const handleClose = () => {
  emit("handleBeforeClose");
  closeDialog();
};

const rules = reactive({
  equipmentId: [
    { required: true, message: "请输入设备编号", trigger: "blur" },
  ],
});
</script>

<style lang="scss" scoped>
.form-row {
  display: flex;
  flex-direction: row;
  justify-content: space-between;
  margin-bottom: 20rpx;
}

.form-col {
  flex: 1;
  margin-right: 20rpx;
}

.form-col:last-child {
  margin-right: 0;
}

.dialog-footer {
  display: flex;
  justify-content: flex-end;
  margin-top: 40rpx;
  flex-direction: row;
  gap: 20rpx;
}

// å¼¹çª—样式适配
:deep(.u-popup__content) {
  padding: 30rpx;
}

:deep(.u-form-item) {
  margin-bottom: 20rpx;
}
</style>

 src/store/modules/user.ts

@@ -1,4 +1,4 @@
import {logout, getInfo, loginCheckFactory} from "@/api/login";
import {logout, getInfo, login} from "@/api/login";
import { getToken, setToken, removeToken } from "@/utils/auth";
import defAva from "@/static/images/profile.jpg";
import { defineStore } from "pinia";
@@ -26,12 +26,12 @@
  }),
  actions: {
    // éƒ¨é—¨ç™»å½•
    loginCheckFactory(userInfo: any) {
    login(userInfo: any) {
      const userName = userInfo.userName
      const password = userInfo.password
      const factoryId = userInfo.factoryId
      return new Promise((resolve, reject) => {
        loginCheckFactory(userName, password, factoryId).then((res: any) => {
        login(userName, password, factoryId).then((res: any) => {
          setToken(res.token)
          this.token = res.token
          resolve(null)

 src/utils/uviewplus.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,82 @@
/**
 * uview-plus å·¥å…·å‡½æ•°å°è£…
 * æä¾›ç»Ÿä¸€çš„提示和模态框工具
 */

/**
 * ä½¿ç”¨ Toast æç¤ºå·¥å…·
 * @returns {{showToast: function}} 
 */
export const useToast = () => {
  /**
   * æ˜¾ç¤ºæç¤ºä¿¡æ¯
   * @param {string} message æç¤ºæ¶ˆæ¯
   * @param {string} [type='info'] æç¤ºç±»åž‹ï¼š'success' | 'error' | 'warning' | 'info'
   * @param {number} [duration=2000] æ˜¾ç¤ºæ—¶é•¿ï¼ˆæ¯«ç§’）
   */
  const showToast = (message, type = 'info', duration = 2000) => {
    // æ˜ å°„ uview-plus çš„图标类型
    const iconMap = {
      success: 'success',
      error: 'error', 
      warning: 'warning',
      info: 'info'
    };
    
    uni.showToast({
      title: message,
      icon: iconMap[type] || 'none',
      duration: duration
    });
  };

  return {
    showToast
  };
};

/**
 * ä½¿ç”¨ Modal æ¨¡æ€æ¡†å·¥å…·
 * @returns {{showModal: function}}
 */
export const useModal = () => {
  /**
   * æ˜¾ç¤ºç¡®è®¤æ¨¡æ€æ¡†
   * @param {Object} options é…ç½®é€‰é¡¹
   * @param {string} options.title æ ‡é¢˜
   * @param {string} options.content å†…容
   * @param {boolean} [options.showCancel=true] æ˜¯å¦æ˜¾ç¤ºå–消按钮
   * @param {string} [options.confirmText='确认'] ç¡®è®¤æŒ‰é’®æ–‡æœ¬
   * @param {string} [options.cancelText='取消'] å–消按钮文本
   * @returns {Promise<boolean>} ç”¨æˆ·ç¡®è®¤ç»“æžœ
   */
  const showModal = (options) => {
    return new Promise((resolve) => {
      uni.showModal({
        title: options.title || '提示',
        content: options.content || '',
        showCancel: options.showCancel !== false,
        confirmText: options.confirmText || '确认',
        cancelText: options.cancelText || '取消',
        success: (res) => {
          resolve(res.confirm);
        },
        fail: () => {
          resolve(false);
        }
      });
    });
  };

  return {
    showModal
  };
};

/**
 * é»˜è®¤å¯¼å‡º
 */
export default {
  useToast,
  useModal
};