阿拉蕾 1 년 전
부모
커밋
851c75f2cd
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 2
      src/views/company/tcmScheduleReport/consume.vue
  2. 3 1
      src/views/qw/qwAccounts/index.vue

+ 2 - 2
src/views/company/tcmScheduleReport/consume.vue

@@ -113,7 +113,7 @@
 
 
     <!-- 添加或修改公司档期消费对话框 -->
     <!-- 添加或修改公司档期消费对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
     <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
        <el-form-item label="所属档期" prop="scheduleId">
        <el-form-item label="所属档期" prop="scheduleId">
             <el-select filterable style="width: 350px" v-model="form.scheduleId" placeholder="请选择档期" clearable size="small" >
             <el-select filterable style="width: 350px" v-model="form.scheduleId" placeholder="请选择档期" clearable size="small" >
                   <el-option
                   <el-option
@@ -124,7 +124,7 @@
                     />
                     />
             </el-select>
             </el-select>
         </el-form-item>
         </el-form-item>
-         <el-form-item label="消费金额"  prop="money">
+         <el-form-item label="媒体消费金额"  prop="money">
                <el-input style="width: 350px" v-model="form.money" pattern="\d+(\.\d{1,2})?"  type="number" placeholder="请输入消费金额" />
                <el-input style="width: 350px" v-model="form.money" pattern="\d+(\.\d{1,2})?"  type="number" placeholder="请输入消费金额" />
                <!-- <el-input-number style="width: 350px"  onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))" v-model="form.money" :step="10" :precision="2"  :min="0.00" placeholder="请输入消费金额" />
                <!-- <el-input-number style="width: 350px"  onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))" v-model="form.money" :step="10" :precision="2"  :min="0.00" placeholder="请输入消费金额" />
          -->
          -->

+ 3 - 1
src/views/qw/qwAccounts/index.vue

@@ -41,7 +41,9 @@
               <el-tag prop="authCheck" v-for="(item, index) in authCheckOptions"  :type="scope.row.authCheck==0?'danger':'success'"  v-if="scope.row.authCheck==item.dictValue">{{item.dictLabel}}</el-tag>
               <el-tag prop="authCheck" v-for="(item, index) in authCheckOptions"  :type="scope.row.authCheck==0?'danger':'success'"  v-if="scope.row.authCheck==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
           </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="关联设备id" align="center" prop="deviceId" />
+      <!-- <el-table-column label="关联设备id" align="center" prop="deviceId" /> -->
+      <el-table-column label="最近一次上线时间" align="center" prop="onlineTime" />
+      <el-table-column label="最近一次下线时间" align="center" prop="offlineTime" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
       <el-table-column label="设备是否可用" align="center" prop="availableDevice" >
       <el-table-column label="设备是否可用" align="center" prop="availableDevice" >
           <template slot-scope="scope">
           <template slot-scope="scope">