|
|
@@ -238,7 +238,14 @@
|
|
|
<!-- <el-divider /> -->
|
|
|
<!-- 添加或修改公告对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="980px" append-to-body>
|
|
|
- <dynamic-forms :config="form" @inputs = "changeFn" :formConfig="queryData" :open="open" @submitForm="submitForm($event)" @cancel="cancel($event)" :nummer = "nummer" />
|
|
|
+ <!-- if(){ -->
|
|
|
+ <!-- 日历 -->
|
|
|
+ <dynamic-forms v-if="nummer == 0" :config="form" @inputs = "changeFn" :formConfig="queryData" :open="open" @submitForm="submitForm($event)" @cancel="cancel($event)" :nummer = "nummer" />
|
|
|
+ <!-- }else if(){ -->
|
|
|
+ <!-- 备忘录 -->
|
|
|
+ <memoran-dum v-if="nummer == 1" :config="form" @inputs = "changeFn" :formConfig="queryDatatwo" :open="open" @cancel="cancel($event)" :nummer = "nummer" />
|
|
|
+ <!-- } -->
|
|
|
+
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -366,6 +373,7 @@ export default {
|
|
|
selectList:[],
|
|
|
editorList:[],
|
|
|
queryData: {},
|
|
|
+ queryDatatwo:{},
|
|
|
nummer:0 //0 是日历 1 是备忘录
|
|
|
};
|
|
|
},
|
|
|
@@ -387,12 +395,16 @@ export default {
|
|
|
brightDate () {
|
|
|
// let ary = []
|
|
|
var that = this
|
|
|
- console.log(that.calendarData)
|
|
|
+ console.log(that.calendarData,887)
|
|
|
for (var i = 0 ; i < that.calendarData.length; i++) {
|
|
|
// that.ary.push(that.calendarData[i].startDate)
|
|
|
// that.ary.push(that.calendarData[i].begin_time.slice(0,10))
|
|
|
- that.ary = that.calendarData[i].all_date
|
|
|
- console.log(that.calendarData[i].begin_time)
|
|
|
+ // that.ary.push(that.calendarData[i].all_date.split(','))
|
|
|
+ if(that.calendarData[i].all_date !== undefined){
|
|
|
+ that.ary.push(that.calendarData[i].all_date.join(','))
|
|
|
+ console.log(that.calendarData[i].all_date.join(','),754)
|
|
|
+ }
|
|
|
+ // console.log(that.calendarData[i].all_date,754)
|
|
|
}
|
|
|
console.log(that.ary)
|
|
|
return that.ary
|
|
|
@@ -409,7 +421,10 @@ export default {
|
|
|
// this.calendarData[i].begin_time = this.calendarData[i].begin_time.slice(0,10)
|
|
|
console.log(this.calendarData[i].begin_time,123)
|
|
|
// if (date === this.calendarData[i].begin_time) {
|
|
|
- content = this.calendarData[i].remind_type
|
|
|
+ if(this.calendarData[i].all_date !== undefined){
|
|
|
+ content = this.calendarData[i].remind_type
|
|
|
+ }
|
|
|
+
|
|
|
// }
|
|
|
}
|
|
|
console.log(content)
|
|
|
@@ -555,8 +570,8 @@ export default {
|
|
|
this.loading = true;
|
|
|
listIndextanl(this.calendaraddmer).then(response => {
|
|
|
if(response.data !== undefined){
|
|
|
- this.queryData = response.data
|
|
|
- this.queryData.columns.filter(route => {
|
|
|
+ this.queryDatatwo = response.data
|
|
|
+ this.queryDatatwo.columns.filter(route => {
|
|
|
// console.log(route)
|
|
|
if(route.htmlType == "input" || route.htmlType == 'textarea'){
|
|
|
this.inputList.push(route)
|
yrik