Răsfoiți Sursa

作业创建步骤在修改时不显示修改;修改普通作业创建修改时SOP项为不显示

wyn 3 luni în urmă
părinte
comite
5184808517

+ 3 - 3
src/views/jobTicket/job/CreateJob.vue

@@ -2,7 +2,7 @@
   <div>
     <!--    sop表单-->
     <ContentWrap>
-      <el-collapse v-model="activeName" accordion>
+      <el-collapse v-model="activeName" accordion">
         <el-collapse-item name="1">
           <template #title>
             <div style="display: flex; align-items: center; gap: 8px">
@@ -741,14 +741,14 @@ const cancel = async () => {
         type: 'warning'
       })
       // 用户确认离开
-      router.push('/sopm/sop')
+      router.push('/jobTicket/job')
     } catch {
       // 用户取消离开
       console.log('用户取消离开')
     }
   } else {
     // 没有未保存的更改,直接离开
-    router.push('/sopm/sop')
+    router.push('/jobTicket/job')
   }
 }
 

+ 2 - 24
src/views/jobTicket/job/UpdateJob.vue

@@ -2,27 +2,6 @@
   <div>
     <!--    job表单-->
     <ContentWrap>
-      <el-collapse v-model="activeName" accordion>
-        <el-collapse-item name="1">
-          <template #title>
-            <div style="display: flex; align-items: center; gap: 8px">
-              <el-icon size="20" style="margin-left: 10px">
-                <InfoFilled />
-              </el-icon>
-              <span style="font-size: 18px">作业修改步骤</span>
-
-            </div>
-          </template>
-
-          <div style="padding-left: 20px">
-            <div>1、选择SOP</div>
-            <div>2、确定流程模式信息</div>
-            <div>3、确定点位及锁定分组</div>
-            <div>4、确定锁定人员与共锁人员</div>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
-
       <!-- 自定义边框容器 与sop表单 -->
       <div class="custom-tabs-container">
         <div class="tab-header">
@@ -37,8 +16,8 @@
             label-width="68px"
           >
             <el-row>
-              <el-col :span="5">
-                <el-form-item label="SOP" prop="sopId">
+              <el-col :span="5"  v-if="JobForm.sopId">
+                <el-form-item label="SOP" prop="sopId" >
                   <el-select
                     v-model="JobForm.sopId"
                     placeholder="请选择SOP"
@@ -365,7 +344,6 @@ const JobForm = reactive({
   ticketUserList:null,
 })
 const JobAutoName = ref(false)
-const activeName = ref('0')
 const machineryOptions = ref()
 const workstationOption = ref()
 const SopListOption = ref()