修改

dist/static/css/chunk-16e1254a.5ea7c894.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-41b6eabd]{width:100%;text-align:right}.reword-list[data-v-41b6eabd]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-41b6eabd]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-41b6eabd]{margin-bottom:22px;width:250px;border-style:dashed}

dist/static/css/chunk-662adb86.2ea9e3a8.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-a47a4102]{width:100%;text-align:right}.reword-list[data-v-a47a4102]{display:-webkit-box;display:-ms-flexbox;display:flex}.reword-list .el-form-item[data-v-a47a4102]{-webkit-box-flex:1;-ms-flex:1;flex:1}.add-reword[data-v-a47a4102]{margin-bottom:22px;width:250px;border-style:dashed}

src/views/contentManager/contentOperation.vue

@@ -583,15 +583,15 @@ export default {
           if(actionTime && actionTime.length > 0) {
             form.onlineTime = dayjs(actionTime[0]).format('YYYY-MM-DD HH:mm:ss')
             form.offlineTime = dayjs(actionTime[1]).format('YYYY-MM-DD HH:mm:ss')
-          } else {
-            form.onlineTime = null
-            form.offlineTime = null
           }
           if (this.pageType == "create") {
             if (form.id) {
               // 判断有没有Id，如果有则删除
               delete form.id;
             }
+            if(this.type == 5) {
+              form.status = 0
+            }
             // return false
             newsAdd(form).then(res => {
               this.messageTips("添加", res);
@@ -706,6 +706,10 @@ export default {
             } else {
               this.uploadType = 1
             }
+            let tempActionTime = null
+            if(result.onlineTime && result.offlineTime) {
+              tempActionTime = [result.onlineTime, result.offlineTime]
+            }
             this.form = {
               id: result.id,
               title: result.title,
@@ -718,14 +722,10 @@ export default {
               status: result.status,
               memo: result.memo,
               content: result.content,
+              actionTime: tempActionTime,
               tenantId: result.tenantId.toString(),
               subType: result.subType ? result.subType : null
             };
-            if(result.onlineTime && result.offlineTime) {
-              this.form.actionTime = [result.onlineTime, result.offlineTime]
-            } else {
-              this.form.actionTime = null
-            }
             this.dataInfo.updateTime = result.updateTime
           }
         });

src/views/luckyDraw/trophyCreate.vue

@@ -11,17 +11,21 @@
                     <el-option v-for="item in groupList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
             </el-form-item>
-            <el-row :gutter="10" v-for="(item, index) in form.rewordList" :key="index">
+            <el-row :gutter="10" v-for="(reword, index) in form.rewordList" :key="index">
                 <el-col :span="12">
-                    <el-form-item :label="`奖品${++index}`" prop="name" label-width="100PX">
-                        <el-input v-model.trim="item.name"
+                    <el-form-item :label="`奖品${index + 1}`"
+                            label-width="100PX"
+                            :prop="'rewordList.' + index + '.name'"
+                            :rules="[{required: true, message:'请输入活动名称', trigger: 'blur'}]">
+                        <el-input v-model.trim="reword.name"
                                 autocomplete="off"
                                 placeholder="请输入奖品名称"></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="7">
-                    <el-form-item prop="chances">
-                        <el-input v-model.trim="item.chances"
+                    <el-form-item :prop="'rewordList.' + index + '.chances'"
+                            :rules="[{required: true, validator: validNumber, trigger: 'blur'}]">
+                        <el-input v-model.trim="reword.chances"
                                 type="number"
                                 autocomplete="off"
                                 placeholder="请输入中奖概率">
@@ -30,8 +34,9 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="5">
-                    <el-form-item prop="stock">
-                        <el-input v-model.trim="item.stock"
+                    <el-form-item :prop="'rewordList.' + index + '.stock'"
+                            :rules="[{required: true, validator: validNumber1, trigger: 'blur'}]">
+                        <el-input v-model.trim="reword.stock"
                                 type="number"
                                 autocomplete="off"
                                 placeholder="请输入库存">
@@ -62,11 +67,31 @@ import pagination from "@/components/Pagination/index";
 import dayjs from 'dayjs';
 import cleanDeep from 'clean-deep';
 import { luckDrawPrizeAdd } from './api'
+const validNumber1 = (rule, value, callback) => {
+    if (value == '' && typeof value == 'string' || value == null) {
+        callback(new Error('请输入库存'))
+    } else if (value < 0) {
+        callback(new Error('输入值不能小于0'))
+    } else {
+        callback()
+    }
+}
+const validNumber = (rule, value, callback) => {
+    if (value == '' && typeof value == 'string' || value == null) {
+        callback(new Error('请输入中奖概率'))
+    } else if (value < 0) {
+        callback(new Error('输入值不能小于0'))
+    } else {
+        callback()
+    }
+}
 export default {
     components: { pagination, Tooltip, },
     props: ['groupList', 'close', 'getList'],
     data () {
         return {
+            validNumber1: validNumber1,
+            validNumber: validNumber,
             form: {
                 groupId: null,
                 rewordList: [{
@@ -77,11 +102,7 @@ export default {
                 memo: null
             },
             rules: {
-                name: [{required: true, message:'请输入活动名称', trigger: 'blur'}],
-                groupId: [{required: true, message:'请选择所属活动', trigger: 'change'}],
-                chances: [{required: true, message:'请输入中奖概率', trigger: 'blur'}],
-                stock: [{required: true, message:'请输入库存', trigger: 'blur'}],
-                enabled: [{required: true, message:'请选择是否启用', trigger: 'change'}]
+                groupId: [{required: true, message:'请选择所属活动', trigger: 'change'}]
             },
             pageInfo: {
                 // 分页规则