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

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/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: "",