From b31b73570437cd2293dcd136e7a86479392a3358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 1 Apr 2022 13:59:52 +0800
Subject: [PATCH 1/5] =?UTF-8?q?52360=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=20=E6=A0=87=E5=87=86=E5=8F=B7=E4=B8=8E=E5=BA=93?=
 =?UTF-8?q?=E4=B8=AD=E9=87=8D=E5=A4=8D=E6=97=B6=EF=BC=8C=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E7=BB=99=E4=B8=AA=E6=8F=90=E7=A4=BA=E5=8F=8A=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A3=80=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue            |  2 +-
 .../domesticStandardsAndRegulations/index.vue    | 16 +++++++++-------
 .../foreignStandardsAndRegulations/index.vue     | 16 +++++++++-------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 68f61c1c4..a055c31d3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -43,7 +43,7 @@
                 </el-form-item>
                 <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                   <el-input
-                    v-model="form.standNumber"
+                    v-model.trim="form.standNumber"
                     placeholder="请输入标准编号"
                     clearable
                   ></el-input>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index be81bde45..73b1d4b6f 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4618,13 +4618,15 @@ export default {
         }
       }
      if(item){
-       if(item.advanceSearchVOStr.length){
-         advanceSearchVOList.push({
-           connect: item.advanceSearchVOStr[0].connect,
-           field: item.advanceSearchVOStr[0].field,
-           type: item.advanceSearchVOStr[0].type,
-           value: item.advanceSearchVOStr[0].value,
-         })
+       if(item.advanceSearchVOStr){
+         if(item.advanceSearchVOStr.length){
+           advanceSearchVOList.push({
+             connect: item.advanceSearchVOStr[0].connect,
+             field: item.advanceSearchVOStr[0].field,
+             type: item.advanceSearchVOStr[0].type,
+             value: item.advanceSearchVOStr[0].value,
+           })
+         }
        }
      }
       formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 825560ead..5a82cc79c 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -3976,13 +3976,15 @@ export default {
 
       }
       if(item){
-        if(item.advanceSearchVOStr.length){
-          advanceSearchVOList.push({
-            connect: item.advanceSearchVOStr[0].connect,
-            field: item.advanceSearchVOStr[0].field,
-            type: item.advanceSearchVOStr[0].type,
-            value: item.advanceSearchVOStr[0].value,
-          })
+        if(item.advanceSearchVOStr){
+          if(item.advanceSearchVOStr.length){
+            advanceSearchVOList.push({
+              connect: item.advanceSearchVOStr[0].connect,
+              field: item.advanceSearchVOStr[0].field,
+              type: item.advanceSearchVOStr[0].type,
+              value: item.advanceSearchVOStr[0].value,
+            })
+          }
         }
       }
       formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)

From 2ff46a3e512c0c110c0d66181e89fdff38e2782e Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Fri, 1 Apr 2022 14:23:08 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2051963=20=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E5=BA=93=E7=BC=96=E8=BE=91=E7=9A=84=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BA=BA=E5=91=98=E6=98=AF=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E6=A1=86=E5=90=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue | 55 +++++++++++++++++--
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index e82071769..4720b184e 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -764,6 +764,17 @@
                       :disabled="true"
                     ></custom-input>
                   </template>
+                  <template v-else-if="field.attrField === 'WJSCRYBUSS'">
+                    <el-form-item
+                      prop="WJSCRYBUSS"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">文件上传人员</template>
+                      <el-input v-model="sarBussionessStandEO[field.attrField]" :title="sarBussionessStandEO[field.attrField]" placeholder="选择文件上传人员" @click.native="choiceWJSCRY('WJSCRYBUSS', '选择文件上传人员', sarBussionessStandEO[field.attrField])">
+                      </el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else>
                     <custom-input
                       :config="field"
@@ -1475,7 +1486,12 @@
       @checkedRole="checkedRole2"
       :nodeList="nodeList2"
     ></Role-tree>
-
+    <Role-tree
+      :is-title="drawerTitle"
+      :is-visible.sync="modalShowRoleFlag1"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList3"
+    ></Role-tree>
     <Mechanism-tree
       is-title="选择部门信息"
       :is-visible.sync="modalshowflagZRBM"
@@ -2358,8 +2374,10 @@ export default {
       drawerTitle4: '',
       drawerTitle2: '',
       modalShowRoleFlag: false,
+      modalShowRoleFlag1: false,
       nodeList: [],
       nodeList2: [],
+      nodeList3: [],
       nodeListZRBM: [],
       modalshowflagZRBM: false,
       addOrUPdateFlag: 1, // 新增：1， 修改：2
@@ -3625,6 +3643,24 @@ export default {
       this.drawerTitle = title
       this.modalShowRoleFlag = true
     },
+    choiceWJSCRY(type, title, nameId) {
+      this.nodeList3 = []
+      if (nameId) {
+        let nameId1 = nameId.split(',')
+        let idList = []
+        nameId1.forEach(item => {
+          let a, b
+          a = item.substring(item.indexOf('(') +1)
+          b = a.substring(0, a.lastIndexOf(')'))
+          idList.push(b)
+        })
+        idList = idList.join(',')
+        this.nodeList3 = idList.split(',')
+      }
+      this.userType = type
+      this.drawerTitle = title
+      this.modalShowRoleFlag1 = true
+    },
     checkedRole2(data) {
       let idList = ''
       let nameList = ''
@@ -3645,10 +3681,19 @@ export default {
       if (this.drawerTitle === '查询起草人') {
         this.sarBussionessSearch['QCRBUSS'] = nameList
       }
-      this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
-      if (this.sarBussionessStandEO.QCRBUSS) {
-        this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
+      if (this.drawerTitle === '选择起草人') {
+        this.$set(this.sarBussionessStandEO, 'QCRBUSS', nameList)
+        if (this.sarBussionessStandEO.QCRBUSS) {
+          this.$refs.sarBussionessStandForm.validateField('QCRBUSS')
+        }
       }
+      if (this.drawerTitle === '选择文件上传人员') {
+        this.$set(this.sarBussionessStandEO, 'WJSCRYBUSS', nameList)
+        if (this.sarBussionessStandEO.WJSCRYBUSS) {
+          this.$refs.sarBussionessStandForm.validateField('WJSCRYBUSS')
+        }
+      }
+
       // this.sarBussionessStandEO['QCRBUSS'] = nameList
     },
     choiceQCDW(type, title, id) {
@@ -4603,7 +4648,7 @@ export default {
               this.OCRData = res.data
             } else {
               this.$message.warning('当前标准没有' + text + '文件')
-              this.this.OCRData = []
+              this.OCRData = []
             }
           }
         })

From 622e177fc8d59706ede4a37e1c28c8cb4dcc3f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 1 Apr 2022 14:27:42 +0800
Subject: [PATCH 3/5] =?UTF-8?q?52369=20=E6=A0=87=E5=87=86=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E8=A2=AB?=
 =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=EF=BC=8C=E4=BF=9D=E5=AD=98=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E7=84=B6=E5=90=8E=E5=88=A0=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=88=97=E8=A1=A8=E8=BF=98=E6=98=AF?=
 =?UTF-8?q?=E6=9C=89=E4=B8=A4=E4=B8=AA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzpg/step1.vue   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index 5238e9904..f40f73e50 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -698,11 +698,15 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      item.commentText = ''
       this.$nextTick(() => {
         if(item.form){
           this.hisListForm = JSON.parse(JSON.stringify(item.form))
           this.listForm = JSON.parse(JSON.stringify(item.form))
+          if(item.taskInfo === '被驳回之后的保存'){
+            this.commentText = item.commentText
+          }else{
+            this.commentText = ''
+          }
           this.listForm.prcNum = this.prcNum
           this.listForm.prcName = this.prcName
           this.listForm['id'] = item.id
@@ -920,7 +924,7 @@ export default {
         _formData.append("taskIds", this.taskIds);
         _formData.append("prcType", "5");
         _formData.append("json", JSON.stringify({
-          taskInfo: "选择已拆分标准",
+          taskInfo: "被驳回之后的保存",
           form: this.listForm,
           roleForm: this.roleForm,
           commentText: this.commentText
@@ -1020,7 +1024,8 @@ export default {
                         commentText: this.commentText
                       }
                     };
-                    let json = this.hisListForm
+                    this.listForm.dataList = this.dataList
+                    let json = this.listForm
                     this.$http.post("lawss/activiti/completeTaskNew", {
                       taskIds: this.$route.query.taskIds,
                       userId: this.$store.getters.userInfo.userId,

From 70eef8805d694f6fc94e600a5f2ca59b507c6f88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 1 Apr 2022 14:38:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?52361=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B-=E9=99=84=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E8=A1=8C=E9=97=B4=E8=B7=9D=E5=8F=98=E7=AA=84=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a055c31d3..2f90ea679 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -289,7 +289,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%; line-height: 40px">
                       <div v-for="(item,index) in xgdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -314,7 +314,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in FBGBJBDFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -339,7 +339,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%; line-height: 40px">
                       <div v-for="(item,index) in ssgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -364,7 +364,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in caFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -389,7 +389,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in zbjbdFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -416,7 +416,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -441,7 +441,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in kwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -468,7 +468,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in jdwjFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -493,7 +493,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in bpgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>
@@ -518,7 +518,7 @@
                     clearable
                   ></el-input>
                   <div style="display: flex;justify-content: space-between">
-                    <div style="width: 80%;">
+                    <div style="width: 80%;line-height: 40px">
                       <div v-for="(item,index) in zqyjgFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">
                         {{ item.name }}
                       </div>

From f3825a985fe7805c85e3e5a29c3bb7412adcee00 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Fri, 1 Apr 2022 14:47:24 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052281=20=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E8=B5=B7=E8=8D=89-=E6=B7=BB=E5=8A=A0=EF=BC=8C?=
 =?UTF-8?q?=E6=BB=91=E5=8A=A8=E5=88=B0=E6=9C=80=E4=BD=8E=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/wfhxzg/step1.vue        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index b8247fcd3..89aafdb4f 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -741,7 +741,7 @@ export default {
 
 .wfhxzgStep1 {
   /deep/ .el-table--scrollable-y .el-table__body-wrapper {
-    height: calc(100% - 57px) !important;
+    // height: calc(100% - 57px) !important;
   }
 
   /deep/ .el-drawer__container {
@@ -805,3 +805,19 @@ export default {
   }
 }
 </style>
+<style lang="less">
+  .wfhxzgStep1 {
+    .el-drawer__container {
+   
+    }
+    /*.el-table{*/
+    /*  overflow: auto;*/
+    /*}*/
+    /*.el-table__body-wrapper{*/
+    /*  overflow:visible;*/
+    /*}*/
+    /*.el-table::after{*/
+    /*  position: relative;*/
+    /*}*/
+  }
+</style>