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

2023-04-11 10:31:42 +08:00
parent 9aa6d8f180 29b9e8fdd0
commit c55de2e7ea
6 changed files with 205 additions and 62 deletions
--- a/project/fengdu/app/AppDynamic/components/Detail.vue
+++ b/project/fengdu/app/AppDynamic/components/Detail.vue
@@ -16,24 +16,8 @@
            <ai-info-item label="正文" v-if="info.contentType === '0'" isLine>
              <AiArticle :value="info.content"></AiArticle>
            </ai-info-item>
-            <ai-info-item v-if="info.contentType === '0'" isLine label="封面图片">
-              <ai-uploader
-                :instance="instance"
-                disabled
-                v-model="info.files"
-                :limit="9">
-              </ai-uploader>
-            </ai-info-item>
-            <ai-info-item v-if="info.contentType === '1'" isLine label="封面图片">
-              <video style="width:100%; height:100%; object-fit: fill;" :src="info.files[0].url" controls></video>
-            </ai-info-item>
-            <ai-info-item v-if="info.contentType === '1'" isLine label="视频封面">
-              <ai-uploader
-                :instance="instance"
-                disabled
-                v-model="info.pictureUrl"
-                :limit="1">
-              </ai-uploader>
+            <ai-info-item label="附件" isLine>
+              <AiFileList :fileList="info.files"></AiFileList>
            </ai-info-item>
          </ai-wrapper>
        </template>
--- a/project/fengdu/app/AppDynamic/components/List.vue
+++ b/project/fengdu/app/AppDynamic/components/List.vue
@@ -62,7 +62,7 @@
          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
          { prop: 'createUserName',  label: '姓名', align: 'center' },
          { prop: 'areaName', label: '所属地区', align: 'center' },
-          { prop: 'createUserName', label: '推送人', align: 'center' },
+          { prop: 'examineUserName', label: '推送人', align: 'center' },
          { prop: 'createTime', label: '推送时间', align: 'center' }
        ],
        tableData: [],
--- a/project/fengdu/app/AppIntegratingRules/components/List.vue
+++ b/project/fengdu/app/AppIntegratingRules/components/List.vue
@@ -45,7 +45,7 @@
            <el-form-item label="事件类型" prop="systemRuleId">
              <el-cascader v-model="form.systemRuleId" ref="cascaderArr" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm" :options="rulesOps"/>
            </el-form-item>
-            <el-form-item label="自定义事件" prop="ruleName">
+            <el-form-item label="自定义事件" prop="ruleName" v-if="form.systemRuleId !== '17'">
              <ai-select v-model="form.ruleName" @change="change" placeholder="请选择自定义事件" :selectList="dict.getDict('appIntegralApplyEventType')">
            </ai-select>
            </el-form-item>
@@ -94,8 +94,8 @@
      var validcode = (rule, value, callback) => {
        if (value) {
          if (value != 0) {
-            if (!/^([+-]?([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/.test(value)) {
-              callback(new Error('请输入积分分值，可输入正数、负数、最多保留两位小数'))
+            if (!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/.test(value)) {
+              callback(new Error('请输入积分分值，只可输入正数、最多保留两位小数'))
            } else {
              callback();
            }
@@ -326,7 +326,7 @@
      },
      handleTypeForm(v) {
        if (this.dialog) {
-          if(v[0] == '1' || v[0]== '10') {
+          if(v[1] == '17') {
            this.form.scoringCycle = '0'
            this.form.numberLimit = '1'
            this.isOneAndTen = true
--- a/project/fengdu/app/AppResidentIntegrating/components/Detail.vue
+++ b/project/fengdu/app/AppResidentIntegrating/components/Detail.vue
@@ -37,17 +37,10 @@
                    @getList="getList" :col-configs="colConfigs" :dict="dict">
            <el-table-column slot="changeIntegral" label="变动积分" align="center">
              <template slot-scope="{ row }">
-                <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
-                <span v-if="row.integralType == 0 || row.integralType == 2">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
+                <span>{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
              </template>
            </el-table-column>
-            <el-table-column slot="integralType" label="类型" align="center">
-              <template slot-scope="{ row }">
-                <span v-if="row.integralType == 0">积分调整</span>
-                <span v-else>{{ row.eventType }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
+            <el-table-column slot="eventDesc" label='事件' align="center" show-overflow-tooltip>
              <template slot-scope="{ row }">
                <span>{{ row.eventDesc || row.eventName }}</span>
              </template>
@@ -87,9 +80,9 @@
      colConfigs() {
        return [
          {prop: "doTime", label: '时间', align: "left", width: "200px"},
-          {slot: "integralType", label: '类型', align: "center", width: "240px", dict: "integralType"},
+          {prop: "integralType", label: '类型', align: "center", dict: "integralType"},
          {slot: "changeIntegral"},
-          {prop: "nowIntegral", label: '剩余积分', align: "center", width: "200px"},
+          {prop: "nowIntegral", label: '剩余积分', align: "center" },
          {slot: "eventDesc"},
        ]
      }
--- a/project/fengdu/app/AppResidentIntegrating/components/List.vue
+++ b/project/fengdu/app/AppResidentIntegrating/components/List.vue
@@ -8,7 +8,8 @@
          <ai-download
            :instance="instance"
            url="/app/appwechatuserqujing/export"
-            :params="search"
+            :params="params"
+            v-if="permissions('app_appwechatuserqujing_export')"
            fileName="居民积分"
             :disabled="tableData.length == 0">
            <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
@@ -16,13 +17,13 @@
        </template>
        <template #right>
          <el-input
-            v-model="search.title"
+            v-model="search.idNumber"
            class="search-input"
            size="small"
            v-throttle="() => {search.current = 1, getList()}"
-            placeholder="姓名/身份证/手机号/微信昵称"
+            placeholder="姓名/身份证/手机号"
            clearable
-            @clear="search.current = 1, search.title = '', getList()"
+            @clear="search.current = 1, search.idNumber = '', getList()"
            suffix-icon="iconfont iconSearch">
          </el-input>
        </template>
@@ -52,7 +53,7 @@
        @onConfirm="onConfirm"
        @closed="form={},chooseUserList=[]">
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="选择人员" prop="ids">
+          <el-form-item label="选择人员" prop="ids" v-if="!isEdit">
            <ai-person-select :instance="instance" keys="openId" customRightText :customClicker="true" :chooseUserList="chooseUserList"
                url="/app/appwechatuserqujing/listByFdAppletUser" headerTitle="用户列表"
                :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
@@ -63,7 +64,7 @@
            </ai-person-select>
          </el-form-item>
          <el-form-item label="调整说明" prop="eventDesc">
-            <el-input v-model.trim="form.eventDesc" placeholder="请输入..." type="textarea" :rows="4" show-word-limit
+            <el-input v-model="form.eventDesc" placeholder="请输入..." type="textarea" :rows="4" show-word-limit
                      maxlength="100"></el-input>
          </el-form-item>
          <el-form-item label="类型" prop="integralCalcType">
@@ -85,7 +86,8 @@

    props: {
      instance: Function,
-      dict: Object
+      dict: Object,
+      permissions: Function
    },

    data() {
@@ -93,7 +95,7 @@
        search: {
          current: 1,
          size: 10,
-          title: '',
+          idNumber: '',
          areaId: ''
        },
        form: {
@@ -106,13 +108,14 @@
        dialog: false,
        chooseUserList: [],
        total: 0,
+        isEdit: false,
        colConfigs: [
          { prop: 'realName',  label: '姓名', align: 'left', width: '200px' },
          { prop: 'phone',  label: '手机号', align: 'center' },
          { prop: 'idNumber', label: '身份证号', align: 'center' },
          { prop: 'areaName', label: '所属地区', align: 'center' },
          { prop: 'girdName', label: '所属网格', align: 'center' },
-          { prop: 'integral', label: '积分总分', align: 'center' },
+          { prop: 'integral', label: '剩余积分', align: 'center' },
          { prop: 'usedIntegral', label: '已用积分', align: 'center' }
        ],
        tableData: []
@@ -128,7 +131,8 @@

      params () {
        return {
-          ...this.search
+          ...this.search,
+          size: 1000
        }
      },

@@ -145,7 +149,9 @@

    created() {
      this.search.areaId = this.user.info.areaId
-      this.getList()
+      this.dict.load('integralCalcType').then(() => {
+        this.getList()
+      })
    },

    methods: {
@@ -173,16 +179,16 @@
      },

      changeIntegral(row,type) {
+        this.isEdit = false
        if(type==0) {
          this.dialog = true
        } else if(type ==1) {
+          this.isEdit = true
          this.chooseUserList = [{
            openId: row.openId,
            name: row.realName
          }]
          this.form = {
-            ...this.form,
-            ...row,
            ids: this.chooseUserList.map(e => e.openId)
          }

--- a/project/qujing/app/AppCertificateManage/components/Add.vue
+++ b/project/qujing/app/AppCertificateManage/components/Add.vue
@@ -6,18 +6,39 @@
    <template slot="content">
      <ai-card title="基本信息">
        <template #content>
-          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
-            <el-form-item label="证书名称" style="width: 100%" prop="certificateName" :rules="[{required: true, message: '请输入证书名称', trigger: 'blur'}]">
-              <el-input size="small" v-model="form.certificateName" clearable placeholder="请输入证书名称" :maxlength="200"></el-input>
-            </el-form-item>
-            <el-form-item label="上传证书" prop="imageUrl" style="width: 100%;" :rules="[{required: true, message: '请上传证书', trigger: 'change'}]">
-              <ai-uploader
-                :instance="instance"
-                v-model="form.imageUrl"
-                :limit="1">
-              </ai-uploader>
-            </el-form-item>
-          </el-form>
+          <div class="wrapper">
+            <el-form class="ai-form" :model="form" label-width="120px" ref="form">
+              <el-form-item label="证书名称" style="width: 100%" prop="certificateName" :rules="[{required: true, message: '请输入证书名称', trigger: 'blur'}]">
+                <el-input size="small" show-word-limit style="width: 50%;" v-model="form.certificateName" clearable placeholder="请输入证书名称" :maxlength="50"></el-input>
+              </el-form-item>
+              <el-form-item label="证书封面名称" style="width: 100%" prop="certificateTitle" :rules="[{required: true, message: '请输入证书封面名称', trigger: 'blur'}]">
+                <el-input size="small" show-word-limit style="width: 50%;" v-model="form.certificateTitle" clearable placeholder="请输入证书封面名称" :maxlength="20"></el-input>
+              </el-form-item>
+              <el-form-item label="证书描述" style="width: 100%" prop="certificateContent" :rules="[{required: true, message: '请输入证书描述', trigger: 'blur'}]">
+                <div class="input-wrapper">
+                  <el-button type="text" style="width: fit-content;" @click="append">插入获得证书序号</el-button>
+                  <el-input :rows="4" type="textarea" size="small" style="width: 100%;" v-model="form.certificateContent" clearable placeholder="恭喜您成为曲靖市第 「#获得证书序号」，位知法明理人。特颁此证，以资鼓励!"></el-input>
+                </div>
+              </el-form-item>
+              <el-form-item label="证书颁发单位" prop="certificateIssueUnit" style="width: 100%;" :rules="[{required: true, message: '请输入证书颁发单位', trigger: 'change'}]">
+                <el-input size="small" show-word-limit style="width: 50%;" v-model="form.certificateIssueUnit" clearable placeholder="请输入证书颁发单位" :maxlength="50"></el-input>
+              </el-form-item>
+            </el-form>
+            <div class="view-img">
+              <h1>{{ form.certificateTitle }}</h1>
+              <h2>全巧丽</h2>
+              <div class="view-img__content">
+                <div class="top">
+                  <span v-html="certificateContent"></span>
+                </div>
+              </div>
+              <div class="bottom">
+                <p>{{ form.certificateIssueUnit }}</p>
+                <div>{{ date }}</div>
+              </div>
+              <img src="https://cdn.cunwuyun.cn/fengdu/icon.png" />
+            </div>
+          </div>
        </template>
      </ai-card>
    </template>
@@ -42,13 +63,29 @@
        info: {},
        form: {
          certificateName: '',
-          imageUrl: []
+          certificateIssueUnit: '曲靖市政法委',
+          certificateTitle: '知法明理人证书',
+          certificateContent: `恭喜您成为曲靖市第 「#获得证书序号」位知法明理人
+
+          特颁此证，以资鼓励!`
        },
-        id: ''
+        id: '',
+        date: ''
+      }
+    },
+
+    computed: {
+      certificateContent () {
+        if (this.form.certificateContent.indexOf('「#获得证书序号」') > -1) {
+          return this.form.certificateContent.replace('「#获得证书序号」', '<i></i>')
+        }
+
+        return this.form.certificateContent
      }
    },

    created () {
+      this.date = this.$moment(new Date()).format(`YYYY年MM月DD日`)
      if (this.params && this.params.id) {
        this.id = this.params.id
        this.getInfo(this.params.id)
@@ -69,12 +106,18 @@
        })
      },

+      append () {
+        if (this.form.certificateContent.indexOf('「#获得证书序号」') === -1) {
+          this.form.certificateContent = this.form.certificateContent + '「#获得证书序号」'
+        }
+      },
+
      confirm () {
        this.$refs.form.validate((valid) => {
          if (valid) {
            this.instance.post(`/app/appcertificateinfo/addOrUpdate`, {
              ...this.form,
-              imageUrl: this.form.imageUrl[0].url
+              id: this.params.id || ''
            }).then(res => {
              if (res.code == 0) {
                this.$message.success('提交成功')
@@ -99,5 +142,122 @@

 <style scoped lang="scss">
  .AppCertificateManage {
+    .input-wrapper {
+      display: flex;
+      flex-direction: column;
+      width: 50%;
+    }
+
+    .wrapper {
+      position: relative;
+      height: 500px;
+
+      .view-img {
+        position: absolute;
+        right: 0;
+        top: 0px;
+        z-index: 11;
+        width: 884px;
+        height: 1248px;
+        padding-top: 190px;
+        background: url(https://cdn.cunwuyun.cn/fengdu/zhengshu-bg.png);
+        background-size: 100% 100%;
+        transform: scale(0.4);
+        transform-origin: top right;
+
+        .view-img__content {
+          width: 724px;
+          margin: 0 auto;
+          font-weight: 500;
+          font-size: 24px;
+          color: #222222;
+          letter-spacing: 3px;
+          text-align: justify;
+          line-height: 40px;
+
+          p {
+            margin-top: 40px;
+          }
+
+
+          span {
+            display: block;
+            white-space: pre-line;
+          }
+
+          :deep( i ) {
+            display: inline-block;
+            position: relative;
+            width: 140px;
+            font-weight: 700;
+            font-size: 36px;
+            color: #3D5C8F;
+            text-align: center;
+
+            &:after {
+              position: absolute;
+              bottom: -10px;
+              left: 50%;
+              transform: translateX(-50%);
+              width: 120px;
+              height: 2px;
+              background: #999999;
+              z-index: 11;
+              content: ' ';
+            }
+          }
+        }
+
+        .bottom {
+          position: absolute;
+          bottom: 80px;
+          right: 78px;
+          line-height: 40px;
+          font-size: 24px;
+          text-align: right;
+          color: #3D5C8F;
+        }
+
+        h1 {
+          margin: 0 20px 70px;
+          font-weight: 900;
+          font-size: 72px;
+          color: #3D5C8F;
+          letter-spacing: 16px;
+          text-align: center;
+        }
+
+        h2 {
+          position: relative;
+          margin-bottom: 46px;
+          font-weight: 700;
+          font-size: 36px;
+          color: #3D5C8F;
+          text-align: center;
+
+          &:after {
+            position: absolute;
+            bottom: -10px;
+            left: 50%;
+            transform: translateX(-50%);
+            width: 120px;
+            height: 2px;
+            background: #999999;
+            z-index: 11;
+            content: ' ';
+          }
+        }
+
+        & > img {
+          position: absolute;
+          bottom: 340px;
+          left: 50%;
+          z-index: 1;
+          width: 140px;
+          height: 140px;
+          transform: translateX(-50%);
+        }
+      }
+    }
  }
 </style>