From 6474d8d4a15170d752a77821ce52585654f3f87a Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 2 Nov 2023 14:55:23 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppPatrolReportSet/AppPatrolReportSet.vue | 231 ++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100644 packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
new file mode 100644
index 00000000..4d8febd4
--- /dev/null
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -0,0 +1,231 @@
+<template>
+  <ai-list class="AppPatrolReportSet">
+    <ai-title slot="title" title="巡查上报设置"  isShowBottomBorder>
+      <el-button size="small" type="primary" icon="iconfont iconAdd" slot="rightBtn" @click="add">添加节点</el-button>
+    </ai-title>
+    <template slot="content">
+      <div class="item">
+        <div class="btn">
+          <el-button type="text">编辑</el-button>
+          <el-button type="text">删除</el-button>
+        </div>
+        <div class="index">01</div>
+        <div class="info">
+          <div class="label">节点类型</div>
+          <div class="value">混合节点</div>
+        </div>
+        <div class="info">
+          <div class="label">上级节点网络</div>
+          <div class="value">混合节点</div>
+        </div>
+        <div class="flex">
+          <div class="info">
+            <div class="label">生效功能</div>
+            <div class="value">
+              <span>添加</span>
+              <span>办理</span>
+              <span>转交</span>
+            </div>
+          </div>
+          <div class="info">
+            <div class="label">生效身份</div>
+            <div class="value">
+              <span>网格员</span>
+              <span>网格长</span>
+            </div>
+          </div>
+        </div>
+        <div class="info">
+          <div class="label">同级节点网络</div>
+          <div class="value">李凤村子网络（当前选中网格层级生效）</div>
+        </div>
+        <div class="flex">
+          <div class="info">
+            <div class="label">生效功能</div>
+            <div class="value">
+              <span>添加</span>
+              <span>办理</span>
+              <span>转交</span>
+            </div>
+          </div>
+          <div class="info">
+            <div class="label">生效身份</div>
+            <div class="value">
+              <span>网格员</span>
+              <span>网格长</span>
+            </div>
+          </div>
+          <div class="info">
+            <div class="label">条件约束</div>
+            <div class="value">名称约束</div>
+          </div>
+        </div>
+      </div>
+      <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="$refs.form.resetFields()" @onConfirm="onConfirm">
+        <el-form ref="form" :rules="rules" size="small" :model="form" label-width="110px">
+          <el-form-item label="节点类型" prop="name">
+            <ai-select
+              v-model="form.eventStatus"
+              clearable
+              placeholder="请选择..."
+              :selectList="dict.getDict('clapEventStatus')">
+            </ai-select>
+          </el-form-item>
+          <el-form-item label="选择节点网格" prop="idNumber">
+            <ai-select
+              v-model="form.eventStatus"
+              clearable
+              placeholder="请选择..."
+              :selectList="dict.getDict('clapEventStatus')">
+            </ai-select>
+            <el-checkbox v-model="checked">当前选中网格层级生效</el-checkbox>
+          </el-form-item>
+          <el-form-item label="生效功能" prop="status">
+            <el-checkbox-group v-model="checkList">
+              <el-checkbox label="0">添加</el-checkbox>
+              <el-checkbox label="1">办理</el-checkbox>
+              <el-checkbox label="2">转交</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label="生效身份" prop="status">
+            <el-checkbox-group v-model="checkList">
+              <el-checkbox label="0">网格员</el-checkbox>
+              <el-checkbox label="1">网格长</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label="同级节点网格" prop="idNumber">
+            <ai-select
+              v-model="form.eventStatus"
+              clearable
+              placeholder="请选择..."
+              :selectList="dict.getDict('clapEventStatus')">
+            </ai-select>
+            <el-checkbox v-model="checked">当前选中网格层级生效</el-checkbox>
+          </el-form-item>
+          <el-form-item label="生效功能" prop="status">
+            <el-checkbox-group v-model="checkList">
+              <el-checkbox label="0">添加</el-checkbox>
+              <el-checkbox label="1">办理</el-checkbox>
+              <el-checkbox label="2">转交</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label="生效身份" prop="status">
+            <el-checkbox-group v-model="checkList">
+              <el-checkbox label="0">网格员</el-checkbox>
+              <el-checkbox label="1">网格长</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'AppPatrolReportSet',
+    label: '巡查上报设置',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
+    },
+
+    data () {
+      return {
+        dialog: false,
+        dialogTitle: '',
+        form: {
+          eventStatus: ''
+        },
+        checked: false,
+        checkList: ['0', '1']
+      }
+    },
+    computed: {
+      rules() {
+        return {
+          name: [{ required: true, message: '请输入党员姓名', trigger: 'change'}],
+          idNumber: [{ required: true, message: '请选择党员', trigger: 'change'}],
+          status: [{ required: true, message: '请选择缴费状态', trigger: 'change'}],
+          ymd: [{ required: true, message: '请选择缴纳月份', trigger: 'change'}],
+          amount: [{ required: true, message: '请输入金额', trigger: 'blur'}],
+        }
+      },
+    },
+    created() {
+      this.dict.load('clapEventStatus').then(() => {
+
+      })
+    },
+    methods: {
+      add() {
+        this.dialogTitle = '添加节点'
+        this.dialog = true
+      },
+      onConfirm() {
+
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .AppPatrolReportSet {
+    height: 100%;
+    .item {
+      padding: 0 0 4px 26px;
+      position: relative;
+      border-bottom: 1px solid #F2F2F2;
+      .info {
+        height: 22px;
+        font-family: MicrosoftYaHei;
+        font-size: 14px;
+        color: #888;
+        line-height: 22px;
+        margin-bottom: 16px;
+        .label {
+          display: inline-block;
+          width: 112px;
+          color: #888;
+        }
+        .value {
+          display: inline-block;
+          width: calc(100% - 112px);
+          color: #222;
+          span {
+            display: inline-block;
+            margin-right: 24px;
+          }
+        }
+      }
+      .index {
+        position: absolute;
+        top: 0;
+        left: 0;
+        height: 21px;
+        font-family: DINAlternate-Bold;
+        font-weight: 700;
+        font-size: 18px;
+        color: #666;
+      }
+      .btn {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+      .flex {
+        display: flex;
+        .info {
+          width: 33.3%;
+        }
+      }
+    }
+    :deep(.ai-select) {
+      display: inline-block;
+      width: 300px;
+      margin-right: 16px;
+    }
+  }
+</style>

From 86171587a09ca68f2d8970ffe70cbc4f488c9b8f Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 3 Nov 2023 10:30:32 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=8C=BA=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/grid/AppGridBlock/components/add.vue  |  4 +++-
 packages/grid/AppGridBlock/components/list.vue | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/grid/AppGridBlock/components/add.vue b/packages/grid/AppGridBlock/components/add.vue
index df0d1511..f186a2a0 100644
--- a/packages/grid/AppGridBlock/components/add.vue
+++ b/packages/grid/AppGridBlock/components/add.vue
@@ -161,7 +161,9 @@ export default {
           this.instance.post(`/app/appgirdinfo/addOrUpdate`, {
             ...this.forms,
             girdMemberManageList: girdMemberManageList?.map(v => ({wxUserId: v.id})) || [],
-            girdMemberList: girdMemberList?.map(v => ({wxUserId: v.id})) || []
+            girdMemberList: girdMemberList?.map(v => ({wxUserId: v.id})) || [],
+            isCoordination: this.forms.currIndex,
+            coordinationId: this.forms.currIndex == 1 ? this.forms.parentGirdId : null
           }).then((res) => {
             if (res.code == 0) {
               this.cancel(true)
diff --git a/packages/grid/AppGridBlock/components/list.vue b/packages/grid/AppGridBlock/components/list.vue
index 3d5417f0..d5d52358 100644
--- a/packages/grid/AppGridBlock/components/list.vue
+++ b/packages/grid/AppGridBlock/components/list.vue
@@ -85,6 +85,9 @@
             <el-button type="primary" v-if="!treeObj.treeList.length" @click="init">初始化</el-button>
           </template>
         </ai-search-bar>
+        <el-tabs v-model="currIndex" @tab-click="tabChange">
+          <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label"></el-tab-pane>
+        </el-tabs>
         <ai-table
           class="mt10"
           :tableData="tableData"
@@ -178,7 +181,9 @@ export default {
       gridMemberColConfigs: [
         {prop: "name"},
         {prop: "checkType", format: v => v === '1' ? '网格员' : '网格长'}
-      ]
+      ],
+      currIndex: 0,
+      tabs: [{label: '子网格'}, {label: '协同部门'}],
     };
   },
   created() {
@@ -202,12 +207,16 @@ export default {
     }
   },
   methods: {
+    tabChange() {
+      this.page.current = 1
+      this.getList()
+    },
     handleNodeClick(val) {
       this.info = this.$copy(val);
       this.getList();
     },
     getTreeList() {
-      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/listAll4`).then((res) => {
         if (res?.data) {
 
           this.treeObj.treeList = res.data.filter(e => !e.parentGirdId)
@@ -274,7 +283,8 @@ export default {
       }).catch(() => 0);
     },
     getList() {
-      this.instance.post("/app/appgirdinfo/list", null, {
+      var url = this.currIndex == 1 ? `/app/appgirdinfo/listCoordination` : `/app/appgirdinfo/list?isCoordination=0`
+      this.instance.post(url, null, {
         params: {
           ...this.searchObj,
           ...this.page,
@@ -301,7 +311,7 @@ export default {
     toAdd() {
       let {id: parentGirdId, girdName: parentGirdName} = this.info
       this.$router.push({
-        hash: "#add", query: {parentGirdId, parentGirdName}
+        hash: "#add", query: {parentGirdId, parentGirdName, currIndex: this.currIndex}
       })
     },
     goBack() {

From 91701965e95fb6a01443143777c98571de8161f6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 3 Nov 2023 15:59:19 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppPatrolReportSet/AppPatrolReportSet.vue | 373 +++++++++++++-----
 1 file changed, 266 insertions(+), 107 deletions(-)

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
index 4d8febd4..c57664f4 100644
--- a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -1,124 +1,140 @@
 <template>
-  <ai-list class="AppPatrolReportSet">
+  <ai-detail class="AppPatrolReportSet">
     <ai-title slot="title" title="巡查上报设置"  isShowBottomBorder>
       <el-button size="small" type="primary" icon="iconfont iconAdd" slot="rightBtn" @click="add">添加节点</el-button>
     </ai-title>
     <template slot="content">
-      <div class="item">
-        <div class="btn">
-          <el-button type="text">编辑</el-button>
-          <el-button type="text">删除</el-button>
-        </div>
-        <div class="index">01</div>
-        <div class="info">
-          <div class="label">节点类型</div>
-          <div class="value">混合节点</div>
-        </div>
-        <div class="info">
-          <div class="label">上级节点网络</div>
-          <div class="value">混合节点</div>
-        </div>
-        <div class="flex">
+      <div class="list" v-if="list.length">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <div class="btn">
+            <el-button type="text" @click="edit(index)">编辑</el-button>
+            <el-button type="text" @click="del(index)">删除</el-button>
+          </div>
+          <div class="index">{{index < 9 ? `0${index+1}` : `${index+1}`}}</div>
           <div class="info">
-            <div class="label">生效功能</div>
-            <div class="value">
-              <span>添加</span>
-              <span>办理</span>
-              <span>转交</span>
-            </div>
+            <div class="label">节点类型</div>
+            <div class="value">{{item.nodeType == 0 ? '首节点' : $dict.getLabel('prfcNodeType', item.nodeType)}}</div>
           </div>
           <div class="info">
-            <div class="label">生效身份</div>
-            <div class="value">
-              <span>网格员</span>
-              <span>网格长</span>
+            <div class="label">上级节点网络</div>
+            <div class="value">{{item.girdName}}</div>
+          </div>
+          <div class="flex">
+            <div class="info">
+              <div class="label">生效功能</div>
+              <div class="value">
+                <span v-if="item.functionAdd == 1">添加</span>
+                <span v-if="item.functionHandle == 1">办理</span>
+                <span v-if="item.functionTransmit == 1">转交</span>
+              </div>
+            </div>
+            <div class="info">
+              <div class="label">生效身份</div>
+              <div class="value">
+                <span v-if="item.roleAdmin == 1">网格员</span>
+                <span v-if="item.roleMember == 1">网格长</span>
+              </div>
             </div>
           </div>
-        </div>
-        <div class="info">
-          <div class="label">同级节点网络</div>
-          <div class="value">李凤村子网络（当前选中网格层级生效）</div>
-        </div>
-        <div class="flex">
-          <div class="info">
-            <div class="label">生效功能</div>
-            <div class="value">
-              <span>添加</span>
-              <span>办理</span>
-              <span>转交</span>
+
+          <div v-if="item.nodeType == 3">
+            <div class="info">
+              <div class="label">同级节点网络</div>
+              <div class="value">{{item.girdName2}}</div>
             </div>
-          </div>
-          <div class="info">
-            <div class="label">生效身份</div>
-            <div class="value">
-              <span>网格员</span>
-              <span>网格长</span>
+            <div class="flex">
+              <div class="info">
+                <div class="label">生效功能</div>
+                <div class="value">
+                  <span v-if="item.functionAdd == 1">添加</span>
+                  <span v-if="item.functionHandle == 1">办理</span>
+                  <span v-if="item.functionTransmit == 1">转交</span>
+                </div>
+              </div>
+              <div class="info">
+                <div class="label">生效身份</div>
+                <div class="value">
+                  <span v-if="item.roleAdmin == 1">网格员</span>
+                  <span v-if="item.roleMember == 1">网格长</span>
+                </div>
+              </div>
+              <!-- <div class="info">
+                <div class="label">条件约束</div>
+                <div class="value">名称约束</div>
+              </div> -->
             </div>
           </div>
-          <div class="info">
-            <div class="label">条件约束</div>
-            <div class="value">名称约束</div>
-          </div>
         </div>
       </div>
-      <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="$refs.form.resetFields()" @onConfirm="onConfirm">
+      <ai-empty v-else>暂无数据</ai-empty>
+      
+      <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="$refs.form.resetFields()" @onConfirm="onConfirm" width="60%">
         <el-form ref="form" :rules="rules" size="small" :model="form" label-width="110px">
-          <el-form-item label="节点类型" prop="name">
-            <ai-select
-              v-model="form.eventStatus"
+          <el-form-item label="节点类型" prop="nodeType" v-if="form.nodeType === '0'">
+            <ai-select disabled
+              v-model="form.nodeType"
               clearable
               placeholder="请选择..."
-              :selectList="dict.getDict('clapEventStatus')">
+              :selectList="nodeTypeDictList">
             </ai-select>
           </el-form-item>
-          <el-form-item label="选择节点网格" prop="idNumber">
-            <ai-select
-              v-model="form.eventStatus"
+          <el-form-item label="节点类型" prop="nodeType" v-else>
+            <ai-select :disabled="getGirdList.length == 1"
+              v-model="form.nodeType"
               clearable
               placeholder="请选择..."
-              :selectList="dict.getDict('clapEventStatus')">
+              :selectList="dict.getDict('prfcNodeType')" @change="changeNodeType">
             </ai-select>
-            <el-checkbox v-model="checked">当前选中网格层级生效</el-checkbox>
           </el-form-item>
-          <el-form-item label="生效功能" prop="status">
-            <el-checkbox-group v-model="checkList">
-              <el-checkbox label="0">添加</el-checkbox>
-              <el-checkbox label="1">办理</el-checkbox>
-              <el-checkbox label="2">转交</el-checkbox>
-            </el-checkbox-group>
+          <el-form-item label="选择节点网格" prop="girdId" >
+            <ai-picker v-if="form.nodeType === '0'"
+              :ops="{label: 'girdName'}"
+              dialogTitle="选择节点网格"
+              action="/app/appgirdinfo/girdList"
+              :instance="instance"
+              @pick="onGirdChange"
+              v-model="form.girdIdList">
+              <div class="userSelcet">
+                <span style="color: #606266;" v-if="form.girdIdList.length">{{ form.girdName }}</span>
+                <span v-else>选择节点网格</span>
+                <i class="el-icon-arrow-down"></i>
+              </div>
+            </ai-picker>
+            <el-input placeholder="节点网格" v-model="form.girdName" disabled v-else></el-input>
+            <el-checkbox v-model="sameLevelUsed" disabled>当前选中网格层级生效</el-checkbox>
           </el-form-item>
-          <el-form-item label="生效身份" prop="status">
-            <el-checkbox-group v-model="checkList">
-              <el-checkbox label="0">网格员</el-checkbox>
-              <el-checkbox label="1">网格长</el-checkbox>
-            </el-checkbox-group>
+          <el-form-item label="生效功能">
+            <el-checkbox v-model="form.functionAdd" true-label="1" false-label="0">添加</el-checkbox>
+            <el-checkbox v-model="form.functionHandle" true-label="1" false-label="0">办理</el-checkbox>
+            <el-checkbox v-model="form.functionTransmit" true-label="1" false-label="0">转交</el-checkbox>
           </el-form-item>
-          <el-form-item label="同级节点网格" prop="idNumber">
-            <ai-select
-              v-model="form.eventStatus"
-              clearable
-              placeholder="请选择..."
-              :selectList="dict.getDict('clapEventStatus')">
-            </ai-select>
-            <el-checkbox v-model="checked">当前选中网格层级生效</el-checkbox>
-          </el-form-item>
-          <el-form-item label="生效功能" prop="status">
-            <el-checkbox-group v-model="checkList">
-              <el-checkbox label="0">添加</el-checkbox>
-              <el-checkbox label="1">办理</el-checkbox>
-              <el-checkbox label="2">转交</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label="生效身份" prop="status">
-            <el-checkbox-group v-model="checkList">
-              <el-checkbox label="0">网格员</el-checkbox>
-              <el-checkbox label="1">网格长</el-checkbox>
-            </el-checkbox-group>
+          <el-form-item label="生效身份">
+            <el-checkbox v-model="form.roleAdmin" true-label="1" false-label="0">网格员</el-checkbox>
+            <el-checkbox v-model="form.roleMember" true-label="1" false-label="0">网格长</el-checkbox>
           </el-form-item>
+          <div v-if="form.nodeType == 3">
+            <el-form-item label="同级节点网格" prop="girdId2">
+              <el-input placeholder="节点网格" v-model="form.girdName2" disabled></el-input>
+              <el-checkbox v-model="sameLevelUsed" disabled>当前选中网格层级生效</el-checkbox>
+            </el-form-item>
+            <el-form-item label="生效功能">
+              <el-checkbox v-model="form.functionAdd2" true-label="1" false-label="0">添加</el-checkbox>
+              <el-checkbox v-model="form.functionHandle2" true-label="1" false-label="0">办理</el-checkbox>
+              <el-checkbox v-model="form.functionTransmit2" true-label="1" false-label="0">转交</el-checkbox>
+            </el-form-item>
+            <el-form-item label="生效身份">
+              <el-checkbox v-model="form.roleAdmin2" true-label="1" false-label="0">网格员</el-checkbox>
+              <el-checkbox v-model="form.roleMember2" true-label="1" false-label="0">网格长</el-checkbox>
+            </el-form-item>
+          </div>
         </el-form>
       </ai-dialog>
     </template>
-  </ai-list>
+    <template slot="footer">
+      <el-button @click="getList">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
 </template>
 
 <script>
@@ -137,35 +153,157 @@
         dialog: false,
         dialogTitle: '',
         form: {
-          eventStatus: ''
+          nodeType: '', //0：首节点、1：上级、2：同级、3：混合
+          girdIdList: [],
+          girdId: '',
+          girdCode: '',
+          girdLevel: '',
+          girdName: '',
+          functionAdd: '1',
+          functionHandle: '1',
+          functionTransmit: '1',
+          roleAdmin: '1',
+          roleMember: '1',
+          girdId2: '',
+          girdCode2: '',
+          girdLevel2: '',
+          girdName2: '',
+          functionAdd2: '1',
+          functionHandle2: '1',
+          functionTransmit2: '1',
+          roleAdmin2: '1',
+          roleMember2: '1',
         },
-        checked: false,
-        checkList: ['0', '1']
+        list: [],
+        nodeTypeDictList: [{dictName: '首节点', dictValue: '0'}],
+        sameLevelUsed: true,
+        getGirdList: [],
+        editIndex: ''
       }
     },
     computed: {
       rules() {
         return {
-          name: [{ required: true, message: '请输入党员姓名', trigger: 'change'}],
-          idNumber: [{ required: true, message: '请选择党员', trigger: 'change'}],
-          status: [{ required: true, message: '请选择缴费状态', trigger: 'change'}],
-          ymd: [{ required: true, message: '请选择缴纳月份', trigger: 'change'}],
-          amount: [{ required: true, message: '请输入金额', trigger: 'blur'}],
+          nodeType: [{ required: true, message: '请选择节点类型', trigger: 'change'}],
+          girdId: [{ required: true, message: '请选择节点网络', trigger: 'change'}],
+          girdId2: [{ required: true, message: '请选择同级节点网格', trigger: 'change'}],
         }
       },
     },
     created() {
-      this.dict.load('clapEventStatus').then(() => {
-
+      this.dict.load('prfcNodeType').then(() => {
+        this.getList()
       })
     },
     methods: {
       add() {
+        this.form = {
+          nodeType: '', //0：首节点、1：上级、2：同级、3：混合
+          girdIdList: [],
+          girdId: '',
+          girdCode: '',
+          girdLevel: '',
+          girdName: '',
+          functionAdd: '1',
+          functionHandle: '1',
+          functionTransmit: '1',
+          roleAdmin: '1',
+          roleMember: '1',
+          girdId2: '',
+          girdCode2: '',
+          girdLevel2: '',
+          girdName2: '',
+          functionAdd2: '1',
+          functionHandle2: '1',
+          functionTransmit2: '1',
+          roleAdmin2: '1',
+          roleMember2: '1',
+        }
+        if(this.list.length > 0) {
+          this.getGird(this.list.length-1)
+        }else { //首节点
+          this.form.nodeType = '0'
+        }
         this.dialogTitle = '添加节点'
         this.dialog = true
+        this.$refs.form.resetFields()
+      },
+      del(index) {
+        this.$confirm('确定删除该节点？').then(() => {
+          this.list.splice(index, 1)
+        })
+      },
+      edit(index) {
+        this.editIndex = index
+        this.form = {...this.list[index]}
+        if(this.form.nodeType != '0') {
+          this.getGird(index)
+        } 
+        this.dialogTitle = '编辑节点'
+        this.dialog = true
       },
       onConfirm() {
-
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            if(this.dialogTitle == '添加节点') {
+              this.list.push(this.form)
+            }else {
+              this.list.splice(this.editIndex, 1, this.form)
+            }
+            this.dialog = false
+          }
+        })
+      },
+      getList() {
+        this.instance.post(`/app/apppatrolreportflowconfigv2/queryNew`).then(res => {
+          if (res.code == 0) {
+            this.list = res.data
+          }
+        })
+      },
+      onGirdChange(e) {
+        this.form.girdId = e[0].id
+        this.form.girdCode = e[0].girdCode
+        this.form.girdLevel = e[0].girdLevel
+        this.form.girdName = e[0].girdName
+      },
+      changeNodeType(e) { //1 上下级节点取数组0；2同级节点选择数组1; 3混合节点主取数组0，同级选择数组1
+        console.log(e)
+        var arr = []
+        if(e == 1) {
+          arr.push(this.getGirdList[0])
+        }
+        if(e == 2) {
+          arr.push(this.getGirdList[1])
+        }
+        if(e == 3) {
+          arr.push(this.getGirdList[0])
+          this.form.girdId2 = this.getGirdList[1].id
+          this.form.girdCode2 = this.getGirdList[1].girdCode
+          this.form.girdLevel2 = this.getGirdList[1].girdLevel
+          this.form.girdName2 = this.getGirdList[1].girdName
+        }
+        this.onGirdChange(arr)
+      },
+      getGird(index) {
+        var girdCode = this.list[index].girdCode
+        this.instance.post(`app/apppatrolreportflowconfigv2/choiseGird?previousGirdCode=${girdCode}`).then(res => {
+          if (res.code == 0) {
+            this.getGirdList = res.data
+            if(res.data.length == 1 && this.dialogTitle == '添加节点') { //返回数据一条表示nodeType 1 上下级节点；混合节点主去数组0，同级选择数组1；同级节点选择数组1
+              this.form.nodeType = '1'
+              this.onGirdChange(res.data)
+            }
+          }
+        })
+      },
+      confirm() {
+        this.instance.post(`/app/apppatrolreportflowconfigv2/addOrUpdate`, this.list).then(res => {
+          if (res.code == 0) {
+            this.$message.success('提交成功')
+            this.getList()
+          }
+        })
       }
     }
   }
@@ -174,8 +312,12 @@
 <style lang="scss" scoped>
   .AppPatrolReportSet {
     height: 100%;
+    .list {
+      padding: 0 16px 16px;
+      background-color: #fff;
+    }
     .item {
-      padding: 0 0 4px 26px;
+      padding: 16px 0 4px 26px;
       position: relative;
       border-bottom: 1px solid #F2F2F2;
       .info {
@@ -202,7 +344,7 @@
       }
       .index {
         position: absolute;
-        top: 0;
+        top: 16px;
         left: 0;
         height: 21px;
         font-family: DINAlternate-Bold;
@@ -213,7 +355,7 @@
       .btn {
         position: absolute;
         right: 0;
-        top: 0;
+        top: 16px;
       }
       .flex {
         display: flex;
@@ -222,10 +364,27 @@
         }
       }
     }
-    :deep(.ai-select) {
+    :deep(.ai-select),
+    :deep(.el-input) {
       display: inline-block;
-      width: 300px;
+      width: 50%;
       margin-right: 16px;
     }
+    :deep(.AiPicker) {
+      display: inline-block;
+      width: 50%;
+      margin-right: 16px;
+      border: 1px solid #d0d4dc;
+      padding-left: 16px;
+      box-sizing: border-box;
+      border-radius: 4px;
+      position: relative;
+      .el-icon-arrow-down {
+        position: absolute;
+        top: 8px;
+        right: 8px;
+      }
+    }
+    
   }
 </style>

From ec8da1829869702438609b524d9d56cbc6f1e938 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 3 Nov 2023 16:06:48 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
index c57664f4..9cbc7410 100644
--- a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -79,7 +79,7 @@
             </ai-select>
           </el-form-item>
           <el-form-item label="节点类型" prop="nodeType" v-else>
-            <ai-select :disabled="getGirdList.length == 1"
+            <ai-select :disabled="getGirdList.length == 1 && form.nodeType == '1'"
               v-model="form.nodeType"
               clearable
               placeholder="请选择..."
@@ -131,7 +131,7 @@
       </ai-dialog>
     </template>
     <template slot="footer">
-      <el-button @click="getList">取消</el-button>
+      <el-button @click="getList">返回</el-button>
       <el-button type="primary" @click="confirm">提交</el-button>
     </template>
   </ai-detail>
@@ -237,7 +237,7 @@
         this.editIndex = index
         this.form = {...this.list[index]}
         if(this.form.nodeType != '0') {
-          this.getGird(index)
+          this.getGird(index-1)
         } 
         this.dialogTitle = '编辑节点'
         this.dialog = true

From a2519d82a2120126bdb8965f49d6896ccf90dae7 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 6 Nov 2023 15:27:54 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=8C=BA=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/grid/AppGridBlock/components/add.vue  | 4 +++-
 packages/grid/AppGridBlock/components/list.vue | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/grid/AppGridBlock/components/add.vue b/packages/grid/AppGridBlock/components/add.vue
index f186a2a0..4bf64b47 100644
--- a/packages/grid/AppGridBlock/components/add.vue
+++ b/packages/grid/AppGridBlock/components/add.vue
@@ -163,7 +163,9 @@ export default {
             girdMemberManageList: girdMemberManageList?.map(v => ({wxUserId: v.id})) || [],
             girdMemberList: girdMemberList?.map(v => ({wxUserId: v.id})) || [],
             isCoordination: this.forms.currIndex,
-            coordinationId: this.forms.currIndex == 1 ? this.forms.parentGirdId : null
+            coordinationId: this.forms.currIndex == 1 ? this.forms.parentGirdId : null,
+            parentGirdId: this.forms.currIndex == 1 ? this.forms.coordinationId : this.forms.parentGirdId,
+            parentGirdName: this.forms.currIndex == 1 ? this.forms.coordinationName : this.forms.parentGirdName
           }).then((res) => {
             if (res.code == 0) {
               this.cancel(true)
diff --git a/packages/grid/AppGridBlock/components/list.vue b/packages/grid/AppGridBlock/components/list.vue
index d5d52358..29a201a3 100644
--- a/packages/grid/AppGridBlock/components/list.vue
+++ b/packages/grid/AppGridBlock/components/list.vue
@@ -310,8 +310,10 @@ export default {
     },
     toAdd() {
       let {id: parentGirdId, girdName: parentGirdName} = this.info
+      var coordinationId = this.info.parentGirdId
+      var coordinationName = this.info.parentGirdName
       this.$router.push({
-        hash: "#add", query: {parentGirdId, parentGirdName, currIndex: this.currIndex}
+        hash: "#add", query: {parentGirdId, parentGirdName, coordinationId, coordinationName, currIndex: this.currIndex}
       })
     },
     goBack() {

From 9307452a14c812080cd674708bc0e490f34680d0 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 6 Nov 2023 15:36:13 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
index 9cbc7410..03bd65e3 100644
--- a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -68,7 +68,7 @@
       </div>
       <ai-empty v-else>暂无数据</ai-empty>
       
-      <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="$refs.form.resetFields()" @onConfirm="onConfirm" width="60%">
+      <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="$refs.form.resetFields()" @onConfirm="onConfirm" width="70%">
         <el-form ref="form" :rules="rules" size="small" :model="form" label-width="110px">
           <el-form-item label="节点类型" prop="nodeType" v-if="form.nodeType === '0'">
             <ai-select disabled
@@ -102,6 +102,7 @@
             </ai-picker>
             <el-input placeholder="节点网格" v-model="form.girdName" disabled v-else></el-input>
             <el-checkbox v-model="sameLevelUsed" disabled>当前选中网格层级生效</el-checkbox>
+            <el-checkbox v-model="form.onlyCoordination" v-if="form.nodeType == '2'">仅协同部门</el-checkbox>
           </el-form-item>
           <el-form-item label="生效功能">
             <el-checkbox v-model="form.functionAdd" true-label="1" false-label="0">添加</el-checkbox>
@@ -116,6 +117,7 @@
             <el-form-item label="同级节点网格" prop="girdId2">
               <el-input placeholder="节点网格" v-model="form.girdName2" disabled></el-input>
               <el-checkbox v-model="sameLevelUsed" disabled>当前选中网格层级生效</el-checkbox>
+              <el-checkbox v-model="form.onlyCoordination" v-if="form.nodeType == '3'">仅协同部门</el-checkbox>
             </el-form-item>
             <el-form-item label="生效功能">
               <el-checkbox v-model="form.functionAdd2" true-label="1" false-label="0">添加</el-checkbox>
@@ -173,6 +175,7 @@
           functionTransmit2: '1',
           roleAdmin2: '1',
           roleMember2: '1',
+          onlyCoordination: false
         },
         list: [],
         nodeTypeDictList: [{dictName: '首节点', dictValue: '0'}],
@@ -218,6 +221,7 @@
           functionTransmit2: '1',
           roleAdmin2: '1',
           roleMember2: '1',
+          onlyCoordination: false
         }
         if(this.list.length > 0) {
           this.getGird(this.list.length-1)

From 10ae557ad07580012fd3e1a0629da3d8e48cd4e5 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Tue, 7 Nov 2023 14:18:28 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEventReporting/AppEventReporting.vue   |  55 ++
 .../AppEventReporting/components/Detail.vue   | 592 ++++++++++++++++++
 .../AppEventReporting/components/List.vue     | 249 ++++++++
 .../AppEventReporting/components/Setting.vue  | 178 ++++++
 4 files changed, 1074 insertions(+)
 create mode 100644 packages/conv/AppEventReporting/AppEventReporting.vue
 create mode 100644 packages/conv/AppEventReporting/components/Detail.vue
 create mode 100644 packages/conv/AppEventReporting/components/List.vue
 create mode 100644 packages/conv/AppEventReporting/components/Setting.vue

diff --git a/packages/conv/AppEventReporting/AppEventReporting.vue b/packages/conv/AppEventReporting/AppEventReporting.vue
new file mode 100644
index 00000000..c5f5b8e5
--- /dev/null
+++ b/packages/conv/AppEventReporting/AppEventReporting.vue
@@ -0,0 +1,55 @@
+<template>
+  <section class="AppEventReporting">
+    <component ref="component" :is="currentPage" @change="onChange" :params="params" :instance="instance" :dict="dict" :menuName="menuName" />
+  </section>
+</template>
+
+<script>
+import List from './components/List'
+import Detail from './components/Detail'
+import Setting from './components/Setting'
+
+export default {
+  name: 'AppEventReporting',
+  label: '巡查上报',
+
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: '巡查上报'}
+  },
+
+  data() {
+    return {
+      component: 'List',
+      params: {}
+    }
+  },
+  computed: {
+    currentPage() {
+      let {hash, query: {id}} = this.$route
+      return hash == "#Setting" ? Setting :
+          !!id ? Detail : List
+    }
+  },
+  components: {
+    List,
+    Detail,
+    Setting
+  },
+
+  methods: {
+    onChange(data) {
+      this.$router.push({query: data.params, hash: data.type == "Setting" ? "#Setting" : ""})
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.AppEventReporting {
+  height: 100%;
+  background: #F3F6F9;
+  overflow: auto;
+}
+</style>
diff --git a/packages/conv/AppEventReporting/components/Detail.vue b/packages/conv/AppEventReporting/components/Detail.vue
new file mode 100644
index 00000000..f29a7320
--- /dev/null
+++ b/packages/conv/AppEventReporting/components/Detail.vue
@@ -0,0 +1,592 @@
+<template>
+  <ai-detail class="reportAtWillDetail" v-loading="isLoading">
+    <template #title>
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+        <template #rightBtn>
+          <div class="title-btns">
+            <el-button type="primary" icon="iconfont iconPerson_Transfered" @click="isShowForward = true" v-if="detail.powerTransmit">指派事件</el-button>
+            <el-button type="primary" icon="iconfont iconRegister" @click="isShowAdd = true" v-if="detail.powerHandle">处理事件</el-button>
+          </div>
+        </template>
+      </ai-title>
+    </template>
+    <template #content>
+      <div class="detail-content__wrapper">
+        <div class="detail-content__wrapper--left">
+          <ai-card title="基础信息">
+            <template #content>
+              <ai-wrapper>
+                <ai-info-item label="上报人员" :value="detail.name"></ai-info-item>
+                <ai-info-item label="当前状态" :value="dict.getLabel('clapEventStatus', detail.eventStatus)"></ai-info-item>
+                <ai-info-item label="联系方式">{{ detail.phone }}</ai-info-item>
+                <ai-info-item label="上报时间">{{ detail.createTime }}</ai-info-item>
+                <ai-info-item label="事件来源">{{ dict.getLabel('residentEventSource', detail.eventSource) }}</ai-info-item>
+                <ai-info-item label="事件类型">{{ detail.groupName }}</ai-info-item>
+                <ai-info-item label="事件描述" isLine>{{ detail.content }}</ai-info-item>
+                <ai-info-item label="现场照片" isLine>
+                  <ai-uploader :instance="instance" disabled v-model="detail.files"></ai-uploader>
+                </ai-info-item>
+                <ai-info-item label="所属网格">{{ detail.girdName }}</ai-info-item>
+                <ai-info-item label="事件位置" isLine>
+                  <div id="map" style="width: 500px; height: 280px;"></div>
+                </ai-info-item>
+              </ai-wrapper>
+            </template>
+          </ai-card>
+          <ai-evaluation v-if="!!detail.id" :bid="detail.id" :info.sync="evaluation"/>
+        </div>
+        <div class="rightZone">
+          <ai-card title="办理进度">
+            <template #content>
+              <el-steps direction="vertical" :active="1">
+                <el-step
+                    v-for="(item, i) in process"
+                    :key="i"
+                    :title="item.systemExplain"
+                    :description="item.doTime">
+                  <template #title>
+                    <h2 class="step-title" style="font-weight: 500; font-size: 14px;">
+                      {{ item.systemExplain }}
+                    </h2>
+                  </template>
+                  <template #description>
+                    <p style="color: #888; margin: 0 4px 10px 0; font-size: 14px;">{{ item.doTime }}</p>
+                    <div style="color: #444;margin-bottom: 10px;" v-if="item.doExplain">{{ item.doExplain }}</div>
+                    <ai-uploader :instance="instance" disabled v-model="item.files"></ai-uploader>
+                  </template>
+                </el-step>
+              </el-steps>
+            </template>
+          </ai-card>
+        </div>
+      </div>
+      <ai-dialog
+          :visible.sync="isShowAdd"
+          width="800px"
+          title="事件处理"
+          @closed="onClose"
+          @onConfirm="handleEvent">
+        <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+          <el-form-item label="事件分类" prop="groupId" style="width: 100%;" :rules="[{ required: true, message: '请选择事件分类' }]">
+            <ai-select
+                v-model="form.groupId"
+                placeholder="请选择事件分类"
+                :selectList="dictList">
+            </ai-select>
+          </el-form-item>
+          <el-form-item label="处理结果" prop="eventStatus" style="width: 100%;" :rules="[{ required: true, message: '请选择处理结果' }]">
+            <el-radio-group v-model="form.eventStatus">
+              <el-radio label="1">已办结</el-radio>
+              <el-radio label="0">已拒绝</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="处理意见" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入处理意见' }]">
+            <el-input type="textarea" :rows="5" :maxlength="500" v-model="form.content" clearable placeholder="请输入处理意见" show-word-limit></el-input>
+          </el-form-item>
+          <el-form-item label="图片" prop="files" style="width: 100%;">
+            <ai-uploader
+                :instance="instance"
+                isShowTip
+                v-model="form.files"
+                :limit="9">
+            </ai-uploader>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+      <ai-dialog
+          :visible.sync="isShowForward"
+          width="800px"
+          @close="onClose"
+          title="事件指派"
+          @onConfirm="onForwardConfirm">
+        <el-form class="ai-form" label-width="120px" :model="forwardForm" ref="forwardForm">
+          <el-form-item label="转交" prop="name" style="width: 100%;" :rules="[{ required: true, message: '请选择网格员或网格' }]">
+            <el-input disabled size="small" v-model="forwardForm.name" clearable placeholder="请选择网格员或网格">
+              <template slot="append">
+                <el-button @click="getGirdList().then(()=>isShowUser=true )">选择</el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="办理意见" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入办理意见' }]">
+            <el-input type="textarea" :rows="5" :maxlength="500" v-model="forwardForm.content" clearable placeholder="请输入办理意见" show-word-limit></el-input>
+          </el-form-item>
+          <el-form-item label="图片" prop="files" style="width: 100%;">
+            <ai-uploader
+                :instance="instance"
+                v-model="forwardForm.files"
+                isShowTip
+                :limit="9">
+            </ai-uploader>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+      <ai-dialog
+          :visible.sync="isShowUser"
+          width="800px"
+          title="选择网格员"
+          @onConfirm="onConfirm">
+        <div class="grid-wrapper">
+          <el-input
+              style="margin-bottom: 10px;"
+              size="small"
+              placeholder="请输入网格名称/网格员姓名/网格员电话"
+              v-model="name" @change="$refs.tree.filter(name)"
+              suffix-icon="iconfont iconSearch">
+          </el-input>
+          <el-tree
+              :filter-node-method="filterNode"
+              ref="tree"
+              :props="defaultProps"
+              node-key="id"
+              :data="tree"
+              highlight-current
+              @current-change="onTreeChange">
+            <div class="tree-container" slot-scope="{ data }">
+              <div class="tree-container__user">
+                <div class="tree-user__item">
+                  <span v-if="!data.isUser">{{ data.girdName }}</span>
+                  <span v-else>{{data.name}}<span v-if="data.phone">-{{data.phone}}</span></span>
+                </div>
+              </div>
+            </div>
+          </el-tree>
+        </div>
+      </ai-dialog>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+import AMapLoader from '@amap/amap-jsapi-loader'
+import {mapState} from 'vuex'
+
+export default {
+  name: 'Detail',
+  props: ['dict', 'instance'],
+
+  data() {
+    return {
+      forwardForm: {
+        content: '',
+        girdId: '',
+        girdName: '',
+        girdMemberId: '',
+        girdMemberName: '',
+        name: ''
+      },
+      isLoading: true,
+      name: '',
+      detail: {},
+      isShowUser: false,
+      eventList: [],
+      isShowAdd: false,
+      userList: [],
+      processList: [],
+      dictList: [],
+      defaultProps: {
+        label: 'girdName'
+      },
+      isShowForward: false,
+      tree: [],
+      gridInfo: {},
+      form: {
+        files: [],
+        groupId: '',
+        groupName: '',
+        content: [],
+        eventStatus: '1'
+      },
+      evaluation: {}
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+    process: v => [v.evaluation.id ? {
+      systemExplain: `${v.evaluation.createUserName}完成评价 (${v.evaluation.score}星评价)`,
+      doTime: v.evaluation.createTime,
+      doExplain: v.evaluation.rateText,
+    } : null, v.processList].flat().filter(Boolean)
+  },
+
+  created() {
+    this.getDict()
+    this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
+      this.getDetail()
+    })
+  },
+
+  methods: {
+    getDetail() {
+      this.instance.post('/app/apppatrolreportinfov2/queryDetailById', null, {
+        params: {id: this.$route.query.id}
+      }).then(res => {
+        if (res?.data) {
+          this.detail = res.data
+          this.processList = res.data.processList
+          this.form.groupId = res.data.groupId
+
+          this.$nextTick(() => {
+            this.initMap()
+          })
+          this.isLoading = false
+        }
+      }).catch(() => {
+        this.isLoading = false
+      })
+    },
+
+    getGirdList() {
+      return this.instance.post(`/app/apppatrolreportinfov2/listGirdInfoByTransfer?id=${this.$route.query.id}`).then(res => {
+        if (res?.data) {
+          // return this.tree = this.formatList([res.data])
+          this.tree = res.data
+          this.tree.map((item) => {
+            item.children = [item.girdMemberList?.map(e => ({
+              ...e, isUser: true, girdName: item.girdName
+            })) || []].flat()
+          })
+        }
+      })
+    },
+
+    onClose() {
+      this.form.files = []
+      this.form.groupId = ''
+      this.form.groupName = ''
+      this.form.content = ''
+      this.form.eventStatus = ''
+      this.forwardForm.content = ''
+      this.forwardForm.girdId = ''
+      this.forwardForm.girdName = ''
+      this.forwardForm.girdMemberId = ''
+      this.forwardForm.girdMemberName = ''
+      this.forwardForm.name = ''
+      this.forwardForm.files = []
+    },
+
+    formatList(list) {
+      for (let item of list) {
+        item.children = [item.girdList, item.girdMemberList?.map(e => ({
+          ...e, isUser: true, girdName: item.girdName,
+          girdId: item.id
+        })) || []].flat()
+        if (item.girdList?.length > 0) {
+          this.formatList(item.girdList)
+        }
+      }
+      return list
+    },
+
+    filterNode(value, data) {
+      if (!value) return true
+
+      return (data.girdName && data.girdName.indexOf(value) !== -1) || (data.name && data.name.indexOf(value) !== -1) || (data.name && data.phone.indexOf(value) !== -1)
+    },
+
+    onTreeChange(e) {
+      this.gridInfo = e
+    },
+
+    onForwardConfirm() {
+      this.$refs.forwardForm.validate(v => {
+        if (v) {
+          this.instance.post('/app/apppatrolreportinfov2/transfer', {
+            ...this.forwardForm,
+            id: this.$route.query.id
+          }).then(res => {
+            if (res?.code == 0) {
+              this.isShowForward = false
+              this.onClose()
+              this.getDetail()
+              this.$message.success('转交成功!')
+            }
+          })
+        }
+      })
+    },
+
+    onConfirm() {
+      // if (this.gridInfo.userId) {
+      //   this.forwardForm.girdId = this.gridInfo.girdId
+      //   this.forwardForm.girdName = this.gridInfo.girdName
+      //   this.forwardForm.girdMemberId = this.gridInfo.id
+      //   this.forwardForm.girdMemberName = this.gridInfo.name
+      // } else {
+      //   this.forwardForm.girdId = this.gridInfo.id
+      // }
+      // this.forwardForm.girdName = this.gridInfo.girdName
+      // this.forwardForm.name = `${this.gridInfo.girdName}${this.gridInfo.name ? '-' + this.gridInfo.name : ''}`
+      // this.isShowUser = false
+      if(!this.gridInfo.userId) {
+        return this.$message.error('请选择网格员!')
+      } 
+      this.forwardForm.girdId = this.gridInfo.girdId
+      this.forwardForm.girdName = this.gridInfo.girdName
+      this.forwardForm.girdMemberId = this.gridInfo.id
+      this.forwardForm.girdMemberName = this.gridInfo.name
+      this.forwardForm.name = `${this.gridInfo.girdName}${this.gridInfo.name ? '-' + this.gridInfo.name : ''}`
+      this.isShowUser = false
+    },
+    getDict() {
+      this.instance.post(`/app/apppatrolreportgroupv2/list?current=1&size=100000`).then(res => {
+        if (res.code == 0) {
+          this.dictList = res.data.records.map(v => {
+            return {
+              dictValue: v.id,
+              dictName: v.groupName
+            }
+          })
+        }
+      })
+    },
+
+    close() {
+      this.$confirm('确定关闭该事件？').then(() => {
+        this.instance.post(`/app/apppatrolreportinfov2/delete?ids=${this.$route.query.id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getList()
+          }
+        })
+      })
+    },
+
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'list',
+        isRefresh: !!isRefresh
+      })
+    },
+
+    initMap() {
+      let {lng, lat} = this.detail
+      let center = [lng, lat]
+      AMapLoader.load({
+        key: 'b553334ba34f7ac3cd09df9bc8b539dc',
+        version: '2.0'
+      }).then(AMap => {
+        let map = new AMap.Map('map', {
+          center,
+          zoom: 14
+        })
+        let marker = new AMap.Marker({
+          position: new AMap.LngLat(lng, lat),
+          title: this.detail.address
+        })
+        map.add(marker)
+      })
+    },
+
+    handleEvent() {
+      this.$refs.form.validate(v => {
+        if (v) {
+          this.instance.post('/app/apppatrolreportinfov2/finish', {
+            ...this.form,
+            groupName: this.dictList.filter(v => v.dictValue === this.form.groupId)[0].dictName,
+            id: this.$route.query.id
+          }).then(res => {
+            if (res?.code == 0) {
+              this.isShowAdd = false
+              this.getDetail()
+              this.$message.success('处理成功!')
+            }
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.reportAtWillDetail {
+  height: 100%;
+
+  .grid-wrapper {
+    min-height: 360px;
+  }
+
+  .title-btns {
+    display: flex;
+    align-items: center;
+  }
+
+  :deep( .el-tree ) {
+    background: transparent;
+
+    .el-tree-node__expand-icon.is-leaf {
+      color: transparent !important;
+    }
+
+    .el-tree-node__content > .el-tree-node__expand-icon {
+      padding: 4px;
+    }
+
+    .el-tree-node__content {
+      height: 32px;
+    }
+
+    .el-tree__empty-text {
+      color: #222;
+      font-size: 14px;
+    }
+
+    .el-tree-node__children .el-tree-node__content {
+      height: 32px;
+    }
+
+    .el-tree-node__content:hover {
+      background: #E8EFFF;
+      color: #222222;
+      border-radius: 2px;
+    }
+
+    .is-current > .el-tree-node__content {
+      &:hover {
+        background: #2266FF;
+        color: #fff;
+      }
+
+      background: #2266FF;
+
+      span {
+        color: #fff;
+      }
+    }
+  }
+
+  .el-steps {
+    :deep( .el-step__icon ) {
+      font-size: 12px;
+      color: #555555;
+      border-color: #d0d4dc;
+    }
+
+    :deep( .el-step__head.is-finish ) {
+      .el-step__icon.is-text {
+        border: none;
+        color: #fff;
+        font-size: 12px;
+        background: #2266ff;
+      }
+    }
+
+    :deep( .el-step__line ) {
+      background-color: #d0d4dc;
+    }
+  }
+
+  .imgs {
+    font-size: 0;
+
+    img {
+      width: 108px;
+      height: 108px;
+      margin-right: 4px;
+      margin-bottom: 4px;
+      cursor: pointer;
+      user-select: none;
+
+      &:hover {
+        opacity: 0.8;
+      }
+
+      &:nth-of-type(2n) {
+        margin-right: 0;
+      }
+    }
+  }
+
+  :deep( .report-dialog ) {
+    .el-select {
+      width: 100%;
+    }
+  }
+
+  :deep( .el-step__head.is-process ) {
+    color: #555;
+    border-color: #555;
+  }
+
+  :deep( .is-finish h2 ) {
+    color: #2266ff;
+  }
+
+  .step-title {
+    color: #555;
+  }
+
+  .detail-content__wrapper {
+    display: flex;
+    width: 100%;
+    flex-wrap: wrap;
+
+    .detail-content__wrapper--left {
+      flex: 1;
+      margin-right: 20px;
+    }
+  }
+
+  :deep( .ai-detail__content ) {
+    background: #f3f6f9;
+
+    .ai-detail__content--wrapper {
+      display: flex;
+      gap: 16px;
+      width: 100%;
+      max-width: 100%;
+      padding: 16px;
+      box-sizing: border-box;
+
+      & > .el-card {
+        flex: 1;
+        min-width: 0;
+      }
+
+      .rightZone {
+        width: 400px;
+        flex-shrink: 0;
+        display: flex;
+        flex-direction: column;
+        gap: 16px;
+      }
+    }
+  }
+
+  :deep( .el-card ) {
+    .el-card__header {
+      padding: 12px 16px;
+      font-weight: bold;
+    }
+
+    .el-card__body {
+      padding: 8px;
+    }
+
+    #amap {
+      width: 466px;
+      height: 232px;
+    }
+
+    .el-steps {
+      margin-left: 8px;
+    }
+
+    .imgFormItem > .el-form-item__content {
+      display: flex;
+      gap: 16px;
+      flex-wrap: wrap;
+
+      &:before {
+        content: none;
+      }
+
+      .el-image__inner {
+        width: 82px;
+        height: 82px;
+      }
+    }
+  }
+}
+</style>
diff --git a/packages/conv/AppEventReporting/components/List.vue b/packages/conv/AppEventReporting/components/List.vue
new file mode 100644
index 00000000..a5bc9f41
--- /dev/null
+++ b/packages/conv/AppEventReporting/components/List.vue
@@ -0,0 +1,249 @@
+<template>
+  <ai-list>
+    <template #title>
+      <ai-title :title="menuName" isShowBottomBorder>
+        <el-button type="primary" slot="rightBtn" @click="toSetting">事件类型设置</el-button>
+      </ai-title>
+    </template>
+    <template #content>
+      <ai-search-bar>
+        <template #left>
+          <ai-select
+            v-model="search.eventStatus"
+            clearable
+            placeholder="处理状态"
+            :selectList="dict.getDict('clapEventStatus')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <ai-select
+            v-model="search.eventSource"
+            clearable
+            placeholder="事件来源"
+            :selectList="dict.getDict('residentEventSource')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <ai-select
+            v-model="search.groupId"
+            clearable
+            placeholder="事件类型"
+            :selectList="typeList"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <el-cascader ref="cascader1" v-model="girdArr" :options="girdOptions" placeholder="所属网格" size="small"
+            :props="defaultProps" :show-all-levels="false" @change="gridChange" clearable></el-cascader>
+          <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+        </template>
+        <template #right>
+          <ai-download :instance="instance" url="/app/apppatrolreportinfov2/export" :params="search" fileName="巡查上报"
+                       :disabled="tableData.length == 0">
+            <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
+          </ai-download>
+          <el-input
+              v-model="search.content"
+              class="search-input"
+              size="small"
+              v-throttle="() => {search.current = 1, getList()}"
+              placeholder="请输入内容描述/上报人员/联系方式"
+              clearable
+              @change="getList"
+              @clear="search.current = 1, search.content = '', getList()"
+              suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table :tableData="tableData" :colConfigs="colConfigs" :total="total" :current.sync="search.current" :size.sync="search.size" @getList="getList">
+        <el-table-column slot="options" label="操作" fixed="right" width="120" align="center">
+          <div class="table-options" slot-scope="{row}">
+            <el-button type="text" title="详情" @click="toDetail(row.id)">详情</el-button>
+            <el-button type="text" title="删除" @click="handleDelete(row.id)">删除</el-button>
+          </div>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: 'List',
+  label: "巡查上报",
+
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: String
+  },
+
+  data() {
+    return {
+      userList: [],
+      search: {
+        current: 1,
+        size: 10,
+        eventStatus: '',
+        content: '',
+        eventSource: '',
+        groupId: '',
+        createTimeStart: '',
+        createTimeEnd: '',
+        girdId: ''
+      },
+      total: 0,
+      tableData: [],
+      content: '',
+      id: '',
+      girdId: '',
+      girdArr: [],
+      girdOptions: [],
+      defaultProps: {
+        label: 'girdName',
+        value: 'id',
+        children: 'children',
+        checkStrictly: true,
+      },
+      searchDotime: [],
+      typeList: []
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+
+    colConfigs() {
+      return [
+        {prop: 'content', label: '内容描述', width: '300px'},
+        {prop: 'eventSource', label: '事件来源', align: 'center', dict: 'residentEventSource'},
+        {prop: 'groupName', label: '事件类型', align: 'center'},
+        {prop: 'girdName', label: '所属网格', align: 'center'},
+        {prop: 'createTime', label: '上报时间', align: 'center'},
+        {prop: 'name', label: '上报人员', align: 'center'},
+        {prop: 'phone', label: '联系方式', align: 'center'},
+        {prop: 'eventStatus', label: '处理状态', align: 'center', format: v => this.dict.getLabel('clapEventStatus', v)},
+        {prop: 'processTime', label: '处理时长', align: 'center'},
+        {slot: 'options'}
+      ]
+    },
+
+    handleStatusOps() {
+      return this.dict.getDict("reportAtWillHandleStatus").map(e => ({label: e.dictName, value: e.dictValue}))
+    }
+  },
+
+  created() {
+    this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
+      this.getList()
+      this.getGridList()
+      this.getTypeList()
+    })
+  },
+
+  methods: {
+    timeChange() {
+      if (this.searchDotime) {
+        this.search.createTimeStart = this.searchDotime[0]
+        this.search.createTimeEnd = this.searchDotime[1]
+      } else {
+        this.search.createTimeStart = null
+        this.search.createTimeEnd = null
+      }
+      this.search.current = 1
+      this.getList()
+    },
+    // 所有网格
+    getGridList() {
+      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
+        if (res?.code == 0) {
+          this.girdOptions = this.toTree(res.data)
+        }
+      })
+    },
+    // 转树形结构
+    toTree(data) {
+      let result = [];
+      if (!Array.isArray(data)) {
+        return result
+      }
+      let map = {};
+      data.forEach(item => {
+        map[item.id] = item;
+      });
+      data.forEach(item => {
+        let parent = map[item.parentGirdId];
+        if (parent) {
+          (parent.children || (parent.children = [])).push(item);
+        } else {
+          result.push(item);
+        }
+      });
+      return result;
+    },
+    gridChange(val) {
+      this.girdArr = val
+      this.search.girdId = val?.[val.length - 1]
+      this.$refs.cascader1.dropDownVisible = false;
+      this.search.current = 1
+      this.getList()
+    },
+    getList() {
+      this.instance.post(`/app/apppatrolreportinfov2/list`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    toDetail(id) {
+      this.$emit('change', {
+        type: 'Detail',
+        params: {
+          id: id || ''
+        }
+      })
+    },
+
+    toSetting() {
+      this.$emit('change', {
+        type: 'Setting',
+        params: {
+          id: ''
+        }
+      })
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要进行删除?").then(() => {
+        this.instance.post("/app/apppatrolreportinfov2/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!")
+            this.getList()
+          }
+        })
+      }).catch(() => 0)
+    },
+    getTypeList() {
+      this.instance.post(`/app/apppatrolreportgroupv2/list?size=10000`).then(res => {
+        if (res.code == 0) {
+          res.data.records.map((item) => {
+            item.dictName = item.groupName
+            item.dictValue = item.id
+          })
+          this.typeList = res.data.records
+        }
+      })
+    }
+  },
+  
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/packages/conv/AppEventReporting/components/Setting.vue b/packages/conv/AppEventReporting/components/Setting.vue
new file mode 100644
index 00000000..b00ec1db
--- /dev/null
+++ b/packages/conv/AppEventReporting/components/Setting.vue
@@ -0,0 +1,178 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title  isShowBack isShowBottomBorder title="事件类型" @onBackClick="cancel(false)"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="isShowAdd = true">添加事件类型</el-button>
+        </template>
+        <template slot="right">
+          <el-input
+            v-model="search.groupName"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, getList()}"
+            placeholder="请输入事件类型名称"
+            clearable
+            @change="getList"
+            @clear="search.current = 1, search.groupName = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 6px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="tags" label="标签">
+          <template slot-scope="{ row }">
+            <div class="table-tags">
+              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+          <div class="table-options" slot-scope="{ row }">
+            <el-button type="text" @click="edit(row)">编辑</el-button>
+            <el-button type="text" @click="remove(row.id)">删除</el-button>
+          </div>
+        </el-table-column>
+      </ai-table>
+      <ai-dialog
+        :visible.sync="isShowAdd"
+        width="780px"
+        height="580px"
+        :title="id ? '编辑事件类型' : '添加事件类型'"
+        @close="onClose"
+        @onConfirm="onConfirm">
+        <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
+          <el-form-item label="事件类型" prop="groupName" style="width: 100%;" :rules="[{ required: true, message: '请输入事件类型名称', trigger: 'blur' }]">
+            <el-input size="small" :maxlength="10" show-word-limit placeholder="请输入事件类型名称" v-model="form.groupName"></el-input>
+          </el-form-item>
+          <el-form-item label="排序" prop="showIndex" style="width: 100%;" :rules="[{ required: true, message: '请输入排序', trigger: 'blur' }]">
+            <el-input-number size="small" v-model="form.showIndex" :min="1" :max="100" label="请输入排序"></el-input-number>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          groupName: ''
+        },
+        form: {
+          groupName: '',
+          showIndex: ''
+        },
+        id: '',
+        isShowAdd: false,
+        total: 0,
+        colConfigs: [
+          {prop: 'groupName', label: '事件类型', align: 'left'},
+          {prop: 'showIndex', label: '排序', align: 'center'},
+          {slot: 'options', label: '操作'}
+        ],
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    mounted() {
+      this.getList()
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/apppatrolreportgroupv2/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      edit (e) {
+        this.id = e.id
+        this.form.groupName = e.groupName
+        this.form.showIndex = ''
+
+        this.$nextTick(() => {
+          this.isShowAdd = true
+        })
+      },
+
+      onClose () {
+        this.id = ''
+        this.form.showIndex = ''
+        this.form.groupName = ''
+      },
+
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/apppatrolreportgroupv2/addOrUpdate`, {
+              ...this.form,
+              id: this.id || null
+            }).then(res => {
+              if (res.code === 0) {
+                this.$message.success('添加成功')
+                this.isShowAdd = false
+
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/apppatrolreportgroupv2/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+</style>

From 3473d09885e0375c783ffad67f4daef787df77e8 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 8 Nov 2023 09:31:03 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
index 03bd65e3..127e3e81 100644
--- a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -102,7 +102,7 @@
             </ai-picker>
             <el-input placeholder="节点网格" v-model="form.girdName" disabled v-else></el-input>
             <el-checkbox v-model="sameLevelUsed" disabled>当前选中网格层级生效</el-checkbox>
-            <el-checkbox v-model="form.onlyCoordination" v-if="form.nodeType == '2'">仅协同部门</el-checkbox>
+            <el-checkbox v-model="form.onlyCoordination" v-if="form.nodeType == '2'" true-label="1" false-label="0">仅协同部门</el-checkbox>
           </el-form-item>
           <el-form-item label="生效功能">
             <el-checkbox v-model="form.functionAdd" true-label="1" false-label="0">添加</el-checkbox>
@@ -117,7 +117,7 @@
             <el-form-item label="同级节点网格" prop="girdId2">
               <el-input placeholder="节点网格" v-model="form.girdName2" disabled></el-input>
               <el-checkbox v-model="sameLevelUsed" disabled>当前选中网格层级生效</el-checkbox>
-              <el-checkbox v-model="form.onlyCoordination" v-if="form.nodeType == '3'">仅协同部门</el-checkbox>
+              <el-checkbox v-model="form.onlyCoordination" v-if="form.nodeType == '3'" true-label="1" false-label="0">仅协同部门</el-checkbox>
             </el-form-item>
             <el-form-item label="生效功能">
               <el-checkbox v-model="form.functionAdd2" true-label="1" false-label="0">添加</el-checkbox>
@@ -175,7 +175,7 @@
           functionTransmit2: '1',
           roleAdmin2: '1',
           roleMember2: '1',
-          onlyCoordination: false
+          onlyCoordination: '1'
         },
         list: [],
         nodeTypeDictList: [{dictName: '首节点', dictValue: '0'}],
@@ -221,7 +221,7 @@
           functionTransmit2: '1',
           roleAdmin2: '1',
           roleMember2: '1',
-          onlyCoordination: false
+          onlyCoordination: '1'
         }
         if(this.list.length > 0) {
           this.getGird(this.list.length-1)

From 63d85b5c5b8b25b8d21316addebfabed86c208a6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 8 Nov 2023 10:45:48 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=B8=89=E4=BC=9A=E4=B8=80=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/party/AppMeetingChinaunion/components/add.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/party/AppMeetingChinaunion/components/add.vue b/packages/party/AppMeetingChinaunion/components/add.vue
index 03afaedf..e6b0ed88 100644
--- a/packages/party/AppMeetingChinaunion/components/add.vue
+++ b/packages/party/AppMeetingChinaunion/components/add.vue
@@ -317,11 +317,11 @@ export default {
     }
     const startTimePass = (rule, value, callback) => {
       if (value) {
-        if (moment(value).unix() - moment(new Date()).unix() > 0) {
-          callback()
-        } else {
-          callback(new Error('开始时间要大于当前时间'));
-        }
+        // if (moment(value).unix() - moment(new Date()).unix() > 0) {
+        //   callback()
+        // } else {
+        //   callback(new Error('开始时间要大于当前时间'));
+        // }
       } else {
         callback(new Error('请填写开始时间'));
       }

From 0c3dab491f1f37f0273e14f891723ca1d229c9ce Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 8 Nov 2023 11:20:40 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
index 127e3e81..e3f93547 100644
--- a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -110,8 +110,8 @@
             <el-checkbox v-model="form.functionTransmit" true-label="1" false-label="0">转交</el-checkbox>
           </el-form-item>
           <el-form-item label="生效身份">
-            <el-checkbox v-model="form.roleAdmin" true-label="1" false-label="0">网格员</el-checkbox>
-            <el-checkbox v-model="form.roleMember" true-label="1" false-label="0">网格长</el-checkbox>
+            <el-checkbox v-model="form.roleMember" true-label="1" false-label="0">网格员</el-checkbox>
+            <el-checkbox v-model="form.roleAdmin" true-label="1" false-label="0">网格长</el-checkbox>
           </el-form-item>
           <div v-if="form.nodeType == 3">
             <el-form-item label="同级节点网格" prop="girdId2">
@@ -125,8 +125,8 @@
               <el-checkbox v-model="form.functionTransmit2" true-label="1" false-label="0">转交</el-checkbox>
             </el-form-item>
             <el-form-item label="生效身份">
-              <el-checkbox v-model="form.roleAdmin2" true-label="1" false-label="0">网格员</el-checkbox>
-              <el-checkbox v-model="form.roleMember2" true-label="1" false-label="0">网格长</el-checkbox>
+              <el-checkbox v-model="form.rroleMember2" true-label="1" false-label="0">网格员</el-checkbox>
+              <el-checkbox v-model="form.oleAdmin2" true-label="1" false-label="0">网格长</el-checkbox>
             </el-form-item>
           </div>
         </el-form>

From 0aaa71aa29b7389be95d0596c77f42d73a7b6c85 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 8 Nov 2023 11:33:28 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppPatrolReportSet/AppPatrolReportSet.vue  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
index e3f93547..7b2726d7 100644
--- a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -31,8 +31,8 @@
             <div class="info">
               <div class="label">生效身份</div>
               <div class="value">
-                <span v-if="item.roleAdmin == 1">网格员</span>
-                <span v-if="item.roleMember == 1">网格长</span>
+                <span v-if="item.roleMember == 1">网格员</span>
+                <span v-if="item.roleAdmin == 1">网格长</span>
               </div>
             </div>
           </div>
@@ -46,16 +46,16 @@
               <div class="info">
                 <div class="label">生效功能</div>
                 <div class="value">
-                  <span v-if="item.functionAdd == 1">添加</span>
-                  <span v-if="item.functionHandle == 1">办理</span>
-                  <span v-if="item.functionTransmit == 1">转交</span>
+                  <span v-if="item.functionAdd2 == 1">添加</span>
+                  <span v-if="item.functionHandle2 == 1">办理</span>
+                  <span v-if="item.functionTransmit2 == 1">转交</span>
                 </div>
               </div>
               <div class="info">
                 <div class="label">生效身份</div>
                 <div class="value">
-                  <span v-if="item.roleAdmin == 1">网格员</span>
-                  <span v-if="item.roleMember == 1">网格长</span>
+                  <span v-if="item.roleMember2 == 1">网格员</span>
+                  <span v-if="item.roleAdmin2 == 1">网格长</span>
                 </div>
               </div>
               <!-- <div class="info">
@@ -125,8 +125,8 @@
               <el-checkbox v-model="form.functionTransmit2" true-label="1" false-label="0">转交</el-checkbox>
             </el-form-item>
             <el-form-item label="生效身份">
-              <el-checkbox v-model="form.rroleMember2" true-label="1" false-label="0">网格员</el-checkbox>
-              <el-checkbox v-model="form.oleAdmin2" true-label="1" false-label="0">网格长</el-checkbox>
+              <el-checkbox v-model="form.roleMember2" true-label="1" false-label="0">网格员</el-checkbox>
+              <el-checkbox v-model="form.roleAdmin2" true-label="1" false-label="0">网格长</el-checkbox>
             </el-form-item>
           </div>
         </el-form>

From acb6393f7d70f2f53fdc2a7f4cf3cc6548bd4f4c Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 8 Nov 2023 11:48:40 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
index 7b2726d7..919dbe32 100644
--- a/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
+++ b/packages/conv/AppPatrolReportSet/AppPatrolReportSet.vue
@@ -17,7 +17,7 @@
           </div>
           <div class="info">
             <div class="label">上级节点网络</div>
-            <div class="value">{{item.girdName}}</div>
+            <div class="value">{{item.girdName}}<span class="span" v-if="item.nodeType == 2 && item.onlyCoordination == '1'">仅协同部门</span></div>
           </div>
           <div class="flex">
             <div class="info">
@@ -40,7 +40,7 @@
           <div v-if="item.nodeType == 3">
             <div class="info">
               <div class="label">同级节点网络</div>
-              <div class="value">{{item.girdName2}}</div>
+              <div class="value">{{item.girdName2}}<span class="span" v-if="item.nodeType == 3 && item.onlyCoordination == '1'">仅协同部门</span></div>
             </div>
             <div class="flex">
               <div class="info">
@@ -344,6 +344,9 @@
             display: inline-block;
             margin-right: 24px;
           }
+          .span {
+            margin-left: 16px;
+          }
         }
       }
       .index {