From 0f5eb829c6198f7950c9722584d9d642dbbffd92 Mon Sep 17 00:00:00 2001
From: weifs <605403358@qq.com>
Date: Thu, 13 Apr 2023 09:38:50 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B7=A5=E4=BD=9C=E6=B5=81=20-=20?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=20-=20?=
 =?UTF-8?q?=2030%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/nginx/default.conf                     |   9 +-
 .../js/pages/manage/setting/approve.vue       | 111 +++++++++++++-----
 2 files changed, 85 insertions(+), 35 deletions(-)

diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
index dc6defe47..2eda6e165 100644
--- a/docker/nginx/default.conf
+++ b/docker/nginx/default.conf
@@ -170,14 +170,13 @@ server {
     }
 
     # 工作流
-    location /workflow/api/ {
-        auth_request /workflowauth;
-        auth_request_set $auth_status $upstream_status;
-        proxy_pass http://workflow/api/;
-    }
     location /workflow/ {
         proxy_pass http://workflow/;
     }
+    location /workflow/api/ {
+        auth_request /workflowauth;
+        proxy_pass http://workflow/api/;
+    }
     location /workflowauth {
         internal;
         proxy_set_header Content-Type "application/json";
diff --git a/resources/assets/js/pages/manage/setting/approve.vue b/resources/assets/js/pages/manage/setting/approve.vue
index 680b0f762..b34772b92 100644
--- a/resources/assets/js/pages/manage/setting/approve.vue
+++ b/resources/assets/js/pages/manage/setting/approve.vue
@@ -1,58 +1,109 @@
 <template>
     <div class="setting-item submit">
         <Row class="approve-row" :gutter="8">
-            <Col :xxl="{ span: 6 }" :xl="{ span: 8 }" :lg="{ span: 12 }" :sm="{ span: 24 }" :xs="{ span: 24 }" >
-                <div class="approve-col-box approve-col-add">
+            <!-- <Col :xxl="{ span: 6 }" :xl="{ span: 8 }" :lg="{ span: 12 }" :sm="{ span: 24 }" :xs="{ span: 24 }" >
+                <div class="approve-col-box approve-col-add" @click="add">
                     <Icon type="md-add" />
                 </div>
-
-            </Col>
-            <Col :xxl="{ span: 6 }" :xl="{ span: 8 }" :lg="{ span: 12 }" :sm="{ span: 24 }" :xs="{ span: 24 }" >
-                <div class="approve-col-box approve-col-for">
-                    <p>{{$L('流程名称：')}}<span>{{$L('加班')}}</span></p>
-
+            </Col> -->
+            <Col v-for="(item, key) in list" :xxl="{ span: 6 }" :xl="{ span: 8 }" :lg="{ span: 12 }" :sm="{ span: 24 }" :xs="{ span: 24 }" >
+                <div class="approve-col-box approve-col-for" @click="edit(item)">
+                    <p>{{$L('流程名称：')}}<span style="font-weight: 500;">{{$L(item.name)}}</span></p>
                     <Divider style="margin: 12px 0;"/>
-                    <div class="approve-button-box">
-                        <p>{{$L('是否启用：')}} <i-switch v-model="value"  /></p>
+                    <div class="approve-button-box" @click.stop="edit(item)">
+                        <p>{{$L('是否发布')}}： </p>
                         <p>
-                            <Icon type="md-create" />
-                            <Icon type="md-trash" />
+                            <i-switch v-model="item.issue" :disabled="true" />
+                            <!-- <Icon type="md-create" />
+                            <Icon type="md-trash" /> -->
                         </p>
-
-                    </div>
-                </div>
-            </Col>
-            <Col :xxl="{ span: 6 }" :xl="{ span: 8 }" :lg="{ span: 12 }" :sm="{ span: 24 }" :xs="{ span: 24 }" >
-                <div class="approve-col-box approve-col-for">
-                    <p>{{$L('流程名称：')}}<span>{{$L('加班')}}</span></p>
-
-                    <Divider style="margin: 12px 0;"/>
-                    <div class="approve-button-box">
-                        <p>{{$L('是否启用：')}} <i-switch v-model="value"  /></p>
-                        <p>
-                            <Icon type="md-create" />
-                            <Icon type="md-trash" />
-                        </p>
-
                     </div>
                 </div>
             </Col>
         </Row>
+
+        <!--查看所有项目-->
+        <DrawerOverlay v-model="approvalSettingShow"  placement="right" :size="1200">
+            <iframe :src="iframeSrc"></iframe>
+        </DrawerOverlay>
+
     </div>
 </template>
 
 <script>
+import DrawerOverlay from "../../../components/DrawerOverlay";
+import store from '../../../store/state'
+import {languageType} from "../../../language";
 export default {
     name: "approve",
+    components: {DrawerOverlay},
     data(){
         return{
-            value:true,
+            value:false,
             loadIng:0,
+            approvalSettingShow:false,
+            iframeSrc:"",
+            name:"",
+            list:[
+                {name:"请假",issue:false},
+                {name:"加班申请",issue:false},
+            ]
         }
     },
+    watch: {
+        approvalSettingShow(val) {
+            if (val) this.iframeSrc = `/workflow/#/?name=${this.name}&token=${store.userToken}&en=${languageType}`
+        }
+    },
+    mounted() {
+        window.addEventListener('message', this.saveSuccess)
+    },
+    beforeDestroy() {
+        window.removeEventListener("message", this.saveSuccess);
+    },
+    methods: {
+        // 保存成功回调
+        saveSuccess(e){
+            if (typeof e.data === 'string') {
+                let propsBody = JSON.parse(e.data);
+                if( propsBody.method == "saveSuccess" ) {
+                    this.list.forEach((h,index) => {
+                        if(h.name == this.name){
+                            h.issue = true;
+                            this.$set(this.list,index,h)
+                        }
+                    });
+                    this.approvalSettingShow = false;
+                    $A.messageSuccess('发布成功');
+                }
+            }
+        },
+        // 添加
+        add(){
+            this.name = "请假"
+            this.approvalSettingShow = true;
+        },
+        // 编辑
+        edit(item){
+            console.log(item.issue)
+            if(!item.issue){
+                this.name = item.name
+                this.approvalSettingShow = true;
+            }
+        }
+    }
 }
 </script>
 
 <style scoped>
-
+    iframe{
+        width: 100%;
+        height: 100%;
+        padding: 0;
+        margin: 0;
+        border: 0;
+        float: left;
+        border-top-left-radius: 18px;
+        border-bottom-left-radius: 18px;
+    }
 </style>