From 46cac7fea0e0a8487e9daa1d6b1c2ee92c7bb880 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 24 Nov 2022 18:29:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2+?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B6=88=E6=81=AF+=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessrecords/LndustrialExplosiveCome.vue | 33 ++++++----
 .../LndustrialExplosiveEnter.vue              | 27 ++++----
 .../ProcessMaterialWarehousingRecord.vue      | 33 +++++-----
 .../ProcessMaterialsDeliveryRecord.vue        | 31 +++++----
 .../ProcessMaterialsPlanRecord.vue            | 19 +++---
 .../ProcessMaterialWarehousingDetail.vue      | 44 +++++++------
 .../ProcessMaterialsDeliveryDetail.vue        | 42 ++++++------
 .../modules/ProcessMaterialsPlanDetail.vue    | 64 +++++++++++--------
 src/views/dashboard/HomePage.vue              | 28 +++++---
 .../ProcessMerchandiseNewsList.vue            | 21 ++++--
 .../dictionaries/ProcessSupplierList.vue      |  2 +-
 src/views/system/LogList.vue                  |  4 +-
 src/views/system/RoleUserList.vue             | 36 +++++++----
 src/views/system/SysCategoryList.vue          | 11 ++--
 14 files changed, 230 insertions(+), 165 deletions(-)

diff --git a/src/views/accessrecords/LndustrialExplosiveCome.vue b/src/views/accessrecords/LndustrialExplosiveCome.vue
index 372d516..feb2e0e 100644
--- a/src/views/accessrecords/LndustrialExplosiveCome.vue
+++ b/src/views/accessrecords/LndustrialExplosiveCome.vue
@@ -4,30 +4,35 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :span="4">
-            <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+          <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
                                  placeholder="请选择物资类型"  />
             </a-form-item>
           </a-col>
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+          <a-button type="primary" icon="download" @click="handleExportXls('民爆出库记录')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
-      <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-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <!--      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>-->
-      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-      <!--        <a-button type="primary" icon="import">导入</a-button>-->
-      <!--      </a-upload>-->
-      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
-      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-    </div>
+<!--    <div class="table-operator">-->
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>-->
+<!--      <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
+<!--      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>-->
+<!--      &lt;!&ndash;      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash;      &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
+<!--      &lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
diff --git a/src/views/accessrecords/LndustrialExplosiveEnter.vue b/src/views/accessrecords/LndustrialExplosiveEnter.vue
index b52cd8f..3938d6a 100644
--- a/src/views/accessrecords/LndustrialExplosiveEnter.vue
+++ b/src/views/accessrecords/LndustrialExplosiveEnter.vue
@@ -4,12 +4,17 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :span="4">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
                                  placeholder="请选择物资类型"  />
             </a-form-item>
           </a-col>
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+            <a-button type="primary" icon="download" @click="handleExportXls('民爆入库记录')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
           <!--          <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
           <!--            <a-form-item label="供应商">-->
           <!--              <a-input placeholder="请输入供应商信息" v-model="queryParam.supplier"></a-input>-->
@@ -71,19 +76,17 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
+<!--    <div class="table-operator">-->
 
 
-      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
-      <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-      <!--        <a-button type="primary" icon="import">导入</a-button>-->
-      <!--      </a-upload>-->
-      <!-- 高级查询区域 -->
-      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-    </div>
+<!--      &lt;!&ndash;      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
+
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--      &lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
diff --git a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
index 84aa58c..b9050b0 100644
--- a/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialWarehousingRecord.vue
@@ -4,7 +4,7 @@ aq<template>
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :span="4">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
                                  placeholder="请选择物资类型"  />
@@ -48,7 +48,7 @@ aq<template>
 <!--&lt;!&ndash;            </a-form-item>&ndash;&gt;-->
 <!--&lt;!&ndash;          </a-col>&ndash;&gt;-->
 
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="流程发起人">
               <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
             </a-form-item>
@@ -63,27 +63,28 @@ aq<template>
 <!--              />-->
 <!--            </a-form-item>-->
 <!--          </a-col>-->
-
-
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+            <a-button type="primary" icon="download" @click="handleExportXls('入库记录')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 查询区域-END -->
 
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
+<!--    &lt;!&ndash; 操作按钮区域 &ndash;&gt;-->
+<!--    <div class="table-operator">-->
 
 
-<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('采购记录')">导出</a-button>
-      <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
-      <!-- 高级查询区域 -->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-    </div>
+<!--&lt;!&ndash;      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
+
+<!--&lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--&lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--&lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--&lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
diff --git a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
index e9eecad..1097419 100644
--- a/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialsDeliveryRecord.vue
@@ -4,35 +4,38 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :span="4">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
                                  placeholder="请选择物资类型"  />
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="流程发起人">
               <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+            <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
-      <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-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-<!--      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>-->
-<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
-<!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-    </div>
+<!--    <div class="table-operator">-->
+
+<!--&lt;!&ndash;      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
+<!--&lt;!&ndash;      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>&ndash;&gt;-->
+<!--&lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--&lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--&lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--&lt;!&ndash;      &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
diff --git a/src/views/accessrecords/ProcessMaterialsPlanRecord.vue b/src/views/accessrecords/ProcessMaterialsPlanRecord.vue
index 63848bd..17d2977 100644
--- a/src/views/accessrecords/ProcessMaterialsPlanRecord.vue
+++ b/src/views/accessrecords/ProcessMaterialsPlanRecord.vue
@@ -4,17 +4,22 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :span="4">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="物资类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag type="list" v-model="queryParam.materialType" dictCode="material_type"
                                  placeholder="请选择物资类型"  />
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
             <a-form-item label="流程发起人">
               <a-input placeholder="请输入流程发起人" v-model="queryParam.createBy"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+            <a-button type="primary" icon="download" @click="handleExportXls('采购记录')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -22,9 +27,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
-      <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-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
       <!--      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>-->
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
@@ -333,9 +336,9 @@
       },
 
       handleEnterDetail(records){
-        let parm ={};
-        parm.id = records.id
-        getAction("/hy/processUdgetPlan/getPlanTableId",parm);
+        // let parm ={};
+        // parm.id = records.id
+        // getAction("/hy/processUdgetPlan/getPlanTableId",parm);
         // this.$router.push({
         //   name:'src-views-accessrecords-plan-ProcessMaterialsDeliveryPlan',
         //   params:{
diff --git a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
index 6872b71..237610c 100644
--- a/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialWarehousingDetail.vue
@@ -4,22 +4,22 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="供应商">
               <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="物料组">
               <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" >
-            <a-form-item label="物料号">
-              <a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+<!--          <a-col :xl="5" :lg="7" :md="8" :sm="24" hidden="hidden" >-->
+<!--            <a-form-item label="物料号">-->
+<!--              <a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="物料名称">
               <a-input placeholder="请输入物料名称" v-model="queryParam.merchandiseName"/>
             </a-form-item>
@@ -42,11 +42,17 @@
 <!--            </a-form-item>-->
 <!--          </a-col>-->
 
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="入库人">
               <a-input placeholder="请选择入库人" v-model="queryParam.librarySign"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+            <a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
+
 <!--          <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
 <!--            <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
 <!--              <a-range-picker-->
@@ -66,18 +72,16 @@
 
     <!-- 操作按钮区域 -->
 
-      <div class="table-operator" style="float: left;">
+<!--      <div class="table-operator" style="float: left;">-->
 
-        <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-        <a-button type="primary" icon="download" @click="handleExportXls('物资入库流程')">导出</a-button>
-        <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-        <!--        <a-button type="primary" icon="import">导入</a-button>-->
-        <!--      </a-upload>-->
-        <!-- 高级查询区域 -->
-        <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-      </div>
+<!--        &lt;!&ndash;      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
+
+<!--        &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--        &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--        &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--        &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
+<!--        &lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--      </div>-->
 
 
 
diff --git a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
index 4e4c18e..9fd9d7f 100644
--- a/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialsDeliveryDetail.vue
@@ -4,26 +4,32 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="6" :lg="7" :md="8" :sm="16">
             <a-form-item label="供应商">
               <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="6" :lg="7" :md="8" :sm="16">
             <a-form-item label="物料组">
               <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" >
-            <a-form-item label="物料号">
-              <a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+<!--          <a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" >-->
+<!--            <a-form-item label="物料号">-->
+<!--              <a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
+          <a-col :xl="6" :lg="7" :md="8" :sm="16">
             <a-form-item label="物料名称">
               <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"/>
             </a-form-item>
           </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="16">
+            <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
+
 
 <!--          <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
 <!--            <a-form-item label="出库人">-->
@@ -48,17 +54,15 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator" style="float: left;">
-      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-            <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
-            <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-      <!--        <a-button type="primary" icon="import">导入</a-button>-->
-      <!--      </a-upload>-->
-      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
-      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-    </div>
+<!--    <div class="table-operator" style="float: left;">-->
+<!--      &lt;!&ndash;      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>&ndash;&gt;-->
+
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash;      &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
+<!--      &lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
diff --git a/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue b/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
index 6308210..e2a8b24 100644
--- a/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
+++ b/src/views/accessrecords/modules/ProcessMaterialsPlanDetail.vue
@@ -4,27 +4,26 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="供应商">
               <a-input placeholder="请输入供应商信息" v-model="queryParam.supplierId"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="物料组">
-              <a-input placeholder="请输入物料组" v-model="queryParam.materialGroup"/>
+              <a-input placeholder="请输入物料组" v-model="queryParam.materialClassify"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16" hidden="hidden" >
-            <a-form-item label="物料号">
-              <a-input placeholder="请输入物料" v-model="queryParam.materialNumber" disabled="disabled"/>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="4" :lg="7" :md="8" :sm="16">
+          <a-col :xl="5" :lg="7" :md="8" :sm="24">
             <a-form-item label="物料名称">
               <a-input placeholder="请输入物料名称" v-model="queryParam.materialName"/>
             </a-form-item>
           </a-col>
-
+          <a-col :xl="8" :lg="7" :md="8" :sm="24">
+            <a-button type="primary" icon="download" @click="handleExportXls('物资采购记录')">导出</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 8px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </a-col>
           <!--          <a-col :xl="4" :lg="7" :md="8" :sm="16">-->
           <!--            <a-form-item label="出库人">-->
           <!--              <a-input placeholder="请选择出库人" v-model="queryParam.librarySign"/>-->
@@ -48,17 +47,14 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator" style="float: left;">
-      <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('物资出库流程')">导出</a-button>
-      <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-      <!--        <a-button type="primary" icon="import">导入</a-button>-->
-      <!--      </a-upload>-->
-      <!--      &lt;!&ndash; 高级查询区域 &ndash;&gt;-->
-      <!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
-    </div>
+<!--    <div class="table-operator" style="float: left;">-->
+
+<!--      &lt;!&ndash;      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--      &lt;!&ndash;        <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--      &lt;!&ndash;      </a-upload>&ndash;&gt;-->
+<!--      &lt;!&ndash;      &lt;!&ndash; 高级查询区域 &ndash;&gt;&ndash;&gt;-->
+<!--      &lt;!&ndash;      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>&ndash;&gt;-->
+<!--    </div>-->
 
     <!-- table区域-begin -->
     <div>
@@ -190,12 +186,12 @@
           {
             title:'物料组',
             align:"center",
-            dataIndex: 'descriptionName',
+            dataIndex: 'materialClassify',
           },
           {
             title:'物料号',
             align:"center",
-            dataIndex: 'materialClassify',
+            dataIndex: 'materialsNumber',
           },
           {
             title:'物料名称及规格型号',
@@ -248,7 +244,7 @@
           },
         ],
         url: {
-          list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainId",
+          list: "/hy/processUdgetPlan/queryProcessUdgetPlanMaterialByMainIdDetail",
           delete: "/hy/processUdgetPlan/deleteProcessUdgetPlanMaterial",
           deleteBatch: "/hy/processUdgetPlan/deleteBatchProcessUdgetPlanMaterial",
           exportXlsUrl: "/hy/processUdgetPlan/exportProcessUdgetPlanMaterial",
@@ -275,9 +271,22 @@
         superFieldList:[],
       }
     },
+
     created() {
-      console.log("=============",this.deliveryDetailId);
+      // console.log("=============",this.deliveryDetailId);
       this.getSuperFieldList();
+      this.loadData();
+    },
+
+    watch:{
+      materPlanId:function (newData, oldData) {
+        //newData是更新后的数据
+        //oldData是旧数据
+        if(newData !== oldData){
+          this.loadData();
+        }
+      }
+
     },
     computed: {
       importExcelUrl: function(){
@@ -336,14 +345,15 @@
           this.ipagination.current = 1;
         }
         this.onClearSelected()
-        this.queryParam.id = this.materPlanId;
+        this.queryParam.processUdgetPlanId = this.materPlanId;
         var params = this.getQueryParams();//查询条件
         this.loading = true;
         console.log("=====>",params)
+        console.log(params)
         getAction(this.url.list, params).then((res) => {
           console.log(res,"//////////////////////////");
           if (res.success) {
-            this.dataSource = res.result;
+            this.dataSource = res.result.records;
             this.ipagination.total = res.result.total;
           }
           if(res.code===510){
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 60dbe48..ad0a865 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -37,6 +37,7 @@
           >
           </a-table>
         </div>
+        <show-announcement ref="ShowAnnouncement" @ok="modalFormOk"></show-announcement>
       </a-card>
       <!--登录日志-->
       <a-card id="log" style="width: 33%; height: 100%;padding-bottom: 10px;" :body-style="{height: '95%', overflow:'hidden'}">
@@ -74,10 +75,10 @@
 <script>
 
 
-
-import { getAction } from '@api/manage'
+import { getAction, putAction } from '@api/manage'
 import { JVXETypes } from '@/components/jeecg/JVxeTable/index'
 import { colorList } from '@/components/tools/setting'
+import ShowAnnouncement from '@comp/tools/ShowAnnouncement'
 
 
 export default {
@@ -85,6 +86,7 @@ export default {
   // mixins:[JeecgListMixin],
   components:{
     JVXETypes,
+    ShowAnnouncement
   },
 
   data() {
@@ -95,6 +97,7 @@ export default {
       },
       //待办 登录日志 站内消息查询地址
       url: {
+        listCementByUser:"/sys/annountCement/listByUser",
         todoManger: '/actTask/todoList',
         lists: '/sys/log/listHomePage',
         listMseeage: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
@@ -172,6 +175,8 @@ export default {
   },
 
   methods: {
+    modalFormOk(){
+    },
     //待办无限滚动
     heightScrollTodo(){
       if (document.getElementById("todoDiv").scrollTop + document.getElementById("todoDiv").offsetHeight >= document.getElementById("todoDiv").scrollHeight) {
@@ -276,12 +281,19 @@ export default {
         on: {
           click: () => {
             console.log(record)
-
-            // this.$router.push({name:'activiti-todoManage',
-            //   params:{
-            //     businessKey: record.busId
-            //   }
-            // })
+            putAction(this.url.editCementSend,{anntId:record.id}).then((res)=>{
+              if(res.success){
+                this.loadData();
+              }
+            });
+            this.hovered = false;
+            if(record.openType==='component'){
+              this.openPath = record.openPage;
+              this.formData = {id:record.busId};
+              this.$refs.showDynamNotice.detail(record.openPage);
+            }else{
+              this.$refs.ShowAnnouncement.detail(record);
+            }
           },
         }
       }
diff --git a/src/views/dictionaries/ProcessMerchandiseNewsList.vue b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
index 7041aa6..ec83198 100644
--- a/src/views/dictionaries/ProcessMerchandiseNewsList.vue
+++ b/src/views/dictionaries/ProcessMerchandiseNewsList.vue
@@ -103,7 +103,7 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true}"
+        :scroll="{y:460}"
         bordered
         rowKey="id"
         :columns="columns"
@@ -111,11 +111,19 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        class="j-table-force-nowrap"
         @change="handleTableChange">
-         <span slot="merchandiseName" slot-scope="text, record">
-            <j-ellipsis :value="text" :length="20"/>
-          </span>
+        <span slot="merchandiseName" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="7"/>
+        </span>
+        <span slot="supplierId" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="7"/>
+        </span>
+        <span slot="type" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="7"/>
+        </span>
+        <span slot="specification" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="7"/>
+        </span>
 
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
@@ -209,6 +217,7 @@ export default {
         {
           title:'供应商',
           align:"center",
+          scopedSlots: { customRender: 'supplierId' },
           dataIndex: 'supplierId'
         },
         {
@@ -234,11 +243,13 @@ export default {
         {
           title:'型号',
           align:"center",
+          scopedSlots: { customRender: 'type' },
           dataIndex: 'type'
         },
         {
           title:'规格',
           align:"center",
+          scopedSlots: { customRender: 'specification' },
           dataIndex: 'specification'
         },
         // {
diff --git a/src/views/dictionaries/ProcessSupplierList.vue b/src/views/dictionaries/ProcessSupplierList.vue
index 6a2069e..7cfbfc4 100644
--- a/src/views/dictionaries/ProcessSupplierList.vue
+++ b/src/views/dictionaries/ProcessSupplierList.vue
@@ -59,7 +59,7 @@
         size="middle"
         bordered
         rowKey="id"
-        :scroll="{x:true}"
+        :scroll="{y:460}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
diff --git a/src/views/system/LogList.vue b/src/views/system/LogList.vue
index 2deff69..0b20921 100644
--- a/src/views/system/LogList.vue
+++ b/src/views/system/LogList.vue
@@ -71,8 +71,8 @@
       </div>
       <!-- 字符串超长截取省略号显示-->
       <span slot="logContent" slot-scope="text, record">
-          <j-ellipsis :value="text" :length="40"/>
-        </span>
+          <j-ellipsis :value="text" :length="10"/>
+      </span>
     </a-table>
     <!-- table区域-end -->
   </a-card>
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index b7bb180..a4757d3 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -8,36 +8,36 @@
           <!-- 搜索区域 -->
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="12" :sm="8">
+              <a-col :xl="8" :lg="7" :md="8" :sm="24">
                 <a-form-item label="角色名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                   <a-input placeholder="" v-model="queryParam.roleName"></a-input>
                 </a-form-item>
               </a-col>
-              <a-col :md="11" :sm="12">
-                <a-form-item label="创建时间" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
+              <a-col :xl="8" :lg="7" :md="8" :sm="24">
+                <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <j-date v-model="queryParam.createTime_begin" date-format="YYYY-MM-DD " style="width:45%" placeholder="请选择开始时间" ></j-date>
                   <span style="width: 10px;">~</span>
                   <j-date v-model="queryParam.createTime_end"  date-format="YYYY-MM-DD " style="width:45%" placeholder="请选择结束时间"></j-date>
                 </a-form-item>
               </a-col>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="12" :sm="24">
-               <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
+            <a-col :xl="8" :lg="7" :md="8" :sm="24">
+              <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
             </a-col>
           </span>
             </a-row>
           </a-form>
         </div>
         <!-- 操作按钮区域 -->
-        <div class="table-operator" style="margin: 5px 0 10px 2px">
-          <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
-          <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-<!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--            <a-button type="primary" icon="import">导入</a-button>-->
-<!--          </a-upload>-->
-<!--          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
-        </div>
+<!--        <div class="table-operator" style="margin: 5px 0 10px 2px">-->
+<!--          &lt;!&ndash;<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>&ndash;&gt;-->
+<!--&lt;!&ndash;          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">&ndash;&gt;-->
+<!--&lt;!&ndash;            <a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
+<!--&lt;!&ndash;          </a-upload>&ndash;&gt;-->
+<!--&lt;!&ndash;          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>&ndash;&gt;-->
+<!--        </div>-->
 
         <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
           <i class="anticon anticon-info-circle ant-alert-icon">
@@ -316,7 +316,15 @@
           deleteBatch2: '/sys/user/deleteUserRoleBatch',
           exportXlsUrl: 'sys/role/exportXls',
           importExcelUrl: 'sys/role/importExcel'
-        }
+        },
+        labelCol: {
+        xs: { span: 4 },
+        sm: { span: 4 },
+        },
+        wrapperCol: {
+          xs: { span: 20 },
+          sm: { span: 20 },
+        },
       }
     },
     computed: {
diff --git a/src/views/system/SysCategoryList.vue b/src/views/system/SysCategoryList.vue
index 7fb60c9..addce88 100644
--- a/src/views/system/SysCategoryList.vue
+++ b/src/views/system/SysCategoryList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card :bordered="false">
-    
+
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
@@ -27,6 +27,7 @@
         ref="table"
         size="middle"
         rowKey="id"
+        :scroll="{y:460}"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="ipagination"
@@ -35,7 +36,7 @@
         @change="handleTableChange"
         @expand="handleExpand"
         v-bind="tableProps">
-        
+
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
           <a-divider type="vertical" />
@@ -59,7 +60,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import SysCategoryModal from './modules/SysCategoryModal'
   import { deleteAction } from '@/api/manage'
-  
+
   export default {
     name: "SysCategoryList",
     mixins:[JeecgListMixin],
@@ -292,8 +293,8 @@
           }
         }
       },
-      
-       
+
+
     }
   }
 </script>