suojin
/
jonhon-mes-web
25
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

Browse Source
dev-scheduling
zhangdi 2 months ago
parent 45a4e201f9 595dde458c
commit d2b66c99f2
10 changed files with 373 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 121
      src/views/energyManagement/components/electricityQuota.vue
  2. 13
      src/views/energyManagement/components/electricityTarget.vue
  3. 37
      src/views/energyManagement/components/waterQuota.vue
  4. 10
      src/views/energyManagement/components/waterTarget.vue
  5. 34
      src/views/energyManagement/electricityManagement.vue
  6. 26
      src/views/energyManagement/energyMonitoring.vue
  7. 62
      src/views/energyManagement/peakFlatValley.vue
  8. 37
      src/views/energyManagement/waterManagement.vue
  9. 92
      src/views/personnelEfficiencyManagement/salaryManagement/payrollComputation.vue
  10. 63
      src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue

121
src/views/energyManagement/components/electricityQuota.vue
Unescape View File

@ -18,13 +18,33 @@
@row-save="rowSave" @row-save="rowSave"
@row-update="rowUpdate" @row-update="rowUpdate"
:beforeOpen="beforeOpen" :beforeOpen="beforeOpen"
@sort-change="sortChange"
> >
<template #equipmentId-form="{type,disabled}">
<jhSelect
:value="form.equipmentId"
placeholder="请搜索选择"
api-url="/blade-desk/equipment/page"
echo-api="/blade-desk/equipment/page"
echoParamsKey="id"
echo-method="get"
api-method="get"
list-key="records"
total-key="total"
label-key="deviceName"
value-key="id"
search-key="deviceName"
:debounce-time="100"
@change="changeEquipment"
:title="'修改'"
/>
</template>
<template #menu-left> <template #menu-left>
<el-button type="danger" @click="handleDelete">删除</el-button> <el-button type="danger" @click="handleDelete" v-if="permission.electricityQuota_delete">删除</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleExport">导出</el-button> <el-button type="primary" @click="handleExport" v-if="permission.electricityQuota_export">导出</el-button>
<el-button type="primary" @click="handleImport">导入</el-button> <el-button type="primary" @click="handleImport" v-if="permission.electricityQuota_import">导入</el-button>
</template> </template>
<template #menu="scope"> </template> <template #menu="scope"> </template>
</avue-crud> </avue-crud>
@ -39,6 +59,7 @@
<script> <script>
import basicImport from '@/components/basic-import/main.vue' import basicImport from '@/components/basic-import/main.vue'
import { pageList, removeItem, saveItem, exportData } from '@/api/energyManagement/bsEnergyQuota'; import { pageList, removeItem, saveItem, exportData } from '@/api/energyManagement/bsEnergyQuota';
import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
basicImport, basicImport,
@ -64,7 +85,8 @@ export default {
selection: true, selection: true,
viewBtn: false, viewBtn: false,
delBtn: false, delBtn: false,
addBtn: true, addBtn: false,
editBtn:false,
editBtnText: "修改", editBtnText: "修改",
viewBtnIcon: " ", viewBtnIcon: " ",
delBtnIcon: " ", delBtnIcon: " ",
@ -100,7 +122,7 @@ export default {
{ {
label: "作业中心", label: "作业中心",
prop: "workCenterId", prop: "workCenterId",
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
search: true, search: true,
@ -126,25 +148,46 @@ export default {
}, },
{ {
label: "设备", label: "设备",
prop: "equipmentId", prop: "equipmentName",
// bind: "equipmentName", // bind: "equipmentName",
search: false, search: false,
sortable: true, sortable: "custom",
filter: true, filter: true,
span: 24, span: 24,
type: "select", display:false,
dicUrl:"/api/blade-desk/equipment/page?current=1&size=999&deviceName={{key}}", // type: "select",
props:{ // dicUrl:"/api/blade-desk/equipment/page?current=1&size=999&deviceName={{key}}",
label:"deviceName", // props:{
value:"id", // label:"deviceName",
res:"data.records", // value:"id",
}, // res:"data.records",
remote: true, // },
// dicData: [ // remote: true,
// { label: "化学镀镍", value: "化学镀镍" }, // // dicData: [
// { label: "电镀设备", value: "电镀设备" }, // // { label: "化学镀镍", value: "化学镀镍" },
// { label: "喷涂设备", value: "喷涂设备" }, // // { label: "电镀设备", value: "电镀设备" },
// // { label: "喷涂设备", value: "喷涂设备" },
// // ],
// rules: [
// {
// required: true,
// message: "请选择设备",
// trigger: "blur",
// },
// ], // ],
// change:(row) =>{
// this.form.equipmentName = row && row.item && row.item.deviceName
// }
},
{
label: "设备",
prop: "equipmentId",
// bind: "equipmentName",
search: false,
sortable: "custom",
filter: true,
span: 24,
hide:true,
rules: [ rules: [
{ {
required: true, required: true,
@ -152,9 +195,6 @@ export default {
trigger: "blur", trigger: "blur",
}, },
], ],
change:(row) =>{
this.form.equipmentName = row && row.item && row.item.deviceName
}
}, },
{ {
label: "日期", label: "日期",
@ -162,7 +202,7 @@ export default {
type:'date', type:'date',
search: true, search: true,
searchRange: true, searchRange: true,
sortable: true, sortable: "custom",
filter: true, filter: true,
span: 24, span: 24,
format:"YYYY-MM-DD", format:"YYYY-MM-DD",
@ -181,7 +221,7 @@ export default {
label: "定额单位面积用电量(kWh/dm²)", label: "定额单位面积用电量(kWh/dm²)",
prop: "electricNum", prop: "electricNum",
search: false, search: false,
sortable: true, sortable: "custom",
filter: true, filter: true,
span: 24, span: 24,
rules: [ rules: [
@ -202,7 +242,37 @@ export default {
}, },
}; };
}, },
computed: {
...mapGetters(['permission']),
},
created(){
console.log('pero--------',this.permission)
this.option.addBtn = this.permission.electricityQuota_add ? true : false;
this.option.editBtn = this.permission.electricityQuota_edit ? true : false;
},
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
// this.query.isAsc = undefined;
this.query.asc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField == "DATE" ? `"${orderByField}"` : orderByField;
// this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
},
changeEquipment(val, item){
console.log('val------------------',val)
console.log('item------------------',item)
this.form.equipmentId = val
this.form.equipmentName = item && item.deviceName
},
handleImport() { handleImport() {
this.isShowImport = true this.isShowImport = true
}, },
@ -340,6 +410,9 @@ export default {
type:2, type:2,
...param ...param
}).then(res =>{ }).then(res =>{
res.data.data.records.map(item =>{
item.electricNum = Number(item.electricNum)
})
this.data = res.data.data.records; this.data = res.data.data.records;
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
this.loading = false; this.loading = false;

13
src/views/energyManagement/components/electricityTarget.vue
Unescape View File

@ -51,6 +51,7 @@ export default {
data:[], data:[],
isShowImport:false, isShowImport:false,
selectionList: [], selectionList: [],
query:{},
option: { option: {
height: "auto", height: "auto",
calcHeight: 32, calcHeight: 32,
@ -105,6 +106,7 @@ export default {
prop: "year", prop: "year",
search: true, search: true,
span: 24, span: 24,
sortable: 'custom',
type:"year", type:"year",
format: "YYYY", format: "YYYY",
valueFormat: "YYYY", valueFormat: "YYYY",
@ -122,6 +124,7 @@ export default {
prop: "quarter", prop: "quarter",
search: true, search: true,
span: 24, span: 24,
sortable: 'custom',
type:"select", type:"select",
dicData:[ dicData:[
{label:"第一季度",value:'1'}, {label:"第一季度",value:'1'},
@ -142,7 +145,7 @@ export default {
prop: "target", prop: "target",
type:'number', type:'number',
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
rules: [ rules: [
@ -174,15 +177,19 @@ export default {
methods: { methods: {
// 表格排序 // 表格排序
sortChange({ prop, order }) { sortChange({ prop, order }) {
console.log('prop-------------',prop)
if (!prop) { if (!prop) {
// 如果取消排序，清空排序参数 // 如果取消排序，清空排序参数
this.query.orderByField = undefined; this.query.orderByField = undefined;
this.query.isAsc = undefined; // this.query.isAsc = undefined;
this.query.asc = undefined;
} else { } else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
console.log('orderByField-------------',orderByField)
this.query.orderByField = orderByField; this.query.orderByField = orderByField;
this.query.isAsc = order === 'ascending' ? true : false; // this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
} }
// // 重新加载数据 // // 重新加载数据
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);

37
src/views/energyManagement/components/waterQuota.vue
Unescape View File

@ -8,7 +8,6 @@
> >
<template #equipmentId-form="{type,disabled}"> <template #equipmentId-form="{type,disabled}">
<jhSelect <jhSelect
@input="val => (form.equipmentId = val)"
:value="form.equipmentId" :value="form.equipmentId"
placeholder="请搜索选择" placeholder="请搜索选择"
api-url="/blade-desk/equipment/page" api-url="/blade-desk/equipment/page"
@ -107,7 +106,7 @@ export default {
{ {
label: "作业中心", label: "作业中心",
prop: "workCenterId", prop: "workCenterId",
sortable: true, sortable: 'custom',
filter: true, filter: true,
multiple: true, multiple: true,
span: 24, span: 24,
@ -139,10 +138,11 @@ export default {
prop: "equipmentName", prop: "equipmentName",
// bind: "equipmentName", // bind: "equipmentName",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
display:false, display:false,
span: 24, span: 24,
// type: "select", // type: "select",
// dicUrl:"/api/blade-desk/equipment/page?current=1&size=999&deviceName={{key}}", // dicUrl:"/api/blade-desk/equipment/page?current=1&size=999&deviceName={{key}}",
// props:{ // props:{
@ -173,16 +173,23 @@ export default {
prop: "equipmentId", prop: "equipmentId",
// bind: "equipmentName", // bind: "equipmentName",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
hide:true hide:true,
rules: [
{
required: true,
message: "请选择设备",
trigger: "blur",
},
],
}, },
{ {
label: "日期", label: "日期",
prop: "date", prop: "date",
search: true, search: true,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
type: 'date', type: 'date',
@ -204,7 +211,7 @@ export default {
label: "自来水用水量(L/d㎡)", label: "自来水用水量(L/d㎡)",
prop: "tapWaterNum", prop: "tapWaterNum",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
rules: [ rules: [
@ -219,7 +226,7 @@ export default {
label: "纯水用水量(L/d㎡)", label: "纯水用水量(L/d㎡)",
prop: "pureWaterNum", prop: "pureWaterNum",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
rules: [ rules: [
@ -255,12 +262,13 @@ export default {
if (!prop) { if (!prop) {
// 如果取消排序，清空排序参数 // 如果取消排序，清空排序参数
this.query.orderByField = undefined; this.query.orderByField = undefined;
this.query.isAsc = undefined; // this.query.isAsc = undefined;
this.query.asc = undefined;
} else { } else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField == "DATE" ? `"${orderByField}"` : orderByField;
this.query.orderByField = orderByField; // this.query.isAsc = order === 'ascending' ? true : false;
this.query.isAsc = order === 'ascending' ? true : false; this.query.asc = order === 'ascending' ? true : false;
} }
// // 重新加载数据 // // 重新加载数据
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);
@ -444,12 +452,17 @@ export default {
endDate:this.query.date && this.query.date.length != 0 && this.query.date[1] endDate:this.query.date && this.query.date.length != 0 && this.query.date[1]
} }
if(param.date) delete param.date if(param.date) delete param.date
console.log('param======',param)
pageList({ pageList({
type: 1, type: 1,
current:this.page.currentPage, current:this.page.currentPage,
size:this.page.pageSize, size:this.page.pageSize,
...param ...param
}).then(res => { }).then(res => {
// res.data.data.records.map(item =>{
// item.pureWaterNum = Number(item.pureWaterNum)
// item.tapWaterNum = Number(item.tapWaterNum)
// })
this.data = res.data.data.records; this.data = res.data.data.records;
this.page.total = res.data.data.total; this.page.total = res.data.data.total;
this.loading = false; this.loading = false;

10
src/views/energyManagement/components/waterTarget.vue
Unescape View File

@ -110,7 +110,7 @@ export default {
label: "年份", label: "年份",
prop: "year", prop: "year",
search: true, search: true,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
type: "year", type: "year",
@ -130,7 +130,7 @@ export default {
prop: "target", prop: "target",
type:"number", type:"number",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
}, },
@ -158,12 +158,14 @@ export default {
if (!prop) { if (!prop) {
// 如果取消排序，清空排序参数 // 如果取消排序，清空排序参数
this.query.orderByField = undefined; this.query.orderByField = undefined;
this.query.isAsc = undefined; // this.query.isAsc = undefined;
this.query.asc = undefined;
} else { } else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase(); const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField; this.query.orderByField = orderByField;
this.query.isAsc = order === 'ascending' ? true : false; // this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
} }
// // 重新加载数据 // // 重新加载数据
this.onLoad(this.page, this.query); this.onLoad(this.page, this.query);

34
src/views/energyManagement/electricityManagement.vue
Unescape View File

@ -15,15 +15,18 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
> >
<!-- 自定义开关列 --> <!-- 自定义开关列 -->
<template #isJumbotron="scope"> <template #isJumbotron="scope">
<el-switch v-model="scope.row.isJumbotron" :active-value="1" <el-switch v-model="scope.row.isJumbotron" :active-value="1"
:disabled="!permission.electricityMonitoring_big_screen"
:inactive-value="0" @change="(val) => changeJumbtron(scope.row,val)"></el-switch> :inactive-value="0" @change="(val) => changeJumbtron(scope.row,val)"></el-switch>
</template> </template>
<!-- 自定义操作列 --> <!-- 自定义操作列 -->
<template #menu="scope"> <template #menu="scope">
<el-button type="text" size="small" @click="handleElectricDetail(scope.row)" <el-button type="text" size="small" @click="handleElectricDetail(scope.row)"
v-if="permission.electricityMonitoring_detail"
>用电明细</el-button >用电明细</el-button
> >
</template> </template>
@ -89,6 +92,7 @@
<script> <script>
import { pageList, editItem,pageListDetail } from '@/api/energyManagement/waterManagement'; import { pageList, editItem,pageListDetail } from '@/api/energyManagement/waterManagement';
import { mapGetters } from 'vuex';
export default { export default {
data() { data() {
return { return {
@ -211,6 +215,7 @@ export default {
multiple: true, multiple: true,
span: 24, span: 24,
width: 200, width: 200,
sortable: 'custom',
overflow: true, overflow: true,
search: true, search: true,
dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect", dicUrl:"/api/blade-desk/BA/WorkCenter/listForSelect",
@ -231,6 +236,7 @@ export default {
prop: 'date', prop: 'date',
span: 24, span: 24,
overflow: true, overflow: true,
sortable: 'custom',
search: true, search: true,
type: 'date', type: 'date',
searchRange: true, searchRange: true,
@ -251,6 +257,7 @@ export default {
prop: 'workArea', prop: 'workArea',
span: 24, span: 24,
overflow: true, overflow: true,
sortable: 'custom',
search: false, search: false,
rules: [ rules: [
{ {
@ -264,7 +271,8 @@ export default {
label: '定额单位面积用电量(kWh/dm²)', label: '定额单位面积用电量(kWh/dm²)',
prop: 'quoElectricNum', prop: 'quoElectricNum',
span: 24, span: 24,
width: 200, width: 210,
sortable: 'custom',
overflow: true, overflow: true,
search: false, search: false,
rules: [ rules: [
@ -280,7 +288,8 @@ export default {
prop: 'realElectricNum', prop: 'realElectricNum',
span: 24, span: 24,
overflow: true, overflow: true,
width: 200, sortable: 'custom',
width: 210,
search: false, search: false,
rules: [ rules: [
{ {
@ -294,8 +303,10 @@ export default {
label: '实际总用电量(kWh)', label: '实际总用电量(kWh)',
prop: 'totalElectricNum', prop: 'totalElectricNum',
span: 24, span: 24,
width: 160,
overflow: true, overflow: true,
search: false, search: false,
sortable: 'custom',
rules: [ rules: [
{ {
required: true, required: true,
@ -315,7 +326,26 @@ export default {
}; };
}, },
mounted() {}, mounted() {},
computed: {
...mapGetters(['permission']),
},
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
// this.query.isAsc = undefined;
this.query.asc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField == "DATE" ? "CREATE_TIME" : orderByField;
// this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
},
searchChange(params, done){ searchChange(params, done){
this.query = params this.query = params
this.page.currentPage = 1; this.page.currentPage = 1;

26
src/views/energyManagement/energyMonitoring.vue
Unescape View File

@ -16,16 +16,17 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
> >
<template #menu-left> <template #menu-left>
<el-button type="primary" @click="handleAdd">新增</el-button> <el-button type="primary" @click="handleAdd" v-if="permission.energyMonitoring_add">新增</el-button>
<el-button type="danger" @click="handleDelete">删除</el-button> <el-button type="danger" @click="handleDelete" v-if="permission.energyMonitoring_delete">删除</el-button>
</template> </template>
<template #menu-right> <template #menu-right>
<!-- <el-button type="primary" @click="handleImport">导入</el-button> --> <!-- <el-button type="primary" @click="handleImport">导入</el-button> -->
</template> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="primary" text @click="editRow(scope.row)">修改</el-button> <el-button type="primary" text @click="editRow(scope.row)" v-if="permission.energyMonitoring_edit">修改</el-button>
</template> </template>
</avue-crud> </avue-crud>
@ -49,6 +50,7 @@
import addBatchMonitoring from './components/addBatchMonitoring.vue' import addBatchMonitoring from './components/addBatchMonitoring.vue'
import basicImport from '@/components/basic-import/main.vue' import basicImport from '@/components/basic-import/main.vue'
import { pageList, removeItem, saveItem, exportData } from '@/api/energyManagement/bsEnergyMonitor'; import { pageList, removeItem, saveItem, exportData } from '@/api/energyManagement/bsEnergyMonitor';
import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
@ -282,7 +284,25 @@ export default {
checkRow:{}, checkRow:{},
}; };
}, },
computed: {
...mapGetters(['permission']),
},
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
console.log('perop---------',prop)
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
this.query.isAsc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField;
this.query.isAsc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
},
selectionClear() { selectionClear() {
this.selectionList = []; this.selectionList = [];
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();

62
src/views/energyManagement/peakFlatValley.vue
Unescape View File

@ -2,15 +2,17 @@
<basic-container> <basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@sort-change="sortChange"
>
<template #menu-left> <template #menu-left>
<el-button type="primary" @click="handleAdd">新增</el-button> <el-button type="primary" @click="handleAdd" v-if="permission.peakFlatValley_add">新增</el-button>
<el-button type="danger" @click="handleDelete">删除</el-button> <el-button type="danger" @click="handleDelete" v-if="permission.peakFlatValley_delete">删除</el-button>
</template> </template>
<template #menu-right> </template> <template #menu-right> </template>
<template #menu="scope"> <template #menu="scope">
<el-button type="primary" text @click="handleEdit(scope.row)">修改</el-button> <el-button type="primary" text @click="handleEdit(scope.row)" v-if="permission.peakFlatValley_edit">修改</el-button>
<el-button type="primary" text @click="rowDel(scope.row)">删除</el-button> <el-button type="primary" text @click="rowDel(scope.row)" v-if="permission.peakFlatValley_delete">删除</el-button>
</template> </template>
</avue-crud> </avue-crud>
<addBatchPeak <addBatchPeak
@ -26,6 +28,7 @@
<script> <script>
import addBatchPeak from "@/views/energyManagement/components/addBatchPeak.vue"; import addBatchPeak from "@/views/energyManagement/components/addBatchPeak.vue";
import {pageList,removeItem} from '@/api/energyManagement/peakFlat' import {pageList,removeItem} from '@/api/energyManagement/peakFlat'
import { mapGetters } from 'vuex';
export default { export default {
components: { addBatchPeak }, components: { addBatchPeak },
data() { data() {
@ -87,7 +90,7 @@ export default {
{ {
label: "月份", label: "月份",
prop: "month", prop: "month",
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 24, span: 24,
search: true, search: true,
@ -107,7 +110,7 @@ export default {
label: "尖时一开始", label: "尖时一开始",
prop: "sharpOneStartTime", prop: "sharpOneStartTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 140, width: 140,
@ -119,7 +122,7 @@ export default {
label: "尖时一结束", label: "尖时一结束",
prop: "sharpOneEndTime", prop: "sharpOneEndTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 140, width: 140,
@ -131,7 +134,7 @@ export default {
label: "峰时一开始", label: "峰时一开始",
prop: "peakOneStartTime", prop: "peakOneStartTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 140, width: 140,
@ -143,7 +146,7 @@ export default {
label: "峰时一结束", label: "峰时一结束",
prop: "peakOneEndTime", prop: "peakOneEndTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -155,7 +158,7 @@ export default {
label: "平时一开始", label: "平时一开始",
prop: "flatOneStartTime", prop: "flatOneStartTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -167,7 +170,7 @@ export default {
label: "平时一结束", label: "平时一结束",
prop: "flatOneEndTime", prop: "flatOneEndTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -179,7 +182,7 @@ export default {
label: "谷时一开始", label: "谷时一开始",
prop: "valleyOneStartTime", prop: "valleyOneStartTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -191,7 +194,7 @@ export default {
label: "谷时一结束", label: "谷时一结束",
prop: "valleyOneEndTime", prop: "valleyOneEndTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -203,7 +206,7 @@ export default {
label: "尖时二开始", label: "尖时二开始",
prop: "sharpTwoStartTime", prop: "sharpTwoStartTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -215,7 +218,7 @@ export default {
label: "尖时二结束", label: "尖时二结束",
prop: "sharpTwoEndTime", prop: "sharpTwoEndTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -227,7 +230,7 @@ export default {
label: "峰时二开始", label: "峰时二开始",
prop: "peakTwoStartTime", prop: "peakTwoStartTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -239,7 +242,7 @@ export default {
label: "峰时二结束", label: "峰时二结束",
prop: "peakTwoEndTime", prop: "peakTwoEndTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
@ -252,7 +255,7 @@ export default {
label: "平时二开始", label: "平时二开始",
prop: "flatTwoStartTime", prop: "flatTwoStartTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -264,7 +267,7 @@ export default {
label: "平时二结束", label: "平时二结束",
prop: "flatTwoEndTime", prop: "flatTwoEndTime",
search: false, search: false,
sortable: true, sortable: 'custom',
filter: true, filter: true,
span: 12, span: 12,
width: 130, width: 130,
@ -285,7 +288,26 @@ export default {
checkRow:{}, checkRow:{},
}; };
}, },
computed: {
...mapGetters(['permission']),
},
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
// this.query.isAsc = undefined;
this.query.asc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField;
// this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
},
selectionClear() { selectionClear() {
this.selectionList = []; this.selectionList = [];
this.$refs.crud.toggleSelection(); this.$refs.crud.toggleSelection();

37
src/views/energyManagement/waterManagement.vue
Unescape View File

@ -2,9 +2,11 @@
<basic-container> <basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
@on-load="onLoad" @sort-change="sortChange">
<template #isJumbotron="scope" > <template #isJumbotron="scope" >
<el-switch v-model="scope.row.isJumbotron" :active-value="1" <el-switch v-model="scope.row.isJumbotron" :active-value="1"
:disabled="!permission.waterMonitoring_big_screen"
:inactive-value="0" @change="(val) => changeJumbtron(scope.row,val)"></el-switch> :inactive-value="0" @change="(val) => changeJumbtron(scope.row,val)"></el-switch>
</template> </template>
</avue-crud> </avue-crud>
@ -13,6 +15,7 @@
<script> <script>
import { pageList,editItem } from "@/api/energyManagement/waterManagement" import { pageList,editItem } from "@/api/energyManagement/waterManagement"
import { mapGetters } from 'vuex';
export default { export default {
data() { data() {
return { return {
@ -72,6 +75,7 @@ export default {
{ {
label: "作业中心", label: "作业中心",
prop: "workCenterId", prop: "workCenterId",
sortable: 'custom',
type:"select", type:"select",
multiple: true, multiple: true,
span: 24, span: 24,
@ -94,6 +98,7 @@ export default {
{ {
label: "日期", label: "日期",
prop: "date", prop: "date",
sortable: 'custom',
span: 24, span: 24,
width: 200, width: 200,
overflow: true, overflow: true,
@ -116,6 +121,7 @@ export default {
label: "加工面积(dm²)", label: "加工面积(dm²)",
prop: "workArea", prop: "workArea",
span: 24, span: 24,
sortable: 'custom',
width: 200, width: 200,
overflow: true, overflow: true,
search: false, search: false,
@ -130,6 +136,7 @@ export default {
{ {
label: "定额单位自来水用水量(L/dm²)", label: "定额单位自来水用水量(L/dm²)",
prop: "quoTapWaterNum", prop: "quoTapWaterNum",
sortable: 'custom',
span: 24, span: 24,
width: 280, width: 280,
overflow: true, overflow: true,
@ -146,6 +153,7 @@ export default {
label: "实际单位自来水用水量(L/dm²)", label: "实际单位自来水用水量(L/dm²)",
prop: "realTapWaterNum", prop: "realTapWaterNum",
span: 24, span: 24,
sortable: 'custom',
width: 280, width: 280,
overflow: true, overflow: true,
search: false, search: false,
@ -163,6 +171,7 @@ export default {
span: 24, span: 24,
width: 200, width: 200,
overflow: true, overflow: true,
sortable: 'custom',
search: false, search: false,
rules: [ rules: [
{ {
@ -178,6 +187,7 @@ export default {
span: 24, span: 24,
width: 240, width: 240,
overflow: true, overflow: true,
sortable: 'custom',
search: false, search: false,
rules: [ rules: [
{ {
@ -191,6 +201,7 @@ export default {
label: "实际单位纯水用水量(L/dm²)", label: "实际单位纯水用水量(L/dm²)",
prop: "realPureWaterNum", prop: "realPureWaterNum",
span: 24, span: 24,
sortable: 'custom',
width: 200, width: 200,
overflow: true, overflow: true,
search: false, search: false,
@ -206,6 +217,7 @@ export default {
label: "实际总纯水用水量(t)", label: "实际总纯水用水量(t)",
prop: "totalPureWaterNum", prop: "totalPureWaterNum",
span: 24, span: 24,
sortable: 'custom',
width: 200, width: 200,
overflow: true, overflow: true,
search: false, search: false,
@ -227,8 +239,29 @@ export default {
}, },
}; };
}, },
mounted() { }, computed: {
...mapGetters(['permission']),
},
mounted() {
console.log('permission-------',this.permission)
},
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
// this.query.isAsc = undefined;
this.query.asc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
this.query.orderByField = orderByField == "DATE" ? "CREATE_TIME" : orderByField;
// this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
},
searchChange(params, done){ searchChange(params, done){
this.query = params this.query = params
this.page.currentPage = 1; this.page.currentPage = 1;

92
src/views/personnelEfficiencyManagement/salaryManagement/payrollComputation.vue
Unescape View File

@ -17,6 +17,7 @@
@size-change="sizeChange" @size-change="sizeChange"
@refresh-change="refreshChange" @refresh-change="refreshChange"
@on-load="onLoad" @on-load="onLoad"
@sort-change="sortChange"
> >
<template #totalArea-search="{ disabled, size }"> <template #totalArea-search="{ disabled, size }">
<div style="display: flex;"> <div style="display: flex;">
@ -64,7 +65,7 @@
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary">导出</el-button> <el-button type="primary" v-if="permission.payrollComputation_export">导出</el-button>
</template> </template>
</avue-crud> </avue-crud>
</basic-container> </basic-container>
@ -73,6 +74,7 @@
<script> <script>
import {getList} from "@/api/performanceManagement/payrollComputation" import {getList} from "@/api/performanceManagement/payrollComputation"
import jhSelect from '@/components/jh-select/index.vue'; import jhSelect from '@/components/jh-select/index.vue';
import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
jhSelect, jhSelect,
@ -152,7 +154,7 @@ export default {
endPlaceholder: "结束时间", endPlaceholder: "结束时间",
hide: true, hide: true,
width: 200, width: 200,
sortable: true, sortable: 'custom',
searchOrder: 8, searchOrder: 8,
overHidden: true, overHidden: true,
rules: [ rules: [
@ -176,7 +178,7 @@ export default {
search: true, search: true,
width: 160, width: 160,
searchOrder: 7, searchOrder: 7,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -191,7 +193,7 @@ export default {
prop: "partCode", prop: "partCode",
search: false, search: false,
width: 200, width: 200,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -206,7 +208,7 @@ export default {
prop: "partName", prop: "partName",
search: false, search: false,
width: 160, width: 160,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -228,7 +230,7 @@ export default {
prop: "batchNo", prop: "batchNo",
search: false, search: false,
width: 160, width: 160,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -243,7 +245,7 @@ export default {
prop: "useDept", prop: "useDept",
search: false, search: false,
width: 150, width: 150,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -258,7 +260,7 @@ export default {
prop: "productType", prop: "productType",
search: false, search: false,
width: 150, width: 150,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -274,7 +276,7 @@ export default {
search: true, search: true,
width: 120, width: 120,
searchIndex:2, searchIndex:2,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -292,7 +294,7 @@ export default {
width: 160, width: 160,
hide:true, hide:true,
searchOrder: 5, searchOrder: 5,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -313,7 +315,7 @@ export default {
label: "作业中心", label: "作业中心",
prop: "wcName", prop: "wcName",
width: 160, width: 160,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
search:false, search:false,
}, },
@ -322,7 +324,7 @@ export default {
prop: "team", prop: "team",
search: false, search: false,
width: 160, width: 160,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -338,7 +340,7 @@ export default {
type: "select", type: "select",
search: true, search: true,
width: 160, width: 160,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
searchOrder: 4, searchOrder: 4,
rules: [ rules: [
@ -368,7 +370,7 @@ export default {
// type: "select", // type: "select",
// search: true, // search: true,
// width: 200, // width: 200,
// sortable: true, // sortable: 'custom',
// overHidden: true, // overHidden: true,
// rules: [ // rules: [
// { // {
@ -388,7 +390,7 @@ export default {
prop: "hourQuota", prop: "hourQuota",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -403,7 +405,7 @@ export default {
prop: "hourPrepar", prop: "hourPrepar",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -418,7 +420,7 @@ export default {
prop: "hqUnit", prop: "hqUnit",
search: false, search: false,
width: 130, width: 130,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -433,7 +435,7 @@ export default {
prop: "workQty", prop: "workQty",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -448,7 +450,7 @@ export default {
prop: "hourTotal", prop: "hourTotal",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -463,7 +465,7 @@ export default {
prop: "worker", prop: "worker",
search: false, search: false,
width: 100, width: 100,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -478,7 +480,7 @@ export default {
prop: "plateThickness", prop: "plateThickness",
search: false, search: false,
width: 100, width: 100,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -493,7 +495,7 @@ export default {
// prop: "productType", // prop: "productType",
// search: false, // search: false,
// width: 200, // width: 200,
// sortable: true, // sortable: 'custom',
// overHidden: true, // overHidden: true,
// rules: [ // rules: [
// { // {
@ -509,7 +511,7 @@ export default {
type: "select", type: "select",
search: true, search: true,
width: 100, width: 100,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
searchOrder: 3, searchOrder: 3,
dicUrl:"/api/blade-scheduling/qualityGrade/getGrades", dicUrl:"/api/blade-scheduling/qualityGrade/getGrades",
@ -532,7 +534,7 @@ export default {
prop: "singleBatchNo", prop: "singleBatchNo",
search: true, search: true,
width: 120, width: 120,
sortable: true, sortable: 'custom',
searchOrder: 1, searchOrder: 1,
overHidden: true, overHidden: true,
rules: [ rules: [
@ -548,7 +550,7 @@ export default {
prop: "putQuantity", prop: "putQuantity",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -563,7 +565,7 @@ export default {
prop: "scrapQty", prop: "scrapQty",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -578,7 +580,7 @@ export default {
prop: "lossQty", prop: "lossQty",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -593,7 +595,7 @@ export default {
prop: "testQty", prop: "testQty",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -608,7 +610,7 @@ export default {
prop: "poArea", prop: "poArea",
search: false, search: false,
width: 150, width: 150,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -624,7 +626,7 @@ export default {
search: true, search: true,
width: 150, width: 150,
searchOrder: 0, searchOrder: 0,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -639,7 +641,7 @@ export default {
prop: "putStoreTime", prop: "putStoreTime",
search: false, search: false,
width: 150, width: 150,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -654,7 +656,7 @@ export default {
prop: "baseAmount", prop: "baseAmount",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -669,7 +671,7 @@ export default {
prop: "subsidyAmount", prop: "subsidyAmount",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -684,7 +686,7 @@ export default {
prop: "totalAmount", prop: "totalAmount",
search: false, search: false,
width: 120, width: 120,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
rules: [ rules: [
{ {
@ -698,8 +700,30 @@ export default {
}, },
}; };
}, },
computed: {
...mapGetters(['permission']),
},
mounted() {}, mounted() {},
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
console.log('prop-------------',prop)
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
// this.query.isAsc = undefined;
this.query.asc = undefined;
} else {
// const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
// console.log('orderByField-------------',orderByField)
this.query.orderByField = prop;
// this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
},
// 切换工序 // 切换工序
changePpsName(val, item) { changePpsName(val, item) {
console.log("val", val) console.log("val", val)

63
src/views/personnelEfficiencyManagement/salaryManagement/salaryStandard.vue
Unescape View File

@ -19,14 +19,15 @@
@on-load="onLoad" @on-load="onLoad"
:span-method="spanMethod" :span-method="spanMethod"
:before-open="beforeOpen" :before-open="beforeOpen"
@sort-change="sortChange"
> >
<template #menu-left> <template #menu-left>
<el-button type="danger" @click="handleDelete" <el-button type="danger" @click="handleDelete" v-if="permission.salaryStandard_delete"
>删除</el-button >删除</el-button
> >
</template> </template>
<template #menu-right> <template #menu-right>
<el-button type="primary" @click="handleImport" <el-button type="primary" @click="handleImport" v-if="permission.salaryStandard_import"
>导入 >导入
</el-button> </el-button>
</template> </template>
@ -96,7 +97,7 @@
<script> <script>
import basicImport from '@/components/basic-import/main.vue' import basicImport from '@/components/basic-import/main.vue'
import {getProcessList,getList,deleteTable,addTable } from "@/api/performanceManagement/salaryManagement" import {getProcessList,getList,deleteTable,addTable } from "@/api/performanceManagement/salaryManagement"
import { fa } from 'element-plus/es/locales.mjs'; import { mapGetters } from 'vuex';
export default { export default {
components: { components: {
basicImport, basicImport,
@ -107,6 +108,7 @@ export default {
loading: false, loading: false,
data: [], data: [],
form: {}, form: {},
query:{},
page: { page: {
pageSize: 10, pageSize: 10,
currentPage: 1, currentPage: 1,
@ -136,8 +138,8 @@ export default {
selection: true, selection: true,
viewBtn: false, viewBtn: false,
delBtn: false, delBtn: false,
addBtn: true, addBtn: false,
editBtn: true, editBtn: false,
editBtnText: "修改", editBtnText: "修改",
addBtnIcon: " ", addBtnIcon: " ",
viewBtnIcon: " ", viewBtnIcon: " ",
@ -172,7 +174,7 @@ export default {
prop: "standardType", prop: "standardType",
type: "select", type: "select",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 100, width: 100,
rules: [ rules: [
@ -192,7 +194,7 @@ export default {
label: "工序", label: "工序",
prop: "processName", prop: "processName",
search: true, search: true,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
@ -209,7 +211,7 @@ export default {
label: "工序", label: "工序",
prop: "processId", prop: "processId",
search: false, search: false,
sortable: true, sortable: 'custom',
hide:true, hide:true,
overHidden: true, overHidden: true,
addDisplay: true, addDisplay: true,
@ -227,7 +229,7 @@ export default {
label: "零件号", label: "零件号",
prop: "partNo", prop: "partNo",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
minWidth: 160, minWidth: 160,
// rules: [ // rules: [
@ -243,7 +245,7 @@ export default {
prop: "settlementPrice", prop: "settlementPrice",
type: "number", type: "number",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 110, width: 110,
rules: [ rules: [
@ -259,7 +261,7 @@ export default {
prop: "settlementUnit", prop: "settlementUnit",
type: "select", type: "select",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 120, width: 120,
rules: [ rules: [
@ -280,7 +282,7 @@ export default {
prop: "step", prop: "step",
hide:true, hide:true,
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 100, width: 100,
addDisplay: true, addDisplay: true,
@ -298,7 +300,7 @@ export default {
prop: "minStep", prop: "minStep",
type: "number", type: "number",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 95, width: 95,
addDisplay: false, addDisplay: false,
@ -309,7 +311,7 @@ export default {
prop: "maxStep", prop: "maxStep",
search: false, search: false,
type: "number", type: "number",
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
@ -320,7 +322,7 @@ export default {
prop: "stepUnit", prop: "stepUnit",
type: "select", type: "select",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 100, width: 100,
dicData: [ dicData: [
@ -339,7 +341,7 @@ export default {
label: "阶梯结算价", label: "阶梯结算价",
prop:"stepSettlementPrice", prop:"stepSettlementPrice",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
hide: true, hide: true,
width: 110, width: 110,
@ -358,7 +360,7 @@ export default {
prop: "price", prop: "price",
type: "number", type: "number",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
addDisplay: false, addDisplay: false,
editDisplay: false, editDisplay: false,
@ -369,7 +371,7 @@ export default {
prop: "stepSettlementUnit", prop: "stepSettlementUnit",
type: "select", type: "select",
search: false, search: false,
sortable: true, sortable: 'custom',
overHidden: true, overHidden: true,
width: 120, width: 120,
dicData: [ dicData: [
@ -388,10 +390,33 @@ export default {
}, },
}; };
}, },
computed: {
...mapGetters(['permission']),
},
mounted() { mounted() {
this.option.addBtn = this.permission.salaryStandard_add ? true : false;
this.option.editBtn = this.permission.salaryStandard_edit ? true : false;
}, },
methods: { methods: {
// 表格排序
sortChange({ prop, order }) {
console.log('prop-------------',prop)
if (!prop) {
// 如果取消排序，清空排序参数
this.query.orderByField = undefined;
// this.query.isAsc = undefined;
this.query.asc = undefined;
} else {
const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
console.log('orderByField-------------',orderByField)
this.query.orderByField = orderByField == 'MIN_STEP' ? 'minstep' : orderByField == 'MAX_STEP' ? 'maxstep' : orderByField;
// this.query.isAsc = order === 'ascending' ? true : false;
this.query.asc = order === 'ascending' ? true : false;
}
// // 重新加载数据
this.onLoad(this.page, this.query);
},
getPpsList(query){ getPpsList(query){
console.log('form============',this.form) console.log('form============',this.form)
getProcessList({ getProcessList({

Write Preview
Loading…
Cancel
Save