Merge remote-tracking branch 'origin/dev' into dev

2022-08-10 16:59:09 +08:00
parent c5b2b233b2 36e189f569
commit bf1348fa63
3 changed files with 251 additions and 60 deletions
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
@@ -34,7 +34,7 @@
      <template #content>
        <ai-search-bar>
          <template #left>
-            <el-select size="small" style="width: 200px;margin-left: 16px;" v-model="search.girdId" placeholder="类型" clearable
+            <el-select size="small" style="width: 200px;" v-model="search.girdId" placeholder="类型" clearable
                      @change="getListInit()">
              <el-option
                  v-for="(item,i) in girdList"
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -5,21 +5,12 @@
        <ai-search-bar>
          <template #left>
            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="dialog = true">批量调整积分</el-button>
-            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="toDetail('')">跳转详情</el-button>
-            <el-select size="small" style="width: 200px;" v-model="search.girdId" placeholder="所属网格" clearable
-                      @change="getListInit()">
-              <el-option
-                  v-for="(item,i) in girdList"
-                  :key="i"
-                  :label="item.girdName"
-                  :value="item.id"
-              >
-              </el-option>
-            </el-select>
+            <el-cascader ref="cascader1" clearable v-model="search.girdId" :options="girdOptions" placeholder="所属网格" size="small" 
+              :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
          </template>
          <template #right>
-            <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.name" clearable
-              @clear="page.current = 1, search.name = '', getTableData()" suffix-icon="iconfont iconSearch"
+            <el-input size="small" placeholder="请输入居民名称或真实姓名" v-model="search.userName" clearable
+              @clear="page.current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
              v-throttle="() => {(page.current = 1), getTableData();}"/>
            <ai-download :instance="instance" url="" :params="search" fileName="网格员积分"
                         :disabled="tableData.length == 0">
@@ -32,7 +23,7 @@
          <el-table-column slot="options" label="操作"  align="center">
            <template slot-scope="{ row }">
              <el-button type="text" @click="dialog = true">调整积分</el-button>
-              <el-button type="text" @click="toAdd(row.id)">详情</el-button>
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
            </template>
          </el-table-column>
        </ai-table>
@@ -48,8 +39,8 @@
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="选择人员" prop="residentId">
          <ai-person-select :instance="instance" :customClicker="true"
-                            :url="'/app/appresident/list?areaId=' + user.info.areaId"
-                            :isMultiple="false" dialogTitle="选择" @selectPerson="selectPerson">
+                            :url="'/app/appgirdmemberinfo/list?size=10'"
+                            :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson">
            <template name="option" v-slot:option="{ item }">
              <span class="iconfont iconProlife">{{ item.name }}</span>
              <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
@@ -61,17 +52,13 @@
                    maxlength="100"></el-input>
        </el-form-item>
        <el-form-item label="上传凭证">
-          <el-row>
-            <el-radio v-model="radio" label="1">图片</el-radio>
-            <el-radio v-model="radio" label="2">附件</el-radio>
-          </el-row>
-          <ai-uploader :instance="instance" isWechat v-model="form.files" :limit="1" url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
+          <ai-uploader :instance="instance" fileType="file" v-model="form.enclosure" :limit="1"></ai-uploader>
        </el-form-item>
        <el-form-item label="类型" prop="integralCalcType">
-          <!-- <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')"/> -->
+          <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')"/>
        </el-form-item>
-        <el-form-item label="积分" prop="changeIntegral">
-          <el-input v-model.trim="form.changeIntegral" placeholder="请输入正数" size="small"></el-input>
+        <el-form-item label="积分" prop="integral">
+          <el-input v-model.trim="form.integral" placeholder="请输入正数" size="small"></el-input>
        </el-form-item>
      </el-form>
    </ai-dialog>
@@ -92,8 +79,7 @@ export default {
  data() {
    return {
      search: {
-        current: 1,
-        name: '',
+        userName: '',
        girdId: '',
      },
      tableData: [],
@@ -101,24 +87,40 @@ export default {
      girdList: [],
      
      form: {
-
+        ids: [],
+        eventDesc: "",  
+        enclosure: [],   // 附件
+        integralCalcType: "",
+        integral: 0,
      },
      personList: [],
      dialog: false,
-      radio: ''
+      girdOptions: [],
+      defaultProps: {
+        label: 'girdName',
+        value: 'id',
+        checkStrictly: true,
+        expandTrigger: 'hover',
+      },
    }
  },
  created() {
-    // this.$dict.load('integralCalcType')
+    this.$dict.load('integralCalcType')
+    this.getTableData()
+    this.getGridList()
+  },
+  watch: {
+    gridChange() {}
  },
  computed: {
    ...mapState(['user']),
    colConfigs() {
      return [
-        { prop: "", label: '姓名', align: "left",  },
-        { prop: "", label: '所属网格', align: "center",  },
-        { prop: "", label: '积分余额', align: "center", },
-        { prop: "", label: '累计积分', align: "center", },
+        { prop: "userName", label: '姓名', align: "left",  },
+        { prop: "girdName", label: '所属网格', align: "center",  },
+        { prop: "integral", label: '积分余额', align: "center", },
+        { prop: "totalIntegral", label: '累计积分', align: "center", },
+        { prop: "usedIntegral", label: '已用积分', align: "center", },
        { slot: "options" },
      ]
    },
@@ -127,26 +129,87 @@ export default {
        residentId: [{required: true, message: '请选择人员', trigger: 'blur'},],
        eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'},],
        integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'},],
-        changeIntegral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}],
+        integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}],
      }
    },
  },
  methods: {
-    getTableData() {},
-    getListInit() {
-      this.search.current = 1
-      this.getList()
-    },
-    selectPerson(val) {
-      if (val) {
-        this.form.residentId = val.id
-        this.personList = [{...val}]
-      } else {
-        this.form.residentId = ""
-        this.personList = []
+    getTableData() {
+      this.instance.post(`/app/appintegraluser/integralManager`,null,{
+        params: {
+          ...this.page,
+          ...this.search,
        }
+      }).then(res => {
+        if(res?.data) {
+          this.tableData = res.data.records
+          this.page.total = res.data.total
+        }
+      })
    },
-    onConfirm() {},
+
+    selectPerson(val) {
+      this.personList = val
+      this.form.ids = this.personList.map(e => e.id)
+      // if (val) {
+      //   this.form.residentId = val.id
+      //   this.personList = [{...val}]
+      // } else {
+      //   this.form.residentId = ""
+      //   this.personList = []
+      // }
+    },
+    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.search.girdId = val?.[val.length - 1]
+      this.$refs.cascader1.dropDownVisible = false;
+      this.getTableData()
+    },
+
+    onConfirm() {
+      this.instance.post(`/app/appintegraluser/changeIntegral`,{
+        ids: this.form.ids,
+        eventDesc: this.form.eventDesc,  
+        enclosure: this.form.enclosure?.[0].url,   // 附件
+        integralCalcType: this.form.integralCalcType,
+        integral: this.form.integral,
+      }).then(res => {
+        if(res.code == 0) {
+          this.$message.success('调整积分成功')
+          this.getTableData()
+          this.dialog = false
+        }
+      })
+    },
+
    toDetail(id) {
      this.$emit('change', {
        type: 'gridScoreDetail',
--- a/project/dv/apps/components/PdGrid.vue
+++ b/project/dv/apps/components/PdGrid.vue
@@ -1,39 +1,60 @@
 <template>
-  <div class="pdgird">
-    <div class="pdgird-title">
+  <div class="pdgrid" @click="isShowGrid1 = false">
+    <div class="pdgrid-title">
      <h2>幸福郫都微网实格架构</h2>
    </div>
-    <div class="pdgird-body">
-      <div class="pdgird-body__item">
+    <div class="pdgrid-grid__title">
+      <h2>郫都某街道</h2>
+    </div>
+    <div class="pdgrid-body">
+      <div class="pdgrid-body__item">
        <h2>240</h2>
        <p>多层网格</p>
      </div>
-      <div class="pdgird-body__item">
+      <div class="pdgrid-body__item" @click.stop="isShowGrid1 = true">
        <h2>240</h2>
        <p>第一网格</p>
      </div>
-      <div class="pdgird-body__item">
+      <div class="pdgrid-body__item">
        <h2>240</h2>
        <p>微网格</p>
      </div>
    </div>
+    <transition name="fade">
+      <div class="grid-dialog" v-show="isShowGrid1">
+        <div class="mask"></div>
+        <div class="grid-container">
+          <h2>已选择的网格</h2>
+          <div class="grid-list">
+            <div
+              :class="[currIndex1 === index ? 'grid-active' : '']"
+              v-for="(item, index) in 20"
+              :key="index"
+              @click.stop="currIndex1 = index">
+              幸福郫都微网实格架构
+            </div>
+          </div>
+        </div>
+      </div>
+    </transition>
  </div>
 </template>

 <script>
  export default {
-    name: 'pdgird',
+    name: 'pdgrid',

    data () {
      return {
-
+        isShowGrid1: false,
+        currIndex1: 0
      }
    }
  }
 </script>

 <style lang="scss">
-  .pdgird {
+  .pdgrid {
    position: relative;
    width: 100%;
    height: 100%;
@@ -42,11 +63,40 @@
    background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/middle-bg.png) no-repeat center;
    background-size: contain;

+    .fade-enter-active, .fade-leave-active {
+      transition: opacity .3s ease-in-out;
+    }
+    .fade-enter, .fade-leave-to {
+      opacity: 0;
+    }
+
    * {
      box-sizing: border-box;
    }

-    .pdgird-title {
+    .pdgrid-grid__title {
+      position: absolute;
+      top: 40px;
+      left: 50%;
+      width: 271px;
+      height: 53px;
+      line-height: 53px;
+      text-align: center;
+      background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/grid-title-sbg.png) no-repeat center;
+      background-size: 100% 100%;
+      transform: translateX(-50%);
+
+      h2 {
+        color: #FFFFFF;
+        font-size: 21px;
+        text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
+        background: #fff;
+        -webkit-background-clip: text;
+        -webkit-text-fill-color: transparent;
+      }
+    }
+
+    .pdgrid-title {
      position: absolute;
      top: 220px;
      left: 50%;
@@ -68,24 +118,30 @@
      }
    }

-    .pdgird-body {
+    .pdgrid-body {
      display: flex;
      position: absolute;
      justify-content: space-between;
-      bottom: 220px;
+      bottom: 200px;
      left: 0;
      width: 100%;
      padding: 0 112px;

-      .pdgird-body__item {
+      .pdgrid-body__item {
        display: flex;
        flex-direction: column;
        width: 200px;
        height: 187px;
        align-items: center;
        padding-top: 71px;
+        cursor: pointer;
        background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/item-bg.png) no-repeat center;
        background-size: 100% 100%;
+        transition: opacity ease 0.3s;
+
+        &:hover {
+          opacity: 0.8;
+        }

        &:nth-of-type(2) {
          position: relative;
@@ -112,5 +168,77 @@
        }
      }
    }
+
+    .grid-dialog {
+      position: fixed;
+      top: 0;
+      left: 0;
+      z-index: 111;
+      width: 100%;
+      height: 100%;
+
+      & > .mask {
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 1;
+        width: 100%;
+        height: 100%;
+        background: rgba(0, 0, 0, 0.4);
+      }
+
+      .grid-container {
+        display: flex;
+        position: absolute;
+        flex-direction: column;
+        left: 50%;
+        top: 50%;
+        z-index: 2;
+        width: 640px;
+        height: 640px;
+        background: rgba(7,13,41,0.9);
+        border: 1px solid #144662;
+        transform: translate(-50%, -50%);
+
+        & > h2 {
+          width: 100%;
+          height: 67px;
+          line-height: 67px;
+          text-align: center;
+          color: #FFFFFF;
+          font-size: 27px;
+          text-shadow: 0px 0px 13px rgb(59 182 255 / 80%);
+          background: url(https://cdn.cunwuyun.cn/dvcp/dv/pddv/grid-title-bg.png) no-repeat center;
+          background-size: 100% 100%;
+        }
+
+        .grid-list {
+          flex: 1;
+          overflow-y: auto;
+
+          & > div {
+            height: 67px;
+            line-height: 67px;
+            text-align: center;
+            color: #FFFFFF;
+            font-size: 27px;
+            cursor: pointer;
+            transition: all ease 0.5s;
+
+            &.grid-active {
+              background: linear-gradient(270deg, rgba(0,48,124,0) 0%, #00307C 16%, rgba(0,99,255,0.9100) 50%, rgba(0,48,124,0.8200) 87%, rgba(0,48,124,0) 100%);
+              box-shadow: inset 0px -1px 0px 0px rgba(16,34,54,1);
+              text-shadow: 0px 3px 5px rgba(0,0,0,0.5000);
+            }
+
+            &:hover {
+              background: linear-gradient(270deg, rgba(0,48,124,0) 0%, #00307C 16%, rgba(0,99,255,0.9100) 50%, rgba(0,48,124,0.8200) 87%, rgba(0,48,124,0) 100%);
+              box-shadow: inset 0px -1px 0px 0px rgba(16,34,54,1);
+              text-shadow: 0px 3px 5px rgba(0,0,0,0.5000);
+            }
+          }
+        }
+      }
+    }
  }
 </style>