Browse Source

fix:选择模板改造,ui还原

master
15881625488@163.com 1 week ago
parent
commit
e45f27c3ec
8 changed files with 109 additions and 95 deletions
  1. +7
    -0
      src/App.vue
  2. +9
    -12
      src/lang/en/business/study/studyFormFill.js
  3. +9
    -12
      src/lang/zh/business/study/studyFormFill.js
  4. +31
    -34
      src/views/business/comps/select/SelectTemplateDialog.vue
  5. +0
    -1
      src/views/business/study/comp/tbbd/Xq.vue
  6. +34
    -24
      src/views/business/study/comp/tbbdList.vue
  7. +0
    -1
      src/views/business/study/comp/ytbd/Xq.vue
  8. +19
    -11
      src/views/business/study/comp/ytbdList.vue

+ 7
- 0
src/App.vue View File

@ -450,6 +450,13 @@ export default {
}
}
}
/* 单选,隐藏label */
.hide-label>.el-radio__label {
font-size: 0 !important;
line-height: 0 !important;
}
.template-form-item {
background: #fff;
padding: 20px;

+ 9
- 12
src/lang/en/business/study/studyFormFill.js View File

@ -1,20 +1,19 @@
export default {
jcsz:'基础设置',
bdsj:'表单设计',
xzbd:'新增表单',
fh:'复核',
jq:'加签',
ghgsr:'更换归属人',
sy:'审阅',
fz:'废止',
shfz:'确认废止',
gc:'观察',
bdsm:'表单说明',
zc:'暂存',
next:'下一步',
save:'保存',
submit:'提交',
bdsm:'表单说明',
tjysb:'提交预设表',
shryId:'审核人员',
fzrsh:'是否需要试验负责人审核',
approve:'通过',
reject:'拒绝',
reject:'拒绝',
shtg:'审核通过',
shjj:'审核拒绝',
tb:'填报',
bdnr:'表单内容',
qmxx:'签名信息',
qmr:'签名人',
@ -22,7 +21,5 @@ export default {
qmsj:'签名时间',
bzyy:'备注原因',
jcgj:'稽查轨迹',
xztbbd:'新增填报表单',
cjjl:'创建记录',
ts:'是否确定用该预填模板进行实际填报?',
}

+ 9
- 12
src/lang/zh/business/study/studyFormFill.js View File

@ -1,20 +1,19 @@
export default {
jcsz:'基础设置',
bdsj:'表单设计',
xzbd:'新增表单',
fh:'复核',
jq:'加签',
ghgsr:'更换归属人',
sy:'审阅',
fz:'废止',
shfz:'确认废止',
gc:'观察',
bdsm:'表单说明',
zc:'暂存',
next:'下一步',
save:'保存',
submit:'提交',
bdsm:'表单说明',
tjysb:'提交预设表',
shryId:'审核人员',
fzrsh:'是否需要试验负责人审核',
approve:'通过',
reject:'拒绝',
reject:'拒绝',
shtg:'审核通过',
shjj:'审核拒绝',
tb:'填报',
bdnr:'表单内容',
qmxx:'签名信息',
qmr:'签名人',
@ -23,6 +22,4 @@ export default {
bzyy:'备注原因',
jcgj:'稽查轨迹',
cjjl:'创建记录',
xztbbd:'新增填报表单',
ts:'是否确定用该预填模板进行实际填报?',
}

+ 31
- 34
src/views/business/comps/select/SelectTemplateDialog.vue View File

@ -1,51 +1,39 @@
<template>
<div class="select-template">
<el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="80%" append-to-body :close-on-click-modal="false"
style="padding: 20px 20px;">
<el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="800px" append-to-body
:close-on-click-modal="false" style="padding: 20px 20px;">
<div class="dialog-container">
<el-form :model="searchForm" ref="searchForm" :inline="true">
<el-form-item :label="$t('page.system.template.sn') + ':'" prop="sn">
<el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px"
@keyup.enter.native="search" />
</el-form-item>
<el-form-item :label="$t('page.system.template.name') + ':'" prop="name">
<el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable
style="width: 150px" @keyup.enter.native="search" />
</el-form-item>
<el-form-item :label="$t('page.system.template.department') + ':'" prop="deptId">
<select-dept style="width:200px" v-model="searchForm.deptId" @change="search" />
</el-form-item>
<el-form-item :label="$t('page.system.template.status') + ':'" prop="status">
<el-select v-model="searchForm.status" :placeholder="$t('form.placeholderSelect')" clearable
style="width: 100px" @change="search">
<el-option key="0" :label="$t('page.system.template.statusEnable')" :value="10" />
<el-option key="1" :label="$t('page.system.template.statusDisable')" :value="1" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
<el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list">
<el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" />
<el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
<el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" />
<el-table-column :label="$t('page.system.template.status')" prop="status" width="150">
<el-table v-loading="loading" border :data="list">
<!-- 单选列 -->
<el-table-column width="80" align="center">
<template slot-scope="scope">
<span v-if="scope.row.status === 10">{{ $t('page.system.template.statusEnable') }}</span>
<span v-if="scope.row.status === 1">{{ $t('page.system.template.statusDisable') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('form.operate')" fixed="right" align="center" width="150">
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.status === 10" @click="handleSelect(scope.row)">{{ $t('page.system.template.select') }}</el-button>
<el-radio v-model="selectedId" :label="scope.row.id" class="hide-label" @click.native.stop="handleRadioClick(scope.row)"></el-radio>
</template>
</el-table-column>
<el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" width="150px"/>
<el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
<el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" width="150px"/>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum"
:limit.sync="searchForm.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
@pagination="getList" />
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="open = false">{{ $t('form.cancel') }}</el-button>
<el-button type="primary" :disabled="!(this.selectedId && this.selectedId !== '')" @click="handleSelect">{{
$t('form.saveConfirm') }}</el-button>
</div>
</el-dialog>
</div>
@ -56,13 +44,14 @@ import { public_templateList } from "@/api/business/public/public";
import SelectDept from "@/views/business/comps/select/SelectDept";
export default {
name: "SelectTemplateDialog",
components: {SelectDept},
components: { SelectDept },
props: {
},
watch: {
},
data() {
return {
selectedId: null,
loading: false,
open: false,
total: 0,
@ -70,7 +59,7 @@ export default {
searchForm: {
pageNum: 1,
pageSize: 10,
sn: '',
sn: '',
name: '',
deptId: null,
status: '',
@ -80,12 +69,16 @@ export default {
mounted() {
},
methods: {
handleRadioClick(row) {
this.selectedId = row.id
},
show() {
this.selectedId=null
this.search()
},
search() {
this.searchForm.pageNum = 1;
this.open = true
this.open = true
this.getList();
},
reset() {
@ -106,8 +99,10 @@ export default {
this.loading = false
})
},
handleSelect(row) {
this.$emit('callback', row);
handleSelect() {
let that = this
let _index = _.findIndex(this.list, function (item) { return item.id = that.selectedId })
this.$emit('callback', this.list[_index]);
this.open = false
}
}
@ -115,5 +110,7 @@ export default {
</script>
<style rel="stylesheet/scss" lang="scss">
.select-template {}
.select-template {
}
</style>

+ 0
- 1
src/views/business/study/comp/tbbd/Xq.vue View File

@ -7,7 +7,6 @@ G