修改页面

src/components/jeecg/PEditableTable.vue

@@ -2681,9 +2681,9 @@
         this.elemValueChange(FormTypes.sel_search, row, column, value)
       },
       filterOption(input, option) {
-        console.log("filterOption=========",input,option);
+        // console.log("filterOption=========",input,option);
 
-        console.log("option.componentOptions.children[0]",option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0)
+        // console.log("option.componentOptions.children[0]",option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0)
         return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       },
       searchOption (input,pro,index){
@@ -2705,7 +2705,7 @@
             // getAction(this.url.descriptionRake,par).then((res)=>{
             let a= [];
             if(res.success){
-              console.log("222222222222222===",res.result);
+              // console.log("222222222222222===",res.result);
               let pam = res.result.records||res.result;
               pam.forEach( item => {
                   let isb = false;

src/views/activiti/applyHome.vue

@@ -10,14 +10,14 @@
       <div v-else >
         <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 :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}">
+                <a-card hoverable @click="chooseProcess(item)" class="forRadius" :style="{'background-color':item.color,'border-radius':'12px'}">
                   <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)" style="color: white">{{item.name}}</a>
+                        <a href="javascript:void (0)" style="color: white;font-size: 18px;font-weight: bolder;">{{item.name}}</a>
 <!--                        <a href="javascript:void (0)" @click="chooseProcess(item)">{{item.name}}</a>-->
                       <!--</a-col>-->
                     </a-row>
@@ -105,7 +105,13 @@
           pictrueId:'',
           procInstId:''
         },
-        colors:["#175CFF","#FFC542","#00C18B","#0DCCFF","#C449EA","#f56c6c","#00e1cd","#ff4562","#f9d500","#7191e4","#8759ff","#fc7798","#00bf50","#b7d264"]
+        colors:["#7da0f5",
+          "#fad172",
+          "#46cea8",
+          "#3dd6ff",
+          "#cf6dee",
+          "#fa8e8e",
+          "#4bfceb","#fd7186","#f9d500","#7191e4","#8759ff","#fc7798","#00bf50","#b7d264"]
       }
     },
     computed:{

src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@@ -225,37 +225,37 @@
       },
     },
     methods: {
-      // loadData(arg) {
-      //   if(!this.url.list){
-      //     this.$message.error("请设置url.list属性!")
-      //     return
-      //   }
-      //   //加载数据 若传入参数1则加载第一页的内容
-      //   if (arg === 1) {
-      //     this.ipagination.current = 1;
-      //   }
-      //   let ue= sessionStorage.getItem('USER_INFORMATION');
-      //   let res=JSON.parse(ue);
-      //   if(res.realname !== "管理员"){
-      //    return ;
-      //   }
-      //   console.log(res);
-      //   var params = this.getQueryParams();//查询条件
-      //   this.loading = true;
-      //   getAction(this.url.list, params).then((res) => {
-      //     if (res.success) {
-      //       this.dataSource = res.result.records||res.result;
-      //       if(res.result.total)
-      //       {
-      //         this.ipagination.total = res.result.total;
-      //       }
-      //     }
-      //     if(res.code===510){
-      //       this.$message.warning(res.message)
-      //     }
-      //     this.loading = false;
-      //   })
-      // },
+      loadData(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        //加载数据 若传入参数1则加载第一页的内容
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        let ue= sessionStorage.getItem('USER_INFORMATION');
+        let res=JSON.parse(ue);
+        if(res.realname !== "管理员"){
+         return ;
+        }
+        console.log(res);
+        var params = this.getQueryParams();//查询条件
+        this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records||res.result;
+            if(res.result.total)
+            {
+              this.ipagination.total = res.result.total;
+            }
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
 
 
 

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -507,7 +507,7 @@
         this.productLicenseDate=[];
         this.inboundLicenseDate=[];
         this.queryParam = {
-          supplier: null,
+            supplier: null,
             itemGroup: null,
             merchandiseNewsId: this.$route.query.item,
             itemDescription: null,

src/views/wastematerials/ProcessWasteMaterialsList.vue

@@ -292,8 +292,12 @@
         let res=JSON.parse(ue);
         console.log("23r4qwerfasdfgzsfh",res)
         if(res.realname !== "管理员"){
-          console.log("asdfasd")
-          this.queryParam.departId = res.departIds;
+         if(!!res.departIds){
+           this.queryParam.departId = res.departIds ;
+         }else{
+           return ;
+         }
+
         }
       },