Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

spring

昨天 3739a47340c8d8b6edf5fdcbb0534f5fc8d96530

Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New

 src/api/safeProduction/emergencyPlanReview.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
// å‘货台账页面接口
import request from "@/utils/request";

// åˆ†é¡µæŸ¥è¯¢
export function safeContingencyPlanListPage(query) {
  return request({
    url: "/safeContingencyPlan/page",
    method: "get",
    params: query,
  });
}

export function safeContingencyPlanAdd(query) {
    return request({
        url: '/safeContingencyPlan',
        method: 'post',
        data: query
    })
}

export function safeContingencyPlanUpdate(query) {
    return request({
        url: '/safeContingencyPlan',
        method: 'put',
        data: query
    })
}

export function safeContingencyPlanDel(ids) {
    return request({
        url: '/safeContingencyPlan/' + ids,
        method: 'delete',
        data: ids
    })
}

 src/api/salesManagement/deliveryLedger.js

@@ -18,6 +18,14 @@
    data: query,
  });
}
// ä¿®æ”¹å‘货台账
export function deductStock(query) {
  return request({
    url: "/shippingInfo/deductStock",
    method: "post",
    data: query,
  });
}

// åˆ é™¤å‘货台账
export function delDeliveryLedger(query) {

 src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue

@@ -197,10 +197,6 @@
              <div v-if="!activity.isShen" class="node-reason">
                <span>审批意见：</span>{{ activity.approveNodeReason }}
              </div>
              <div v-if="!activity.isShen" class="node-reason">
                <span>签名：</span>
                                <img :src="activity.urlTem" class="signImg" alt="" v-if="activity.urlTem"/>
              </div>
              <div v-else-if="activity.isShen">
                <el-form-item
                  :prop="'activities.' + index + '.approveNodeReason'"

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -45,7 +45,7 @@
          type="danger"
          plain
          @click="handleDelete"
          v-if="currentApproveType !== 7"
          v-if="currentApproveType !== 5 && currentApproveType !== 6 && currentApproveType !== 7"
        >删除</el-button>
      </div>
    </div>

 src/views/collaborativeApproval/knowledgeBase/index.vue

@@ -46,11 +46,13 @@
    </div>

    <!-- æ–°å¢ž/编辑知识弹窗 -->
    <el-dialog
    <FormDialog
      v-model="dialogVisible"
      :title="dialogTitle"
      width="800px"
      :close-on-click-modal="false"
      :width="'800px'"
      @close="closeKnowledgeDialog"
      @confirm="submitForm"
      @cancel="closeKnowledgeDialog"
    >
      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
        <el-row :gutter="20">
@@ -115,7 +117,14 @@
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="创建人" prop="creator">
              <el-input v-model="form.creator" placeholder="请输入创建人" />
              <el-select v-model="form.creator" placeholder="请选择创建人" style="width: 100%" filterable>
                <el-option
                  v-for="user in userList"
                  :key="user.userId"
                  :label="user.nickName"
                  :value="user.nickName"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
@@ -125,20 +134,16 @@
          </el-col>
        </el-row>
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="dialogVisible = false">取消</el-button>
          <el-button type="primary" @click="submitForm">确定</el-button>
        </span>
      </template>
    </el-dialog>
    </FormDialog>

    <!-- æŸ¥çœ‹çŸ¥è¯†è¯¦æƒ…弹窗 -->
    <el-dialog
    <FormDialog
      v-model="viewDialogVisible"
      title="知识详情"
      width="900px"
      :close-on-click-modal="false"
      :width="'900px'"
      @close="closeViewDialog"
      @confirm="handleViewDialogConfirm"
      @cancel="closeViewDialog"
    >
      <div class="knowledge-detail">
        <el-descriptions :column="2" border>
@@ -183,7 +188,7 @@
          <h4>关键要点</h4>
          <div class="key-points">
            <el-tag
              v-for="(point, index) in currentKnowledge.keyPoints.split(',')"
              v-for="(point, index) in currentKnowledge.keyPoints?.split(',') || []"
              :key="index"
              type="success"
              style="margin-right: 8px; margin-bottom: 8px;"
@@ -219,24 +224,19 @@
          </div>
        </div>
      </div>

      <template #footer>
        <span class="dialog-footer">
          <el-button @click="viewDialogVisible = false">关闭</el-button>
          <el-button type="primary" @click="copyKnowledge">复制知识</el-button>
          <!-- <el-button type="success" @click="markAsFavorite">收藏@</el-button> -->
        </span>
      </template>
    </el-dialog>
    </FormDialog>
  </div>
</template>

<script setup>
import { Search } from "@element-plus/icons-vue";
import { onMounted, ref, reactive, toRefs, getCurrentInstance, computed } from "vue";
import { onMounted, ref, reactive, toRefs, getCurrentInstance, computed, watch } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import FormDialog from '@/components/Dialog/FormDialog.vue';
import { listKnowledgeBase, delKnowledgeBase,addKnowledgeBase,updateKnowledgeBase } from "@/api/collaborativeApproval/knowledgeBase.js";
import useUserStore from '@/store/modules/user';
import { userListNoPageByTenantId } from '@/api/system/user.js';

// è¡¨å•éªŒè¯è§„则
const rules = {
@@ -302,6 +302,9 @@

// è¡¨å•å¼•ç”¨
const formRef = ref();
// ç”¨æˆ·ç›¸å…³
const userStore = useUserStore();
const userList = ref([]);

// è¡¨æ ¼åˆ—配置
const tableColumn = ref([
@@ -389,6 +392,15 @@
  }
]);

// ç›‘听对话框打开，获取用户列表
watch(dialogVisible, (newVal) => {
  if (newVal) {
    userListNoPageByTenantId().then((res) => {
      userList.value = res.data || [];
    });
  }
});

// ç”Ÿå‘½å‘¨æœŸ
onMounted(() => {
  getList();
@@ -414,7 +426,7 @@
  .then(res => {
    tableLoading.value = false;
    tableData.value = res.data.records
    page.total = res.data.total;
    page.value.total = res.data.total;
  }).catch(err => {
    tableLoading.value = false;
  })
@@ -437,7 +449,7 @@
  dialogType.value = type;
  if (type === "add") {
    dialogTitle.value = "新增知识";
    // é‡ç½®è¡¨å•
    // é‡ç½®è¡¨å•ï¼Œé»˜è®¤åˆ›å»ºäººä¸ºå½“前用户
    Object.assign(form.value, {
      title: "",
      type: "",
@@ -446,7 +458,7 @@
      problem: "",
      solution: "",
      keyPoints: "",
      creator: "",
      creator: userStore.nickName || "",
      usageCount: 0
    });
  } else if (type === "edit" && row) {
@@ -550,6 +562,39 @@
  });
};

// å…³é—­çŸ¥è¯†è¡¨å•å¯¹è¯æ¡†
const closeKnowledgeDialog = () => {
  // æ¸…空表单数据，默认创建人为当前用户
  Object.assign(form.value, {
    id: undefined,
    title: "",
    type: "",
    scenario: "",
    efficiency: "",
    problem: "",
    solution: "",
    keyPoints: "",
    creator: userStore.nickName || "",
    usageCount: 0
  });
  // æ¸…除表单验证状态
  if (formRef.value) {
    formRef.value.clearValidate();
  }
  dialogVisible.value = false;
};

// å…³é—­æŸ¥çœ‹è¯¦æƒ…对话框
const closeViewDialog = () => {
  viewDialogVisible.value = false;
};

// å¤„理查看详情对话框确认（执行复制操作）
const handleViewDialogConfirm = () => {
  copyKnowledge();
  closeViewDialog();
};

// æäº¤çŸ¥è¯†è¡¨å•
const submitForm = async () => {
  try {
@@ -559,7 +604,7 @@
      addKnowledgeBase({...form.value}).then(res => {
        if(res.code == 200){
          ElMessage.success("添加成功");
          dialogVisible.value = false;
          closeKnowledgeDialog();
          getList();
        }
      }).catch(err => {
@@ -569,7 +614,7 @@
      updateKnowledgeBase({...form.value}).then(res => {
        if(res.code == 200){
          ElMessage.success("更新成功");
          dialogVisible.value = false;
          closeKnowledgeDialog();
          getList();
        }
      }).catch(err => {

 src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue

@@ -127,7 +127,7 @@
            <el-option
                v-for="person in employees"
                :key="person.id"
                :label="`${person.staffName} (${person.postName})`"
                :label="`${person.staffName}${person.postName ? ` (${person.postName})` : ''}`"
                :value="person.id"
            />
          </el-select>
@@ -307,7 +307,7 @@
    size: -1,
    staffState: 1
  }).then(res => {
    employees.value = res.data.records.sort((a, b) => a.postName.localeCompare(b.postName))
    employees.value = res.data.records.sort((a, b) => (a.postName || '').localeCompare(b.postName || ''))
  })
})
</script>

 src/views/collaborativeApproval/notificationManagement/meetExamine/index.vue

@@ -240,7 +240,7 @@
    it.participants = staffList.value.filter(staff => staffs.some(id=>id === staff.id)).map(staff => {
      return {
        id: staff.id,
        name: `${staff.staffName}(${staff.postName})`
        name:  `${staff.staffName}${staff.postName ? ` (${staff.postName})` : ''}`
      }
    })


 src/views/collaborativeApproval/notificationManagement/meetPublish/index.vue

@@ -239,7 +239,7 @@
    it.participants = staffList.value.filter(staff => staffs.some(id=>id === staff.id)).map(staff => {
      return {
        id: staff.id,
        name: `${staff.staffName}(${staff.postName})`
        name: `${staff.staffName}${staff.postName ? ` (${staff.postName})` : ''}`
      }
    })


 src/views/collaborativeApproval/notificationManagement/summary/index.vue

@@ -214,7 +214,7 @@
    it.participants = staffList.value.filter(staff => staffs.some(id => id === staff.id)).map(staff => {
      return {
        id: staff.id,
        name: `${staff.staffName}(${staff.postName})`
        name:  `${staff.staffName}${staff.postName ? ` (${staff.postName})` : ''}`
      }
    })


 src/views/collaborativeApproval/sealManagement/index.vue

@@ -82,7 +82,14 @@
    </el-card>

    <!-- ç”¨å°ç”³è¯·å¯¹è¯æ¡† -->
    <el-dialog v-model="showSealApplyDialog" title="申请用印" width="600px">
    <FormDialog
      v-model="showSealApplyDialog"
      title="申请用印"
      :width="'600px'"
      @close="closeSealApplyDialog"
      @confirm="submitSealApplication"
      @cancel="closeSealApplyDialog"
    >
      <el-form :model="sealForm" :rules="sealRules" ref="sealFormRef" label-width="100px">
        <el-form-item label="申请编号" prop="applicationNum">
          <el-input v-model="sealForm.applicationNum" placeholder="请输入申请编号" />
@@ -119,13 +126,7 @@
          </el-radio-group>
        </el-form-item>
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="showSealApplyDialog = false">取消</el-button>
          <el-button type="primary" @click="submitSealApplication">提交申请</el-button>
        </span>
      </template>
    </el-dialog>
    </FormDialog>

    <!-- è§„章制度发布对话框 -->
    <!-- <el-dialog v-model="showRegulationDialog" :title="operationType === 'add' ? '发布制度' : '编辑制度'" width="800px">
@@ -177,10 +178,17 @@
    </el-dialog> -->

    <!-- ç”¨å°è¯¦æƒ…对话框 -->
    <el-dialog v-model="showSealDetailDialog" title="用印申请详情" width="700px">
    <FormDialog
      v-model="showSealDetailDialog"
      title="用印申请详情"
      :width="'700px'"
      @close="closeSealDetailDialog"
      @confirm="closeSealDetailDialog"
      @cancel="closeSealDetailDialog"
    >
      <div v-if="currentSealDetail" class="mb10">
        <el-descriptions :column="2" border>
          <el-descriptions-item label="申请编号">{{ currentSealDetail.id }}</el-descriptions-item>
          <el-descriptions-item label="申请编号">{{ currentSealDetail.applicationNum }}</el-descriptions-item>
          <el-descriptions-item label="申请标题">{{ currentSealDetail.title }}</el-descriptions-item>
          <el-descriptions-item label="申请人">{{ currentSealDetail.createUserName }}</el-descriptions-item>
          <el-descriptions-item label="所属部门">{{ currentSealDetail.department }}</el-descriptions-item>
@@ -194,10 +202,17 @@
          <el-descriptions-item label="申请原因" :span="2">{{ currentSealDetail.reason }}</el-descriptions-item>
        </el-descriptions>
      </div>
    </el-dialog>
    </FormDialog>

    <!-- è§„章制度详情对话框 -->
    <el-dialog v-model="showRegulationDetailDialog" title="规章制度详情" width="800px">
    <FormDialog
      v-model="showRegulationDetailDialog"
      title="规章制度详情"
      :width="'800px'"
      @close="closeRegulationDetailDialog"
      @confirm="handleRegulationDetailConfirm"
      @cancel="closeRegulationDetailDialog"
    >
      <div v-if="currentRegulationDetail">
        <el-descriptions :column="2" border>
          <el-descriptions-item label="制度编号">{{ currentRegulationDetail.id }}</el-descriptions-item>
@@ -216,10 +231,17 @@
          <el-button type="success" @click="resetForm(currentRegulationDetail)">确认查看</el-button>
        </div>
      </div>
    </el-dialog>
    </FormDialog>

    <!-- ç‰ˆæœ¬åŽ†å²å¯¹è¯æ¡† -->
    <el-dialog v-model="showVersionHistoryDialog" title="版本历史" width="800px">
    <FormDialog
      v-model="showVersionHistoryDialog"
      title="版本历史"
      :width="'800px'"
      @close="closeVersionHistoryDialog"
      @confirm="closeVersionHistoryDialog"
      @cancel="closeVersionHistoryDialog"
    >
      <el-table :data="versionHistory" style="width: 100%;margin-bottom: 10px">
        <el-table-column prop="version" label="版本号" width="100" />
        <el-table-column prop="updateTime" label="更新时间" width="180" />
@@ -232,10 +254,17 @@
          </template>
        </el-table-column>
      </el-table>
    </el-dialog>
    </FormDialog>

    <!-- é˜…读状态对话框 -->
    <el-dialog v-model="showReadStatusDialog" title="阅读状态" width="800px">
    <FormDialog
      v-model="showReadStatusDialog"
      title="阅读状态"
      :width="'800px'"
      @close="closeReadStatusDialog"
      @confirm="closeReadStatusDialog"
      @cancel="closeReadStatusDialog"
    >
      <el-table :data="readStatusList" style="width: 100%;margin-bottom: 10px">
        <el-table-column prop="employee" label="员工姓名" width="120" />
        <el-table-column prop="department" label="所属部门" width="150" />
@@ -249,7 +278,7 @@
          </template>
        </el-table-column>
      </el-table>
    </el-dialog>
    </FormDialog>
  </div>
</template>

@@ -263,7 +292,8 @@
import { getUserProfile, userListNoPageByTenantId } from '@/api/system/user.js'
import useUserStore from '@/store/modules/user'
import { userLoginFacotryList } from "@/api/system/user.js"
import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js"
import FormDialog from '@/components/Dialog/FormDialog.vue'

// å“åº”式数据
const currentUser = ref(null)
@@ -434,7 +464,7 @@
    addSealApplication(sealForm).then(res => {
      if(res.code == 200){
        ElMessage.success('申请提交成功')
        showSealApplyDialog.value = false
        closeSealApplyDialog()
        getSealApplicationList()
        Object.assign(sealForm, {
        applicationNum: '',
@@ -447,12 +477,53 @@
      })
      }
    }).catch(err => {
      ElMessage.error(err.msg)
      console.log(err.msg)
    })
  
  } catch (error) {
    ElMessage.error('请完善申请信息')
  }
}
// å…³é—­ç”¨å°ç”³è¯·å¯¹è¯æ¡†
const closeSealApplyDialog = () => {
  // æ¸…空表单数据
  Object.assign(sealForm, {
    applicationNum: '',
    title: '',
    sealType: '',
    reason: '',
    approveUserId: '',
    urgency: 'normal',
    status: 'pending'
  })
  // æ¸…除表单验证状态
  if (sealFormRef.value) {
    sealFormRef.value.clearValidate()
  }
  showSealApplyDialog.value = false
}
// å…³é—­ç”¨å°è¯¦æƒ…对话框
const closeSealDetailDialog = () => {
  showSealDetailDialog.value = false
}
// å…³é—­è§„章制度详情对话框
const closeRegulationDetailDialog = () => {
  showRegulationDetailDialog.value = false
}
// å¤„理规章制度详情确认
const handleRegulationDetailConfirm = () => {
  // å¦‚æžœtableData>0，执行确认查看操作
  if (currentRegulationDetail.value && tableData.value && tableData.value.length > 0) {
    resetForm(currentRegulationDetail.value)
  }
  closeRegulationDetailDialog()
}
// å…³é—­ç‰ˆæœ¬åŽ†å²å¯¹è¯æ¡†
const closeVersionHistoryDialog = () => {
  showVersionHistoryDialog.value = false
}
// å…³é—­é˜…读状态对话框
const closeReadStatusDialog = () => {
  showReadStatusDialog.value = false
}
// æ–°å¢ž
const handleAdd = () => {
@@ -735,6 +806,13 @@
  })
}

// åˆ†é¡µå˜åŒ–处理
const paginationChange = (obj) => {
  page.current = obj.page;
  page.size = obj.limit;
  getSealApplicationList();
};

// ç›‘听对话框打开，获取用户列表
watch(showSealApplyDialog, (newVal) => {
  if (newVal) {

 src/views/procurementManagement/invoiceEntry/index.vue

@@ -112,6 +112,8 @@
  gePurchaseListPage,
  {
    purchaseContractNumber: undefined,
    // åªæŸ¥è¯¢å·²å®¡æ‰¹é€šè¿‡ï¼ˆæˆ–指定状态为 3）的记录
    approvalStatus: 3,
  },
  [
    {

 src/views/procurementManagement/paymentEntry/index.vue

@@ -261,7 +261,6 @@
  {
    label: "供应商名称",
    prop: "supplierName",
    width:240
  },
    {
        label: "付款状态",
@@ -282,7 +281,6 @@
        label: "产品大类",
        prop: "productCategory",
        showOverflowTooltip: true,
        width: 100
    },
    {
        label: "规格型号",
@@ -293,7 +291,6 @@
  {
    label: "已付款金额(元)",
    prop: "ticketsTotal",
    width: 120,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },
@@ -301,7 +298,6 @@
  {
    label: "待付款金额(元)",
    prop: "pendingTicketsTotal",
    width: 120,
    formatData: (params) => {
      return params ? parseFloat(params).toFixed(2) : 0;
    },
@@ -327,6 +323,8 @@
  searchForm: {
    supplierNameOrContractNo: "",
    status: false,
    // åªæŸ¥è¯¢å®¡æ‰¹çŠ¶æ€ä¸º 3 çš„记录
    approvalStatus: 3,
  },
  form: {
    purchaseContractNumber: "",

 src/views/productionManagement/productionOrder/index.vue

@@ -50,6 +50,7 @@
                :tableData="tableData"
                :page="page"
                :tableLoading="tableLoading"
                :row-class-name="tableRowClassName"
                @pagination="pagination">
        <template #completionStatus="{ row }">
          <el-progress
@@ -163,6 +164,12 @@
      width: 120,
    },
    {
      label: "交付日期",
      prop: "deliveryDate",
      formatData: val => (val ? dayjs(val).format("YYYY-MM-DD") : ""),
      width: 120,
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
@@ -228,6 +235,18 @@
    if (p < 50) return "#e6a23c";
    if (p < 80) return "#409eff";
    return "#67c23a";
  };

  // æ·»åŠ è¡¨è¡Œç±»åæ–¹æ³•
  const tableRowClassName = ({ row }) => {
    switch (row.deliveryDaysDiff) {
      case 15:
        return 'yellow'
      case 10:
        return 'red'
      case 2:
        return 'purple'
    }
  };

  // ç»‘定工艺路线弹框
@@ -388,4 +407,17 @@
<style scoped lang="scss">
.search_form{
  align-items: start;
}</style>
}

::v-deep .yellow {
  background-color: #FAF0DE;
}

::v-deep .red {
  background-color: #FAE1DE;
}

::v-deep .purple{
  background-color: #F4DEFA;
}
</style>

 src/views/safeProduction/emergencyPlanReview/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,810 @@
<template>
  <div class="app-container">
    <div class="search_form">
      <div>
        <span class="search_title">应急预案名称：</span>
        <el-input v-model="searchForm.planName"
                  style="width: 240px"
                  placeholder="请输入应急预案名称搜索"
                  @change="handleQuery"
                  clearable
                  :prefix-icon="Search" />
        <span class="search_title ml10">应急预案类型：</span>
        <el-select v-model="searchForm.planType"
                   clearable
                   @change="handleQuery"
                   style="width: 240px">
          <el-option v-for="item in emergencyPlanTypeOptions"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value" />
        </el-select>
        <el-button type="primary"
                   @click="handleQuery"
                   style="margin-left: 10px">
          æœç´¢
        </el-button>
      </div>
      <div>
        <el-button type="primary"
                   @click="openForm('add')">新增应急预案</el-button>
        <el-button type="danger"
                   plain
                   @click="handleDelete">删除</el-button>
      </div>
    </div>
    <div class="table_list">
      <PIMTable rowKey="id"
                :column="tableColumn"
                :tableData="tableData"
                :page="page"
                :isSelection="true"
                @selection-change="handleSelectionChange"
                :tableLoading="tableLoading"
                @pagination="pagination"
                :total="page.total"></PIMTable>
    </div>
    <!-- æ–°å¢ž/编辑应急预案弹窗 -->
    <el-dialog v-model="dialogVisible"
               :title="dialogTitle"
               width="800px"
               :close-on-click-modal="false">
      <el-form ref="formRef"
               :model="form"
               :rules="rules"
               label-width="120px">
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="应急预案编码"
                          prop="planCode">
              <el-input v-model="form.planCode"
                        placeholder="请输入应急预案编码" />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="应急预案名称"
                          prop="planName">
              <el-input v-model="form.planName"
                        placeholder="请输入应急预案名称" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="发布生效时间："
                          prop="publishTime">
              <el-date-picker style="width: 100%"
                              v-model="form.publishTime"
                              value-format="YYYY-MM-DD"
                              format="YYYY-MM-DD"
                              type="date"
                              placeholder="请选择"
                              clearable />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="核心责任人："
                          prop="coreResponsorUserId">
              <el-select v-model="form.coreResponsorUserId"
                         placeholder="请选择"
                         @change="handleChange"
                         clearable>
                <el-option v-for="item in userList"
                           :key="item.userId"
                           :label="item.nickName"
                           :value="item.userId" />
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="预案类型"
                          prop="planType">
              <el-select v-model="form.planType"
                         placeholder="请选择预案类型"
                         style="width: 100%">
                <el-option v-for="item in emergencyPlanTypeOptions"
                           :key="item.value"
                           :label="item.label"
                           :value="item.value" />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="备注"
                          prop="remark">
              <el-input v-model="form.remark"
                        placeholder="请输入备注" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="适用范围"
                      prop="applyScope">
          <el-checkbox-group v-model="form.applyScope">
            <el-checkbox label="all">全体员工</el-checkbox>
            <el-checkbox label="manager">管理层</el-checkbox>
            <el-checkbox label="hr">人事部门</el-checkbox>
            <el-checkbox label="finance">财务部门</el-checkbox>
            <el-checkbox label="tech">技术部门</el-checkbox>
          </el-checkbox-group>
        </el-form-item>
        <el-form-item label="应急处置步骤"
                      prop="execSteps">
          <div class="exec-steps-container"
               style="width:100%">
            <div v-for="(step, index) in execStepsList"
                 :key="index"
                 class="exec-step-item">
              <div class="step-header">
                <div>
                  <el-input v-model="step.step"
                            placeholder="步骤"
                            style="width: 200px; margin-right: 10px" />
                  <el-button type="danger"
                             size="small"
                             @click="removeExecStep(index)"
                             style="margin-left: 10px">删除</el-button>
                </div>
                <div style="margin-top: 5px;width: 100%;">
                  <el-input v-model="step.description"
                            placeholder="措施"
                            type="textarea"
                            :rows="2"
                            style="flex: 1" />
                </div>
              </div>
            </div>
            <el-button type="primary"
                       size="small"
                       @click="addExecStep"
                       style="margin-top: 10px">添加步骤</el-button>
          </div>
        </el-form-item>
      </el-form>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="dialogVisible = false">取消</el-button>
          <el-button type="primary"
                     @click="submitForm">确定</el-button>
        </span>
      </template>
    </el-dialog>
    <!-- æŸ¥çœ‹åº”急预案详情弹窗 -->
    <el-dialog v-model="viewDialogVisible"
               title="应急预案详情"
               width="900px"
               :close-on-click-modal="false">
      <div class="knowledge-detail">
        <el-descriptions :column="2"
                         border>
          <el-descriptions-item label="应急预案名称"
                                :span="2">
            <span class="detail-title">{{ currentKnowledge.planName }}</span>
          </el-descriptions-item>
          <el-descriptions-item label="应急预案编码">
            <span>{{ currentKnowledge.planCode }}</span>
          </el-descriptions-item>
          <el-descriptions-item label="发布生效时间">
            {{ currentKnowledge.publishTime }}
          </el-descriptions-item>
          <el-descriptions-item label="核心责任人">
            {{ currentKnowledge.coreResponsorUserName }}
          </el-descriptions-item>
          <el-descriptions-item label="预案类型">
            <el-tag type="warning"> {{ currentKnowledge.planType }}</el-tag>
          </el-descriptions-item>
          <el-descriptions-item label="备注">
            {{ currentKnowledge.remark }}
          </el-descriptions-item>
        </el-descriptions>
        <div class="detail-section">
          <h4>适用范围</h4>
          <div class="key-points">
            <el-tag v-for="(point, index) in currentKnowledge.applyScope.split(',')"
                    :key="index"
                    type="primary"
                    style="margin-right: 8px; margin-bottom: 8px;">
              {{ getApplyScopeLabel(point.trim()) }}
            </el-tag>
          </div>
        </div>
        <div class="detail-section">
          <h4>应急处置步骤</h4>
          <div class="detail-content">
            <div v-if="currentKnowledge.execSteps">
              <div v-for="(step, index) in JSON.parse(currentKnowledge.execSteps)"
                   :key="index"
                   class="exec-step-view">
                <span class="step-number">{{ index + 1 }}.</span>
                <span class="step-title">{{ step.step }}：</span>
                <span>{{ step.description }}</span>
              </div>
            </div>
            <div v-else
                 class="no-data">无应急处置步骤</div>
          </div>
        </div>
      </div>
      <template #footer>
        <span class="dialog-footer">
          <el-button @click="viewDialogVisible = false">关闭</el-button>
          <!-- <el-button type="success" @click="markAsFavorite">收藏@</el-button> -->
        </span>
      </template>
    </el-dialog>
  </div>
</template>

<script setup>
  import { Search } from "@element-plus/icons-vue";
  import {
    onMounted,
    ref,
    reactive,
    toRefs,
    getCurrentInstance,
    computed,
  } from "vue";
  import { ElMessage, ElMessageBox } from "element-plus";
  import PIMTable from "@/components/PIMTable/PIMTable.vue";
  import { userListNoPage } from "@/api/system/user.js";
  import {
    safeContingencyPlanListPage,
    safeContingencyPlanAdd,
    safeContingencyPlanUpdate,
    safeContingencyPlanDel,
  } from "@/api/safeProduction/emergencyPlanReview.js";

  // è¡¨å•éªŒè¯è§„则
  const rules = {
    planCode: [
      { required: true, message: "请输入应急预案编码", trigger: "blur" },
    ],
    applyScope: [
      { required: true, message: "请选择适用范围", trigger: "change" },
    ],
    planType: [{ required: true, message: "请选择预案类型", trigger: "change" }],
    planName: [
      { required: true, message: "请输入应急预案名称", trigger: "blur" },
    ],
    publishTime: [
      { required: true, message: "请选择发布生效时间", trigger: "change" },
    ],
    coreResponsorUserId: [
      { required: true, message: "请选择核心责任人", trigger: "change" },
    ],
  };

  // å“åº”式数据
  const data = reactive({
    searchForm: {
      planName: "",
      planType: "",
    },
    tableLoading: false,
    page: {
      current: 1,
      size: 20,
      total: 0,
    },
    tableData: [],
    selectedIds: [],
    form: {
      planCode: "", // é¢„案编号
      applyScope: [], // é€‚用范围
      planType: "", // é¢„案类型
      planName: "", // é¢„案名称
      publishTime: "", // å‘布时间
      coreResponsorUserId: "", // æ ¸å¿ƒè´Ÿè´£äººç”¨æˆ·ID
      coreResponsorUserName: "", // æ ¸å¿ƒè´Ÿè´£äººç”¨æˆ·å
      remark: "", // å¤‡æ³¨
      execSteps: "", // æ‰§è¡Œæ­¥éª¤
    },
    dialogVisible: false,
    dialogTitle: "",
    dialogType: "add",
    viewDialogVisible: false,
    currentKnowledge: {},
  });

  const {
    searchForm,
    tableLoading,
    page,
    tableData,
    selectedIds,
    form,
    dialogVisible,
    dialogTitle,
    dialogType,
    viewDialogVisible,
    currentKnowledge,
  } = toRefs(data);

  // è¡¨å•å¼•ç”¨
  const formRef = ref();
  const execStepsList = ref([]);

  // è¡¨æ ¼åˆ—配置
  const tableColumn = ref([
    {
      label: "应急预案编码",
      prop: "planCode",
      showOverflowTooltip: true,
    },
    {
      label: "应急预案名称",
      prop: "planName",
      showOverflowTooltip: true,
    },
    {
      label: "发布生效时间",
      prop: "publishTime",
      showOverflowTooltip: true,
    },
    {
      label: "核心责任人",
      prop: "coreResponsorUserName",
      showOverflowTooltip: true,
    },
    {
      label: "预案类型",
      prop: "planType",
      showOverflowTooltip: true,
    },
    {
      label: "备注",
      prop: "remark",
      showOverflowTooltip: true,
    },
    {
      dataType: "action",
      label: "操作",
      align: "center",
      fixed: "right",
      width: 200,
      operation: [
        {
          name: "编辑",
          type: "text",
          clickFun: row => {
            openForm("edit", row);
          },
        },
        {
          name: "查看",
          type: "text",
          clickFun: row => {
            viewKnowledge(row);
          },
        },
      ],
    },
  ]);
  const userList = ref([]);
  // ç”Ÿå‘½å‘¨æœŸ
  onMounted(() => {
    userListNoPage().then(res => {
      userList.value = res.data;
    });
    getList();
    startAutoRefresh();
  });
  const handleChange = userId => {
    const selectedUser = userList.value.find(user => user.userId === userId);
    if (selectedUser) {
      form.value.coreResponsorUserName = selectedUser.nickName;
    }
  };

  // åº”急处置步骤管理
  const addExecStep = () => {
    const stepNumber = execStepsList.value.length + 1;
    execStepsList.value.push({
      step: `步骤${stepNumber}`,
      description: "",
    });
  };

  const removeExecStep = index => {
    execStepsList.value.splice(index, 1);
  };

  const initExecSteps = execSteps => {
    if (execSteps) {
      try {
        execStepsList.value = JSON.parse(execSteps);
      } catch (e) {
        execStepsList.value = [];
      }
    } else {
      execStepsList.value = [];
    }
  };
  // å¼€å§‹è‡ªåŠ¨åˆ·æ–°
  const startAutoRefresh = () => {
    setInterval(() => {
      getList();
    }, 600000); // 10分钟刷新一次 (10 * 60 * 1000 = 600000ms)
  };

  // æŸ¥è¯¢æ•°æ®
  const handleQuery = () => {
    page.value.current = 1;
    getList();
  };

  const getList = () => {
    tableLoading.value = true;
    safeContingencyPlanListPage({ ...page.value, ...searchForm.value })
      .then(res => {
        tableLoading.value = false;
        tableData.value = res.data.records;
        page.total = res.data.total;
      })
      .catch(err => {
        tableLoading.value = false;
      });
  };

  // åˆ†é¡µå¤„理
  const pagination = obj => {
    page.value.current = obj.page;
    page.value.size = obj.limit;
    handleQuery();
  };

  // é€‰æ‹©å˜åŒ–处理
  const handleSelectionChange = selection => {
    selectedIds.value = selection.map(item => item.id);
  };

  // æ‰“开表单
  const openForm = (type, row = null) => {
    dialogType.value = type;
    if (type === "add") {
      dialogTitle.value = "新增应急预案";
      // é‡ç½®è¡¨å•
      Object.assign(form.value, {
        planCode: "", // é¢„案编号
        applyScope: [], // é€‚用范围
        planType: "", // é¢„案类型
        planName: "", // é¢„案名称
        publishTime: "", // å‘布时间
        coreResponsorUserId: "", // æ ¸å¿ƒè´Ÿè´£äººç”¨æˆ·ID
        coreResponsorUserName: "", // æ ¸å¿ƒè´Ÿè´£äººç”¨æˆ·å
        remark: "", // å¤‡æ³¨
        execSteps: "", // æ‰§è¡Œæ­¥éª¤
      });
      initExecSteps("");
    } else if (type === "edit" && row) {
      dialogTitle.value = "编辑应急预案";
      Object.assign(form.value, {
        id: row.id,
        planCode: row.planCode, // é¢„案编号
        applyScope: row.applyScope ? row.applyScope.split(",") : [], // é€‚用范围
        planType: row.planType, // é¢„案类型
        planName: row.planName, // é¢„案名称
        publishTime: row.publishTime, // å‘布时间
        coreResponsorUserId: row.coreResponsorUserId, // æ ¸å¿ƒè´Ÿè´£äººç”¨æˆ·ID
        coreResponsorUserName: row.coreResponsorUserName, // æ ¸å¿ƒè´Ÿè´£äººç”¨æˆ·å
        remark: row.remark, // å¤‡æ³¨
        execSteps: row.execSteps, // æ‰§è¡Œæ­¥éª¤
      });
      initExecSteps(row.execSteps);
    }
    dialogVisible.value = true;
  };

  // æŸ¥çœ‹åº”急预案详情
  const viewKnowledge = row => {
    currentKnowledge.value = { ...row };
    viewDialogVisible.value = true;
  };
  const getApplyScopeLabel = scope => {
    const scopeMap = {
      all: "全体员工",
      manager: "管理层",
      hr: "人事部门",
      finance: "财务部门",
      tech: "技术部门",
    };
    return scopeMap[scope] || scope;
  };

  // èŽ·å–类型标签类型
  const getTypeTagType = type => {
    const typeMap = {
      contract: "success",
      approval: "warning",
      solution: "primary",
      experience: "info",
      guide: "danger",
    };
    return typeMap[type] || "info";
  };

  // èŽ·å–类型标签文本
  const getTypeLabel = type => {
    return getKnowledgeTypeLabel(type);
  };

  // èŽ·å–效率标签类型
  const getEfficiencyTagType = efficiency => {
    const typeMap = {
      high: "success",
      medium: "warning",
      low: "info",
    };
    return typeMap[efficiency] || "info";
  };

  // èŽ·å–效率标签文本
  const getEfficiencyLabel = efficiency => {
    const efficiencyMap = {
      high: "显著提升",
      medium: "一般提升",
      low: "轻微提升",
    };
    return efficiencyMap[efficiency] || efficiency;
  };

  // èŽ·å–效率提升百分比
  const getEfficiencyScore = efficiency => {
    const scoreMap = {
      high: 40,
      medium: 25,
      low: 15,
    };
    return scoreMap[efficiency] || 0;
  };

  // èŽ·å–平均节省时间
  const getTimeSaved = efficiency => {
    const timeMap = {
      high: "2-3天",
      medium: "1-2天",
      low: "0.5-1天",
    };
    return timeMap[efficiency] || "未知";
  };
  const emergencyPlanTypeOptions = computed(() => [
    {
      value: "预防性应急预案",
      label: "预防性应急预案",
    },
    {
      value: "应急处理预案",
      label: "应急处理预案",
    },
    {
      value: "恢复性应急预案",
      label: "恢复性应急预案",
    },
  ]);
  // æäº¤åº”急预案表单
  const submitForm = async () => {
    try {
      await formRef.value.validate();

      // éªŒè¯åº”急处置步骤
      for (let i = 0; i < execStepsList.value.length; i++) {
        const step = execStepsList.value[i];
        if (!step.step || !step.step.trim()) {
          ElMessage.error(`第${i + 1}条步骤的"步骤"不能为空`);
          return;
        }
        if (!step.description || !step.description.trim()) {
          ElMessage.error(`第${i + 1}条步骤的"措施"不能为空`);
          return;
        }
      }

      // å°†åº”急处置步骤转换为JSON字符串
      form.value.execSteps = JSON.stringify(execStepsList.value);
      if (dialogType.value === "add") {
        // æ–°å¢žåº”急预案
        form.value.applyScope = form.value.applyScope.join(",");
        safeContingencyPlanAdd({ ...form.value })
          .then(res => {
            if (res.code == 200) {
              ElMessage.success("添加成功");
              dialogVisible.value = false;
              getList();
            }
          })
          .catch(err => {
            ElMessage.error(err.msg);
          });
      } else {
        form.value.applyScope = form.value.applyScope.join(",");
        safeContingencyPlanUpdate({ ...form.value })
          .then(res => {
            if (res.code == 200) {
              ElMessage.success("更新成功");
              dialogVisible.value = false;
              getList();
            }
          })
          .catch(err => {
            ElMessage.error(err.msg);
          });
      }
    } catch (error) {
      console.error("表单验证失败:", error);
    }
  };

  // åˆ é™¤åº”急预案
  const handleDelete = () => {
    if (selectedIds.value.length === 0) {
      ElMessage.warning("请选择要删除的应急预案");
      return;
    }

    ElMessageBox.confirm("选中的内容将被删除，是否确认删除？", "删除", {
      confirmButtonText: "确认",
      cancelButtonText: "取消",
      type: "warning",
    })
      .then(() => {
        // console.log(selectedIds.value);
        safeContingencyPlanDel(selectedIds.value).then(res => {
          if (res.code == 200) {
            ElMessage.success("删除成功");
            selectedIds.value = [];
            getList();
          }
        });
      })
      .catch(() => {
        // ç”¨æˆ·å–消
      });
  };

  // å¯¼å‡º
  const { proxy } = getCurrentInstance();
  const { knowledge_type } = proxy.useDict("knowledge_type");

  // å­—典工具
  const knowledgeTypeOptions = computed(() => knowledge_type?.value || []);
  const getKnowledgeTypeLabel = val => {
    const item = knowledgeTypeOptions.value.find(
      i => String(i.value) === String(val)
    );
    return item ? item.label : val;
  };
  const getKnowledgeTypeTagType = val => {
    const item = knowledgeTypeOptions.value.find(
      i => String(i.value) === String(val)
    );
    return item?.elTagType || "info";
  };
  const handleExport = () => {
    proxy.download(
      "/knowledgeBase/export",
      { ...searchForm.value },
      "应急预案库.xlsx"
    );
  };
</script>

<style scoped>
  .auto-refresh-info {
    margin-bottom: 15px;
  }

  .auto-refresh-info .el-alert {
    border-radius: 8px;
  }

  .dialog-footer {
    text-align: right;
  }

  .knowledge-detail {
    padding: 20px 0;
  }

  .detail-title {
    font-size: 18px;
    font-weight: bold;
    color: #303133;
  }

  .detail-section {
    margin-top: 24px;
  }

  .detail-section h4 {
    margin: 0 0 12px 0;
    font-size: 16px;
    font-weight: 600;
    color: #303133;
    border-left: 4px solid #409eff;
    padding-left: 12px;
  }

  .detail-content {
    background: #f8f9fa;
    padding: 16px;
    border-radius: 6px;
    line-height: 1.6;
    color: #606266;
    white-space: pre-wrap;
  }

  .key-points {
    display: flex;
    flex-wrap: wrap;
    gap: 8px;
  }

  .usage-stats {
    margin-top: 16px;
  }

  .stat-item {
    text-align: center;
    padding: 20px;
    background: #f8f9fa;
    border-radius: 8px;
  }

  .stat-number {
    font-size: 24px;
    font-weight: bold;
    color: #409eff;
    margin-bottom: 8px;
  }

  .stat-label {
    font-size: 14px;
    color: #909399;
  }

  .exec-steps-container {
    border: 1px solid #e4e7ed;
    border-radius: 4px;
    padding: 15px;
    background-color: #f9fafc;
  }

  .exec-step-item {
    margin-bottom: 10px;
    padding: 10px;
    background-color: #ffffff;
    border: 1px solid #e4e7ed;
    border-radius: 4px;
  }

  .step-header {
    display: flex;
    align-items: flex-start;
    flex-direction: column;
  }

  .exec-step-view {
    margin-bottom: 8px;
    padding-left: 20px;
    position: relative;
  }

  .step-number {
    position: absolute;
    left: 0;
    font-weight: bold;
    color: #409eff;
  }

  .step-title {
    font-weight: bold;
    margin-right: 5px;
  }

  .no-data {
    color: #909399;
    font-style: italic;
  }
</style>

 src/views/safeProduction/hazardousMaterialsControl/index.vue

@@ -53,7 +53,8 @@
               v-if="dialogType === 'add'"
               :model="form"
               :rules="rules"
               label-width="120px">
               label-width="140px"
               label-position="top">
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="危险源"
@@ -200,7 +201,8 @@
               v-if="dialogType === 'edit'"
               :model="form"
               :rules="rules1"
               label-width="120px">
               label-width="140px"
               label-position="top">
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="归还人"

 src/views/salesManagement/deliveryLedger/index.vue

@@ -52,7 +52,7 @@
              type="primary" 
              size="small" 
              :disabled="isApproving(scope.row.status)"
              @click="openForm('edit', scope.row)">编辑</el-button>
              @click="openForm('edit', scope.row)">补充发货信息</el-button>
            <el-button 
              link 
              type="danger" 
@@ -177,9 +177,9 @@
import { getToken } from "@/utils/auth";
import { getCurrentDate } from "@/utils/index.js";
import {
  deliveryLedgerListPage,
  addOrUpdateDeliveryLedger,
  delDeliveryLedger,
    deliveryLedgerListPage,
    addOrUpdateDeliveryLedger,
    delDeliveryLedger, deductStock,
} from "@/api/salesManagement/deliveryLedger.js";
import { delLedgerFile } from "@/api/salesManagement/salesLedger.js";
 
@@ -392,7 +392,7 @@
        expressNumber: form.value.type === "快递" ? form.value.expressNumber : "",
        tempFileIds: tempFileIds,
      };
      addOrUpdateDeliveryLedger(payload).then((res) => {
            deductStock(payload).then((res) => {
        proxy.$modal.msgSuccess("操作成功");
        closeDia();
        getList();

 src/views/salesManagement/salesLedger/index.vue

@@ -37,7 +37,7 @@
        </div>
      </div>
      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
        :expand-row-keys="expandedRowKeys" :row-key="(row) => row.id" show-summary style="width: 100%"
        :expand-row-keys="expandedRowKeys" :row-key="(row) => row.id" :row-class-name="tableRowClassName" show-summary style="width: 100%"
        :summary-method="summarizeMainTable" @expand-change="expandChange" height="calc(100vh - 18.5em)">
        <el-table-column align="center" type="selection" width="55" fixed="left"/>
        <el-table-column type="expand" width="60" fixed="left">
@@ -117,6 +117,7 @@
        <el-table-column label="录入人" prop="entryPersonName" width="100" show-overflow-tooltip />
        <el-table-column label="录入日期" prop="entryDate" width="120" show-overflow-tooltip />
        <el-table-column label="签订日期" prop="executionDate" width="120" show-overflow-tooltip />
        <el-table-column label="交付日期" prop="deliveryDate" width="120" show-overflow-tooltip />
        <el-table-column fixed="right" label="操作" min-width="100" align="center">
          <template #default="scope">
            <el-button link type="primary" size="small" @click="openForm('edit', scope.row)">编辑</el-button>
@@ -204,6 +205,14 @@
                        </el-form-item>
                    </el-col>
                </el-row>
        <el-row :gutter="30">
          <el-col :span="12">
            <el-form-item label="交货日期：" prop="entryDate">
              <el-date-picker style="width: 100%" v-model="form.deliveryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
                              type="date" placeholder="请选择" clearable />
            </el-form-item>
          </el-col>
        </el-row>
                <el-row>
                    <el-form-item label="产品信息：" prop="entryDate">
                        <el-button v-if="operationType !== 'view'" type="primary" @click="openProductForm('add')">添加</el-button>
@@ -694,6 +703,7 @@
        customerId: "",
        entryPerson: "",
        entryDate: "",
    deliveryDate: "",
        maintenanceTime: "",
        productData: [],
        executionDate: "",
@@ -703,6 +713,7 @@
        customerId: [{ required: true, message: "请选择", trigger: "change" }],
        entryPerson: [{ required: true, message: "请选择", trigger: "change" }],
        entryDate: [{ required: true, message: "请选择", trigger: "change" }],
    deliveryDate: [{ required: true, message: "请选择", trigger: "change" }],
        executionDate: [{ required: true, message: "请选择", trigger: "change" }],
    },
});
@@ -986,6 +997,18 @@
    } else {
        expandedRowKeys.value = [];
    }
};

// æ·»åŠ è¡¨è¡Œç±»åæ–¹æ³•
const tableRowClassName = ({ row }) => {
  switch (row.deliveryDaysDiff) {
    case 15:
      return 'yellow'
    case 10:
      return 'red'
    case 2:
      return 'purple'
  }
};
// ä¸»è¡¨åˆè®¡æ–¹æ³•
const summarizeMainTable = (param) => {
@@ -2084,6 +2107,19 @@
    margin-left: 10px;
}

::v-deep .yellow {
  background-color: #FAF0DE;
}

::v-deep .red {
  background-color: #FAE1DE;
}

::v-deep .purple{
  background-color: #F4DEFA;
}


.table_list {
    margin-top: unset;
}

 src/views/salesManagement/salesQuotation/index.vue

@@ -51,7 +51,7 @@
        height="calc(100vh - 22em)"
      >
                <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column prop="quotationNo" label="报价单号" width="150" />
        <el-table-column prop="quotationNo" label="报价单号" />
        <el-table-column prop="customer" label="客户名称" />
        <el-table-column prop="salesperson" label="业务员" width="100" />
        <el-table-column prop="quotationDate" label="报价日期" width="120" />
@@ -252,7 +252,7 @@
                                    @change="getProductModel($event, scope.row)"
                                >
                                    <el-option
                                        v-for="item in modelOptions"
                                        v-for="item in scope.row.modelOptions || []"
                                        :key="item.id"
                                        :label="item.model"
                                        :value="item.id"
@@ -322,7 +322,7 @@
        </el-descriptions-item>
      </el-descriptions>
      
      <div style="margin-top: 20px;">
      <div style="margin: 20px 0;">
        <h4>产品明细</h4>
        <el-table :data="currentQuotation.products" border style="width: 100%">
          <el-table-column prop="product" label="产品名称" />
@@ -521,7 +521,7 @@
    if (!value) {
        row.productId = '';
        row.product = '';
        modelOptions.value = [];
        row.modelOptions = [];
        row.specificationId = '';
        row.specification = '';
        row.unit = '';
@@ -534,9 +534,9 @@
    if (label) {
        row.product = label;
    }
    // èŽ·å–规格型号列表
    // èŽ·å–规格型号列表，设置到当前行的 modelOptions
    modelList({ id: value }).then((res) => {
        modelOptions.value = res || [];
        row.modelOptions = res || [];
    });
};
const getProductModel = (value, row) => {
@@ -550,10 +550,11 @@
    }
    // æ›´æ–° specificationId（v-model å·²ç»è‡ªåŠ¨æ›´æ–°ï¼Œè¿™é‡Œç¡®ä¿ä¸€è‡´æ€§ï¼‰
    row.specificationId = value;
    const index = modelOptions.value.findIndex((item) => item.id === value);
    const modelOptions = row.modelOptions || [];
    const index = modelOptions.findIndex((item) => item.id === value);
    if (index !== -1) {
        row.specification = modelOptions.value[index].model;
        row.unit = modelOptions.value[index].unit;
        row.specification = modelOptions[index].model;
        row.unit = modelOptions[index].unit;
    } else {
        row.specification = '';
        row.unit = '';
@@ -616,23 +617,46 @@
  form.paymentMethod = row.paymentMethod || ''
  form.status = row.status || '草稿'
  form.remark = row.remark || ''
  form.products = row.products ? row.products.map(product => {
  form.products = row.products ? await Promise.all(row.products.map(async (product) => {
    const productName = product.product || product.productName || ''
    // ä¼˜å…ˆç”¨ productId；如果只有名称，尝试反查 id ä»¥ä¾¿æ ‘选择器反显
    const resolvedId = product.productId
    const resolvedProductId = product.productId
      ? Number(product.productId)
      : findNodeIdByLabel(productOptions.value, productName) || ''
    
    // å¦‚果有产品ID，加载对应的规格型号列表
    let modelOptions = [];
    let resolvedSpecificationId = product.specificationId || '';
    
    if (resolvedProductId) {
      try {
        const res = await modelList({ id: resolvedProductId });
        modelOptions = res || [];
        
        // å¦‚果返回的数据没有 specificationId，但有 specification åç§°ï¼Œæ ¹æ®åç§°æŸ¥æ‰¾ ID
        if (!resolvedSpecificationId && product.specification) {
          const foundModel = modelOptions.find(item => item.model === product.specification);
          if (foundModel) {
            resolvedSpecificationId = foundModel.id;
          }
        }
      } catch (error) {
        console.error('加载规格型号失败:', error);
      }
    }
    
    return {
      productId: resolvedId,
      productId: resolvedProductId,
      product: productName,
      specificationId: product.specificationId || '',
      specificationId: resolvedSpecificationId,
      specification: product.specification || '',
      quantity: product.quantity || 0,
      unit: product.unit || '',
      unitPrice: product.unitPrice || 0,
      amount: product.amount || 0
      amount: product.amount || 0,
      modelOptions: modelOptions // ä¸ºæ¯è¡Œæ·»åŠ ç‹¬ç«‹çš„规格型号列表
    }
  }) : []
  })) : []
  form.subtotal = row.subtotal || 0
  form.freight = row.freight || 0
  form.otherFee = row.otherFee || 0
@@ -714,7 +738,8 @@
    quantity: 1,
    unit: '',
    unitPrice: 0,
    amount: 0
    amount: 0,
    modelOptions: [] // ä¸ºæ¯è¡Œæ·»åŠ ç‹¬ç«‹çš„规格型号列表
  })
}