diff --git a/src/components/jeecg/modal/ProcessDelivery.vue b/src/components/jeecg/modal/ProcessDelivery.vue
index e3d5833..bfb67ee 100644
--- a/src/components/jeecg/modal/ProcessDelivery.vue
+++ b/src/components/jeecg/modal/ProcessDelivery.vue
@@ -353,11 +353,7 @@
         this.close()
       },
       handleSubmit() {
-        if (this.getFileData) {
-          this.$emit('close')
-          this.visible = false
-          return
-        }
+
         if (!this.multi) {
           if (this.selectionRows && this.selectionRows.length > 1) {
             this.$message.warning('请选择一条记录')
@@ -365,6 +361,11 @@
           }
         }
         if (!this.selectionRows || this.selectionRows.length == 0) {
+          if (this.getFileData) {
+            this.$emit('close')
+            this.visible = false
+            return
+          }
           this.$message.warning('请选择一条记录')
           return false
         }
diff --git a/src/components/jeecg/modal/ProcessPlan.vue b/src/components/jeecg/modal/ProcessPlan.vue
index 7066d9c..ff7cf12 100644
--- a/src/components/jeecg/modal/ProcessPlan.vue
+++ b/src/components/jeecg/modal/ProcessPlan.vue
@@ -381,18 +381,25 @@
         this.close()
       },
       handleSubmit() {
-        if (this.getFileData) {
+        /*if (this.getFileData) {
           this.$emit('close')
           this.visible = false
           return
-        }
+        }*/
+        console.log('//////////',this.changeData)
         if (!this.multi) {
           if (this.selectionRows && this.selectionRows.length > 1) {
+
             this.$message.warning('请选择一条记录')
             return false
           }
         }
         if (!this.selectionRows || this.selectionRows.length == 0) {
+          if (this.getFileData){
+            this.$emit('close')
+            this.visible = false
+            return
+          }
           this.$message.warning('请选择一条记录')
           return false
         }
diff --git a/src/defaultSettings.js b/src/defaultSettings.js
index 9672f83..3918af4 100644
--- a/src/defaultSettings.js
+++ b/src/defaultSettings.js
@@ -20,8 +20,8 @@ export default {
   contentWidth: 'Fixed', // layout of content: Fluid or Fixed, only works when layout is topmenu
   fixedHeader: true, // sticky header
   fixSiderbar: true, // sticky siderbar
-  autoHideHeader: true, //  auto hide header
-  colorWeak: true,
+  autoHideHeader: false, //  auto hide header
+  colorWeak: false,
   multipage: true, //默认多页签模式
   // vue-ls options
   storageOptions: {
diff --git a/src/views/activiti/applyHome.vue b/src/views/activiti/applyHome.vue
index d81b83a..74f12dd 100644
--- a/src/views/activiti/applyHome.vue
+++ b/src/views/activiti/applyHome.vue
@@ -14,16 +14,16 @@
               <a-list-item slot="renderItem" slot-scope="item">
                 <a-card>
                   <div slot="title">
-                    <a-row>
-                      <a-col span="12" :title="item.name">{{item.name}} </a-col>
-                      <a-col span="12" style="text-align: right;">
-                        <a href="javascript:void (0)" @click="chooseProcess(item)">发起申请</a>
-                      </a-col>
+                    <a-row style="text-align: center;">
+                     <!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
+                      <!--<a-col span="12" style="text-align: center;">-->
+                        <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>
+                      <!--</a-col>-->
                     </a-row>
                   </div>
-                  <b>版本：</b>v.{{item.version}}
+                 <!-- <b>版本：</b>v.{{item.version}}
                   <br/>
-                  <b>说明：</b>{{item.description}}
+                  <b>说明：</b>{{item.description}}-->
                 </a-card>
               </a-list-item>
             </a-list>
diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index 3124ff9..defd790 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -130,7 +130,7 @@
           </template>
           <template v-else-if="r.status == 1">
 
-            <a href="javascript:void(0);" v-if="r.procInstStatus == 1" @click="cancel(r)"  style="color:#8000ff;">撤回</a>
+            <a href="javascript:void(0);" v-if="r.procInstStatus == 1" @click="handelSubmitCancel(r)"  style="color:#8000ff;">撤回</a>
             <a-divider type="vertical" v-if="r.procInstStatus == 1"/>
             <a href="javascript:void(0);" @click="history(r)" style="color:blue;">查看进度</a>
             <a-divider type="vertical" />
@@ -238,7 +238,7 @@
     </a-modal>
     <a-modal title="确认撤回" v-model="modalCancelVisible" :mask-closable="false" :width="500">
       <a-form ref="delForm" v-model="cancelForm" :label-width="70" v-if="modalCancelVisible">
-        <a-form-item label="撤回原因" prop="reason">
+        <a-form-item label="撤回原因" prop="reason" v-show="false">
           <a-input type="textarea" v-model="cancelForm.reason" :rows="4" />
         </a-form-item>
       </a-form>
@@ -553,17 +553,27 @@
         this.cancelForm.procInstId = v.procInstId;
         this.modalCancelVisible = true;
       },
-      handelSubmitCancel() {
-        this.submitLoading = true;
-        this.postFormAction(this.url.cancelApply,this.cancelForm).then(res => {
-          if (res.success) {
-            this.$message.success("操作成功");
-            this.loadData();
-            this.modalCancelVisible = false;
-          }else {
-            this.$message.error(res.message);
+      handelSubmitCancel(v) {
+        this.$confirm({
+          title: '撤回',
+          content: `您确定要撤回吗？`,
+          centered: true,
+          onOk: () => {
+            this.cancelForm.id = v.id;
+            this.cancelForm.procInstId = v.procInstId;
+            this.submitLoading = true;
+            this.postFormAction(this.url.cancelApply,this.cancelForm).then(res => {
+              if (res.success) {
+                this.$message.success("操作成功");
+                this.loadData();
+                this.modalCancelVisible = false;
+              }else {
+                this.$message.error(res.message);
+              }
+            }).finally(()=>this.submitLoading = false);
           }
-        }).finally(()=>this.submitLoading = false);
+        })
+
       },
       history(v) {
         if (!v.procInstId) {
diff --git a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
index 30dd963..2b0132e 100644
--- a/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
+++ b/src/views/activiti/form/ProcessPermissionAuthorizationForm.vue
@@ -48,16 +48,16 @@
               <j-date placeholder="请选择授权时间(结束时间)" v-decorator="['privilegedTimeEnd',validatorRules.privilegedTimeEnd]" @change="dateback2" :trigger-change="true" style="width: 100%" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="是否继续授权" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag  v-decorator="['continueAuthorize', {}]" placeholder="是否继续授权" :type="'radio'" :triggerChange="true" dictCode="authorize_code"/>
-            </a-form-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-item label="授权确认时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date placeholder="请选择授权时间(确认时间)" v-decorator="['privilegedAffirmedTime',validatorRules.privilegedAffirmedTime]" :trigger-change="true"  style="width: 100%" />
-            </a-form-item>
-          </a-col>
+<!--          <a-col :span="12">-->
+<!--            <a-form-item label="是否继续授权" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <j-dict-select-tag  v-decorator="['continueAuthorize', {}]" placeholder="是否继续授权" :type="'radio'" :triggerChange="true" dictCode="authorize_code"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          <a-col :span="12">-->
+<!--            <a-form-item label="授权确认时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--              <j-date placeholder="请选择授权时间(确认时间)" v-decorator="['privilegedAffirmedTime',validatorRules.privilegedAffirmedTime]" :trigger-change="true"  style="width: 100%" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
           <a-col :span="12">
             <a-form-item label="授权天数" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-input-number v-decorator="['authorizationNumberDays']" placeholder="授权天数" style="width: 100%" disabled/>
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 8cd1e1a..2c8354d 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -48,16 +48,17 @@
               <j-date placeholder="请选择需求时间" v-decorator="['needTime',validatorRules.needTime]"   :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
             </a-form-item>
           </a-col>
-<!--          <a-col :span="8">-->
-<!--            <a-form-item label="顺序号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
-<!--              <a-input-number v-decorator="['orderNumber']" placeholder="请输入顺序号" style="width: 100%"/>-->
-<!--            </a-form-item>-->
-<!--          </a-col>-->
+
           <a-col :span="8">
             <a-form-item label="文件" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
+<!--          <a-col :span="8" >
+            <a-form-item label="流程说明" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
+            </a-form-item>
+          </a-col>-->
         </a-row>
       </a-form>
     </j-form-container>
@@ -102,6 +103,11 @@
       </a-tab-pane>
 
     </a-tabs>
+    <div class="div_process">
+      <span>流程说明：</span>
+      <j-editor v-decorator="[ 'opinion', {} ]" triggerChange></j-editor>
+    </div>
+
     <div class="div_process">
       <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
         <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
@@ -130,7 +136,7 @@
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   import JSelectUserByDep from '@/components/jeecgbiz/JSelectUserByDep'
   import JDictSelectTag from '@/components/dict/JDictSelectTag'
-
+  import JEditor from '@/components/jeecg/JEditor'
 
   export default {
     name: 'ProcessUdgetPlanForm',
@@ -144,10 +150,12 @@
       JSelectUserByDep,
       JDictSelectTag,
       JSelectCompany,
+      JEditor
     },
     data() {
       return {
         bigId:[],
+        opinion:"",
         bigIdRake:[],
         materialGroups:'',
         materialId :'',
@@ -190,6 +198,7 @@
               // slotName: 'actions',   //  <-------------slot 的名称，对应 v-slot 冒号后面和等号前面的内容
               // type: FormTypes.slot,
               type: FormTypes.sel_search,
+              disabled: this.disabled,
               // slotName: 'group',
               width: '200px',
               options: [],
@@ -205,6 +214,7 @@
               key: 'materialNumber',
               type: FormTypes.sel_search,
               dictCode: '',
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               options: [],
@@ -269,6 +279,7 @@
               title: '物料名称及规格型号',
               key: 'materialName',
               type: FormTypes.input,
+              disabled: this.disabled,
               // type: FormTypes.sel_search,
               // dictCode: '',
               width: '200px',
@@ -279,6 +290,7 @@
               title: '系列',
               key: 'materialSeries',
               type: FormTypes.input,
+              disabled: this.disabled ,
               // dictCode: '',
               width: '200px',
               placeholder: '请输入${title}',
@@ -288,6 +300,7 @@
               title: '单位',
               key: 'materialUnit',
               type: FormTypes.input,
+              disabled: this.disabled,
               // type: FormTypes.select,
               // dictCode: '',
               width: '200px',
@@ -298,6 +311,7 @@
               title: '单价(元）',
               key: 'materialPrice',
               type: FormTypes.inputNumber,
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -306,6 +320,7 @@
               title: '对比单价',
               key: 'action',
               type: FormTypes.slot,
+              disabled: this.disabled,
               width: '80px',
               // placeholder: '请输入${title}',
               // defaultValue: '',
@@ -316,6 +331,7 @@
               title: '数量',
               key: 'materialQuantity',
               type: FormTypes.inputNumber,
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -324,6 +340,7 @@
               title: '金额（元）',
               key: 'materialAmount',
               type: FormTypes.inputNumber,
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -332,6 +349,7 @@
               title: '供应商',
               key: 'supplierId',
               type: FormTypes.input,
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -340,6 +358,7 @@
               title: '执行标准',
               key: 'materialStandard',
               type: FormTypes.input,
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -348,6 +367,7 @@
               title: '交货时间',
               key: 'deliveryTime',
               type: FormTypes.date,
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -356,6 +376,7 @@
               title: '备注',
               key: 'remarks',
               type: FormTypes.input,
+              disabled: this.disabled,
               width: '200px',
               placeholder: '请输入${title}',
               defaultValue: ''
@@ -376,6 +397,7 @@
           }
         },
         btndisabled: false,
+        isShowInput: '',
         // 表单校验
         validatorRules: {
           // 'blur'是鼠标失去焦点的时候会触发验证
@@ -935,5 +957,6 @@
 <style scoped>
   .div_process{
     margin-top: 30px;
+
   }
 </style>
\ No newline at end of file
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index de5bcb5..b8f8ede 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -215,6 +215,7 @@ export default {
       searchForm: {
         // 搜索框对应data对象
         name: "",
+        tableId: "",
       },
       modalTaskTitle: "",
       modalTitle: "", // 添加或编辑标题
@@ -263,6 +264,11 @@ export default {
     };
   },
   mounted() {
+    console.log(this.searchForm)
+    console.log(this.$route.params.name)
+    if (this.$route.params.name !== null) {
+      this.searchForm.name=this.$route.params.name
+    }
     this.init();
   },
   methods: {
@@ -272,9 +278,12 @@ export default {
     loadData(){},
     getDataList() {
       this.loading = true;
+      console.log("this.searchForm")
+      console.log(this.searchForm)
       this.getAction(this.url.todoList,this.searchForm).then(res => {
         this.loading = false;
         if (res.success) {
+          console.log(res)
           this.data = res.result||[];
           this.total = this.data.leading;
         }
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 25618f6..0b810f5 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -1,95 +1,100 @@
 <template>
-  <div style="height: 740px;">
-    <div style="width: 100% ;height: 100%;">
+  <div style="height: 740px;margin: 20px 10px 0px;">
       <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
         <!--待办任务-->
-        <div class="top-div" style="width: 33%;">
-          <a-card class="div-card" title="待办" style="overflow: hidden" extra="刷新" @click="todoList">
+        <div class="top-div" style="width: 33%;height: 100%;">
+          <a-card class="div-card" title="待办" style="overflow: hidden">
             <a-table
-              class="j-table-force-nowrap"
               rowKey="id"
+              :scroll="{x: false, y: 300 }"
               :loading="loading"
               :show-header="false"
               :columns="columns"
               :dataSource="tasks"
-              :pagination="true"
-            ></a-table>
-<!--            <ul class="ul-li" style="width: 100%; list-style-type:none;padding-left: 0px;">-->
-<!--              &lt;!&ndash;这里可以用for循环&ndash;&gt;-->
-<!--              &lt;!&ndash;用于存放从数据库中查出来的信息并对其进行循环&ndash;&gt;-->
-<!--              <li v-for="(task,index) in tasks.slice(0,8)" :key="index" style="width: 100%;">-->
-<!--                &lt;!&ndash;类型&ndash;&gt;-->
-<!--                <a-button class="ant-col-md-4" :title="task.title" type="primary"-->
-<!--                          style="width: 80px;height: 25px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;"-->
-<!--                          @click="gotodoList">-->
-<!--                  {{task.title}}-->
-<!--                </a-button>-->
-<!--                <span class="ant-col-md-10" :title='task.processName' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">-->
-<!--                    关于{{task.processName}}的审批流程-->
-<!--                </span>-->
-<!--                <span class="ant-col-md-10" :title='task.createTime' style="padding-left: 10%;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;text-align: right; line-height: 25px;">-->
-<!--                    {{task.createTime}}-->
-<!--                  </span>-->
-<!--              </li>-->
-<!--            </ul>-->
+              :pagination="false"
+              :customRow="rowClick"
+            >
+            </a-table>
           </a-card>
         </div>
 
         <!--站内消息-->
-        <div class="top-div" style="width: 33%; margin: 0 0.5%;">
+        <div class="top-div" style="width: 33%;height: 100%;margin: 0 1%;">
           <a-card class="div-card" title="站内消息" style="overflow: hidden">
+            <a-table
+              rowKey="id"
+              :scroll="{x: false, y: 300 }"
+              :show-header="false"
+              :columns="msgColumns"
+              :dataSource="msgContent"
+              :pagination="false"
+              :customRow="rowClickToDo"
+            >
+            </a-table>
           </a-card>
         </div>
 
         <!--登录日志-->
-        <div class="top-div" style="width: 33%;">
+        <div class="top-div" style="width: 33%;height: 100%;">
           <a-card class="div-card"  title="登录日志" style="overflow: hidden">
-            <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
-              <!--这里可以用for循环-->
-              <!--当一个用户登录后增加一条数据-->
-              <li v-for="(loginlog,index) in loginlogs" style="width: 100%;">
-                <!--类型-->
-                <a-button class="ant-col-md-8" type="primary" style="width: 80px;height: 25px;">{{loginlog.department}}</a-button>
-                <span class="ant-col-md-9" style="text-align: center; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
-                  {{loginlog.loginName}}
-                </span>
-                <span class="ant-col-md-10" style="text-align: right; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;line-height: 25px;">
-                  {{loginlog.loginTime}}
-                </span>
-
-              </li>
-            </ul>
+            <a-table
+              rowKey="id"
+              :scroll="{x: false, y: 300 }"
+              :show-header="false"
+              :columns="loginColumns"
+              :dataSource="loginLogs"
+              :pagination="false"
+            >
+            </a-table>
+
           </a-card>
         </div>
 
       </div>
 
 
-      <div class="bottom-div" style="width: 100%;height: 70%;margin-top: 0.5%">
+      <div class="bottom-div" style="width: 100%;height: 60%;margin-top: 1%">
         <a-card style="width: 100%;height: 90%;border-radius: 10px;" title="全部应用">
           <ul class="apply-use" style="list-style-type: none;padding: 0px">
+            <li @click='informationManagement'  class="ant-col-md-4">
+              <a-icon type="table" style="font-size: 25px;" /> 基础信息管理
+            </li>
             <li @click='processManage'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;流程管理
+              <a-icon type="cluster" style="font-size: 25px;" /> 流程管理
             </li>
             <li @click='materialManage'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;物资管理
+              <a-icon type="setting" style="font-size: 25px;" /> 物资管理
             </li>
             <li @click='statisticalAnalysis'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;统计分析
+              <a-icon type="line-chart" style="font-size: 25px;" /> 统计分析
             </li>
             <li @click='dictionaryLibrary'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;标准字典库
+              <a-icon type="read" style="font-size: 25px;" /> 标准字典库
             </li>
             <li @click='isystemManage'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;系统管理
+              <a-icon type="setting" style="font-size: 25px;" /> 系统管理
+            </li>
+            <li @click='portalInformation'  class="ant-col-md-4">
+              <a-icon type="bank" style="font-size: 25px;" /> 门户信息
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
+            </li>
+            <li @click='statisticalTreatment'  class="ant-col-md-4">
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
             </li>
             <li @click='statisticalTreatment'  class="ant-col-md-4">
-              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i> &nbsp;&nbsp;&nbsp;统计报表
+              <a-icon type="bar-chart" style="font-size: 25px;" /> 统计报表
             </li>
           </ul>
         </a-card>
       </div>
-    </div>
 
   </div>
 </template>
@@ -99,70 +104,173 @@
 import { getAction } from '@api/manage'
 import { JVXETypes } from '@/components/jeecg/JVxeTable/index'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
+
 
 
 export default {
   name: 'HomePage',
+  // mixins:[JeecgListMixin],
   components:{
     JVXETypes,
   },
   data() {
     return {
+      //登录日志查询条件
+      queryParam:{
+        logType:1,
+        keyWord:'登录成功',
+      },
+      isorter:{
+        column: 'createTime',
+        order: 'desc',
+      },
+      //待办 登录日志 站内消息查询地址
       url: {
-        todoManger: '/actTask/todoList'
+        todoManger: '/actTask/todoList',
+        lists: '/sys/log/list',
+        listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
       },
-
+      //待办显示内容
       columns:[
         {
           align:"left",
           dataIndex: 'title',
+          ellipsis: true,
         },
         {
           align:"left",
           dataIndex: 'processName',
+          ellipsis: true,
         },
         {
           align:"center",
           dataIndex: 'createTime',
+          ellipsis: true,
         }
       ],
-      loading:true,
       tasks:[],
-      loginlogs:[
+      //登录日志显示内容
+      loginColumns:[
+        {
+          align:"left",
+          dataIndex: 'logType_dictText',
+          ellipsis: true,
+          sorter: true
+        },
         {
-          department: "企划部",
-          loginName: "李朝阳",
-          loginTime: "2022.10.26 12:00:00"
+          align:"left",
+          dataIndex: 'username',
+          ellipsis: true,
+          sorter: true
+        },
+        {
+          align:"center",
+          dataIndex: 'createTime',
+          ellipsis: true,
+          sorter: true
         },
+      ],
+      loginLogs:[],
+      //站内消息显示内容
+      msgColumns:[
         {
-          department: "企划部",
-          loginName: "李朝阳",
-          loginTime: "2022.10.26 12:00:00"
+          align: "left",
+          dataIndex: "msgContent",
+          ellipsis: true,
         }
-      ]
+      ],
+      msgContent: [],
+      //加载状态
+      loading:true,
+
 
     }
   },
 
   created() {
     this.todoList();
+    this.loginList();
+    this.systemMessage();
   },
 
-
   methods: {
+    //待办任务的行点击事件(前往待办)
+    rowClick: function(record, index) {
+      return {
+        on: {
+          click: () => {
+            console.log(record)
+            console.log(record.id)
+            this.$router.push({name:'activiti-todoManage',
+              params:{
+                id: record.id
+              }
+            })
+          },
+        }
+      }
+    },
+    rowClickToDo: function(record, index) {
+      return {
+        on: {
+          click: () => {
+            console.log(record)
+            // this.$router.push({name:'activiti-todoManage',
+            //   params:{
+            //     businessKey: record.busId
+            //   }
+            // })
+          },
+        }
+      }
+    },
+    //待办任务查询
     todoList(){
       getAction(this.url.todoManger).then((res) => {
         if (res.success) {
+          console.log("res")
           this.loading = false
           this.tasks = res.result
           console.log(res.result)
         }
       })
+    },
+
+    // 系统消息查询
+    systemMessage(){
+      let queryUnRead = {
+        readFlag: '0'
+      }
+      let param = Object.assign({},queryUnRead,this.isorter);
+
+      getAction(this.url.listMseeage,param).then((res) => {
+        if (res.success) {
+          console.log("resMessage")
+          this.loading = false
+          this.msgContent = res.result.records
+          console.log(res.result)
+        }
+      })
+    },
+
+    // 登录日志查询
+    loginList(){
+      let param = Object.assign({}, this.queryParam, this.isorter);
 
+      getAction(this.url.lists,param).then((res) => {
+        if (res.success) {
+          console.log("resnew")
+          console.log(res.result)
+          this.loading = false
+          this.loginLogs = res.result.records
+        }
+      })
     },
 
     // 跳转地址
+    informationManagement(){
+      this.$router.push('/supplier/regulate')
+    },
     processManage(){
       this.$router.push('/activiti/applyHome')
     },
@@ -178,6 +286,9 @@ export default {
     isystemManage(){
       this.$router.push('/isystem/user')
     },
+    portalInformation(){
+      this.$router.push('')
+    },
     statisticalTreatment(){
       this.$router.push('/report/ArchivesStatisticst')
     },
@@ -194,13 +305,22 @@ export default {
 <style scoped>
 @import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
 
+/deep/.ant-card-head{
+  margin-bottom:0px;
+}
+
+/deep/.ant-table-placeholder{
+  margin-top:0px;
+  border-top: 0px;
+  border-bottom: 0px;
+}
 
 /deep/.ant-table-tbody .ant-table-row td{
   padding: 3% 0 0 0;
 }
 /deep/.ant-table-tbody > tr > td {
 
-   border-bottom: 0px;
+  border-bottom: 0px;
   font-weight: 400;
 }
 /deep/.ant-table-tbody > tr:hover>td {
@@ -212,9 +332,6 @@ export default {
 /deep/.ant-table-tbody > tr:hover{
   background: white;
 }
-.top-div {
-  height: 100%;
-}
 
 .div-card {
   width: 100%;
@@ -229,18 +346,15 @@ export default {
   font-weight: bold;
 }
 
-.iconfont{
-  vertical-align: -10%;
-  /*background-color: #f28123;*/
-  /*border-radius: 10px;*/
-}
 .apply-use li{
-  text-align: center;
-  margin-top: 20px;
+  text-align: left;
+  margin-top: 60px;
+  padding: 0 40px;
 }
 
-.mouse:hover {
+.apply-use li:hover {
   cursor: pointer;
+  color: #5cb6ff;
 }
 
 /deep/.ant-card-body {
diff --git a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
index 3c96c08..d0b8bb4 100644
--- a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
+++ b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
@@ -228,7 +228,7 @@
           {
             title:'供应商',
             align:"center",
-            dataIndex: 'supplier'
+            dataIndex: 'supplierId'
           },
           {
             title:'备注',
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 4956619..8318901 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -14,48 +14,74 @@
           </a-col>
 
           <a-col :md="6" :sm="8">
-            <a-form-item label="性别">
-              <a-select v-model="queryParam.sex" placeholder="请选择性别">
+            <a-form-item label="用户状态">
+              <a-select v-model="queryParam.status" placeholder="请选择">
                 <a-select-option value="">请选择</a-select-option>
-                <a-select-option value="1">男性</a-select-option>
-                <a-select-option value="2">女性</a-select-option>
+                <a-select-option value="1">正常</a-select-option>
+                <a-select-option value="2">冻结</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
-
-
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <a-form-item label="真实名字">
-                <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="6" :sm="8">
-              <a-form-item label="手机号码">
-                <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="6" :sm="8">
-              <a-form-item label="用户状态">
-                <a-select v-model="queryParam.status" placeholder="请选择">
-                  <a-select-option value="">请选择</a-select-option>
-                  <a-select-option value="1">正常</a-select-option>
-                  <a-select-option value="2">冻结</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-          </template>
+          <a-col :md="6" :sm="8">
+            <a-form-item label="真实名字">
+              <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="8">
+          <a-form-item label="部门">
+            <j-select-depart v-model="queryParam.departIds" :trigger-change="true"  ></j-select-depart>
+          </a-form-item>
+          </a-col>
+<!--          <a-row :gutter="24">-->
+<!--          <a-col :md="6" :sm="8">-->
+<!--            <a-form-item label="选择职务">-->
+<!--              <j-select-position  :buttons="false"  v-model="formData.post" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+<!--          </a-row>-->
+<!--          <a-col :md="6" :sm="8">-->
+<!--            <a-form-item label="性别">-->
+<!--              <a-select v-model="queryParam.sex" placeholder="请选择性别">-->
+<!--                <a-select-option value="">请选择</a-select-option>-->
+<!--                <a-select-option value="1">男性</a-select-option>-->
+<!--                <a-select-option value="2">女性</a-select-option>-->
+<!--              </a-select>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+
+
+<!--          <template v-if="toggleSearchStatus">-->
+<!--            <a-col :md="6" :sm="8">-->
+<!--              <a-form-item label="真实名字">-->
+<!--                <a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+
+<!--&lt;!&ndash;            <a-col :md="6" :sm="8">&ndash;&gt;-->
+<!--&lt;!&ndash;              <a-form-item label="手机号码">&ndash;&gt;-->
+<!--&lt;!&ndash;                <a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input>&ndash;&gt;-->
+<!--&lt;!&ndash;              </a-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;            </a-col>&ndash;&gt;-->
+
+<!--            <a-col :md="6" :sm="8">-->
+<!--              <a-form-item label="用户状态">-->
+<!--                <a-select v-model="queryParam.status" placeholder="请选择">-->
+<!--                  <a-select-option value="">请选择</a-select-option>-->
+<!--                  <a-select-option value="1">正常</a-select-option>-->
+<!--                  <a-select-option value="2">冻结</a-select-option>-->
+<!--                </a-select>-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
+<!--          </template>-->
 
           <a-col :md="6" :sm="8">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
+<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
+<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
+<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--              </a>-->
             </span>
           </a-col>
 
@@ -111,7 +137,8 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
+        @change="handleTableChange"
+      >
 
         <template slot="avatarslot" slot-scope="text, record, index">
           <div class="anty-img-wrap">
@@ -129,9 +156,9 @@
               更多 <a-icon type="down"/>
             </a>
             <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
+<!--              <a-menu-item>-->
+<!--                <a href="javascript:;" @click="handleDetail(record)">详情</a>-->
+<!--              </a-menu-item>-->
 
               <a-menu-item>
                 <a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>
@@ -183,6 +210,8 @@
   import JInput from '@/components/jeecg/JInput'
   import UserRecycleBinModal from './modules/UserRecycleBinModal'
   import JSuperQuery from '@/components/jeecg/JSuperQuery'
+  import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
+  import JSelectPosition from '@comp/jeecgbiz/JSelectPosition'
 
   export default {
     name: "UserList",
@@ -193,13 +222,20 @@
       PasswordModal,
       JInput,
       UserRecycleBinModal,
-      JSuperQuery
+      JSuperQuery,
+      JSelectDepart,
+      JSelectPosition
     },
     data() {
       return {
         description: '这是用户管理页面',
         queryParam: {},
         recycleBinVisible: false,
+        formData: {
+          areaLinkage1: '110105',
+          areaLinkage2: '140221',
+          sex: 1
+        },
         columns: [
           /*{
             title: '#',
diff --git a/src/views/system/modules/UserModal.vue b/src/views/system/modules/UserModal.vue
index c4c9b73..7173ebc 100644
--- a/src/views/system/modules/UserModal.vue
+++ b/src/views/system/modules/UserModal.vue
@@ -175,13 +175,13 @@
           <a-input placeholder="请输入手机号码" :disabled="isDisabledAuth('user:form:phone')" v-decorator="[ 'phone', validatorRules.phone]" />
         </a-form-item>
 
-        <a-form-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入座机" v-decorator="[ 'telephone', validatorRules.telephone]"/>
-        </a-form-item>
+<!--        <a-form-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <a-input placeholder="请输入座机" v-decorator="[ 'telephone', validatorRules.telephone]"/>-->
+<!--        </a-form-item>-->
 
-        <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>
-        </a-form-item>
+<!--        <a-form-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--          <j-dict-select-tag  v-decorator="['activitiSync', {}]" placeholder="请选择是否同步工作流引擎" :type="'radio'" :triggerChange="true" dictCode="activiti_sync"/>-->
+<!--        </a-form-item>-->
 
       </a-form>
     </a-spin>