Просмотр исходного кода

Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

huhao@jgai.com 3 месяцев назад
Родитель
Сommit
1ea9e3dbba
1 измененных файлов с 9 добавлено и 3 удалено
  1. 9 3
      src/views/base/craftManagement/route/bindProcess.vue

+ 9 - 3
src/views/base/craftManagement/route/bindProcess.vue

@@ -9,6 +9,7 @@
         <span>工艺名称:{{ routeOperationData?.processRouteName }}</span>
         <span>产品名称:{{ routeOperationData?.prodtName }}</span>
         <span>产品编码:{{ routeOperationData?.prodtCode }}</span>
+        <span>产品型号: {{ routeOperationData?.prodtModel }}</span>
       </div>
       <el-button :icon="Back" size="small" @click="back">返回</el-button>
     </div>
@@ -132,6 +133,7 @@
       <div class="detailInfo">
         <el-scrollbar>
           <div class="opBox">
+            <el-text class="mx-1" type="warning">切换之前记得先保存</el-text>
             <el-button type="primary" @click="changeEditStatus">{{
               !editStatus ? "切换为工序信息编辑模式" : "切换为工序路线编辑模式"
             }}</el-button>
@@ -603,7 +605,6 @@ const filterDicts = () => {
   // dictsArray.value = arr;
 };
 
-
 const routeOperationData = ref(null);
 const cancelStatus = ref(true);
 //通过id获取现存储信息
@@ -637,6 +638,10 @@ const reset = () => {
   routeOperationData.value = {};
 };
 const editProComponent = async () => {
+  if (!currentProcess.value.operationId) {
+    ElMessage.warning("请串联保存工序流程");
+    return;
+  }
   router.push({
     path: `/base/craftManagement/processCom/${currentProcess.value.operationId}/${route.fullPath.split("/")[5]}/${route.fullPath.split("/")[4]}`,
   });
@@ -788,7 +793,8 @@ const convertToSnakeLayout = () => {
   }
 }
 
-.title,.processInfo{
+.title,
+.processInfo {
   line-height: 44px;
   color: #6f7991;
   font-size: 14px;
@@ -798,7 +804,7 @@ const convertToSnakeLayout = () => {
 }
 
 .processInfo span {
-  margin: 0 150px 0 200px;
+  margin: 0 150px 0 150px;
 }
 .processInfo {
   position: absolute;