Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/MonthlyCostStatement/index.vue

@@ -351,6 +351,10 @@
             <template v-else-if="scope.row.OrderSource==10 && scope.row.TCIDAndTCNUMList.length==0">
               <p class="_TCIDAndTCNUMList">{{$t('tips.qzcpbianhao')}}：{{scope.row.SourceID}}</p>
             </template>
+            <template v-else-if="scope.row.OtherType==80">
+              <p class="_TCIDAndTCNUMList">{{scope.row.CarName}}</p>
+              <p class="_TCIDAndTCNUMList">{{scope.row.CarUseDate+"  "+scope.row.CarUseNum+"天"}}</p>
+            </template>
             <template v-else-if="scope.row.OrderSource==0 || scope.row.OrderSource==null">
               <p class="_TCIDAndTCNUMList">{{ scope.row.BranchName }}-{{scope.row.DepartName}} </p>
             </template>
@@ -394,11 +398,13 @@
 
           </template>
         </el-table-column>
-        <el-table-column prop="" :label="$t('fnc.feiyongleixing')" show-overflow-tooltip width="150">
+        <el-table-column prop="" :label="$t('fnc.feiyongleixing')" show-overflow-tooltip width="200">
           <template slot-scope="scope">
             <template v-for="(s,si) in scope.row.CostTypeList">
-              <span
-                style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{s}}</span></br>
+              <div
+                style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">
+                {{s}}
+              </div>
             </template>
           </template>
         </el-table-column>