From 6ce36cdbbdd6195f22f4c871d9d9854a51286862 Mon Sep 17 00:00:00 2001
From: ouyang <qinoy8521@163.com>
Date: Wed, 17 May 2023 17:50:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=AF=E5=88=B0=E7=AB=AF=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/subprocess/SubProcess.vue       | 94 ++++++++++++++++++-
 1 file changed, 93 insertions(+), 1 deletion(-)

diff --git a/com.actionsoft.apps.coe.pal/src/views/subprocess/SubProcess.vue b/com.actionsoft.apps.coe.pal/src/views/subprocess/SubProcess.vue
index aeccc8a..f11d05b 100644
--- a/com.actionsoft.apps.coe.pal/src/views/subprocess/SubProcess.vue
+++ b/com.actionsoft.apps.coe.pal/src/views/subprocess/SubProcess.vue
@@ -72,9 +72,31 @@
             </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-            <awsui-button type="primary" @click="generateSubProcessModel">确定</awsui-button>
+            <awsui-button type="primary" @click="submit">确定</awsui-button>
             <awsui-button @click="close">取 消</awsui-button>
         </div>
+        <!-- 关于选择的子流程是否是独立的校验提示 -->
+        <el-dialog
+                :visible.sync="generatePreHandleData.independentDlgVisible" width="700px"
+                :show-close="false"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                append-to-body>
+            <div>
+                <div style="display: inline-flex;align-items: center;flex-wrap: wrap;overflow: auto; border: 1px solid #efefef;">
+                    <el-tag style="margin: 5px;" v-for="tag in generatePreHandleData.independentNodeVos" :key="tag.id">{{ tag.name }}</el-tag>
+                </div>
+                <p style="margin: 10px 0;text-indent: 2em;">
+                    <span style="color: red;">*</span>
+                    以上的子流程，既不存在前置流程也不存在后置流程，同时也不是其它流程的前置流程或后置流程。<br/>
+                    因此，如果想继续生成总图并同时保留以上子流程的话，请取消本次操作，并为以上子流程补充前置流程或后置流程。 如果想继续生成总图且不想保留以上子流程的话，请选择跳过。
+                </p>
+            </div>
+            <div slot="footer" class="dialog-footer">
+                <awsui-button type="primary" >跳过</awsui-button>
+                <awsui-button @click="closeGeneratePreDlg">取 消</awsui-button>
+            </div>
+        </el-dialog>
     </el-dialog>
 </template>
 
@@ -116,6 +138,10 @@
                     label: 'name',
                     isLeaf: 'leaf'
                 },
+                generatePreHandleData: {
+                    independentDlgVisible: false,
+                    independentNodeVos: []
+                }
             }
         },
         methods: {
@@ -133,6 +159,7 @@
                             // console.log('initData', ro);
                             this.subProcessForm.position.label = ro.data.dirRootName;
                             this.subProcessForm.position.path = ro.data.dirRootPath;
+                            this.subProcessForm.position.locationId = ro.data.locationId;
                         }else if (ro.result === 'error') {
                             this.$message({type: 'error', message: ro.msg});
                             this.$emit('getResult');
@@ -150,6 +177,10 @@
                     this.$refs.subProcessModelTree.setCheckedKeys([]);
                 }
             },
+            closeGeneratePreDlg(){
+                this.generatePreHandleData.independentDlgVisible = false;
+                this.generatePreHandleData.independentNodeVos = [];
+            },
             closeAdapter(done) {
                 this.close();
                 done();
@@ -166,9 +197,70 @@
                 this.subProcessForm.defaultProcessCheckedKeys = [];
                 this.subProcessForm.showProcessTree = false;
             },
+            submit(){
+                this.generatePreHandle();
+            },
+            // 预处理2 查看所选的子流程中部分子流程的前置或后置是否在所选的范围内
+            generatePreHandle2(excludeProcessIdArr){
+                const param = {
+                    url: 'jd',
+                    data: {
+                        cmd: '',
+                        processIdJsonArr: JSON.stringify(this.subProcessForm.processList),
+                        excludeProcessIdJsonArr: JSON.stringify(excludeProcessIdArr)
+                    }
+                }
+                awsuiAxios.post(param)
+                    .then(ro => {
+
+                    })
+                    .catch(err => {
+                        console.log(err);
+                    });
+            },
+            // 跳过独立的子流程
+            jumpOverIndependent(){
+                let excludeProcessIdArr = [];
+                this.generatePreHandleData.independentNodeVos.forEach(vo => excludeProcessIdArr.push(vo.id));
+                this.generatePreHandle2(excludeProcessIdArr);
+            },
+            // 预处理 检验是否有独立的子流程
+            generatePreHandle(){
+                const param = {
+                    url: 'jd',
+                    data: {
+                        cmd: 'com.actionsoft.apps.coe.method.process.subprocess.independent_node_pre_handle',
+                        processIdJsonArr: JSON.stringify(this.subProcessForm.processList),
+                    }
+                }
+                awsuiAxios.post(param)
+                    .then(ro => {
+                        if (ro.result == 'ok'){
+                            if (ro.data.independentNodeVos.length){
+                                this.generatePreHandleData.independentDlgVisible = true;
+                                this.generatePreHandleData.independentNodeVos = ro.data.independentNodeVos;
+                            }else {
+                                this.generatePreHandle2([]);
+                            }
+                        }else if (ro.result == 'error'){
+                            this.$message({type: 'error', message: ro.msg});
+                        }
+                    })
+                    .catch(err => {
+                        console.log(err)
+                    });
+            },
             // 生成端到端总图
             generateSubProcessModel(){
                 console.log('执行参数',this.subProcessForm);
+                if (!this.subProcessForm.processList.length){
+                    this.$message({type: 'warning', message: '请选择子流程'});
+                    return;
+                }
+                if (!this.subProcessForm.modelName){
+                    this.$message({type: 'warning', message: '请填写模型名称'});
+                    return;
+                }
                 const param = {
                     url: 'jd',
                     data: {