From 1a3827e541cc777aed389add919d2214f1f26377 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 14:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/processApproval.vue            | 11 ++--
 .../components/processApproval.vue            | 54 +++++++++----------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/packages/work/processManagement/mattersConfig/components/processApproval.vue b/packages/work/processManagement/mattersConfig/components/processApproval.vue
index fc67ed96..fb65fc9a 100644
--- a/packages/work/processManagement/mattersConfig/components/processApproval.vue
+++ b/packages/work/processManagement/mattersConfig/components/processApproval.vue
@@ -53,8 +53,8 @@
         </el-steps>
       </template>
     </ai-card>
-    <el-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
-               :close-on-click-modal="false">
+    <ai-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
+               :close-on-click-modal="false" @onConfirm="saveAddProgress('addForm')">
       <el-form :model="nodeObj" label-width="120px" ref="addForm" :rules="addRules">
         <el-form-item label="审批步骤名称：" prop="nodeName">
           <el-input size="small" v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10"
@@ -87,12 +87,7 @@
           </el-radio-group>
         </el-form-item>
       </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width: 92px;" size="small" @click="isAddStep = false">取消</el-button>
-        <el-button style="width: 92px;" size="small" type="primary" @click="saveAddProgress('addForm')">确认
-        </el-button>
-      </div>
-    </el-dialog>
+    </ai-dialog>
   </div>
 </template>
 
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index c39774c9..72729ffd 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -73,8 +73,8 @@
         </el-steps>
       </template>
     </ai-card>
-    <el-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
-               :close-on-click-modal="false">
+    <ai-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
+               :close-on-click-modal="false" @onConfirm="saveAddProgress">
       <el-form size="small" :model="nodeObj" label-width="120px" ref="addForm" :rules="addRules">
         <el-form-item label="审批步骤名称" prop="nodeName">
           <el-input v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10"
@@ -104,32 +104,32 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="数据权限" prop="areaFilter">
-          <el-radio-group v-model="nodeObj.areaFilter">
-            <el-radio :label="0">不限
-              <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看全部申报事项">
-                <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-              </el-popover>
-            </el-radio>
-            <el-radio :label="1">村社区
-              <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本村申报事项">
-                <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-              </el-popover>
-            </el-radio>
-            <el-radio :label="2">镇街
-              <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本镇申报事项">
-                <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-              </el-popover>
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
+        <template v-if="nodeObj.nodeType==2">
+          <el-form-item label="数据权限" prop="areaFilter">
+            <el-radio-group v-model="nodeObj.areaFilter">
+              <el-radio :label="0">不限
+                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看全部申报事项">
+                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
+                </el-popover>
+              </el-radio>
+              <el-radio :label="1">村社区
+                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本村申报事项">
+                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
+                </el-popover>
+              </el-radio>
+              <el-radio :label="2">镇街
+                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本镇申报事项">
+                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
+                </el-popover>
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="附件图片" prop="areaFilter">
+
+          </el-form-item>
+        </template>
       </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width: 92px;" size="small" @click="isAddStep = false">取消</el-button>
-        <el-button style="width: 92px;" size="small" type="primary" @click="saveAddProgress">确认
-        </el-button>
-      </div>
-    </el-dialog>
+    </ai-dialog>
   </div>
 </template>