From 0ad307de135ce54c31302b444054a5f3e53c392f Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 28 Oct 2022 18:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialWarehousingForm.vue   |  82 +------
 .../form/ProcessSmaterialsScrapForm.vue       |  28 ++-
 .../activiti/form/ProcessUdgetPlanForm.vue    |   2 +-
 src/views/dashboard/HomePage.vue              | 203 +++++++++++++-----
 src/views/dashboard/NewHomePage.vue           |   5 +-
 .../ProcessSuppliesStrongerList.vue           |   2 +-
 .../ProcessSuppliesStrongerLists.vue          |  10 +-
 .../ProcessWasteMaterialsList.vue             |  48 ++---
 .../ProcessWasteMaterialsLists.vue            |  14 +-
 .../wastematerials/modules/ProcessWaste.vue   |   2 +-
 10 files changed, 215 insertions(+), 181 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 7aec639..24d7562 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -157,88 +157,12 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
               title: '物料号',
               key: 'materialNumber',
               type: FormTypes.sel_search,
+              disabled: true,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
             },
-            // {
-            //   title: '物料描述',
-            //   key: 'materialDescription',
-            //   type: FormTypes.input,
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-            // {
-            //   title: '仓储地点_id',
-            //   key: 'unitWasteWarehouseCodeId',
-            //   type: FormTypes.sel_search,
-            //   dictCode:"",
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-            // {
-            //   title: '生产时间',
-            //   key: 'productionTime',
-            //   type: FormTypes.date,
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-            // {
-            //   title: '保质期',
-            //   key: 'expirationDate',
-            //   type: FormTypes.date,
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-            // {
-            //   title: '是否到货',
-            //   key: 'arrivalNotice',
-            //   type: FormTypes.select,
-            //   dictCode:"",
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-            // {
-            //   title: '入库时间',
-            //   key: 'storageTime',
-            //   type: FormTypes.date,
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-            // {
-            //   title: '入库人',
-            //   key: 'librarySign',
-            //   type: FormTypes.sel_search,
-            //   dictCode:"",
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-            // {
-            //   title: '核算属性',
-            //   key: 'materialType',
-            //   type: FormTypes.sel_search,
-            //   dictCode:"",
-            //   width:"200px",
-            //   placeholder: '请输入${title}',
-            //   defaultValue:'',
-            // },
-           /* {
-              title: '器材编号',
-              key: 'equipment',
-              type: FormTypes.sel_search,
-              dictCode:"",
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },*/
             {
               title: 'WBS',
               key: 'wbs',
@@ -252,6 +176,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
               title: '物料名称及规格型号',
               key: 'materialName',
               type: FormTypes.sel_search,
+              disabled: true,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -261,6 +186,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
               title: '单位',
               key: 'materialUnit',
               type: FormTypes.select,
+              disabled: true,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -270,6 +196,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
               title: '单价',
               key: 'materialPrice',
               type: FormTypes.inputNumber,
+              disabled: true,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -278,6 +205,7 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
               title: '金额',
               key: 'materialAmount',
               type: FormTypes.inputNumber,
+              disabled: true,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
diff --git a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
index 88506e0..23d3edf 100644
--- a/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
+++ b/src/views/activiti/form/ProcessSmaterialsScrapForm.vue
@@ -137,6 +137,7 @@
               title: '器材编号',
               key: 'equipment',
               type: FormTypes.sel_search,
+              disabled: true,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -155,6 +156,7 @@
               title: '物料名称及规格型号',
               key: 'materialName',
               type: FormTypes.sel_search,
+              disabled: true,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -164,6 +166,7 @@
               title: '单位',
               key: 'materialUnit',
               type: FormTypes.select,
+              disabled: true,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -173,6 +176,7 @@
               title: '报废数量',
               key: 'scrapNumber',
               type: FormTypes.inputNumber,
+              disabled: true,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -181,6 +185,7 @@
               title: '单价',
               key: 'materialPrice',
               type: FormTypes.inputNumber,
+              disabled: true,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -189,6 +194,7 @@
               title: '金额',
               key: 'materialAmount',
               type: FormTypes.inputNumber,
+              disabled: true,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
@@ -205,6 +211,7 @@
               title: '供货商',
               key: 'supplier',
               type: FormTypes.sel_search,
+              disabled: true,
               dictCode:"",
               width:"200px",
               placeholder: '请输入${title}',
@@ -218,14 +225,14 @@
               placeholder: '请输入${title}',
               defaultValue:'',
             },
-            {
-              title: '物资报废流程主表id',
-              key: 'processSmaterialsScrapId',
-              type: FormTypes.input,
-              width:"200px",
-              placeholder: '请输入${title}',
-              defaultValue:'',
-            },
+            // {
+            //   title: '物资报废流程主表id',
+            //   key: 'processSmaterialsScrapId',
+            //   type: FormTypes.input,
+            //   width:"200px",
+            //   placeholder: '请输入${title}',
+            //   defaultValue:'',
+            // },
           ]
         },
         url: {
@@ -274,6 +281,11 @@
         type: Boolean,
         default: false,
         required: false
+      },
+      hidden: {
+        type: Boolean,
+        default: false,
+        required: false
       }
     },
     computed: {
diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue
index 5369a1a..25249e2 100644
--- a/src/views/activiti/form/ProcessUdgetPlanForm.vue
+++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue
@@ -294,7 +294,7 @@
             {
               title: '对比单价',
               key: 'action',
-             type: FormTypes.slot,
+              type: FormTypes.slot,
               //width: '200px',
               // placeholder: '请输入${title}',
               // defaultValue: '',
diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue
index 63fef8c..fe774ca 100644
--- a/src/views/dashboard/HomePage.vue
+++ b/src/views/dashboard/HomePage.vue
@@ -1,65 +1,87 @@
 <template>
-  <div style="width: 1680px;height: 780px;">
-    <div style="width: 90%;;height: 100%;">
+  <div style="height: 760px;">
+    <div style="height: 100%;">
+
       <div style="display: flex;align-items: center;justify-content: stretch;width: 100%;height: 50%">
-        <div style="width: 55%;;margin-left: 6%;margin-top:3%;height: 100%;">
-          <a-card style="width: 100%;height: 100%;border-radius: 20px;">
-            <span class="font" style="display: inline-block;height: 10%;"><i class="iconfont icon-daibanrenwu" style="font-size: 35px;"></i>待办
-            <i class="iconfont icon-shenglvehao"></i>
+
+
+        <!--待办任务-->
+        <div class="top-div" style="width: 33%;">
+          <a-card class="div-card">
+            <span class="font" style="display: inline-block;height: 10%;">
+              <i class="el-icon-s-claim" style="font-size: 25px;"></i>待办
+              <i class="iconfont icon-shenglvehao"></i>
             </span>
-            <div style="width: 100%;height: 150px">
+            <div style="width: 100%;height: 100%;" v-show="showDate.noDate">
               暂无待办
             </div>
-            <a-divider style="border: 1px solid #c7c7c7"/>
-            <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
-<!--              这里可以用for循环-->
-              <li><a-tag color="#539ee6">物资审批1</a-tag><span style="margin-left: 70px">关于xxxx物资的审批流程</span><span style="margin-left: 150px">2020.10.1 10:10:20</span></li>
-              <li><a-tag color="#539ee6">物资审批2</a-tag><span style="margin-left: 70px">关于xxxx物资的审批流程</span><span style="margin-left: 150px">2020.10.1 10:10:20</span></li>
-              <li><a-tag color="#539ee6">物资审批3</a-tag><span style="margin-left: 70px">关于xxxx物资的审批流程</span><span style="margin-left: 150px">2020.10.1 10:10:20</span></li>
+            <ul class="ul-li" style="list-style-type:none;padding-left: 0px;" v-show="showDate.showDate">
+              <!--这里可以用for循环-->
+              <!--用于存放从数据库中查出来的信息并对其进行循环-->
+              <li v-for="(task,index) in tasks " style="width: 100%;">
+                <!--类型-->
+                <span class="mouse" color="#539ee6" style="font-weight: normal; background-color: #539ee6;
+                color: white;border-radius: 4px;width: 20%;text-align: center;display: block;height: 25px;line-height: 25px;">
+                  {{task.type}}
+                </span>
+                <span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width: 40%;padding-left: 35px;
+                display: block;height: 25px;line-height: 25px;">
+                  {{task.message}}
+                </span>
+                <span style="display: block;height: 25px;line-height: 25px;">
+                  {{task.time}}
+                </span>
+              </li>
+
             </ul>
           </a-card>
         </div>
 
-        <div style="width: 55%;margin-left: 3%;margin-top:3%; height: 100%;">
-          <a-card style="width: 100%;height: 100%;border-radius: 20px;">
-            <span class="font" style="display: inline-block;height: 10%;"><i class="iconfont icon-rizhi-copy" style="font-size: 30px;"></i>登录日志
+        <!--站内消息-->
+        <div class="top-div" style="margin: 0 0 0 0.5%;width: 45%;" >
+          <a-card class="div-card" title="站内消息">
+          </a-card>
+        </div>
+
+        <!--登录日志-->
+        <div class="top-div" style="margin: 0 0 0 0.5%;width: 45%;">
+          <a-card class="div-card">
+            <span class="font" style="display: inline-block;height: 10%;"><i class="el-icon-s-order" style="font-size: 30px;"></i>登录日志
             <i class="iconfont icon-shenglvehao"></i>
             </span>
             <ul class="ul-li" style="list-style-type:none;padding-left: 0px;">
-<!--              这里可以用for循环-->
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-              <li><a-tag color="#539ee6" style="width: 85px;text-align: center;">企划部</a-tag><span style="margin-left: 50px">李朝阳</span><span style="margin-left: 100px">2002.2.10 10:10:20</span></li>
-            </ul>
+              <!--这里可以用for循环-->
+              <!--当一个用户登录后增加一条数据-->
+              <li v-for="(loginlog,index) in loginlogs" style="width: 100%;">
+                <!--类型-->
+                <span class="mouse" color="#539ee6" style="font-weight: normal; background-color: #539ee6;
+                color: white;border-radius: 4px;width: 17%;text-align: center;display: block;height: 25px;line-height: 25px;">
+                  {{loginlog.department}}
+                </span>
+                <span style="width: 40%;padding-left: 45px;margin-left: 35px;
+                display: block;height: 25px;line-height: 25px;">
+                  {{loginlog.loginName}}
+                </span>
+                <span style="display: block;height: 25px;line-height: 25px;">
+                  {{loginlog.loginTime}}
+                </span>
+              </li>
+              </ul>
           </a-card>
         </div>
       </div>
-      <div style="width: 100%;margin-top: 5%;margin-left: 6%;height: 70%">
-        <a-card style="width: 94%;height: 90%;border-radius: 20px;">
-            <span class="font" style="display: inline-block;height: 10%;"><i class="iconfont icon-rizhi-copy" style="font-size: 30px;"></i>全部应用
+
+      <div style="width: 100%;height: 70%;margin-top: 0.5%">
+        <a-card style="width: 100%;height: 90%;border-radius: 10px;">
+            <span class="font" style="display: inline-block;height: 10%;">
+              <i class="el-icon-s-grid" style="font-size: 30px;color: #5cb6ff;cursor: pointer"></i>
+              <p style="display: inline-block;margin-left: 10px">全部应用</p>
             </span>
           <ul class="apply-use" style="list-style-type: none;padding: 0px">
-            <li><i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资审批</span></li>
-            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
-            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
-            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
-            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
-            <li><i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资审批</span></li>
-            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
-            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
-            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
-            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
-            <li><i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资审批</span></li>
-            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
-            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
-            <li><i class="iconfont icon-suggest-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资申领</span></li>
-            <li><i class="iconfont icon-process-copy" style="font-size: 35px;"></i><span style="margin-left: 20px">物资报废</span></li>
+            <li>
+              <i class="iconfont icon-lianxiren1-copy" style="font-size: 35px;"></i>
+              <span class="text-style">流程管理</span>
+            </li>
           </ul>
         </a-card>
       </div>
@@ -71,18 +93,85 @@
 <script>
 
 export default {
-  name: 'HomePage'
+  name: 'HomePage',
+
+  data() {
+    return {
+      //获取信息的地址
+      showDate: {
+        noDate: true ,
+        showDate: false,
+      },
+      url: {
+
+      },
+      //此处存放数据,如果有数据就在待办任务处显示(现未写查询逻辑)
+      tasks:[],
+      loginlogs:[
+        {
+          department: "企划部",
+          loginName: "李朝阳",
+          loginTime: "2022.10.26 12:00:00"
+        },
+        {
+          department: "企划部",
+          loginName: "李朝阳",
+          loginTime: "2022.10.26 12:00:00"
+        }
+      ]
+
+    }
+  },
+
+  created() {
+    // this.searchDoneData();
+    // //当页面第一次生成时对进行tasks进行查询如果有数据则显示待办任务
+    // //如果没有则显示暂无待办任务
+    this.toBeDoneData();
+  },
+
+
+  methods: {
+    // 对待办任务进行查询查看是否有待办数据
+    searchDoneData(){
+      // 待添加
+    },
+    // 判断是否有待办任务数据
+    toBeDoneData(){
+      this.tasks[0] =
+      {
+        type: "流程审批",
+        message: "关于帐外物资的xxxx的审批流程",
+        time: "2002.20.20 10:10:20"
+      }
+      if (this.tasks != null){
+        this.showDate.noDate = false;
+        this.showDate.showDate = true;
+      }
+    },
+
+  }
 }
 </script>
 
-
 <style scoped>
 @import url("http://at.alicdn.com/t/c/font_3733417_ws9m9bvag1h.css");
+
+.top-div {
+  height: 100%;
+}
+
+.div-card {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+
 .border-style{
   width: 40%;
   height: 50%;
   border: 1px solid lightgrey;
-  border-radius: 15px;
+  border-radius: 10px;
   background-color: #ffffff;
   margin: 30px 0 0 50px;
   box-shadow: 0 0 2px 2px lightgrey;
@@ -98,18 +187,34 @@ export default {
 
 .ul-li li{
   margin-top: 10px;
+  display: inline-flex;
+  font-weight: bold;
 }
 
 .iconfont{
   vertical-align: -10%;
+  /*background-color: #f28123;*/
+  /*border-radius: 10px;*/
 }
 .apply-use li{
   float: left;
-  border: 1px solid black;
   width: 15%;
   height: 60px;
   margin: 40px 0 0 60px;
+  line-height: 60px;
+  font-weight: bold;
 }
 
+.mouse:hover {
+  cursor: pointer;
+}
 
+.text-style {
+  margin-left: 20px;
+  cursor: pointer;
+}
+
+i:hover {
+  color: #5cb6ff;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/dashboard/NewHomePage.vue b/src/views/dashboard/NewHomePage.vue
index 9484631..12e367b 100644
--- a/src/views/dashboard/NewHomePage.vue
+++ b/src/views/dashboard/NewHomePage.vue
@@ -12,10 +12,7 @@
 
         <div style="width: 50%;padding-left: 10%;height: 100%">
           <a-card title="站内消息" style="width: 100%;height: 100%">
-            <template #extra><a-button type="primary">更多</a-button></template>
-<!--            <p>card content</p>-->
-<!--            <p>card content</p>-->
-<!--            <p>card content</p>-->
+
           </a-card>
         </div>
       </div>
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 62a41ff..549e228 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -225,7 +225,7 @@
         fieldList.push({type:'string',value:'arrivalNotice',text:'是否到货',dictCode:''})
         fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
         fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
         this.superFieldList = fieldList
 
 
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index d864867..750f451 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -34,10 +34,10 @@
                 <a-input placeholder="请选择存储仓位" v-model="queryParam.freightSpace"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="生产日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-range-picker
-                  style="width: 210px"
+                  style="width: 180px"
                   format="YYYY-MM-DD"
                   :placeholder="['开始时间', '结束时间']"
                   @change="onDateChange"
@@ -64,7 +64,7 @@
                 />
               </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" style="margin-left: 30px">
               <a-form-item label="入库人">
                 <a-input placeholder="请选择入库人" v-model="queryParam.librarySign"/>
               </a-form-item>
@@ -79,8 +79,6 @@
       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
       <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
 
-      <!-- 高级查询区域 -->
-<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
           <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
@@ -389,7 +387,7 @@
         fieldList.push({type:'int',value:'arrivalNotice',text:'是否到货',dictCode:''})
         fieldList.push({type:'date',value:'inboundTime',text:'入库时间'})
         fieldList.push({type:'string',value:'librarySign',text:'入库人',dictTable:'', dictText:'', dictCode:''})
-        fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
         this.superFieldList = fieldList
       }
     }
diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index edee713..5bbf8f2 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -132,12 +132,6 @@
     },
     data () {
       return {
-        // //帐外库存位置储存信息
-        // libraryNamesMessage: [],
-        // //供应商信息
-        // supplierMessage: [],
-        // //物料信息
-        // materialMessage: [],
         description: '账外物资库管理页面',
         // 表头
         columns: [
@@ -236,25 +230,25 @@
         })
       },
       getSuperFieldList(){
-        // let fieldList=[];
-        // fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
-        // fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
-        // fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
-        // fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
-        // fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
-        // fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
-        // fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
-        // fieldList.push({type:'string',value:'materialsUnit',text:'计量单位',dictCode:''})
-        // fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
-        // fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
-        // fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
-        // fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
-        // fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
-        // fieldList.push({type:'Date',value:'inboundTime',text:'入库时间',dictCode:''})
-        // fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
-        // fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
-        // fieldList.push({type:'string',value:'libraryNames',text:'库存位置',dictCode:''})
-        // this.superFieldList = fieldList
+        let fieldList=[];
+        fieldList.push({type:'string',value:'supplier',text:'供应商',dictCode:''})
+        fieldList.push({type:'string',value:'supplierDescription',text:'供应商描述',dictCode:''})
+        fieldList.push({type:'string',value:'materialGroup',text:'物料组',dictCode:''})
+        fieldList.push({type:'string',value:'material',text:'物料',dictCode:''})
+        fieldList.push({type:'string',value:'materialDescription',text:'物料描述',dictCode:''})
+        fieldList.push({type:'string',value:'materialStorageId',text:'库存位置',dictCode:''})
+        fieldList.push({type:'string',value:'freightSpace',text:'库存仓位',dictCode:''})
+        fieldList.push({type:'string',value:'materialsUnit',text:'计量单位',dictCode:''})
+        fieldList.push({type:'int',value:'number',text:'数量',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'money',text:'金额',dictCode:''})
+        fieldList.push({type:'date',value:'productionDate',text:'生产日期'})
+        fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
+        fieldList.push({type:'Date',value:'inboundTime',text:'入库时间',dictCode:''})
+        fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
+        fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        fieldList.push({type:'string',value:'libraryNames',text:'库存位置',dictCode:''})
+        this.superFieldList = fieldList
         let item ={
           state : 0,
           sort : 0
@@ -262,13 +256,13 @@
         getAction(this.url.queryLibraryName,item).then((res)=>{
           if(res.success){
             this.libraryNames = res.result.records;
-            console.log(res.result.records);
+            // console.log(res.result.records);
           }
         });
         getAction(this.url.queryListmaterials).then((res)=>{
           if(res.success){
             this.Listmaterials = res.result;
-            console.log(res.result);
+            // console.log(res.result);
           }
         });
       }
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index 16eed68..1f22d8f 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -315,9 +315,9 @@
       searchQuery(){
         getAction(this.url.list,this.queryParam).then((res)=>{
           if(res.success){
-            console.log("resultsearch ：")
-            console.log(res.result);
-            console.log(this.queryParam)
+            // console.log("resultsearch ：")
+            // console.log(res.result);
+            // console.log(this.queryParam)
             this.dataSource=res.result.records;
           }
         });
@@ -338,9 +338,9 @@
         },
         getAction(this.url.list,this.queryParam).then((res)=>{
           if(res.success){
-            console.log("resultsearch ：")
-            console.log(res.result);
-            console.log(this.queryParam)
+            // console.log("resultsearch ：")
+            // console.log(res.result);
+            // console.log(this.queryParam)
             this.dataSource=res.result.records;
           }
         });
@@ -372,7 +372,7 @@
         fieldList.push({type:'String',value:'expirationDate',text:'保质期'})
         fieldList.push({type:'date',value:'inboundTime',text:'入库时间',dictCode:''})
         fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
-        fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
         this.superFieldList = fieldList
       }
     }
diff --git a/src/views/wastematerials/modules/ProcessWaste.vue b/src/views/wastematerials/modules/ProcessWaste.vue
index bb5c59e..1906c3e 100644
--- a/src/views/wastematerials/modules/ProcessWaste.vue
+++ b/src/views/wastematerials/modules/ProcessWaste.vue
@@ -211,7 +211,7 @@
         fieldList.push({type:'date',value:'expirationDate',text:'保质期'})
         fieldList.push({type:'string',value:'inboundTime',text:'入库时间',dictCode:''})
         fieldList.push({type:'string',value:'warehousePeople',text:'入库人',dictCode:''})
-        fieldList.push({type:'string',value:'accountingAttributes',text:'核算属性',dictCode:''})
+        fieldList.push({type:'int',value:'accountingAttributes',text:'核算属性',dictCode:''})
         this.superFieldList = fieldList
       }
     }