|
@@ -11,9 +11,9 @@
|
|
|
<el-form-item label="标题" prop="title">
|
|
|
{{ info.title }}
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="备注" prop="remark">
|
|
|
+ <!-- <el-form-item label="备注" prop="remark">
|
|
|
<el-input v-model="info.remark" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }"></el-input>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
|
|
|
<el-collapse v-model="collapse" accordion>
|
|
|
<el-collapse-item title="上报可行时间列表" name="1">
|
|
@@ -88,7 +88,7 @@ export default {
|
|
|
schPlanUpdate: 'update',
|
|
|
}),
|
|
|
async searchSch() {
|
|
|
- let res = await this.schQuery({ planid: this.info.id, schid: '99991' });
|
|
|
+ let res = await this.schQuery({ planid: this.id, schid: '99991' });
|
|
|
if (this.$checkRes(res)) {
|
|
|
let data = JSON.parse(JSON.stringify(res.data));
|
|
|
if (res.data.length > 0) {
|
|
@@ -99,7 +99,7 @@ export default {
|
|
|
else if (i.type) {
|
|
|
let fRes = _.find(this.events, f => f.termid === i.termid && f.type === i.type);
|
|
|
i.name = fRes.name || fRes.title;
|
|
|
- }
|
|
|
+ } else return {};
|
|
|
return i;
|
|
|
});
|
|
|
this.$set(this, `selected`, list);
|
|
@@ -146,11 +146,11 @@ export default {
|
|
|
if (arr.length > 0) {
|
|
|
//有这个事件
|
|
|
object = arr[0];
|
|
|
- if (object.type === '0')
|
|
|
- if (!_.get(object, 'editable', true)) {
|
|
|
- this.$message.warning('不能上报假期的时间');
|
|
|
- return;
|
|
|
- }
|
|
|
+
|
|
|
+ if (!_.get(object, 'editable', true)) {
|
|
|
+ this.$message.warning('不能上报假期的时间');
|
|
|
+ return;
|
|
|
+ }
|
|
|
} else {
|
|
|
console.warn(`无对应id事件`);
|
|
|
return;
|