Merge remote-tracking branch 'origin/develop' into develop

src/App.vue

@@ -341,7 +341,6 @@ export default {
   //background: url('~@/assets/images/shangqi/home/BG.png') no-repeat;
   background-size: 100% 100%;
   font-family: MicrosoftYaHei, 微软雅黑;
-
   & > div {
     position: absolute;
     top: 0;

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -90,7 +90,7 @@
                 </el-button>
             </div>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -623,6 +623,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             PLedit () {
                 if (this.zrIdList.length > 0) {
                     this.PLmodalType = 2
@@ -1114,6 +1119,7 @@
             }
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
             }, res => {

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -130,7 +130,7 @@
         <template slot="title">拆分信息</template>
       </ProcessTitle>
       <el-table border
-                ref="selection"
+                ref="filterTable"
                 :data="itemList"
                 tooltip-effect="dark"
                 style="width: 100%;"
@@ -393,6 +393,11 @@ export default {
     ProcessTitle
   },
   methods: {
+    handleResize() {
+      this.$nextTick(()=> {
+        this.$refs.filterTable.doLayout();
+      });
+    },
     getBDList () {
       this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
         standHisId: this.oldNumber,
@@ -515,6 +520,7 @@ export default {
     },
   },
   mounted () {
+    window.addEventListener('resize', this.handleResize);
     this.getHistoryData()
     this.getData()
   }

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -91,7 +91,7 @@
         </el-button>
       </div>
       <el-table border
-                ref="selection"
+                ref="filterTable"
                 :data="itemList"
                 tooltip-effect="dark"
                 style="width: 100%;"
@@ -637,6 +637,11 @@ export default {
     ProcessTitle
   },
   methods: {
+    handleResize() {
+      this.$nextTick(()=> {
+        this.$refs.filterTable.doLayout();
+      });
+    },
     PLedit () {
       if (this.zrIdList.length > 0) {
         this.PLmodalType = 2
@@ -1136,6 +1141,7 @@ export default {
     }
   },
   mounted() {
+    window.addEventListener('resize', this.handleResize);
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -69,7 +69,7 @@
                 <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
             </div>
             <el-table border
-                      ref="selections"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -323,6 +323,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             handleTransfer() {
                 this.drawerModal = true
             },
@@ -515,6 +520,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -69,7 +69,7 @@
                 <el-button  type="primary" :disabled="acceptShow && !itemList.length" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
             </div>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -543,6 +543,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             getBDList () {
                 this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
                     standHisId: this.oldNumber,
@@ -902,6 +907,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

src/pages/processCenter/pages/creatProcess/bzjd/step4.vue

@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -344,6 +344,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
@@ -501,6 +506,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -350,6 +350,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
@@ -489,6 +494,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -66,7 +66,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <el-table border
-                      ref="selection"
+                      ref="filterTable"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -348,6 +348,11 @@
             ProcessTitle
         },
         methods: {
+            handleResize() {
+                this.$nextTick(()=> {
+                    this.$refs.filterTable.doLayout();
+                });
+            },
             checkBD (id,id2,itemsNum) {
                 let itemsEoPage = {
                     oldItemId: id,
@@ -487,6 +492,7 @@
             },
         },
         mounted () {
+            window.addEventListener('resize', this.handleResize);
             this.getHistoryData()
             this.getData()
         }

src/sysConfig/index.js

@@ -6,11 +6,11 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-// const devIp = '192.168.10.248'
+const devIp = '192.168.10.6'
 // const devIp = '62.234.136.153'
-// const devInterfacePORT = '8033'
+const devInterfacePORT = '9999'
-const devIp = '10.19.11.243'
+// const devIp = '10.19.11.243'
-const devInterfacePORT = '4304'
+// const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='