王新雷 4 år sedan
förälder
incheckning
b023f8a28b

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/index.html


+ 0 - 1
dist/static/css/chunk-a214328a.bcfbaa42.css

@@ -1 +0,0 @@
-.content-tooltip[data-v-64596b6c]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.dialog-footer[data-v-6539aab0]{width:100%;text-align:right}.reword-list[data-v-6539aab0]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-6539aab0]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-6539aab0]{margin-bottom:22px;width:250px;border-style:dashed}

+ 1 - 0
dist/static/css/chunk-b10e6fea.cb21165c.css

@@ -0,0 +1 @@
+.content-tooltip[data-v-64596b6c]{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;max-width:100%;display:inline-block}.dialog-footer[data-v-17893631]{width:100%;text-align:right}.reword-list[data-v-17893631]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-17893631]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-17893631]{margin-bottom:22px;width:180px;border-style:dashed}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.9c4c9a9e.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/chunk-a214328a.d82b67ff.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/chunk-b10e6fea.ea2f4f82.js


+ 14 - 4
src/views/luckyDraw/trophyCreate.vue

@@ -45,6 +45,7 @@
                 </el-col>
             </el-row>
             <div style="text-align: center">
+                <el-button :disabled="form.rewordList.length <= 1" class="add-reword" round icon="el-icon-minus" @click="onRemoveReword">删除奖品</el-button>
                 <el-button class="add-reword" round icon="el-icon-plus" @click="onAddReword">添加奖品</el-button>
             </div>
             <el-form-item label="备注" label-width="100PX"
@@ -65,13 +66,15 @@
 import Tooltip from '@/components/Tooltip/index'
 import pagination from "@/components/Pagination/index";
 import dayjs from 'dayjs';
+import numeral from 'numeral';
 import cleanDeep from 'clean-deep';
 import { luckDrawPrizeBatchAdd } from './api'
 const validNumber1 = (rule, value, callback) => {
+    const re = /^[0-9]+$/
     if (value == '' && typeof value == 'string' || value == null) {
         callback(new Error('请输入库存'))
-    } else if (value < 0) {
-        callback(new Error('输入值不能小于0'))
+    } else if (!re.test(value) && value < 0) {
+        callback(new Error('输入库存为正整数'))
     } else {
         callback()
     }
@@ -117,6 +120,13 @@ export default {
     mounted () {
     },
     methods: {
+        onRemoveReword() { // 删除奖品
+            let form = this.form
+            if(form.rewordList.length <= 1) {
+                return
+            }
+            this.form.rewordList.pop()
+        },
         onAddReword() { // 添加奖品
             let form = this.form
             form.rewordList.push({
@@ -137,7 +147,7 @@ export default {
                         params.push({
                             name: item.name,
                             groupId: form.groupId,
-                            chances: item.chances ? item.chances / 100 : 0,
+                            chances: numeral(item.chances ? item.chances / 100 : 0).format('0.00'),
                             stock: item.stock,
                             memo: form.memo,
                             enabled: 1
@@ -184,7 +194,7 @@ export default {
 
 .add-reword {
     margin-bottom: 22px;
-    width: 250px;
+    width: 180px;
     border-style: dashed;
 }
 </style>

+ 6 - 4
src/views/luckyDraw/trophyManager.vue

@@ -39,7 +39,7 @@
                                 prop="chances"
                                 label="中奖概率">
                     <template slot-scope="scope">
-                        {{ scope.row.chances * 100 }}%
+                        {{ Number((scope.row.chances * 100).toFixed(4)) }}%
                     </template>
                 </el-table-column>
                 <el-table-column align="center"
@@ -140,13 +140,15 @@ import Tooltip from '@/components/Tooltip/index'
 import pagination from "@/components/Pagination/index";
 import trophyCreate from './trophyCreate'
 import dayjs from 'dayjs';
+import numeral from 'numeral';
 import cleanDeep from 'clean-deep';
 import { luckDrawPrizeList, luckDrawPrizeUpdate, luckDrawGroupFindAll } from './api'
 const validNumber1 = (rule, value, callback) => {
+    const re = /^[0-9]+$/
     if (value == '' && typeof value == 'string' || value == null) {
         callback(new Error('请输入库存'))
-    } else if (value < 0) {
-        callback(new Error('输入值不能小于0'))
+    } else if (!re.test(value) && value < 0) {
+        callback(new Error('输入库存为正整数'))
     } else {
         callback()
     }
@@ -249,7 +251,7 @@ export default {
                     let params = {
                         name: form.name,
                         groupId: form.groupId,
-                        chances: form.chances ? form.chances / 100 : 0,
+                        chances: numeral(form.chances ? form.chances / 100 : 0).format('0.0000'),
                         stock: form.stock,
                         memo: form.memo,
                         enabled: 1

Vissa filer visades inte eftersom för många filer har ändrats