Skip to content

A
agcs2.0-web
Commit 730d022e authored by liang's avatar liang
Browse files
Options

Merge branch 'dev' of https://inno.sh-sict.com/gitlab/qq5616657/agcs2.0-web into dev 

# Conflicts:
#	src/views/Home/index.vue
parents 1035b2c8 fc8b1546
Hide whitespace changes
Inline Side-by-side
Showing with 622 additions and 499 deletions
src/components/DialogComponents/Form.vue
View file @ 730d022e
...@@ -20,254 +20,250 @@ ...@@ -20,254 +20,250 @@
> >
<el-row> <el-row>
<template v-for="(item, index) in formDataSet"> <template v-for="(item, index) in formDataSet">
<el-col <!-- <el-col
v-if="!item.hidden" v-if="!item.hidden"
:span="item.spanCount ? item.spanCount : countLine" :span="item.spanCount ? item.spanCount : countLine"
:key="item.prop" :key="item.prop"
:class="item.class" :class="item.class"
> -->
<el-form-item
:key="index"
:label="item.label ? `${item.label}:` : ''"
:label-width="item.labelWidth"
:prop="item.prop"
:rules="item.rules"
:class="item.className"
:style="item.style"
> >
<el-form-item <!-- 按钮控制 -->
:key="index" <el-button
:label="item.label ? `${item.label}:` : ''" v-if="item.operation"
:label-width="item.labelWidth" class="operBtn"
:prop="item.prop" :type="item.operation.type ? item.operation.type : 'text'"
:rules="item.rules" :autofocus="item.autofocus"
:class="item.className" @click="item.operation.func ? item.operation.func(form) : {}"
:style="item.style" >
{{
item.operation.text ? item.operation.text : "新增"
}}</el-button
> >
<!-- 按钮控制 -->
<el-button
v-if="item.operation"
class="operBtn"
:type="item.operation.type ? item.operation.type : 'text'"
:autofocus="item.autofocus"
@click="item.operation.func ? item.operation.func(form) : {}"
>
{{
item.operation.text ? item.operation.text : "新增"
}}</el-button
>
<!-- 提示 --> <!-- 提示 -->
<el-tooltip <el-tooltip
v-if="item.tips" v-if="item.tips"
effect="dark" effect="dark"
:content="item.tips" :content="item.tips"
placement="top" placement="top"
slot="label" slot="label"
>
<span :style="item.tipsStyle">{{ item.label }}：</span>
</el-tooltip>
<!-- 输入框 input -->
<el-input
v-if="item.type === 'input'"
:type="item.inputType ? item.inputType : ''"
:maxlength="item.maxlength"
:minlength="item.minlength"
:placeholder="item.placeholder"
clearable
:disabled="item.disabled"
v-model="form[item.prop]"
@input="item.func ? item.func($event) : {}"
:resize="item.resize"
:rows="item.rows"
:autosize="item.autosize"
>
<span
:slot="item.slot ? item.slot : 'append'"
v-if="item.unit"
>{{ item.unit }}</span
> >
<span :style="item.tipsStyle">{{ item.label }}：</span> </el-input>
</el-tooltip>
<!-- 输入框 input --> <!-- 数字输入框 -->
<el-input <div v-if="item.type === 'number'" style="display: inline-table">
v-if="item.type === 'input'" <el-input-number
:type="item.inputType ? item.inputType : ''" :min="item.min"
:maxlength="item.maxlength" :max="item.max"
:minlength="item.minlength"
:placeholder="item.placeholder"
clearable clearable
:precision="item.precision"
:controls="item.controls || false"
:disabled="item.disabled" :disabled="item.disabled"
v-model="form[item.prop]" v-model="form[item.prop]"
:placeholder="item.placeholder"
@input="item.func ? item.func($event) : {}" @input="item.func ? item.func($event) : {}"
:resize="item.resize" style="display: table-cell"
:rows="item.rows" ></el-input-number>
:autosize="item.autosize" <span
v-if="item.append"
class="el-input-group__append"
style="line-height: 28px"
>{{ item.append }}</span
> >
<span </div>
:slot="item.slot ? item.slot : 'append'" <!-- 模糊查询输入 -->
v-if="item.unit" <el-autocomplete
>{{ item.unit }}</span v-else-if="item.type === 'autocomplete'"
> popper-class="my-autocomplete"
</el-input> v-model="form[item.prop]"
:fetch-suggestions="item.func"
:placeholder="item.placeholder"
@select="item.selectfun"
clearable
>
<template slot-scope="{ item }">
<div class="name">
{{ item.value }}
<span v-if="item.specification"
>({{ item.specification }})</span
>
</div>
<span class="description">{{ item.description }}</span>
</template>
</el-autocomplete>
<!-- 数字输入框 --> <!-- 选择器 -->
<div <el-select
v-if="item.type === 'number'" v-else-if="item.type === 'select'"
style="display: inline-table" :multiple="item.multiple"
> :disabled="item.disabled"
<el-input-number v-model="form[item.prop]"
:min="item.min" :placeholder="item.placeholder ? item.placeholder : '请选择'"
:max="item.max" :filterable="item.filterable ? false : true"
clearable clearable
:precision="item.precision" :value-key="item.key ? item.key : 'value'"
:controls="item.controls || false" @change="item.func ? item.func($event) : {}"
:disabled="item.disabled" >
v-model="form[item.prop]" <el-option
:placeholder="item.placeholder" v-for="(opt, optIndex) in item.opts"
@input="item.func ? item.func($event) : {}" :key="optIndex"
style="display: table-cell" :label="opt.label"
></el-input-number> :value="item.isSelect ? opt.selectValue : opt.value"
<span :disabled="opt.disabled"
v-if="item.append"
class="el-input-group__append"
style="line-height: 28px"
>{{ item.append }}</span
>
</div>
<!-- 模糊查询输入 -->
<el-autocomplete
v-else-if="item.type === 'autocomplete'"
popper-class="my-autocomplete"
v-model="form[item.prop]"
:fetch-suggestions="item.func"
:placeholder="item.placeholder"
@select="item.selectfun"
clearable
> >
<template slot-scope="{ item }"> <span style="float: left">{{ opt.label }}</span>
<div class="name"> <span style="float: right; color: #8492a6; font-size: 10px">{{
{{ item.value }} opt.description
<span v-if="item.specification" }}</span>
>({{ item.specification }})</span </el-option>
> </el-select>
</div>
<span class="description">{{ item.description }}</span>
</template>
</el-autocomplete>
<!-- 选择器 --> <!-- 模糊查询选择 -->
<el-select <el-select
v-else-if="item.type === 'select'" v-else-if="item.type === 'remote'"
:multiple="item.multiple" v-model="form[item.prop]"
:disabled="item.disabled" filterable
v-model="form[item.prop]" remote
:placeholder="item.placeholder ? item.placeholder : '请选择'" reserve-keyword
:filterable="item.filterable ? false : true" :multiple="item.multiple ? true : false"
clearable :placeholder="item.placeholder"
:value-key="item.key ? item.key : 'value'" :remote-method="item.remoteFunc"
@change="item.func ? item.func($event) : {}" v-el-select-loadmore="loadmore"
> @change="item.func ? item.func($event) : {}"
<el-option >
v-for="(opt, optIndex) in item.opts" <el-option
:key="optIndex" v-for="(opt, optIndex) in item.opts"
:label="opt.label" :key="optIndex"
:value="item.isSelect ? opt.selectValue : opt.value" :label="opt.label"
:disabled="opt.disabled" :value="item.isSelect ? opt.selectValue : opt.value"
> ></el-option>
<span style="float: left">{{ opt.label }}</span> </el-select>
<span
style="float: right; color: #8492a6; font-size: 10px"
>{{ opt.description }}</span
>
</el-option>
</el-select>
<!-- 模糊查询选择 --> <!-- 日期 -->
<el-select <el-date-picker
v-else-if="item.type === 'remote'" v-else-if="item.type === 'date'"
v-model="form[item.prop]" v-model="form[item.prop]"
filterable :type="item.dateType ? item.dateType : 'date'"
remote :placeholder="item.placeholder"
reserve-keyword :picker-options="item.options"
:multiple="item.multiple ? true : false" :format="item.format"
:placeholder="item.placeholder" :value-format="item.valueFormat"
:remote-method="item.remoteFunc" @change="item.func ? item.func($event) : {}"
v-el-select-loadmore="loadmore" ></el-date-picker>
@change="item.func ? item.func($event) : {}" <!-- 时间 -->
> <el-time-picker
<el-option v-else-if="item.type === 'time'"
v-for="(opt, optIndex) in item.opts" :format="item.format"
:key="optIndex" :value-format="item.valueFormat"
:label="opt.label" v-model="form[item.prop]"
:value="item.isSelect ? opt.selectValue : opt.value" :picker-options="item.options"
></el-option> @change="item.func ? item.func($event) : {}"
</el-select> ></el-time-picker>
<!-- 开关 -->
<el-switch
v-else-if="item.type === 'switch'"
:disabled="item.disabled"
:active-value="item.activeValue || 1"
:inactive-value="item.inactiveValue || 0"
v-model="form[item.prop]"
>
</el-switch>
<!-- 日期 --> <!-- 单选框 -->
<el-date-picker <el-radio
v-else-if="item.type === 'date'" :class="item.class"
v-model="form[item.prop]" v-else-if="item.type === 'radio'"
:type="item.dateType ? item.dateType : 'date'" v-model="form[item.prop]"
:placeholder="item.placeholder" v-for="(opt, optIndex) in item.opts"
:picker-options="item.options" :key="optIndex"
:format="item.format" :label="opt.value"
:value-format="item.valueFormat" @change="item.func ? item.func($event) : {}"
@change="item.func ? item.func($event) : {}" >{{ opt.label }}</el-radio
></el-date-picker> >
<!-- 时间 -->
<el-time-picker
v-else-if="item.type === 'time'"
:format="item.format"
:value-format="item.valueFormat"
v-model="form[item.prop]"
:picker-options="item.options"
@change="item.func ? item.func($event) : {}"
></el-time-picker>
<!-- 开关 -->
<el-switch
v-else-if="item.type === 'switch'"
:disabled="item.disabled"
:active-value="item.activeValue || 1"
:inactive-value="item.inactiveValue || 0"
v-model="form[item.prop]"
>
</el-switch>
<!-- 单选框 --> <!-- 多选框 -->
<el-radio <el-checkbox-group
:class="item.class" v-else-if="item.type === 'checkbox'"
v-else-if="item.type === 'radio'" v-model="form[item.prop]"
v-model="form[item.prop]" >
<el-checkbox
v-for="(opt, optIndex) in item.opts" v-for="(opt, optIndex) in item.opts"
:key="optIndex" :key="optIndex"
:label="opt.value" :label="opt.label"
@change="item.func ? item.func($event) : {}" ></el-checkbox>
>{{ opt.label }}</el-radio </el-checkbox-group>
>
<!-- 多选框 -->
<el-checkbox-group
v-else-if="item.type === 'checkbox'"
v-model="form[item.prop]"
>
<el-checkbox
v-for="(opt, optIndex) in item.opts"
:key="optIndex"
:label="opt.label"
></el-checkbox>
</el-checkbox-group>
<!-- 级联 --> <!-- 级联 -->
<el-cascader <el-cascader
v-else-if="item.type === 'cascader'" v-else-if="item.type === 'cascader'"
:options="item.list" :options="item.list"
v-model="form[item.prop]" v-model="form[item.prop]"
:clearable="true" :clearable="true"
:filterable="true" :filterable="true"
></el-cascader> ></el-cascader>
<!-- 树形 --> <!-- 树形 -->
<el-tree <el-tree
v-else-if="item.type === 'tree'" v-else-if="item.type === 'tree'"
ref="tree" ref="tree"
:data="treeList" :data="treeList"
show-checkbox show-checkbox
:node-key="item.nodeKey || 'id'" :node-key="item.nodeKey || 'id'"
:props="item.props || defaultProps" :props="item.props || defaultProps"
></el-tree> ></el-tree>
<!-- 导入文件 --> <!-- 导入文件 -->
<template v-else-if="item.type === 'import'"> <template v-else-if="item.type === 'import'">
<div class="import-container" @click="handleImport"> <div class="import-container" @click="handleImport">
<span v-if="form[item.prop]">{{ form[item.prop] }}</span> <span v-if="form[item.prop]">{{ form[item.prop] }}</span>
<span v-else class="wait">{{ item.placeholder }}</span> <span v-else class="wait">{{ item.placeholder }}</span>
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
</div> </div>
<input <input
ref="fileInput" ref="fileInput"
type="file" type="file"
class="import-file" class="import-file"
:accept="item.accept" :accept="item.accept"
@change="handleFileChange($event)" @change="handleFileChange($event)"
/> />
</template> </template>
<span v-else-if="item.type === 'text'">{{ <span v-else-if="item.type === 'text'">{{
form[item.prop] form[item.prop]
}}</span> }}</span>
</el-form-item> </el-form-item>
</el-col> <!-- </el-col> -->
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
...@@ -571,4 +567,8 @@ export default { ...@@ -571,4 +567,8 @@ export default {
.el-autocomplete { .el-autocomplete {
width: 100%; width: 100%;
} }
.el-row {
display: flex;
flex-wrap: wrap;
}
</style> </style>
src/components/FormComponents/index.vue
View file @ 730d022e
...@@ -10,209 +10,204 @@ ...@@ -10,209 +10,204 @@
:style="formStyle" :style="formStyle"
@submit.native.prevent="handleSearch()" @submit.native.prevent="handleSearch()"
> >
<el-col <div v-for="(item, index) in forms" :key="index">
v-for="(item, index) in forms" <template v-if="!item.hidden">
v-if="!item.hidden" <el-form-item
:key="index" v-if="item.type != 'btn'"
:xs="item.xs ? item.xs : 24" :label="item.label ? item.label + (item.hiddenColon ? '' : '：') : ''"
:sm="item.sm ? item.sm : 12" :prop="item.prop"
:md="item.md ? item.md : 8" :rules="item.rules"
:lg="item.lg ? item.lg : 8" :label-width="item.labelWidth || '110px'"
:xl="item.xl ? item.xl : 6"
>
<el-form-item
v-if="item.type != 'btn'"
:label="item.label ? item.label + (item.hiddenColon ? '' : '：') : ''"
:prop="item.prop"
:rules="item.rules"
:label-width="item.labelWidth || '110px'"
>
<!-- 输入框 -->
<el-input
v-if="item.type === 'input'"
:id="item.id ? item.id : ''"
v-model="form[item.prop]"
:readonly="item.readonly"
:disabled="item.disabled"
clearable=""
:placeholder="item.placeholder"
@focus="item.focusFunc ? item.focusFunc($event) : {}"
@change="item.func ? item.func($event) : {}"
> >
<span v-if="item.unit" :slot="item.slot ? item.slot : 'append'"> <!-- 输入框 -->
{{ item.unit }}
</span>
</el-input>
<template v-if="item.type === 'textarea'">
<el-input <el-input
v-if="item.type === 'input'"
:id="item.id ? item.id : ''"
v-model="form[item.prop]" v-model="form[item.prop]"
type="textarea" :readonly="item.readonly"
:disabled="item.disabled"
clearable=""
:placeholder="item.placeholder" :placeholder="item.placeholder"
:rows="item.rows" @focus="item.focusFunc ? item.focusFunc($event) : {}"
:autosize="item.autosize" @change="item.func ? item.func($event) : {}"
:minlength="item.minlength" >
:maxlength="item.maxlength" <span v-if="item.unit" :slot="item.slot ? item.slot : 'append'">
:show-word-limit="item.showLimit" {{ item.unit }}
></el-input> </span>
</template> </el-input>
<!-- 模糊查询输入 --> <template v-if="item.type === 'textarea'">
<el-autocomplete <el-input
v-else-if="item.type === 'autocomplete'" v-model="form[item.prop]"
v-model="form[item.prop]" type="textarea"
:popper-class="item.popperClass" :placeholder="item.placeholder"
style="width: 100%" :rows="item.rows"
:fetch-suggestions="item.func" :autosize="item.autosize"
:placeholder="item.placeholder" :minlength="item.minlength"
clearable :maxlength="item.maxlength"
@select="item.selectfun ? item.selectfun($event) : {}" :show-word-limit="item.showLimit"
> ></el-input>
<template slot-scope="{ item }">
<div class="name">{{ item.value }}</div>
<span class="description">{{ item.description }}</span>
</template> </template>
</el-autocomplete>
<!-- 模糊查询选择 --> <!-- 模糊查询输入 -->
<el-select <el-autocomplete
v-else-if="item.type === 'remote'" v-else-if="item.type === 'autocomplete'"
v-model="form[item.prop]" v-model="form[item.prop]"
filterable :popper-class="item.popperClass"
remote style="width: 100%"
reserve-keyword :fetch-suggestions="item.func"
:placeholder="item.placeholder" :placeholder="item.placeholder"
:remote-method="item.remoteFunc" clearable
> @select="item.selectfun ? item.selectfun($event) : {}"
<el-option >
v-for="(opt, optIndex) in item.opts" <template slot-scope="{ item }">
:key="optIndex" <div class="name">{{ item.value }}</div>
:label="opt.label" <span class="description">{{ item.description }}</span>
:value="item.isSelect ? opt.selectValue : opt.value" </template>
></el-option> </el-autocomplete>
</el-select>
<!-- 日期区间 --> <!-- 模糊查询选择 -->
<el-date-picker <el-select
v-else-if="item.type === 'daterange'" v-else-if="item.type === 'remote'"
v-model="form[item.prop]" v-model="form[item.prop]"
type="daterange" filterable
align="right" remote
unlink-panels reserve-keyword
range-separator="-" :placeholder="item.placeholder"
start-placeholder="开始日期" :remote-method="item.remoteFunc"
end-placeholder="结束日期" >
:picker-options="item.options" <el-option
:format="item.format" v-for="(opt, optIndex) in item.opts"
:value-format="item.valueFormat" :key="optIndex"
></el-date-picker> :label="opt.label"
:value="item.isSelect ? opt.selectValue : opt.value"
></el-option>
</el-select>
<!-- 日期 --> <!-- 日期区间 -->
<el-date-picker <el-date-picker
v-else-if="item.type === 'date'" v-else-if="item.type === 'daterange'"
v-model="form[item.prop]" v-model="form[item.prop]"
:type="item.dateType ? item.dateType : 'date'" type="daterange"
:placeholder="item.placeholder" align="right"
:picker-options="item.options" unlink-panels
:format="item.format" range-separator="-"
:value-format="item.valueFormat" start-placeholder="开始日期"
></el-date-picker> end-placeholder="结束日期"
:picker-options="item.options"
:format="item.format"
:value-format="item.valueFormat"
@change="handleSearch"
></el-date-picker>
<!-- 下拉框 --> <!-- 日期 -->
<el-select <el-date-picker
v-else-if="item.type === 'select'" v-else-if="item.type === 'date'"
v-model="form[item.prop]" v-model="form[item.prop]"
clearable :type="item.dateType ? item.dateType : 'date'"
filterable :placeholder="item.placeholder"
:disabled="item.disabled" :picker-options="item.options"
:placeholder="item.placeholder ? item.placeholder : '请选择'" :format="item.format"
@change="item.func ? item.func($event) : {}" :value-format="item.valueFormat"
> @change="handleSearch"
<el-option ></el-date-picker>
<!-- 下拉框 -->
<el-select
v-else-if="item.type === 'select'"
v-model="form[item.prop]"
clearable
filterable
:disabled="item.disabled"
:placeholder="item.placeholder ? item.placeholder : '请选择'"
@change="item.func ? item.func($event) : handleSearch()"
>
<el-option
v-for="(opt, optIndex) in item.opts"
:key="optIndex"
:label="opt.label"
:value="item.isSelect ? opt.selectValue : opt.value"
></el-option>
</el-select>
<!-- 单选框 -->
<el-radio
v-for="(opt, optIndex) in item.opts" v-for="(opt, optIndex) in item.opts"
v-else-if="item.type === 'radio'"
:key="optIndex" :key="optIndex"
:label="opt.label" v-model="form[item.prop]"
:value="item.isSelect ? opt.selectValue : opt.value" :class="item.class"
></el-option> :label="opt.value"
</el-select> @change="item.func ? item.func($event) : {}"
>{{ opt.label }}</el-radio
<!-- 单选框 --> >
<el-radio
v-for="(opt, optIndex) in item.opts"
v-else-if="item.type === 'radio'"
:key="optIndex"
v-model="form[item.prop]"
:class="item.class"
:label="opt.value"
@change="item.func ? item.func($event) : {}"
>{{ opt.label }}</el-radio
>
<!-- 级联 --> <!-- 级联 -->
<el-cascader <el-cascader
v-else-if="item.type === 'cascader'" v-else-if="item.type === 'cascader'"
v-model="form[item.prop]" v-model="form[item.prop]"
:style="'width:' + item.width" :style="'width:' + item.width"
:options="item.list" :options="item.list"
:change-on-select="item.changeSelect" :change-on-select="item.changeSelect"
:show-all-levels="item.showLevel" :show-all-levels="item.showLevel"
></el-cascader> ></el-cascader>
<!-- 文字 --> <!-- 文字 -->
<span v-else-if="item.type === 'text'">{{ <span v-else-if="item.type === 'text'">{{
item.text ? item.text : form[item.prop] item.text ? item.text : form[item.prop]
}}</span> }}</span>
<!-- 数字输入框 --> <!-- 数字输入框 -->
<el-input-number <el-input-number
v-else-if="item.type === 'number'" v-else-if="item.type === 'number'"
v-model="form[item.prop]" v-model="form[item.prop]"
:controls="false" :controls="false"
:min="item.min || 0" :min="item.min || 0"
:precision="item.precision" :precision="item.precision"
:disabled="item.disabled || disabled" :disabled="item.disabled || disabled"
/> />
<!-- 图标 --> <!-- 图标 -->
<span v-else-if="item.type === 'svg'"> <span v-else-if="item.type === 'svg'">
<svg-icon <svg-icon
:style="item.style" :style="item.style"
:icon-class="item.iconClass" :icon-class="item.iconClass"
class="form-svg" class="form-svg"
@click.native="clickSvg(item.func)" @click.native="clickSvg(item.func)"
></svg-icon> ></svg-icon>
</span> </span>
</el-form-item> </el-form-item>
<div v-if="item.type == 'btn'" class="flex"> <div v-if="item.type == 'btn'" class="flex">
<template v-for="(btn, index) in item.list"> <template v-for="(btn, index) in item.list">
<el-button <el-button
v-if="btn.btnType == 'button'" v-if="btn.btnType == 'button'"
:key="index" :key="index"
:type="btn.type" :type="btn.type"
:size="size" :size="size"
:icon="btn.icon" :icon="btn.icon"
:style="btn.style" :style="btn.style"
@click="btn.func(form)" @click="btn.func(form)"
>{{ btn.btnText }}</el-button >{{ btn.btnText }}</el-button
>
<div
v-if="btn.btnType == 'tobeModified'"
:key="index"
class="tobeModified"
:style="{ backgroundColor: modifiedFlag ? '#4E68FF' : '#fff' }"
@click="changeModified"
>
<i
:style="{ color: modifiedFlag ? '#fff' : '#d9d9d9' }"
class="el-icon-check"
></i>
<span :style="{ color: modifiedFlag ? '#fff' : '#000' }"
>待修改（{{ btn.tobeModified }}）</span
> >
</div> <div
</template> v-if="btn.btnType == 'tobeModified'"
</div> :key="index"
</el-col> class="tobeModified"
:style="{ backgroundColor: modifiedFlag ? '#4E68FF' : '#fff' }"
@click="changeModified"
>
<i
:style="{ color: modifiedFlag ? '#fff' : '#d9d9d9' }"
class="el-icon-check"
></i>
<span :style="{ color: modifiedFlag ? '#fff' : '#000' }"
>待修改（{{ btn.tobeModified }}）</span
>
</div>
</template>
</div></template
>
</div>
<el-col v-if="lists" :xs="24" :sm="24" :lg="24" style="padding-left: 120px"> <el-col v-if="lists" :xs="24" :sm="24" :lg="24" style="padding-left: 120px">
<el-button <el-button
...@@ -342,6 +337,8 @@ export default { ...@@ -342,6 +337,8 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.el-form-self { .el-form-self {
display: flex;
flex-wrap: wrap;
width: 100%; width: 100%;
margin: 20px 0; margin: 20px 0;
overflow: hidden; overflow: hidden;
......
src/components/TabComponents/index.vue
View file @ 730d022e
...@@ -685,8 +685,8 @@ ...@@ -685,8 +685,8 @@
<template v-if="column.type === 'switch'"> <template v-if="column.type === 'switch'">
<el-switch <el-switch
v-model="scope.row[column.value]" v-model="scope.row[column.value]"
:active-value="1" :active-value="0"
:inactive-value="0" :inactive-value="1"
@change="column.func(scope.row, scope.$index)" @change="column.func(scope.row, scope.$index)"
></el-switch> ></el-switch>
</template> </template>
......
src/components/UploadForOperation/index.vue
View file @ 730d022e
...@@ -110,7 +110,7 @@ export default { ...@@ -110,7 +110,7 @@ export default {
type: Number, type: Number,
default: 9, default: 9,
}, },
fileSize: Number, fileSize: { type: Number, default: 10 * 1024 * 1024 },
loadText: String, loadText: String,
showFileList: { showFileList: {
type: Boolean, type: Boolean,
...@@ -186,8 +186,9 @@ export default { ...@@ -186,8 +186,9 @@ export default {
beforeUpload(file) { beforeUpload(file) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const size = this.fileSize const size = this.fileSize
console.log(file.size)
if (size && file.size > size) { if (size && file.size > size) {
this.$message.error("大小超出限制" + this.tip) this.$message.error("文件大小超出限制，请上传10M以下的文件")
reject() reject()
} }
resolve() resolve()
...@@ -213,7 +214,7 @@ export default { ...@@ -213,7 +214,7 @@ export default {
// 移除提醒 // 移除提醒
beforeRemove(file, fileList) { beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.file_name || file.name}？`) // return this.$confirm(`确定移除 ${file.file_name || file.name}？`)
}, },
// 移除 // 移除
......
src/components/layout/index.vue
View file @ 730d022e
...@@ -104,10 +104,10 @@ export default { ...@@ -104,10 +104,10 @@ export default {
route: "/allianceintroduction", route: "/allianceintroduction",
name: "联盟介绍", name: "联盟介绍",
}, },
{ // {
route: "/healthpopularization", // route: "/healthpopularization",
name: "健康科普", // name: "健康科普",
}, // },
{ {
route: "/scientificresearch", route: "/scientificresearch",
name: "科学研究", name: "科学研究",
......
src/layouts/components/NavBar/index.vue
View file @ 730d022e
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="userInfo"> <div class="userInfo">
<error-log></error-log> <error-log></error-log>
<!-- <avatar></avatar> --> <!-- <avatar></avatar> -->
<div v-if="$route.path != '/auditqualitycontrol'" class="fontSelect"> <div v-if="showFontList.includes($route.path)" class="fontSelect">
<div <div
v-for="(item, index) in fontList" v-for="(item, index) in fontList"
:key="index" :key="index"
...@@ -122,6 +122,25 @@ export default { ...@@ -122,6 +122,25 @@ export default {
return { return {
pulse: false, pulse: false,
isDot: true, isDot: true,
showFontList: [
"/dataoverview",
"/screening/index",
"/screening/draft",
"/followupquery",
"/followupresearch",
"/auditqualitycontrol",
"/field-mapping",
"/systems/form-config",
"/database",
"/systems/colla-group",
"/systems/org",
"/systems/dict",
"/systems/user",
"/systems/role",
"/systems/menu",
"/systems/medicalunion",
"/operation",
],
screeningList: [ screeningList: [
{ {
title: "社区筛查", title: "社区筛查",
......
src/store/modules/table.js
View file @ 730d022e
const state = { const state = {
fontSize: localStorage.getItem("fontSize") || 1, fontSize: localStorage.getItem("fontSize") || 14,
selectedIndex: sessionStorage.getItem("selectedIndex") || "", selectedIndex: sessionStorage.getItem("selectedIndex") || "",
refreshFlag: 0, refreshFlag: 0,
} }
......
src/views/Home/HealthPopularization/index.vue
View file @ 730d022e
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="list_title"> <div class="list_title">
{{ leftBar[activeBar].name }} {{ leftBar[activeBar].name }}
</div> </div>
<ul class="list" v-if="tableData.length > 0"> <ul v-if="tableData.length > 0" class="list">
<li v-for="(item, index) in tableData" :key="index"> <li v-for="(item, index) in tableData" :key="index">
<div class="leftImg"> <div class="leftImg">
<img <img
...@@ -62,14 +62,19 @@ ...@@ -62,14 +62,19 @@
{{ item }}<span v-if="index != showTitle.length - 1"> / </span> {{ item }}<span v-if="index != showTitle.length - 1"> / </span>
</div> </div>
</div> </div>
{{ showText }} <div class="refuteList">
<!-- <pdf :src="pdfSrc"></pdf> -->
<pdf-view ref="pdfView" :pdf-url="pdfSrc"></pdf-view>
</div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { articleList } from "@/api/operation-management" import { articleList } from "@/api/operation-management"
import PdfView from "../PdfView/index"
import paginationMixin from "@/components/TabComponents/mixin" import paginationMixin from "@/components/TabComponents/mixin"
export default { export default {
components: { PdfView },
mixins: [paginationMixin], mixins: [paginationMixin],
data() { data() {
return { return {
...@@ -89,7 +94,7 @@ export default { ...@@ -89,7 +94,7 @@ export default {
name: "其他", name: "其他",
}, },
], ],
showText: "", pdfSrc: "",
showTitle: [], showTitle: [],
showDetail: false, showDetail: false,
// 分页数据 // 分页数据
...@@ -97,6 +102,15 @@ export default { ...@@ -97,6 +102,15 @@ export default {
tableData: [], tableData: [],
} }
}, },
watch: {
showDetail(v) {
if (v) {
setTimeout(() => {
this.$refs.pdfView.loadPDF()
}, 250)
}
},
},
mounted() { mounted() {
console.log(this.$route) console.log(this.$route)
if (this.$route.query.tabIndex) { if (this.$route.query.tabIndex) {
...@@ -112,6 +126,7 @@ export default { ...@@ -112,6 +126,7 @@ export default {
size: this.pageSize, size: this.pageSize,
current: this.pageIndex, current: this.pageIndex,
moduleType: "4", moduleType: "4",
status: "1",
articleType: this.activeBar - 0 + 1, articleType: this.activeBar - 0 + 1,
} }
articleList(params) articleList(params)
...@@ -129,19 +144,23 @@ export default { ...@@ -129,19 +144,23 @@ export default {
changeActive(i) { changeActive(i) {
this.activeBar = i this.activeBar = i
this.showDetail = false this.showDetail = false
this.showText = "" this.pdfSrc = ""
this.getArticleList() this.getArticleList()
}, },
viewDetail(i) { viewDetail(i) {
this.showDetail = true this.showDetail = true
this.showText = this.tableData[i].articleContent this.pdfSrc =
"https://ds.cixincloud.com/geca-api/disease-data/file/info/" +
this.tableData[i].filePath[0].bucketName +
"/" +
this.tableData[i].filePath[0].uuidName
this.showTitle[0] = this.leftBar[this.activeBar].name this.showTitle[0] = this.leftBar[this.activeBar].name
this.showTitle[1] = this.tableData[i].articleTitle this.showTitle[1] = this.tableData[i].articleTitle
console.log(this.showText) console.log(this.pdfSrc)
}, },
back(index) { back(index) {
if (index == 0) { if (index == 0) {
this.showText = "" this.pdfSrc = ""
this.showDetail = false this.showDetail = false
} }
}, },
...@@ -268,4 +287,8 @@ export default { ...@@ -268,4 +287,8 @@ export default {
font-family: AlibabaPuHuiTiR; font-family: AlibabaPuHuiTiR;
} }
} }
.refuteList {
height: 100%;
// overflow: auto;
}
</style> </style>
src/views/Home/PdfView/index.vue
View file @ 730d022e
...@@ -199,7 +199,7 @@ export default { ...@@ -199,7 +199,7 @@ export default {
left: 0; left: 0;
right: 0; right: 0;
padding: 10px 0; padding: 10px 0;
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 1);
.info { .info {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
......
src/views/Home/ScientificResearch/index.vue
View file @ 730d022e
<template> <template>
<div class="commonList"> <div class="commonList">
<ul class="left_bar"> <!-- <ul class="left_bar">
<li <li
v-for="(item, index) in leftBar" v-for="(item, index) in leftBar"
:key="index" :key="index"
...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
> >
{{ item.name }} {{ item.name }}
</li> </li>
</ul> </ul> -->
<div v-loading="listLoading" class="right_list"> <div v-loading="listLoading" class="right_list">
<div class="list_title"> <!-- <div class="list_title">
{{ leftBar[activeBar].name }} {{ leftBar[activeBar].name }}
</div> </div> -->
<ul v-if="tableData.length > 0" class="list"> <ul v-if="tableData.length > 0" class="list">
<li <li
v-for="(item, index) in tableData" v-for="(item, index) in tableData"
...@@ -103,7 +103,8 @@ export default { ...@@ -103,7 +103,8 @@ export default {
size: this.pageSize, size: this.pageSize,
current: this.pageIndex, current: this.pageIndex,
moduleType: "5", moduleType: "5",
articleType: this.activeBar - 0 + 1, status: "1",
// articleType: this.activeBar - 0 + 1,
} }
articleList(params) articleList(params)
.then((res) => { .then((res) => {
...@@ -159,7 +160,8 @@ export default { ...@@ -159,7 +160,8 @@ export default {
} }
} }
.right_list { .right_list {
width: calc(100% - 208px); width: 100%;
// width: calc(100% - 208px);
height: 760px; height: 760px;
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
......
src/views/Home/index.vue
View file @ 730d022e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div id="con"> <div id="con">
<Notice v-show="isNotice"></Notice> <Notice v-show="isNotice"></Notice>
<div v-show="!isNotice"> <div v-show="!isNotice">
<div class="top flex"> <div class="flex">
<div class="left box"> <div class="left box">
<video :src="videoSrc" controls class="video" /> <video :src="videoSrc" controls class="video" />
</div> </div>
...@@ -15,7 +15,10 @@ ...@@ -15,7 +15,10 @@
:label="e.title" :label="e.title"
:name="index + 1 + ''" :name="index + 1 + ''"
> >
<ul class="tabslist"> <ul
class="tabslist videoTabList"
:style="{ height: videoHeight }"
>
<li <li
v-for="(item, index) in noticeList" v-for="(item, index) in noticeList"
:key="index" :key="index"
...@@ -132,7 +135,7 @@ ...@@ -132,7 +135,7 @@
</div> </div>
<!-- 健康科普 --> <!-- 健康科普 -->
<div class="healthPopularization"> <!-- <div class="healthPopularization">
<div class="title_box"> <div class="title_box">
<div class="title">健康科普</div> <div class="title">健康科普</div>
<div class="empty"></div> <div class="empty"></div>
...@@ -152,7 +155,7 @@ ...@@ -152,7 +155,7 @@
{{ item.name }} {{ item.name }}
</li> </li>
</ul> </ul>
</div> </div> -->
<!-- 科学研究 --> <!-- 科学研究 -->
<div class="scientificresearch"> <div class="scientificresearch">
...@@ -179,9 +182,9 @@ ...@@ -179,9 +182,9 @@
<div v-show="showFixed" class="fixed_box"> <div v-show="showFixed" class="fixed_box">
<ul class="f_list"> <ul class="f_list">
<el-popover <el-popover
popper-class="poperbackground"
v-for="(item, index) in rigBarList" v-for="(item, index) in rigBarList"
:key="index" :key="index"
popper-class="poperbackground"
placement="left-start" placement="left-start"
title="" title=""
width="200" width="200"
...@@ -229,9 +232,10 @@ export default { ...@@ -229,9 +232,10 @@ export default {
isNotice: false, isNotice: false,
curPdf: {}, curPdf: {},
pdfSrc: "", pdfSrc: "",
videoHeight: "0px",
fixIndex: -1, fixIndex: -1,
// videoSrc: require("../../../public/aaa.mp4"), videoSrc: require("../../../public/video.mp4"),
videoSrc: "", // videoSrc: "",
exTab: "浙江省典型案例", exTab: "浙江省典型案例",
example: [ example: [
{ {
...@@ -249,6 +253,9 @@ export default { ...@@ -249,6 +253,9 @@ export default {
{ {
title: "学术动态", title: "学术动态",
}, },
{
title: "健康知识",
},
], ],
noticeTopList: [ noticeTopList: [
{ {
...@@ -332,7 +339,24 @@ export default { ...@@ -332,7 +339,24 @@ export default {
this.showFixed = false this.showFixed = false
} }
}) })
var video = document.querySelector("video")
video.addEventListener("canplay", (e) => {
console.log(e.target.clientHeight)
this.videoHeight = e.target.clientHeight - 66 + "px"
})
}) })
window.onresize = () =>
(() => {
this.$nextTick(() => {
this.videoHeight =
document.querySelector("video").clientHeight - 66 + "px"
})
})()
},
beforeDestroy() {
window.onresize = () => {}
}, },
methods: { methods: {
setPdf(item) { setPdf(item) {
...@@ -349,7 +373,10 @@ export default { ...@@ -349,7 +373,10 @@ export default {
item.filePath[0].uuidName item.filePath[0].uuidName
}, },
handleClick() { handleClick() {
// if (this.curTab == "4") {
// } else {
this.getArticleList(this.curTab) this.getArticleList(this.curTab)
// }
}, },
// 获取新闻会议tab的数据 // 获取新闻会议tab的数据
getArticleList(moduleType) { getArticleList(moduleType) {
...@@ -363,7 +390,7 @@ export default { ...@@ -363,7 +390,7 @@ export default {
articleList(params) articleList(params)
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
if (["1", "2", "3"].includes(moduleType)) { if (["1", "2", "3", "4"].includes(moduleType)) {
const d = res.data.records const d = res.data.records
if (moduleType === "2") { if (moduleType === "2") {
this.noticeList = [...this.noticeTopList, ...d] this.noticeList = [...this.noticeTopList, ...d]
...@@ -413,7 +440,7 @@ export default { ...@@ -413,7 +440,7 @@ export default {
.video { .video {
width: 100%; width: 100%;
border-radius: 5px; border-radius: 5px;
height: 420px; // height: 420px;
object-fit: fill; object-fit: fill;
} }
} }
...@@ -422,7 +449,6 @@ export default { ...@@ -422,7 +449,6 @@ export default {
border-radius: 8px; border-radius: 8px;
overflow: hidden; overflow: hidden;
.tabslist { .tabslist {
height: 352px;
padding-right: 8px; padding-right: 8px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
...@@ -464,7 +490,7 @@ export default { ...@@ -464,7 +490,7 @@ export default {
} }
} }
.videoboxs { .videoboxs {
height: 100%; // height: 100%;
} }
} }
.dataAnalysis { .dataAnalysis {
......
src/views/followupentry/index.vue
View file @ 730d022e
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
:patient-id="patientId" :patient-id="patientId"
:screenList="screenList" :screenList="screenList"
@refreshData="refreshData" @refreshData="refreshData"
@changeShow="changeShow"
></ConfigForms> ></ConfigForms>
</div> </div>
</template> </template>
...@@ -78,6 +79,9 @@ export default { ...@@ -78,6 +79,9 @@ export default {
}) })
}, },
methods: { methods: {
changeShow() {
this.$emit("changeShow")
},
refreshData(data) { refreshData(data) {
// this.refreshFlag = false // this.refreshFlag = false
// this.$nextTick(() => { // this.$nextTick(() => {
......
src/views/followupquery/index.vue
View file @ 730d022e
<template> <template>
<!-- 随访查询 --> <!-- 随访查询 -->
<div class="screeningSearch"> <div class="screeningSearch">
<div v-show="!isDetail"> <div v-show="!isDetail && !show">
<div class="top"> <div class="top">
<form-components <form-components
ref="form" ref="form"
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
v-if="isDetail" v-if="isDetail"
@back="back" @back="back"
></FollowUpDetail> ></FollowUpDetail>
<followupentry v-if="show" @changeShow="changeShow"></followupentry>
</div> </div>
</template> </template>
<script> <script>
...@@ -40,15 +41,18 @@ import searchMixin from "../searchMixin" ...@@ -40,15 +41,18 @@ import searchMixin from "../searchMixin"
import { getCurrentFormByType } from "@/api/coop-group.js" import { getCurrentFormByType } from "@/api/coop-group.js"
import { getFollowSearch } from "@/api/followup" import { getFollowSearch } from "@/api/followup"
import FollowUpDetail from "./FollowUpDetail.vue" import FollowUpDetail from "./FollowUpDetail.vue"
import followupentry from "../followupentry"
export default { export default {
components: { components: {
FormComponents, FormComponents,
FollowUpDetail, FollowUpDetail,
followupentry,
}, },
mixins: [paginationMixin, searchMixin], mixins: [paginationMixin, searchMixin],
data() { data() {
return { return {
isDetail: false, isDetail: false,
show: false,
followId: "", followId: "",
listLoading: false, listLoading: false,
keyword: "", keyword: "",
...@@ -292,6 +296,10 @@ export default { ...@@ -292,6 +296,10 @@ export default {
this.getCurrentFormByType(2) this.getCurrentFormByType(2)
}, },
methods: { methods: {
changeShow() {
this.$router.push({ query: {} })
this.show = false
},
back() { back() {
this.isDetail = false this.isDetail = false
const followId = this.$route.query.followId const followId = this.$route.query.followId
...@@ -311,8 +319,9 @@ export default { ...@@ -311,8 +319,9 @@ export default {
console.log(v) console.log(v)
}, },
handleEdit(data, i, index) { handleEdit(data, i, index) {
this.show = true
this.$router.push({ this.$router.push({
path: "/followupentry", // path: "/followupentry",
query: { query: {
patientId: data.patientId, patientId: data.patientId,
followId: data.id, followId: data.id,
...@@ -328,9 +337,10 @@ export default { ...@@ -328,9 +337,10 @@ export default {
}, },
onSearch(form) { onSearch(form) {
console.log(form) console.log(form)
this.pageIndex = 1
sessionStorage.setItem("followQuery-form", JSON.stringify(form)) sessionStorage.setItem("followQuery-form", JSON.stringify(form))
this.formEdit = form this.formEdit = form
// this.handleSearch() this.handleSearch()
}, },
onClickSearch() { onClickSearch() {
this.pageIndex = 1 this.pageIndex = 1
......
src/views/followupresearch/index.vue
View file @ 730d022e
<template> <template>
<!-- 随访调查 --> <!-- 随访调查 -->
<div class="screeningSearch"> <div class="screeningSearch">
<div class="top"> <template v-if="!show">
<form-components <div class="top">
:forms="formList" <form-components
:formEdit="formEdit" :forms="formList"
@handleSearch="onSearch" :formEdit="formEdit"
></form-components> @handleSearch="onSearch"
</div> ></form-components>
<div class="bot"> </div>
<el-table-self <div class="bot">
ref="table" <el-table-self
:table-data="tableData" ref="table"
:columns="columns" :table-data="tableData"
:header-class="'newHeader'" :columns="columns"
:list-loading="listLoading" :header-class="'newHeader'"
:current-page="pageIndex" :list-loading="listLoading"
:total-count="total" :current-page="pageIndex"
:page-sizes="pageSizes" :total-count="total"
:page-size="pageSize" :page-sizes="pageSizes"
@pageSizeChange="handleSizeChange" :page-size="pageSize"
@currentPageChange="handleCurrentChange" @pageSizeChange="handleSizeChange"
/> @currentPageChange="handleCurrentChange"
</div> />
</div>
</template>
<followupentry v-if="show" @changeShow="changeShow"></followupentry>
</div> </div>
</template> </template>
<script> <script>
import FormComponents from "@/components/FormComponents" import FormComponents from "@/components/FormComponents"
import followupentry from "../followupentry"
import paginationMixin from "@/components/TabComponents/mixin" import paginationMixin from "@/components/TabComponents/mixin"
import searchMixin from "../searchMixin" import searchMixin from "../searchMixin"
import { getCurrentFormByType } from "@/api/coop-group.js" import { getCurrentFormByType } from "@/api/coop-group.js"
...@@ -35,12 +39,14 @@ import { mapGetters } from "vuex" ...@@ -35,12 +39,14 @@ import { mapGetters } from "vuex"
export default { export default {
components: { components: {
FormComponents, FormComponents,
followupentry,
}, },
mixins: [paginationMixin, searchMixin], mixins: [paginationMixin, searchMixin],
data() { data() {
return { return {
formId: "", //随访表单类型 formId: "", //随访表单类型
listLoading: false, listLoading: false,
show: false,
keyword: "", keyword: "",
modifiedFlag: false, modifiedFlag: false,
columns: [ columns: [
...@@ -271,6 +277,10 @@ export default { ...@@ -271,6 +277,10 @@ export default {
this.handleSearch() //调试注释 this.handleSearch() //调试注释
}, },
methods: { methods: {
changeShow() {
this.$router.push({ query: {} })
this.show = false
},
changeModified() { changeModified() {
this.modifiedFlag = !this.modifiedFlag this.modifiedFlag = !this.modifiedFlag
}, },
...@@ -287,7 +297,7 @@ export default { ...@@ -287,7 +297,7 @@ export default {
rowOpration(data, i) { rowOpration(data, i) {
sessionStorage.setItem("formEdit", JSON.stringify(data)) sessionStorage.setItem("formEdit", JSON.stringify(data))
this.$router.push({ this.$router.push({
path: `/followupentry`, // path: `/followupentry`,
query: { query: {
patientId: data.patientId, patientId: data.patientId,
getData: 0, getData: 0,
...@@ -295,6 +305,7 @@ export default { ...@@ -295,6 +305,7 @@ export default {
model: "add", model: "add",
}, },
}) })
this.show = true
}, },
async handleSearch() { async handleSearch() {
this.listLoading = true this.listLoading = true
......
src/views/screening/components/ConfigForms.vue
View file @ 730d022e
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
v-if="formType == 1 ? (!disabled ? true : false) : true" v-if="formType == 1 ? (!disabled ? true : false) : true"
class="draftButton" class="draftButton"
:loading="loading" :loading="loading"
:disabled="!infoCompelete" :disabled="formType == 1 ? !infoCompelete : false"
@click="onSubmit(formType)" @click="onSubmit(formType)"
>{{ formType == 1 ? "临时保存" : "返回" }}</el-button >{{ formType == 1 ? "临时保存" : "返回" }}</el-button
> >
...@@ -353,17 +353,21 @@ export default { ...@@ -353,17 +353,21 @@ export default {
this.loading = false this.loading = false
} else { } else {
// 返回 // 返回
this.$router.back() // this.$router.back()
this.$emit("changeShow")
} }
}, },
continueSubmit() { continueSubmit() {
sessionStorage.removeItem("index1Data") sessionStorage.removeItem("index1Data")
this.activeName = "index0" this.activeName = "index0"
// 清空表单 // 清空表单
for (let i = 0; i < this.$refs.formTabs.length; i++) { // for (let i = 0; i < this.$refs.formTabs.length; i++) {
this.$refs.formTabs[i].resetForm() // this.$refs.formTabs[i].resetForm()
this.$refs.formTabs[i].initForm() // this.$refs.formTabs[i].initForm()
} // }
this.formTabsList = []
this.formTabs = []
this.getCurrentFormByType(this.formType)
// 清空红字：不符合筛查条件 // 清空红字：不符合筛查条件
this.$refs.showDialog.dialogVisible = false this.$refs.showDialog.dialogVisible = false
if (this.$route.path != "/screening/add") { if (this.$route.path != "/screening/add") {
......
src/views/systems/medicalunion-management/index.vue
View file @ 730d022e
...@@ -259,6 +259,9 @@ export default { ...@@ -259,6 +259,9 @@ export default {
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
this.$message.success("删除成功") this.$message.success("删除成功")
if (this.tableData.length == 1 && this.pageIndex != 1) {
this.pageIndex--
}
this.handleSearch() this.handleSearch()
} }
}) })
......
src/views/systems/operation-management/components/AcademicTrend.vue
View file @ 730d022e
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<div class="bot-table"> <div class="bot-table">
<customs-table <customs-table
ref="table" ref="table"
:max-height="780"
:table-data="tableData" :table-data="tableData"
:columns="columns" :columns="columns"
:header-class="'newHeader'" :header-class="'newHeader'"
...@@ -135,7 +136,7 @@ export default { ...@@ -135,7 +136,7 @@ export default {
value: "filePath", value: "filePath",
}, },
{ {
label: "上传时间", label: "创建时间",
minWidth: 120, minWidth: 120,
value: "uploadTime", value: "uploadTime",
}, },
...@@ -223,11 +224,11 @@ export default { ...@@ -223,11 +224,11 @@ export default {
}, },
watch: {}, watch: {},
mounted() { mounted() {
this.getArticleList() this.handleSearch()
}, },
methods: { methods: {
// 获取新闻会议 // 获取新闻会议
getArticleList() { handleSearch() {
this.listLoading = true this.listLoading = true
let params = { let params = {
size: this.pageSize, size: this.pageSize,
......
src/views/systems/operation-management/components/HealthPopularization.vue
View file @ 730d022e
<template> <template>
<div id="medicalunion-management"> <div id="medicalunion-management">
<div class="top-btn"> <div class="top-btn">
<el-select v-model="selectType" @change="getArticleList"> <el-select v-model="selectType" @change="beforeSearch">
<el-option <el-option
v-for="item in selectList" v-for="item in selectList"
:key="item.value" :key="item.value"
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
ref="table" ref="table"
:table-data="tableData" :table-data="tableData"
:columns="columns" :columns="columns"
:max-height="780"
:header-class="'newHeader'" :header-class="'newHeader'"
:list-loading="listLoading" :list-loading="listLoading"
:current-page="pageIndex" :current-page="pageIndex"
...@@ -170,7 +171,7 @@ export default { ...@@ -170,7 +171,7 @@ export default {
value: "filePath", value: "filePath",
}, },
{ {
label: "上传时间", label: "创建时间",
minWidth: 120, minWidth: 120,
value: "uploadTime", value: "uploadTime",
}, },
...@@ -291,11 +292,15 @@ export default { ...@@ -291,11 +292,15 @@ export default {
}, },
watch: {}, watch: {},
mounted() { mounted() {
this.getArticleList() this.handleSearch()
}, },
methods: { methods: {
// 获取健康科普 // 获取健康科普
getArticleList() { beforeSearch() {
this.pageIndex = 1
this.handleSearch()
},
handleSearch() {
this.listLoading = true this.listLoading = true
let params = { let params = {
size: this.pageSize, size: this.pageSize,
......
src/views/systems/operation-management/components/NewsMeeting.vue
View file @ 730d022e
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
:total-count="total" :total-count="total"
:page-sizes="pageSizes" :page-sizes="pageSizes"
:page-size="pageSize" :page-size="pageSize"
:max-height="780"
@pageSizeChange="handleSizeChange" @pageSizeChange="handleSizeChange"
@currentPageChange="handleCurrentChange" @currentPageChange="handleCurrentChange"
/> />
...@@ -135,7 +136,7 @@ export default { ...@@ -135,7 +136,7 @@ export default {
value: "filePath", value: "filePath",
}, },
{ {
label: "上传时间", label: "创建时间",
minWidth: 120, minWidth: 120,
value: "uploadTime", value: "uploadTime",
}, },
...@@ -223,11 +224,11 @@ export default { ...@@ -223,11 +224,11 @@ export default {
}, },
watch: {}, watch: {},
mounted() { mounted() {
this.getArticleList() this.handleSearch()
}, },
methods: { methods: {
// 获取新闻会议 // 获取新闻会议
getArticleList() { handleSearch() {
this.listLoading = true this.listLoading = true
let params = { let params = {
size: this.pageSize, size: this.pageSize,
......
src/views/systems/operation-management/components/NoticeAnnouncement.vue
View file @ 730d022e
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
:page-sizes="pageSizes" :page-sizes="pageSizes"
:page-size="pageSize" :page-size="pageSize"
@pageSizeChange="handleSizeChange" @pageSizeChange="handleSizeChange"
:max-height="780"
@currentPageChange="handleCurrentChange" @currentPageChange="handleCurrentChange"
/> />
</div> </div>
...@@ -135,7 +136,7 @@ export default { ...@@ -135,7 +136,7 @@ export default {
value: "filePath", value: "filePath",
}, },
{ {
label: "上传时间", label: "创建时间",
minWidth: 120, minWidth: 120,
value: "uploadTime", value: "uploadTime",
}, },
...@@ -223,11 +224,11 @@ export default { ...@@ -223,11 +224,11 @@ export default {
}, },
watch: {}, watch: {},
mounted() { mounted() {
this.getArticleList() this.handleSearch()
}, },
methods: { methods: {
// 获取新闻会议 // 获取新闻会议
getArticleList() { handleSearch() {
this.listLoading = true this.listLoading = true
let params = { let params = {
size: this.pageSize, size: this.pageSize,
......
src/views/systems/operation-management/components/TypicalCase.vue
View file @ 730d022e
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
:list-loading="listLoading" :list-loading="listLoading"
:current-page="pageIndex" :current-page="pageIndex"
:total-count="total" :total-count="total"
:max-height="780"
:page-sizes="pageSizes" :page-sizes="pageSizes"
:page-size="pageSize" :page-size="pageSize"
@pageSizeChange="handleSizeChange" @pageSizeChange="handleSizeChange"
...@@ -135,7 +136,7 @@ export default { ...@@ -135,7 +136,7 @@ export default {
value: "filePath", value: "filePath",
}, },
{ {
label: "上传时间", label: "创建时间",
minWidth: 120, minWidth: 120,
value: "uploadTime", value: "uploadTime",
}, },
...@@ -223,11 +224,11 @@ export default { ...@@ -223,11 +224,11 @@ export default {
}, },
watch: {}, watch: {},
mounted() { mounted() {
this.getArticleList() this.handleSearch()
}, },
methods: { methods: {
// 获取新闻会议 // 获取新闻会议
getArticleList() { handleSearch() {
this.listLoading = true this.listLoading = true
let params = { let params = {
size: this.pageSize, size: this.pageSize,
......
src/views/systems/operation-management/components/mixin.js
View file @ 730d022e
...@@ -44,7 +44,7 @@ const mixin = { ...@@ -44,7 +44,7 @@ const mixin = {
articleEnable(params).then((res) => { articleEnable(params).then((res) => {
if (res.code == 1) { if (res.code == 1) {
// this.$message.success("保存成功") // this.$message.success("保存成功")
this.getArticleList() this.handleSearch()
} }
}) })
}, },
...@@ -67,7 +67,8 @@ const mixin = { ...@@ -67,7 +67,8 @@ const mixin = {
this.form = { this.form = {
status: 1, status: 1,
} }
this.getArticleList() // this.pageIndex = 1
this.handleSearch()
} }
}) })
} else { } else {
...@@ -89,7 +90,10 @@ const mixin = { ...@@ -89,7 +90,10 @@ const mixin = {
.then((res) => { .then((res) => {
if (res.code == 1) { if (res.code == 1) {
this.$message.success("删除成功") this.$message.success("删除成功")
this.getArticleList() if (this.tableData.length == 1 && this.pageIndex != 1) {
this.pageIndex--
}
this.handleSearch()
} }
}) })
.catch(() => {}) .catch(() => {})
......
src/views/systems/operation-management/components/scientificResearch.vue
View file @ 730d022e
<template> <template>
<div id="medicalunion-management"> <div id="medicalunion-management">
<div class="top-btn"> <div class="top-btn">
<el-select v-model="selectType" @change="getArticleList"> <el-select v-model="selectType" @change="beforeSearch">
<el-option <el-option
v-for="item in selectList" v-for="item in selectList"
:key="item.value" :key="item.value"
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
ref="table" ref="table"
:table-data="tableData" :table-data="tableData"
:columns="columns" :columns="columns"
:max-height="780"
:header-class="'newHeader'" :header-class="'newHeader'"
:list-loading="listLoading" :list-loading="listLoading"
:current-page="pageIndex" :current-page="pageIndex"
...@@ -161,7 +162,7 @@ export default { ...@@ -161,7 +162,7 @@ export default {
value: "filePath", value: "filePath",
}, },
{ {
label: "上传时间", label: "创建时间",
minWidth: 120, minWidth: 120,
value: "uploadTime", value: "uploadTime",
}, },
...@@ -277,11 +278,15 @@ export default { ...@@ -277,11 +278,15 @@ export default {
}, },
watch: {}, watch: {},
mounted() { mounted() {
this.getArticleList() this.handleSearch()
}, },
methods: { methods: {
beforeSearch() {
this.pageIndex = 1
this.handleSearch()
},
// 获取健康科普 // 获取健康科普
getArticleList() { handleSearch() {
this.listLoading = true this.listLoading = true
let params = { let params = {
size: this.pageSize, size: this.pageSize,
......
src/views/systems/role/index.vue
View file @ 730d022e
...@@ -187,6 +187,9 @@ export default { ...@@ -187,6 +187,9 @@ export default {
type: "success", type: "success",
message: "删除成功!", message: "删除成功!",
}) })
if (this.tableData.length == 1 && this.pageIndex != 1) {
this.pageIndex--
}
this.handleSearch() this.handleSearch()
} }
}) })
......
src/views/systems/user/index.vue
View file @ 730d022e
...@@ -345,12 +345,14 @@ export default { ...@@ -345,12 +345,14 @@ export default {
spanCount: 12, spanCount: 12,
prop: "orgId", prop: "orgId",
opts: orgList, opts: orgList,
rules: [{ required: true, message: "请选择机构" }],
func: this.orgChange, func: this.orgChange,
}, },
{ {
type: "select", type: "select",
label: "科室", label: "科室",
spanCount: 12, spanCount: 12,
rules: [{ required: true, message: "请选择科室" }],
prop: "deptId", prop: "deptId",
opts: [], opts: [],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment