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

.idea/yunsu.iml

@@ -10,6 +10,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: net.lingala.zip4j:zip4j:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.1.6.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.1.6.RELEASE" level="project" />

ys_vue/src/views/base/allocation.vue

@@ -420,7 +420,7 @@
                             if (res.code == "ok") {
                                 this.editFormVisible = false;
                                 this.$message({
-                                    message: "添加成功",
+                                    message: "修改成功",
                                     type: "success"
                                 });
                                 this.getMoulds();
@@ -466,7 +466,7 @@
                     res => {
                         if (res.code == "ok") {
                             this.$message({
-                                message: "修改成功",
+                                message: "设备已启用",
                                 type: "success"
                             });
                             this.getMoulds();

ys_vue/src/views/base/factory.vue

@@ -19,7 +19,7 @@
 		<el-table :data="list" highlight-current-row :height="tableHeight" v-loading="listLoading" style="width: 100%;">
             <el-table-column type="index" width="60"></el-table-column>
 			<el-table-column prop="companyName" label="生产方名称" width="250" sortable></el-table-column>
-            <el-table-column prop="administrator" label="资产方管理员" width="150" sortable>
+            <el-table-column prop="administrator" label="生产方管理员" width="150" sortable>
             </el-table-column>
             <el-table-column prop="relateCompanyList" label="关联资产方" width="400" sortable>
                 <template slot-scope="scope">

ys_vue/src/views/map/map.vue

@@ -104,7 +104,7 @@
             this.$el.style.height = (window.innerHeight - 100) + "px";
             const that = this;
             window.onresize = function temp() {
-                this.$el.style.height = (window.innerHeight - 100) + "px";
+                that.$el.style.height = (window.innerHeight - 100) + "px";
             };
 
             //新地图

ys_vue/src/views/mold/moldDetail.vue

@@ -360,7 +360,7 @@
                                     v-if="approve == 1 && (scope.row.state == 0 || (scope.row.state == 1 && user.subordinateType == 1) || (scope.row.state == 2 && user.subordinateType == 0))" 
                                     >不通过</el-button>
                                 <el-button size="small" @click="showAdd(scope.row.id)" type="primary"
-                                    v-if="scope.row.uplodtorId == user.id && scope.row.state == 3">更新模具</el-button>
+                                    v-if="scope.row.uplodtorId == user.id && scope.row.state == 3 && moldDetail.equipmentNo != null">更新模具</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -745,14 +745,15 @@
 
             toAnotherMould(id){
                 //简单粗暴的方法到另一个模具详情
-                var currentRoute = this.$route.path.split("/");
-                if (currentRoute.length == 3 && currentRoute[1] == "moldList") {
-                    this.$router.go(0);
-                }
-                this.$router.replace('/moldList/' + id);
+                // var currentRoute = this.$route.path.split("/");
+                // if (currentRoute.length == 3 && currentRoute[1] == "moldList") {
+                //     this.$router.go(0);
+                // }
+                // this.$router.replace('/moldList/' + id);
+
                 //更加简单粗暴地方法
-                // this.detailId = id;
-                // this.getDetail();
+                this.detailId = id;
+                this.getDetail();
             },
 
             //标签页面切换时
@@ -1633,7 +1634,6 @@
             };
         },
         mounted() {
-            // this.getMsg();
             this.getDetail();
         }
     };

ys_vue/src/views/mold/moldList.vue

@@ -221,8 +221,8 @@
             };
         },
         methods: {
-            getMsg() {
-                //获取模具
+            //获取模具
+            getMoulds(){
                 this.http.post( this.port.base.moulds, {
                     belongCompanyId: this.user.companyId
                 },
@@ -243,6 +243,10 @@
                         type: "error"
                     });
                 });
+            },
+            getMsg() {
+                //获取模具
+                this.getMoulds();
                 //新版获取公司
                 this.http.post(this.port.base.relationList, {
                     companyType: 1
@@ -373,6 +377,7 @@
 
             //添加界面
             showAdd() {
+                this.getMoulds();
                 this.addFormVisible = true;
                 this.addForm = {
                     modelNo: "",

ys_vue/src/views/project/project.vue

@@ -114,7 +114,7 @@
                     ]
                 },
                 
-                addFormVisible: false,//新增界面是否显示
+                addFormVisible: false, //新增界面是否显示
 				addLoading: false,
 				//新增界面数据
 				addForm: {
@@ -126,7 +126,7 @@
 			}
 		},
 		methods: {
-            // 获取基础数据
+            //获取基础数据
             getMsg(){
                 this.http.post(this.port.project.getUserById, {
                     companyIds: this.user.companyId,
@@ -172,7 +172,12 @@
                     });
                 })
 
-                // 获取模具
+                //获取模具
+                this.getMoulds();
+            },
+
+            //获取模具
+            getMoulds(){
                 this.http.post(this.port.mold.modelList, {
                     parentId: this.user.parentId,
                     id: this.user.id
@@ -276,6 +281,8 @@
 
             //显示新增界面
 			handleAdd() {
+                //重新获取一下模具
+                this.getMoulds();
 				this.addFormVisible = true;
 				this.addForm = {
 					projectName: '',

ys_vue/src/views/project/projectDetail.vue

@@ -749,18 +749,15 @@
                             cName = "",
                             modelIds = "",
                             userIds = "";
-                        for(var i in this.editForm.customerCompany){
-                            if(cId.indexOf(this.editForm.customerCompany[i].id) == -1){
-                                cId += this.editForm.customerCompany[i].id + ",";
-                                cName += this.editForm.customerCompany[i].companyName + ",";
+                        for(var i in this.editForm.modelIds){
+                            if(cId.indexOf(this.editForm.modelIds[i].produceCompanyId) == -1){
+                                cId += this.editForm.modelIds[i].produceCompanyId + ",";
+                                cName += this.editForm.modelIds[i].produceCompanyName + ",";
                             }
+                            modelIds += this.editForm.modelIds[i].id + ","
                         }
                         cId = cId.substring(0,cId.length-1);
                         cName = cName.substring(0,cName.length-1);
-
-                        for(var i in this.editForm.modelIds){
-                            modelIds += this.editForm.modelIds[i].id + ","
-                        }
                         modelIds = modelIds.substring(0,modelIds.length-1);
 
                         // for(var i in this.editForm.assets){