积分商城

project/pidu/app/AppGoods/AppGoods.vue

@@ -8,7 +8,7 @@
 
 <script>
   import List from './components/List'
-  import Detail from './components/Detail'
+  import Add from './components/Add'
 
   export default {
     name: 'AppGoods',
@@ -28,14 +28,14 @@
     },
 
     components: {
-      Detail,
+      Add,
       List
     },
 
     methods: {
       onChange (data) {
-        if (data.type === 'Detail') {
+        if (data.type === 'Add') {
-          this.component = 'Detail'
+          this.component = 'Add'
           this.params = data.params
         }
 

project/pidu/app/AppGoods/components/Add.vue

@@ -0,0 +1,134 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form :model="form" label-width="120px" ref="form">
+            <el-form-item label="标题" prop="title" :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
+              <el-input type="input" v-model="form.title" clearable placeholder="请输入..." maxlength="30" show-word-limit></el-input>
+            </el-form-item>
+            <el-form-item prop="areaId" label="发布地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
+              <ai-area-select clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+            </el-form-item>
+            <el-form-item label="正文" prop="content" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
+              <ai-editor v-model="form.content" :instance="instance"/>
+            </el-form-item>
+            <el-form-item label="缩略图" prop="thumbUrl">
+              <ai-uploader
+                :instance="instance"
+                isShowTip
+                v-model="form.thumbUrl"
+                :limit="1"
+                :cropOps="cropOps"
+                is-crop>
+                <template slot="tips">
+                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
+                  <p>图片比例：1.6：1</p>
+                </template>
+              </ai-uploader>
+            </el-form-item>
+          </el-form>
+        </template>
+      </ai-card>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'Add',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object,
+      menuName: String
+    },
+
+    data () {
+      return {
+        info: {},
+        form: {
+          title: '',
+          content: '',
+          areaId: '',
+          createUnitName: '',
+          createUserName: '',
+          status: '',
+          thumbUrl: []
+        },
+        cropOps: {
+          width: "336px",
+          height: "210px"
+        },
+        id: ''
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+      pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
+    },
+
+    created () {
+      this.form.areaId = this.user.info.areaId
+      this.disabledLevel = this.user.info.areaList.length
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+          }
+        })
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+              ...this.form,
+              type: 5,
+              createUserName: this.user.info.name,
+              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
+                url: this.form.thumbUrl[0].url
+              }]) : ''
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功')
+                setTimeout(() => {
+                  this.cancel(true)
+                }, 600)
+              }
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>

project/pidu/app/AppGoods/components/Detail.vue

@@ -1,188 +0,0 @@
- <template>
-  <ai-detail isHasSidebar v-loading="isLoading">
-    <template slot="title">
-      <ai-title title="返乡报备详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
-      </ai-title>
-    </template>
-    <template slot="content">
-      <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
-      <div v-show="currIndex === 0">
-        <ai-card title="基本信息" v-show="currIndex === 0">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
-              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
-              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
-              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
-              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
-              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="行程信息">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="出发时间" :value="info.startTime"></ai-info-item>
-              <ai-info-item label="出发地" >
-                <span  :style="{color: info.denger == 1 ? '#FF4466' : '#333'}">{{info.startAreaName}} </span>
-              </ai-info-item>
-              <ai-info-item label="出发地详址" isLine :value="info.startAddress"></ai-info-item>
-              <ai-info-item label="出行方式" :value="info.travelTypeNames"></ai-info-item>
-              <ai-info-item label="车次/航班" isLine :value="info.trainNo"></ai-info-item>
-              <ai-info-item label="行程描述" :value="info.description"></ai-info-item>
-              <ai-info-item label="抵平卡口" :value="info.gatewayName"></ai-info-item>
-              <ai-info-item label="抵平时间" :value="info.arriveTime"></ai-info-item>
-              <ai-info-item label="目的地" :value="info.arriveAreaName"></ai-info-item>
-              <ai-info-item label="目的地详址" isLine :value="info.arriveAddress"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="健康状况">
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="是否有风险旅居史" v-if="info.fromHighRiskArea === '1'">
-                <span style="color: red">{{ info.highRiskAreaName }}</span>
-              </ai-info-item>
-              <ai-info-item label="是否有风险旅居史" v-else value="否"></ai-info-item>
-              <ai-info-item label="7天内是否接触新冠确诊或疑似患者">
-                <span :style="{color: info.contactPatients === '1' ? 'red' : ''}">{{ dict.getLabel('yesOrNo', info.contactPatients) }}</span>
-              </ai-info-item>
-              <ai-info-item label="当前健康状况" v-if="info.abnormalHealth === '1'">
-                <span style="color: red">{{ dict.getLabel('EP_abnormalType', info.abnormalType) }}</span>
-              </ai-info-item>
-              <ai-info-item label="当前健康状况" v-else value="否"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-      </div>
-      <div v-show="currIndex === 1">
-        <ai-card title="风险处置">
-          <template #right>
-            <el-button type="primary" v-if="info.status === '0'" @click="release">解除异常</el-button>
-          </template>
-          <template #content>
-            <ai-wrapper
-              label-width="120px">
-              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
-              <ai-info-item label="填报时间" :value="info.createTime"></ai-info-item>
-              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
-              <ai-info-item label="手机号码" :value="info.phone"></ai-info-item>
-              <ai-info-item label="人员类别" :value="dict.getLabel('EP_registerPersonType', info.type)"></ai-info-item>
-              <ai-info-item label="是否从事高危行业" :value="dict.getLabel('EP_highRiskIndustries', info.highRiskIndustries)"></ai-info-item>
-            </ai-wrapper>
-          </template>
-        </ai-card>
-        <ai-card title="风险处理意见">
-          <template #content>
-            <ai-table
-              :isShowPagination="false"
-              tableSize="small"
-              border
-              :tableData="info.riskDisposalList"
-              :col-configs="colConfigs"
-              @getList="() => {}">
-            </ai-table>
-          </template>
-        </ai-card>
-        <ai-card title="社区初排" v-if="info.cmAdvanceDisposal">
-          <template #content>
-            <ai-wrapper
-              style="margin-bottom: 20px;"
-              label-width="120px">
-              <ai-info-item label="处置意见" :value="dict.getLabel('EP_communityHandleType', info.cmAdvanceDisposal.communityHandleType)"></ai-info-item>
-              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="居家状态" :value="dict.getLabel('EP_homeStatus2', info.cmAdvanceDisposal.homeStatus)"></ai-info-item>
-              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离时间" :value="info.cmAdvanceDisposal.quarantineBeginTime + ' - ' + info.cmAdvanceDisposal.quarantineEndTime"></ai-info-item>
-              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="隔离策略" :value="dict.getLabel('EP_quarantineStrategy', info.cmAdvanceDisposal.quarantineStrategy)"></ai-info-item>
-              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="管控方式" :value="dict.getLabel('EP_controlMethod', info.cmAdvanceDisposal.controlMethod)"></ai-info-item>
-              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '1'" label="图片" isLine>
-                <ai-uploader
-                  :instance="instance"
-                  :value="info.cmAdvanceDisposal.fileList"
-                  disabled
-                  :limit="9">
-                </ai-uploader>
-              </ai-info-item>
-              <ai-info-item v-if="info.cmAdvanceDisposal.communityHandleType === '2'" label="风险解除证明文件" isLine>
-                <ai-uploader
-                  :instance="instance"
-                  :value="info.cmAdvanceDisposal.proveFileList"
-                  disabled
-                  :limit="9">
-                </ai-uploader>
-              </ai-info-item>
-            </ai-wrapper>
-            <ai-empty style="margin-bottom: 60px;" v-if="!info.cmAdvanceDisposal"></ai-empty>
-          </template>
-        </ai-card>
-      </div>
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-  export default {
-    name: 'Detail',
-
-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
-    },
-
-    data () {
-      return {
-        info: {},
-        isShow: false,
-        currIndex: 0,
-        isLoading: false,
-        tableData: [],
-        colConfigs: [
-          {prop: 'remarks', label: '异常记录', align: 'center' },
-          {prop: 'createTime', label: '创建时间', align: 'center'},
-          {prop: 'createUserName', label: '记录人', align: 'center' }
-        ],
-        tabList: ['基本信息', '风险处置']
-      }
-    },
-
-    created () {
-      this.isLoading = true
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-        this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => {
-          this.getInfo(this.params.id)
-        })
-      }
-    },
-
-    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            this.info.travelTypeNames = res.data.travelType.split(',').map(v => {
-              return this.dict.getLabel('EP_travelType', v)
-            }).join('，')
-          }
-
-          this.isLoading = false
-        }).catch(() => {
-          this.isLoading = false
-        })
-      },
-
-      cancel () {
-        this.$emit('change', {
-          type: 'List',
-          isRefresh: true
-        })
-      }
-    }
-  }
-</script>
-
-<style scoped lang="scss">
-</style>

project/pidu/app/AppGoods/components/List.vue

@@ -1,43 +1,25 @@
 <template>
   <ai-list class="list">
-    <ai-title slot="title" title="商品管理" isShowBottomBorder :instance="instance" v-if="search.arriveAreaId" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
+    <ai-title slot="title" title="商品管理" isShowBottomBorder>
+      <template #sub>
+        <span>添加的商品即可在积分超市中下单兑换</span>
+      </template>
+    </ai-title>
     <template slot="content">
-      <div class="statistics-top">
-        <div class="statistics-top__item">
-          <span>登记人数</span>
-          <h2 style="color: #2266FF;">{{ info['登记人数'] }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>今日新增返乡</span>
-          <h2 style="color: #22AA99;">{{ info['今日新增返乡'] }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>风险人数</span>
-          <h2 style="color: #F8B425">{{ info['风险人数'] }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>今日风险人数</span>
-          <h2 style="color: red">{{ info['今日风险人数'] }}</h2>
-        </div>
-        <div class="statistics-top__item">
-          <span>风险处理</span>
-          <h2 style="color: red">{{ info['风险处理'] }}</h2>
-        </div>
-      </div>
-      <div class="content">
       <ai-search-bar bottomBorder>
         <template #left>
-            <ai-select
+          <ai-user-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
-              v-model="search.riskStatus"
+            <div class="userSelcet">
-              clearable
+              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
-              placeholder="请选择风险状态"
+              <span v-else>兑换人</span>
-              :selectList="dict.getDict('EP_riskStatus')"
+              <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
-              @change="search.current = 1, getList()">
+              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
-            </ai-select>
+            </div>
+          </ai-user-selecter>
           <ai-select
             v-model="search.source"
             clearable
-              placeholder="请选择数据来源"
+            placeholder="请选择订单状态"
             :selectList="dict.getDict('EP_source')"
             @change="search.current = 1, getList()">
           </ai-select>
@@ -46,7 +28,7 @@
             type="date"
             size="small"
             value-format="yyyy-MM-dd"
-              placeholder="选择开始日期"
+            placeholder="选择兑换开始日期"
             @change="search.current = 1, getList()">
           </el-date-picker>
           <el-date-picker
@@ -54,18 +36,15 @@
             type="date"
             size="small"
             value-format="yyyy-MM-dd"
-              placeholder="选择结束日期"
+            placeholder="选择兑换结束日期"
             @change="search.current = 1, getList()">
           </el-date-picker>
-            <ai-download :instance="instance" url="/app/appepidemicpreventionregisterinfo/export" :params="search" fileName="返乡报备" :disabled="tableData.length == 0">
-              <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
-            </ai-download>
         </template>
         <template #right>
           <el-input
             v-model="search.name"
             size="small"
-              placeholder="请输入姓名、手机号"
+            placeholder="请输入商品名称"
             clearable
             v-throttle="() => {search.current = 1, getList()}"
             @clear="search.current = 1, search.name = '', getList()"
@@ -73,6 +52,13 @@
           </el-input>
         </template>
       </ai-search-bar>
+      <ai-search-bar style="margin-top: 12px" bottomBorder>
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加商品</el-button>
+        </template>
+        <template #right>
+        </template>
+      </ai-search-bar>
       <ai-table
         :tableData="tableData"
         :col-configs="colConfigs"
@@ -82,7 +68,13 @@
         :current.sync="search.current"
         :size.sync="search.size"
         @getList="getList">
-          <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+        <el-table-column slot="goods" width="240px" label="商品" align="left">
+          <template slot-scope="{ row }">
+            <div class="goods">
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="100px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
@@ -91,13 +83,11 @@
           </template>
         </el-table-column>
       </ai-table>
-      </div>
     </template>
   </ai-list>
 </template>
 
 <script>
-  import { mapState } from 'vuex'
   export default {
     name: 'List',
 
@@ -112,40 +102,24 @@
           current: 1,
           size: 10,
           name: '',
-          gatewayId: '',
+          createUserId: ''
-          status: '',
-          riskStatus: '',
-          arriveAreaId: '',
-          queryBeginTime: '',
-          queryEndTime: '',
-          infoType: 1,
-          source: ''
         },
+        name: '',
         info: {},
         colConfigs: [
-          { prop: 'name', label: '姓名' },
+          { slot: 'goods', label: '商品' },
-          { prop: 'phone', align: 'center', label: '手机号码' },
+          { prop: 'phone', align: 'center', label: '单价/数量' },
-          { prop: 'startTime', align: 'center', label: '出发时间' },
+          { prop: 'startTime', align: 'center', label: '消耗积分' },
-          { prop: 'startAreaName', align: 'center', label: '出发地区' },
+          { prop: 'startAreaName', align: 'center', label: '兑换人' },
           {
             prop: 'arriveTime',
             align: 'center',
-            label: '抵平时间'
+            label: '兑换时间'
           },
           {
             prop: 'arriveAreaName',
             align: 'center',
-            label: '到达地区'
+            label: '状态'
-          },
-          { prop: 'source',
-            align: 'center',
-            label: '数据来源',
-            formart: v => this.dict.getLabel('EP_source', v) },
-          {
-            prop: 'riskStatus',
-            align: 'center',
-            label: '风险状态',
-            formart: v => this.dict.getLabel('EP_riskStatus', v)
           }
         ],
         ids: [],
@@ -156,23 +130,10 @@
       }
     },
 
-    computed: {
-      ...mapState(['user'])
-    },
-
     created () {
-      this.disabledLevel = this.user.info.areaList.length - 1
-      this.loading = true
-
-      this.instance.post(`/app/appdvcpconfig/getCorpArea`).then(res => {
-        if (res.code == 0) {
-          this.search.arriveAreaId = res.data
-          this.getTotalInfo()
       this.dict.load(['EP_riskLevel', 'EP_handleType', 'modeType', 'EP_riskStatus', 'EP_source']).then(() => {
         this.getList()
       })
-        }
-      })
     },
 
     methods: {
@@ -188,57 +149,28 @@
           if (res.code == 0) {
             this.tableData = res.data.records
             this.total = res.data.total
-            this.loading = false
-          } else {
-            this.loading = false
           }
-        }).catch(() => {
-          this.loading = false
         })
       },
 
-      toDetail (id) {
+      toAdd (id) {
         this.$emit('change', {
-          type: 'Detail',
+          type: 'Add',
           params: {
             id: id || ''
           }
         })
       },
 
-      changeArea () {
-        this.search.current = 1
-
-        this.$nextTick(() => {
-          this.getList()
-          this.getTotalInfo()
-        })
-      },
-
       remove (id) {
         this.$confirm('确定删除该数据？').then(() => {
           this.instance.post(`/app/appepidemicpreventionregisterinfo/delete?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
-              this.getTotalInfo()
               this.getList()
             }
           })
         })
-      },
-
-
-      getTotalInfo () {
-        this.instance.post(`/app/appepidemicpreventionregisterinfo/listStatistics`, null, {
-          params: {
-            areaId: this.search.arriveAreaId,
-            infoType: 1
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.info = res.data
-          }
-        })
       }
     }
   }
@@ -246,50 +178,47 @@
 
 <style scoped lang="scss">
   .list {
-    ::v-deep .ai-list__content {
+    .userSelcet {
-      .ai-list__content--right-wrapper {
-        background: transparent!important;
-        box-shadow: none!important;
-        margin: 0!important;
-        padding: 0 0 0!important;
-      }
-    }
-    .statistics-top {
       display: flex;
       align-items: center;
-      margin-bottom: 20px;
+      justify-content: space-between;
-
+      width: 215px;
-      & > div {
+      height: 32px;
-        flex: 1;
+      line-height: 32px;
-        height: 96px;
-        line-height: 1;
-        margin-right: 20px;
-        padding: 16px 24px;
-        background: #FFFFFF;
-        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
       border-radius: 4px;
+      border: 1px solid #d0d4dc;
+      overflow: hidden;
+      cursor: pointer;
+      transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
 
-        &:last-child {
+      &:hover {
-          margin-right: 0;
+        border-color: $placeholderColor;
       }
 
-        h3 {
+      i {
-          font-size: 24px;
+        display: flex;
+        position: relative;
+        align-items: center;
+        justify-content: center;
+        width: 30px;
+        height: 100%;
+        line-height: 32px;
+        font-size: 14px;
+        text-align: center;
+        color: #d0d4dc;
+        transform: rotateZ(180deg);
+      }
+
+      .el-icon-circle-close:hover {
+        opacity: 0.6;
       }
 
       span {
-          display: block;
+        flex: 1;
-          margin-bottom: 16px;
+        padding: 0 15px;
-          color: #888888;
+        font-size: 12px;
-          font-size: 16px;
+        color: $placeholderColor;
       }
     }
   }
-
-    .content {
-      padding: 16px;
-      background: #FFFFFF;
-      box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
-    }
-  }
 </style>