From 4170d2ba3dfedb4816a8a2b0aac0d7b3c100068a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 09:24:40 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=97=AE=E7=AD=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue              |  4 +-
 .../components/questions-item.vue             | 68 ++++++++++++++
 .../personal/pages/my-questions/index.vue     | 91 +++++++++++++++++++
 src/router/index.js                           | 18 +++-
 4 files changed, 175 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/personal/pages/my-questions/components/questions-item.vue
 create mode 100644 src/pages/personal/pages/my-questions/index.vue

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index bed1dce20..07fafe8e4 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -473,8 +473,8 @@
               // },
               // {
               //   title: '我的问答',
-              //   path: '/questionsAndAnswers',
-              //   menuId: '8VKLZATQQG4NQHXV9UDS'
+              //   path: '/questions',
+              //   menuId: ''
               // },
               {
                 title: '我的板块',
diff --git a/src/pages/personal/pages/my-questions/components/questions-item.vue b/src/pages/personal/pages/my-questions/components/questions-item.vue
new file mode 100644
index 000000000..cbff2eb72
--- /dev/null
+++ b/src/pages/personal/pages/my-questions/components/questions-item.vue
@@ -0,0 +1,68 @@
+<!--问题项的描述-->
+<template>
+<div id="questions-item">
+   <div>
+     <div class="row">
+       <div class="item">
+         <span>{{question.modifyTime}}</span>
+       </div>
+       <div class="item"  style="padding-left: 10px;">
+         <span>{{ resType }}</span>
+       </div>
+     </div>
+     <div class="row" style="margin-top: 10px">
+        <div class="item">
+          <span>{{question.resCode}}</span>
+        </div>
+       <div class="item" style="padding-left: 10px">
+         <span>{{question.content}}</span>
+       </div>
+     </div>
+   </div>
+</div>
+</template>
+
+<script>
+export default {
+  name: "questions-item",
+  props: ['question'],
+  computed: {
+    resType() {
+      const matcher = {
+        INLAND_STAND: '国内标准',
+        FOREIGN_STAND: '国外标准',
+        FOREIGN_LAWS: '国内外政策',
+        BUSINESS: '企业标准'
+      }
+      return matcher[this.question.resType]
+    }
+  },
+  data(){
+    return{
+    }
+  },
+  watch:{
+    question: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        this.question = val
+      }
+    }
+  }
+};
+</script>
+
+<style lang="less" scoped>
+#questions-item{
+  width: 100%;
+  padding:10px 0;
+
+  .row {
+    line-height: 1.2;
+  }
+  .item {
+    display: inline-block;
+  }
+}
+</style>
diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue
new file mode 100644
index 000000000..32711a849
--- /dev/null
+++ b/src/pages/personal/pages/my-questions/index.vue
@@ -0,0 +1,91 @@
+<!--我的问答-->
+<template>
+<div id="my-questions">
+  <el-tabs
+    type="border-card"
+    style="height: 100%"
+    class="type-tabs"
+    tab-position="left"
+  >
+    <el-tab-pane label="我的提问">
+     <div style="height: 100%">
+       <el-tabs
+         class="question-tabs"
+         type="border-card"
+         style="height: 100%"
+         tab-position="left"
+       >
+         <template v-for="question in questionList">
+           <el-tab-pane :name="question.name">
+             <template slot="label">
+               <questonsItem :question="question"></questonsItem>
+             </template>
+           </el-tab-pane>
+
+         </template>
+       </el-tabs>
+     </div>
+    </el-tab-pane>
+    <el-tab-pane label="我的回答">
+      <div>
+
+      </div>
+    </el-tab-pane>
+  </el-tabs>
+</div>
+</template>
+
+<script>
+import questonsItem from './components/questions-item'
+export default {
+  name: "index",
+  components:{
+    questonsItem,
+  },
+  data(){
+    return{
+      questionList: [{
+        title: '问题1',
+        name: '1',
+        content: '问题1的内容',
+        resCode:'GB 17354-XXXX',
+        resType: 'FOREIGN_STAND',
+        modifyTime: '2022-03-14 14:40:42',
+      }, {
+        title: '问题2',
+        name: '2',
+        content: '问题2的内容',
+        resCode:'GB 14444-1',
+        resType: 'INLAND_STAND',
+        modifyTime: '2021-08-35 17:45:49',
+      }],
+    }
+  },
+};
+</script>
+
+<style lang="less" scoped>
+#my-questions{
+  height: 100%;
+  background: #F5F7FA;
+  margin-bottom: 10px;
+  .type-tabs{
+    /deep/.el-tabs__header {
+      margin-right: 0;
+    }
+  }
+  .question-tabs{
+    height: 100%;
+    /deep/.el-tabs__item{
+      height: 100%;
+    }
+  }
+  /deep/.el-tabs__content{
+    height: 100%;
+    padding: 0;
+  }
+  /deep/.el-tab-pane{
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index aba27e034..ac50a8a7f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -242,15 +242,25 @@ const routes = [
         }
       },
       {
-        path: '/questionsAndAnswers',
-        name: 'QuestionsAndAnswers',
-        component: resolve => require(['@/pages/personal/pages/questionsAndAnswers'], resolve),
+        path: '/questions',
+        name: 'MyQuestions',
+        component: resolve => require(['@/pages/personal/pages/my-questions'], resolve),
         meta: {
           requireAuth: true,
           title: '我的问答',
-          menuId: '8VKLZATQQG4NQHXV9UDS'
+          menuId: ''
         }
       }
+      // {
+      //   path: '/questionsAndAnswers',
+      //   name: 'QuestionsAndAnswers',
+      //   component: resolve => require(['@/pages/personal/pages/questionsAndAnswers'], resolve),
+      //   meta: {
+      //     requireAuth: true,
+      //     title: '我的问答',
+      //     menuId: '8VKLZATQQG4NQHXV9UDS'
+      //   }
+      // }
     ]
   },
   // **************************   流程中心   *******************************

From 51f76eb92975d31c4a73911bc54d5ca53efde8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 13:32:10 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E7=AB=8B=E9=A1=B9=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/qbzxdlx/step1.vue      | 60 +++++++++----------
 .../pages/creatProcess/qbzxdlx/step2.vue      |  1 -
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
index b8b0ad24e..2995bc6b1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
@@ -6,7 +6,6 @@
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-      <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
@@ -14,7 +13,7 @@
           <template slot="title">基础信息</template>
         </ProcessTitle>
           <el-form class="label-input-form prc-content-border" label-width="150px" ref="qblx_pageData" :model="qblx_pageData" :rules="qblxRule">
-            <el-form-item label="流程名称" class="add-form-item form-item-disabled">
+            <el-form-item label="流程名称" prop="processName" class="add-form-item form-item-disabled">
               <el-input
                 style="width: 90%"
                 clearable
@@ -75,9 +74,9 @@
           <el-table-column prop="drafterName" label="起草人" width="150" align="center"></el-table-column>
           <el-table-column prop="resPersonName" label="评审责任人" width="150" align="center"></el-table-column>
           <el-table-column prop="wgLeaderName" label="工作组组长" width="150" align="center"></el-table-column>
-          <el-table-column prop="draftTime" label="初稿完成日期" width="150" align="center"></el-table-column>
-          <el-table-column prop="releaseTime" label="标准发布时间"  width="150" align="center"></el-table-column>
-          <el-table-column prop="endTime" label="截止日期"  align="center"></el-table-column>
+          <el-table-column prop="draftTime" label="计划标准初稿完成时间" min-width="180" align="center"></el-table-column>
+          <el-table-column prop="releaseTime" label="计划标准发布时间"  width="150" align="center"></el-table-column>
+          <el-table-column prop="endTime" label="立项完成时间" min-width="150"  align="center"></el-table-column>
           <el-table-column label="操作" align="center" width="80" fixed="right">
             <template slot-scope="scope">
               <el-button size="mini" type="primary" @click="editRow('edit','编辑信息',scope.row)">编辑</el-button>
@@ -104,7 +103,6 @@
         <el-timeline>
           <el-form
             ref="roleForm"
-            :rules="roleFormRules"
             :model="roleForm"
             class="label-input-form">
             <el-timeline-item timestamp="起草" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
@@ -226,9 +224,10 @@
     </el-drawer>
     <!-- 选择工作组抽屉-->
     <el-drawer
+      class="drawer-table"
       title="选择工作组组长"
       :visible.sync="workModel"
-      size="900px"
+      size="600px"
       @close="closeWorkDrawer"
       custom-class="demo-drawer"
     >
@@ -415,18 +414,14 @@ export default {
         qblxData: [],
       },
       commentText: '',
-      qblxRule: {},
-
+      qblxRule: {
+        processName: [
+          {required: true, message:'请输入流程名称', trigger: 'blur'}
+        ]
+      },
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
-        dockUser: '',
-        dockUserName: '',
-      },
-      roleFormRules:{
-        dockUserName: [
-          {required: true, message: '请选择责任工程师', trigger: 'change'},
-        ],
       },
       // 上传路径
       uploadPath: 'api/att/attFile/uploadNew',
@@ -474,9 +469,9 @@ export default {
         // releaseTime: [
         //   {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
         // ],
-        // drafterName: [
-        //   {required: true, message: '请选择起草人', trigger: 'change'},
-        // ],
+        drafterName: [
+          {required: true, message: '请选择起草人', trigger: 'change'},
+        ],
       },
       isSubmit: false,
       saveLoading: false,
@@ -739,7 +734,6 @@ export default {
         this.qblx_pageData = mes.form ? mes.form : mes.qblx_pageData
         this.fileInfoList = mes.form ? mes.form.qblxFile :  mes.qblx_pageData.qblxFile
         this.commentText = mes.commentText
-        this.roleForm = mes.roleForm
       });
     },
 
@@ -803,14 +797,9 @@ export default {
     },
     // 选人组件确认
     drawerCheck(data) {
-      if(this.type === '1' ){
-        this.addQblxData.dutyPeopleId = data[0].id
-        this.addQblxData.dutyPeople = data[0].name
-      }else{
-        this.roleForm.dockUser = data[0].id
-        this.roleForm.dockUserName = data[0].name
-      }
-      this.modalshowflag = false
+     this.addQblxData.dutyPeopleId = data[0].id
+     this.addQblxData.dutyPeople = data[0].name
+     this.modalshowflag = false
     },
 
     /** 新增按钮 */
@@ -931,7 +920,6 @@ export default {
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "26");
       _formData.append("json", JSON.stringify({
-        roleForm: this.roleForm,
         qblx_pageData: this.qblx_pageData,
         commentText: this.commentText
       }));
@@ -944,15 +932,19 @@ export default {
       })
     },
     listSubmit (item) {
+      console.log(item);
       return new Promise((resolve, reject) => {
         let newForm = Object.assign(this.roleForm, item,this.qblx_pageData);
+        newForm.startUserName = this.$store.getters.userInfo.userName
+        newForm.startUser  = this.$store.getters.userInfo.userId
+        newForm.dockUser = item.drafter
+        newForm.dockUserName = item.drafterName
         this.$http.post('lawss/activiti/startProcessRollBack',{
           createUser: this.$store.getters.userInfo.userId,
           createUserName: this.$store.getters.userInfo.userName,
           type: '26',
           json: JSON.stringify({
             form: newForm,
-            roleForm: this.roleForm,
             commentText: this.commentText
           })
         },{
@@ -1130,6 +1122,14 @@ export default {
     height: calc(~'100% - 65px');
     overflow: auto;
   }
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+    /deep/.demo-drawer-content{
+      overflow-y: hidden;
+    }
+  }
 }
 
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index e9fc3c681..cc61b2324 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -917,7 +917,6 @@ export default {
           this.fileIds = itemId.id
           this.getFileInfo();
         });
-        console.log(item.area.join(','));
         this.type = item.type
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })

From f6ee1d2b1323334809dde403e3877707c9ef65d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 14:00:16 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/addEdit.vue         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index efaaec888..9a37a87be 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1540,17 +1540,17 @@ export default {
       }
       if (this.editRowData.ssrq === "-") {
         this.editRowData.ssrq = "";
-      } else if (this.editRowData.ssrq !== null && this.editRowData.ssrq !== "-" && this.editRowData.ssrq !== "") {
+      } else if (this.editRowData.ssrq&& this.editRowData.ssrq !== "-" ) {
         this.editRowData.ssrq = this.editRowData.ssrq.split(",");
       }
       if (this.editRowData.zccssrqgj === "-") {
         this.editRowData.zccssrqgj = "";
-      } else if (this.editRowData.zccssrqgj !== null && this.editRowData.zccssrqgj !== "-" && this.editRowData.zccssrqgj !== "") {
+      } else if (this.editRowData.zccssrqgj && this.editRowData.zccssrqgj !== "-") {
         this.editRowData.zccssrqgj = this.editRowData.zccssrqgj.split(",");
       }
       if (this.editRowData.xcxssrqgj === "-") {
         this.editRowData.xcxssrqgj = "";
-      } else if (this.editRowData.xcxssrqgj !== null && this.editRowData.xcxssrqgj !== "-" && this.editRowData.xcxssrqgj !== " ") {
+      } else if (this.editRowData.xcxssrqgj && this.editRowData.xcxssrqgj !== "-") {
         this.editRowData.xcxssrqgj = this.editRowData.xcxssrqgj.split(",");
       }
       this.drawerEdit = true;

From 661ffe72f4f9c59231bc5bed4b5df5712dca1d0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 14:13:36 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=9D=A1=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E5=B1=95=E7=A4=BA=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/addEdit.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 9a37a87be..5523daf8c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -2316,7 +2316,7 @@ export default {
         id: this.zqaId,
         types: '1',
         page: this.page,
-        Size: this.Size
+        Size: 1000,
       }, {
         _this: this
       }, res => {

From c66c7dc7d376344b3aca411cfbfadf2ab6e3cf65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 16:39:52 +0800
Subject: [PATCH 05/10] =?UTF-8?q?52674=20=E3=80=90=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=20=E9=A1=B9=E7=9B=AE=E7=BC=96=E5=8F=B7=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=90=8E=E9=9D=A2=E5=A4=9A=E4=B8=AA=E9=80=97?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step3.vue             | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index e53feb134..b52f9cbeb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -220,6 +220,7 @@
     </div>
     <!--    添加抽屉-->
     <el-drawer
+      class="drawer-table"
       title="添加项目"
       :visible.sync="projectModel"
       size="900px"
@@ -261,7 +262,7 @@
                 </el-form-item>
               </el-form>
             </div>
-            <div style="height: calc(100% - 65px); overflow: auto">
+            <div style="height: calc(100% - 65px); ">
               <div style="font-size: 16px; color: #FF7F50; padding-bottom: 10px; margin-left: 10px">
                 <p>如果各项目符合法规情况相同,可同时勾选,第一个勾选项目合规排查结果,将代表所有勾选项目合规排查结果。</p>
               </div>
@@ -584,8 +585,9 @@ export default {
             });
             //去掉字符串的最后一个逗号
             let dex = projectNumbers.lastIndexOf(",")
+            let name = projectNames.lastIndexOf(",")
             this.dataList.push({
-              projectName: projectNames,
+              projectName: projectNames.substring(0, name),
               projectNumber: projectNumbers.substring(0, dex),
               projectIds: projectIds,
               managementHostName: this.selectProjectList[0].managementHostName,
@@ -838,7 +840,14 @@ export default {
       }
     }
   }
-
+  .drawer-table{
+    /deep/.el-drawer__body{
+      overflow-y: hidden;
+    }
+    /deep/.demo-drawer-content{
+      overflow-y: hidden;
+    }
+  }
   .demo-drawer-content {
     margin-top: 10px;
   }

From 03377c95605d39c3a284a3d4303b8ee0c8f14db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 17:10:52 +0800
Subject: [PATCH 06/10] =?UTF-8?q?52709=20=E3=80=90=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=AD=97=E6=AE=B5=E5=BA=94=E8=AF=A5=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=20=E7=8E=B0=E5=9C=A8=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=9B=BD?=
 =?UTF-8?q?=E5=86=85=E6=98=AF=E6=9C=89=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzrk/step2.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index b442841bc..538ce48b2 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -112,7 +112,6 @@
             <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
               <el-input v-model="form.standSystem" disabled></el-input>
             </el-form-item>
-            <van-field label="标签" v-model="form.gxhbq" readonly placeholder="请输入标签" />
           </div>
           <ProcessTitle>
             <template slot="title">实施日期</template>

From 0eba391df3342876fa85c2ea34e7d519f055910b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Sat, 7 May 2022 17:31:44 +0800
Subject: [PATCH 07/10] =?UTF-8?q?52710=20=E3=80=90=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE=20=E7=82=B9=E5=87=BB=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzrk/step2.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 538ce48b2..ab8f1e6dd 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -845,8 +845,12 @@ export default {
     handleSave() {
     },
     handle1() {
-      this.formTongGuo.approvalOpinion = 1
-      this.handleSubmit()
+      if(this.formTongGuo.commentText){
+        this.formTongGuo.approvalOpinion = 1
+        this.handleSubmit()
+      }else{
+        this.$message.warning('请填写审批意见')
+      }
     },
     handle2() {
       this.formTongGuo.approvalOpinion = 0

From c7ba390b1de678b0da58a26130515beac900ecdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 10 May 2022 09:34:33 +0800
Subject: [PATCH 08/10] =?UTF-8?q?52695=20=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=20=E5=9B=9E=E6=89=A7=E8=AF=B4=E6=98=8E=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
index fd7326a58..537d668c7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
@@ -409,7 +409,7 @@ export default {
         }
         this.qbfsForm = item.qbfsForm || item;
         this.formLoading = false;
-        this.commentText = item.qbfsForm ? item.qbfsForm.commentText : ''
+        this.commentText = item.commentText
         this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
         this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
         this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;

From 26e9044117cb1728e311e1eaa26df8956ecc25c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 10 May 2022 10:07:28 +0800
Subject: [PATCH 09/10] =?UTF-8?q?52712=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=20=E6=89=B9=E5=87=86=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=20=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E5=90=8C?=
 =?UTF-8?q?=E6=84=8F=E5=90=8E=20=E9=80=82=E7=94=A8=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=9C=89=E4=B8=AA=E3=80=90=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index baa7a102e..fa40ff4bd 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3823,6 +3823,13 @@ export default {
             location['child2'] = []
           } else {
             const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
+            if(childList.length){
+              childList.forEach(item => {
+                if(item.value === "[]"){
+                  item.value = ''
+                }
+              })
+            }
             location['child2'] = childList
           }
         }

From aa7fd756e6a42e7277829228a26e33ac78d9f43b Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 10 May 2022 10:23:43 +0800
Subject: [PATCH 10/10] feat: There is no way the, bug #52726

---
 src/pages/home2/components/todoList/index.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue
index 45b47146d..77b06c4c5 100644
--- a/src/pages/home2/components/todoList/index.vue
+++ b/src/pages/home2/components/todoList/index.vue
@@ -39,12 +39,7 @@ export default {
   mounted() {this.queryProcess()},
   methods: {
       getPrcNameFilter(row){
-          if(row && row.prcType === 'buss3'){
-              return row.prcName + '-' + row.taskInfo
-          }else {
-              return row.prcName
-          }
-
+        return row.prcName
       },
     togo () {
       this.$router.push('/processCenter')