Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/views/mold/moldDetail.vue

@@ -950,7 +950,7 @@
                     if(this.approve == 1){
                         array.push(list[i]);
                     } else {
-                        if(list[i].uplodtorId == this.user.id){
+                        if(list[i].uplodtorId == this.user.id || list[i].state == 3 || list[i].state < 0){
                             array.push(list[i]);
                         }
                     }
@@ -1476,7 +1476,17 @@
                 },
                 res => {
                     if (res.code == "ok") {
-                        this.operations = res.data;
+                        if(type == 4){
+                            var list = res.data , array = [];
+                            for(var i in list){
+                                if(list[i].isPass == 1){
+                                    array.push(list[i])
+                                }
+                            }
+                            this.operations = array;
+                        } else {
+                            this.operations = res.data;
+                        }
                     } else {
                         this.$message({
                             message: res.msg,