From e42f9daf509c45da5d4abfa4fdf6bd8c790ef1a3 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 23 Aug 2022 11:03:18 +0800
Subject: [PATCH 1/6] 56789

---
 .../pages/creatProcess/qbzxdjhgk/component/rename.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
index 901b0228e..a7e65ac1f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
@@ -42,8 +42,8 @@
             </el-form-item>
             <el-form-item prop="reviseStatus"  label="制修订类型" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
               <el-select :disabled="disabledXX"  disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
-                <el-option label="制定" value="制定"></el-option>
-                <el-option label="修订" value="修订"></el-option>
+                <el-option label="制定" value="1"></el-option>
+                <el-option label="修订" value="2"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -219,8 +219,8 @@
                 </el-form-item>
                 <el-form-item label="制修订类型" class="search-item search-item-last">
                   <el-select :disabled="disabledXX"  v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
-                    <el-option label="制定" value="制定"></el-option>
-                    <el-option label="修订" value="修订"></el-option>
+                    <el-option label="制定" value="1"></el-option>
+                    <el-option label="修订" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">

From d7355aeb87bb095f1b1573e293ed702b48a0d9ea Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 23 Aug 2022 14:27:11 +0800
Subject: [PATCH 2/6] 57015

---
 src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
index 1390d70fe..4ee21b81f 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
@@ -6,7 +6,7 @@
                     <el-form-item label="计划状态" class="search-item">
                         <el-select v-model="form.planStatus" placeholder="请选择计划状态">
                             <el-option label="请选择" value=""></el-option>
-                            <el-option label="未开始" value="0"></el-option>
+<!--                            <el-option label="未开始" value="0"></el-option>-->
                             <el-option label="制定中" value="1"></el-option>
                             <el-option label="修订中" value="2"></el-option>
                             <el-option label="已取消" value="3"></el-option>

From 901efa3edd8eeb10eb4b91f4e3438221039396ac Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Tue, 23 Aug 2022 14:59:55 +0800
Subject: [PATCH 3/6] 57011

---
 src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index edf2f57ed..7addb1936 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -83,11 +83,13 @@
               prop="itermsConditions"
               label="条款内容"
               fixed="left"
-              show-overflow-tooltip
               :resizable="false"
               align="center">
               <template slot-scope="scope">
-                <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
+                <el-tooltip placement="top">
+                  <div slot="content">{{scope.row.itermsConditions}}</div>
+                  <div class="itemsText" @click="itemsTextDialog(scope.row.itemsNum, scope.row.itermsConditions)">{{ scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
+                </el-tooltip>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="50" :resizable="false" fixed="right">

From fe5828ad2aacc29d2745d3bf3071be4b977654a9 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Wed, 24 Aug 2022 14:06:37 +0800
Subject: [PATCH 4/6] 57017

---
 src/pages/config/pages/mechanismManage/pages/mechanism.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
index 652e418dc..7b0ed7bb2 100644
--- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue
+++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
@@ -457,6 +457,7 @@ export default {
         current: this.page,
         size: this.pageSize,
         uname: this.searchForm.uname,
+        institutionId: this.id,
         email: this.searchForm.email
       }, {
         _this: this,

From 465e4c2eaee43de694f8a93e9d653e14a81d6375 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 25 Aug 2022 11:19:46 +0800
Subject: [PATCH 5/6] 57017

---
 .../pages/mechanismManage/pages/mechanism.vue | 19 ++++++++++++-------
 src/sysConfig/index.js                        |  6 ++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/pages/mechanism.vue b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
index 7b0ed7bb2..9c570751a 100644
--- a/src/pages/config/pages/mechanismManage/pages/mechanism.vue
+++ b/src/pages/config/pages/mechanismManage/pages/mechanism.vue
@@ -172,6 +172,7 @@
                     <el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">
                       禁用
                     </el-dropdown-item>
+
                     <el-dropdown-item v-btn-permission="'ce2d2b9bb8004e0d9efcabc42a9f354d'" :command="[scope.row, '配置岗位']">
                       配置岗位
                     </el-dropdown-item>
@@ -228,7 +229,7 @@
         :expand-on-click-node="false"
         show-checkbox>
       </el-tree>
-      <pagination :page="page" :pageSize="pageSize" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
+      <pagination :page="page1" :pageSize="pageSize1" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
       <div id="roleFormButton" class="demo-drawer-footer">
         <el-button
           size="mini"
@@ -277,6 +278,8 @@ export default {
       total: 0,
       total2: 0,
       pageSize: this.$store.getters.userInfo.configContent,
+      page1:1,
+      pageSize1:20,
       sideClose: false,
       data: [], // table数据
       treeLoading: false,
@@ -298,6 +301,7 @@ export default {
     },
     resetFormPost() {
       this.modalPost = false
+      this.page1 = 1
     },
     PostSubmit() {
       if (this.drawerTitle === '配置岗位') {
@@ -350,8 +354,8 @@ export default {
 
     getTree2() {
       this.$http.get('sarPosition/position', {
-        current: this.page,
-        pageSize: this.pageSize,
+        current: this.page1,
+        pageSize: this.pageSize1,
         ...this.sarPost,
       }, {
         _this: this,
@@ -368,6 +372,7 @@ export default {
       })
       this.nodeList = arr
       this.modalPost = true
+      this.getTree2()
     },
     disableFlagEdit(row, type) {
       let json = {}
@@ -519,12 +524,12 @@ export default {
         this.getDatas()
       }
     },
-    pageChange2(page) {
-      this.page = page
+    pageChange2(page1) {
+      this.page1 = page1
       this.getTree2()
     },
-    pageSizeChange2(pageSize) {
-      this.pageSize = pageSize
+    pageSizeChange2(pageSize1) {
+      this.pageSize1 = pageSize1
       this.getTree2()
     },
 
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index a6096515a..6413e98b5 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -8,8 +8,10 @@
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.1.42'
 // const devInterfacePORT = '9999'
-const devIp = '39.98.140.126'
-const devInterfacePORT = '4201'
+const devIp = 'localhost'
+const devInterfacePORT = '10086'
+// const devIp = '39.98.140.126'
+// const devInterfacePORT = '4201'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证

From 579ba310b49fd7024ed04925000d95754796e7b1 Mon Sep 17 00:00:00 2001
From: zhangjun <879913833@qq.com>
Date: Thu, 25 Aug 2022 12:24:42 +0800
Subject: [PATCH 6/6] 56789

---
 .../pages/creatProcess/qbzxdjhgk/component/cancel.vue         | 4 ++--
 .../pages/creatProcess/qbzxdjhgk/component/delay.vue          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
index d92de47d4..dbad7223a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
@@ -212,8 +212,8 @@
                 </el-form-item>
                 <el-form-item label="制修订类型" class="search-item search-item-last">
                   <el-select :disabled="disabledXX"  v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
-                    <el-option label="制定" value="制定"></el-option>
-                    <el-option label="修订" value="修订"></el-option>
+                    <el-option label="制定" value="1"></el-option>
+                    <el-option label="修订" value="2"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
index eeb1fcd78..47e1ded37 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
@@ -228,8 +228,8 @@
                </el-form-item>
                <el-form-item label="制修订类型" class="search-item search-item-last">
                  <el-select  v-model="standardSearch.reviseStatus" placeholder="请选择制修订类型">
-                   <el-option label="制定" value="制定"></el-option>
-                   <el-option label="修订" value="修订"></el-option>
+                   <el-option label="制定" value="1"></el-option>
+                   <el-option label="修订" value="2"></el-option>
                  </el-select>
                </el-form-item>
                <el-form-item class="search-item btn-box">