From 80d4e2c92fd69f5af17f5e9939b9ff052f9a5595 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Wed, 30 Nov 2022 11:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E6=97=A7,=E7=94=B5=E7=BC=86,=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=AF=BC=E5=85=A5,=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/applyHome.vue     | 16 +++++++---------
 src/views/waste/ProcessWasteList.vue | 21 +++++++++------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/views/activiti/applyHome.vue b/src/views/activiti/applyHome.vue
index d2dd802..420d594 100644
--- a/src/views/activiti/applyHome.vue
+++ b/src/views/activiti/applyHome.vue
@@ -12,7 +12,7 @@
           <a-collapse-panel v-for="(value, index)  in activeKeyAll" :header="filterDictText(dictOptions,value)||'未分类'" :key="value">
             <a-list :grid="{ gutter: 20,column:4}" :dataSource="processDataMap[value]">
               <a-list-item slot="renderItem" slot-scope="item" >
-                <a-card hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px'}">
+                <a-card hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px'}" :headStyle="{'border-radius':'12px'}">
                   <div slot="title">
                     <a-row style="text-align: center;">
                      <!-- <a-col span="12" :title="item.name">{{item.name}} </a-col>-->
@@ -148,6 +148,11 @@
           if (res.success) {
             var result = res.result||[];
             if (result.length>0){
+              console.log("====================",result);
+              //14种颜色的循环
+              for (let i in result){
+                this.$set(result[i],'color',this.colors[i%14])
+              }
               let searchProcessKey = this.searchProcessKey;
               if (searchProcessKey){ //过滤条件
                 result = _.filter(result, function(o) { return o.name.indexOf(searchProcessKey)>-1; });
@@ -155,14 +160,7 @@
               this.processDataMap = _.groupBy(result,'categoryId');
               // console.log("111111111111",this.categoryId)
               // console.log("===================",this.processDataMap,"=====================")
-              //14种颜色的循环
-              let n = 0
-              for (let i in this.processDataMap){
-                for (let j in this.processDataMap[i]){
-                  this.$set(this.processDataMap[i][j],'color',this.colors[n%14])
-                  n++
-                }
-              }
+
               // console.log("=======",this.processDataMap.wuzi)
               for (const categoryId in this.processDataMap) {
                 this.activeKeyAll.push(categoryId)
diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue
index 00c2b42..bab3e3c 100644
--- a/src/views/waste/ProcessWasteList.vue
+++ b/src/views/waste/ProcessWasteList.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xl="4" :lg="7" :md="8" :sm="24">
             <a-form-item label="物资名称">
-              <a-input placeholder="请输入物资名称" v-model="queryParam.materialName"/>
+              <a-input placeholder="请输入物资名称" v-model="queryParam.materialNameSearch"/>
             </a-form-item>
           </a-col>
           <a-col :md="5" :sm="10">
@@ -21,18 +21,18 @@
             </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.descriptionId"/>
+          <a-form-item label="物料组">
+              <a-input placeholder="请输入物料组" v-model="queryParam.descriptionId"/>
             </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.affiliation"/>
+              <a-input placeholder="请选择所属单位" v-model="queryParam.departId"/>
             </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.depositary" dict=",,"/>
+              <a-form-item label="存放地点">
+                <a-input placeholder="请选择存放地点" v-model="queryParam.depositary"/>
               </a-form-item>
             </a-col>
 <!--          <a-col :xl="3" :lg="7" :md="8" :sm="24">-->
@@ -243,13 +243,10 @@
       },
     },
     methods: {
-      searchReset(){
+      searchReset() {
+        this.queryParam = {}
         this.createScrapTime = []
-        getAction(this.url.list).then((res)=>{
-          if(res.success){
-            this.dataSource=res.result.records;
-          }
-        });
+        this.loadData(1);
       },
       handleInto() {
         this.$router.push(