Browse Source

Merge remote-tracking branch 'origin/master'

306132416@qq.com 4 years ago
parent
commit
d588a40d71
2 changed files with 5 additions and 2 deletions
  1. 1 1
      src/App.vue
  2. 4 1
      src/views/data/InforList.vue

+ 1 - 1
src/App.vue

@@ -38,7 +38,7 @@ export default {
   },
   data() {
     return {
-      isManufacturer: "manufacturer", // distributor 经销商 manufacturer 厂商
+      isManufacturer: "distributor", // distributor 经销商 manufacturer 厂商
       userAccount: "",
       userToken: "",
       loadingFlag: true,

+ 4 - 1
src/views/data/InforList.vue

@@ -94,7 +94,7 @@
                     >已完成</span
                   > -->
                   <span v-if="!obj.endDate || (obj.endDate && obj.download == 1 && obj.report == 1)">已完成</span>
-                  <span v-else @click="waitToReport(obj, index)" :class="{noDownLoad: obj.download == '0'}">待办</span>
+                  <span v-else @click="waitToReport(obj, index)" :class="{noDownLoad: obj.download == '0'}" class="line">待办</span>
                 </td>
 
                 <td v-if="operation" :style="trStyle" class="operationStyle">
@@ -639,4 +639,7 @@ export default {
   color: rgb(173, 162, 162);
   cursor: text!important;
 }
+.line{
+  text-decoration: underline;
+}
 </style>