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

ys_vue/src/views/Home.vue

@@ -305,7 +305,10 @@ export default {
       //消息数据
       popoverData: ["", "", ""],
       unreadCount: [],
-      activePage: 0
+      activePage: 0,
+
+      //时间
+      activeDate: new Date()
     };
   },
   methods: {
@@ -497,6 +500,11 @@ export default {
           });
         }
       );
+      //本页面再点的话强制转移一下
+      var currentRoute = this.$route.path.split("/");
+      if (currentRoute.length == 3 && currentRoute[1] == "moldList") {
+        this.$router.go(0);
+      }
       if (type == 0) {
         //审批 跳转到模具详情
         this.$router.push("/moldList/" + refid);
@@ -689,7 +697,7 @@ export default {
   border-bottom: 1px #eee solid;
 }
 
-.popover-item > p {
+.popover-item > div > p {
   margin: 0;
   line-height: 18px;
 }

ys_vue/src/views/base/allocation.vue

@@ -47,7 +47,7 @@
             <el-table-column label="操作" align="center" width="160" sortable>
                 <template slot-scope="scope">
                     <el-button size="small" type="primary" @click="openEnable(scope.$index)" :disabled="scope.row.isUse == 1">启用</el-button>
-                    <el-button size="small" @click="showEdit(scope.$index, scope.row)">修改</el-button>
+                    <el-button size="small" @click="showEdit(scope.$index, scope.row, scope.row.isUse == 1)">修改</el-button>
                     <!-- <el-button type="danger" size="small">删除</el-button> -->
                 </template>
             </el-table-column>
@@ -143,6 +143,7 @@
                         clearable
                         placeholder="请选择所属公司"
                         style="width: 202px"
+                        :disabled="newAllocation.usage"
                     >
                         <el-option
                         v-for="item in companies"
@@ -207,7 +208,8 @@
                     equipmentName: "", //设备名称
                     id: "", //设备id
                     belongCompanyId: "", //所属公司ID
-                    agent: "" //代理商
+                    agent: "", //代理商
+                    usage: true //是否可以修改公司
                 },
                 filters: {
                     keyName: "",
@@ -370,14 +372,15 @@
             },
 
              //修改界面
-            showEdit(index, row) {
+            showEdit(index, row, usageBoolean) {
                 this.editFormVisible = true;
                 this.newAllocation = {
                     id: row.id,
                     useLife: row.useLife,
                     equipmentNo: row.equipmentNo,
                     belongCompanyId: row.belongCompanyId,
-                    agent: row.agent
+                    agent: row.agent,
+                    usage: usageBoolean
                 };
             },
 

ys_vue/src/views/project/competence.vue

@@ -30,7 +30,7 @@
 			</el-table-column>
 			<el-table-column prop="projectName" label="项目名称" width="220" sortable>
 			</el-table-column>
-			<el-table-column prop="addr" label="修改" align="center" width="150">
+			<el-table-column prop="addr" label="上传" align="center" width="150">
                 <template slot-scope="scope">
                     <el-checkbox :value="scope.row.update==1?true:false"></el-checkbox>
                 </template>