123

src/views/activiti/form/demoForm2.vue

@@ -214,6 +214,15 @@ export default {
                         // 获取用户下拉数据
                         this.getAction('/sys/user/list2', { pageSize: 20000 }).then(userData => {
                             if (res.success) {
+                              
+                                if(userData.data != null && userData.data.supplierList != null){
+                                    // userData.data.supplierList.forEach(user => {
+                                    //      console.log("userDatacode",user.code);
+                                    //      console.log("userDataname",user.name);
+                                    // })
+                                    this.dynamicData.supplierList = userData.data.supplierList
+                                }
+                              
                                 userData.result.records.forEach(user => {
                                     user.label = user.realname
                                     user.value = user.username

src/views/oa/enterpriseAnnouncement.vue

@@ -63,6 +63,15 @@
           :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
           @change="handleTableChange"
         >
+          <!-- 发布时间 -->
+          <span slot="releaseTimeSlot" slot-scope="text, record">
+            <span v-if="record.isRelease == '0'">
+             
+            </span>
+            <span v-else>
+            {{text}}
+            </span>
+          </span>
           <!-- 发布 -->
           <span slot="isReleaseSlot" slot-scope="text, record">
             <a-tag color="#f50" v-if="record.isRelease == '0'">
@@ -169,6 +178,12 @@ export default {
                     dataIndex: 'createTime',
                     align: 'center'
                 },
+                {
+                    title: '发布时间',
+                    dataIndex: 'releaseTime',
+                    scopedSlots: { customRender: 'releaseTimeSlot' },
+                    align: 'center'
+                },
                 {
                     title: '发布',
                     dataIndex: 'isRelease',

src/views/system/modules/AddressListRight.vue

@@ -29,6 +29,8 @@
 
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleDelete" type="primary" icon="hdd" v-has='"address:delete"'>删除</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('通讯录信息')">导出</a-button>
+      
     </div>
 
     <a-table
@@ -133,6 +135,7 @@
           }
         ],
         url: {
+          exportXlsUrl: "/sys/user/exportXls?address=1",
           list: '/sys/user/queryByOrgCodeForAddressList',
           listByPosition: '/sys/position/list'
         }