Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/stock/stockUserDetail.vue

               <span>使用数量</span>
             </template>
             <template slot-scope="scope">
-              <span >{{scope.row.count}}</span>
+              <span v-if="scope.row.is_total == 0">{{scope.row.count}}</span>
+              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
+
             </template>
           </el-table-column>
           <el-table-column min-width="35" align="center">
               <span>使用时间</span>
             </template>
             <template slot-scope="scope">
-              <span  v-if="scope.row.is_total == 0">{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
-              <span  v-if="scope.row.is_total == 1">{{scope.row.total}} </span>
+              <span>{{scope.row.ctime | parseTime('{y}-{m}-{d} {h}:{i}')}} </span>
+
             </template>
           </el-table-column>