dianliang/lanan-system-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system-vue into dev

Browse Source
This commit is contained in:
lzttt 2024-10-22 10:16:34 +08:00
commit 5335e0c924
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/repair/wares/WaresForm.vue
View File

@ -107,7 +107,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="配件属性" prop="attribute"> <el-form-item label="配件属性" prop="attribute">
<el-select v-model="formData.attribute" placeholder="请选择单位"> <el-select v-model="formData.attribute" placeholder="请选择配件属性">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.REPAIR_WARES_ATTRIBUTE)" <el-option v-for="dict in this.getDictDatas(DICT_TYPE.REPAIR_WARES_ATTRIBUTE)"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> </el-select>

7
src/views/system/notify/template/index.vue
View File

@ -116,9 +116,10 @@
<el-input v-model="sendNotifyForm.content" type="textarea" placeholder="请输入模板内容" readonly /> <el-input v-model="sendNotifyForm.content" type="textarea" placeholder="请输入模板内容" readonly />
</el-form-item> </el-form-item>
<el-form-item label="接收人" prop="userId"> <el-form-item label="接收人" prop="userId">
<el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%"> <el-input v-model="sendNotifyForm.userId" type="text" placeholder="请输入接收人ID" />
<el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" /> <!-- <el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%">-->
</el-select> <!-- <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<el-form-item v-for="param in sendNotifyForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param"> <el-form-item v-for="param in sendNotifyForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param">
<el-input v-model="sendNotifyForm.templateParams[param]" :placeholder="'请输入 ' + param + ' 参数'" /> <el-input v-model="sendNotifyForm.templateParams[param]" :placeholder="'请输入 ' + param + ' 参数'" />