sunyadv 5 years ago
parent
commit
b4ea2f3f86

+ 0 - 1
ys_vue/src/main.js

@@ -76,7 +76,6 @@ router.beforeEach((to, from, next) => {
                         }
                         }
                         
                         
                         if(children[j].name == "权限管理"){
                         if(children[j].name == "权限管理"){
-                            console.log((user.parentId == 0 || user.parentId == 1) && user.isManager == 0)
                             if((user.parentId == 0 || user.parentId == 1) && user.isManager == 0){
                             if((user.parentId == 0 || user.parentId == 1) && user.isManager == 0){
                                 children[j].hidden = true
                                 children[j].hidden = true
                             }
                             }

+ 2 - 0
ys_vue/src/port.js

@@ -37,10 +37,12 @@ export default {
         addMold: '/mould/addOrUpdate', //添加/修改模具设备
         addMold: '/mould/addOrUpdate', //添加/修改模具设备
         molds: '/mould/list', //模具列表
         molds: '/mould/list', //模具列表
         modelList: '/mould/modelList', //给项目分配模具获取该公司下的模具列表
         modelList: '/mould/modelList', //给项目分配模具获取该公司下的模具列表
+
         moldDetail: '/mould/detail', //模具详情
         moldDetail: '/mould/detail', //模具详情
         moldFileList: '/mouldfile/list', //获取模具文档*
         moldFileList: '/mouldfile/list', //获取模具文档*
         moldFileListAll: '/mouldfile/allList', //获取全部模具文档
         moldFileListAll: '/mouldfile/allList', //获取全部模具文档
         moldFileUpload: '/mouldfile/uploadFile', //上传模具文档*
         moldFileUpload: '/mouldfile/uploadFile', //上传模具文档*
+        moldFileDowload: '/mouldfile/dowloadFile', //模具文档的下载
         moldFileCheck: '/mouldfile/check', //审批模具文档 
         moldFileCheck: '/mouldfile/check', //审批模具文档 
         moldFileDelete: '/mouldfile/delFile', //项目文档的删除
         moldFileDelete: '/mouldfile/delFile', //项目文档的删除
         moldOperationList: '/mouldoperationdynamics/list', //项目文档的删除
         moldOperationList: '/mouldoperationdynamics/list', //项目文档的删除

File diff suppressed because it is too large
+ 798 - 782
ys_vue/src/views/mold/moldDetail.vue


+ 13 - 13
ys_vue/src/views/mold/moldList.vue

@@ -112,17 +112,17 @@
 
 
                 formRules: {
                 formRules: {
                     modelNo: [
                     modelNo: [
-                    { required: true, message: "请输入模具编号", trigger: "blur" }
+                        { required: true, message: "请输入模具编号", trigger: "blur" }
                     ],
                     ],
                     modelName: [
                     modelName: [
-                    { required: true, message: "请输入模具名称", trigger: "blur" }
+                        { required: true, message: "请输入模具名称", trigger: "blur" }
                     ],
                     ],
                     equipmentId: [
                     equipmentId: [
-                    {
-                        required: true,
-                        message: "请选择云模盒编号",
-                        trigger: ["blur", "change"]
-                    }
+                        {
+                            required: true,
+                            message: "请选择云模盒编号",
+                            trigger: ["blur", "change"]
+                        }
                     ]
                     ]
                 },
                 },
                 listLoading: false,
                 listLoading: false,
@@ -243,12 +243,12 @@
 
 
             //添加界面
             //添加界面
             showAdd() {
             showAdd() {
-            this.addFormVisible = true;
-            this.addForm = {
-                modelNo: "",
-                modelName: "",
-                equipmentId: ""
-            };
+                this.addFormVisible = true;
+                this.addForm = {
+                    modelNo: "",
+                    modelName: "",
+                    equipmentId: ""
+                };
             },
             },
 
 
             addSubmit() {
             addSubmit() {

+ 1 - 1
ys_vue/src/views/project/projectDetail.vue

@@ -661,7 +661,7 @@
             this.allDetail.height = height - 170 + "px";
             this.allDetail.height = height - 170 + "px";
             const that = this;
             const that = this;
             window.onresize = function temp() {
             window.onresize = function temp() {
-                that.allDetail.height = window.innerHeight - 210;    
+                that.allDetail.height = window.innerHeight - 170;    
             };
             };
         },
         },
         mounted() {
         mounted() {