Sfoglia il codice sorgente

模具保养的文件类型大小限制

Reiskuchen 5 anni fa
parent
commit
07e12c4d06

+ 8 - 6
ys_vue/src/views/detection/maintenance.vue

@@ -158,6 +158,7 @@
             :http-request="maintain"
             :limit="1"
             :auto-upload="false"
+            before-upload="beforeUpload"
           >
             <el-button size="small" type="primary">上传</el-button>
           </el-upload>
@@ -250,14 +251,15 @@ export default {
     backToDetection() {
       this.$router.go(-1);
     },
-    //暂未用到的上传格式和大小限制
+    //上传格式和大小限制
     beforeUpload(file) {
-      const isJPG = file.type === "image/png";
-      const isLt2M = file.size / 1024 / 1024 < 2;
-      if (!isJPG) {
-        this.$message.error("上传头像图片只能是 PNG 格式!");
+      const isJPG = file.type === "image/jpg";
+      const isPNG = file.type === "image/jpg";
+      const isLt5M = file.size / 1024 / 1024 < 5;
+      if (!isJPG || !isPNG) {
+        this.$message.error("上传头像图片只能是 JPG 或 PNG 格式!");
       }
-      if (!isLt2M) {
+      if (!isLt5M) {
         this.$message.error("上传头像图片大小不能超过 2MB!");
       }
       return isJPG && isLt2M;

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

@@ -335,7 +335,16 @@
                         <el-table-column type="index" width="40"></el-table-column>
                         <el-table-column prop="uploadtor" label="申请人" sortable></el-table-column>
                         <el-table-column prop="indate" label="申请时间" width="200" sortable></el-table-column>
-                        <el-table-column prop="state" label="状态 X" width="120" sortable></el-table-column>
+                        <el-table-column label="状态" width="120" sortable>
+                            <template slot-scope="scope">
+                                <span v-if="scope.row.state == -2">生产方审核不通过</span>
+                                <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
+                                <span v-else-if="scope.row.state == 0">待双方审核</span>
+                                <span v-else-if="scope.row.state == 1">待生产方审核</span>
+                                <span v-else-if="scope.row.state == 2">待资产方审核</span>
+                                <span v-else-if="scope.row.state == 3">审核通过</span>
+                            </template>
+                        </el-table-column>
                         <el-table-column label="操作" width="200" sortable>
                             <template slot-scope="scope">
                                 <el-button size="small" @click="updateApproval(scope.row.id, true)" type="primary">通过</el-button>