合并冲突

src/views/plant/processData/basicCommunication/addOrEdit.vue

@@ -386,11 +386,13 @@ export default {
         ...this.formData
         }).then(({code, data})=>{
           this.loading=false;
-        if(code==200){
-          this.msgSuccess('添加成功');
-          this.handleClose();
-        }
-      })
+          if(code==200){
+            this.msgSuccess('添加成功');
+            this.handleClose();
+          }
+        }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 编辑
     edit(){
@@ -403,7 +405,9 @@ export default {
           this.msgSuccess('编辑成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 获取操作类型列表
     getOperationList(){

src/views/plant/processData/communicationRules/addOrEdit.vue

@@ -220,7 +220,9 @@ export default {
           this.msgSuccess('添加成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 编辑
     edit(){
@@ -232,7 +234,9 @@ export default {
           this.msgSuccess('编辑成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 获取基础通信规则列表
     getBasiccomInfo(){

src/views/plant/processData/mappingRules/addOrEdit.vue

@@ -202,7 +202,9 @@ export default {
           this.msgSuccess('添加成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 编辑
     edit(){
@@ -214,7 +216,9 @@ export default {
           this.msgSuccess('编辑成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 获取基础通信规则列表
     getOpccomrule(){

src/views/plant/processData/operationType/addOrEdit.vue

@@ -85,7 +85,9 @@ export default {
           this.msgSuccess('添加成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 编辑
     edit(){
@@ -96,7 +98,9 @@ export default {
           this.msgSuccess('编辑成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     }
   }
 }

src/views/plant/processData/technology/addOrEdit.vue

@@ -247,7 +247,9 @@ export default {
           this.msgSuccess('添加成功');
           this.handleClose();
         }
-      })
+      }).catch(()=>{
+          this.loading=false;
+        })
     },
     // 编辑
     edit(){
@@ -270,7 +272,7 @@ export default {
         this.attributeList=data;
       })
     },
-    // 选择Attr后的回调
+    // 属性值列表
     setAttributeValue(value){
       getAttributeValue(value).then(({data:{Valst=[]}})=>{
         this.attrValueList=Valst;
@@ -282,7 +284,7 @@ export default {
         this.stepTypeList = data;
       })
     },
-    // 
+    // 项目列表
     getProjectList(){
       getProjectList().then(({data=[]})=>{
         this.projectList=data;
@@ -290,6 +292,8 @@ export default {
     },
   },
   created(){
+    this.item['Operation-ActivateInStation']=this.item['Operation-ActivateInStation']?this.item['Operation-ActivateInStation']:false;
+    this.item['Operation-ActivateWhenRepair']=this.item['Operation-ActivateWhenRepair']?this.item['Operation-ActivateWhenRepair']:false;
     this.getWorkLineList();
     this.getAttribute();
     this.getSteptype();

src/views/plant/processData/technology/index.vue

@@ -81,7 +81,7 @@
 import AddOrEdit from './addOrEdit.vue';
 import ScanRule from './scanRule.vue';
 import OperationGuide from './operationGuide.vue'
-import {getTableList, delParser} from '@/api/plant/processData/technology'
+import {getTableList, delParser, getAttribute, getAttributeValue} from '@/api/plant/processData/technology'
 export default {
   components:{
     AddOrEdit,
@@ -99,6 +99,8 @@ export default {
       tableData:[], // table数据源
       isAddOrEdit: '', // add-添加，edit-修改
       item:{}, // 当前要编辑的对象
+      attributeList:[], // 属性编码列表
+
     }
   },
   methods:{
@@ -162,7 +164,19 @@ export default {
         this.queryParams.total=count;
         this.tableData=records;
       })
-    }
+    },
+    // 属性编码列表
+    getAttribute(){
+      getAttribute().then(({data=[]})=>{
+        this.attributeList=data;
+      })
+    },
+    // 属性值列表
+    getAttributeValue(value){
+      getAttributeValue(value).then(({data:{Valst=[]}})=>{
+        this.attrValueList=Valst;
+      })
+    },
   },
   mounted(){
     this.getTableList();

src/views/plant/resource/operationDefinition/addOrEdit.vue

@@ -275,6 +275,9 @@ export default {
         })
       }
     }
+    this.item['Process-HasDependOn']=this.item['Process-HasDependOn']?this.item['Process-HasDependOn']:false;
+    this.item['Process-IsLastPO']=this.item['Process-IsLastPO']?this.item['Process-IsLastPO']:false;
+    this.item['Process-IsFirstPO']=this.item['Process-IsFirstPO']?this.item['Process-IsFirstPO']:false;
     this.getWorkLineList();
   }
 }

src/views/plant/resource/operationDefinition/index.vue

@@ -220,6 +220,10 @@ export default {
         this.loading=false
         this.queryParams.total=count;
         this.tableData=records;
+      }).catch(()=>{
+        this.loading=false
+        this.queryParams.total=0;
+        this.tableData=[];
       })
     },
     // 是否显示绑定工位界面

src/views/productplan/workbench/insertOrder/index.vue

@@ -0,0 +1,8 @@
+<template>
+  <div>
+    插单
+    1、OPC、开放协议两个页面不要，工艺添加配置opc通信规则和开放协议弹窗，要对应操作类型才要添加相应数据
+    2、工艺属性值和属性编码中文映射
+    3、零件关联关系
+  </div>
+</template>