Commit 9e386675 authored by tanjunxin's avatar tanjunxin

fix: 排班日历数据获取接口修改

parent 3d75d4ee
...@@ -191,6 +191,7 @@ export default { ...@@ -191,6 +191,7 @@ export default {
}, },
/** 查询节假日设置列表 */ /** 查询节假日设置列表 */
getList(type) { getList(type) {
console.log(type);
this.loading = true; this.loading = true;
this.holidayList = []; this.holidayList = [];
this.workdayList = []; this.workdayList = [];
...@@ -202,10 +203,12 @@ export default { ...@@ -202,10 +203,12 @@ export default {
if (type) { if (type) {
delete params.workunitName; delete params.workunitName;
} else { } else {
delete params.workunitIds; // delete params.workunitIds;
params["workunitId"] = this.selectRow.id; // params["workunitId"] = this.selectRow.id;
params.workunitIds = [this.selectRow.id];
} }
const fn = type ? getCalWorkunits : listCalholiday; // const fn = type ? getCalWorkunits : listCalholiday;
const fn = getCalWorkunits;
fn(params).then((response) => { fn(params).then((response) => {
this.calendarDayList = response.data; this.calendarDayList = response.data;
if (response.data != null) { if (response.data != null) {
......
...@@ -121,8 +121,10 @@ ...@@ -121,8 +121,10 @@
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy"/> <el-table-column label="创建人" align="center" prop="createBy" width="150"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
<el-table-column label="更新人" align="center" prop="updateBy" width="150"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" > <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -99,6 +99,10 @@ ...@@ -99,6 +99,10 @@
<el-table-column label="异常原因" align="center" prop="abnormalReason" /> <el-table-column label="异常原因" align="center" prop="abnormalReason" />
<el-table-column label="异常处理人" align="center" prop="nickName" /> <el-table-column label="异常处理人" align="center" prop="nickName" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -111,6 +111,10 @@ ...@@ -111,6 +111,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验名称" align="center" prop="qcTool" /> <el-table-column label="检验名称" align="center" prop="qcTool" />
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -113,6 +113,10 @@ ...@@ -113,6 +113,10 @@
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/> <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment