Merge branch 'master' of https://gitee.com/vansfa/rt_companyUI

src/components/Material/index.vue

@@ -342,11 +342,13 @@ export default {
       })
     },
     beforeUpload(file) {
+      console.log(file.type)
       const isPic =
         file.type === 'image/jpeg' ||
         file.type === 'image/png' ||
         file.type === 'image/gif' ||
-        file.type === 'image/jpg'
+        file.type === 'image/jpg' ||
+        file.type === 'audio/mpeg'
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isPic) {
         this.$message.error('上传图片只能是 JPG、JPEG、PNG、GIF 格式!')

src/views/company/tcmScheduleReport/consume.vue

@@ -113,7 +113,7 @@
 
     <!-- 添加或修改公司档期消费对话框 -->
     <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-select filterable style="width: 350px" v-model="form.scheduleId" placeholder="请选择档期" clearable size="small" >
                   <el-option
@@ -124,7 +124,7 @@
                     />
             </el-select>
         </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-number style="width: 350px"  onkeyup="value=(value.replace(/\D/g,'')==''?'':parseInt(value))" v-model="form.money" :step="10" :precision="2"  :min="0.00" placeholder="请输入消费金额" />
          -->

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>
           </template>
       </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="availableDevice" >
           <template slot-scope="scope">

src/views/store/components/productOrder.vue

@@ -477,6 +477,7 @@ export default {
         open:false,
       },
       certificateForm:{
+        orderCode:null,
         certificates:null,
       },
       certificateRules:{
@@ -624,6 +625,7 @@ export default {
     },
     handleConfirm(){
       this.certificateForm.id = this.orderId;
+      this.certificateForm.orderCode = this.order.orderCode;
       this.certificateForm.certificates = this.photoArr;
       uploadCredentials(this.certificateForm).then(response => {
               if (response.code === 200) {