This commit is contained in:
xd 2024-07-10 16:36:34 +08:00
parent 4724fca487
commit eb594c0c21
24 changed files with 1028 additions and 940 deletions

View File

@ -4,6 +4,7 @@ import dialogDrag from './dialog/drag'
import dialogDragWidth from './dialog/dragWidth' import dialogDragWidth from './dialog/dragWidth'
import dialogDragHeight from './dialog/dragHeight' import dialogDragHeight from './dialog/dragHeight'
import clipboard from './module/clipboard' import clipboard from './module/clipboard'
import tableHeight from './table/tableHeight'
const install = function(Vue) { const install = function(Vue) {
Vue.directive('hasRole', hasRole) Vue.directive('hasRole', hasRole)
@ -12,6 +13,7 @@ const install = function(Vue) {
Vue.directive('dialogDrag', dialogDrag) Vue.directive('dialogDrag', dialogDrag)
Vue.directive('dialogDragWidth', dialogDragWidth) Vue.directive('dialogDragWidth', dialogDragWidth)
Vue.directive('dialogDragHeight', dialogDragHeight) Vue.directive('dialogDragHeight', dialogDragHeight)
Vue.directive('tableHeight', tableHeight)
} }
if (window.Vue) { if (window.Vue) {

View File

@ -0,0 +1,35 @@
import { addResizeListener, removeResizeListener } from 'element-ui/src/utils/resize-event'
// 设置表格高度
const doResize = (el, binding) => {
// 获取调用传递过来的数据
const { value } = binding
// 获取距底部距离(用于展示页码等信息)
const customHeight = (value && value.customHeight) || 76
// 计算列表高度
const height = window.innerHeight - el.getBoundingClientRect().top - customHeight
// 设置高度
el.style.height = height + "px"
}
export default {
// 初始化设置
bind(el, binding) {
// 设置resize监听方法
el.resizeListener = () => {
doResize(el, binding)
}
// 绑定监听方法到addResizeListener
addResizeListener(window.document.body, el.resizeListener)
},
// 所在组件的 VNode 更新时设置
// 页面上搜索表单是可以展开收起的,当展开更多表单搜索时,表格高度没变
update(el, binding) {
doResize(el, binding)
},
// 销毁时设置
unbind(el) {
// 移除resize监听
removeResizeListener(window.document.body, el.resizeListener)
}
}

View File

@ -89,37 +89,39 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="clMaterialList" :row-class-name="rowClMaterialIndex" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="clMaterialList" :row-class-name="rowClMaterialIndex" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center" prop="index" width="80"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="materialId" v-if="false"/> <el-table-column label="序号" align="center" prop="index" width="80"/>
<el-table-column label="编码" align="center" prop="materialNo" /> <el-table-column label="id" align="center" prop="materialId" v-if="false"/>
<el-table-column label="名称" align="center" prop="materialName" /> <el-table-column label="编码" align="center" prop="materialNo" />
<el-table-column label="单价" align="center" prop="materialPrice" /> <el-table-column label="名称" align="center" prop="materialName" />
<el-table-column prop="materialState" label="状态" width="80"> <el-table-column label="单价" align="center" prop="materialPrice" />
<template slot-scope="scope"> <el-table-column prop="materialState" label="状态" width="80">
<dict-tag :options="dict.type.yl_material_state" :value="scope.row.materialState"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.yl_material_state" :value="scope.row.materialState"/>
</el-table-column> </template>
<el-table-column label="操作" width="250" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" width="250" align="center">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['clMaterial:clMaterial:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['clMaterial:clMaterial:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['clMaterial:clMaterial:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['clMaterial:clMaterial:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -116,53 +116,55 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="customerList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
<el-table-column label="客户ID" align="center" prop="cusId" v-if="false"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="审批状态" align="center" prop="cusApprovalStatus" width="100"> <el-table-column label="客户ID" align="center" prop="cusId" v-if="false"/>
<template slot-scope="scope"> <el-table-column fixed label="审批状态" align="center" prop="cusApprovalStatus" width="100">
<el-tooltip :content="scope.row.cusReturnRemark" placement="bottom" effect="dark" :disabled="scope.row.cusReturnRemark==null"> <template slot-scope="scope">
<dict-tag :options="dict.type.cus_approval_status" :value="scope.row.cusApprovalStatus"/> <el-tooltip :content="scope.row.cusReturnRemark" placement="bottom" effect="dark" :disabled="scope.row.cusReturnRemark==null">
</el-tooltip> <dict-tag :options="dict.type.cus_approval_status" :value="scope.row.cusApprovalStatus"/>
</template> </el-tooltip>
</el-table-column> </template>
<el-table-column fixed label="客户编码" align="center" prop="cusCode" width="230px"></el-table-column> </el-table-column>
<el-table-column fixed label="客户名称" align="center" prop="cusName" width="300px"> <el-table-column fixed label="客户编码" align="center" prop="cusCode" width="230px"></el-table-column>
<template slot-scope="scope"> <el-table-column fixed label="客户名称" align="center" prop="cusName" width="300px">
<el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.cusName}}</el-link> <template slot-scope="scope">
</template> <el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.cusName}}</el-link>
</el-table-column> </template>
<el-table-column label="业务员" align="center" prop="cusSalesman"/> </el-table-column>
<el-table-column label="SAP客户编码" align="center" prop="cusSapCode" width="120px"/> <el-table-column label="业务员" align="center" prop="cusSalesman"/>
<el-table-column label="客户类型" align="center" prop="cusType"> <el-table-column label="SAP客户编码" align="center" prop="cusSapCode" width="120px"/>
<template slot-scope="scope"> <el-table-column label="客户类型" align="center" prop="cusType">
<dict-tag :options="dict.type.cus_type" :value="scope.row.cusType"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.cus_type" :value="scope.row.cusType"/>
</el-table-column> </template>
<el-table-column label="客户组" align="center" prop="cusGroup"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="客户组" align="center" prop="cusGroup">
<dict-tag :options="dict.type.cus_group" :value="scope.row.cusGroup"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.cus_group" :value="scope.row.cusGroup"/>
</el-table-column> </template>
<el-table-column label="创建人" align="center" prop="createName"/> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime"> <el-table-column label="创建人" align="center" prop="createName"/>
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
<!-- </el-table-column>
<el-table-column label="状态" align="center" prop="cusState" v-if="$auth.hasPermi('customer:customer:changCusStatus')"> <!--
<template slot-scope="scope"> <el-table-column label="状态" align="center" prop="cusState" v-if="$auth.hasPermi('customer:customer:changCusStatus')">
<el-switch <template slot-scope="scope">
v-model="scope.row.cusState" <el-switch
active-value="0" v-model="scope.row.cusState"
inactive-value="1" active-value="0"
@change="handleStatusChange(scope.row)" inactive-value="1"
></el-switch> @change="handleStatusChange(scope.row)"
</template> ></el-switch>
</el-table-column> </template>
--> </el-table-column>
</el-table> -->
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -69,39 +69,41 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table width="100%" v-loading="loading" :data="factoryList" :row-class-name="rowFactoryIndex" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" width="100%" v-loading="loading" :data="factoryList" :row-class-name="rowFactoryIndex" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center" prop="index" width="80"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="factoryId" v-if="false"/> <el-table-column label="序号" align="center" prop="index" width="80"/>
<el-table-column label="编码" width="100" align="center" prop="factoryNo" /> <el-table-column label="id" align="center" prop="factoryId" v-if="false"/>
<el-table-column label="名称" width="100" align="center" prop="factoryName" /> <el-table-column label="编码" width="100" align="center" prop="factoryNo" />
<el-table-column label="人工成本占比(%)" width="150" align="center" prop="factoryRgRatio" /> <el-table-column label="名称" width="100" align="center" prop="factoryName" />
<el-table-column label="五金费用占比(%)" width="150" align="center" prop="factoryWjRatio" /> <el-table-column label="人工成本占比(%)" width="150" align="center" prop="factoryRgRatio" />
<el-table-column label="辅料费用占比(%)" width="150" align="center" prop="factoryFlRatio" /> <el-table-column label="五金费用占比(%)" width="150" align="center" prop="factoryWjRatio" />
<el-table-column label="电费占比(%)" width="150" align="center" prop="factoryDfRatio" /> <el-table-column label="辅料费用占比(%)" width="150" align="center" prop="factoryFlRatio" />
<el-table-column label="天然气费用占比(%)" width="150" align="center" prop="factoryTrqRatio" /> <el-table-column label="电费占比(%)" width="150" align="center" prop="factoryDfRatio" />
<el-table-column label="运输费用占比(%)" width="150" align="center" prop="factoryYsRatio" /> <el-table-column label="天然气费用占比(%)" width="150" align="center" prop="factoryTrqRatio" />
<el-table-column label="总占比(%)" width="150" align="center" prop="factoryTotalRatio" /> <el-table-column label="运输费用占比(%)" width="150" align="center" prop="factoryYsRatio" />
<el-table-column label="盘具费用占比(%)" width="150" align="center" prop="factoryPjRatio" /> <el-table-column label="总占比(%)" width="150" align="center" prop="factoryTotalRatio" />
<el-table-column fixed="right" label="操作" align="center" width="150"> <el-table-column label="盘具费用占比(%)" width="150" align="center" prop="factoryPjRatio" />
<template slot-scope="scope"> <el-table-column fixed="right" label="操作" align="center" width="150">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['factory:factory:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['factory:factory:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['factory:factory:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['factory:factory:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -97,39 +97,41 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="materialList" :row-class-name="rowCMaterialIndex" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="materialList" :row-class-name="rowCMaterialIndex" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center" prop="index" width="80"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="materialId" v-if="false"/> <el-table-column label="序号" align="center" prop="index" width="80"/>
<el-table-column label="类型" align="center" prop="typeName" /> <el-table-column label="id" align="center" prop="materialId" v-if="false"/>
<el-table-column label="型号" align="center" prop="materialXingh" /> <el-table-column label="类型" align="center" prop="typeName" />
<el-table-column label="规格" align="center" prop="materialGuig" /> <el-table-column label="型号" align="center" prop="materialXingh" />
<el-table-column label="电压" align="center" prop="materialDiany" /> <el-table-column label="规格" align="center" prop="materialGuig" />
<el-table-column label="单位" align="center" prop="materialDw" /> <el-table-column label="电压" align="center" prop="materialDiany" />
<el-table-column prop="materialState" label="状态" width="80"> <el-table-column label="单位" align="center" prop="materialDw" />
<template slot-scope="scope"> <el-table-column prop="materialState" label="状态" width="80">
<dict-tag :options="dict.type.material_state" :value="scope.row.materialState"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.material_state" :value="scope.row.materialState"/>
</el-table-column> </template>
<el-table-column label="操作" width="250" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" width="250" align="center">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['material:material:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['material:material:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['material:material:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['material:material:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -79,36 +79,38 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="materialTypeList" :row-class-name="rowCMaterialTypeIndex" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="materialTypeList" :row-class-name="rowCMaterialTypeIndex" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center" prop="index" width="80"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="typeId" v-if="false"/> <el-table-column label="序号" align="center" prop="index" width="80"/>
<el-table-column label="编码" align="center" prop="typeNo" /> <el-table-column label="id" align="center" prop="typeId" v-if="false"/>
<el-table-column label="名称" align="center" prop="typeName" /> <el-table-column label="编码" align="center" prop="typeNo" />
<el-table-column prop="typeState" label="状态" width="80"> <el-table-column label="名称" align="center" prop="typeName" />
<template slot-scope="scope"> <el-table-column prop="typeState" label="状态" width="80">
<dict-tag :options="dict.type.material_type_state" :value="scope.row.typeState"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.material_type_state" :value="scope.row.typeState"/>
</el-table-column> </template>
<el-table-column label="操作" align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" align="center">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['materialType:materialType:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['materialType:materialType:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['materialType:materialType:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['materialType:materialType:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -91,57 +91,59 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
<el-table-column label="任务编号" width="100" align="center" prop="jobId" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" /> <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
<el-table-column label="任务组名" align="center" prop="jobGroup"> <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="任务组名" align="center" prop="jobGroup">
<dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
</el-table-column> </template>
<el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" /> </el-table-column>
<el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" /> <el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center"> <el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="状态" align="center">
<el-switch <template slot-scope="scope">
v-model="scope.row.status" <el-switch
active-value="0" v-model="scope.row.status"
inactive-value="1" active-value="0"
@change="handleStatusChange(scope.row)" inactive-value="1"
></el-switch> @change="handleStatusChange(scope.row)"
</template> ></el-switch>
</el-table-column> </template>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['monitor:job:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['monitor:job:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['monitor:job:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['monitor:job:remove']"
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']"> >删除</el-button>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
<el-dropdown-menu slot="dropdown"> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-item command="handleRun" icon="el-icon-caret-right" <el-dropdown-menu slot="dropdown">
v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item> <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
<el-dropdown-item command="handleView" icon="el-icon-view" v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item> <el-dropdown-item command="handleView" icon="el-icon-view"
<el-dropdown-item command="handleJobLog" icon="el-icon-s-operation" v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item>
v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item> <el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
</el-dropdown-menu> v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item>
</el-dropdown> </el-dropdown-menu>
</template> </el-dropdown>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -98,26 +98,28 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="访问编号" align="center" prop="infoId" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" /> <el-table-column label="访问编号" align="center" prop="infoId" />
<el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" /> <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" /> <el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" /> <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="操作系统" align="center" prop="os" /> <el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
<el-table-column label="登录状态" align="center" prop="status"> <el-table-column label="操作系统" align="center" prop="os" />
<template slot-scope="scope"> <el-table-column label="登录状态" align="center" prop="status">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</el-table-column> </template>
<el-table-column label="操作信息" align="center" prop="msg" :show-overflow-tooltip="true" /> </el-table-column>
<el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180"> <el-table-column label="操作信息" align="center" prop="msg" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<span>{{ parseTime(scope.row.loginTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.loginTime) }}</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -23,40 +23,44 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table
v-loading="loading" <div v-tableHeight="{customHeight: 76}">
:data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)" <el-table
style="width: 100%;" height="100%"
> v-loading="loading"
<el-table-column label="序号" type="index" align="center"> :data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
<template slot-scope="scope"> style="width: 100%;"
<span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span> >
</template> <el-table-column label="序号" type="index" align="center">
</el-table-column> <template slot-scope="scope">
<el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" /> <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
<el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" /> </template>
<el-table-column label="部门名称" align="center" prop="deptName" /> </el-table-column>
<el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" /> <el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" /> <el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="浏览器" align="center" prop="browser" /> <el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="操作系统" align="center" prop="os" /> <el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<el-table-column label="登录时间" align="center" prop="loginTime" width="180"> <el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="浏览器" align="center" prop="browser" />
<span>{{ parseTime(scope.row.loginTime) }}</span> <el-table-column label="操作系统" align="center" prop="os" />
</template> <el-table-column label="登录时间" align="center" prop="loginTime" width="180">
</el-table-column> <template slot-scope="scope">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <span>{{ parseTime(scope.row.loginTime) }}</span>
<template slot-scope="scope"> </template>
<el-button </el-table-column>
size="mini" <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
type="text" <template slot-scope="scope">
icon="el-icon-delete" <el-button
@click="handleForceLogout(scope.row)" size="mini"
v-hasPermi="['monitor:online:forceLogout']" type="text"
>强退</el-button> icon="el-icon-delete"
</template> @click="handleForceLogout(scope.row)"
</el-table-column> v-hasPermi="['monitor:online:forceLogout']"
</el-table> >强退</el-button>
</template>
</el-table-column>
</el-table>
</div>
<pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" /> <pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
</div> </div>

View File

@ -111,45 +111,47 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="50" align="center" /> <el-table height="100%" ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="日志编号" align="center" prop="operId" /> <el-table-column type="selection" width="50" align="center" />
<el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" /> <el-table-column label="日志编号" align="center" prop="operId" />
<el-table-column label="操作类型" align="center" prop="businessType"> <el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="操作类型" align="center" prop="businessType">
<dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>
</el-table-column> </template>
<el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" /> </el-table-column>
<el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" /> <el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" /> <el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
<el-table-column label="操作状态" align="center" prop="status"> <el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="操作状态" align="center" prop="status">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</el-table-column> </template>
<el-table-column label="操作日期" align="center" prop="operTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作日期" align="center" prop="operTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']">
<span>{{ parseTime(scope.row.operTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.operTime) }}</span>
</el-table-column> </template>
<el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
<span>{{ scope.row.costTime }}毫秒</span> <template slot-scope="scope">
</template> <span>{{ scope.row.costTime }}毫秒</span>
</el-table-column> </template>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-view" type="text"
@click="handleView(scope.row,scope.index)" icon="el-icon-view"
v-hasPermi="['monitor:operlog:query']" @click="handleView(scope.row,scope.index)"
>详细</el-button> v-hasPermi="['monitor:operlog:query']"
</template> >详细</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -60,40 +60,44 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="priceVerificationList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="priceVerificationList" @selection-change="handleSelectionChange">
<el-table-column label="核价单Id" align="center" prop="quotHjId" v-if="false"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="核价单号" align="center" prop="quotHjCode" width="280px"> <el-table-column label="核价单Id" align="center" prop="quotHjId" v-if="false"/>
<template slot-scope="scope"> <el-table-column fixed label="核价单号" align="center" prop="quotHjCode" width="280px">
<el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotHjCode}}</el-link> <template slot-scope="scope">
</template> <el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotHjCode}}</el-link>
</el-table-column> </template>
<el-table-column fixed label="核价状态" align="center" prop="quotHjApprovalStatus" width="150px"> </el-table-column>
<template slot-scope="scope"> <el-table-column fixed label="核价状态" align="center" prop="quotHjApprovalStatus" width="150px">
<dict-tag :options="dict.type.quot_hj_approval_status" :value="scope.row.quotHjApprovalStatus"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_hj_approval_status" :value="scope.row.quotHjApprovalStatus"/>
</el-table-column> </template>
<el-table-column label="报价单号" align="center" prop="quotCode" width="280px"/> </el-table-column>
<el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/> <el-table-column label="报价单号" align="center" prop="quotCode" width="280px"/>
<el-table-column label="客户" align="center" prop="quotCustomerName"width="250px"/> <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
<el-table-column label="项目" align="center" prop="quotProject"width="250px"/> <el-table-column label="客户" align="center" prop="quotCustomerName"width="250px"/>
<el-table-column label="核价类型" align="center" prop="quotHjPricingType"width="150px"> <el-table-column label="项目" align="center" prop="quotProject"width="250px"/>
<template slot-scope="scope"> <el-table-column label="核价类型" align="center" prop="quotHjPricingType"width="150px">
<dict-tag :options="dict.type.quot_pricing_type" :value="scope.row.quotHjPricingType"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_pricing_type" :value="scope.row.quotHjPricingType"/>
</el-table-column> </template>
<el-table-column label="核价日期" align="center" prop="quotHjPricingDate" width="180"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="核价日期" align="center" prop="quotHjPricingDate" width="180">
<span>{{ parseTime(scope.row.quotHjPricingDate) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.quotHjPricingDate) }}</span>
</el-table-column> </template>
<el-table-column label="创建人" align="center" prop="createName" width="150px"/> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="160"> <el-table-column label="创建人" align="center" prop="createName" width="150px"/>
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime" width="160">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
<!-- 添加或修改报价单-核价单对话框 -->
<hjDialog ref="hjDialog" @refreshList="getList"></hjDialog>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -102,9 +106,6 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改报价单-核价单对话框 -->
<hjDialog ref="hjDialog" @refreshList="getList"></hjDialog>
</div> </div>
</template> </template>
<style> <style>

View File

@ -156,84 +156,87 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="quotList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="quotList" @selection-change="handleSelectionChange">
<el-table-column label="报价单ID" align="center" prop="quotId" v-if="false"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="询价单号" align="center" prop="quotCode" width="250px"> <el-table-column label="报价单ID" align="center" prop="quotId" v-if="false"/>
<template slot-scope="scope"> <el-table-column fixed label="询价单号" align="center" prop="quotCode" width="250px">
<el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotCode}}</el-link> <template slot-scope="scope">
</template> <el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotCode}}</el-link>
</el-table-column> </template>
<el-table-column fixed label="提交状态" align="center" prop="quotApprovalStatus"> </el-table-column>
<template slot-scope="scope"> <el-table-column fixed label="提交状态" align="center" prop="quotApprovalStatus">
<dict-tag :options="dict.type.quot_approval_status" :value="scope.row.quotApprovalStatus"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_approval_status" :value="scope.row.quotApprovalStatus"/>
</el-table-column> </template>
<el-table-column label="处理状态" align="center" prop="quotHandle" v-if="checkRole(['SALES_MAN'])"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="处理状态" align="center" prop="quotHandle" v-if="checkRole(['SALES_MAN'])">
<dict-tag :options="dict.type.quot_fkfile_handle" :value="scope.row.quotHandle"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_fkfile_handle" :value="scope.row.quotHandle"/>
</el-table-column> </template>
<el-table-column label="是否打印" align="center" prop="quotPrint" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="是否打印" align="center" prop="quotPrint" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')">
<el-switch <template slot-scope="scope">
v-model="scope.row.quotPrint" <el-switch
active-value="0" v-model="scope.row.quotPrint"
inactive-value="1" active-value="0"
@change="handleStatusChange(scope.row)" inactive-value="1"
:disabled="scope.row.quotPrint=='0'" @change="handleStatusChange(scope.row)"
></el-switch> :disabled="scope.row.quotPrint=='0'"
</template> ></el-switch>
</el-table-column> </template>
<!-- </el-table-column>
<el-table-column label="打印人" align="center" prop="quotPrintUserNickName" width="150px" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"/> <!--
--> <el-table-column label="打印人" align="center" prop="quotPrintUserNickName" width="150px" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"/>
<el-table-column label="OA提交状态" align="center" prop="quotOAApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION','SALES_MAN'])"> -->
<template slot-scope="scope"> <el-table-column label="OA提交状态" align="center" prop="quotOAApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION','SALES_MAN'])">
<dict-tag :options="dict.type.quot_oa_approval_status" :value="scope.row.quotOAApprovalStatus" v-if="scope.row.quotOAApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_oa_approval_status" :value="scope.row.quotOAApprovalStatus" v-if="scope.row.quotOAApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="OA审批说明" align="center" prop="quotOAApprovalStatusRemark" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION','SALES_MAN'])"/> </el-table-column>
<el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/> <el-table-column label="OA审批说明" align="center" prop="quotOAApprovalStatusRemark" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION','SALES_MAN'])"/>
<el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/> <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
<el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/> <el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
<el-table-column label="报价要求" align="center" prop="quotQuotationRequire" width="250px"/> <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
<el-table-column label="金思维提交状态" align="center" prop="quotJswApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"> <el-table-column label="报价要求" align="center" prop="quotQuotationRequire" width="250px"/>
<template slot-scope="scope"> <el-table-column label="金思维提交状态" align="center" prop="quotJswApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<dict-tag :options="dict.type.quot_jsw_approval_status" :value="scope.row.quotJswApprovalStatus" v-if="scope.row.quotJswApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsw_approval_status" :value="scope.row.quotJswApprovalStatus" v-if="scope.row.quotJswApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsxzApprovalStatus" v-if="scope.row.quotJsxzApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsxzApprovalStatus" v-if="scope.row.quotJsxzApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="核价协助状态" align="center" prop="quotHjApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="核价协助状态" align="center" prop="quotHjApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<dict-tag :options="dict.type.quot_hj_approval_status" :value="scope.row.quotHjApprovalStatus" v-if="scope.row.quotHjApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_hj_approval_status" :value="scope.row.quotHjApprovalStatus" v-if="scope.row.quotHjApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="金思维报价单号" align="center" prop="quotJswCode" width="280px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"/> </el-table-column>
<el-table-column label="询价日期" align="center" prop="quotInquiryDate" width="160"> <el-table-column label="金思维报价单号" align="center" prop="quotJswCode" width="280px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"/>
<template slot-scope="scope"> <el-table-column label="询价日期" align="center" prop="quotInquiryDate" width="160">
<span>{{ parseTime(scope.row.quotInquiryDate) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.quotInquiryDate) }}</span>
</el-table-column> </template>
<el-table-column label="报价日期" align="center" prop="quotQuotationDate" width="160"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="报价日期" align="center" prop="quotQuotationDate" width="160">
<span>{{ parseTime(scope.row.quotQuotationDate) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.quotQuotationDate) }}</span>
</el-table-column> </template>
<el-table-column label="明细条数" align="center" prop="quotMaterialsCount" width="100"/> </el-table-column>
<el-table-column label="反馈说明" align="center" prop="quotFeedbackExplanation" width="150px"/> <el-table-column label="明细条数" align="center" prop="quotMaterialsCount" width="100"/>
<el-table-column label="创建人" align="center" prop="createName" width="150px"/> <el-table-column label="反馈说明" align="center" prop="quotFeedbackExplanation" width="150px"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="160"> <el-table-column label="创建人" align="center" prop="createName" width="150px"/>
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime" width="160">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
<el-table-column label="审核人" align="center" prop="quotCheckUserNickname" /> </el-table-column>
</el-table> <el-table-column label="审核人" align="center" prop="quotCheckUserNickname" />
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -994,43 +997,45 @@
<span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'&&this.form.quotJswApprovalStatus != '1'&&this.form.quotOAApprovalStatus != '1'">驳回</el-button></span> <span style="margin-left: 10px" v-hasPermi="['quot:quot:reject']"><el-button type="danger" plain @click="rejectQuotForm" v-if="this.form.quotApprovalStatus == '1'&&this.form.quotJsxzApprovalStatus != '1'&&this.form.quotHjApprovalStatus != '1'&&this.form.quotJswApprovalStatus != '1'&&this.form.quotOAApprovalStatus != '1'">驳回</el-button></span>
</div> </div>
</div> </div>
</el-dialog>
<!-- 客户选择对话框--> <!-- 客户选择对话框-->
<CustomerSelect ref="customerSelect" :open="customerOpen" @submit="submitCustomer" @cancel="customerOpen=false"></CustomerSelect> <CustomerSelect ref="customerSelect" :open="customerOpen" @submit="submitCustomer" @cancel="customerOpen=false"></CustomerSelect>
<!-- 技术确认单详情对话框 --> <!-- 技术确认单详情对话框 -->
<jsqrDialog ref="jsqrDialog"></jsqrDialog> <jsqrDialog ref="jsqrDialog"></jsqrDialog>
<!-- 核价单详情对话框 --> <!-- 核价单详情对话框 -->
<hjDialog ref="hjDialog"></hjDialog> <hjDialog ref="hjDialog"></hjDialog>
<!-- 产品导入对话框 --> <!-- 产品导入对话框 -->
<el-dialog :title="productUpload.title" :visible.sync="productUpload.open" width="400px" append-to-body> <el-dialog :title="productUpload.title" :visible.sync="productUpload.open" width="400px" append-to-body>
<el-upload <el-upload
ref="productUpload" ref="productUpload"
:limit="1" :limit="1"
accept=".xlsx, .xls" accept=".xlsx, .xls"
:headers="productUpload.headers" :headers="productUpload.headers"
:action="productUpload.url" :action="productUpload.url"
:disabled="productUpload.isUploading" :disabled="productUpload.isUploading"
:on-progress="handleFileUploadProgress" :on-progress="handleFileUploadProgress"
:on-success="handleFileSuccess" :on-success="handleFileSuccess"
:auto-upload="false" :auto-upload="false"
drag drag
> >
<i class="el-icon-upload"></i> <i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xlsxlsx格式文件</span> <span>仅允许导入xlsxlsx格式文件</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link> <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm"> </el-button>
<el-button @click="productUpload.open = false"> </el-button>
</div> </div>
</el-upload> </el-dialog>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm"> </el-button>
<el-button @click="productUpload.open = false"> </el-button>
</div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<style> <style>

View File

@ -26,30 +26,32 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table width="100%" v-loading="loading" :data="quotsList" :row-class-name="rowQuotsIndex"> <div v-tableHeight="{customHeight: 76}">
<el-table-column fixed="left" label="序号" align="center" prop="index" width="50"/> <el-table height="100%" width="100%" v-loading="loading" :data="quotsList" :row-class-name="rowQuotsIndex">
<el-table-column fixed="left" label="操作" align="center" width="100" class-name="small-padding fixed-width"> <el-table-column fixed="left" label="序号" align="center" prop="index" width="50"/>
<template slot-scope="scope"> <el-table-column fixed="left" label="操作" align="center" width="100" class-name="small-padding fixed-width">
<el-button type="text" @click="handleDeleteClick(scope.row)">删除</el-button> <template slot-scope="scope">
<el-button type="text" @click="handleDeleteClick(scope.row)">删除</el-button>
<el-button type="text" @click="handleToOAQuotClick(scope.row)">转报价</el-button> <el-button type="text" @click="handleToOAQuotClick(scope.row)">转报价</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="left" label="quot_id" align="center" prop="quot_id" v-if="false"/> <el-table-column fixed="left" label="quot_id" align="center" prop="quot_id" v-if="false"/>
<el-table-column fixed="left" label="报价单号" width="260" align="center" prop="quotCode"> <el-table-column fixed="left" label="报价单号" width="260" align="center" prop="quotCode">
<template slot-scope="scope"> <template slot-scope="scope">
<el-link :underline="false" type="primary" @click="handleDetail(scope.row)">{{scope.row.quotCode}}</el-link> <el-link :underline="false" type="primary" @click="handleDetail(scope.row)">{{scope.row.quotCode}}</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="报价客户" width="250" align="center" prop="quotCustomer" /> <el-table-column label="报价客户" width="250" align="center" prop="quotCustomer" />
<el-table-column label="报价项目" width="250" align="center" prop="quotProject" /> <el-table-column label="报价项目" width="250" align="center" prop="quotProject" />
<el-table-column label="总价" width="150" align="center" prop="totalPrice" /> <el-table-column label="总价" width="150" align="center" prop="totalPrice" />
<el-table-column label="联系人" align="center" prop="quotLxr" /> <el-table-column label="联系人" align="center" prop="quotLxr" />
<el-table-column label="联系人电话" width="100" align="center" prop="quotLxrdh" /> <el-table-column label="联系人电话" width="100" align="center" prop="quotLxrdh" />
<el-table-column label="创建人" width="180" align="center" prop="createName" /> <el-table-column label="创建人" width="180" align="center" prop="createName" />
<el-table-column label="创建日期" width="180" align="center" prop="createTime" /> <el-table-column label="创建日期" width="180" align="center" prop="createTime" />
<el-table-column label="更新日期" width="180" align="center" prop="updateTime" /> <el-table-column label="更新日期" width="180" align="center" prop="updateTime" />
</el-table> </el-table>
</div>
<!-- 报价详情对话框 --> <!-- 报价详情对话框 -->
<el-dialog :title="title" :visible.sync="open" width="1050px" v-el-drag-dialog append-to-body> <el-dialog :title="title" :visible.sync="open" width="1050px" v-el-drag-dialog append-to-body>

View File

@ -85,33 +85,35 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="sysSapUserList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="sysSapUserList" @selection-change="handleSelectionChange">
<el-table-column label=" ID" align="center" prop="sapUserId" v-if="false"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="SAP账户" align="center" prop="sapUserBm" /> <el-table-column label=" ID" align="center" prop="sapUserId" v-if="false"/>
<el-table-column label="SAP账户名称" align="center" prop="sapUserName" /> <el-table-column label="SAP账户" align="center" prop="sapUserBm" />
<el-table-column label="系统账户" align="center" prop="sysUserName" /> <el-table-column label="SAP账户名称" align="center" prop="sapUserName" />
<el-table-column label="系统账户名称" align="center" prop="sysUserNickName" /> <el-table-column label="系统账户" align="center" prop="sysUserName" />
<el-table-column label="片区" align="center" prop="sysUserPianqu" /> <el-table-column label="系统账户名称" align="center" prop="sysUserNickName" />
<el-table-column label="操作" align="center"> <el-table-column label="片区" align="center" prop="sysUserPianqu" />
<template slot-scope="scope"> <el-table-column label="操作" align="center">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['sysSapUser:sysSapUser:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['sysSapUser:sysSapUser:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['sysSapUser:sysSapUser:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['sysSapUser:sysSapUser:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -102,42 +102,45 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
<el-table-column label="参数主键" align="center" prop="configId" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" /> <el-table-column label="参数主键" align="center" prop="configId" />
<el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" /> <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
<el-table-column label="参数键值" align="center" prop="configValue" :show-overflow-tooltip="true" /> <el-table-column label="参数键名" align="center" prop="configKey" :show-overflow-tooltip="true" />
<el-table-column label="系统内置" align="center" prop="configType"> <el-table-column label="参数键值" align="center" prop="configValue" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="系统内置" align="center" prop="configType">
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.configType"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.configType"/>
</el-table-column> </template>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['system:config:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['system:config:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['system:config:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['system:config:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -48,53 +48,56 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table <div v-tableHeight="{customHeight: 76}">
v-if="refreshTable" <el-table
v-loading="loading" height="100%"
:data="deptList" v-if="refreshTable"
row-key="deptId" v-loading="loading"
:default-expand-all="isExpandAll" :data="deptList"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="deptId"
> :default-expand-all="isExpandAll"
<el-table-column align="left" prop="deptName" label="部门名称"></el-table-column> :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
<el-table-column prop="orderNum" label="排序"></el-table-column> >
<el-table-column prop="status" label="状态"> <el-table-column align="left" prop="deptName" label="部门名称"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="orderNum" label="排序"></el-table-column>
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> <el-table-column prop="status" label="状态">
</template> <template slot-scope="scope">
</el-table-column> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<el-table-column label="创建时间" align="center" prop="createTime"> </template>
<template slot-scope="scope"> </el-table-column>
<span>{{ parseTime(scope.row.createTime) }}</span> <el-table-column label="创建时间" align="center" prop="createTime">
</template> <template slot-scope="scope">
</el-table-column> <span>{{ parseTime(scope.row.createTime) }}</span>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </template>
<template slot-scope="scope"> </el-table-column>
<el-button <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
size="mini" <template slot-scope="scope">
type="text" <el-button
icon="el-icon-edit" size="mini"
@click="handleUpdate(scope.row)" type="text"
v-hasPermi="['system:dept:edit']" icon="el-icon-edit"
>修改</el-button> @click="handleUpdate(scope.row)"
<el-button v-hasPermi="['system:dept:edit']"
size="mini" >修改</el-button>
type="text" <el-button
icon="el-icon-plus" size="mini"
@click="handleAdd(scope.row)" type="text"
v-hasPermi="['system:dept:add']" icon="el-icon-plus"
>新增</el-button> @click="handleAdd(scope.row)"
<el-button v-hasPermi="['system:dept:add']"
v-if="scope.row.parentId != 0" >新增</el-button>
size="mini" <el-button
type="text" v-if="scope.row.parentId != 0"
icon="el-icon-delete" size="mini"
@click="handleDelete(scope.row)" type="text"
v-hasPermi="['system:dept:remove']" icon="el-icon-delete"
>删除</el-button> @click="handleDelete(scope.row)"
</template> v-hasPermi="['system:dept:remove']"
</el-table-column> >删除</el-button>
</el-table> </template>
</el-table-column>
</el-table>
</div>
<!-- 添加或修改部门对话框 --> <!-- 添加或修改部门对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>

View File

@ -107,47 +107,49 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column label="字典编号" align="center" prop="dictId" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="字典编号" align="center" prop="dictId" />
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true"> <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
<router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type"> <template slot-scope="scope">
<span>{{ scope.row.dictType }}</span> <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
</router-link> <span>{{ scope.row.dictType }}</span>
</template> </router-link>
</el-table-column> </template>
<el-table-column label="状态" align="center" prop="status"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="状态" align="center" prop="status">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</el-table-column> </template>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" /> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['system:dict:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['system:dict:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['system:dict:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['system:dict:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -48,59 +48,62 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table <div v-tableHeight="{customHeight: 76}">
v-if="refreshTable" <el-table
v-loading="loading" height="100%"
:data="menuList" v-if="refreshTable"
row-key="menuId" v-loading="loading"
:default-expand-all="isExpandAll" :data="menuList"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="menuId"
> :default-expand-all="isExpandAll"
<el-table-column prop="menuName" align="left" label="菜单名称" :show-overflow-tooltip="true"></el-table-column> :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
<el-table-column prop="icon" label="图标" align="center" width="100"> >
<template slot-scope="scope"> <el-table-column prop="menuName" align="left" label="菜单名称" :show-overflow-tooltip="true"></el-table-column>
<svg-icon :icon-class="scope.row.icon" /> <el-table-column prop="icon" label="图标" align="center" width="100">
</template> <template slot-scope="scope">
</el-table-column> <svg-icon :icon-class="scope.row.icon" />
<el-table-column prop="orderNum" label="排序" width="60"></el-table-column> </template>
<el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column> </el-table-column>
<el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column> <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
<el-table-column prop="status" label="状态" width="80"> <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
<template slot-scope="scope"> <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> <el-table-column prop="status" label="状态" width="80">
</template> <template slot-scope="scope">
</el-table-column> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
<el-table-column label="创建时间" align="center" prop="createTime"> </template>
<template slot-scope="scope"> </el-table-column>
<span>{{ parseTime(scope.row.createTime) }}</span> <el-table-column label="创建时间" align="center" prop="createTime">
</template> <template slot-scope="scope">
</el-table-column> <span>{{ parseTime(scope.row.createTime) }}</span>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </template>
<template slot-scope="scope"> </el-table-column>
<el-button <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
size="mini" <template slot-scope="scope">
type="text" <el-button
icon="el-icon-edit" size="mini"
@click="handleUpdate(scope.row)" type="text"
v-hasPermi="['system:menu:edit']" icon="el-icon-edit"
>修改</el-button> @click="handleUpdate(scope.row)"
<el-button v-hasPermi="['system:menu:edit']"
size="mini" >修改</el-button>
type="text" <el-button
icon="el-icon-plus" size="mini"
@click="handleAdd(scope.row)" type="text"
v-hasPermi="['system:menu:add']" icon="el-icon-plus"
>新增</el-button> @click="handleAdd(scope.row)"
<el-button v-hasPermi="['system:menu:add']"
size="mini" >新增</el-button>
type="text" <el-button
icon="el-icon-delete" size="mini"
@click="handleDelete(scope.row)" type="text"
v-hasPermi="['system:menu:remove']" icon="el-icon-delete"
>删除</el-button> @click="handleDelete(scope.row)"
</template> v-hasPermi="['system:menu:remove']"
</el-table-column> >删除</el-button>
</el-table> </template>
</el-table-column>
</el-table>
</div>
<!-- 添加或修改菜单对话框 --> <!-- 添加或修改菜单对话框 -->
<el-dialog :title="title" :visible.sync="open" width="680px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>

View File

@ -69,50 +69,52 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center" prop="noticeId" width="100" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column <el-table-column label="序号" align="center" prop="noticeId" width="100" />
label="公告标题" <el-table-column
align="center" label="公告标题"
prop="noticeTitle" align="center"
:show-overflow-tooltip="true" prop="noticeTitle"
/> :show-overflow-tooltip="true"
<el-table-column label="公告类型" align="center" prop="noticeType" width="100"> />
<template slot-scope="scope"> <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
<dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
</el-table-column> </template>
<el-table-column label="状态" align="center" prop="status" width="100"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="状态" align="center" prop="status" width="100">
<dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
</el-table-column> </template>
<el-table-column label="创建者" align="center" prop="createBy" width="100" /> </el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="100"> <el-table-column label="创建者" align="center" prop="createBy" width="100" />
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime" width="100">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</el-table-column> </template>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['system:notice:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['system:notice:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['system:notice:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['system:notice:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -79,41 +79,43 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column label="岗位编号" align="center" prop="postId" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="岗位编码" align="center" prop="postCode" /> <el-table-column label="岗位编号" align="center" prop="postId" />
<el-table-column label="岗位名称" align="center" prop="postName" /> <el-table-column label="岗位编码" align="center" prop="postCode" />
<el-table-column label="岗位排序" align="center" prop="postSort" /> <el-table-column label="岗位名称" align="center" prop="postName" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="岗位排序" align="center" prop="postSort" />
<template slot-scope="scope"> <el-table-column label="状态" align="center" prop="status">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</el-table-column> </template>
<el-table-column label="创建时间" align="center" prop="createTime" width="180"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime" width="180">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['system:post:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['system:post:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['system:post:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['system:post:remove']"
</template> >删除</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -97,55 +97,57 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
<el-table-column label="角色编号" prop="roleId" width="120" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" /> <el-table-column label="角色编号" prop="roleId" width="120" />
<el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" /> <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
<el-table-column label="显示顺序" prop="roleSort" width="100" /> <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" width="100"> <el-table-column label="显示顺序" prop="roleSort" width="100" />
<template slot-scope="scope"> <el-table-column label="状态" align="center" width="100">
<el-switch <template slot-scope="scope">
v-model="scope.row.status" <el-switch
active-value="0" v-model="scope.row.status"
inactive-value="1" active-value="0"
@change="handleStatusChange(scope.row)" inactive-value="1"
></el-switch> @change="handleStatusChange(scope.row)"
</template> ></el-switch>
</el-table-column> </template>
<el-table-column label="创建时间" align="center" prop="createTime"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
<el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width"> </el-table-column>
<template slot-scope="scope" v-if="scope.row.roleId !== 1"> <el-table-column label="操作" width="200px" align="center" class-name="small-padding fixed-width">
<el-button <template slot-scope="scope" v-if="scope.row.roleId !== 1">
size="mini" <el-button
type="text" size="mini"
icon="el-icon-edit" type="text"
@click="handleUpdate(scope.row)" icon="el-icon-edit"
v-hasPermi="['system:role:edit']" @click="handleUpdate(scope.row)"
>修改</el-button> v-hasPermi="['system:role:edit']"
<el-button >修改</el-button>
size="mini" <el-button
type="text" size="mini"
icon="el-icon-delete" type="text"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['system:role:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['system:role:remove']"
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']"> >删除</el-button>
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
<el-dropdown-menu slot="dropdown"> <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<el-dropdown-item command="handleDataScope" icon="el-icon-circle-check" <el-dropdown-menu slot="dropdown">
v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item> <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
<el-dropdown-item command="handleAuthUser" icon="el-icon-user" v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item> <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
</el-dropdown-menu> v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
</el-dropdown> </el-dropdown-menu>
</template> </el-dropdown>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"

View File

@ -57,55 +57,59 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table v-loading="loading" :data="jsqrList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" width="55" align="center" /> <el-table height="100%" v-loading="loading" :data="jsqrList" @selection-change="handleSelectionChange">
<el-table-column label="ID" align="center" prop="quotJsqrId" v-if="false"/> <el-table-column type="selection" width="55" align="center" />
<el-table-column fixed label="技术确认单编号" align="center" prop="quotJsqrCode" width="280px"> <el-table-column label="ID" align="center" prop="quotJsqrId" v-if="false"/>
<template slot-scope="scope"> <el-table-column fixed label="技术确认单编号" align="center" prop="quotJsqrCode" width="280px">
<el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotJsqrCode}}</el-link> <template slot-scope="scope">
</template> <el-link :underline="false" type="primary" @click="handleUpdate(scope.row)">{{scope.row.quotJsqrCode}}</el-link>
</el-table-column> </template>
<el-table-column fixed label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px"> </el-table-column>
<template slot-scope="scope"> <el-table-column fixed label="技术协助状态" align="center" prop="quotJsxzApprovalStatus" width="150px">
<dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsxzApprovalStatus"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsxzApprovalStatus"/>
</el-table-column> </template>
<el-table-column label="技术协助分组" align="center" prop="quotJsxzGroup" width="180px"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="技术协助分组" align="center" prop="quotJsxzGroup" width="180px">
<dict-tag :options="dict.type.quot_jsxz_group" :value="scope.row.quotJsxzGroupValues"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsxz_group" :value="scope.row.quotJsxzGroupValues"/>
</el-table-column> </template>
<el-table-column label="特缆协助状态" align="center" prop="quotJsqrTlApprovalStatus" width="150px"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="特缆协助状态" align="center" prop="quotJsqrTlApprovalStatus" width="150px">
<dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrTlApprovalStatus" v-if="scope.row.quotJsqrTlApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrTlApprovalStatus" v-if="scope.row.quotJsqrTlApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="低压协助状态" align="center" prop="quotJsqrDyApprovalStatus" width="150px"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="低压协助状态" align="center" prop="quotJsqrDyApprovalStatus" width="150px">
<dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrDyApprovalStatus" v-if="scope.row.quotJsqrDyApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrDyApprovalStatus" v-if="scope.row.quotJsqrDyApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="中压协助状态" align="center" prop="quotJsqrZyApprovalStatus" width="150px"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="中压协助状态" align="center" prop="quotJsqrZyApprovalStatus" width="150px">
<dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrZyApprovalStatus" v-if="scope.row.quotJsqrZyApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrZyApprovalStatus" v-if="scope.row.quotJsqrZyApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="其他协助状态" align="center" prop="quotJsqrQtApprovalStatus" width="150px"> </el-table-column>
<template slot-scope="scope"> <el-table-column label="其他协助状态" align="center" prop="quotJsqrQtApprovalStatus" width="150px">
<dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrQtApprovalStatus" v-if="scope.row.quotJsqrQtApprovalStatus!=0"/> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.quot_jsxz_approval_status" :value="scope.row.quotJsqrQtApprovalStatus" v-if="scope.row.quotJsqrQtApprovalStatus!=0"/>
</el-table-column> </template>
<el-table-column label="询价单号" align="center" prop="quotCode" width="250px"/> </el-table-column>
<el-table-column label="客户" align="center" prop="quotCustomerName" width="250px"/> <el-table-column label="询价单号" align="center" prop="quotCode" width="250px"/>
<el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/> <el-table-column label="客户" align="center" prop="quotCustomerName" width="250px"/>
<el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/> <el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
<el-table-column label="创建人" align="center" prop="createName" width="150px"/> <el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="160"> <el-table-column label="创建人" align="center" prop="createName" width="150px"/>
<template slot-scope="scope"> <el-table-column label="创建时间" align="center" prop="createTime" width="160">
<span>{{ parseTime(scope.row.createTime) }}</span> <template slot-scope="scope">
</template> <span>{{ parseTime(scope.row.createTime) }}</span>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
<!-- 添加或修改报价单-技术确认单对话框 -->
<jsqrDialog ref="jsqrDialog" @refreshList="getList"></jsqrDialog>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
@ -114,9 +118,6 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改报价单-技术确认单对话框 -->
<jsqrDialog ref="jsqrDialog" @refreshList="getList"></jsqrDialog>
</div> </div>
</template> </template>
<script> <script>

View File

@ -80,75 +80,78 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange"> <div v-tableHeight="{customHeight: 76}">
<el-table-column type="selection" align="center" width="55"></el-table-column> <el-table height="100%" v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column label="序号" type="index" width="50" align="center"> <el-table-column type="selection" align="center" width="55"></el-table-column>
<template slot-scope="scope"> <el-table-column label="序号" type="index" width="50" align="center">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span> <template slot-scope="scope">
</template> <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</el-table-column> </template>
<el-table-column </el-table-column>
label="表名称" <el-table-column
align="center" label="表名称"
prop="tableName" align="center"
:show-overflow-tooltip="true" prop="tableName"
width="200" :show-overflow-tooltip="true"
/> width="200"
<el-table-column />
label="表描述" <el-table-column
align="center" label="表描述"
prop="tableComment" align="center"
:show-overflow-tooltip="true" prop="tableComment"
/> :show-overflow-tooltip="true"
<el-table-column />
label="实体" <el-table-column
align="center" label="实体"
prop="className" align="center"
:show-overflow-tooltip="true" prop="className"
width="200" :show-overflow-tooltip="true"
/> width="200"
<el-table-column label="创建时间" align="center" prop="createTime" width="160" /> />
<el-table-column label="更新时间" align="center" prop="updateTime" width="160" /> <el-table-column label="创建时间" align="center" prop="createTime" width="160" />
<el-table-column fixed="right" label="操作" align="center" width="300"> <el-table-column label="更新时间" align="center" prop="updateTime" width="160" />
<template slot-scope="scope"> <el-table-column fixed="right" label="操作" align="center" width="300">
<el-button <template slot-scope="scope">
type="text" <el-button
size="small" type="text"
icon="el-icon-view" size="small"
@click="handlePreview(scope.row)" icon="el-icon-view"
v-hasPermi="['tool:gen:preview']" @click="handlePreview(scope.row)"
>预览</el-button> v-hasPermi="['tool:gen:preview']"
<el-button >预览</el-button>
type="text" <el-button
size="small" type="text"
icon="el-icon-edit" size="small"
@click="handleEditTable(scope.row)" icon="el-icon-edit"
v-hasPermi="['tool:gen:edit']" @click="handleEditTable(scope.row)"
>编辑</el-button> v-hasPermi="['tool:gen:edit']"
<el-button >编辑</el-button>
type="text" <el-button
size="small" type="text"
icon="el-icon-delete" size="small"
@click="handleDelete(scope.row)" icon="el-icon-delete"
v-hasPermi="['tool:gen:remove']" @click="handleDelete(scope.row)"
>删除</el-button> v-hasPermi="['tool:gen:remove']"
<el-button >删除</el-button>
type="text" <el-button
size="small" type="text"
icon="el-icon-refresh" size="small"
@click="handleSynchDb(scope.row)" icon="el-icon-refresh"
v-hasPermi="['tool:gen:edit']" @click="handleSynchDb(scope.row)"
>同步</el-button> v-hasPermi="['tool:gen:edit']"
<el-button >同步</el-button>
type="text" <el-button
size="small" type="text"
icon="el-icon-download" size="small"
@click="handleGenTable(scope.row)" icon="el-icon-download"
v-hasPermi="['tool:gen:code']" @click="handleGenTable(scope.row)"
>生成代码</el-button> v-hasPermi="['tool:gen:code']"
</template> >生成代码</el-button>
</el-table-column> </template>
</el-table> </el-table-column>
</el-table>
</div>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"