fix

project/dv/apps/AppGridDV.vue

@@ -233,6 +233,7 @@
       handleNodeClick (e) {
         this.girdLevel = e.girdLevel
         this.isLoading = true
+        console.log(e)
         this.getGirdInfo(e.id, e.girdLevel)
         this.getStatisticsInfo(e.id)
       },
@@ -341,43 +342,16 @@
         this.y = '50%'
       },
 
-      getGirdInfo (id, level) {
+      getGirdInfo (id) {
         this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
           if (res.code == 0) {
-            const chartData = this.formatList(res.data)
-            if (res.data && res.data[0] && res.data[0].parentGirdInfo) {
-              const parentGirdInfo = res.data[0].parentGirdInfo
-              const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
-                return {
-                  ...v,
-                  label: v.name,
-                  id: v.id,
-                  checkType: '2',
-                  girdName: parentGirdInfo.girdName,
-                  girdLevel: parentGirdInfo.girdLevel,
-                  isUser: true
-                }
-              }) : [{
-                label: '-',
-                id: parentGirdInfo.id,
-                girdLevel: parentGirdInfo.girdLevel,
-                girdName: parentGirdInfo.girdName
-              }]
-              this.chartData = [{
-                label: parentGirdInfo.girdName,
-                id: parentGirdInfo.id,
-                girdLevel: parentGirdInfo.girdLevel,
-                isUser: false,
-                children: chartData,
-                userList: girdMemberList
-              }]
-            } else {
-              this.chartData = chartData
-            }
+            const chartData = this.formatList([res.data])
+            console.log(chartData)
+            this.chartData = chartData
 
             this.$nextTick(() => {
-              if (level === '2') {
-                this.getUserList(id)
+              if (id) {
+                this.getUserList(id, chartData[0].id)
               } else {
                 this.isLoading = false
                 this.autoScale()
@@ -387,7 +361,7 @@
         })
       },
 
-      getUserList (id) {
+      getUserList (id, parentId) {
         this.instance.post(`/app/appgirdmemberresident/listByGirdMember`, null, {
           params: {
             size: 1000,
@@ -402,7 +376,7 @@
                 label: v.name
               }
             })
-            
+
             this.isLoading = false
 
             if (!userList.length) {
@@ -410,7 +384,7 @@
               return false
             }
 
-            const node = this.$refs.VueOkrTree.getNode(id)
+            const node = this.$refs.VueOkrTree.getNode(parentId)
             this.$refs.VueOkrTree.append({
               id: new Date().getTime(),
               label: '子节点',
@@ -546,7 +520,7 @@
       .el-table {
         background-color: transparent;
       }
-      
+
       .el-table__body tr td:first-child .cell, .ai-table .el-table__header tr th:first-child .cell {
         padding-left: 0!important;
       }
@@ -690,7 +664,7 @@
             text-overflow:ellipsis;
             white-space: nowrap;
             margin-bottom: 10px;
-          
+
             &:nth-of-type(2n) {
               margin-right: 0;
             }
@@ -875,4 +849,4 @@
       }
     }
   }
-</style>
+</style>

project/sass/apps/AppHouseMap/toolBar/communityOverview.vue

@@ -57,8 +57,8 @@ export default {
 <style lang="scss" scoped>
 .communityOverview {
   max-width: 400px;
-  max-height: 700px;
-  overflow-y: auto;
+  max-height: 600px;
+  overflow-y: auto!important;
 
   .units {
     display: flex;

project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue

@@ -4,8 +4,8 @@
       <ai-title slot="title" title="审批详情" isShowBack isShowBottomBorder @onBackClick="approval.goBack()">
         <template #rightBtn>
           <template v-if="listType==0&&$permissions('zwsp_oaapprovalapplyinfo_approve')">
-            <el-button size="small" class="iconfont iconClean del-btn-list" @click="agreeRefulse(0)">拒绝</el-button>
-            <el-button size="small" type="primary" class="iconfont iconCorrect" @click="agreeRefulse(1)">同意</el-button>
+            <el-button size="small" icon="iconfont iconClean del-btn-list" @click="agreeRefulse(0)">拒绝</el-button>
+            <el-button size="small" type="primary" icon="iconfont iconCorrect" @click="agreeRefulse(1)">同意</el-button>
           </template>
           <el-button v-if="listType==2&&detail.approvalStatus==0&&$permissions('app_oaapprovalapplyinfo_del')"
                      size="small" class="iconfont iconRevoke del-btn-list" style="width: 76px;" @click="recall">撤回
@@ -157,9 +157,9 @@
                             <span class="li_opinion" v-if="item.annexFiles && item.annexFiles.length>0">审批附件：</span>
                             <div style="flex: 1;">
                               <div class="desc_div">
-                                <img @click="openImg(value.accessUrl)" v-for="(value,_v) in item.pictureFiles" :key="_v"
-                                     :src="value.accessUrl" alt="图片" width="80px" height="80px"
-                                     style="border: 1px solid #ddd;cursor: pointer;">
+                                <el-image v-for="(value,_v) in item.pictureFiles" :key="_v" :preview-src-list="[value.accessUrl]"
+                                          :src="value.accessUrl" alt="图片" width="80px" height="80px"
+                                          style="border: 1px solid #ddd;cursor: pointer;"/>
                               </div>
                               <ul class="file_ul">
                                 <li v-for="(v,_i) in item.annexFiles" :key="_i" @click="downFile(v.accessUrl)">
@@ -205,15 +205,12 @@
       </template>
     </ai-detail>
 
-    <el-dialog :visible.sync="isOpen" width="600px">
-      <img :src="imgUrl" alt="" width="100%" height="500px">
-    </el-dialog>
 
     <!--审批同意、拒绝-->
     <el-dialog :title="titleType" center :visible.sync="isAgree" width="720px" v-loading="loading"
                :close-on-click-modal="false" @close="form.fieldInfos = []">
-      <div style="height: 400px;overflow-y: auto;">
-        <el-form size="small" :model="form" label-width="90px" ref="ruleForm" label-position="right"
+      <div style="max-height: 400px;overflow-y: auto;">
+        <el-form size="small" :model="form" label-width="120px" ref="ruleForm" label-position="right"
                  class="dialog-form">
           <el-form-item v-for="(op,i) in form.fieldInfos" :key="i"
                         :label="op.fieldName + (op.fieldNameSuffix ? op.fieldNameSuffix : '')" class="dynamicFormItem"
@@ -240,15 +237,15 @@
                 type="date"
                 placeholder="请选择">
             </el-date-picker>
-            <ai-select v-if="op.fieldDataType=='9'" v-model="op.fieldValue"
-                       :selectList="dict.getDict(op.dictionaryCode)"/>
+            <ai-select v-if="op.fieldDataType=='9'" v-model="op.fieldValue" :selectList="dict.getDict(op.dictionaryCode)"/>
           </el-form-item>
-          <el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]"
-                        v-if="titleType=='审批拒绝'">
-            <el-input type="textarea" :rows="4" v-model.trim="form.opinion" placeholder="请输入" show-word-limit
-                      :maxlength="150"></el-input>
+          <el-form-item label="指定审批人" prop="appointNextCandidateId" :rules="[{ required: true, message: '请选择指定审批人'}]" v-if="form.nextNodeAreaFilter==3">
+            <ai-select v-model="form.appointNextCandidateId" :selectList="form.nextCandidateList"/>
           </el-form-item>
-          <el-form-item label="图片" prop="imgList" style="position: relative;">
+          <el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]" v-if="!form.pass">
+            <el-input type="textarea" :rows="4" v-model.trim="form.opinion" placeholder="请输入" show-word-limit :maxlength="150"/>
+          </el-form-item>
+          <el-form-item label="图片" prop="imgList" style="position: relative;" v-if="form.pictureEnable==1">
             <span style="position: absolute;left: -78px;top: 18px;font-size: 12px;color: #999;">（最多9张）</span>
             <el-upload
                 action
@@ -268,7 +265,7 @@
               </div>
             </el-upload>
           </el-form-item>
-          <el-form-item label="附件" prop="fileList">
+          <el-form-item label="附件" prop="fileList" v-if="form.annexEnable==1">
             <el-upload
                 class="upload-demo"
                 action
@@ -324,7 +321,6 @@ export default {
       detailObj: {},
       dataList: [],
       processList: [],
-      titleType: '',
       isAgree: false,
       form: {
         id: '',
@@ -344,7 +340,6 @@ export default {
       fileList: [],
       alreadyList: [],//已审批的
       imgUrl: '',
-      isOpen: false,
       url: "/admin/sysunit/getAll2",
       applyForm: {},
       menuList: ["基本信息", '申请表单', '附件材料', "审批记录"],
@@ -370,7 +365,8 @@ export default {
         {slot: "annex"},
         {slot: "options"}
       ]
-    }
+    },
+    titleType: v => v.form.pass ? '审批同意' : '审批拒绝'
   },
   methods: {
     handleDownload() {
@@ -417,10 +413,6 @@ export default {
       this.fileList = []
       this.isAgree = false
     },
-    openImg(url) {
-      this.isOpen = true;
-      this.imgUrl = url;
-    },
     // 下载
     downFile(url) {
       window.open(url);
@@ -558,36 +550,22 @@ export default {
       let dictionaryArr = []
       this.loading = true
       this.instance.post(`/app/approv-alapply-info/approval-popup?id=${this.detail.id}&type=${index}`).then(res => {
-        this.loading = false
-        if (res && res.data) {
+        if (res?.data) {
           if (index == 1) {
-            res.data.fieldInfos.map(e => {
-              if (e.fieldType == 3 && e.dictionaryCode && dictionaryArr.indexOf(e.dictionaryCode) == -1) {
+            this.form = res.data
+            this.form.fieldInfos = res.data.fieldInfos.filter(e => e.fieldType == 3)
+            this.form.nextCandidateList = this.form.nextCandidateList?.map(e => ({dictValue: e.candidate, dictName: e.name}))
+            this.form.fieldInfos.map(e => {
+              if (e.dictionaryCode && !dictionaryArr.includes(e.dictionaryCode)) {
                 dictionaryArr.push(e.dictionaryCode)
               }
             })
-            if (dictionaryArr.length) {
-              this.dict.load(dictionaryArr).then(() => {
-                this.form.fieldInfos = res.data.fieldInfos.filter(e => e.fieldType == 3)
-              })
-            } else {
-              this.form.fieldInfos = res.data.fieldInfos.filter(e => e.fieldType == 3)
-            }
+            dictionaryArr.length > 0 && this.dict.load(dictionaryArr)
           }
-
+          this.form.pass = index == 1
           this.isAgree = true;
-          if (index == 0) {
-            this.form.pass = false;
-            this.titleType = '审批拒绝';
-          } else {
-            this.form.pass = true;
-            this.titleType = '审批同意';
-          }
         }
-      }).catch(err => {
-        this.loading = false
-        console.log(err);
-      })
+      }).finally(() => this.loading = false)
     },
     saveAgree() {
       this.form.id = this.detail.id;

project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue

@@ -13,7 +13,7 @@
         </el-tabs>
       </template>
     </ai-list>
-    <component v-else :is="currentComp" :instance="instance" :dict="dict" :processType="currentTab.value" :row="row" @back="back"/>
+    <component v-else :is="currentTab.detail" :instance="instance" :dict="dict" :processType="currentTab.value" :row="row" @back="back"/>
   </section>
 </template>
 
@@ -35,7 +35,6 @@ export default {
     return {
       currIndex: "0",
       row: {},
-      currentComp: "",
     }
   },
   computed: {
@@ -49,22 +48,18 @@ export default {
       return this.tabs?.[this.currIndex] || {}
     },
     showDetail() {
-      return !!this.$route.query?.id || !!this.$route.query?.processType
+      return this.$route.hash == "#add" || !!this.$route.query?.processType
     }
   },
   methods: {
     goPage(params) {
-      this.row = params.row
-      this.currentComp = params.comp
-      this.$router.push({query: {processType: this.currentTab.value}})
+      this.$router.push({query: {id: params.row.id}, hash: "#add"})
     },
-
     back() {
       this.$router.push({query: {}})
     }
   },
   created() {
-    this.$router.push({query: {}});
     this.$dict.load("hbDepartment", 'sex', 'nation', 'marital', 'native_place', 'education', 'candidateApproverType', 'scopeCandidates', 'nodeType')
   }
 }

project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue

@@ -9,12 +9,12 @@
           </el-steps>
         </div>
       </template>
-      <template #content v-if="refresh">
-        <baseInfo ref="baseInfo" :instance="instance" :dict="dict" v-show="activeStep==0"/>
+      <template #content v-if="loaded">
+        <baseInfo ref="baseInfo" :instance="instance" :dict="dict" v-if="activeStep==0"/>
         <applyForm ref="applyForm" :instance="instance" :dict="dict" v-show="activeStep==1"/>
-        <attachmentMaterial ref="attachmentMaterial" :instance="instance" v-show="activeStep==2"/>
+        <attachmentMaterial ref="attachmentMaterial" :instance="instance" v-if="activeStep==2"/>
         <processApproval ref="processApproval" :approvalSteps="applyForm.approvalSteps" :instance="instance"
-                         :dict="dict" v-show="activeStep==3"/>
+                         :dict="dict" v-if="activeStep==3"/>
       </template>
       <template #footer>
         <el-button class="btn" v-if="activeStep==0" @click="handleBack">取消</el-button>
@@ -39,12 +39,10 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    row: Object
   },
   components: {baseInfo, applyForm, attachmentMaterial, processApproval},
   data() {
     return {
-      activeStep: 0,
       baseInfo: {},
       applyForm: {
         tableId: "",
@@ -52,7 +50,8 @@ export default {
       },
       processAnnexDefs: [],
       detailObj: {},
-      refresh: true
+      activeStep: 0,
+      loaded: false
     }
   },
   computed: {
@@ -66,7 +65,7 @@ export default {
     },
     detailTitle() {
       return this.detailObj?.id ? "编辑事项" : "添加事项"
-    }
+    },
   },
   methods: {
     /**
@@ -103,9 +102,9 @@ export default {
       }
     },
     handleBaseInfo() {
-      this.$refs['baseInfo'].banseInfoForm().then(res => {
+      this.$refs.baseInfo.banseInfoForm().then(res => {
         if (res) {
-          this.$refs['applyForm'].getFormList()
+          this.$refs.applyForm?.getFormList()
           this.baseInfo = res
           this.activeStep++
         }
@@ -115,18 +114,17 @@ export default {
      * 保存
      */
     save() {
-      this.$refs['processApproval'].handleProcessApproval().then(res => {
+      this.$refs.processApproval?.handleProcessApproval().then(res => {
         this.instance.post(`/approval-process-def/add-update`, {
           ...this.detailObj,
           ...this.baseInfo,
           processDefStatus: Number(this.baseInfo.processDefStatus),
           tableId: this.applyForm.tableId,
-          processType: 0,
           tableType: 2,
-          processAnnexDefs: this.annexs.map(e => ({...e, mustFill: Number(e.mustFill)})),
+          processAnnexDefs: this.annexs?.map(e => ({...e, mustFill: Number(e.mustFill)})),
           processNodeList: res.processNodeList
         }).then(res => {
-          if (res.code == 0) {
+          if (res?.code == 0) {
             this.$message.success("保存成功")
             this.$emit("back")
           }
@@ -139,28 +137,21 @@ export default {
       this.instance.post(`/approval-process-def/info-id`, null, {params: {id}}).then(res => {
         if (res?.data) {
           this.detailObj = res.data
-          this.refreshDetail()
         }
-      })
+      }).finally(() => this.loaded = true)
     },
     getStepIcon(rowIndex) {
       if (rowIndex < this.activeStep) return "iconfont iconSteps_Finished"
       else if (this.activeStep == rowIndex) return "iconfont iconSteps_In_Progress"
       return ""
     },
-    refreshDetail() {
-      this.refresh = false
-      this.$nextTick(() => this.refresh = true)
-    },
     handleBack() {
       this.detailObj?.id && this.$router.push({query: {}})
       this.$emit('back')
     }
   },
   created() {
-    if (this.row.id) {
-      this.getDetail(this.row.id)
-    }
+    this.getDetail(this.$route.query.id)
   }
 }
 </script>

project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue

@@ -29,15 +29,7 @@
               <el-checkbox :label="p.dictName" v-for="(p,i) in dict.getDict(e.dictionaryCode)"
                            :key="Math.random()"></el-checkbox>
             </el-checkbox-group>
-
-            <el-select placeholder="请选择" disabled size="small" clearable style="width: 100%;" v-if="e.fieldDataType==9">
-              <el-option
-                  v-for="(item,i) in dict.getDict(e.fieldDbName)" :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue">
-              </el-option>
-            </el-select>
-
+            <ai-select v-if="e.fieldDataType==9" disabled/>
             <el-date-picker
                 v-model="form.picker"
                 v-if="['2','3','7','8'].includes(e.fieldDataType)"

project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue

@@ -44,25 +44,8 @@
                   </el-button>
                 </div>
               </div>
-              <!-- <ai-wechat-selecter slot="append" :instance="instance" :props="{id:'wxUserId',label:'name'}"
-                                    v-model="item.candidateList" v-if="item.candidateApproverType==1">
-                <el-button size="mini" type="primary">选择指定人员</el-button>
-              </ai-wechat-selecter> -->
-              <!-- <ai-user-picker :instance="instance" v-model="item.candidateList"  v-if="item.candidateApproverType==1"/> -->
-              <!-- <ai-people :showAiArea="false" customCliker :instance="instance"
-                        unitUrl="/admin/sysunit/getAll2"
-                        :meta="[]" v-model="item.candidateList"
-                        v-if="item.candidateApproverType==1">
-                <el-button size="mini" type="primary">选择指定人员</el-button>
-              </ai-people> -->
-
-              <!-- <ai-user-picker :instance="instance" v-model="form.portalUserId"/> -->
-              <ai-person-select
-                  :chooseUserList="item.candidateList"
-                  v-if="item.candidateApproverType==1"
-                  :instance="instance" customRightText url="/user/page"
-                  headerTitle="人员列表" dialogTitle="选择" :isMultiple="true"
-                  @selectPerson="e => changeCharge(e, index)">
+              <ai-person-select :chooseUserList="item.candidateList" v-if="item.candidateApproverType==1" :instance="instance" customRightText url="/user/page"
+                                headerTitle="人员列表" dialogTitle="选择" :isMultiple="true" @selectPerson="e => changeCharge(e, index)">
                 <template v-slot:option="{ item }">
                   <span class="iconfont iconProlife">{{ item.name }}</span>
                   <span>{{ item.phone }}</span>
@@ -73,63 +56,40 @@
         </el-steps>
       </template>
     </ai-card>
-    <el-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
-               :close-on-click-modal="false">
-      <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"
-                    clearable/>
+    <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="100px" ref="addForm" :rules="addRules">
+        <el-form-item label="审批步骤" prop="nodeName">
+          <el-input v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10" clearable/>
         </el-form-item>
         <el-form-item label="审批方式" prop="nodeType">
-          <el-radio-group v-model="nodeObj.nodeType">
-            <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-button>
-              </el-popover>
-            </el-radio>
-            <el-radio :label="3">抄送
-              <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-button>
-              </el-popover>
-            </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-radio-group v-model="nodeObj.nodeType" @change="nodeObj.areaFilter='',nodeObj.annexEnable='',nodeObj.pictureEnable=''">
+            <el-radio v-for="op in approvalWays" :key="op.value" :label="op.value">
+              <span v-text="op.label"/>
+              <el-popover placement="top-start" width="200" trigger="click" :content="op.tips">
+                <el-button type="text" slot="reference" icon="el-icon-warning" class="color-666"/>
               </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 v-for="op in dict.getDict('processNodeAreaFilter')" :key="op.dictValue" :label="op.dictValue">
+                <span v-text="op.dictName"/>
+                <el-popover placement="top-start" width="200" trigger="click" :content="dict.getLabel('processNodeAreaFilterTips',op.dictValue)">
+                  <el-button type="text" slot="reference" icon="el-icon-warning" class="color-666"/>
+                </el-popover>
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="附件图片">
+            <el-checkbox v-model="nodeObj.annexEnable" true-label="1" false-label="0">附件</el-checkbox>
+            <el-checkbox v-model="nodeObj.pictureEnable" true-label="1" false-label="0">图片</el-checkbox>
+          </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>
 
@@ -149,19 +109,15 @@ export default {
       form: {
         processNodeList: [],
       },
-      areaId: "",
+      approvalWays: [
+        {value: 2, label: '或签', tips: '或签是指该节点指定多名负责人审批时，其中任何一人完成审批即可。适合一个事项只需要某个岗位任何一人审批即可的业务场景。'},
+        {value: 3, label: '抄送', tips: '抄送是指一个事项审批完成后，抄送给需要知晓的单位或个人，被抄送的对象可以查阅该事项内容，无需审批。适合一个事项无需对方审批，但审批完成后需要通知对方知晓的业务场景。'},
+      ],
       isAddStep: false,
       isSelectImg: false,
       isSelectUnit: false,
       isSelectPerson: false,
-      nodeObj: {
-        candidateApproverType: '1',
-        candidateList: [],
-        nodeIndex: '',
-        nodeName: '',
-        nodeType: '',
-        scopeCandidates: ''
-      },
+      nodeObj: {areaFilter: [], annexEnable: null, pictureEnable: null},
       indexType: '',
       titleType: '',
       bomIndex: '',
@@ -190,15 +146,11 @@ export default {
     handleProcessApproval() {
       return Promise.resolve(this.form)
     },
-    /**
-     *删除
-     * */
     deleteInfo(index) {
       this.$confirm("是否删除").then(() => {
         this.form.processNodeList.splice(index, 1)
-      })
+      }).catch(() => 0)
     },
-
     changeCharge(e, i) {
       this.$set(this.form.processNodeList[i], 'candidateList', e.map(v => {
         return {
@@ -209,9 +161,6 @@ export default {
     },
     /**
      * 添加流程
-     * @param index
-     * @param item
-     * @param i
      */
     addAppStep(index, item, i) {
       this.isAddStep = true;
@@ -220,10 +169,8 @@ export default {
       if (index == 2) {
         this.titleType = '编辑审批步骤';
         item.nodeType = item.nodeType * 1;
-        item.areaFilter = item.areaFilter * 1;
         item.candidateApproverType = item.candidateApproverType * 1;
-        item.scopeCandidates = item.scopeCandidates * 1;
-        this.nodeObj = JSON.parse(JSON.stringify(item));
+        this.nodeObj = this.$copy(item)
       } else {
         this.titleType = '添加审批步骤';
         if (this.form.processNodeList.length > 0) {
@@ -235,11 +182,11 @@ export default {
     saveAddProgress() {
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.nodeObj.scopeCandidates == 0) this.nodeObj.candidateList = [];
+          if (this.nodeObj.scopeCandidates == '0') this.nodeObj.candidateList = [];
           if (this.indexType == 1) {
-            this.form.processNodeList.push(JSON.parse(JSON.stringify(this.nodeObj)));
+            this.form.processNodeList.push(this.$copy(this.nodeObj));
           } else {
-            this.form.processNodeList.splice(this.bomIndex, 1, JSON.parse(JSON.stringify(this.nodeObj)));
+            this.form.processNodeList.splice(this.bomIndex, 1, this.$copy(this.nodeObj));
           }
           this.$refs.addForm.resetFields();
           this.isAddStep = false;
@@ -253,13 +200,16 @@ export default {
         nodeIndex: '',
         nodeName: '',
         nodeType: '',
-        scopeCandidates: ''
+        scopeCandidates: '1',
+        annexEnable: null,
+        pictureEnable: null,
+        areaFilter: null
       };
       this.$refs.addForm?.resetFields();
     },
   },
   created() {
-    this.areaId = this.user.info.areaId.substring(0, 6) + '000000'
+    this.dict.load("processNodeAreaFilter", 'processNodeAreaFilterTips')
     if (this.config.detailObj?.id) {
       Object.keys(this.form).map(e => this.form[e] = this.config.detailObj[e])
     }
@@ -442,6 +392,10 @@ export default {
     }
   }
 
+  .color-666 {
+    color: #666;
+  }
+
   .dia_per_content {
     width: 640px;
     height: 400px;
@@ -511,7 +465,7 @@ export default {
   .peraoBtn {
     .el-button--text {
       color: #333;
-      font-size: 12px;
+      font-size: 14px;
     }
   }