Commit 68bc388d authored by “yiyousong”'s avatar “yiyousong”

fix:修改页面

parent e25bb664
...@@ -36,7 +36,8 @@ export default { ...@@ -36,7 +36,8 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.app { .app {
width: 100%; width: 100%;
height: 100%; min-height: 100%;
background-color: #f0f2f5; background-color: #f0f2f5;
display: flex;
} }
</style> </style>
...@@ -364,4 +364,7 @@ ...@@ -364,4 +364,7 @@
.autoWidth .el-input__inner { .autoWidth .el-input__inner {
padding-left: 15px !important; padding-left: 15px !important;
position: absolute; position: absolute;
} }
\ No newline at end of file .el-tooltip__popper {
max-width: 20%;
}
\ No newline at end of file
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
class="ml10 mr10" class="ml10 mr10"
placeholder="请输入设备名称搜索" placeholder="请输入设备名称搜索"
></el-input> ></el-input>
<el-button size="small" type="primary" @click="getDeviceList" <el-button size="small" type="primary" @click="handleSearch"
>搜 索</el-button >搜 索</el-button
> >
<el-button size="small" @click="searchReset">重 置</el-button> <el-button size="small" @click="searchReset">重 置</el-button>
...@@ -223,10 +223,16 @@ export default { ...@@ -223,10 +223,16 @@ export default {
this.$refs.AddDevice.onAdd(); this.$refs.AddDevice.onAdd();
this.dialogVisible = true; this.dialogVisible = true;
}, },
// 搜索
handleSearch() {
this.current = 1;
this.getDeviceList();
},
// 重置 // 重置
searchReset() { searchReset() {
this.searchVal = ""; this.searchVal = "";
this.current = 1;
this.getDeviceList(); this.getDeviceList();
}, },
// 翻页 // 翻页
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<div class="out-box flex1"> <div class="out-box flex1">
<router-view></router-view> <router-view></router-view>
</div> </div>
<div class="footer tac">Copyright &copy;2021 ICZER 信宏翔科技有限公司</div>
</div> </div>
</template> </template>
...@@ -87,22 +86,18 @@ export default { ...@@ -87,22 +86,18 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
.layouts { .layouts {
width: 100%; width: 100%;
height: 100%; height: auto;
padding-bottom: 10px;
.crumbs { .crumbs {
margin: 10px 0px; margin: 10px 0px;
width: 98%; width: 98%;
} }
.out-box { .out-box {
width: 98%; width: 98%;
margin-top: 10px;
border-radius: 4px; border-radius: 4px;
background-color: #fff; background-color: #fff;
overflow-y: auto; overflow-y: auto;
} }
.footer {
height: 50px;
line-height: 50px;
font-size: 14px;
color: rgba(0, 0, 0, 0.45);
}
} }
</style> </style>
\ No newline at end of file
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</div> </div>
<TableHeader> <TableHeader>
<div slot="left"> <div slot="left">
<!-- <el-button size="small" type="primary" @click="handleAddMaterials" <!-- <el-button size="small" type="primary" @click="handleAddMaterials"
>加入材料</el-button >加入材料</el-button
>--> >-->
<el-button size="small" type="danger" @click="handleDelAll" <el-button size="small" type="danger" @click="handleDelAll"
...@@ -21,7 +21,9 @@ ...@@ -21,7 +21,9 @@
placeholder="选择部门" placeholder="选择部门"
> >
<template slot="prefix"> <template slot="prefix">
{{ (deptList.find((v) => v.deptNumber === department) || {}).name }} {{
(deptList.find((v) => v.deptNumber === department) || {}).name
}}
</template> </template>
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
...@@ -119,7 +121,7 @@ ...@@ -119,7 +121,7 @@
</div> </div>
</el-card> </el-card>
<!-- 添加材料 --> <!-- 添加材料 -->
<!-- <AddMaterals <!-- <AddMaterals
ref="AddMaterals" ref="AddMaterals"
:depList="depList" :depList="depList"
:libVisible.sync="libVisible" :libVisible.sync="libVisible"
...@@ -135,12 +137,12 @@ ...@@ -135,12 +137,12 @@
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from "@/components/TableHeader.vue";
import PreviewMaterals from "./modal/PreviewMaterals.vue"; import PreviewMaterals from "./modal/PreviewMaterals.vue";
import { getPubdatumList,delPubdatum } from "@/api/libray"; import { getPubdatumList, delPubdatum } from "@/api/libray";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
export default { export default {
components: { components: {
TableHeader, TableHeader,
PreviewMaterals PreviewMaterals,
}, },
data() { data() {
return { return {
...@@ -172,7 +174,7 @@ export default { ...@@ -172,7 +174,7 @@ export default {
let res = await getPubdatumList({ let res = await getPubdatumList({
page: this.current, page: this.current,
size: this.size, size: this.size,
materialName:this.searchVal, materialName: this.searchVal,
deptCode: this.department, deptCode: this.department,
}); });
this.loading = false; this.loading = false;
...@@ -180,7 +182,6 @@ export default { ...@@ -180,7 +182,6 @@ export default {
let { data, total } = res.data.data; let { data, total } = res.data.data;
this.tableData = data; this.tableData = data;
this.total = total; this.total = total;
} }
}, },
...@@ -200,13 +201,14 @@ export default { ...@@ -200,13 +201,14 @@ export default {
}, },
// 搜索 // 搜索
handleSearch() { handleSearch() {
this.current=1 this.current = 1;
this.getPbuList() this.getPbuList();
}, },
// 重置 // 重置
handleReset() { handleReset() {
this.department = ""; this.department = "";
this.searchVal = ""; this.searchVal = "";
this.getPbuList();
}, },
// 选中 // 选中
handleSelectionChange(select) { handleSelectionChange(select) {
...@@ -215,14 +217,16 @@ export default { ...@@ -215,14 +217,16 @@ export default {
// 翻页 // 翻页
changePagination(cur) { changePagination(cur) {
this.current = cur; this.current = cur;
this.getPbuList();
}, },
// 改变没有显示数量 // 改变没有显示数量
changeSize(size) { changeSize(size) {
this.size = size; this.size = size;
this.getPbuList();
}, },
// 预览 // 预览
handlePreview(row) { handlePreview(row) {
console.log("row",row)
this.materalsInfo = row; this.materalsInfo = row;
this.previewVisible = true; this.previewVisible = true;
}, },
......
...@@ -4,13 +4,14 @@ ...@@ -4,13 +4,14 @@
<div class="main flex flexc aic"> <div class="main flex flexc aic">
<div class="header tac mb20"> <div class="header tac mb20">
<div class="materals-name mb10">{{ materialsInfo.materialName }}</div> <div class="materals-name mb10">{{ materialsInfo.materialName }}</div>
<p class="abbreviation">材料全称:{{ materialsInfo.materiaFullName }}</p> <p class="abbreviation">
材料全称:{{ materialsInfo.materiaFullName }}
</p>
</div> </div>
<div class="preview-box"> <div class="preview-box">
<img class="sample-sheet-img" :src="api + materialsPreview" /> <img class="sample-sheet-img" :src="api + materialsPreview" />
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -46,7 +47,7 @@ export default { ...@@ -46,7 +47,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL, api: process.env.VUE_APP_API_BASE_URL + "/",
val: "", val: "",
}; };
}, },
...@@ -87,7 +88,6 @@ export default { ...@@ -87,7 +88,6 @@ export default {
// box-shadow: 2px 2px 8px 8px #ccc; // box-shadow: 2px 2px 8px 8px #ccc;
.sample-sheet-img { .sample-sheet-img {
width: 100%; width: 100%;
object-fit: contain;
} }
} }
} }
......
...@@ -19,7 +19,10 @@ ...@@ -19,7 +19,10 @@
class="autoWidth" class="autoWidth"
> >
<template slot="prefix"> <template slot="prefix">
{{ (deptList.find((v) => v.deptNumber === departmentLeft) || {}).name }} {{
(deptList.find((v) => v.deptNumber === departmentLeft) || {})
.name
}}
</template> </template>
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
...@@ -36,7 +39,7 @@ ...@@ -36,7 +39,7 @@
class="ml10 mr10" class="ml10 mr10"
placeholder="请输入事项名称搜索" placeholder="请输入事项名称搜索"
></el-input> ></el-input>
<el-button size="small" type="primary" @click="getWriteMatterList" <el-button size="small" type="primary" @click="handleSearchLeft"
>搜索</el-button >搜索</el-button
> >
<el-button size="small" @click="leftReset">重置</el-button> <el-button size="small" @click="leftReset">重置</el-button>
...@@ -78,7 +81,7 @@ ...@@ -78,7 +81,7 @@
show-overflow-tooltip show-overflow-tooltip
label="事项名称" label="事项名称"
> >
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<p class="short">{{ scope.row.matterName }}</p> <p class="short">{{ scope.row.matterName }}</p>
<p class="full-name"> <p class="full-name">
事项全称:{{ scope.row.matterFullName }} 事项全称:{{ scope.row.matterFullName }}
...@@ -138,7 +141,8 @@ ...@@ -138,7 +141,8 @@
> >
<template slot="prefix"> <template slot="prefix">
{{ {{
(deptList.find((v) => v.deptNumber === departmentRight) || {}).name (deptList.find((v) => v.deptNumber === departmentRight) || {})
.name
}} }}
</template> </template>
<el-option <el-option
...@@ -156,7 +160,7 @@ ...@@ -156,7 +160,7 @@
class="ml10 mr10" class="ml10 mr10"
placeholder="请输入材料名称搜索" placeholder="请输入材料名称搜索"
></el-input> ></el-input>
<el-button size="small" type="primary" @click="getMaterialsList" <el-button size="small" type="primary" @click="handleSearchRight"
>搜索</el-button >搜索</el-button
> >
<el-button size="small" @click="rightReset">重置</el-button> <el-button size="small" @click="rightReset">重置</el-button>
...@@ -222,8 +226,7 @@ ...@@ -222,8 +226,7 @@
<span <span
@click="handleRecommend(scope.row.id)" @click="handleRecommend(scope.row.id)"
v-else v-else
class="pointer" class="pointer primary"
:class="{ primary: recommendCount < 5 }"
>推荐</span >推荐</span
> >
</div> </div>
...@@ -273,7 +276,11 @@ ...@@ -273,7 +276,11 @@
></PreviewMaterials> ></PreviewMaterials>
<!-- 公共库 --> <!-- 公共库 -->
<CommonLib :matterId="matterId" @ok="getMaterialsList" :libVisible.sync="libVisible"></CommonLib> <CommonLib
:matterId="matterId"
@ok="getMaterialsList"
:libVisible.sync="libVisible"
></CommonLib>
</div> </div>
</template> </template>
...@@ -325,7 +332,7 @@ export default { ...@@ -325,7 +332,7 @@ export default {
activeDep: {}, activeDep: {},
libVisible: false, libVisible: false,
depList: [], depList: [],
matterId:null, matterId: null,
recommendCount: "", // 推荐次数 recommendCount: "", // 推荐次数
}; };
}, },
...@@ -374,21 +381,27 @@ export default { ...@@ -374,21 +381,27 @@ export default {
this.rightTotal = total; this.rightTotal = total;
this.rightTableData = data; this.rightTableData = data;
this.recommendCount = recommendCount; this.recommendCount = recommendCount;
console.log(data);
this.loadingRight = false; this.loadingRight = false;
}, },
// 左边搜索
handleSearchLeft() {
this.leftCurrent = 1;
this.getWriteMatterList();
},
// 左边重置 // 左边重置
leftReset() { leftReset() {
this.departmentLeft = ""; this.departmentLeft = "";
this.leftSearch = ""; this.leftSearch = "";
this.leftCurrent = 1;
this.getWriteMatterList(); this.getWriteMatterList();
}, },
// 左边选择表格行 // 左边选择表格行
handleCurrentChange(currentRow) { handleCurrentChange(currentRow) {
this.activeDep = currentRow; if (currentRow) {
this.getMaterialsList(); this.activeDep = currentRow;
this.getMaterialsList();
}
}, },
// 取消材料全选 // 取消材料全选
...@@ -425,7 +438,7 @@ export default { ...@@ -425,7 +438,7 @@ export default {
this.$message.warning("请先选择事项"); this.$message.warning("请先选择事项");
return; return;
} }
this.matterId=this.activeDep.id this.matterId = this.activeDep.id;
this.libVisible = true; this.libVisible = true;
}, },
// 右边勾选 // 右边勾选
...@@ -441,16 +454,21 @@ export default { ...@@ -441,16 +454,21 @@ export default {
let ids = this.rightSelectedRowKeys.map((v) => v.id).join(","); let ids = this.rightSelectedRowKeys.map((v) => v.id).join(",");
this.handleDel(ids); this.handleDel(ids);
}, },
// 右边搜索
handleSearchRight() {
this.rightCurrent = 1;
this.getMaterialsList();
},
// 右边重置 // 右边重置
rightReset() { rightReset() {
this.departmentRight = ""; this.departmentRight = "";
this.rightSearch = ""; this.rightSearch = "";
this.rightCurrent = 1;
this.getMaterialsList(); this.getMaterialsList();
}, },
// 推荐 // 推荐
async handleRecommend(id) { async handleRecommend(id) {
let res = await recommendMaterials({id:id,siteId:this.siteId }); let res = await recommendMaterials({ id: id, siteId: this.siteId });
let { code, msg } = res.data; let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
......
...@@ -79,9 +79,10 @@ ...@@ -79,9 +79,10 @@
:on-success="OnsuccessSamplePath" :on-success="OnsuccessSamplePath"
:headers="headers" :headers="headers"
:before-upload="beforeUpload" :before-upload="beforeUpload"
accept="application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document" accept="application/vnd.openxmlformats-officedocument.wordprocessingml.document"
> >
<el-button size="small" type="primary">上传Word文件</el-button> <el-button size="small" type="primary">上传Word文件</el-button>
<span class="tips">提示:请上传.docx格式</span>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -124,8 +125,8 @@ export default { ...@@ -124,8 +125,8 @@ export default {
source: 1, // 来源 source: 1, // 来源
matterId: "", // 事项id matterId: "", // 事项id
siteId: local.getLocal("sampleSiteId") siteId: local.getLocal("sampleSiteId")
? local.getLocal("sampleSiteId") ? local.getLocal("sampleSiteId")
: "", : "",
matterNo: "", // 事项编号 matterNo: "", // 事项编号
fileName: "", // 附件名称 fileName: "", // 附件名称
fileUrl: "", // 附件地址 fileUrl: "", // 附件地址
...@@ -282,7 +283,10 @@ export default { ...@@ -282,7 +283,10 @@ export default {
/deep/.el-select { /deep/.el-select {
width: 100%; width: 100%;
} }
.tips {
margin-left: 10px;
color: #ccc;
}
/deep/.tableScopeSwitch .el-switch__label { /deep/.tableScopeSwitch .el-switch__label {
position: absolute; position: absolute;
display: none; display: none;
......
...@@ -3,49 +3,47 @@ ...@@ -3,49 +3,47 @@
<el-dialog title="从公共库中选择" :visible.sync="Visible" width="70%"> <el-dialog title="从公共库中选择" :visible.sync="Visible" width="70%">
<TableHeader> <TableHeader>
<div slot="right" class="flex"> <div slot="right" class="flex">
<el-input <el-input
size="small" size="small"
style="width: 200px" style="width: 200px"
v-model="searchVal" v-model="searchVal"
class="ml10 mr10" class="ml10 mr10"
placeholder="请输入事项名称搜索" placeholder="请输入事项名称搜索"
></el-input> ></el-input>
<el-button size="small" type="primary" @click="handleSarch" <el-button size="small" type="primary" @click="handleSarch"
>搜索 >搜索
</el-button </el-button>
>
<el-button size="small" @click="resetSearch">重置</el-button> <el-button size="small" @click="resetSearch">重置</el-button>
</div> </div>
</TableHeader> </TableHeader>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
size="small" size="small"
:data="tableData" :data="tableData"
reserve-selection reserve-selection
border border
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
max-height="500px" max-height="500px"
:row-key="(row) => row.id" :row-key="(row) => row.id"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center"> <el-table-column type="selection" width="55" align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
type="index" type="index"
label="序号" label="序号"
width="55" width="55"
align="center" align="center"
:index="(index) => (current - 1) * size + index + 1" :index="(index) => (current - 1) * size + index + 1"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
label="部门名称" label="部门名称"
align="center" align="center"
prop="deptName" prop="deptName"
width="80" width="300"
> >
</el-table-column> </el-table-column>
<el-table-column prop="name" show-overflow-tooltip label="材料名称"> <el-table-column prop="name" show-overflow-tooltip label="材料名称">
...@@ -55,30 +53,30 @@ ...@@ -55,30 +53,30 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="createTime"
label="加入时间" label="加入时间"
align="center" align="center"
width="140" width="140"
> >
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination" v-if="total"> <div class="pagination" v-if="total">
<el-pagination <el-pagination
background background
layout="total,sizes,prev,pager,next,jumper" layout="total,sizes,prev,pager,next,jumper"
:pager-count="5" :pager-count="5"
:total="total" :total="total"
:current-page="current" :current-page="current"
:page-size="size" :page-size="size"
:page-sizes="pageSizes" :page-sizes="pageSizes"
@current-change="changePagination" @current-change="changePagination"
@size-change="changeSize" @size-change="changeSize"
> >
</el-pagination> </el-pagination>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="handleOk" <el-button size="small" type="primary" @click="handleOk"
>确 定</el-button >确 定</el-button
> >
<el-button size="small" @click="Visible = false">取 消</el-button> <el-button size="small" @click="Visible = false">取 消</el-button>
</span> </span>
...@@ -88,8 +86,8 @@ ...@@ -88,8 +86,8 @@
<script> <script>
import TableHeader from "@/components/TableHeader.vue"; import TableHeader from "@/components/TableHeader.vue";
import {getPubdatumList} from "@/api/libray"; import { getPubdatumList } from "@/api/libray";
import {addPubdatum} from "@/api/materials"; import { addPubdatum } from "@/api/materials";
import local from "@/utils/local"; import local from "@/utils/local";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
...@@ -108,7 +106,6 @@ export default { ...@@ -108,7 +106,6 @@ export default {
required: false, required: false,
default: 0, default: 0,
}, },
}, },
created() { created() {
this.getPbuList(); this.getPbuList();
...@@ -116,8 +113,8 @@ export default { ...@@ -116,8 +113,8 @@ export default {
data() { data() {
return { return {
siteId: local.getLocal("sampleSiteId") siteId: local.getLocal("sampleSiteId")
? local.getLocal("sampleSiteId") ? local.getLocal("sampleSiteId")
: "", : "",
department: "", department: "",
searchVal: "", searchVal: "",
tableData: [], tableData: [],
...@@ -137,7 +134,7 @@ export default { ...@@ -137,7 +134,7 @@ export default {
this.$emit("update:libVisible", val); this.$emit("update:libVisible", val);
}, },
}, },
...mapGetters(["deptList"]), ...mapGetters(["deptList"]),
}, },
methods: { methods: {
// 系统事项列表 // 系统事项列表
...@@ -146,41 +143,49 @@ export default { ...@@ -146,41 +143,49 @@ export default {
let res = await getPubdatumList({ let res = await getPubdatumList({
page: this.current, page: this.current,
size: this.size, size: this.size,
materialName: this.searchVal materialName: this.searchVal,
}); });
this.loading = false; this.loading = false;
if (res.data.code === 1) { if (res.data.code === 1) {
let {data, total} = res.data.data; let { data, total } = res.data.data;
this.tableData = data; this.tableData = data;
this.total = total; this.total = total;
} }
}, },
async handleOk() { async handleOk() {
let res = await addPubdatum({ids: this.selectedRowKeys.join(","), matterId: this.matterId, siteId: this.siteId}); let res = await addPubdatum({
let {code, msg} = res.data; ids: this.selectedRowKeys.join(","),
matterId: this.matterId,
siteId: this.siteId,
});
let { code, msg } = res.data;
if (code === 1) { if (code === 1) {
this.$message.success(msg); this.$message.success(msg);
this.$refs.multipleTable.clearSelection() this.$refs.multipleTable.clearSelection();
this.Visible = false; this.Visible = false;
this.$emit("ok"); this.$emit("ok");
} }
}, },
handleSarch() { handleSarch() {
this.current = 1 this.current = 1;
this.getPbuList() this.getPbuList();
}, },
resetSearch() { resetSearch() {
this.current = 1;
this.searchVal = ""; this.searchVal = "";
this.getPbuList();
}, },
changePagination(cur) { changePagination(cur) {
this.current = cur; this.current = cur;
this.getPbuList();
}, },
changeSize(size) { changeSize(size) {
this.size = size; this.size = size;
this.getPbuList();
}, },
handleSelectionChange(select) { handleSelectionChange(select) {
this.selectedRowKeys = select.map(i => i.id); this.selectedRowKeys = select.map((i) => i.id);
// console.log(select); // console.log(select);
}, },
}, },
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<el-drawer <el-drawer
title="材料预览" title="材料预览"
:visible.sync="Visible" :visible.sync="Visible"
size="60%" size="50%"
@close="handleClose" @close="handleClose"
> >
<div class="main flex"> <div class="main flex">
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
<img class="sample-sheet-img" :src="api + materialsPreview" /> <img class="sample-sheet-img" :src="api + materialsPreview" />
</div> </div>
</div> </div>
<!-- <div class="right">--> <!-- <div class="right">-->
<!-- <formBuilder--> <!-- <formBuilder-->
<!-- ref="formBuilder"--> <!-- ref="formBuilder"-->
<!-- :buildData="materialsJsonList"--> <!-- :buildData="materialsJsonList"-->
<!-- v-model="val"--> <!-- v-model="val"-->
<!-- ></formBuilder>--> <!-- ></formBuilder>-->
<!-- </div>--> <!-- </div>-->
</div> </div>
</el-drawer> </el-drawer>
</div> </div>
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
}, },
data() { data() {
return { return {
api: process.env.VUE_APP_API_BASE_URL, api: process.env.VUE_APP_API_BASE_URL + "/",
val: "", val: "",
}; };
}, },
...@@ -108,10 +108,24 @@ export default { ...@@ -108,10 +108,24 @@ export default {
height: 100%; height: 100%;
} }
.left { .left {
width: 50%; width: 100%;
height: 100%; height: 100%;
background-color: #e8e8e8; background-color: #e8e8e8;
overflow-y: auto; overflow-y: auto;
&::-webkit-scrollbar {
width: 10px;
overflow-y: auto;
}
&::-webkit-scrollbar-thumb {
border-radius: 6px;
background-color: rgba(144, 147, 153, 0.5);
}
&::-webkit-scrollbar-track {
border-radius: 6px;
background: #fff;
}
.left-header { .left-header {
height: 80px; height: 80px;
...@@ -130,8 +144,6 @@ export default { ...@@ -130,8 +144,6 @@ export default {
} }
.sample-sheet-img { .sample-sheet-img {
width: 100%; width: 100%;
height: 100%;
object-fit: contain;
} }
} }
.right { .right {
......
...@@ -23,7 +23,10 @@ ...@@ -23,7 +23,10 @@
class="autoWidth" class="autoWidth"
> >
<template slot="prefix"> <template slot="prefix">
{{ (deptList.find((v) => v.deptNumber === departmentLeft) || {}).name }} {{
(deptList.find((v) => v.deptNumber === departmentLeft) || {})
.name
}}
</template> </template>
<el-option <el-option
v-for="item in deptList" v-for="item in deptList"
...@@ -77,8 +80,12 @@ ...@@ -77,8 +80,12 @@
prop="deptName" prop="deptName"
> >
</el-table-column> </el-table-column>
<el-table-column prop="matterName" show-overflow-tooltip label="事项名称"> <el-table-column
<!-- <template slot-scope="scope"> prop="matterName"
show-overflow-tooltip
label="事项名称"
>
<!-- <template slot-scope="scope">
<p class="short">{{ scope.row.matterName }}</p> <p class="short">{{ scope.row.matterName }}</p>
<p class="full-name"> <p class="full-name">
事项全称:{{ scope.row.matterFullName }} 事项全称:{{ scope.row.matterFullName }}
...@@ -115,8 +122,7 @@ ...@@ -115,8 +122,7 @@
<span <span
@click="handleRecommend(scope.row.id)" @click="handleRecommend(scope.row.id)"
v-else v-else
class="pointer" class="pointer primary"
:class="{ primary: recommendCount < 5 }"
>推荐</span >推荐</span
> >
</div> </div>
...@@ -161,7 +167,7 @@ ...@@ -161,7 +167,7 @@
> >
</div> </div>
<div slot="right" class="flex"> <div slot="right" class="flex">
<el-select <el-select
v-model="departmentRight" v-model="departmentRight"
size="small" size="small"
placeholder="选择部门" placeholder="选择部门"
...@@ -169,7 +175,8 @@ ...@@ -169,7 +175,8 @@
> >
<template slot="prefix"> <template slot="prefix">
{{ {{
(deptList.find((v) => v.deptNumber === departmentRight) || {}).name (deptList.find((v) => v.deptNumber === departmentRight) || {})
.name
}} }}
</template> </template>
<el-option <el-option
...@@ -361,7 +368,6 @@ export default { ...@@ -361,7 +368,6 @@ export default {
this.leftTotal = total; this.leftTotal = total;
this.recommendCount = recommendCount; this.recommendCount = recommendCount;
this.loadingLeft = false; this.loadingLeft = false;
console.log(res.data, this.recommendCount);
} }
}, },
// 新增事项 // 新增事项
...@@ -400,13 +406,14 @@ export default { ...@@ -400,13 +406,14 @@ export default {
}, },
// 左边搜索 // 左边搜索
searchLeft() { searchLeft() {
this.leftCurrent=1 this.leftCurrent = 1;
this.getWriteMatterList(); this.getWriteMatterList();
}, },
// 左边重置 // 左边重置
leftReset() { leftReset() {
this.departmentLeft = ""; this.departmentLeft = "";
this.leftSearch = ""; this.leftSearch = "";
this.leftCurrent = 1;
this.getWriteMatterList(); this.getWriteMatterList();
}, },
// 左边勾选 // 左边勾选
...@@ -451,6 +458,7 @@ export default { ...@@ -451,6 +458,7 @@ export default {
rightReset() { rightReset() {
this.rightSearch = ""; this.rightSearch = "";
this.departmentRight = ""; this.departmentRight = "";
this.rightCurrent = 1;
this.getMatterList(); this.getMatterList();
}, },
// 右边勾选 // 右边勾选
......
<template> <template>
<div> <div>
<el-dialog <el-dialog
:title="title" :title="title"
:visible.sync="Visible" :visible.sync="Visible"
width="30%" width="30%"
@close="handleClose" @close="handleClose"
> >
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="事项简称" prop="matterName"> <el-form-item label="事项简称" prop="matterName">
<el-input <el-input
size="small" size="small"
v-model="form.matterName" v-model="form.matterName"
placeholder="请输入事项简称" placeholder="请输入事项简称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="事项全称" prop="matterFullName"> <el-form-item label="事项全称" prop="matterFullName">
<el-input <el-input
size="small" size="small"
v-model="form.matterFullName" v-model="form.matterFullName"
placeholder="请输入事项全称" placeholder="请输入事项全称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="事项编号" prop="matterNo"> <el-form-item label="事项编号" prop="matterNo">
<el-input <el-input
size="small" size="small"
v-model="form.matterNo" v-model="form.matterNo"
placeholder="请输入事项编号" placeholder="请输入事项编号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="选择部门" prop="deptId"> <el-form-item label="选择部门" prop="deptCode">
<el-select <el-select
size="small" size="small"
ref="myselected" ref="myselected"
v-model="form.deptCode" v-model="form.deptCode"
placeholder="请选择部门" placeholder="请选择部门"
@change="handleChange" @change="handleChange"
> >
<el-option <el-option
v-for="v in departmentList" v-for="v in departmentList"
:key="v.deptNumber" :key="v.deptNumber"
:label="v.name" :label="v.name"
:value="v.deptNumber" :value="v.deptNumber"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="handleOk" <el-button size="small" type="primary" @click="handleOk"
>确 定</el-button >确 定</el-button
> >
<el-button size="small" @click="handleRest">重 置</el-button> <el-button size="small" @click="handleRest">重 置</el-button>
</span> </span>
...@@ -84,10 +84,11 @@ export default { ...@@ -84,10 +84,11 @@ export default {
matterFullName: "", // 事项全称 matterFullName: "", // 事项全称
matterName: "", // 事项简称 matterName: "", // 事项简称
deptId: "", // 部门id deptId: "", // 部门id
deptCode: "", // 部门编号
matterNo: "", // 事项编号 matterNo: "", // 事项编号
siteId: local.getLocal("writeSiteId") siteId: local.getLocal("writeSiteId")
? local.getLocal("writeSiteId") ? local.getLocal("writeSiteId")
: "", : "",
source: 0, source: 0,
deptName: "", deptName: "",
}, },
...@@ -98,7 +99,7 @@ export default { ...@@ -98,7 +99,7 @@ export default {
matterName: [ matterName: [
{ required: true, message: "请输入事项简称", trigger: "blur" }, { required: true, message: "请输入事项简称", trigger: "blur" },
], ],
deptId: [ deptCode: [
{ required: true, message: "请输选择部门", trigger: "change" }, { required: true, message: "请输选择部门", trigger: "change" },
], ],
matterNo: [ matterNo: [
......
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