Commit 9e386675 authored by tanjunxin's avatar tanjunxin

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

parent 3d75d4ee
......@@ -191,6 +191,7 @@ export default {
},
/** 查询节假日设置列表 */
getList(type) {
console.log(type);
this.loading = true;
this.holidayList = [];
this.workdayList = [];
......@@ -202,10 +203,12 @@ export default {
if (type) {
delete params.workunitName;
} else {
delete params.workunitIds;
params["workunitId"] = this.selectRow.id;
// delete params.workunitIds;
// 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) => {
this.calendarDayList = response.data;
if (response.data != null) {
......
......@@ -121,8 +121,10 @@
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template>
</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" >
<template slot-scope="scope">
<el-button
......
......@@ -99,6 +99,10 @@
<el-table-column label="异常原因" align="center" prop="abnormalReason" />
<el-table-column label="异常处理人" align="center" prop="nickName" />
<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">
<template slot-scope="scope">
<el-button
......@@ -211,7 +215,7 @@ export default {
},
methods: {
//人员选择返回
onUserSelected(row){
onUserSelected(row){
this.form.userName = row.userName
this.form.userId = row.userId
this.form.nickName = row.nickName
......
......@@ -111,6 +111,10 @@
</template>
</el-table-column>
<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">
<template slot-scope="scope">
<el-button
......@@ -190,7 +194,7 @@
<el-input v-model="form.indexName" type="textarea" placeholder="请输入检验要求" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
......
......@@ -113,6 +113,10 @@
<dict-tag :options="dict.type.sys_yes_no" :value="scope.row.enableFlag"/>
</template>
</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">
<template slot-scope="scope">
<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