Merge branch 'master' into test-dev

src/router/views/index.js

@@ -238,7 +238,22 @@ export default [{
             component: () =>
                 import ( /* webpackChunkName: "views" */ '@/views/manager/contractinfo/detail')
         }]
-    }, {
+    },
+    {
+        path: '/contract',
+        component: Layout,
+        redirect: '/contract/detail1',
+        children: [{
+            path: 'detail1',
+            name: '编辑合同段',
+            meta: {
+                i18n: 'edit'
+            },
+            component: () =>
+                import ( /* webpackChunkName: "views" */ '@/views/manager/contractinfo/detail')
+        }]
+    },
+     {
         path: '/excel',
         component: Layout,
         redirect: '/excel/excelmodel',

src/views/manager/projectinfo/editElement/editElement.vue

@@ -545,8 +545,8 @@ export default {
           message: '已取消删除'
         });
       });
-      _that.$refs.cascader.clearCheckedNodes()
-      _that.AddNewElementField = ''
+            _that.$refs.cascader.clearCheckedNodes()
+            _that.AddNewElementField = ''
     },
     getInformation2 (a, b, c) {
       if (this.AddNewElementField) {

src/views/manager/projectinfo/list.vue

@@ -243,7 +243,7 @@ export default {
     },
     editContract (item) {
       this.$router.push({
-        path: '/contract/detail',
+        path: '/contract/detail1',
         query: {
           pid: item.pid,
           cid: item.id,

src/views/manager/projectinfo/treeTemplate/template/electronicSignature.vue

@@ -114,12 +114,12 @@
           <table @click class="table martop20 copyTable" width='100%' border='1px ' bordercolor="#E5E5E5" cellpadding='2px'>
             <thead cellpadding='2px' height='40px'>
             <tr>
-              <th width='30%'>元素位置</th>
-              <th width='30%'>签字岗位</th>
-              <th width='30%'>签字时间元素位置</th>
-              <th width='10%'>偏移x</th>
-              <th width='10%'>偏移y</th>
-              <th width='20%'>操作</th>
+              <th >元素位置</th>
+              <th>签字岗位</th>
+              <th>签字时间元素位置</th>
+              <th >偏移x</th>
+              <th>偏移y</th>
+              <th >操作</th>
             </tr>
             </thead>
             <tbody height='36px'>