普通左右功能對接，人員作者未完成

src/api/job/jobPointGroup.ts

@@ -27,6 +27,7 @@ export const selectJobTicketGroupById = async (id: number) => {
 export const insertJobTicketGroup = async (data: jobVO) => {
   return await request.post({ url: '/iscs/job-ticket-group/insertJobTicketGroup', data })
 }
+
 // 修改Job 点位分组
 export const updateJobTicketGroup = async (data: jobVO) => {
   return await request.put({ url: '/iscs/job-ticket-group/updateJobTicketGroup', data })

src/views/jobTicket/job/CreateJob.vue

@@ -237,9 +237,9 @@
               </div>
             </div>
 
-            <!-- 有分组点数据时显示 -->
-            <div v-else-if="JobForm.sopGroupList&&JobForm.sopGroupList[0].groupName!=='默认分组'" class="group-container">
-              <div v-for="group in JobForm.sopGroupList" :key="group.id" class="group-card-user">
+            <!-- 有分组点数据时显示 &&JobForm.ticketGroupList[0].groupName!=='默认分组'-->
+            <div v-else-if="JobForm.ticketGroupList" class="group-container">
+              <div v-for="group in JobForm.ticketGroupList" :key="group.id" class="group-card-user">
                 <div class="group-title">{{ group.groupName }}</div>
                 <div class="user-list">
                   <img src="@/assets/images/添加.png" class="user-card" @click="goSetting('SetJobUser', JobForm,group.id)"/>
@@ -280,20 +280,27 @@
 
 
     <div class="bottom-btn">
-      <el-button @click="submit">
+      <el-button @click="submit('1')">
         <el-icon>
-          <Check/>
+          <Check />
         </el-icon>
-        确 定
+        创建并启动
+      </el-button>
+      <el-button @click="submit('0')">
+        <el-icon>
+          <Check />
+        </el-icon>
+        创 建
       </el-button>
 
       <el-button @click="cancel">
         <el-icon>
-          <Close/>
+          <Close />
         </el-icon>
         取 消
       </el-button>
     </div>
+
   </div>
 </template>
 <script setup lang="ts">
@@ -314,7 +321,7 @@ import {handleTree} from '@/utils/tree'
 import {ref} from 'vue'
 import {Handle, useVueFlow, VueFlow} from '@vue-flow/core'
 import {deleteJobTicketStepList, insertJobTicketStep} from "@/api/job/jobStep";
-import {getJobTicketGroupPage} from "@/api/job/jobPointGroup";
+import {getJobTicketGroupPage, selectJobTicketGroupById} from "@/api/job/jobPointGroup";
 
 const JobForm = reactive({
   id: null,
@@ -329,7 +336,8 @@ const JobForm = reactive({
   ticketStatus: null,
   ticketStartTime: null,
   ticketEndTime: null,
-  remark: null
+  remark: null,
+  ticketGroupList:null,
 })
 const Visible=ref<boolean>(false)
 const JobAutoName = ref(false)
@@ -392,6 +400,15 @@ const goSetting = (type, JobForm,groupId) => {
   }
 }
 
+// 获取Job点位分组详细信息
+// const JobPointGroupsDetails=async()=>{
+//   try {
+// const groupsdetails=await jobPointGroup.selectJobTicketGroupById({
+//   id:1
+// })
+//   }
+// }
+
 // 获取所有点位和分组的数据
 const fetchAllGroupsAndPoints = async () => {
   try {
@@ -665,10 +682,16 @@ const submit = async () => {
         pageSize: -1,
         modeId: JobForm.modeId
       })
-      const ticketStepData = dataNew.list.map((item) => ({
-        ...item,
+      // const ticketStepData = dataNew.list.map((item) => ({
+      //   ...item,
+      //   ticketId: data,
+      // }))
+
+      const ticketStepData = dataNew.list.map(({ id, ...rest }) => ({
+        ...rest,
         ticketId: data,
       }))
+
       // 导入步骤数据
       await insertJobTicketStep(ticketStepData)
       successMessage = t('common.createSuccess')

src/views/jobTicket/job/CreateSopJob.vue

@@ -253,9 +253,9 @@
               </div>
             </div>
 
-            <!-- 有分组点数据时显示 -->
+            <!-- 有分组点数据时显示 && JobForm.ticketGroupList[0].groupName !== '默认分组'-->
             <div
-              v-else-if="JobForm.ticketGroupList && JobForm.ticketGroupList[0].groupName !== '默认分组'"
+              v-else-if="JobForm.ticketGroupList "
               class="group-container"
             >
               <div v-for="group in JobForm.ticketGroupList" :key="group.id" class="group-card-user">

src/views/jobTicket/job/PointView/CardView.vue

@@ -136,6 +136,11 @@ const router=useRouter()
 const props = defineProps({
   groupAdded: Boolean
 })
+// 岗位id
+const workstationId = ref<number>()
+// 设备工艺id
+const machineryId=ref<number>()
+
 // 记录当前选中的分组ID（高亮分组）
 const selectedGroupId = ref<number | null>(null)
 const groupList = ref([])
@@ -374,7 +379,9 @@ const updateFilterData = async (skipReload = false) => {
   if (!skipReload) {
     try {
       const groupData = await jobApi.selectJobTicketById(route.query.ticketId)
-console.log(groupData,'groupData')
+      workstationId.value=groupData.workstationId
+      machineryId.value=groupData.machineryId
+      console.log(groupData,'groupData',workstationId.value,machineryId.value)
       if (groupData?.ticketPointsList?.length > 0) {
         groupList.value.forEach(group => group.pointIds = [])
         groupData.ticketPointsList.forEach((jobPoint: any) => {
@@ -431,9 +438,11 @@ const getOtherList = async () => {
         pointIds: []
       }))
     } else {
+
       // 如果没有分组数据，调用Job接口获取默认分组
       const groupData = await jobApi.selectJobTicketById(route.query.ticketId)
-      console.log(groupData, 'groupData')
+
+      console.log(groupData, 'groupData',)
       groupList.value = groupData.ticketGroupList.map((group: any, index: number) => ({
         id: group.id,
         ticketId: group.ticketId,
@@ -479,7 +488,9 @@ const submit = async () => {
         allCurrentPoints.push({
           ticketId: route.query.ticketId,
           groupId: group.id,
-          pointId: pointId
+          pointId: pointId,
+          workstationId:workstationId.value,
+          machineryId:machineryId.value
         })
       })
     })

src/views/jobTicket/job/UpdateJob.vue

@@ -10,6 +10,7 @@
                 <InfoFilled />
               </el-icon>
               <span style="font-size: 18px">作业修改步骤</span>
+
             </div>
           </template>
 
@@ -253,9 +254,9 @@
               </div>
             </div>
 
-            <!-- 有分组点数据时显示 -->
+            <!-- 有分组点数据时显示  && JobForm.ticketGroupList[0].groupName !== '默认分组'-->
             <div
-              v-else-if="JobForm.ticketGroupList && JobForm.ticketGroupList[0].groupName !== '默认分组'"
+              v-else-if="JobForm.ticketGroupList"
               class="group-container"
             >
               <div v-for="group in JobForm.ticketGroupList" :key="group.id" class="group-card-user">
@@ -1048,6 +1049,12 @@ const getJobTypeName = (ticketType) => {
   const typeOption = JobTypeOptions.find((option) => option.value === ticketType)
   return typeOption ? typeOption.label : '未知类型'
 }
+
+// 返回
+const goBack=()=>{
+  router.push('/jobTicket/job')
+
+  }
 </script>
 
 <style scoped lang="scss">

src/views/jobTicket/job/UserView/CardView.vue

@@ -255,7 +255,6 @@ const removeCoLockUser = (user) => {
   console.log(user,'user')
 }
 
-// 确认按钮事件
 // 确认按钮事件
 const submit = async () => {
   try {
@@ -332,7 +331,7 @@ const submit = async () => {
       ElMessage.warning('请至少选择一个人员或移除一个人员')
       return
     }
-
+    console.log(jtcolocker.value,jtlocker.value,addedCoLockUsers.value,addedLockUsers.value,'jjjj')
     // 【5】先删
     if (toDeleteUserIds.value.length > 0) {
       const deleteIds = toDeleteUserIds.value.join(',')
@@ -359,6 +358,7 @@ const submit = async () => {
     console.error('保存失败:', error)
   }
 }
+
 const cancel = () => {
   if (route.query.type == 'update') {
     router.push({

src/views/sopm/sop/UpdateSop.vue

@@ -233,9 +233,9 @@
               </div>
             </div>
 
-            <!-- 有分组点数据时显示 -->
+            <!-- 有分组点数据时显示 && SopForm.sopGroupList[0].groupName !== '默认分组'-->
             <div
-              v-else-if="SopForm.sopGroupList && SopForm.sopGroupList[0].groupName !== '默认分组'"
+              v-else-if="SopForm.sopGroupList "
               class="group-container"
             >
               <div v-for="group in SopForm.sopGroupList" :key="group.id" class="group-card-user">