Merge branch 'newChange'

src/api/system/user.js

@@ -108,4 +108,21 @@ export function getAppList(params) {
     method: 'get',
     params: params
   })
+}
+
+// 修改用户
+export function updateUser(data) {
+  return request({
+    url: '/system/user',
+    method: 'put',
+    data: data
+  })
+}
+
+//查询所有岗位
+export function getPostAllList() {
+  return request({
+    url: '/system/post/listAllTree',
+    method: 'get',
+  })
 }

src/pages/checklist/index.vue

@@ -675,7 +675,7 @@ export default {
                 checkTime: data.checkTime || formatTime(new Date(), 'YYYY-MM-DD hh:mm:ss'),
                 checkerName: this.currentUser.userInfo.nickName || this.currentUser.userInfo.userName || '',
                 checkerId: this.currentUser.userInfo.userId || '',
-                rectificationDeadline: fourDaysLater,
+                rectificationDeadline: data.rectificationDeadline || fourDaysLater,
                 baseAttachmentList: (data.baseAttachmentList && data.baseAttachmentList.map(item => ({
                     ...item,
                     url: item.attachmentUrl,

src/pages/eikonStatistics/components/Qualification.vue

@@ -32,12 +32,13 @@
             <div class="item-value">{{ localSystemData.isPoliticalReviewPassed ? '是' : '否' }}</div>
           </div>
           <div class="content-item">
-            <div class="item-label">身体健康情况：</div>
+            <div class="item-label">健康异常情况：</div>
             <div class="item-value">{{ !localSystemData.isHealthy ? '健康' : localSystemData.isHealthy }}</div>
           </div>
           <div class="content-item">
             <div class="item-label">有无行政处罚：</div>
-            <div class="item-value">{{ !localSystemData.hasAdministrativePenalty ? '无' : localSystemData.hasAdministrativePenalty }}</div>
+            <div class="item-value">{{ !localSystemData.hasAdministrativePenalty ? '无' :
+              localSystemData.hasAdministrativePenalty }}</div>
           </div>
         </template>
         <template v-else>
@@ -124,7 +125,7 @@ export default {
         this.localSystemData = {};
         return;
       }
-      
+
       const res = { ...newVal };
       const { qualificationLevelStats, positionCompetencyStats, politicalStatusStats, educationStats, ageStats, politicalReviewStats, physicalHealthStats, administrativePenaltyStats } = newVal
 
@@ -133,18 +134,25 @@ export default {
         return;
       }
 
-      // 使用useDict获取资质等级字典
-      const dict = await this.useDict('sys_user_qualification_level')
-      const qualificationDict = dict['sys_user_qualification_level'] || []
+      // // 使用useDict获取资质等级字典
+      // const dict = await this.useDict('sys_user_qualification_level')
+      // const qualificationDict = dict['sys_user_qualification_level'] || []
+
+      // // 按照字典顺序遍历，确保从一级开始显示
+      // for (const dictItem of qualificationDict) {
+      //   const statItem = qualificationLevelStats.find(item => item.levelName === dictItem.value)
+      //   if (statItem) {
+      //     res.qualificationLevelSum = `${res.qualificationLevelSum ? res.qualificationLevelSum + '、' : ''}${dictItem.label} ${statItem.count}人`
+      //   }
+      // }
+     
 
       // 按照字典顺序遍历，确保从一级开始显示
-      for (const dictItem of qualificationDict) {
-        const statItem = qualificationLevelStats.find(item => item.levelName === dictItem.value)
-        if (statItem) {
-          res.qualificationLevelSum = `${res.qualificationLevelSum ? res.qualificationLevelSum + '、' : ''}${dictItem.label} ${statItem.count}人`
-        }
+      for (const dictItem of qualificationLevelStats) {
+        res.qualificationLevelSum = `${res.qualificationLevelSum ? res.qualificationLevelSum + '、' : ''}${dictItem.levelName} ${dictItem.count}人`
       }
 
+
       let availablePositionsSum = []
       for (const item of positionCompetencyStats) {
         availablePositionsSum.push(`${item.postName} ${item.competentCount}人`)
@@ -210,7 +218,7 @@ export default {
         this.localSystemData = {};
         return;
       }
-      
+
       // 创建新对象而不是直接修改传入的对象
       const res = { ...newVal };
       //资质等级

src/pages/eikonStatistics/components/general-overview.vue

@@ -7,7 +7,7 @@
         <view class="stack-item item-1">
           <view class="item-content">
             <view class="item-label">资质能力</view>
-            <view class="item-number">{{ !isPersonal ? '一级' : '' }}{{ localOverviewData.qualificationLevel }}{{
+            <view class="item-number">{{ !isPersonal ? '高级' : '' }}{{ localOverviewData.qualificationLevel }}{{
               !isPersonal ?
                 '人' : '' }}</view>
             <view class="item-description">资质等级</view>
@@ -115,7 +115,7 @@ export default {
     async handleSystemData(newVal) {
       if (newVal) {
         const { qualificationLevelStats } = newVal;
-        let levelOne = qualificationLevelStats && qualificationLevelStats.find(item => item.levelName === 'LEVEL_ONE')?.count || 0;
+        let levelOne = qualificationLevelStats && qualificationLevelStats.find(item => item.levelName === '高级')?.count || 0;
         this.localOverviewData.qualificationLevel = levelOne;
         // this.localOverviewData.workYears = newVal.workYearsStats && newVal.workYearsStats.averageWorkYears;
       }

src/pages/mine/info/edit.vue

@@ -1,127 +1,702 @@
 <template>
   <view class="container">
     <view class="example">
-      <uni-forms ref="form" :model="user" labelWidth="80px">
-        <uni-forms-item label="用户昵称" name="nickName">
-          <uni-easyinput v-model="user.nickName" placeholder="请输入昵称" />
-        </uni-forms-item>
-        <uni-forms-item label="手机号码" name="phonenumber">
-          <uni-easyinput v-model="user.phonenumber" placeholder="请输入手机号码" />
-        </uni-forms-item>
-        <uni-forms-item label="邮箱" name="email">
-          <uni-easyinput v-model="user.email" placeholder="请输入邮箱" />
-        </uni-forms-item>
-        <uni-forms-item label="性别" name="sex" required>
-          <uni-data-checkbox v-model="user.sex" :localdata="sexs" />
-        </uni-forms-item>
+      <uni-forms ref="form" :model="user" :labelWidth="'80px'" style="margin-bottom: 80px;">
+
+        <!-- 基本身份信息 -->
+        <uni-collapse class="collapse" :accordion="false" :value="['basicInfo']">
+          <uni-collapse-item class="collapse-item" title="基本身份信息" name="basicInfo" :show-animation="true">
+            <uni-forms-item label="用户昵称" name="nickName" required>
+              <uni-easyinput v-model="user.nickName" placeholder="请输入昵称" />
+            </uni-forms-item>
+            <uni-forms-item label="归属部门" name="deptId" required>
+              <uni-data-picker v-model="user.deptId" :localdata="deptOptions" popup-title="请选择归属部门" />
+            </uni-forms-item>
+            <uni-forms-item label="手机号码" name="phonenumber">
+              <uni-easyinput v-model="user.phonenumber" placeholder="请输入手机号码" />
+            </uni-forms-item>
+            <uni-forms-item label="邮箱" name="email">
+              <uni-easyinput v-model="user.email" placeholder="请输入邮箱" />
+            </uni-forms-item>
+            <uni-forms-item label="身份证号" name="cardNumber">
+              <uni-easyinput v-model="user.cardNumber" placeholder="请输入身份证号" />
+            </uni-forms-item>
+            <uni-forms-item label="用户性别" name="sex" required>
+              <uni-data-picker v-model="user.sex" :localdata="sys_user_sex" popup-title="请选择性别" />
+            </uni-forms-item>
+            <uni-forms-item label="生肖" name="zodiac">
+              <uni-data-picker v-model="user.zodiac" :localdata="sys_user_zodiac" popup-title="请选择生肖" />
+            </uni-forms-item>
+            <uni-forms-item label="星座" name="constellation">
+              <uni-data-picker v-model="user.constellation" :localdata="sys_user_constellation" popup-title="请选择星座" />
+            </uni-forms-item>
+            <uni-forms-item label="血型" name="blooGroup">
+              <uni-data-picker v-model="user.blooGroup" :localdata="sys_user_blood_group" popup-title="请选择血型" />
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+
+        <!-- 状态管理信息 -->
+        <uni-collapse class="collapse" :accordion="false" :value="['status']">
+          <uni-collapse-item class="collapse-item" title="状态管理信息" name="status" :show-animation="true">
+
+            <uni-forms-item label="培训合规状态" name="trainingComplianceStatus">
+              <uni-data-checkbox v-model="user.trainingComplianceStatus" :localdata="yesNoOptions" />
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+
+        <!-- 资质能力信息 -->
+        <uni-collapse class="collapse" :accordion="false" :value="['qualification']">
+          <uni-collapse-item class="collapse-item" title="资质能力信息" name="qualification" :show-animation="true">
+            <uni-forms-item label="资质等级" name="qualificationLevel" :required="isSecurityRole">
+              <uni-data-picker v-model="user.qualificationLevel" :localdata="sys_user_qualification_level"
+                popup-title="请选择资质等级" @change="handleQualificationLevelChange" />
+            </uni-forms-item>
+            <uni-forms-item label="岗位类型" name="postIds" :required="isSecurityRole">
+              <zxz-uni-data-select v-model="user.postIds" :localdata="postTreeData" multiple placeholder="请选择岗位类型" />
+            </uni-forms-item>
+            <uni-forms-item label="是否通过政审" name="politicalReviewSituation">
+              <uni-data-checkbox v-model="user.politicalReviewSituation" :localdata="yesNoOptions" />
+            </uni-forms-item>
+            <uni-forms-item label="政治面貌" name="politicalStatus">
+              <uni-data-picker v-model="user.politicalStatus" :localdata="sys_user_political_status"
+                popup-title="请选择政治面貌" />
+            </uni-forms-item>
+            <uni-forms-item label="学历" name="schooling">
+              <uni-data-picker v-model="user.schooling" :localdata="sys_user_schooling" popup-title="请选择学历" />
+            </uni-forms-item>
+            <uni-forms-item label="行政处罚情况" name="administrativeStatus">
+              <uni-easyinput v-model="user.administrativeStatus" type="textarea" placeholder="请输入行政处罚情况" />
+            </uni-forms-item>
+            <uni-forms-item label="健康异常情况" name="physicalHealthStatus">
+              <uni-easyinput v-model="user.physicalHealthStatus" type="textarea" placeholder="请输入健康异常情况" />
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+
+        <!-- 工作履历/经验 -->
+        <uni-collapse class="collapse" :accordion="false" :value="['experience']">
+          <uni-collapse-item class="collapse-item" title="工作履历/经验" name="experience" :show-animation="true">
+            <uni-forms-item label="开始工作时间" name="startWorkingDate">
+              <uni-datetime-picker v-model="user.startWorkingDate" type="date" placeholder="请选择开始工作时间" />
+            </uni-forms-item>
+            <uni-forms-item label="开始安检工作时间" name="securityCheckStartDate">
+              <uni-datetime-picker v-model="user.securityCheckStartDate" type="date" placeholder="请选择开始安检工作时间" />
+            </uni-forms-item>
+            <uni-forms-item label="曾在安检工作中担任的最高职务" name="securityInspectionPosition">
+              <uni-data-picker v-model="user.securityInspectionPosition" :localdata="securityPositionOptions"
+                popup-title="请选择最高职务" />
+            </uni-forms-item>
+            <uni-forms-item label="接受奖励次数" name="workRewardsNumber">
+              <uni-easyinput v-model="user.workRewardsNumber" type="number" placeholder="请输入接受奖励次数" />
+            </uni-forms-item>
+            <uni-forms-item label="接受处罚次数" name="workPenaltiesNumber">
+              <uni-easyinput v-model="user.workPenaltiesNumber" type="number" placeholder="请输入接受处罚次数" />
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+
+        <!-- 评价类指标 -->
+        <uni-collapse class="collapse" :accordion="false" :value="['evaluation']">
+          <uni-collapse-item class="collapse-item" title="评价类指标" name="evaluation" :show-animation="true">
+            <uni-forms-item label="性格特征" name="characterCharacteristics">
+              <uni-data-picker v-model="user.characterCharacteristics" :localdata="sys_user_character_characteristics"
+                popup-title="请选择性格特征" />
+            </uni-forms-item>
+            <uni-forms-item label="工作风格" name="workingStyle">
+              <uni-data-picker v-model="user.workingStyle" :localdata="sys_user_working_style" popup-title="请选择工作风格" />
+            </uni-forms-item>
+            <uni-forms-item label="团队配合人员" name="teamCooperation">
+              <zxz-uni-data-select v-model="user.teamCooperation" :localdata="teamCooperationOptions" multiple
+                placeholder="请选择团队配合人员" />
+            </uni-forms-item>
+            <uni-forms-item label="自我关键词评价" name="selfKeywords">
+              <view class="evaluation-column">
+                <uni-data-picker v-model="user.selfAssessmentPersonalityTrait" :localdata="sys_user_personality_trait"
+                  popup-title="请选择性格特质" style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.selfAssessmentCapabilityPerformance"
+                  :localdata="sys_user_capability_performance" popup-title="请选择能力表现"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.selfAssessmentInterpersonalInteraction"
+                  :localdata="sys_user_interpersonal_interaction" popup-title="请选择人际互动"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.selfAssessmentGrowthPotential" :localdata="sys_user_growth_potential"
+                  popup-title="请选择成长潜力" style="width: 100%;" />
+              </view>
+            </uni-forms-item>
+            <uni-forms-item label="同事关键词评价" name="colleagueKeywords">
+              <view class="evaluation-column">
+                <uni-data-picker v-model="user.colleagueCommentsPersonalityTrait"
+                  :localdata="sys_user_personality_trait" popup-title="请选择性格特质"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.colleagueCommentsCapabilityPerformance"
+                  :localdata="sys_user_capability_performance" popup-title="请选择能力表现"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.colleagueCommentsInterpersonalInteraction"
+                  :localdata="sys_user_interpersonal_interaction" popup-title="请选择人际互动"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.colleagueCommentsGrowthPotential" :localdata="sys_user_growth_potential"
+                  popup-title="请选择成长潜力" style="width: 100%;" />
+              </view>
+            </uni-forms-item>
+            <uni-forms-item label="上级关键词评价" name="superiorKeywords">
+              <view class="evaluation-column">
+                <uni-data-picker v-model="user.superiorEvaluationPersonalityTrait"
+                  :localdata="sys_user_personality_trait" popup-title="请选择性格特质"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.superiorEvaluationCapabilityPerformance"
+                  :localdata="sys_user_capability_performance" popup-title="请选择能力表现"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.superiorEvaluationInterpersonalInteraction"
+                  :localdata="sys_user_interpersonal_interaction" popup-title="请选择人际互动"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.superiorEvaluationGrowthPotential" :localdata="sys_user_growth_potential"
+                  popup-title="请选择成长潜力" style="width: 100%;" />
+              </view>
+            </uni-forms-item>
+            <uni-forms-item label="下级关键词评价" name="subordinateKeywords">
+              <view class="evaluation-column">
+                <uni-data-picker v-model="user.subordinateEvaluationPersonalityTrait"
+                  :localdata="sys_user_personality_trait" popup-title="请选择性格特质"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.subordinateEvaluationCapabilityPerformance"
+                  :localdata="sys_user_capability_performance" popup-title="请选择能力表现"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.subordinateEvaluationInterpersonalInteraction"
+                  :localdata="sys_user_interpersonal_interaction" popup-title="请选择人际互动"
+                  style="width: 100%; margin-bottom: 10px;" />
+                <uni-data-picker v-model="user.subordinateEvaluationGrowthPotential"
+                  :localdata="sys_user_growth_potential" popup-title="请选择成长潜力" style="width: 100%;" />
+              </view>
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+
+        <!-- 应急联络信息 -->
+        <uni-collapse class="collapse" :accordion="false" :value="['emergency']">
+          <uni-collapse-item class="collapse-item" title="应急联络信息" name="emergency" :show-animation="true">
+            <uni-forms-item label="紧急联系人姓名" name="emergencyContactName">
+              <uni-easyinput v-model="user.emergencyContactName" placeholder="请输入紧急联系人姓名" />
+            </uni-forms-item>
+            <uni-forms-item label="紧急联系人电话" name="emergencyContactPhone">
+              <uni-easyinput v-model="user.emergencyContactPhone" placeholder="请输入紧急联系人电话" />
+            </uni-forms-item>
+            <uni-forms-item label="紧急联系人关系" name="emergencyContactRelationship">
+              <uni-data-picker v-model="user.emergencyContactRelationship"
+                :localdata="sys_user_emergency_contact_relationship" popup-title="请选择紧急联系人关系" />
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+
+        <!-- 其他信息 -->
+        <uni-collapse class="collapse" :accordion="false" :value="['other']">
+          <uni-collapse-item class="collapse-item" title="其他信息" name="other" :show-animation="true">
+            <uni-forms-item label="备注" name="remark">
+              <uni-easyinput v-model="user.remark" type="textarea" placeholder="请输入备注" />
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+
       </uni-forms>
-      <button type="primary" @click="submit">提交</button>
+    </view>
+
+    <!-- 固定在底部的提交按钮 -->
+    <view class="submit-button">
+      <button type="primary" @click="submit" style="margin-top: 0;width: 100%;">提交</button>
     </view>
   </view>
 </template>
 
 <script>
-  import { getUserProfile } from "@/api/system/user"
-  import { updateUserProfile } from "@/api/system/user"
 
-  export default {
-    data() {
+import { updateUser, listAllUser, getPostAllList, getUserInfoById } from "@/api/system/user"
+import { getDeptList } from "@/api/system/dept/dept"
+import storage from "@/utils/storage"
+import constant from "@/utils/constant"
+import useDictMixin from "@/utils/dict"
+
+export default {
+  mixins: [useDictMixin],
+  data() {
+    return {
+      user: {
+        // 基本身份信息
+        nickName: "",
+        deptId: "",
+        phonenumber: "",
+        email: "",
+        cardNumber: "",
+        sex: "",
+        zodiac: "",
+        constellation: "",
+        blooGroup: "",
+
+        // 状态管理信息
+        trainingComplianceStatus: "",
+
+        // 资质能力信息
+        qualificationLevel: "",
+        postIds: [],
+        politicalReviewSituation: "",
+        politicalStatus: "",
+        schooling: "",
+        administrativeStatus: "",
+        physicalHealthStatus: "",
+
+        // 工作履历/经验
+        startWorkingDate: "",
+        securityCheckStartDate: "",
+        securityInspectionPosition: "",
+        workRewardsNumber: "",
+        workPenaltiesNumber: "",
+
+        // 评价类指标
+        characterCharacteristics: "",
+        workingStyle: "",
+        teamCooperation: [],
+        selfAssessmentPersonalityTrait: "",
+        selfAssessmentCapabilityPerformance: "",
+        selfAssessmentInterpersonalInteraction: "",
+        selfAssessmentGrowthPotential: "",
+        colleagueCommentsPersonalityTrait: "",
+        colleagueCommentsCapabilityPerformance: "",
+        colleagueCommentsInterpersonalInteraction: "",
+        colleagueCommentsGrowthPotential: "",
+        superiorEvaluationPersonalityTrait: "",
+        superiorEvaluationCapabilityPerformance: "",
+        superiorEvaluationInterpersonalInteraction: "",
+        superiorEvaluationGrowthPotential: "",
+        subordinateEvaluationPersonalityTrait: "",
+        subordinateEvaluationCapabilityPerformance: "",
+        subordinateEvaluationInterpersonalInteraction: "",
+        subordinateEvaluationGrowthPotential: "",
+
+        // 应急联络信息
+        emergencyContactName: "",
+        emergencyContactPhone: "",
+        emergencyContactRelationship: "",
+
+        // 其他信息
+        remark: ""
+      },
+
+      // 性别选项
+      sys_user_sex: [],
+
+      // 生肖选项
+      sys_user_zodiac: [],
+
+      // 星座选项
+      sys_user_constellation: [],
+
+      // 血型选项
+      sys_user_blood_group: [],
+
+      // 资质等级选项
+      sys_user_qualification_level: [],
+
+      // 岗位类型选项
+      sys_user_post_type: [],
+
+      // 是否通过政审选项
+      yesNoOptions: [
+        { text: '是', value: '1' },
+        { text: '否', value: '0' }
+      ],
+
+      // 政治面貌选项
+      sys_user_political_status: [],
+
+      // 学历选项
+      sys_user_schooling: [],
+
+      // 安检最高职务选项
+      sys_user_security_position: [],
+
+      // 安检最高职务选项（写死）
+      securityPositionOptions: [
+        { text: '安检员', value: '安检员' },
+        { text: '班组长', value: '班组长' }
+      ],
+
+      // 性格特征选项
+      sys_user_character_characteristics: [],
+
+      // 工作风格选项
+      sys_user_working_style: [],
+
+      // 团队配合人员选项
+      sys_user_team_cooperation: [],
+
+      // 性格特质选项
+      sys_user_personality_trait: [],
+
+      // 能力表现选项
+      sys_user_capability_performance: [],
+
+      // 人际互动选项
+      sys_user_interpersonal_interaction: [],
+
+      // 成长潜力选项
+      sys_user_growth_potential: [],
+
+      // 紧急联系人关系选项
+      sys_user_emergency_contact_relationship: [],
+
+      // 团队配合人员选项
+      teamCooperationOptions: [],
+
+      // 岗位类型树状数据
+      postTreeData: [],
+
+      // 部门选项数据
+      deptOptions: [],
+
+    }
+  },
+  onLoad() {
+    this.loadDictData()
+    this.getUser()
+    this.loadTeamCooperationData()
+    this.loadPostTreeData()
+    this.loadDeptData()
+  },
+  onReady() {
+    this.$refs.form.setRules(this.rules)
+  },
+  computed: {
+    rules() {
       return {
-        user: {
-          nickName: "",
-          phonenumber: "",
-          email: "",
-          sex: ""
+        nickName: {
+          rules: [{
+            required: true,
+            errorMessage: '用户昵称不能为空'
+          }]
         },
-        sexs: [{
-          text: '男',
-          value: "0"
-        }, {
-          text: '女',
-          value: "1"
-        }],
-        rules: {
-          nickName: {
-            rules: [{
-              required: true,
-              errorMessage: '用户昵称不能为空'
-            }]
-          },
-          phonenumber: {
-            rules: [{
-              required: true,
-              errorMessage: '手机号码不能为空'
-            }, {
-              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-              errorMessage: '请输入正确的手机号码'
-            }]
-          },
-          email: {
-            rules: [{
-              required: true,
-              errorMessage: '邮箱地址不能为空'
-            }, {
-              format: 'email',
-              errorMessage: '请输入正确的邮箱地址'
-            }]
-          }
+        deptId: {
+          rules: [{
+            required: true,
+            errorMessage: '归属部门不能为空'
+          }]
+        },
+        qualificationLevel: {
+          rules: [{
+            required: this.isSecurityRole,
+            errorMessage: '资质等级不能为空'
+          }]
+        },
+        postIds: {
+          rules: [{
+            required: this.isSecurityRole,
+            errorMessage: '岗位类型不能为空'
+          }]
+        },
+        phonenumber: {
+          rules: [{
+            required: true,
+            errorMessage: '手机号码不能为空'
+          }, {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            errorMessage: '请输入正确的手机号码'
+          }]
+        },
+        email: {
+          rules: [{
+            required: true,
+            errorMessage: '邮箱地址不能为空'
+          }, {
+            format: 'email',
+            errorMessage: '请输入正确的邮箱地址'
+          }]
         }
       }
     },
-    onLoad() {
-      this.getUser()
+    // 判断当前用户是否是安检员或班组长角色
+    isSecurityRole() {
+      // 安检员和班组长的角色ID通常是固定的，这里假设安检员角色ID为101，班组长角色ID为102
+      // 您可以根据实际情况调整这些ID
+      const securityRoleIds = ['banzuzhang', 'SecurityCheck'] // 安检员和班组长的角色ID
+
+      // 检查当前用户的角色ID是否包含安检员或班组长的角色ID
+      console.log((this.user?.roles && this.user?.roles.length > 0) && this.user.roles.some(role => securityRoleIds.includes(role.roleKey)), "this.user.roleIds.some(role => securityRoleIds.includes(role.roleKey))")
+      return (this.user?.roles && this.user?.roles.length > 0) && this.user?.roles.some(role => securityRoleIds.includes(role.roleKey))
+
+    }
+  },
+  methods: {
+    async loadDictData() {
+      try {
+        const dicts = await this.useDict(
+          'sys_user_sex',
+          'sys_user_zodiac',
+          'sys_user_constellation',
+          'sys_user_blood_group',
+          'sys_user_qualification_level',
+          'sys_user_post_type',
+          'sys_user_political_status',
+          'sys_user_schooling',
+          'sys_user_security_position',
+          'sys_user_character_characteristics',
+          'sys_user_working_style',
+          'sys_user_team_cooperation',
+          'sys_user_personality_trait',
+          'sys_user_capability_performance',
+          'sys_user_interpersonal_interaction',
+          'sys_user_growth_potential',
+          'sys_user_emergency_contact_relationship'
+        )
+
+        // 将获取到的字典数据转换为uni-data-picker需要的格式
+        Object.keys(dicts).forEach(key => {
+          // console.log(dicts[key])
+          // 将dictLabel/dictValue格式转换为label/value格式
+          this[key] = dicts[key].map(item => ({
+            text: item.label,
+            value: item.value
+          }))
+        })
+      } catch (error) {
+        console.error('加载字典数据失败:', error)
+      }
     },
-    onReady() {
-      this.$refs.form.setRules(this.rules)
+
+    // 加载团队配合人员数据
+    async loadTeamCooperationData() {
+      try {
+        const res = await listAllUser()
+        if (res && res.data) {
+          this.teamCooperationOptions = res.data.map(item => ({
+            text: `${item.nickName}(${item.userName})`,
+            value: item.userId
+          }))
+        }
+      } catch (error) {
+        console.error('加载团队配合人员数据失败:', error)
+      }
+    },
+
+    // 加载岗位类型树状数据
+    async loadPostTreeData() {
+      try {
+        const res = await getPostAllList()
+
+        if (res && res.data) {
+          // 保存原始树状数据
+          this.postTreeDataAll = JSON.parse(JSON.stringify(res.data))
+
+          // 将树状数据扁平化，显示为"父级岗位名称 - 子级岗位名称"格式
+          const flattenTreeWithParent = (nodes, parentName = '') => {
+            let result = []
+            nodes.forEach(node => {
+              // 如果有子节点，只处理子节点
+              if (node.children && node.children.length > 0) {
+                result = result.concat(flattenTreeWithParent(node.children, node.postName))
+              } else {
+                // 如果没有子节点，显示当前节点（带父级名称）
+                const displayText = parentName ? `${parentName}/${node.postName}` : node.postName
+                result.push({
+                  text: displayText,
+                  value: node.postId
+                })
+              }
+            })
+            return result
+          }
+
+          this.postTreeData = flattenTreeWithParent(res.data)
+        }
+      } catch (error) {
+        console.error('加载岗位类型树状数据失败:', error)
+      }
     },
-    methods: {
-      getUser() {
-        getUserProfile().then(response => {
-          this.user = response.data
+
+    // 资质等级变化处理
+    handleQualificationLevelChange(e) {
+      console.log('资质等级变化', e)
+      // 清空岗位类型选择
+      this.user.postIds = []
+
+      // 如果资质等级为五级，需要重新生成过滤后的扁平化数据
+      const flattenTreeWithParent = (nodes, parentName = '') => {
+        let result = []
+        nodes.forEach(node => {
+          if (node.children && node.children.length > 0) {
+            result = result.concat(flattenTreeWithParent(node.children, node.postName))
+          } else {
+            const displayText = parentName ? `${parentName}/${node.postName}` : node.postName
+            result.push({
+              text: displayText,
+              value: node.postId
+            })
+          }
         })
-      },
-      submit(ref) {
-        this.$refs.form.validate().then(res => {
-          updateUserProfile(this.user).then(response => {
-            this.$modal.msgSuccess("修改成功")
-          })
+        return result
+      }
+
+      if (e?.detail?.value[0]?.value === 'LEVEL_FIVE') {
+        this.postTreeData = flattenTreeWithParent(this.postTreeDataAll).filter(item => item.value !== 9 && item.value !== 10)
+      } else {
+        this.postTreeData = flattenTreeWithParent(this.postTreeDataAll)
+      }
+
+
+    },
+
+    // 递归过滤树形数据
+    filterPostTree(data) {
+      return data.filter(item => {
+        // 过滤掉postId为9或10的选项
+        if (item.postId == 9 || item.postId == 10) {
+          return false
+        }
+
+        // 如果有子节点，递归过滤
+        if (item.children && item.children.length > 0) {
+          item.children = this.filterPostTree(item.children)
+        }
+
+        return true
+      })
+    },
+
+    // 加载部门数据
+    async loadDeptData() {
+      try {
+        const res = await getDeptList()
+        if (res && res.data) {
+          // 直接使用树状数据，转换为uni-data-picker需要的格式
+          const transformDeptTree = (nodes) => {
+            return nodes.map(node => ({
+              text: node.label,
+              value: node.id,
+              children: node.children ? transformDeptTree(node.children) : []
+            }))
+          }
+          this.deptOptions = transformDeptTree(res.data)
+        }
+      } catch (error) {
+        console.error('加载部门数据失败:', error)
+      }
+    },
+    getUser() {
+      // 获取当前登录用户的ID
+      const currentUserId = storage.get(constant.id)
+      if (currentUserId) {
+        getUserInfoById(currentUserId).then(response => {
+          let res = { ...response.data }
+          res.teamCooperation = res.teamCooperation ? res.teamCooperation.split(",") : []
+          res.postIds = response.postIds || []
+          res.roleIds = response.roleIds || []
+          this.user = res
         })
+      } else {
+        console.error('未找到当前登录用户ID')
       }
+    },
+    submit(ref) {
+      // 重新设置验证规则，确保角色变化后规则能更新
+      this.$refs.form.setRules(this.rules)
+      
+      this.$refs.form.validate().then(res => {
+        // 准备提交数据，将数组字段转换为字符串
+        const submitData = {
+          ...this.user,
+          teamCooperation: this.user.teamCooperation ? this.user.teamCooperation.join(',') : ''
+        }
+
+        updateUser(submitData).then(response => {
+          this.$modal.msgSuccess("修改成功")
+          // 提交成功后返回上一个页面
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 1500)
+        })
+      }).catch(err => {
+        // 验证失败时显示错误提示
+        console.error('表单验证失败:', err)
+        this.$modal.msgError('请检查表单填写是否正确')
+      })
     }
   }
+}
 </script>
 
 <style lang="scss" scoped>
-  page {
-    background-color: #ffffff;
-  }
+page {
+  background-color: #ffffff;
+  padding-bottom: 80px;
+  /* 为底部按钮预留空间 */
+}
 
-  .example {
-    padding: 15px;
-    background-color: #fff;
-  }
+.example {
+  padding: 15px;
 
-  .segmented-control {
-    margin-bottom: 15px;
-  }
+  background-color: #fff;
+}
 
-  .button-group {
-    margin-top: 15px;
-    display: flex;
-    justify-content: space-around;
-  }
+.submit-button {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 999;
+  background: #fff;
+  padding: 15px;
+  box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.1);
+}
 
-  .form-item {
-    display: flex;
-    align-items: center;
-    flex: 1;
-  }
+.collapse {
+  margin-bottom: 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+}
 
-  .button {
-    display: flex;
-    align-items: center;
-    height: 35px;
-    line-height: 35px;
-    margin-left: 10px;
-  }
+.collapse-item {
+  background-color: #fff;
+  padding: 10px;
+}
+
+.segmented-control {
+  margin-bottom: 15px;
+}
+
+.button-group {
+  margin-top: 15px;
+  display: flex;
+  justify-content: space-around;
+}
+
+.form-item {
+  display: flex;
+  align-items: center;
+  flex: 1;
+}
+
+.button {
+  display: flex;
+  align-items: center;
+  height: 35px;
+  line-height: 35px;
+  margin-left: 10px;
+}
+
+button[type="primary"] {
+  margin-top: 20px;
+  background-color: #409EFF;
+}
+
+.evaluation-row {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  width: 100%;
+}
+
+.evaluation-column {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+}
 </style>

src/pages/seizedReported/index.vue

@@ -81,6 +81,26 @@
 
               <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.attendanceTeamName" />
             </uni-forms-item>
+
+            <!-- 开机指令（仅开箱检查岗位显示） -->
+            <uni-forms-item v-if="isPackageInspection" label="开机指令" name="powerOnInstruction" required>
+              <radio-group v-if="!isDetailMode" @change="onpowerOnInstructionChange" class="radio-group"
+                :class="{ 'disabled-group': isDetailMode }">
+                <label class="radio-item" v-for="(item, index) in powerOnInstructionOptions" :key="index">
+                  <radio :value="item.value" :checked="formData.powerOnInstruction == item.value" color="#409EFF" />
+                  <text>{{ item.text }}</text>
+                </label>
+              </radio-group>
+              <uni-easyinput v-else :disabled="true" placeholder="请选择开机指令" :value="formData.powerOnInstructionText" />
+            </uni-forms-item>
+
+            <!-- X光开机员（仅非指令时显示） -->
+            <uni-forms-item v-if="showXrayOperator" label="X光开机员" name="xrayOperatorId" required>
+              <fuzzy-select v-if="!isDetailMode" v-model="formData.xrayOperatorId" :options="xrayOperatorOptions"
+                placeholder="请输入X光开机员姓名搜索" data-value="userId" data-text="nickName" @change="handleXrayOperatorSelect"
+                :disabled="isDetailMode" />
+              <uni-easyinput v-else :disabled="true" placeholder="请选择X光开机员" :value="formData.xrayOperatorName" />
+            </uni-forms-item>
           </uni-collapse-item>
         </uni-collapse>
         <!-- </view> -->
@@ -243,7 +263,7 @@ import HomeContainer from "@/components/HomeContainer.vue";
 import SearchView from "@/pages/attendance/components/SearchView.vue"
 import { treeSelectByType } from "@/api/system/common"
 import useDictMixin from '@/utils/dict'
-
+import FuzzySelect from "@/components/fuzzy-select/fuzzy-select.vue"
 import { addSeizureRecord, approvalStart, getInfo } from '@/api/seizure/seizureRecord.js'
 import { getLocationsbyTime, categoryInfo, categoryList } from '@/api/seizureRecord/seizureRecord.js'
 import config from '@/config'
@@ -254,7 +274,7 @@ import { formatTime } from '@/utils/formatUtils'
 import { getUserInfoById, getPostListsByUserId } from '@/api/system/user.js'
 import { getUserList } from '@/api/attendance/attendance'
 export default {
-  components: { HomeContainer, SearchView },
+  components: { HomeContainer, SearchView, FuzzySelect },
   mixins: [useDictMixin],
   computed: {
     currentUser() {
@@ -273,6 +293,14 @@ export default {
       // console.log(this.item_check_method_options.map(item => item.postName || item.label || item.text || item.value),"this.item_check_method_options.map(item => item.postName || item.label || item.text || item.value)")
       return this.item_check_method_options.map(item => item.postName || item.label || item.text || item.value);
     },
+    // 判断是否为开箱（包）检查岗位
+    isPackageInspection() {
+      return this.formData.checkMethodText === '开箱（包）检查岗位';
+    },
+    // 判断是否显示X光开机员选择（非指令时显示）
+    showXrayOperator() {
+      return this.isPackageInspection && this.formData.powerOnInstruction == '1';
+    },
     // // 判断是新增模式还是详情模式
     isDetailMode() {
 
@@ -298,7 +326,11 @@ export default {
         teamName: '',
         reportTeam: '',
         reportTeamText: '',
-
+        // 开机指令相关字段（开箱检查岗位使用）
+        powerOnInstruction: '0', // 开机指令：'0'-指令, '1'-非指令
+        powerOnInstructionText: '指令',
+        xrayOperatorId: '', // X光开机员ID
+        xrayOperatorName: '', // X光开机员姓名
         // 查获位置信息
         channelCode: '',
         channelName: '',
@@ -365,6 +397,12 @@ export default {
         reportTeam: {
           rules: [{ required: true, errorMessage: '请选择上报班组' }]
         },
+        powerOnInstruction: {
+          rules: [{ required: true, errorMessage: '请选择开机指令' }]
+        },
+        xrayOperatorId: {
+          rules: [{ required: true, errorMessage: '请选择X光开机员' }]
+        },
         forbiddenCategory: {
           rules: [{ required: true, errorMessage: '请选择违禁品类别' }]
         },
@@ -419,7 +457,13 @@ export default {
         { name: '是', value: '1' },
         { name: '否', value: '0' }
       ],
-
+      // 开机指令选项
+      powerOnInstructionOptions: [
+        { text: '指令', value: '0' },
+        { text: '非指令', value: '1' }
+      ],
+      // X光开机员选项
+      xrayOperatorOptions: [],
       // 其他数据
       startDate: '2020-01-01',
       endDate: '2030-12-31',
@@ -463,12 +507,12 @@ export default {
     this.type = params?.type || 'add';
     // }
     await this.initPageData();
-    
+
     // 如果是kezhang角色，加载部门人员
     if (this.isKezhang) {
       await this.loadDepartmentUsers();
     }
-    
+
     if (this.type == 'add' && !this.isKezhang) {
       this.invokerGetLocationsbyTime()
     }
@@ -637,6 +681,14 @@ export default {
           }
         })
 
+        // 处理powerOnInstruction字段，确保为字符串类型
+        if (detailData.powerOnInstruction != null) {
+          this.formData.powerOnInstruction = String(detailData.powerOnInstruction);
+          this.formData.powerOnInstructionText = detailData.powerOnInstructionText || (detailData.powerOnInstruction == 1 ? '非指令' : '指令');
+        } else {
+          this.formData.powerOnInstruction = '0';
+          this.formData.powerOnInstructionText = '指令';
+        }
 
       })
 
@@ -767,7 +819,7 @@ export default {
         ]);
         // 初始化岗位选项数据
         await this.initPositionAndOptions();
-        
+
         const convertTree = (list = []) =>
           list.map(node => ({
             text: node.label,
@@ -831,7 +883,7 @@ export default {
 
         // 更新岗位选项
         this.item_check_method_options = postListsRes.data || [];
-        
+
         console.log("岗位和选项数据已更新，用户ID:", userId);
       } catch (error) {
         console.error("初始化岗位和选项数据失败:", error);
@@ -841,11 +893,11 @@ export default {
     // 加载部门人员（kezhang角色使用）
     async loadDepartmentUsers() {
       if (!this.isKezhang) return;
-      
+
       try {
         const currentUserInfo = this.userInfo || {};
         const currentUserDeptId = currentUserInfo.departmentId || currentUserInfo.deptId;
-        
+
         if (!currentUserDeptId) {
           console.warn('无法获取当前用户的部门ID');
           return;
@@ -862,7 +914,7 @@ export default {
             ...user,
             value: user.userId,
             text: user.nickName || user.userName,
-      
+
           }));
         }
       } catch (error) {
@@ -971,11 +1023,62 @@ export default {
         this.formData.checkMethodText = '';
         return
       }
+      // 如果切换了岗位，重置开机指令相关字段
+      if (this.formData.checkMethodText !== text) {
+        this.formData.powerOnInstruction = '';
+        this.formData.powerOnInstructionText = '';
+        this.formData.xrayOperatorId = '';
+        this.formData.xrayOperatorName = '';
+      }
+
 
       this.formData.checkMethod = selectedItem?.postCode || text;
       this.formData.checkMethodText = selectedItem?.postName || selectedItem?.label || selectedItem?.text || text;
+      // 如果是开箱（包）检查岗位，加载X光开机员列表
+      if (text === '开箱（包）检查岗位') {
+        this.loadXrayOperators();
+      }
+    },
+    // 开机指令变化
+    onpowerOnInstructionChange(e) {
+      const selectedValue = e.detail.value;
+
+      this.formData.powerOnInstruction = selectedValue;
+      this.formData.powerOnInstructionText = selectedValue === '1' ? '非指令' : '指令';
+      this.formData.xrayOperatorId = '';
+      this.formData.xrayOperatorName = '';
+
+      // 如果选择了指令，清空X光开机员
+      if (this.formData.powerOnInstruction === '0') {
+        this.loadXrayOperators();
+      }
+    },
+
+    // 加载X光开机员列表
+    async loadXrayOperators() {
+      try {
+        // 使用现有的用户列表接口，可以根据需要调整参数
+        const { listAllUser } = await import('@/api/system/user.js');
+        const res = await listAllUser();
+        if (res && res.data) {
+          this.xrayOperatorOptions = res.data.map(item => ({
+            ...item,
+            nickName: `${item.nickName}(${item.userName})`,
+          })) || [];
+        }
+      } catch (error) {
+        console.error('加载X光开机员列表失败:', error);
+      }
     },
 
+    // X光开机员选择
+    handleXrayOperatorSelect(value) {
+      const selectedUser = this.xrayOperatorOptions.find(user => user.userId === value);
+      if (selectedUser) {
+        this.formData.xrayOperatorId = selectedUser.userId;
+        this.formData.xrayOperatorName = selectedUser.nickName;
+      }
+    },
     // 安检岗位 - 原data-picker版本（已弃用）
     onItemCheckMethodChange(e) {
       this.formData.checkMethod = e.detail.value[0]?.value || '';
@@ -1075,7 +1178,7 @@ export default {
       const arr = e.detail.value || [];
       this.formData.inspectUserId = arr[arr.length - 1]?.value || '';
       this.formData.inspectUserName = arr.map(item => item.text).join('/');
-      
+
       this.formData.reportTeam = this.departmentUserOptions.find(item => item.userId === this.formData.inspectUserId)?.deptId;
       this.formData.reportTeamText = this.teams.find(item => item.value === this.formData.reportTeam)?.text;
       // 切换查获人员后，重新初始化岗位和选项数据
@@ -1175,7 +1278,7 @@ export default {
 
 
 
-      
+
       const payload = {
         ...this.formData,
         itemSeizureItemsList: [item],

src/pages/seizedReportedVoice/index.vue

@@ -72,6 +72,26 @@
 
               <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.reportTeamText" />
             </uni-forms-item>
+
+            <!-- 开机指令（仅开箱检查岗位显示） -->
+            <uni-forms-item v-if="isPackageInspection" label="开机指令" name="powerOnInstruction" required>
+              <radio-group v-if="!isDetailMode" @change="onpowerOnInstructionChange" class="radio-group"
+                :class="{ 'disabled-group': isDetailMode }">
+                <label class="radio-item" v-for="(item, index) in powerOnInstructionOptions" :key="index">
+                  <radio :value="item.value" :checked="formData.powerOnInstruction === item.value" color="#409EFF" />
+                  <text>{{ item.label }}</text>
+                </label>
+              </radio-group>
+              <uni-easyinput v-else :disabled="true" placeholder="请选择开机指令" :value="formData.powerOnInstructionText" />
+            </uni-forms-item>
+
+            <!-- X光开机员（仅非指令时显示） -->
+            <uni-forms-item v-if="showXrayOperator" label="X光开机员" name="xrayOperatorId" required>
+              <fuzzy-select v-if="!isDetailMode" v-model="formData.xrayOperatorId" :options="xrayOperatorOptions"
+                placeholder="请输入X光开机员姓名搜索" data-value="userId" data-text="nickName" @change="handleXrayOperatorSelect"
+                :disabled="isDetailMode" />
+              <uni-easyinput v-else :disabled="true" placeholder="请选择X光开机员" :value="formData.xrayOperatorName" />
+            </uni-forms-item>
           </view>
 
 
@@ -208,6 +228,7 @@ import HomeContainer from "@/components/HomeContainer.vue";
 import SearchView from "@/pages/attendance/components/SearchView.vue"
 import { treeSelectByType } from "@/api/system/common"
 import useDictMixin from '@/utils/dict'
+import FuzzySelect from "@/components/fuzzy-select/fuzzy-select.vue"
 import { getVoiceInfo, deleteVoiceDraft } from '@/api/voiceSubmissionDraft/voiceSubmissionDraft.js'
 import { addSeizureRecord, approvalStart, getInfo } from '@/api/seizure/seizureRecord.js'
 import { getLocationsbyTime, categoryInfo, categoryList } from '@/api/seizureRecord/seizureRecord.js'
@@ -218,7 +239,7 @@ import { getDeptList } from "@/api/system/dept/dept.js"
 import { formatTime } from '@/utils/formatUtils'
 import { getUserInfoById, getPostListsByUserId } from '@/api/system/user.js'
 export default {
-  components: { HomeContainer, SearchView },
+  components: { HomeContainer, SearchView, FuzzySelect },
   mixins: [useDictMixin],
   computed: {
     currentUser() {
@@ -233,6 +254,14 @@ export default {
       // console.log(this.item_check_method_options.map(item => item.postName || item.label || item.text || item.value),"this.item_check_method_options.map(item => item.postName || item.label || item.text || item.value)")
       return this.item_check_method_options.map(item => item.postName || item.label || item.text || item.value);
     },
+    // 判断是否为开箱（包）检查岗位
+    isPackageInspection() {
+      return this.formData.checkMethodText === '开箱（包）检查岗位';
+    },
+    // 判断是否显示X光开机员选择（非指令时显示）
+    showXrayOperator() {
+      return this.isPackageInspection && this.formData.powerOnInstruction === '1';
+    },
     // // 判断是新增模式还是详情模式
     isDetailMode() {
 
@@ -259,7 +288,11 @@ export default {
         teamName: '',
         reportTeam: '',
         reportTeamText: '',
-
+        // 开机指令相关字段（开箱检查岗位使用）
+        powerOnInstruction: '0', // 开机指令：'0'-指令, '1'-非指令
+        powerOnInstructionText: '指令',
+        xrayOperatorId: '', // X光开机员ID
+        xrayOperatorName: '', // X光开机员姓名
         // 查获位置信息
         channelCode: '',
         channelName: '',
@@ -332,6 +365,12 @@ export default {
         forbiddenType: {
           rules: [{ required: true, errorMessage: '请选择违禁品类型' }]
         },
+        powerOnInstruction: {
+          rules: [{ required: true, errorMessage: '请选择开机指令' }]
+        },
+        xrayOperatorId: {
+          rules: [{ required: true, errorMessage: '请选择X光开机员' }]
+        },
         // forbiddenName: {
         //   rules: [{ required: true, errorMessage: '请输入违禁品名称' }]
         // },
@@ -382,7 +421,13 @@ export default {
         { name: '是', value: '1' },
         { name: '否', value: '0' }
       ],
-
+      // 开机指令选项
+      powerOnInstructionOptions: [
+        { label: '指令', value: '0' },
+        { label: '非指令', value: '1' }
+      ],
+      // X光开机员选项
+      xrayOperatorOptions: [],
       // 其他数据
       startDate: '2020-01-01',
       endDate: '2030-12-31',
@@ -490,7 +535,7 @@ export default {
             this.formData.securityLocation = locationResult.current?.value;
           }
 
-  
+
 
 
         } else {
@@ -899,7 +944,14 @@ export default {
           }
         })
 
-
+        // 处理powerOnInstruction字段，确保为字符串类型
+        if (detailData.powerOnInstruction != null) {
+          this.formData.powerOnInstruction = String(detailData.powerOnInstruction);
+          this.formData.powerOnInstructionText = detailData.powerOnInstructionText || (detailData.powerOnInstruction == 1 ? '非指令' : '指令');
+        } else {
+          this.formData.powerOnInstruction = '0';
+          this.formData.powerOnInstructionText = '指令';
+        }
       })
 
       console.log('表单数据已回填:', this.formData);
@@ -1190,12 +1242,61 @@ export default {
         this.formData.checkMethodText = '';
         return
       }
-
+      // 如果切换了岗位，重置开机指令相关字段
+      if (this.formData.checkMethodText !== text) {
+        this.formData.powerOnInstruction = '';
+        this.formData.powerOnInstructionText = '';
+        this.formData.xrayOperatorId = '';
+        this.formData.xrayOperatorName = '';
+      }
       this.formData.checkMethod = selectedItem?.postCode || text;
       this.formData.checkMethodText = selectedItem?.postName || selectedItem?.label || selectedItem?.text || text;
+      // 如果是开箱（包）检查岗位，加载X光开机员列表
+      if (text === '开箱（包）检查岗位') {
+        this.loadXrayOperators();
+      }
+    },
+
+    // 开机指令变化
+    onpowerOnInstructionChange(e) {
+      const selectedValue = e.detail.value;
+
+      this.formData.powerOnInstruction = selectedValue;
+      this.formData.powerOnInstructionText = selectedValue === '1' ? '非指令' : '指令';
+      this.formData.xrayOperatorId = '';
+      this.formData.xrayOperatorName = '';
+
+      // 如果选择了指令，清空X光开机员
+      if (this.formData.powerOnInstruction === '0') {
+        this.loadXrayOperators();
+      }
     },
 
+    // 加载X光开机员列表
+    async loadXrayOperators() {
+      try {
+        // 使用现有的用户列表接口，可以根据需要调整参数
+        const { listAllUser } = await import('@/api/system/user.js');
+        const res = await listAllUser();
+        if (res && res.data) {
+          this.xrayOperatorOptions = res.data.map(item => ({
+            ...item,
+            nickName: `${item.nickName}(${item.userName})`,
+          })) || [];
+        }
+      } catch (error) {
+        console.error('加载X光开机员列表失败:', error);
+      }
+    },
 
+    // X光开机员选择
+    handleXrayOperatorSelect(value) {
+      const selectedUser = this.xrayOperatorOptions.find(user => user.userId === value);
+      if (selectedUser) {
+        this.formData.xrayOperatorId = selectedUser.userId;
+        this.formData.xrayOperatorName = selectedUser.nickName;
+      }
+    },
 
     // 查获班组变化
     onTeamChange(e) {

src/pages/workProfile/components/organization-support.vue

@@ -132,12 +132,12 @@ export default {
 
             // 获取availablePositions数据，如果没有数据则使用默认数据
             let qualificationLevel = this.moduleMetrics.system && this.moduleMetrics.system.qualificationLevelStats || []
-            let qualificationLevelArr = qualificationLevel.filter(item => item.levelName)
+            //let qualificationLevelArr = qualificationLevel.filter(item => item.levelName)
 
             // 转换数据格式用于环形图
-            const chartData = qualificationLevelArr.map((position, index) => ({
+            const chartData = qualificationLevel.map((position, index) => ({
                 value: position.count, // 使用索引+1作为值，确保每个岗位都有值
-                name: qualificationDict.find(item => item.value === position.levelName)?.label || `资质${index + 1}`
+                name: position.levelName
             }))
 
 
@@ -145,7 +145,7 @@ export default {
             const option = {
                 tooltip: {
                     trigger: 'item',
-                    formatter: function(params) {
+                    formatter: function (params) {
                         return `${params.name}: ${params.value}`;
                     }
                 },
@@ -166,7 +166,7 @@ export default {
                     radius: ['40%', '70%'],
                     center: ['45%', '50%'],
                     avoidLabelOverlap: false,
-                    
+
                     label: {
                         show: true,
                         formatter: '{b}: {c}'
@@ -269,28 +269,29 @@ export default {
 
 <style lang="scss" scoped>
 .content-item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 16rpx;
-
-  &:last-child {
-    margin-bottom: 0;
-  }
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16rpx;
+
+    &:last-child {
+        margin-bottom: 0;
+    }
 }
 
 .item-label {
-  font-size: 28rpx;
-  color: #333333;
-  font-weight: 500;
-  min-width: 120rpx;
+    font-size: 28rpx;
+    color: #333333;
+    font-weight: 500;
+    min-width: 120rpx;
 }
 
 .item-value {
-  font-size: 28rpx;
-  color: #999999;
-  font-weight: 500;
+    font-size: 28rpx;
+    color: #999999;
+    font-weight: 500;
 }
+
 .detail-card {
 
     padding: 10rpx 30rpx;
@@ -303,9 +304,7 @@ export default {
         margin-bottom: 24rpx;
     }
 
-    .text-layout {
-       
-    }
+    .text-layout {}
 
     .chart-section {
         width: 100%;