【友情链接】一丢丢接口等

src/views/dashboard/MyToDo.vue

@@ -413,8 +413,8 @@ export default {
           })
           //轮播配置
           this.config = {
-            oddRowBGC: 'rgba(233, 236, 239,.8)',
-            evenRowBGC: 'rgba(188, 212, 230,.8)',
+            oddRowBGC: 'white',
+            evenRowBGC: 'white',
             columnWidth: [10, 100, 460, 200, 300],
             align: ['center'],
             rowNum: 6,

src/views/oa/enterpriseAnnouncement.vue

@@ -191,18 +191,20 @@ export default {
     methods: {
     // 查询日程计划列表(根据参数不同，传递对应的数据)
         getAnnList () {
-            enterpriseEList(this.queryParam).then(res => {
-                // console.log('>>>>', this.queryParam)
-                if (res.success) {
-                    this.annList = res.result.records
-                    console.log('列表公告=====', this.annList)
+            this.$nextTick(() => {
+                enterpriseEList(this.queryParam).then(res => {
+                    // console.log('>>>>', this.queryParam)
+                    if (res.success) {
+                        this.annList = res.result.records
+                        console.log('列表公告=====', this.annList)
 
-                    this.pagination = {
-                        total: res.result.total,
-                        current: res.result.current,
-                        pageSize: res.result.size
+                        this.pagination = {
+                            total: res.result.total,
+                            current: res.result.current,
+                            pageSize: res.result.size
+                        }
                     }
-                }
+                })
             })
         },
         // 查询按钮

src/views/oa/my-links/add/addLinksModal.vue

@@ -7,66 +7,102 @@
     @cancel="handleCancel"
     width="86%"
   >
-    <!-- tabel 加载 -->
+    <!-- tabel 加载  :form="addLinkform" -->
     <a-spin :spinning="confirmLoading">
-      <a-form :form="addLinkform" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
-        <!-- 标题 类型 -->
+      <a-form :model="linkForm" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
+        <!-- 名称 地址 -->
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="名称">
-              <a-input
-                v-decorator="['name', { rules: [{ required: true, message: '请输入产品名称' }] }]"
-                placeholder="请输入产品名称"
-              />
+              <a-input v-model="linkForm.name" placeholder="请输入名称" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="地址">
-              <a-input
-                v-decorator="['address', { rules: [{ required: true, message: '请输入地址' }] }]"
-                placeholder="请输入地址"
-              />
+              <a-input v-model="linkForm.address" placeholder="请输入地址" />
             </a-form-item>
           </a-col>
         </a-row>
 
-        <!-- 创建人  -->
+        <!-- 新增  创建人 创建时间 -->
+        <div v-if="title == '新增友情链接'">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="创建人">
+                <a-input disabled v-model="linkForm.createBy" placeholder="系统回显" />
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="12">
+              <a-form-item label="创建日期">
+                <a-date-picker
+                  disabled
+                  style="width:100%"
+                  showTime
+                  format="YYYY-MM-DD HH:mm"
+                  placeholder="系统回显"
+                  @change="createTimeChange"
+                  @ok="createTimeOk"
+                  v-model="linkForm.createBy"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </div>
+
+        <!-- 编辑  创建人 创建时间 -->
+        <div v-if="title == '编辑友情链接'">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <a-form-item label="创建人">
+                <a-input disabled v-model="linkForm.createBy" placeholder="回显创建人" />
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="12">
+              <a-form-item label="创建时间">
+                <a-form-item label="创建日期">
+                  <a-date-picker
+                    disabled
+                    v-model="linkForm.createTime"
+                    style="width:100%"
+                    showTime
+                    format="YYYY-MM-DD HH:mm:ss"
+                    @change="createTimeChange"
+                    @ok="createTimeOk"
+                  />
+                </a-form-item>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </div>
+        <!-- 简介 发布-->
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="创建人">
-              <a-input
-                disabled
-                v-decorator="['createBy', { rules: [{ required: false, message: '请输入创建人' }] }]"
-                placeholder="此处应可以回显创建人，不可编辑状态"/>
+            <a-form-item label="简介:" style="marginBottom:0;">
+              <a-textarea v-model="memo" placeholder="请输入简介" style="minHeight:200px;width:1200px;" />
             </a-form-item>
           </a-col>
-
           <a-col :span="12">
-            <a-form-item label="创建时间">
-              <a-input
-                disabled
-                v-decorator="['createTime', { rules: [{ required: false, message: '请输入创建时间' }] }]"
-                placeholder="此处应可以回显创建时间，不可编辑状态"/>
+            <a-form-item label="是否发布:">
+              <a-radio-group v-model="linkForm.isRelease">
+                <a-radio value="0">
+                  仅存稿
+                </a-radio>
+                <a-radio value="1">
+                  发布
+                </a-radio>
+              </a-radio-group>
             </a-form-item>
           </a-col>
         </a-row>
-
-        <!-- 内容 -->
-        <a-row :gutter="24">
-          <a-col :span="12">
-            <a-form-item label="简介:" style="marginBottom:0;"></a-form-item>
-          </a-col>
-          <a-col :span="22">
-            <a-textarea v-model="memo" placeholder="请输入简介" style="marginLeft:128px;"/>
-          </a-col>
-        </a-row>
       </a-form>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
-// import { Moment } from 'moment'
+import { Moment } from 'moment'
 // import { defineComponent } from 'vue'
 import RichText from '@views/jeecg/RichText.vue'
 export default {
@@ -76,10 +112,18 @@ export default {
     },
     data () {
         return {
-            addLinkform: this.$form.createForm(this),
+            // addLinkform: this.$form.createForm(this),
+            linkForm: {
+                name: '',
+                address: '',
+                createBy: '',
+                createTime: {},
+                isRelease: '',
+                memo: ''
+            },
             confirmLoading: false,
             addLinksModVis: false,
-            memo: '', // 公司简介
+            memo: '', // 简介
             title: '',
             formData: {}
         }
@@ -88,7 +132,7 @@ export default {
     methods: {
     // 弹框保存
         handleOk () {
-            // 触发表单验证
+            // 触发表单验证 判断是否有空值  包含 简介 赋值到表单上 判断是编辑还是新增 或者没有输入
             console.log('弹框点击了保存')
         },
         close () {
@@ -99,9 +143,8 @@ export default {
             this.close()
         },
         createTimeChange (value, dateString) {
-            // value:Moment[],dateString:string[]
-            console.log('Selected Time:', value)
-            console.log('Formatted Selected Time:', dateString)
+            console.log('选择的时间:', value)
+            console.log('格式化选择的时间:', dateString)
         },
         createTimeOk (value) {
             console.log('createTimeOk:', value)

src/views/oa/myLinks.vue

@@ -1,13 +1,12 @@
 <template>
-  <!-- :bordered="false" -->
-  <a-card>
+  <a-card :bordered="false">
     <!-- 查询 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <a-form-item label="名称">
-              <a-input placeholder="请输入公司名称查询" v-model="queryParam.name"></a-input>
+              <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
             </a-form-item>
           </a-col>
 
@@ -42,11 +41,12 @@
         <a style="font-weight: 600">4</a>项
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
+
       <a-row>
         <a-table
           bordered
           :columns="columns"
-          :dataSource="annDataList"
+          :dataSource="linksData"
           :loading="loading"
           :pagination="pagination"
           :row-key="record => record.id"
@@ -107,11 +107,10 @@
 </template>
 
 <script>
-// import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import AddLinksModal from '@views/oa/my-links/add/addLinksModal.vue'
+import { linksList } from '@api/oa/cd_links'
 export default {
     name: 'MyLinks',
-    // mixins: [JeecgListMixin],
     components: {
         AddLinksModal
     },
@@ -119,8 +118,16 @@ export default {
         return {
             id: '', // 唯一标识 双休绑定后自动生成，删除
             loading: false, // 表格加载
-            pagination: {}, // 分页
-            queryParam: {}, // 查询条件对象
+            pagination: {
+                total: 0,
+                current: 0,
+                pageSize: 0
+            },
+            queryParam: {
+                pageNo: '1',
+                name: '' // 名称
+                // isRelease: '' // 是否发布
+            },
             // 表头
             columns: [
                 {
@@ -152,51 +159,35 @@ export default {
                     width: '20%'
                 }
             ],
-            // 公共数据
-            annDataList: [
-                {
-                    id: '1',
-                    name: '用友',
-                    address: 'https://www.yonyou.com/',
-                    createBy: 'admin',
-                    isRelease: '1'
-                },
-                {
-                    id: '2',
-                    name: '哒哒办公',
-                    address: 'http://www.dakabg.com/',
-                    createBy: 'admin',
-                    isRelease: '1'
-                },
-                {
-                    id: '3',
-                    name: '钉钉',
-                    address: 'https://www.dingtalk.com/',
-                    createBy: 'admin',
-                    isRelease: '1'
-                },
-                {
-                    id: '4',
-                    name: '品医',
-                    address: 'https://www.11467.com/',
-                    createBy: 'admin',
-                    isRelease: '1'
-                },
-                {
-                    id: '5',
-                    name: '蚂蚁集团',
-                    address: 'https://www.antgroup.com/',
-                    createBy: 'admin',
-                    isRelease: '1'
-                }
-            ]
+            // 链接数据
+            linksData: []
         }
     },
-    created () {},
+    created () {
+        this.getLinksList()
+    },
     methods: {
-    // 新增
+        getLinksList () {
+            this.$nextTick(() => {
+                linksList(this.queryParam).then(res => {
+                    // console.log('>>>>', this.queryParam)
+                    if (res.success) {
+                        this.annList = res.result.records
+                        console.log('链接公告=====', this.annList)
+
+                        this.pagination = {
+                            total: res.result.total,
+                            current: res.result.current,
+                            pageSize: res.result.size
+                        }
+                    }
+                })
+            })
+        },
+
+        // 新增
         addOpen () {
-            console.log('点击了大页面的新增')
+            console.log('点击新增，负责打开弹框，剩下功能在子组件的保存按钮')
             // 拿到子组件的弹框 属性
             this.$refs.AddLinksModal.addLinksModVis = true
             this.$refs.AddLinksModal.title = '新增友情链接'
@@ -210,10 +201,8 @@ export default {
         },
         // 查询
         searchQuery () {
-            // this.loading = true
+            this.getLinksList()
         },
-        // 重置
-        reset () {},
 
         // 批量删除
         batchDel () {},
@@ -222,16 +211,18 @@ export default {
         // ??
         modalFormOk () {},
         // 分页、排序、筛选变化时触发
+        // 分页、排序、筛选变化时触发
         handleTableChange (pagination, filters, sorter) {
+            console.log('当前页信息>>>>', pagination)
+            // this.queryParam.pageNo = pagination.current
+            // this.getLinksList()
         },
 
         // 发布
         sendLinks (id) {
             console.log('点击了发布')
         },
-        saveLinks () {
-
-        },
+        saveLinks () {},
         // 撤销
         backLinks (id) {
             console.log('点击了撤销')