总库,帐外,新建流程

src/views/activiti/applyHome.vue

@@ -11,13 +11,13 @@
         <a-collapse v-model="activeKey">
           <a-collapse-panel v-for="(value, index)  in activeKeyAll" :header="filterDictText(dictOptions,value)||'未分类'" :key="value">
             <a-list :grid="{ gutter: 10,column:4}" :dataSource="processDataMap[value]">
-              <a-list-item slot="renderItem" slot-scope="item">
-                <a-card hoverable @click="chooseProcess(item)">
+              <a-list-item slot="renderItem" slot-scope="item" >
+                <a-card hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color}">
                   <div slot="title">
                     <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)">{{item.name}}</a>
+                        <a href="javascript:void (0)" style="color: white">{{item.name}}</a>
 <!--                        <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
                       <!--</a-col>-->
                     </a-row>
@@ -105,6 +105,7 @@
           pictrueId:'',
           procInstId:''
         },
+        colors:["#175CFF","#FFC542","#00C18B","#0DCCFF","#C449EA","#f56c6c","#00e1cd","#ff4562","#f9d500","#7191e4","#8759ff","#fc7798","#00bf50","#b7d264"]
       }
     },
     computed:{
@@ -146,10 +147,22 @@
                 result = _.filter(result, function(o) { return o.name.indexOf(searchProcessKey)>-1; });
               }
               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)
               }
               this.activeKey = this.activeKeyAll;
+              // console.log("=====================",this.activeKey)
             }
             this.processModalVisible = true;
           }else {
@@ -192,4 +205,8 @@
 </script>
 <style scoped>
   @import '~@assets/less/common.less';
+
+  .forRadius {
+    border-radius: 5px;
+  }
 </style>

src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@@ -58,7 +58,7 @@
       <a-table
         ref="table"
         size="middle"
-        :srcoll="{y:460}"
+        :scroll="{y:460}"
         bordered
         rowKey="id"
         :columns="columns"

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -76,17 +76,23 @@
               <a-input placeholder="请选择批次" v-model="queryParam.supplierBatch"/>
             </a-form-item>
           </a-col>
-          <a-col :xl="5" :lg="7" :md="8" :sm="16">
+
+          <a-col :xl="4" :lg="7" :md="8" :sm="16">
             <a-form-item label="保质期">
-              <a-date-picker
-                style="width: 240px"
-                format="YYYY-MM-DD"
-                placeholder="请输入创建开始时间"
-                v-model="queryParam.expirationDate"
-              />
-<!--              <a-input placeholder="请选择保质期" v-model="queryParam.expirationDate"/>-->
+              <a-input placeholder="请输入保质期" v-model="queryParam.expirationDate"/>
             </a-form-item>
           </a-col>
+<!--          <a-col :xl="5" :lg="7" :md="8" :sm="16">-->
+<!--            <a-form-item label="保质期">-->
+<!--              <a-date-picker-->
+<!--                style="width: 240px"-->
+<!--                format="YYYY-MM-DD"-->
+<!--                placeholder="请输入创建开始时间"-->
+<!--                v-model="queryParam.expirationDate"-->
+<!--              />-->
+<!--&lt;!&ndash;              <a-input placeholder="请选择保质期" v-model="queryParam.expirationDate"/>&ndash;&gt;-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
           <a-col :xl="5" :lg="7" :md="8" :sm="16">
             <a-form-item label="入库时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-range-picker
@@ -155,6 +161,9 @@
         <span slot="supplierName" slot-scope="text, record">
           <j-ellipsis :value="text" :length="4"/>
         </span>
+        <span slot="rates" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="5"/>
+        </span>
         <span slot="materialClassify" slot-scope="text, record">
           <j-ellipsis :value="text" :length="10"/>
         </span>
@@ -335,6 +344,7 @@
           {
             title:'金额',
             align:"center",
+            scopedSlots: { customRender: 'rates' },
             dataIndex: 'rates'
           },
           {