文件上传

PHM-web/src/components/FileUpload/index.vue

@@ -19,8 +19,8 @@
       <!-- 上传提示 -->
       <div class="el-upload__tip" slot="tip" v-if="showTip">
         请上传
-        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
-        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
+        <template v-if="fileSize">大小不超过<b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
+        <template v-if="fileType">格式为<b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
         的文件
       </div>
     </el-upload>

PHM-web/src/views/manage/dataDown/index.vue

@@ -31,8 +31,8 @@
     <!-- 离线下载对话框 -->
     <el-dialog :title="title" :visible.sync="openOffline"  :close-on-click-modal="false" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="案例文件" prop="caseFileName">
-          <file-upload ref="fileUpload" v-model="form.caseFileName" :limit="1"></file-upload>
+        <el-form-item label="文件" prop="caseFileName">
+          <file-upload ref="fileUpload" :fileType="['xls','xlsx']" :fileSize = "0" v-model="form.caseFileName" :limit="1"></file-upload>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -141,6 +141,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.openOffline = false;
       this.reset();
     },
     // 表单重置

PHM-web/src/views/manage/orderConfig/index.vue

@@ -45,13 +45,13 @@
       <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy" />
       <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -71,7 +71,7 @@
     <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="指令编码" prop="orderCode">
-          <el-input v-model="form.orderCode" placeholder="请输入指令编码" />
+          <el-input v-model="form.orderCode" placeholder="请输入指令编码" :disabled="form.id" />
         </el-form-item>
         <el-form-item label="指令名称" prop="name">
           <el-select v-model="form.name" placeholder="请选择指令状态" style="width:100%" @change="change">
@@ -143,6 +143,9 @@ export default {
         orderCode: [
           { required: true, message: '指令编码不能为空', trigger: 'blur' },
         ],
+        name: [
+          { required: true, message: '指令名称不能为空', trigger: 'change' },
+        ],
       },
     }
   },