From d53bc8fe20606d41c2d781685c1863917639fa5c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 30 Jun 2022 11:25:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppPartyScoreManage/pointsDetails.vue     | 60 +++----------------
 .../apps/AppPartyScoreManage/scoreChange.vue  | 60 ++++++++++---------
 2 files changed, 40 insertions(+), 80 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue b/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue
index f6e49a13..6c737792 100644
--- a/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue
+++ b/project/sanjianxi/apps/AppPartyScoreManage/pointsDetails.vue
@@ -1,11 +1,12 @@
 <template>
   <section class="pointsDetails">
-    <ai-list isTabs>
+    <ai-list>
       <template slot="content">
-        <ai-search-bar bottomBorder>
+        <ai-search-bar>
           <template slot="left">
-            <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
-                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
+            <el-date-picker size="small" v-model="searchDotime" type="year" range-separator="至" @change="timeChange"
+                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy" format="yyyy"></el-date-picker>
+            <!-- <el-date-picker v-model="search.startTime" size="small" type="year" placeholder="选择年"></el-date-picker> -->
           </template>
           <template slot="right">
             <el-input
@@ -108,6 +109,7 @@ export default {
       this.instance.post(`/app/apppartyintegralinfo/list`, null, {
         params: {
           ...this.search,
+          type: 1
         },
       })
       .then((res) => {
@@ -157,54 +159,6 @@ export default {
   background: #f3f6f9;
   overflow: auto;
 
-  .form_content {
-    .form_flex {
-      display: flex;
-
-      div {
-        flex: 1;
-      }
-    }
-
-    .form_info {
-      margin-bottom: 8px;
-    }
-
-    .form_label {
-      display: inline-block;
-      color: #999;
-      vertical-align: top;
-      width: 70px;
-      text-align: right;
-    }
-
-    .form_value {
-      display: inline-block;
-      color: #333;
-      width: calc(100% - 70px);
-      // img {
-      //   width: 100px;
-      //   height: 100px;
-      //   margin: 0 8px 8px 0;
-      // }
-    }
-  }
-
-  .form_div {
-    padding-top: 24px;
-    border-top: 1px solid #eee;
-  }
-
-  .status-0 {
-    color: #FF4466;
-  }
-
-  .status-1 {
-    color: #2EA222;
-  }
-
-  .status-2 {
-    color: #999999;
-  }
+  
 }
 </style>
diff --git a/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue b/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue
index a94b919f..b865676b 100644
--- a/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue
+++ b/project/sanjianxi/apps/AppPartyScoreManage/scoreChange.vue
@@ -27,9 +27,9 @@
         @onConfirm="onConfirm"
         @closed="form={}">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="选择人员" prop="residentId">
+        <el-form-item label="选择人员" prop="partyId">
           <ai-person-select :instance="instance" :customClicker="true"
-                            :url="'/app/appresident/list?areaId=' + user.info.areaId"
+                            :url="'/app/appparty/list?partyOrgId=' + user.info.organizationId"
                             :isMultiple="false" dialogTitle="选择" @selectPerson="selectPerson">
             <template name="option" v-slot:option="{ item }">
               <span class="iconfont iconProlife">{{ item.name }}</span>
@@ -37,15 +37,15 @@
             </template>
           </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-form-item label="调整说明" prop="remark">
+          <el-input v-model.trim="form.remark" placeholder="请输入..." type="textarea" :rows="4" show-word-limit
                     maxlength="100"></el-input>
         </el-form-item>
-        <el-form-item label="类型" prop="integralCalcType">
-          <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')"/>
+        <el-form-item label="类型" prop="integralType">
+          <ai-select v-model="form.integralType" :selectList="dict.getDict('partyIntegralType')"/>
         </el-form-item>
-        <el-form-item label="积分" prop="changeIntegral">
-          <el-input v-model.trim.num ="form.changeIntegral" placeholder="请输入正数" size="small"></el-input>
+        <el-form-item label="积分" prop="integral">
+          <el-input v-model.trim.num ="form.integral" placeholder="请输入正数" size="small"></el-input>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -71,28 +71,33 @@ export default {
         size: 10,
         total: 10
       },
-      form: {},
+      form: {
+        partyId: '',
+        partyName: '',
+        remark: '',
+        integralType: '',
+        integral: '',
+      },
       dialog: false,
-      personList: [],
     }
   },
   computed: {
     ...mapState(["user"]),
     rules() {
       return {
-        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("请输入正数")}],
+        partyId: [{required: true, message: '请选择人员', trigger: 'blur'},],
+        remark: [{required: true, message: '请输入调整说明', trigger: 'blur'},],
+        integralType: [{required: true, message: '请选择类型', trigger: 'change'},],
+        integral: [{required: true, validator: (r, v, cb) => v > 0 ? cb() : cb("请输入正数")}],
       }
     },
     colConfigs() {
       return [
-        {prop: "residentName", label: "姓名"},
-        {prop: "eventDesc", label: "调整说明"},
-        {prop: "integralCalcType", label: "类型", dict: "integralCalcType", align: 'center'},
-        {prop: "changeIntegral", label: "积分", align: "center", render: (h, {row}) => h('p',{textAlign:'center'}, `${row.integralCalcType > 0 ? '+' : '-'}${row.changeIntegral}`)},
-        {prop: "doTime", label: "操作时间"},
+        {prop: "partyName", label: "姓名", align: 'center'},
+        {prop: "remark", label: "调整说明", align: 'center'},
+        {prop: "integralType", label: "类型", dict: "partyIntegralType", align: 'center'},
+        {prop: "integral", label: "积分", align: "center", render: (h, {row}) => h('p',{textAlign:'center'}, `${row.integralType == 1 ? '+' : '-'}${row.integral}`)},
+        {prop: "createTime", label: "操作时间", align: 'center'},
         {prop: "createUserName", label: "操作人", align: "center"},
       ]
     }
@@ -100,18 +105,19 @@ export default {
   methods: {
     selectPerson(val) {
       if (val) {
-        this.form.residentId = val.id
-        this.personList = [{...val}]
+        this.form.partyId = val.id
+        this.form.partyName = val.name
       } else {
-        this.form.residentId = ""
-        this.personList = []
+        this.form.partyId = ""
+        this.form.partyName = ""
       }
     },
     onConfirm() {
+      let formData = JSON.stringify(this.form)
       this.$refs['form'].validate(valid => {
         if (valid) {
-          this.instance.post(`/app/apppartyintegralinfo/changeIntegral`, this.form).then(res => {
-            if (res.code == 0) {
+          this.instance.post(`/app/apppartyintegralinfo/changeIntegral`,  this.form ).then(res => {
+            if (res?.code == 0) {
               this.$message.success("添加成功")
               this.dialog = false
               this.getList()
@@ -121,8 +127,8 @@ export default {
       })
     },
     getList() {
-      this.instance.post(`/app/appvillagerintegraldetail/list`, null, {
-        params: {...this.page, areaId: this.areaId, type: 0}
+      this.instance.post(`/app/apppartyintegralinfo/list`, null, {
+        params: {...this.page, type: 0}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data.records