diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue index 09e4ed3..e0c0ef1 100644 --- a/src/views/task_template/edit.vue +++ b/src/views/task_template/edit.vue @@ -11,7 +11,7 @@ <el-form ref="formRef" :model="formData" - label-width="90px" + label-width="120px" :rules="formRules" > <el-form-item label="任务类型" prop="type"> @@ -65,7 +65,7 @@ :value="formData.extend?.terminus?.address" /> </el-form-item> - <el-form-item + <!-- <el-form-item v-if="formData.type == 35" label="负责人" prop="task_admin" @@ -76,7 +76,7 @@ readonly v-model="formData.task_admin_name" /> - </el-form-item> + </el-form-item> --> <el-form-item label="阶段类型" prop="types"> <el-select v-model="formData.types" @@ -146,7 +146,17 @@ <template #append>元</template> </el-input> </el-form-item> - + <el-form-item + v-if="formData.type == 35" + label="充值金额(元)" + prop="recharge" + > + <el-input + placeholder="请输入充值金额(元)" + v-model="formData.recharge" + type="number" + /> + </el-form-item> <el-form-item label="状态" prop="status"> <el-radio-group v-model="formData.status"> <el-radio :label="1">显示</el-radio> @@ -158,6 +168,8 @@ v-model="formData.content" clearable placeholder="请输入任务描述" + type="textarea" + autosize /> </el-form-item> </el-form> @@ -225,8 +237,9 @@ const formData = reactive({ money_two: 0, // 二阶段金额 money_three: 0, // 长期金额 types: "", //阶段类型 - task_admin: "", //任务负责人 - task_admin_name: "", //任务负责人 + // task_admin: "", //任务负责人 + // task_admin_name: "", //任务负责人 + recharge: "", extend: { // origin: { // address: "", @@ -287,10 +300,21 @@ const formRules = reactive<any>({ trigger: ["blur"], }, ], - task_admin: [ + // task_admin: [ + // { + // required: true, + // message: "请选择负责人", + // trigger: ["blur"], + // }, + // ], + recharge: [ { required: true, - message: "请选择负责人", + // message: "请输入充值金额", + validator: (rule: any, value: any, callback: any) => { + if (value <= 0) callback(new Error("充值金额不能小于0")); + else callback(); + }, trigger: ["blur"], }, ], diff --git a/src/views/user_menu/edit.vue b/src/views/user_menu/edit.vue index e400f4a..58aaef4 100644 --- a/src/views/user_menu/edit.vue +++ b/src/views/user_menu/edit.vue @@ -283,7 +283,7 @@ defineExpose({ <style lang="scss" scoped> .avatar-uploader .avatar { width: 80px; - height: 64px; + height: 80px; display: block; } .avatar-uploader .el-upload { @@ -302,7 +302,7 @@ defineExpose({ font-size: 28px; color: #8c939d; width: 80px; - height: 64px; + height: 80px; text-align: center; } </style> diff --git a/src/views/user_menu/index.vue b/src/views/user_menu/index.vue index dfa68df..6c02e1c 100644 --- a/src/views/user_menu/index.vue +++ b/src/views/user_menu/index.vue @@ -73,7 +73,7 @@ <el-table-column label="菜单名称" prop="name" show-overflow-tooltip /> <el-table-column label="菜单图标" prop="icon" show-overflow-tooltip> <template #default="{ row }"> - <img :src="row.icon" style="width: 50px; height: 40px" /> + <img :src="row.icon" style="width: 50px; height: 50px" /> </template> </el-table-column> <el-table-column @@ -218,8 +218,8 @@ getLists(); watch( () => pager.lists, (newValue, oldValue) => { - newValue.forEach((item: any) => { - item.children.forEach((t: any) => { + newValue?.forEach((item: any) => { + item?.children?.forEach((t: any) => { t.parentName = item.name; }); });