From 80debbbbb151034bf3087259c5cc41c34c7dfd2f Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 31 Mar 2022 17:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=AE=A1=E7=90=86=EF=BC=9B=E7=A7=AF=E5=88=86=E6=8E=92?=
 =?UTF-8?q?=E5=90=8D=E6=B7=BB=E5=8A=A0=E9=98=B2=E5=A4=9A=E6=AC=A1=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pointsadjustmenttype-add-or-update.vue    | 36 +++++--------------
 .../modules/points/pointsadjustmenttype.vue   | 31 ++++++++--------
 .../modules/points/userinfo-points-adjust.vue |  5 +++
 3 files changed, 31 insertions(+), 41 deletions(-)

diff --git a/src/views/modules/points/pointsadjustmenttype-add-or-update.vue b/src/views/modules/points/pointsadjustmenttype-add-or-update.vue
index 4e354ab..3ca949b 100644
--- a/src/views/modules/points/pointsadjustmenttype-add-or-update.vue
+++ b/src/views/modules/points/pointsadjustmenttype-add-or-update.vue
@@ -1,35 +1,17 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="140px">
+        <el-form-item label="行为调整类型名称" prop="adjustmentTypeName">
+            <el-input v-model="dataForm.adjustmentTypeName" placeholder="行为调整类型名称" style="width: 300px"></el-input>
+        </el-form-item>
           <el-form-item label="行为调整类型code" prop="adjustmentTypeCode">
-          <el-input v-model="dataForm.adjustmentTypeCode" placeholder="行为调整类型code"></el-input>
-      </el-form-item>
-          <el-form-item label="行为调整类型名称" prop="adjustmentTypeName">
-          <el-input v-model="dataForm.adjustmentTypeName" placeholder="行为调整类型名称"></el-input>
+          <el-input v-model="dataForm.adjustmentTypeCode" placeholder="行为调整类型code" style="width: 300px"></el-input>
       </el-form-item>
           <el-form-item label="分数" prop="point">
-          <el-input v-model="dataForm.point" placeholder="分数"></el-input>
+              <el-input-number v-model="dataForm.point" controls-position="right" :min="0" label="分数" style="width: 300px"></el-input-number>
       </el-form-item>
           <el-form-item label="备注" prop="remark">
           <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="逻辑删除标识" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="逻辑删除标识"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -72,9 +54,9 @@ export default {
         point: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        remark: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+        // remark: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
         revision: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/points/pointsadjustmenttype.vue b/src/views/modules/points/pointsadjustmenttype.vue
index d436bf2..a3e6819 100644
--- a/src/views/modules/points/pointsadjustmenttype.vue
+++ b/src/views/modules/points/pointsadjustmenttype.vue
@@ -2,36 +2,39 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-point__pointsadjustmenttype}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="行为调整类型名称" prop="adjustmentTypeName">
+          <el-input v-model="dataForm.adjustmentTypeName"
+                    placeholder="行为调整类型名称"
+                    clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('point:pointsadjustmenttype:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('point:pointsadjustmenttype:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="adjustmentTypeCode" label="行为调整类型code" header-align="center" align="center"></el-table-column>
+        <el-table-column type="index"
+                         width="50"
+                         label="序号" align="center"></el-table-column>
         <el-table-column prop="adjustmentTypeName" label="行为调整类型名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="adjustmentTypeCode" label="行为调整类型编码" header-align="center" align="center"></el-table-column>
         <el-table-column prop="point" label="分数" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="delFlag" label="逻辑删除标识" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>-->
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('point:pointsadjustmenttype:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('point:pointsadjustmenttype:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/points/userinfo-points-adjust.vue b/src/views/modules/points/userinfo-points-adjust.vue
index ddd7b61..c793816 100644
--- a/src/views/modules/points/userinfo-points-adjust.vue
+++ b/src/views/modules/points/userinfo-points-adjust.vue
@@ -61,6 +61,7 @@
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
       <el-button type="primary"
+                 :disabled="isAble"
                  @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
@@ -71,6 +72,7 @@ import debounce from 'lodash/debounce'
 export default {
   data () {
     return {
+      isAble: false,
       visible: false,
       dataForm: {
         id: '',
@@ -120,6 +122,7 @@ export default {
   methods: {
     init () {
       this.visible = true
+      this.isAble = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -146,9 +149,11 @@ export default {
         if (!valid) {
           return false
         }
+        this.isAble = true
         this.$http['post'](
           '/points/pointslogs/confirmUserAdjustPoint', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
+            this.isAble = false
             return this.$message.error(res.msg)
           }
           this.$message({