Browse Source

操作记录的选择时间修改2、修复clearfiles问题、加入一些:loading

Reiskuchen 5 years ago
parent
commit
2d4be258e4
1 changed files with 14 additions and 10 deletions
  1. 14 10
      ys_vue/src/views/mold/moldDetail.vue

+ 14 - 10
ys_vue/src/views/mold/moldDetail.vue

@@ -84,9 +84,9 @@
         <el-col :span="24" class="title">
             文档资料
 
-            <!-- 上传 模具0 零件1 时 -->
+            <!-- 上传 模具0 时 -->
             <el-dropdown trigger="click" style="float:right;" v-show="activeTab == 0 && update == 1">
-                <el-button size="small" type="primary">
+                <el-button size="small" type="primary" :loading="uploading[0]">
                     上传
                     <i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
@@ -98,7 +98,7 @@
                 </el-dropdown-menu>
             </el-dropdown>
             
-            <!-- 上传 模具0 零件1 时 -->
+            <!-- 上传 零件1 时 -->
             <el-button size="small" type="primary" style="float:right;" v-show="activeTab == 1 && update == 1" @click.native="fileType = 0;centerDialog4Visible = true;">
                 上传
             </el-button>
@@ -134,7 +134,7 @@
                 :limit="5"
                 style="float:right;"
             >
-                <el-button size="small" type="primary">上传</el-button>
+                <el-button size="small" type="primary" :loading="uploading[1]">上传</el-button>
             </el-upload>
 
             <!-- 上传 报废5 时 -->
@@ -398,7 +398,7 @@
         <!-- 操作记录 -->
         <el-col :span="24" class="title">
             操作记录
-            <el-date-picker style="float: right;" v-model="recordTime" type="datetime" placeholder="选择日期时间" @change="changeTime"></el-date-picker>
+            <el-date-picker style="float: right;" v-model="recordTime" type="datetimerange" placeholder="选择日期时间" @change="changeTime"></el-date-picker>
             </el-col>
             <el-table :data="operations" highlight-current-row v-loading="listLoading" style="width: 100%;">
                 <el-table-column type="index" width="40"></el-table-column>
@@ -429,15 +429,15 @@
                 <el-button size="small" type="primary">上传</el-button>
             </el-upload>
             <span slot="footer" class="dialog-footer">
-                <el-button @click="confirmUpload">确定</el-button>
+                <el-button @click="confirmUpload" :loading="uploading[3]">确定</el-button>
             </span>
         </el-dialog>
 
         <!-- 零件文档上传弹窗 -->
-        <el-dialog title="零件文档上传" v-if="centerDialog4Visible" :visible.sync="centerDialog4Visible" width="100" :before-close="clearFileRecord" center>
+        <el-dialog title="零件文档上传" v-if="centerDialog4Visible" :visible.sync="centerDialog4Visible" width="100" :before-close="clearFileRecord2" center>
             <p style="color:#ccc;">文件命名规则:零件编号+2D/3D  如 LJ001+2D.dwg</p>
             <el-upload ref="upload4" action="uploadFile" :http-request="uploadPartFile" :show-file-list="true" :before-remove="beforeRemove" multiple>
-                <el-button size="small" type="primary">上传</el-button>
+                <el-button size="small" type="primary" :loading="uploading[2]">上传</el-button>
             </el-upload>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="uploadFilePart">确定</el-button>
@@ -542,7 +542,7 @@
                     name: "",
                     life: ""
                 },
-
+                uploading:[false, false, false, false],
                 editParts: {
                     id: 0,
                     number: "",
@@ -861,9 +861,13 @@
             //清理报废文档上传窗口中的文件
             clearFileRecord() {
                 this.centerDialog2Visible = false;
-                this.centerDialog4Visible = false;
                 this.$refs.upload1.clearFiles();
                 this.$refs.upload2.clearFiles();
+            },
+
+            //清理零件文档上传窗口中的文件
+            clearFileRecord2() {
+                this.centerDialog4Visible = false;
                 this.$refs.upload4.clearFiles();
             },