From 8c93cab88e0772fe41544a6f6b657589faacf397 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 13 Jul 2021 09:52:09 +0800
Subject: [PATCH 01/25] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherStandardDetails/index.vue            | 2 +-
 .../domesticStandardsAndRegulations/index.vue               | 6 +++---
 .../foreignStandardsAndRegulations/index.vue                | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 5ae4c2ef4..347e22d9a 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -243,7 +243,7 @@
                   <!--发布稿、增补件单独设置下载权限-->
                   <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
                   || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
-                  || child.attrField === 'JDWJ'">
+                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
                     <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
                     <i
                         title="下载"
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 42a67b79e..56a681489 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -159,7 +159,6 @@
             </el-table-column>
             <el-table-column
               label="标准号"
-              width="200px"
             >
               <template slot-scope="scope">
                 <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
@@ -169,7 +168,6 @@
             <el-table-column
               prop="standName"
               label="标准名称"
-              width="250px"
             >
               <template slot-scope="scope">
                 <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -178,7 +176,7 @@
             <el-table-column
               prop="issueTime"
               sortable="custom"
-              width="170px"
+              width="110px"
               label="发布日期">
               <template slot-scope="scope">
                 {{ formatIssueDate(scope.row.issueTime) }}
@@ -187,6 +185,7 @@
             <el-table-column
               prop="xcxssrq"
               sortable="custom"
+              width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
                 <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -195,6 +194,7 @@
             <el-table-column
               prop="zccssrq"
               sortable="custom"
+              width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
                 <span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 3e3c6a765..eea98e0e4 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -3846,7 +3846,7 @@ export default {
   position: relative;
   .tree-content {
     background: #fff;
-    width: 16%;
+    width: 20%;
     position: relative;
     .tree {
       width: calc(~'100% - 15px');

From 301a41576551b41efcc1cf0b5fc894b704e10248 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, 13 Jul 2021 10:29:00 +0800
Subject: [PATCH 02/25] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8F=8A=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home1/components/todoList/index.vue |   6 +-
 src/pages/localTool/standAutoSplit/index.vue  |   2 -
 .../pages/creatProcess/xmpg/step1.vue         | 281 +++++-----
 .../pages/creatProcess/xmpg/step2.vue         |  65 ++-
 .../pages/creatProcess/xmpg/step3.vue         | 303 +++++++----
 .../pages/creatProcess/xmpg/step4.vue         | 512 +++++++++++++++++-
 .../tabComponents/processCenter/index.vue     |  15 +-
 .../page/listOfCountries.vue                  |   2 +-
 .../page/listOther.vue                        |  12 +-
 .../domesticStandardsAndRegulations/index.vue |   2 +-
 .../nonConfomity/pages/businessDivision.vue   |   2 +-
 src/sysConfig/index.js                        |   2 +-
 12 files changed, 917 insertions(+), 287 deletions(-)

diff --git a/src/pages/home1/components/todoList/index.vue b/src/pages/home1/components/todoList/index.vue
index c0ffaa12a..bb698179b 100644
--- a/src/pages/home1/components/todoList/index.vue
+++ b/src/pages/home1/components/todoList/index.vue
@@ -50,7 +50,7 @@ export default {
       this.$router.push(this.path)
     },
     dealWith (row) { // 办理
-      // this.setHandleInfo(JSON.stringify(row))
+      this.setHandleInfo(JSON.stringify(row))
       const prcType = row.prcType
       switch(prcType) {
         case '1':
@@ -152,9 +152,9 @@ export default {
           break;
           //项目合规评估流程
         case '5' :
-          if(row.taskInfo === ''){
+          if(row.taskInfo === '标准法规部业务经理审批'){
             this.$router.push({
-              name: '',
+              name: 'xmpgStep2',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 018032f77..47f871530 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -29,8 +29,6 @@
     <div class="content">
       <div class="action-bar">
         <el-button size="mini"  @click="spiltStandFile" v-btn-permission="''"><i class="iconfont"></i>拆分</el-button>
-        <el-button size="mini"  @click="clickButtonToUpload" v-btn-permission="''"><i class="iconfont">&#xe65d;</i>上传</el-button>
-        <el-button size="mini"  @click="clickButtonToImport" v-btn-permission="''"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button>
         <el-button size="mini"  @click="batchDelete" v-btn-permission="''"><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
       <div class="table-wrap">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index a4d847af7..d0a06cde7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -44,15 +44,16 @@
                   v-model="listForm.certifiedEngineer"
                   placeholder="请选择认证工程师"
                   clearable
-                  @click.native="choiceZRR('certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
+                  @click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
                 ></el-input>
+                <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
               </el-form-item>
               <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.qualityEngineer"
                   placeholder="请选择质量工程师"
                   clearable
-                  @click.native="choiceZRR('qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
+                  @click.native="choiceZRR(null,'qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -63,8 +64,8 @@
         </process-title>
         <div class="tableTitle">
           <div class="tableButton">
-            <el-button plain class="common-button-primary" size="mini"  @click="addList">新增</el-button>
-            <el-button plain class="common-button-primary" size="mini"  @click="addList">批量删除</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="addList">批量删除</el-button>
           </div>
         </div>
         <el-table
@@ -89,14 +90,16 @@
             prop="uname"
             label="产品线责任人">
           </el-table-column>
-<!--          distribute-->
           <el-table-column
-            prop="ministerUser"
+            prop="distributePerson"
             label="分发责任人">
-            <template slot-scope="scope">
-              <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-              <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
-                        @click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>
+            <template slot-scope="scope,text" v-if="showColumn">
+              <div>
+                <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
+                  {{listForm.dataList[scope.$index].distributePerson==null?"请选择分发负责人":listForm.dataList[scope.$index].distributePerson}}
+                </div>
+              </div>
+
             </template>
           </el-table-column>
         </el-table>
@@ -128,60 +131,12 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.dockUserName" placeholder="选择业务经理"
-                              @click.native="choiceZRR('dockUser', '选择业务经理', roleForm.dockUser)">
+                              @click.native="choiceZRR(null,'dockUser', '选择业务经理', roleForm.dockUser)">
                     </el-input>
                   </div>
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="分发责任人进行任务分发" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
-                              @click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="责任人填写评估反馈" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="责任人"
-                              @click.native="choiceZRR('directorUser', '选择责任人', roleForm.directorUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="分发责任人进行任务分发" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"
-                              @click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="产品线责任人审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>产品线责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" placeholder="产品线责任人" ></el-input>
-<!--                    <el-input v-model="roleForm.directorUserName" placeholder="责任人"-->
-<!--                              @click.native="choiceZRR('directorUser', '选择分发责任人', roleForm.directorUser)"></el-input>-->
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
             <el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="directorUserName" style="margin-bottom: 0">
@@ -189,7 +144,7 @@
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
                     <el-input v-model="roleForm.directorUserName" placeholder="请选择标准法规部领导"
-                              @click.native="choiceZRR('directorUser', '选择标准法规部领导', roleForm.directorUser)"></el-input>
+                              @click.native="choiceZRR(null,'directorUser', '选择标准法规部领导', roleForm.directorUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -229,8 +184,11 @@
                 fixed="left"
                 label="标准号">
                 <template slot-scope="scope">
-                  <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
-                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+                  <a v-if="scope.row.standYear" class="table-jump"
+                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                    }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                    {{ scope.row.standNumber }}</a>
                 </template>
               </el-table-column>
               <el-table-column
@@ -272,7 +230,7 @@
         <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
       </div>
     </el-drawer>
-<!--    添加抽屉-->
+    <!--    添加抽屉-->
     <el-drawer
       title="添加产品线"
       :visible.sync="standModel"
@@ -379,11 +337,10 @@ export default {
   },
   data() {
     return {
-      ffzrr:'',
       active: "1",
       standModel: false,
       sarAccessListDatas: [],
-      productData:[], //添加抽屉的数据
+      productData: [], //添加抽屉的数据
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -395,16 +352,9 @@ export default {
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.id,
-        dockUser: "",
-        responUserList: "",
-        ministerUser: "",
-        directorUser: "",
-        presidentUser: "",
-        dockUserName: "",
-        responUserListName: "",
-        ministerUserName: "",
-        directorUserName: "",
-        presidentUserName: ""
+        qualityEngineer: "",
+        certifiedEngineer:"",
+        distributePerson: "",
       },
       formRules: {
         listType: [
@@ -430,7 +380,7 @@ export default {
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
-      dataList:[],
+      dataList: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -441,28 +391,45 @@ export default {
       listForm: {
         standNumber: "", //标准编号
         standName: "",//标准名称
-        certifiedEngineer: '', //认证工程师
-        qualityEngineer: '', //质量工程师
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
         breakdownList: [{
-          applyArctic: '',
-          busStandCover: '',
-          claimType: '',
-          id: '',
-          itemsName:'',
-          itemsNum:'',
-          responsibleUnit: '',
-          standId: '',
-          svpps: '',
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
         }],
         dataList: [{
-          projectLine: '', //产品线
-          uname:'',//产品线责任人
-          ffzrr: '', //分发责任人
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          projectManager:"",// 产品线责任人id
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
           id: "",
-          sarStandProjectLibraries: [],
-        }],
+          sarStandProjectLibraries: [{
+            projectManager: '',
+            projectLevel: '',
+            projectNumber: '',
+            projectEndDate: '',
+            currentNode: '',
+            projectGroup: '',
+            productLine: '',
+            projectClassification: '',
+            projectStatus: '',
+            projectStartDate: '',
+            id: '',
+            projectName: '',
+            projectPlatfor: ''
+          }]
+        }]
       },
       choiceForm: {}, //选择标准清单列表
+      showColumn:true
     };
   },
   methods: {
@@ -479,10 +446,18 @@ export default {
       } else if (this.type === "presidentUser") {
         this.roleForm.presidentUser = this.roleRow.id;
         this.roleForm.presidentUserName = this.roleRow.name;
-      }else if(this.type === 'qualityEngineer') {
-        this.listForm.qualityEngineer = this.roleRow.name
-      }else if(this.type === 'certifiedEngineer') {
-        this.listForm.certifiedEngineer = this.roleRow.name
+      } else if (this.type === "qualityEngineer") {
+        this.listForm.qualityEngineer = this.roleRow.name;
+      } else if (this.type === "certifiedEngineer") {
+        this.listForm.certifiedEngineer = this.roleRow.name;
+      } else if (this.type === "distributePerson") {
+        this.listForm.distributePerson = this.roleRow.name;
+        this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
+        this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name
+        this.showColumn = false;
+        this.$nextTick(() => {
+          this.showColumn = true
+        })
       }
       this.modalshowflag = false;
     },
@@ -515,17 +490,17 @@ export default {
     },
     //取消添加事件
     cancelStand() {
-     this.standModel = false
+      this.standModel = false;
     },
     //确认添加事件
     okStand() {
-      if(this.standList.length >= 1){
-        this.dataList = this.standList
-        this.roleForm.directorUser = this.dataList[0].uname
-        this.listForm.dataList = this.standList
-        this.standModel = false
-      }else{
-        this.$message.warning('请选择一条数据进行添加')
+      if (this.standList.length >= 1) {
+        this.dataList = this.standList;
+        this.roleForm.directorUser = this.dataList[0].uname;
+        this.listForm.dataList = this.standList;
+        this.standModel = false;
+      } else {
+        this.$message.warning("请选择一条数据进行添加");
       }
     },
     //保存事件
@@ -559,25 +534,27 @@ export default {
       json.approvalOpinion = "";
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
+      json.prcCreateUser = this.$store.getters.userInfo.userId;
+      json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standId = this.listForm.standId;
-              this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
-                _this: this
-              }, res => {
-                if (res.ok) {
-                  this.$http.post("lawss/activiti/completeTask", {
-                    taskIds: res.data,
-                    userId: this.$store.getters.userInfo.userId,
-                    json: JSON.stringify(json)
-                  }, {
-                    _this: this
-                  }, res => {
-                    if (res.success) {
-                      this.$message.success(res.message);
-                      this.$router.push("/processCenter");
-                    }
-                  });
-                }
-              });
+      this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
+        _this: this
+      }, res => {
+        if (res.ok) {
+          this.$http.post("lawss/activiti/completeTask", {
+            taskIds: res.data,
+            userId: this.$store.getters.userInfo.userId,
+            json: JSON.stringify(json)
+          }, {
+            _this: this
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+          });
+        }
+      });
     },
     //选择拆分标准取消事件
     closeDrawer() {
@@ -586,25 +563,25 @@ export default {
 
     //选择拆分标准确定事件
     OkDrawer() {
-      if(this.selectedList.length == 1){
-        this.listForm.standNumber  = this.selectedList[0].standNumber
-        this.listForm.standName  = this.selectedList[0].standName
-        this.listForm.id  = this.selectedList[0].id
-        this.$http.get('SarStandItems/sar-stand-items/findAllItems',{
+      if (this.selectedList.length == 1) {
+        this.listForm.standNumber = this.selectedList[0].standNumber;
+        this.listForm.standName = this.selectedList[0].standName;
+        this.listForm.id = this.selectedList[0].id;
+        this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
           ids: this.listForm.id,
-          type:'FBGBJBD',
+          type: "FBGBJBD"
         }, {
-          _this:this
+          _this: this
         }, res => {
-          this.listForm.breakdownList = res.data
-          this.ListModel = false
+          this.listForm.breakdownList = res.data;
+          this.ListModel = false;
         }, e => {
-           this.$message.error('添加失败')
-        })
-      }else if(this.selectedList.length > 1){
-        this.$message.warning('您只能选择一条数据进行带入')
-      }else{
-        this.$message.warning('请选择一条数据带入')
+          this.$message.error("添加失败");
+        });
+      } else if (this.selectedList.length > 1) {
+        this.$message.warning("您只能选择一条数据进行带入");
+      } else {
+        this.$message.warning("请选择一条数据带入");
       }
     },
     //选择拆分标准选择框改变
@@ -622,7 +599,8 @@ export default {
     selectThree(data) {
       this.standList = data;
     },
-    choiceZRR(type, title, id) {
+    choiceZRR(scope,type, title, id) {
+      if(scope!=null)this.dsadadadsada=scope.$index;
       this.nodeList = [];
       this.nodeList.push(id);
       this.type = type;
@@ -648,34 +626,35 @@ export default {
     },
     //获取产品线数据
     getProductData() {
-      this.$http.get('sarStandProjectLibrary/queryProjectManager',{
+      this.$http.get("sarStandProjectLibrary/queryProjectManager", {
         current: this.pageNo,
-        pageSize: this.pageSizeNo,
-      },{
+        pageSize: this.pageSizeNo
+      }, {
         _this: this
       }, res => {
-        this.productData = res.data.records
-        this.totalNo = res.data.total
+        console.log(res.data.records);
+        this.productData = res.data.records;
+        this.totalNo = res.data.total;
       }, e => {
 
-      })
+      });
     },
     //获取标准数据
     getStandData() {
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage','',{
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
         _this: this
       }, res => {
-        this. sarAccessListDatas = res.data.list
-        this.total = res.pageCount
+        this.sarAccessListDatas = res.data.list;
+        this.total = res.pageCount;
       }, e => {
-      })
-    },
+      });
+    }
   },
   computed: {},
   mounted() {
     this.getTree();
-    this.getProductData()
-    this.getStandData()
+    this.getProductData();
+    this.getStandData();
   }
 
 };
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 05d9c289e..5802df6c1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -88,13 +88,8 @@
             label="产品线责任人">
           </el-table-column>
           <el-table-column
-            prop="ministerUser"
+            prop="distributePerson"
             label="分发责任人">
-<!--            <template slot-scope="scope">-->
-<!--              <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>-->
-<!--              <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"-->
-<!--                        @click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>-->
-<!--            </template>-->
           </el-table-column>
         </el-table>
       </div>
@@ -234,22 +229,44 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
-        listType: "", //区分是哪个清单
-        listName: "", //清单名称
-        applyRegion: "", //适用区域
-        descriptionList: "", //清单说明
-        enclosure: "", //附件
-        inforlist: "",//用来存放标准的id
+        passFlag: "1", //1为审批通过 2 为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
         dataList: [{
-          standNumber: "", //标准号
-          cnName: "", //中文名称
-          enName: "", //英文名称
-          isSubTime: "", //发布日期
-          newCarTime: "", //新车型实施日期
-          oldCarTime: "", //在产车实施日期
-          applyCar: "", //适用车型
-          textState: "", //文本状态
-          id: ""
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          projectManager:"",// 产品线责任人id
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: '',
+            projectLevel: '',
+            projectNumber: '',
+            projectEndDate: '',
+            currentNode: '',
+            projectGroup: '',
+            productLine: '',
+            projectClassification: '',
+            projectStatus: '',
+            projectStartDate: '',
+            id: '',
+            projectName: '',
+            projectPlatfor: ''
+          }]
         }]
       },
       choiceForm: {}, //选择标准清单列表
@@ -304,13 +321,14 @@ export default {
         this.listForm['id'] = item.id
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
+        this.dataList.distributePerson = item.dataList[0].distributePerson
       })
     },
 
 
     //驳回事件
     beforeBack () {
-      this.listForm.approvalOpinion = '1'
+      this.listForm.passFlag = '2'
       this.handleSubmit()
     },
     //提交事件
@@ -320,8 +338,8 @@ export default {
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
       this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.commentText = this.commentText;
-      this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;
+      this.listForm.passFlag = '1';
       this.listForm.signFlag = "";
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
@@ -366,7 +384,6 @@ export default {
   mounted() {
     this.processTable()
     this.getData()
-    // console.log(this.$store.getters.getHandleInfo);
   }
 };
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 0acb94e5c..1f5b0c1a7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -58,14 +58,15 @@
         <div class="tableTitle">
         </div>
         <el-table
-          :data="dataList"
+          ref="multipleTable"
+          :data="listForm.breakdownList"
+          tooltip-effect="dark"
+          style="width: 100%"
           border
-          ref="selection"
-          height="49%"
-          style="width: 100%;"
           @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
           <el-table-column
             type="selection"
             width="55"
@@ -73,45 +74,74 @@
           </el-table-column>
           <el-table-column
             prop="productLine"
-            label="条款号">
-          </el-table-column>
-          <el-table-column
-            prop="productLine"
+            align="center"
             label="产品线">
           </el-table-column>
           <el-table-column
-            prop="productLine"
+            prop="projectNumber"
+            align="center"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
             label="项目名称">
           </el-table-column>
           <el-table-column
-            prop="uname"
-            label="产品线责任人">
+            prop="itemNum"
+            align="center"
+            label="条款号">
           </el-table-column>
           <el-table-column
-            prop="ministerUser"
-            label="分发责任人">
-            <!--            <template slot-scope="scope">-->
-            <!--              <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>-->
-            <!--              <el-input v-model="roleForm.ministerUserName" placeholder="选择标准法规工程师"-->
-            <!--                        @click.native="choiceZRR('ministerUser', '选择标准法规工程师', roleForm.ministerUser)"></el-input>-->
-            <!--            </template>-->
+            prop="itemsName"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            prop="implementer"
+            align="center"
+            label="落实人">
+            <template slot-scope="scope,text" v-if="showColumn">
+              <div>
+                <div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)">
+                  {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer }}
+                </div>
+              </div>
+            </template>
           </el-table-column>
         </el-table>
-      </div>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="意见填写">
-            <div style="margin: 10px 0;">
-              <el-input
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
+        <!--    选择责任人-->
+        <el-drawer
+          :title="drawerTitle"
+          :visible.sync="modalshowflag"
+          :wrapperClosable="false"
+          size="800px">
+          <el-tree
+            v-if="modalshowflag"
+            style="height: 100%; overflow: auto;"
+            node-key="id"
+            class="filter-tree"
+            :data="treeData"
+            :props="defaultProps"
+            :default-checked-keys="nodeList"
+            highlight-current
+            check-strictly
+            @check="drawerCheck"
+            default-expand-all
+            :expand-on-click-node="false"
+            show-checkbox
+            ref="tree">
+          </el-tree>
+          <div id="roleFormButton" class="demo-drawer-footer">
+            <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
+                       @click="saveUserInfo">
+              确定
+            </el-button>
+            <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消
+            </el-button>
+          </div>
+        </el-drawer>
       </div>
     </div>
 
@@ -153,7 +183,7 @@
             sortable="custom"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -161,7 +191,7 @@
             label="完成时间"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -169,7 +199,7 @@
             label="审批意见"
             align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.commentText}}</span>
+              <span>{{ scope.row.commentText }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -177,7 +207,7 @@
             label="状态"
             align="center">
             <template slot-scope="scope">
-              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+              <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -186,12 +216,11 @@
     </div>
 
     <ProcessFooter
-      show-back
+      show-save
       show-submit
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
-      :approval="true"
-      @back="beforeBack"
+      @save="handleSave"
       @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -213,13 +242,23 @@ export default {
   },
   data() {
     return {
+      showColumn: true,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      treeData: [], // 人员数据
+      nodeList: [],
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
       detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
       processType: 1,
       loading: false,
-      dataList: [],//清单里的标准数据
+      // dataList: [],//清单里的标准数据
       active: "1",
-      userId:this.$store.getters.userInfo.userId,
+      userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
       listType: "country",  //选择的清单类型
@@ -234,24 +273,50 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
-        listType: "", //区分是哪个清单
-        listName: "", //清单名称
-        applyRegion: "", //适用区域
-        descriptionList: "", //清单说明
-        enclosure: "", //附件
-        inforlist: "",//用来存放标准的id
+        passFlag: "1", //1为审批通过 2 为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
         dataList: [{
-          standNumber: "", //标准号
-          cnName: "", //中文名称
-          enName: "", //英文名称
-          isSubTime: "", //发布日期
-          newCarTime: "", //新车型实施日期
-          oldCarTime: "", //在产车实施日期
-          applyCar: "", //适用车型
-          textState: "", //文本状态
-          id: ""
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
         }]
       },
+      roleForm: {
+        implementer: ""
+      },
       choiceForm: {}, //选择标准清单列表
       countryOptions: [], //适用区域下拉框数据
       user1: "",
@@ -263,17 +328,18 @@ export default {
     };
   },
   methods: {
-    processTable () {
-      this.$http.get('lawss/activiti/get_list_by_instance', {
+    processTable() {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
-        sortWord: this.shunxu ? this.paixu : '',
+        sortWord: this.shunxu ? this.paixu : "",
         shunxu: this.shunxu
       }, {
-        loading: 'loading',
+        loading: "loading",
         _this: this
       }, res => {
-        this.detailData = res
-      }, e => {})
+        this.detailData = res;
+      }, e => {
+      });
     },
     //tab发生变化
     handleTabs(name) {
@@ -285,60 +351,109 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
-            const processForm = JSON.parse(res.mesg)
-            this.getFormFieldList(processForm)
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
           }
         }).catch(e => {
-        })
-      })
+        });
+      });
     },
     /**
      * @description: 动态表单读取
      */
-    getFormFieldList (item) {
-      this.$nextTick(() => {
-        this.listForm = JSON.parse(JSON.stringify(item))
-        this.listForm.prcNum = this.prcNum
-        this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
-        this.listForm.dataList = item.dataList
-        this.dataList = item.dataList
-      })
+    getFormFieldList(item) {
+      this.listForm = JSON.parse(JSON.stringify(item));
+      this.listForm.prcNum = this.prcNum;
+      this.listForm.prcName = this.prcName;
+      this.listForm["id"] = item.id;
+      this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
+      this.listForm.breakdownList = [];
+      for (let i = 0; i < item.pepdtos.length; i++) {
+        for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
+          this.listForm.breakdownList.push({
+            itemsName: item.pepdtos[i].breakdownList[j].itemsName,
+            itemNum: item.pepdtos[i].breakdownList[j].itemsNum,
+            productLine: item.pepdtos[i].sarStandProjectLibraries.productLine,
+            projectNumber: item.pepdtos[i].sarStandProjectLibraries.projectNumber,
+            projectName: item.pepdtos[i].sarStandProjectLibraries.projectName,
+            implementer: item.pepdtos[i].breakdownList[j].implementer || null,
+            distributePerson: item.pepdtos[i].distributePerson,
+            distributePersonId: item.pepdtos[i].distributePersonId,
+            uname: item.pepdtos[i].uname,
+            projectManager: item.pepdtos[i].projectManager
+          });
+        }
+      }
+    },
+    saveUserInfo() {
+      if (this.type === "implementer") {
+        this.listForm.implementer = this.roleRow.name;
+        this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
+        this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
+        this.showColumn = false;
+        this.$nextTick(() => {
+          this.showColumn = true;
+        });
+      }
+      this.modalshowflag = false;
+    },
+    cancleUserInfo() {
+      this.modalshowflag = false;
+    },
+    choiceZRR(scope, type, title, id) {
+      if (scope != null) this.dsadadadsada = scope.$index;
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    getTree() {
+      this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
+        this.treeData = res.data;
+      });
     },
 
-
-    //驳回事件
-    beforeBack () {
-      this.listForm.approvalOpinion = '1'
-      this.handleSubmit()
+    //保存事件
+    handleSave() {
     },
     //提交事件
     handleSubmit() {
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
       this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
-      const json = JSON.stringify(this.listForm);
-      this.$http.post('lawss/activiti/completeTask', {
+      const json = JSON.stringify(this.listForm.breakdownList);
+      this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
-        json: json,
+        json: json
       }, {
         _this: this
       }, res => {
         if (res.success) {
-          this.$message.success(res.message)
-          this.$router.push('/processCenter')
+          this.$message.success(res.message);
+          this.$router.push("/processCenter");
         }
       }, e => {
 
       });
     },
+    drawerCheck(data) {
+      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      if (getlist.length == 1) {
+        this.roleRow = getlist[0];
+      } else {
+        this.$refs.tree.setCheckedKeys([data.id]);
+        this.roleRow = this.$refs.tree.getCheckedNodes()[0];
+      }
+    },
     //标准表格选择框改变
     selectStandChange(data) {
       this.selectList = [];
@@ -359,14 +474,14 @@ export default {
     }
   },
   computed: {
-    listNoDataText () {
-      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
-    },
+    listNoDataText() {
+      return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
+    }
   },
   mounted() {
-    this.processTable()
-    this.getData()
-    // console.log(this.$store.getters.getHandleInfo);
+    this.getTree();
+    this.processTable();
+    this.getData();
   }
 };
 </script>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index e9a99cb62..401699a58 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -1,13 +1,521 @@
+<!--评估流程 - 责任人填写评估反馈 xmpgStep4-->
 <template>
+  <div class="xmpg-step4">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">分发责任人分发任务</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-if="active == '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            width="450"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="researchImplementationTime"
+              align="center"
+              label="实施时间">
+            </el-table-column>
+            <el-table-column
+              prop="researchCompliance"
+              align="center"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="researchNonCompliance"
+                align="center"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="researchCountermeasures"
+                align="center"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="researchCompletionTime"
+                align="center"
+                label="完成时间">
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            width="450"
+            label="在产产品">
+            <el-table-column
+              prop="productionImplementationTime"
+              align="center"
+              label="实施时间">
+            </el-table-column>
+            <el-table-column
+              prop="productionCompliance"
+              align="center"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              label="不合规">
+              <el-table-column
+                prop="productionCountermeasures"
+                align="center"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="productionCompletionTime"
+                align="center"
+                label="完成时间">
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="填写评估反馈">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入您的评估分析"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-if="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.commentText}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep4"
+  name: "xmpgStep4",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],//清单里的标准数据
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        listType: "", //区分是哪个清单
+        listName: "", //清单名称
+        applyRegion: "", //适用区域
+        descriptionList: "", //清单说明
+        enclosure: "", //附件
+        inforlist: "",//用来存放标准的id
+        dataList: [{
+          standNumber: "", //标准号
+          cnName: "", //中文名称
+          enName: "", //英文名称
+          isSubTime: "", //发布日期
+          newCarTime: "", //新车型实施日期
+          oldCarTime: "", //在产车实施日期
+          applyCar: "", //适用车型
+          textState: "", //文本状态
+          id: ""
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    processTable () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : '',
+        shunxu: this.shunxu
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.listForm.dataList = item.dataList
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //保存事件
+    handleSave () {
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.approvalOpinion = "";
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.signFlag = "";
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step4 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 5557de462..bc4ff02a4 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -399,9 +399,20 @@ export default {
           break
         //项目合规评估流程
         case '5' :
-          if(row.taskInfo === ''){
+          if(row.taskInfo === '标准法规部业务经理审批'){
             this.$router.push({
-              name: '',
+              name: 'xmpgStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '标准评估任务下发'){
+            this.$router.push({
+              name: 'xmpgStep3',
               query: {
                 taskIds: row.taskIds,
                 prcId: row.prcId,
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 962916e6d..7b55ad910 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -61,7 +61,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'a43a8f88306ecf557ee243c013076bc4'"
+        v-btn-permission="'562e58cc3a960096cf3321e631293dc9'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index f49580ef7..9ab5e43c8 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -22,6 +22,7 @@
               type="primary"
               class="common-button-primary"
               size="small"
+              v-btn-permission="'688151df30bbff4cd2ecdc436addfd3f'"
               @click="searchSarAccess">
               查询
             </el-button>
@@ -30,6 +31,7 @@
             <el-button
               class="common-button-default"
               size="small"
+              v-btn-permission="'65ca2741907ba7a689c41f3d26684b4b'"
               @click="clearSearch">清空
             </el-button>
           </el-form-item>
@@ -42,7 +44,7 @@
         class="common-button-primary add-button"
         size="mini"
         @click="openModal(null,'addOpt')"
-        v-btn-permission="''"
+        v-btn-permission="'389d3690eeea9d3808bdff4d02dddbd8'"
       ><i class="iconfont">&#xe84e;</i>新增
       </el-button>
       <el-button
@@ -50,7 +52,7 @@
         :loading="delLoading"
         size="mini"
         @click="deleteSarAccess('demore',null)"
-        v-btn-permission="'e8ce15aba7bf8108c41d8d06c75c58eb'"
+        v-btn-permission="'0982c83299f3eb996317b014bb6aaff2'"
       ><i class="iconfont">&#xe61b;</i>批量删除
       </el-button>
     </div>
@@ -136,11 +138,11 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'9cf958c09b0cf3d14cc33807c2c18951'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'30bfbe928d7ee6e6bcef9408b762bc97'">查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'8f57e60942d8c307a9c3d566df64e57b'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'69ebe6847ad7bf7e90bae8025080678c'">编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'1bde7a8d30bfb0ffc0fc8aa506b55bd2'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'adec3450d97917a4ffa803d40a46dba9'">删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 7dfc1b0f7..d4c94f2d8 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -231,7 +231,7 @@
                         取消收藏
                       </el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'247cebaefa7cf1683092af160af11502'">编辑</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>
+<!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'ce4ec1bb233314d2ad8740d0aa98aca1'">分享</el-dropdown-item>-->
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
index 079a0a337..163ca9815 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue
@@ -71,7 +71,7 @@
         class="common-button-primary"
         type="primary"
         size="mini"
-        v-btn-permission="'13dc790d5438d2fa93a03eabf641318'"
+        v-btn-permission="'620e6da5808bf104e576c763546a33b6'"
         title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
       ><i class="iconfont">&#xe6e9;</i>导出</el-button>
       <el-button
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 6bd16fca3..3337ef5b4 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.248'
+const devIp = '192.168.10.250'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'

From 3164d7dc49f30e498734ffd9177dd03a4ebd564e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 13 Jul 2021 14:22:51 +0800
Subject: [PATCH 03/25] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=BA=93=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        |  2 +-
 .../details/otherStandardDetails/index.vue    | 24 +++++++++----------
 src/pages/details/process/ruku/index.vue      |  2 +-
 .../pages/creatProcess/bzrk/step1.vue         | 12 +++++++++-
 .../domesticStandardsAndRegulations/index.vue |  4 ++--
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index c8a7f1d18..202a871fd 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -1564,7 +1564,7 @@ export default {
     // 请求标准id和类型
     showReplaceStandInfo (item) {
       // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType
-      this.$http.get('lawss/sarStandardsInfo/queryInfoByStandNum', {
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', {
         standNumber: item
       }, {
         _this: this
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 347e22d9a..43f10be3d 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -38,25 +38,25 @@
           <template v-if="item.label === '基础信息'" >
             <div class="details-content-modular basic-information" style="border-top:none">
               <div class="basic-information-content">
-                <p><label>标准类别：</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>
                 <p style="color: #C42626;">
-                  <label>标准编号：</label>
+                  <label style=" margin-right: 150px;">标准编号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
                   <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                 </p>
-                <p><label>标准年份：</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
-                <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-                <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
-                <p><label>标准性质：</label><span>{{ sarStandardsInfoEO.standNature || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">标准性质</label><span>{{ sarStandardsInfoEO.standNature || '-' }}</span></p>
                 <p>
-                  <label
+                  <label style=" margin-right: 132px;"
                           title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                  >文本状态<i class="el-icon-warning-outline"></i>：</label>
+                  >文本状态<i class="el-icon-warning-outline"></i></label>
                   <span style="color: #409EFF;">{{ sarStandardsInfoEO.textStatus || '-' }}</span>
                 </p>
-                <p><label>发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-                <p><label>是否纳入认证清单：</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
-                <p><label>标准体系：</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+                <p><label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
+                <p><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystemName || '-' }}</span></p>
                 <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
                 <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
                 <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
@@ -1687,7 +1687,7 @@ export default {
     showReplaceStandInfo (item) {
       this.replaceStandInfoEO.standNumber = item
       // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType
-      this.$http.get('lawss/sarStandardsInfo/queryInfoByStandNum', this.replaceStandInfoEO, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', this.replaceStandInfoEO, {
         _this: this
       }, res => {
         if (res.data != null) {
diff --git a/src/pages/details/process/ruku/index.vue b/src/pages/details/process/ruku/index.vue
index e85d0f6c5..6e82b6638 100644
--- a/src/pages/details/process/ruku/index.vue
+++ b/src/pages/details/process/ruku/index.vue
@@ -1653,7 +1653,7 @@ export default {
     showReplaceStandInfo (item) {
       this.replaceStandInfoEO.standNumber = item
       // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType
-      this.$http.get('lawss/sarStandardsInfo/queryInfoByStandNum', this.replaceStandInfoEO, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', this.replaceStandInfoEO, {
         _this: this
       }, res => {
         if (res.data != null) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index a87ee6f2d..1b41ace11 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -195,6 +195,13 @@
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
+                                    <custom-file
+                                            key="XGD"
+                                            :config="field"
+                                            v-model="form.xgd"
+                                            :disabled="formdisableflag"
+                                            @fileSuccess="fileSuccess"
+                                    ></custom-file>
                                     <div v-if="form.xgd">
                                         {{ form.xgd }}
                                     </div>
@@ -626,6 +633,8 @@
     import ProcessTitle from '../../components/ProcessTitle'
     import {saveTaskFirst} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+    import CustomFile from '@/components/CustomFormComponents/File'
+
 
     export default {
         name: "bzrkStep1",
@@ -729,7 +738,8 @@
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
-            TreeSelect
+            TreeSelect,
+            CustomFile
         },
         methods: {
             popoverHide (checkedIds, checkedData) {
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 56a681489..45d568bc5 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -3887,8 +3887,8 @@ export default {
     async mounted () {
     // 进入页面后查询树形结构目录
     await this.selectMenu()
-    // 进入页面后查询标准体系树形结构目录
-    await this.selectStandardMenu()
+    // 进入页面后查询标准体系树形结构目录 引用 数据字典配置
+    // await this.selectStandardMenu()
     this.treeReload = true
     // 从数据库中查询各下拉框数据
     this.$http.get('sys/dictype/getDicTypeListCode', '', {

From 75bccd61eb0ff0108e31a82638f7efa68d88b646 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Tue, 13 Jul 2021 15:36:29 +0800
Subject: [PATCH 04/25] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/unqualProcess.js                      |  26 +++
 .../pages/creatProcess/wfhxzg/step1.vue       | 179 +++++++++--------
 .../pages/creatProcess/wfhxzg/step2.vue       | 161 +++++++++------
 .../pages/creatProcess/wfhxzg/step3.vue       |  93 ++++++---
 .../pages/creatProcess/wfhxzg/step4.vue       | 187 +++++++++++++-----
 .../pages/creatProcess/wfhxzg/step5.vue       |  91 ++++++---
 .../tabComponents/processCenter/index.vue     |  50 ++++-
 src/router/index.js                           |   4 +-
 8 files changed, 549 insertions(+), 242 deletions(-)
 create mode 100644 src/api/unqualProcess.js

diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js
new file mode 100644
index 000000000..a87c8a3ac
--- /dev/null
+++ b/src/api/unqualProcess.js
@@ -0,0 +1,26 @@
+import axios from '@/common/axiosV2'
+
+// 查询未整改项列表接口
+export function standUnqualified (data) {
+  return axios({
+    url: '/api/sarStandUnqualified/sar-stand-unqualified',
+    method: 'get',
+    params: data
+  })
+}
+// 人员菜单列表获取
+export function roleTreeData (data) {
+  return axios({
+    url: '/api/SarInstitution/institution/institutionAndUser',
+    method: 'get',
+    params: data
+  })
+}
+// 上传文件
+export function uploadFileText (data) {
+  return axios({
+    url: 'api/att/attFile/upload',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index d2787d24f..174ddb4bb 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -54,7 +54,7 @@
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-form
-            ref="Form"
+            ref="roleForm"
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
@@ -81,39 +81,6 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="确认分发责任人" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.ministerUserName" placeholder="选择分发责任人" @click.native="choiceZRR('ministerUser', '选择分发责任人', roleForm.ministerUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="负责人上传材料" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>负责人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择负责人" @click.native="choiceZRR('directorUser', '选择负责人', roleForm.directorUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
-            <el-timeline-item timestamp="批准人" placement="top" :color="roleForm.presidentUser ? '#66b1ff' : ''">
-              <el-card>
-                <el-form-item prop="presidentUserName" style="margin-bottom: 0">
-                  <h4>分发责任人</h4>
-                  <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.presidentUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.presidentUserName" placeholder="选择分发负责人" @click.native="choiceZRR('presidentUser', '选择分发负责人', roleForm.presidentUser)"></el-input>
-                  </div>
-                </el-form-item>
-              </el-card>
-            </el-timeline-item>
           </el-form>
         </el-timeline>
       </div>
@@ -127,21 +94,23 @@
     >
       <div class="search-area">
         <div class="content-top">
-          <el-form :modal="nonConformitySearch" inline class="label-input-form">
+          <el-form :modal="queryUnqualidiedData" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
-              <el-input v-model="nonConformitySearch.standId"
-                        placeholder="请输入"
-                        clearable
-                        :maxlength="100"></el-input>
+              <el-input
+                v-model="queryUnqualidiedData.standId"
+                placeholder="请输入"
+                clearable
+                :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item label="项目名称" class="search-item">
-              <el-input v-model="nonConformitySearch.productName"
-                        placeholder="请输入"
-                        clearable
-                        :maxlength="100"></el-input>
+              <el-input
+                v-model="queryUnqualidiedData.productName"
+                placeholder="请输入"
+                clearable
+                :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item label="责任部门" class="search-item">
-              <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />
+              <el-input v-model="queryUnqualidiedData.responsibleUnit" v-show="false" />
               <el-popover
                 placement="bottom"
                 popper-class="user-dept-popper"
@@ -150,7 +119,7 @@
               >
                 <el-input
                   slot="reference"
-                  v-model="nonConformitySearch.responseUnitShow"
+                  v-model="queryUnqualidiedData.responseUnitShow"
                   placeholder="根据责任部门查找"
                   readonly
                   clearable
@@ -257,19 +226,15 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {interfaceUrl} from "@/sysConfig";
-
+import { startProcess, completeTask } from '@/api/process.js'
+import { standUnqualified } from '@/api/unqualProcess.js'
 export default {
-  name: "step1",
+  name: "wfhxzgStep1",
   data() {
     return {
       textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
-      nonConformitySearch: {
-        standId: '', // 标准号/名称
-        productName: '', // 项目名称
-        responsibleUnit: '' // 责任部门
-      },
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
@@ -280,11 +245,26 @@ export default {
         itemsName: '',
         planCloseTime: '',
         responsibleUnit: '',
-        dutyEngineer: ''
+        dutyEngineer: '',
+        dutyPeopleInfo: '',
+        dutyPeople: '',
+        fileText: '',
+        fileTextId: '',
+        fileTextPath: ''
       }],
       // 责任部门
       zNodesSItem: [],
       standModel: false,
+      // 查询未符合项整改数据库数据
+      queryUnqualidiedData: {
+        pageNo: 1,
+        pageSize: 10,
+        total: 0,
+        closeState: '1',
+        standId: '', // 标准号/名称
+        productName: '', // 项目名称
+        responsibleUnit: '' // 责任部门
+      },
       unqualidiedData: [{
         standId: '',
         productName: '',
@@ -292,14 +272,24 @@ export default {
         itemsName: '',
         planCloseTime: '',
         responsibleUnit: '',
-        dutyEngineer: ''
+        dutyEngineer: '',
+        dutyPeopleInfo: '',
+        dutyPeopleInfoId: '',
+        dutyPeople: '',
+        dutyPeopleId: '',
+        fileText: '',
+        fileTextId: '',
+        fileTextPath: ''
       }],
       selectedList: [],  //未整改项的选择框
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
+        dockUserName: '',
+        dockUser: ''
       },
       roleFormRules: {
+        dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
       },
       nodeList: [],
       drawerTitle: '', //drawer标题
@@ -309,6 +299,7 @@ export default {
         children: 'children',
         label: 'name'
       },
+      taskID: '',
     }
   },
   components: {
@@ -318,21 +309,32 @@ export default {
   },
   mounted () {
     this.getTree()
+    this.getJsonData()
   },
   methods: {
+    getJsonData() {
+      const params = {
+        type: '8'
+      }
+      startProcess(params).then(res => {
+        this.taskID = res.data
+      })
+    },
     //点击新增事件
     addList() {
-      this.$http.get("sarStandUnqualified/sar-stand-unqualified", "", {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
+      standUnqualified(this.queryUnqualidiedData).then(res => {
         this.unqualidiedData = res.data.records
+        this.unqualidiedData.forEach(item => {
+          this.$set(item,'dutyPeopleInfo','')
+          this.$set(item,'dutyPeople','')
+          this.$set(item,'dutyPeopleInfoId','')
+          this.$set(item,'dutyPeopleId','')
+          this.$set(item,'fileText','')
+          this.$set(item,'fileTextId','')
+          this.$set(item,'fileTextPath','')
+        })
         this.total = res.data.total
-      }, e => {
-      });
+      })
       this.standModel = true;
     },
 
@@ -371,7 +373,7 @@ export default {
     OkDrawer() {
       if (this.selectedList.length !== 0) {
         this.dataList = this.selectedList
-        this.ListModel = false;
+        this.standModel = false;
       } else {
         this.$message.warning("请选择至少一条数据进行带入");
       }
@@ -386,12 +388,40 @@ export default {
     // 保存按钮
     handleSave() {},
     // 提交按钮
-    handleSubmit() {},
-
+    handleSubmit() {
+      let json = {
+        startUser: this.$store.getters.userInfo.userId,
+        engineer: this.roleForm.dockUser,
+        standardInfoList: this.dataList,
+      }
+      if (this.dataList[0].standId === '') {
+        this.$message.warning('请选择基础信息进行添加')
+      } else {
+        if (this.roleForm.dockUserName === '') {
+          this.$message.warning('请选择基础信息进行添加')
+        } else {
+          this.$refs['roleForm'].validate((valid) => {
+            if (valid) {
+              const params = new FormData();
+              params.set('json', JSON.stringify(json))
+              params.set('userId', this.$store.getters.userInfo.userId)
+              params.set('taskIds', this.taskID)
+              completeTask(params).then(res => {
+                if(res.success === true) {
+                  this.$message.success('提交成功')
+                  this.$router.push("/processCenter");
+                }
+              })
+            }
+          })
+        }
+      }
+    },
     // 获取流程节点数据
     getTree () {
       this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
         this.treeData = res.data
+        console.log(res.data)
       })
     },
     // 流程阶段负责人选择
@@ -413,19 +443,8 @@ export default {
     },
     // 流程节点负责人抽屉保存按钮
     saveUserInfo () {
-      if (this.type === 'dockUser') {
-        this.roleForm.dockUser = this.roleRow.id
-        this.roleForm.dockUserName = this.roleRow.name
-      } else if (this.type === 'ministerUser') {
-        this.roleForm.ministerUser = this.roleRow.id
-        this.roleForm.ministerUserName = this.roleRow.name
-      } else if (this.type === 'directorUser') {
-        this.roleForm.directorUser = this.roleRow.id
-        this.roleForm.directorUserName = this.roleRow.name
-      } else if (this.type === 'presidentUser') {
-        this.roleForm.presidentUser = this.roleRow.id
-        this.roleForm.presidentUserName = this.roleRow.name
-      }
+      this.roleForm.dockUser = this.roleRow.id
+      this.roleForm.dockUserName = this.roleRow.name
       this.modalshowflag = false
     },
     // 流程节点负责人抽屉取消按钮
@@ -438,7 +457,7 @@ export default {
     },
     // 清空 查询条件
     clearAllSearch (search = true) {
-      this.nonConformitySearch = {
+      this.queryUnqualidiedData = {
         standId: '',
         productName: '',
         responsibleUnit: ''
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 9c4edbd1c..687f3930a 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -90,7 +90,7 @@
           :data="dataList"
           border
           ref="multipleTable"
-          @select="handleSelectionChange"
+          @selection-change="handleSelectionChange"
           height="49%"
           style="width: 100%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -103,17 +103,17 @@
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
           <el-table-column prop="dutyEngineer" label="责任工程师"/>
-          <el-table-column label="选择分发责任人" prop="dutyPeople">
+          <el-table-column label="选择分发责任人" prop="dutyPeopleInfo">
               <template slot-scope="scope">
                 <span v-if="scope.row.show">
                   <el-input
-                    v-model="scope.row.dutyPeople"
+                    v-model="scope.row.dutyPeopleInfo"
                     size="mini"
                     placeholder="请输入内容"
                     @click.native="choiceDuty"
                   />
                 </span>
-                <span v-else>{{scope.row.dutyPeople}}</span>
+                <span v-else>{{scope.row.dutyPeopleInfo}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -175,15 +175,18 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {interfaceUrl} from "@/sysConfig";
+import { roleTreeData } from "@/api/unqualProcess.js"
+import {completeTask, inboundLiaisonDetail} from "@/api/process.js"
 
 export default {
-  name: "step2",
+  name: "wfhxzgStep2",
   data() {
     return {
       textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
       nonConformitySearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
@@ -193,6 +196,8 @@ export default {
       isSubmit: false,
       saveLoading: false,
       dataList: [],
+      endDataList: [],
+      lastDataList: [],
       // 新增选择分发责任人数组
       multipleSelection: [],
       // 当前页数
@@ -214,6 +219,15 @@ export default {
       nodeList: [],
       drawerTitle: '', //drawer标题
       modalshowflag: false, // drawer开关
+      roleForm: {
+        dutyUserInfo: [],
+        dutyUserInfoName: [],
+        dutyPeopleInfo: '',
+        dutyPeople: ''
+      },
+      props:  { label: 'name', children: 'children', value: 'id', multiple: true, disabled: false },
+      dutyUserCaseData: [],
+      roleFormRules: {},
       treeData: [], // 人员数据
       defaultProps: {
         children: 'children',
@@ -232,47 +246,20 @@ export default {
   },
   methods: {
     getData() {
-      this.dataList = [
-        {
-          standId: '1',
-          productName: '1',
-          itemsNum: '1',
-          itemsName: '1',
-          planCloseTime: '1',
-          responsibleUnit: '1',
-          dutyEngineer: '1',
-          dutyPeople: '',
-        },{
-          standId: '332',
-          productName: '333',
-          itemsNum: '33',
-          itemsName: '33',
-          planCloseTime: '33',
-          responsibleUnit: '33',
-          dutyEngineer: '33',
-          dutyPeople: ''
-        },{
-          standId: '312`',
-          productName: '31312',
-          itemsNum: '31`2',
-          itemsName: '312`1`',
-          planCloseTime: '321`3`2',
-          responsibleUnit: '312`123`',
-          dutyEngineer: '312123',
-          dutyPeople: '121'
-        },{
-          standId: '32123',
-          productName: '32132',
-          itemsNum: '312321',
-          itemsName: '3123',
-          planCloseTime: '3123',
-          responsibleUnit: '3123',
-          dutyEngineer: '3123',
-          dutyPeople: ''
-        },
-      ]
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
+      })
     },
-
     // 批量选择分发责任人
     dutyEngineerList() {
       if (this.multipleSelection.length === 0) {
@@ -287,12 +274,12 @@ export default {
     // 选择勾选项的集合
     handleSelectionChange(value) {
       this.multipleSelection = value
-      console.log(value)
     },
     // 选择分发责任人时
     choiceDuty(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
+      this.type = type
       this.drawerTitle = title
       this.modalshowflag = true
     },
@@ -306,37 +293,91 @@ export default {
     // 保存按钮
     handleSave() {},
     // 提交按钮
-    handleSubmit() {},
+    handleSubmit() {
+      let zqa = new Map();
+      for (let lastDataListElement of this.lastDataList) {
+        let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
+        if( a == null){
+          a = {
+            id: lastDataListElement.dutyPeopleInfoId,
+            name: lastDataListElement.dutyPeopleInfo,
+            standardInfoList: []
+          }
+        }
+        a.standardInfoList.push(lastDataListElement);
+        zqa.set(a.id, a);
+      }
+      let list = [];
+      for(let item of zqa) {
+        list.push(item[1])
+      }
+      let json = {
+        dockUserList: list,
+        // engineer: this.$store.getters.userInfo.userId,
+        // standardInfoList: list[0].standardInfoList,
+      }
+      console.log(json)
+      let flag=false
+      this.dataList.forEach(item => {
+        if (item.dutyPeopleInfo === '') {
+          this.$message.warning('请选择分发负责人填入')
+          flag=true
+        }
+      })
+      if(flag)return;
+      const params = new FormData();
+      params.set('json', JSON.stringify(json))
+      params.set('userId', this.$store.getters.userInfo.userId)
+      params.set('taskIds', this.taskIds)
+      completeTask(params).then(res => {
+          if(res.success === true) {
+            this.$message.success('提交成功')
+            this.$router.push("/processCenter");
+          }
+        })
+    },
 
+    // 流程阶段负责人选择
+    choiceZRR (type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.type = type
+      this.drawerTitle = title
+      this.modalshowflag = true
+    },
     // 获取流程节点数据
     getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+      roleTreeData().then(res => {
         this.treeData = res.data
+        this.dutyUserCaseData = res.data
       })
     },
     drawerCheck (data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
-      if(getlist.length == 1) {
-        this.roleRow = getlist[0]
+      if(getlist.length !== 0) {
+        this.roleRow = getlist
       }else {
         this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+        this.roleRow = this.$refs.tree.getCheckedNodes()
       }
     },
     // 流程节点负责人抽屉保存按钮
     saveUserInfo () {
       // 选取负责人时的操作
       for (let i = 0; i < this.multipleSelection.length; i++ ) {
-          this.multipleSelection[i].dutyPeople = this.roleRow.name
-          for (let b = 0; b < this.multipleSelection.length; b++) {
-            this.multipleSelection[b].dutyPeople = this.multipleSelection[i].dutyPeople
-            this.dataList.forEach(val=> {
-              val.show = false
-            })
-          }
-        this.multipleSelection = []
+        this.multipleSelection[i].dutyPeopleInfo = this.roleRow[0].name
+        this.multipleSelection[i].dutyPeopleInfoId = this.roleRow[0].id
+        for (let b = 0; b < this.multipleSelection.length; b++) {
+          this.dataList[b].dutyPeopleInfo = this.multipleSelection[i].dutyPeopleInfo
+          this.dataList[b].dutyPeopleInfoId = this.multipleSelection[i].dutyPeopleInfoId
+          this.dataList.forEach(val=> {
+            val.show = false
+          })
+        }
+        this.lastDataList = this.dataList
         this.$refs.multipleTable.clearSelection();
       }
+      this.roleForm.dutyUserInfoName = this.roleRow.name
       this.modalshowflag = false
     },
     // 流程节点负责人抽屉取消按钮
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 5d3255c1e..51d0aa452 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -168,10 +168,10 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import {interfaceUrl} from "@/sysConfig";
+import {completeTask, inboundLiaisonDetail} from "@/api/process.js";
 
 export default {
-  name: "step3",
+  name: "wfhxzgStep3",
   data() {
     return {
       textarea: '', // 意见
@@ -185,26 +185,9 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
-      dataList: [
-        {
-          standId: '1',
-          productName: '1',
-          itemsNum: '1',
-          itemsName: '1',
-          planCloseTime: '1',
-          responsibleUnit: '1',
-          dutyEngineer: '1',
-          dutyPeople: '13123'
-        },{
-          standId: '',
-          productName: '',
-          itemsNum: '',
-          itemsName: '',
-          planCloseTime: '',
-          responsibleUnit: '',
-          dutyEngineer: '',
-          dutyPeople: ''
-        }],
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      dataList: [],
       newDataList: [],
 
       // 责任部门
@@ -226,9 +209,30 @@ export default {
     ProcessTitle
   },
   created() {
+    this.getData()
     this.getTree()
   },
   methods: {
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        let fileData = JSON.parse(JSON.stringify(item)).dockUserList
+        for (let i = 0; i<fileData.length; i++) {
+          if (fileData[i].name === this.$store.getters.userInfo.userName) {
+            this.dataList = fileData[i].standardInfoList
+          }
+        }
+      })
+    },
     // 选择责任人的按钮操作
     selectPeople(val) {
       this.newDataList = val
@@ -242,7 +246,47 @@ export default {
     // 保存按钮
     handleSave() {},
     // 提交按钮
-    handleSubmit() {},
+    handleSubmit() {
+      let zqa = new Map();
+      for (let lastDataListElement of this.lastDataList) {
+        let a = zqa.get(lastDataListElement.dutyPeopleId)
+        if( a == null){
+          a = {
+            id: lastDataListElement.dutyPeopleId,
+            name: lastDataListElement.dutyPeople,
+            standardInfoList: []
+          }
+        }
+        a.standardInfoList.push(lastDataListElement);
+        zqa.set(a.id, a);
+      }
+      let list = [];
+      for(let item of zqa) {
+        list.push(item[1])
+      }
+      let json = {
+        responUserList: list,
+        actionFlag: 0
+      }
+      let flag=false
+      this.dataList.forEach(item => {
+        if (item.dutyPeople === '') {
+          this.$message.warning('请选择负责人填入')
+          flag=true
+        }
+      })
+      if(flag)return;
+      const params = new FormData();
+      params.set('json', JSON.stringify(json))
+      params.set('userId', this.$store.getters.userInfo.userId)
+      params.set('taskIds', this.taskIds)
+      completeTask(params).then(res => {
+        if (res.success === true) {
+          this.$message.success('提交成功')
+          this.$router.push("/processCenter");
+        }
+      })
+    },
 
     // 获取流程节点数据
     getTree () {
@@ -263,6 +307,9 @@ export default {
     saveUserInfo () {
       // 选择责任人时input框内值
       this.newDataList.dutyPeople = this.roleRow.name
+      this.newDataList.dutyPeopleId = this.roleRow.id
+      this.lastDataList = this.dataList
+      console.log(this.dataList)
       this.modalshowflag = false
     },
     // 流程节点负责人抽屉取消按钮
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 8641d0257..480176623 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -92,27 +92,28 @@
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
           <el-table-column prop="dutyPeople" label="负责人"/>
-          <el-table-column label="佐证材料">
+          <el-table-column label="佐证材料" prop="info.fileText" show-overflow-tooltip width="150">
             <template slot-scope="scope">
-              <el-upload
-                v-model="fileText"
-                ref="uploadFile"up
-                :action="uploadPath"
-                class="upload-demo"
-                :http-request="handleUpload"
-                :on-success="handleOnsuccess"
-                :on-error="handleOnError"
-                :before-upload="handleBeforeUpload"
-                :before-remove="handleBeforeRemove"
-                :on-remove="handleOnRemove"
-                :on-exceed="handleExceed"
-                :limit="10"
-                :file-list="uploadFileList"
-                list-type="picture"
-                :auto-upload="true"
-              >
-                <el-button type="text">上传佐证材料</el-button>
-              </el-upload>
+              <div style="display: inline;">
+              <el-input
+                disabled
+                style="display: none"
+                v-model="scope.row.fileText"
+                clearable
+              />
+              <div v-if="scope.row.fileText" type="primary" @click="fileUpload(scope.row)" class="fileClass">
+                {{ scope.row.fileText }}
+              </div>
+              <div v-else>
+                <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  @click="fileUpload(scope.row)"
+                  size="mini">
+                  点击上传
+                </el-button>
+              </div>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -141,6 +142,24 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+      <el-upload
+        multiple
+        drag
+        :action="uploadPath"
+        ref="importfile"
+        name="file"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="handleBeforeUpload"
+        :on-success="handleOnsuccess"
+        :show-file-list="false"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -149,9 +168,10 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {interfaceUrl} from "@/sysConfig";
+import {inboundLiaisonDetail, completeTask} from "@/api/process"
 
 export default {
-  name: "step4",
+  name: "wfhxzgStep4",
   data() {
     return {
       textarea: '', // 意见
@@ -165,34 +185,17 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
-      dataList: [
-        {
-          standId: '1',
-          productName: '1',
-          itemsNum: '1',
-          itemsName: '1',
-          planCloseTime: '1',
-          responsibleUnit: '1',
-          dutyEngineer: '1',
-          dutyPeople: '13123'
-        },{
-          standId: '',
-          productName: '',
-          itemsNum: '',
-          itemsName: '',
-          planCloseTime: '',
-          responsibleUnit: '',
-          dutyEngineer: '',
-          dutyPeople: '13123'
-        }],
+      dataList: [],
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
       // 当前页数
       pageNo: 1,
       total: 0,
       myLoading: false,
       // 上传路径
       uploadPath: 'api/att/attFile/upload',
-      // 上传文件所储存的数组
-      uploadFileList: [],
+      fileMadel: false,
+      newDataList: [],
       // 责任部门
       zNodesSItem: [],
     }
@@ -203,25 +206,84 @@ export default {
     ProcessTitle
   },
   created() {
+    this.getData()
   },
   methods: {
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        console.log(item)
 
+        this.dataList = [JSON.parse(JSON.stringify(item.responUserInfo.info))]
+        console.log(this.dataList)
+        /*for (let i = 0; i<fileData.length; i++) {
+          if (fileData[i].name === this.$store.getters.userInfo.userName) {
+            this.dataList = fileData[i].standardInfoList
+            console.log(this.dataList)
+          }
+        }*/
+      })
+    },
 
     handleTabs(name) {
       this.active = name
     },
     /************ 上传佐证材料 *****************/
-    // 上传材料
-    handleUpload() {},
+    fileUpload (val) {
+      this.newDataList = val
+      this.fileMadel = true
+    },
     // 文件上传成功
-    handleOnsuccess(res, file) {
-      this.$message.success('上传成功!')
-      console.log(file)
+    handleOnsuccess(res, file, fileList) {
+      if (res.ok) {
+        this.fileMadel = false
+        this.newDataList.fileText = res.data.name
+        this.newDataList.fileTextId = res.data.id
+        this.newDataList.fileTextPath = res.data.filePath
+        console.log(this.dataList)
+        this.$message({
+          showClose: true,
+          message: res.message,
+          type: 'success'
+        })
+      }
     },
     // 文件上传失败后回调
     handleOnError(res, file) {},
     // 文件上传限制条件
-    handleBeforeUpload() {},
+    handleBeforeUpload(file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      // 判断上传文件格式
+      if (fileSuffix === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX或XLS文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
     // 移除上传的文件
     handleBeforeRemove() {},
     handleOnRemove() {},
@@ -233,7 +295,32 @@ export default {
     // 保存按钮
     handleSave() {},
     // 提交按钮
-    handleSubmit() {},
+    handleSubmit() {
+      let flag=false
+      this.dataList.forEach(item => {
+        if (item.fileText === '') {
+          this.$message.warning('请选择佐证材料进行上传')
+          flag=true
+        }
+      })
+      if(flag)return;
+      let fileDataList = this.dataList
+      let json = {
+        info: { fileDataList },
+        username: this.$store.getters.userInfo.userName
+      }
+      console.log(json)
+      const params = new FormData();
+      params.set('json', JSON.stringify(json))
+      params.set('userId', this.$store.getters.userInfo.userId)
+      params.set('taskIds', this.taskIds)
+      completeTask(params).then(res => {
+        if(res.success === true) {
+          this.$message.success('提交成功')
+          this.$router.push("/processCenter");
+        }
+      })
+    },
 
     //未整改项抽屉中的查询按钮
     getTableByPage() {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index c157cb998..a8b85cad1 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -106,19 +106,21 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="textarea">
+              v-model="commentText">
             </el-input>
           </div>
         </el-collapse-item>
       </el-collapse>
     </div>
     <ProcessFooter
-      show-back
       show-submit
+      show-back
+      approval
+      @back="handleSubmitNo"
       :submitLoading="isSubmit"
-      :backLoading="backLoading"
-      @back="handleDataBack"
+      :saveLoading="saveLoading"
       @submit="handleSubmit"
+      submitBTNText="同意"
     >
     </ProcessFooter>
   </div>
@@ -129,13 +131,15 @@ import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
 import {interfaceUrl} from "@/sysConfig";
+import {inboundLiaisonDetail} from "@/api/process";
 
 export default {
-  name: "step5",
+  name: "wfhxzgStep5",
   data() {
     return {
-      textarea: '', // 意见
+      commentText: '',
       title: '', // 新增编辑抽屉标题
+      saveLoading: false,
       ListModel: false, // 新增编辑抽屉开关
       nonConformitySearch: {
         standId: '', // 标准号/名称
@@ -145,24 +149,10 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       backLoading: false,
-      dataList: [
-        {
-          standId: '1',
-          productName: '1',
-          itemsNum: '1',
-          itemsName: '1',
-          planCloseTime: '1',
-          responsibleUnit: '1',
-          dutyEngineer: '1'
-        },{
-          standId: '',
-          productName: '',
-          itemsNum: '',
-          itemsName: '',
-          planCloseTime: '',
-          responsibleUnit: '',
-          dutyEngineer: ''
-        }],
+      dataList: [],
+      json: {},
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
       // 当前页数
       pageNo: 1,
       total: 0,
@@ -180,15 +170,66 @@ export default {
     ProcessTitle
   },
   created() {
+    this.getData()
   },
   methods: {
+    getData() {
+      const params = {
+        taskIds: this.taskIds,
+        pId: this.pId,
+      }
+      inboundLiaisonDetail(params).then(res => {
+        const processForm = JSON.parse(res.mesg)
+        this.getFormFieldList(processForm)
+      })
+    },
+    getFormFieldList (item) {
+      this.$nextTick(() => {
+        console.log(item)
+        this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
+        console.log(this.dataList)
+      })
+    },
 
     handleTabs(name) {
       this.active = name
     },
 
     // 提交按钮
-    handleSubmit() {},
+    handleSubmit() {
+      var json = this.json
+      json.actionFlag = 0
+      json.commentText = this.commentText
+      this.$http.post('lawss/activiti/completeTask', {
+        json: JSON.stringify(json),
+        taskId: this.taskIds,
+        userId: this.$store.getters.userInfo.userId
+      }, {}, res => {
+        if (res.success) {
+          this.$message.success('提交成功')
+          this.$router.push('/processCenter')
+        }
+      })
+    },
+    handleSubmitNo() {
+      if (this.commentText) {
+        var json = this.json
+        json.actionFlag = 1
+        json.commentText = this.commentText
+        this.$http.post('lawss/activiti/completeTask', {
+          json: JSON.stringify(json),
+          taskId: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success('驳回成功')
+            this.$router.push('/processCenter')
+          }
+        })
+      } else {
+        this.$message.warning('请输入反馈意见')
+      }
+    },
     //未整改项抽屉中的查询按钮
     getTableByPage() {
     },
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 6ba2be88c..a8aecdb8a 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -472,7 +472,6 @@ export default {
               }
             })
           }
-          break;
           break
         //项目合规评估流程
         case '5' :
@@ -500,7 +499,54 @@ export default {
             })
           }
           break
-
+        //未符合项整改流程
+        case '8' :
+          if(row.taskInfo === '下发至标准法规工程师'){
+            this.$router.push({
+              name: 'wfhxzgStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '确认+选择责任人') {
+            this.$router.push({
+              name: 'wfhxzgStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if (row.taskInfo === '上传佐证材料填写信息') {
+            this.$router.push({
+              name: 'wfhxzgStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else {
+            this.$router.push({
+              name: 'wfhxzgStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
+          break
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index a61dcc0e4..8939581cf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -341,7 +341,7 @@ const routes = [
       },
       {
         path: '/wfhxzgStep1',
-        name: 'wfhxzgStep2',
+        name: 'wfhxzgStep1',
         component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
         meta: {
           requireAuth: true,
@@ -1699,7 +1699,7 @@ router.beforeEach((to, from, next) => {
   // if (processCenter) {
   //   if (to.meta.process) {
   //     if (store.getters.getHandleInfo.prcType === to.meta.process.prcType &&
-  //       (store.getters.getHandleInfo.taskInfo === to.meta.process.taskInfo ||
+  //       (store.getters.getHandleInfo. === to.meta.process.taskInfo ||
   //       (to.meta.process.taskInfo.__proto__.constructor === Array && to.meta.process.taskInfo.includes(store.getters.getHandleInfo.taskInfo)))) {
   //       next()
   //     } else {

From f2f643a5884d0b0cb4a9467e8b230f8c072eb9ab Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 13 Jul 2021 16:13:55 +0800
Subject: [PATCH 05/25] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=20=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 316 +++++++++++++--
 .../pages/creatProcess/bzrk/step2.vue         |  70 ++--
 .../pages/creatProcess/bzrk/step3.vue         |  70 ++--
 .../pages/creatProcess/bzrk/step4.vue         | 374 ++++++++++++++++--
 4 files changed, 689 insertions(+), 141 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 1b41ace11..30b380397 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -195,73 +195,141 @@
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
-                                    <custom-file
-                                            key="XGD"
-                                            :config="field"
-                                            v-model="form.xgd"
-                                            :disabled="formdisableflag"
-                                            @fileSuccess="fileSuccess"
-                                    ></custom-file>
-                                    <div v-if="form.xgd">
-                                        {{ form.xgd }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.xgdName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.xgdName">
+                                        {{ form.xgdName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('xgd')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('xgd')">
                                             点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.fbgbjbd">
-                                        {{ form.fbgbjbd }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.fbgbjbdName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.fbgbjbdName">
+                                        {{ form.fbgbjbdName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('fbgbjbd')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('fbgbjbd')">
                                             点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zbjbd">
-                                        {{ form.zbjbd }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.zbjbdName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.zbjbdName">
+                                        {{ form.zbjbdName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('zbjbd')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('zbjbd')">
                                             点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.bpg">
-                                        {{ form.bpg }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.bpgName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.bpgName">
+                                        {{ form.bpgName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('bpg')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('bpg')">
                                             点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ssg">
-                                        {{ form.ssg }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.ssgName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.ssgName">
+                                        {{ form.ssgName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('ssg')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('ssg')">
                                             点击上传
                                         </el-button>
                                     </div>
@@ -269,53 +337,113 @@
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.kwj">
-                                        {{ form.kwj }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.kwjName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.kwjName">
+                                        {{ form.kwjName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('kwj')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('kwj')">
                                             点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zqyjg">
-                                        {{ form.zqyjg }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.zqyjgName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.zqyjgName">
+                                        {{ form.zqyjgName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('zqyjg')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('zqyjg')">
                                             点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ca">
-                                        {{ form.ca }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.caName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.caName">
+                                        {{ form.caName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('ca')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('ca')">
                                             点击上传
                                         </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.jdwj">
-                                        {{ form.jdwj }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.jdwjName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.jdwjName">
+                                        {{ form.jdwjName }}
+                                        <el-button
+                                                type="primary"
+                                                class="common-button-primary"
+                                                size="mini"
+                                                style="margin-left: 10px"
+                                                @click="fileUpload('jdwj')">
+                                            重新上传
+                                        </el-button>
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('jdwj')">
                                             点击上传
                                         </el-button>
                                     </div>
@@ -508,14 +636,21 @@
                                     ></el-input>
                                 </el-form-item>
                                 <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.glwj">
-                                        {{ form.glwj }}
+                                    <el-input
+                                            disabled
+                                            style="display: none;"
+                                            v-model="form.glwjName"
+                                            clearable
+                                    ></el-input>
+                                    <div v-if="form.glwjName">
+                                        {{ form.glwjName }}
                                     </div>
                                     <div v-else>
                                         <el-button
                                                 type="primary"
                                                 class="common-button-primary"
-                                                size="mini">
+                                                size="mini"
+                                                @click="fileUpload('glwj')">
                                             点击上传
                                         </el-button>
                                     </div>
@@ -624,6 +759,24 @@
                 @submit="handleSubmit"
         >
         </ProcessFooter>
+        <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+            <el-upload
+                    multiple
+                    drag
+                    :action="fileUrl"
+                    ref="importfile"
+                    name="file"
+                    accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
+                    :before-upload="beginImportFile"
+                    :on-success="importFileSuccess"
+                    :show-file-list="false"
+            >
+                <div style="padding: 20px 0">
+                    <i class="el-icon-upload" style="color: #3399ff"></i>
+                    <p>点击或拖拽上传文件</p>
+                </div>
+            </el-upload>
+        </el-dialog>
     </div>
 </template>
 
@@ -633,8 +786,6 @@
     import ProcessTitle from '../../components/ProcessTitle'
     import {saveTaskFirst} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
-    import CustomFile from '@/components/CustomFormComponents/File'
-
 
     export default {
         name: "bzrkStep1",
@@ -652,6 +803,9 @@
                 },
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
+                fileUrl: 'api/att/attFile/upload',
+                fileMadel: false,
+                fileType: '',
                 form: {
                     // 基础信息
                     textStatus: '', // 文本状态
@@ -685,6 +839,16 @@
                     jdwj: '', // 解读文件
                     zbjbd: '', // 增补件
                     kwj: '', // 勘误件
+                    caName: '', // 草案
+                    fbgbjbdName: '', // 发布稿
+                    xgdName: '', // 修改单
+                    bpgName: '', // 报批稿
+                    ssgName: '', // 送审稿
+                    zqyjgName: '', // 征求意见稿
+                    jdwjName: '', // 解读文件
+                    zbjbdName: '', // 增补件
+                    kwjName: '', // 勘误件
+                    glwjName: '', // 关联文件
                     // 适用范围
                     txlb: '', // 体系类别
                     gkdw: '', // 归口管理部门
@@ -738,10 +902,80 @@
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
-            TreeSelect,
-            CustomFile
+            TreeSelect
         },
         methods: {
+            beginImportFile (file) {
+                var filename = file.name
+                var index1 = filename.lastIndexOf('.')
+                var index2 = filename.length
+                var fileSuffix = filename.substring(index1, index2)
+                // const fileSuffix = file.name.split('.')[1] // 后缀名
+                // 判断上传文件格式
+                if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+                    return true
+                } else {
+                    this.spinShow = false
+                    this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
+                    return false
+                }
+                // 判断文件上传大小
+                // eslint-disable-next-line no-unreachable
+                if (file.size / 1024 / 1024 <= 200) {
+                    return true
+                } else {
+                    this.$message.error('文件' + file.name + '大小不超过200M')
+                    return false
+                }
+                return true
+            },
+            // 导入标准数据成功后执行
+            importFileSuccess (response, file) {
+                if (response.ok) {
+                    this.fileMadel = false
+                    if(this.fileType === 'fbgbjbd'){
+                        this.form.fbgbjbd = response.data.id;
+                        this.form.fbgbjbdName = response.data.name;
+                    }else if(this.fileType === 'xgd'){
+                        this.form.xgd = response.data.id;
+                        this.form.xgdName = response.data.name;
+                    }else if(this.fileType === 'bpg'){
+                        this.form.bpg = response.data.id;
+                        this.form.bpgName = response.data.name;
+                    }else if(this.fileType === 'ssg'){
+                        this.form.ssg = response.data.id;
+                        this.form.ssgName = response.data.name;
+                    }else if(this.fileType === 'zqyjg'){
+                        this.form.zqyjg = response.data.id;
+                        this.form.zqyjgName = response.data.name;
+                    }else if(this.fileType === 'jdwj'){
+                        this.form.jdwj = response.data.id;
+                        this.form.jdwjName = response.data.name;
+                    }else if(this.fileType === 'kwj'){
+                        this.form.kwj = response.data.id;
+                        this.form.kwjName = response.data.name;
+                    }else if(this.fileType === 'xgd'){
+                        this.form.xgd = response.data.id;
+                        this.form.xgdName = response.data.name;
+                    }else if(this.fileType === 'glwj'){
+                        this.form.glwj = response.data.id;
+                        this.form.glwjName = response.data.name;
+                    }else if(this.fileType === 'ca'){
+                        this.form.ca = response.data.id;
+                        this.form.caName = response.data.name;
+                    }
+                    this.$message({
+                        showClose: true,
+                        message: response.message,
+                        type: 'success'
+                    })
+                }
+            },
+            fileUpload (type) {
+                this.fileType = '';
+                this.fileMadel = true
+                this.fileType = type;
+            },
             popoverHide (checkedIds, checkedData) {
                 console.log(checkedIds);
                 console.log(checkedData);
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 49023f76b..06544ba2a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -208,41 +208,41 @@
                     <div class="prc-content-border">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.xgd">
-                                        {{ form.xgd }}
+                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.xgdName">
+                                        {{ form.xgdName }}
                                     </div>
                                     <div v-else>
                                         - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.fbgbjbd">
-                                        {{ form.fbgbjbd }}
+                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.fbgbjbdName">
+                                        {{ form.fbgbjbdName }}
                                     </div>
                                     <div v-else>
                                       - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zbjbd">
-                                        {{ form.zbjbd }}
+                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.zbjbdName">
+                                        {{ form.zbjbdName }}
                                     </div>
                                     <div v-else>
                                        - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.bpg">
-                                        {{ form.bpg }}
+                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.bpgName">
+                                        {{ form.bpgName }}
                                     </div>
                                     <div v-else>
                                        - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ssg">
-                                        {{ form.ssg }}
+                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.ssgName">
+                                        {{ form.ssgName }}
                                     </div>
                                     <div v-else>
                                       - -
@@ -250,33 +250,33 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.kwj">
-                                        {{ form.kwj }}
+                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.kwjName">
+                                        {{ form.kwjName }}
                                     </div>
                                     <div v-else>
                                       - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
-                                    <div v-if="form.zqyjg">
-                                        {{ form.zqyjg }}
+                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.zqyjgName">
+                                        {{ form.zqyjgName }}
                                     </div>
                                     <div v-else>
                                       - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ca">
-                                        {{ form.ca }}
+                                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.caName">
+                                        {{ form.caName }}
                                     </div>
                                     <div v-else>
                                        - -
                                     </div>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.jdwj">
-                                        {{ form.jdwj }}
+                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.jdwjName">
+                                        {{ form.jdwjName }}
                                     </div>
                                     <div v-else>
                                        - -
@@ -473,9 +473,9 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
-                                    <div v-if="form.glwj">
-                                        {{ form.glwj }}
+                                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                                    <div v-if="form.glwjName">
+                                        {{ form.glwjName }}
                                     </div>
                                     <div v-else>
                                        - -
@@ -730,6 +730,16 @@
                     jdwj: '', // 解读文件
                     zbjbd: '', // 增补件
                     kwj: '', // 勘误件
+                    caName: '', // 草案
+                    fbgbjbdName: '', // 发布稿
+                    xgdName: '', // 修改单
+                    bpgName: '', // 报批稿
+                    ssgName: '', // 送审稿
+                    zqyjgName: '', // 征求意见稿
+                    jdwjName: '', // 解读文件
+                    zbjbdName: '', // 增补件
+                    kwjName: '', // 勘误件
+                    glwjName: '', // 关联文件
                     // 适用范围
                     txlb: '', // 体系类别
                     gkdw: '', // 归口管理部门
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index b60c5d0f9..652ca5446 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -201,41 +201,41 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
-                  <div v-if="form.xgd">
-                    {{ form.xgd }}
+                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.xgdName">
+                    {{ form.xgdName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
-                  <div v-if="form.fbgbjbd">
-                    {{ form.fbgbjbd }}
+                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.fbgbjbdName">
+                    {{ form.fbgbjbdName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
-                  <div v-if="form.zbjbd">
-                    {{ form.zbjbd }}
+                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                  <div v-if="form.zbjbdName">
+                    {{ form.zbjbdName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
-                  <div v-if="form.bpg">
-                    {{ form.bpg }}
+                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                  <div v-if="form.bpgName">
+                    {{ form.bpgName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssg">
-                    {{ form.ssg }}
+                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                  <div v-if="form.ssgName">
+                    {{ form.ssgName }}
                   </div>
                   <div v-else>
                     - -
@@ -243,33 +243,33 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
-                  <div v-if="form.kwj">
-                    {{ form.kwj }}
+                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                  <div v-if="form.kwjName">
+                    {{ form.kwjName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
-                  <div v-if="form.zqyjg">
-                    {{ form.zqyjg }}
+                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                  <div v-if="form.zqyjgName">
+                    {{ form.zqyjgName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
-                  <div v-if="form.ca">
-                    {{ form.ca }}
+                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                  <div v-if="form.caName">
+                    {{ form.caName }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
-                  <div v-if="form.jdwj">
-                    {{ form.jdwj }}
+                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                  <div v-if="form.jdwjName">
+                    {{ form.jdwjName }}
                   </div>
                   <div v-else>
                     - -
@@ -466,9 +466,9 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
-                  <div v-if="form.glwj">
-                    {{ form.glwj }}
+                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                  <div v-if="form.glwjName">
+                    {{ form.glwjName }}
                   </div>
                   <div v-else>
                     - -
@@ -722,6 +722,16 @@ export default {
         jdwj: '', // 解读文件
         zbjbd: '', // 增补件
         kwj: '', // 勘误件
+        caName: '', // 草案
+        fbgbjbdName: '', // 发布稿
+        xgdName: '', // 修改单
+        bpgName: '', // 报批稿
+        ssgName: '', // 送审稿
+        zqyjgName: '', // 征求意见稿
+        jdwjName: '', // 解读文件
+        zbjbdName: '', // 增补件
+        kwjName: '', // 勘误件
+        glwjName: '', // 关联文件
         // 适用范围
         txlb: '', // 体系类别
         gkdw: '', // 归口管理部门
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 4be4dffe5..ed2fbb46f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -188,78 +188,258 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
-                  <div v-if="form.xgd">
-                    {{ form.xgd }}
+                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.xgdName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.xgdName">
+                    {{ form.xgdName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('xgd')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('xgd')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
-                  <div v-if="form.fbgbjbd">
-                    {{ form.fbgbjbd }}
+                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.fbgbjbdName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.fbgbjbdName">
+                    {{ form.fbgbjbdName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('fbgbjbd')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('fbgbjbd')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
-                  <div v-if="form.zbjbd">
-                    {{ form.zbjbd }}
+                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.zbjbdName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.zbjbdName">
+                    {{ form.zbjbdName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('zbjbd')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('zbjbd')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
-                  <div v-if="form.bpg">
-                    {{ form.bpg }}
+                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.bpgName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.bpgName">
+                    {{ form.bpgName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('bpg')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('bpg')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssg">
-                    {{ form.ssg }}
+                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.ssgName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.ssgName">
+                    {{ form.ssgName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('ssg')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('ssg')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwj" class="add-form-item form-item-disabled">
-                  <div v-if="form.kwj">
-                    {{ form.kwj }}
+                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.kwjName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.kwjName">
+                    {{ form.kwjName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('kwj')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('kwj')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
-                  <div v-if="form.zqyjg">
-                    {{ form.zqyjg }}
+                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.zqyjgName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.zqyjgName">
+                    {{ form.zqyjgName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('zqyjg')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('zqyjg')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
-                  <div v-if="form.ca">
-                    {{ form.ca }}
+                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.caName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.caName">
+                    {{ form.caName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('ca')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('ca')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwj" class="add-form-item form-item-disabled">
-                  <div v-if="form.jdwj">
-                    {{ form.jdwj }}
+                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.jdwjName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.jdwjName">
+                    {{ form.jdwjName }}
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            style="margin-left: 10px"
+                            @click="fileUpload('jdwj')">
+                      重新上传
+                    </el-button>
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('jdwj')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
               </el-col>
@@ -446,12 +626,24 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
-                  <div v-if="form.glwj">
-                    {{ form.glwj }}
+                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                  <el-input
+                          disabled
+                          style="display: none;"
+                          v-model="form.glwjName"
+                          clearable
+                  ></el-input>
+                  <div v-if="form.glwjName">
+                    {{ form.glwjName }}
                   </div>
                   <div v-else>
-                    - -
+                    <el-button
+                            type="primary"
+                            class="common-button-primary"
+                            size="mini"
+                            @click="fileUpload('glwj')">
+                      点击上传
+                    </el-button>
                   </div>
                 </el-form-item>
               </el-col>
@@ -633,6 +825,24 @@
         @submit="handleSubmit"
     >
     </ProcessFooter>
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+      <el-upload
+              multiple
+              drag
+              :action="fileUrl"
+              ref="importfile"
+              name="file"
+              accept=".ZIP, .zip, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
+              :before-upload="beginImportFile"
+              :on-success="importFileSuccess"
+              :show-file-list="false"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -667,6 +877,9 @@ export default {
       nodeKey: 'id',
       defaultCheckedKeys: [],
       treeStatus:false,
+      fileUrl: 'api/att/attFile/upload',
+      fileMadel: false,
+      fileType: '',
       form: {
         // 基础信息
         textStatus: '', // 文本状态
@@ -700,6 +913,16 @@ export default {
         jdwj: '', // 解读文件
         zbjbd: '', // 增补件
         kwj: '', // 勘误件
+        caName: '', // 草案
+        fbgbjbdName: '', // 发布稿
+        xgdName: '', // 修改单
+        bpgName: '', // 报批稿
+        ssgName: '', // 送审稿
+        zqyjgName: '', // 征求意见稿
+        jdwjName: '', // 解读文件
+        zbjbdName: '', // 增补件
+        kwjName: '', // 勘误件
+        glwjName: '', // 关联文件
         // 适用范围
         txlb: '', // 体系类别
         gkdw: '', // 归口管理部门
@@ -769,6 +992,77 @@ export default {
     },
   },
   methods: {
+    beginImportFile (file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      // 判断上传文件格式
+      if (fileSuffix === '.ZIP' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOC/DOCX或XLS文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // 导入标准数据成功后执行
+    importFileSuccess (response, file) {
+      if (response.ok) {
+        this.fileMadel = false
+        if(this.fileType === 'fbgbjbd'){
+          this.form.fbgbjbd = response.data.id;
+          this.form.fbgbjbdName = response.data.name;
+        }else if(this.fileType === 'xgd'){
+          this.form.xgd = response.data.id;
+          this.form.xgdName = response.data.name;
+        }else if(this.fileType === 'bpg'){
+          this.form.bpg = response.data.id;
+          this.form.bpgName = response.data.name;
+        }else if(this.fileType === 'ssg'){
+          this.form.ssg = response.data.id;
+          this.form.ssgName = response.data.name;
+        }else if(this.fileType === 'zqyjg'){
+          this.form.zqyjg = response.data.id;
+          this.form.zqyjgName = response.data.name;
+        }else if(this.fileType === 'jdwj'){
+          this.form.jdwj = response.data.id;
+          this.form.jdwjName = response.data.name;
+        }else if(this.fileType === 'kwj'){
+          this.form.kwj = response.data.id;
+          this.form.kwjName = response.data.name;
+        }else if(this.fileType === 'xgd'){
+          this.form.xgd = response.data.id;
+          this.form.xgdName = response.data.name;
+        }else if(this.fileType === 'glwj'){
+          this.form.glwj = response.data.id;
+          this.form.glwjName = response.data.name;
+        }else if(this.fileType === 'ca'){
+          this.form.ca = response.data.id;
+          this.form.caName = response.data.name;
+        }
+        this.$message({
+          showClose: true,
+          message: response.message,
+          type: 'success'
+        })
+      }
+    },
+    fileUpload (type) {
+      this.fileType = '';
+      this.fileMadel = true
+      this.fileType = type;
+    },
     popoverHide (checkedIds, checkedData) {
       console.log(checkedIds);
       console.log(checkedData);

From 7fbea78a8a8b5b3c63b6b41de6b8a52b319ec3b5 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 13 Jul 2021 17:54:39 +0800
Subject: [PATCH 06/25] commit

---
 src/pages/localTool/standAutoSplit/index.vue  |  34 +-
 .../pages/creatProcess/bzjd/step1.vue         | 612 ++++++++++++++++++
 .../pages/creatProcess/bzjd/step2.vue         | 300 +++++++++
 .../pages/creatProcess/bzzqyj/step1.vue       | 115 ++--
 .../processCenter/pages/newProcess/index.vue  |   5 +
 .../tabComponents/processCenter/index.vue     |  15 +-
 src/router/index.js                           |  18 +
 7 files changed, 1031 insertions(+), 68 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue
index 018032f77..17566a64b 100644
--- a/src/pages/localTool/standAutoSplit/index.vue
+++ b/src/pages/localTool/standAutoSplit/index.vue
@@ -29,8 +29,8 @@
     <div class="content">
       <div class="action-bar">
         <el-button size="mini"  @click="spiltStandFile" v-btn-permission="''"><i class="iconfont"></i>拆分</el-button>
-        <el-button size="mini"  @click="clickButtonToUpload" v-btn-permission="''"><i class="iconfont">&#xe65d;</i>上传</el-button>
-        <el-button size="mini"  @click="clickButtonToImport" v-btn-permission="''"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button>
+<!--        <el-button size="mini"  @click="clickButtonToUpload" v-btn-permission="''"><i class="iconfont">&#xe65d;</i>上传</el-button>-->
+<!--        <el-button size="mini"  @click="clickButtonToImport" v-btn-permission="''"><i class="iconfont">&#xe6de;</i>导入拆分结果</el-button>-->
         <el-button size="mini"  @click="batchDelete" v-btn-permission="''"><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
       <div class="table-wrap">
@@ -110,21 +110,21 @@
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="''">查看</el-dropdown-item>
-                    <el-dropdown-item
-                        v-if="scope.row.collectBtn"
-                        :command="[scope.row, '收藏']"
-                        v-btn-permission="''"
-                    >
-                      收藏
-                    </el-dropdown-item>
-                    <el-dropdown-item
-                        v-else
-                        :command="[scope.row, '取消收藏']"
-                        v-btn-permission="''"
-                    >
-                      取消收藏
-                    </el-dropdown-item>
-                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="''">分享</el-dropdown-item>
+<!--                    <el-dropdown-item-->
+<!--                        v-if="scope.row.collectBtn"-->
+<!--                        :command="[scope.row, '收藏']"-->
+<!--                        v-btn-permission="''"-->
+<!--                    >-->
+<!--                      收藏-->
+<!--                    </el-dropdown-item>-->
+<!--                    <el-dropdown-item-->
+<!--                        v-else-->
+<!--                        :command="[scope.row, '取消收藏']"-->
+<!--                        v-btn-permission="''"-->
+<!--                    >-->
+<!--                      取消收藏-->
+<!--                    </el-dropdown-item>-->
+<!--                    <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="''">分享</el-dropdown-item>-->
 <!--                    <el-dropdown-item :command="[scope.row, '关联']">关联</el-dropdown-item>-->
                     <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                   </el-dropdown-menu>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
new file mode 100644
index 000000000..de83172fa
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -0,0 +1,612 @@
+<template>
+    <div class="bzjdStep1">
+        <!--    标准征求意见流程-->
+        <ProcessHeader toggle>
+            <template slot="proName">标准解读流程</template>
+            <template slot="proNode">申请人发起流程</template>
+        </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;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
+                                    <div class="addButton">
+                                        <el-button  size="small" type="primary" @click="addZqyjList">带入</el-button>
+                                    </div>
+                                </el-form-item>
+                                <el-form-item label="标准号/政策号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称/政策名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <div class="content" v-show="active === '2'">
+            <div class="block" style="padding-top: 20px;">
+                <el-timeline>
+                    <el-form
+                            ref="Form"
+                            :model="roleForm"
+                            :rules="roleFormRules"
+                            class="label-input-form">
+                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.applyUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="applyUserId" style="margin-bottom: 0">
+                                    <h4>流程发起人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.applyUserId" style="display: none;"/>
+                                        <el-input v-model="roleForm.applyUserIdName" placeholder="流程发起人" disabled/>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="对接部门责任人" placement="top" :color="roleForm.zrUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="zrUserId" style="margin-bottom: 0">
+                                    <h4>对接部门责任人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.zrUserId" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.zrUserIdName"
+                                                placeholder="选择责任部门对接人"
+                                                @click.native="choiceZRRS">
+                                        </el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="批准解读流程" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="deptUserId" style="margin-bottom: 0">
+                                    <h4>标准法规部部长</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.deptUserId" style="display: none;"/>
+                                        <el-input
+                                                v-model="roleForm.deptUserIdName"
+                                                placeholder="选择标准法规部部长·"
+                                                @click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
+                                        />
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                    </el-form>
+                </el-timeline>
+            </div>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="标准征求意见数据库"
+                :visible.sync="listModel"
+                size="900px"
+                custom-class="demo-drawer"
+        >
+            <div class="standardForComments">
+                <div class="content">
+                    <!-- 顶部工具栏 -->
+                    <table-tools-bar>
+                        <div slot="left">
+                            <div class="search-area">
+                                <el-form :model="standCommonlySearch" inline class="label-input-form">
+                                    <el-formItem label="标准号/名称" class="search-item">
+                                        <el-input v-model="standCommonlySearch.numOrName" class="s-c-input" placeholder="请输入标准号/名称" clearable :maxlength="100"></el-input>
+                                    </el-formItem>
+                                    <el-formItem class="search-item btn-box">
+                                        <el-button
+                                                type="primary"
+                                                size="mini"
+                                                class="common-button-primary"
+
+                                                @click="sarStandCompareHisInfo">查询</el-button>
+                                        <el-button
+                                                class="common-button-default"
+                                                size="mini"
+                                                @click="clearSearchStand">清空</el-button>
+                                    </el-formItem>
+                                </el-form>
+                            </div>
+                        </div>
+                    </table-tools-bar>
+                    <div class="table-wrap">
+                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                            <el-table
+                                    ref="selection"
+                                    :data="standInfoList"
+                                    tooltip-effect="dark"
+                                    style="width: 100%;padding:0 0 20px 0;"
+                                    height="100%"
+                                    border
+                                    @selection-change="handleSelection"
+                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                                <el-table-column type="selection" width="55" align="center"/>
+                                <el-table-column
+                                        prop="showNumber"
+                                        label="标准号/政策号"
+                                        width="170"
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>
+                                        <div v-else>{{ scope.row.showNumber }}</div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="standName"
+                                        label="标准名称/政策名称"
+                                        show-overflow-tooltip
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>
+                                        <span v-else>{{ scope.row.standName }}</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </div>
+                </div>
+                <pagination :page="standCommonlySearch.page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+                <loading :loading="spinShow">数据加载中……</loading>
+                <div class="demo-drawer-footer">
+                    <el-button size="mini" @click="closeDrawer">取消</el-button>
+                    <el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
+                </div>
+            </div>
+        </el-drawer>
+        <el-drawer
+                :title="drawerTitle"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    node-key="id"
+                    style="height: 100%; overflow: auto;"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    @check="drawerCheck"
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+        <el-drawer
+                title="选择责任部门对接人"
+                :visible.sync="modalshowflag2"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag2"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList2"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree2">
+            </el-tree>
+            <div id="roleFormButton2" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
+</template>
+
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+
+    export default {
+        name: "bzjdStep1",
+        data() {
+            return {
+                commentText: '',
+                textarea: '', // 意见
+                title: '', // 新增抽屉标题
+                listModel: false, // 新增抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                // 基础信息form表单
+                form: {
+                    number: '',
+                    name: '',
+                    id: '',
+                },
+                formRules: {
+                    number: [
+                        { required: true, message: '请输入标准号/政策号', trigger: 'change' },
+                    ],
+                    name: [
+                        { required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
+                    ],
+                },
+                // 标准征求意见数据可库
+                standCommonlySearch: {
+                    numOrName: '',
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    result: '1'
+                },
+                spinShow: false,
+                standInfoList: [],
+                tableHeight: null,
+                total: 0,
+                selectedList: [],
+                data: [],
+                roleForm: {
+                    applyUserIdName: this.$store.getters.userInfo.userName,
+                    applyUserId: this.$store.getters.userInfo.userId,
+                    zrUserId: '',
+                    zrUserIdName: '',
+                    deptUserId: '',
+                    deptUserIdName: ''
+                },
+                roleFormRules: {
+                    zrUserId: [
+                        { required: true, message: '请选择责任部门对接人', trigger: 'change' },
+                    ],
+                    deptUserId: [
+                        { required: true, message: '请选择标准法规部部长', trigger: 'change' },
+                    ],
+                },
+                treeData: [],
+                nodeList: [],
+                nodeList2: [],
+                type: '',
+                drawerTitle: '',
+                modalshowflag: false,
+                modalshowflag2: false,
+                defaultProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                roleRow: {},
+                itemList: []
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        mounted () {
+            this.getTree()
+            this.sarStandCompareHis()
+            this.tableHeight = $('.content').height() - 44
+            window.onresize = () => {
+                this.tableHeight = $('.content').height() - 44
+            }
+        },
+        methods: {
+            addZqyjList() {
+                this.title = '标准拆分数据库'
+                this.listModel = true
+            },
+            /** 标准征求意见库方法*
+             * **********************************************/
+            // 清空
+            clearSearchStand () {
+                this.standCommonlySearch.page = 1
+                this.standCommonlySearch.start = ''
+                this.standCommonlySearch.end = ''
+                this.standCommonlySearch.categorg = ''
+                this.standCommonlySearch.cname = ''
+                this.sarStandCompareHis()
+            },
+            // 搜索
+            sarStandCompareHisInfo() {
+                this.splitInfoPage = 1
+                this.sarStandCompareHis()
+            },
+            // 查询表格
+            sarStandCompareHis () {
+                this.spinShow = true
+                var form = this.standCommonlySearch
+                this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
+                    _this: this
+                }, res => {
+                    this.standInfoList = res.data.list
+                    this.total = res.data.total
+                    this.spinShow = false
+                }, e => {
+                })
+            },
+            pageChange (page) {
+                this.standCommonlySearch.page = page
+                this.sarStandCompareHis()
+            },
+            // 分页每页显示数改变后方法
+            pageSizeChange (pageSize) {
+                this.$store.getters.userInfo.configContent = pageSize
+                this.standCommonlySearch.size = pageSize
+                this.sarStandCompareHis()
+            },
+            /** 选择带入数据的方法操作
+             * */
+            handleSelection(data) {
+                this.selectedList = [];
+                for (let i = 0; i < data.length; i++) {
+                    this.selectedList.push(data[i].id);
+                }
+            },
+            closeDrawer() {
+                this.listModel = false
+            },
+            enterDrawer() {
+                if (this.selectedList.length === 1) {
+                    let deposit = new Map();
+                    this.standInfoList.forEach(item => {
+                        deposit.set(item.id, item);
+                    });
+                    let bringData = [];
+                    for (let i = 0; i < this.selectedList.length; i++) {
+                        bringData.push(deposit.get(this.selectedList[i]));
+                    }
+                    if (bringData[0].splitStatus === '0') {
+                        this.form.number = bringData[0].standNumSplit
+                        this.form.name = bringData[0].standNameSplit
+                    } else {
+                        this.form.number = bringData[0].showNumber
+                        this.form.name = bringData[0].standName
+                    }
+                    this.form.id = bringData[0].id
+                    this.listModel = false;
+                    this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
+                        infoId: this.form.id,
+                        page: 1,
+                        pageSize: 9999
+                    }, {
+                        _this: this
+                    }, res => {
+                        if (res.ok) {
+                            this.itemList = res.data.list
+                            console.log(res);
+                        }
+                    })
+                } else if (this.selectedList.length > 1) {
+                    this.$message.warning("只能选择一条数据进行带入");
+                } else {
+                    this.$message.warning("请选择一条数据进行带入");
+                }
+            },
+            /*** **********************************************/
+            /** 流程节点负责人的选择 *****************************/
+            choiceZRR (type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.type = type
+                this.drawerTitle = title
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            saveUserInfo () {
+                if (this.type === 'deptUserId') {
+                    this.roleForm.deptUserId = this.roleRow.id
+                    this.roleForm.deptUserIdName = this.roleRow.name
+                }
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            drawerCheck (data) {
+                var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+                if(getlist.length == 1) {
+                    this.roleRow = getlist[0]
+                }else {
+                    this.$refs.tree.setCheckedKeys([data.id]);
+                    this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+                }
+            },
+            choiceZRRS () {
+                this.nodeList2 = []
+                if ( this.roleForm.zrUserId.length > 0) {
+                    this.nodeList2 = this.roleForm.zrUserId.split(',')
+                }
+                this.modalshowflag2 = true
+            },
+            saveUserInfo2 () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.roleForm.zrUserId = idList
+                this.roleForm.zrUserIdName = nameList
+                this.modalshowflag2 = false
+            },
+            cancleUserInfo2 () {
+                this.modalshowflag2 = false
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        this.$refs['Form'].validate((valid) => {
+                            if (valid) {
+                                this.$http.get('lawss/activiti/startProcess', {
+                                    type: '9'
+                                }, {}, res => {
+                                    if (res.ok) {
+                                        var json = Object.assign(this.form, this.roleForm)
+                                        json.commentText = this.commentText
+                                        json.itemList = this.itemList
+                                        this.$http.post('lawss/activiti/completeTask', {
+                                            json: JSON.stringify(json),
+                                            taskId: res.data,
+                                            userId: this.$store.getters.userInfo.userId
+                                        }, {}, res => {
+                                            if (res.success) {
+                                                this.$message.success('流程发起成功')
+                                                this.$router.push('/processCenter')
+                                            }
+                                        })
+                                    } else {
+                                        this.$message.warning('流程启动失败')
+                                    }
+                                })
+                            } else {
+                                return this.$message.warning('请完善人员信息')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            }
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    @import '~@/assets/styles/mixins';
+    .bzjdStep1 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 107px');
+            overflow: auto;
+        }
+        .standardForComments {
+            height: 100%;
+            background: #fff;
+            .el-divider--horizontal {
+                display: block;
+                height: 1px;
+                width: 100%;
+                margin: 0;
+            }
+            flex-direction: column;
+            .action-bar {
+                margin-bottom: 5px;
+                padding: 0;
+            }
+            .content {
+                flex: auto;
+                overflow: hidden;
+                display: flex;
+                flex-direction: column;
+                .table-wrap {
+                    flex: auto;
+                    overflow: hidden;
+                    position: relative;
+                }
+            }
+            & > .pagination {
+                position: static;
+                /deep/.pagination-slot {
+                    padding: 0;
+                }
+            }
+        }
+    }
+</style>
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
new file mode 100644
index 000000000..8f931edfe
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -0,0 +1,300 @@
+<template>
+    <div class="bzjdStep2">
+        <!--    标准调研流程-->
+        <ProcessHeader toggle>
+            <template slot="proName">标准征求意见流程</template>
+            <template slot="proNode">对接人选择责任人</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.cid"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.cname"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            disabled
+                                            v-model="form.endTime"
+                                            type="date"
+                                            placeholder="请选择结束日期">
+                                    </el-date-picker>
+                                </el-form-item>
+                                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.responUserList"
+                                            style="display: none;"
+                                            clearable
+                                    ></el-input>
+                                    <el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="选择责任人"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+    export default {
+        name: "bzjdStep2",
+        data() {
+            return {
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                roleRow: {},
+                nodeList: [],
+                type: '',
+                defaultProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                treeData: [], // 人员数据
+                modalshowflag: false, // drawer开关
+                drawerTitle: '', //drawer标题
+                textarea: '', // 意见
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    cid: '', // 编号
+                    endTime: '', // 结束日期
+                    cname: '', // 名称
+                    responUserList: '',
+                    responUserListName: ''
+                },
+                formRules: {
+                    responUserList: [
+                        { required: true, message: '请选择责任人', trigger: 'change' },
+                    ]
+                },
+                json: {}
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            saveUserInfo () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.form.responUserList = idList
+                this.form.responUserListName = nameList
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            choiceZRR () {
+                this.nodeList = []
+                if (this.form.responUserList.length > 0) {
+                    this.nodeList = this.form.responUserList.split(',')
+                }
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.commentText = this.commentText
+                        json.responUserList = this.form.responUserList
+                        json.responUserListName = this.form.responUserListName
+                        this.$http.post('lawss/activiti/completeTask', {
+                            json: JSON.stringify(json),
+                            taskId: this.taskIds,
+                            userId: this.$store.getters.userInfo.userId
+                        }, {}, res => {
+                            if (res.success) {
+                                this.$message.success('提交成功')
+                                this.$router.push('/processCenter')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.cid = data.cid
+                        this.form.endTime = data.endTime
+                        this.form.cname = data.cname
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getTree()
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzjdStep2 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        .fileClass {
+            cursor: pointer;
+        }
+        .fileClass:hover{
+            color: #0c91e5;
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index f94edf853..b62928f2d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -29,7 +29,7 @@
                     <el-button  size="small" type="primary" @click="addZqyjList">选择征求意见</el-button>
                   </div>
                 </el-form-item>
-                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                <el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
                   <el-input
                           disabled
                           v-model="form.cid"
@@ -47,7 +47,6 @@
                 </el-form-item>
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
-                          disabled
                           v-model="form.endTime"
                           type="date"
                           placeholder="请选择结束日期">
@@ -177,34 +176,34 @@
           <table-tools-bar>
             <div slot="left">
               <div class="search-area">
-                <el-form :model="standCommonlySearch" inline class="label-input-form">
-                  <el-formItem label="类别" class="search-item">
-                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>
-                  </el-formItem>
-                  <el-formItem label="关键字" class="search-item">
-                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>
-                  </el-formItem>
-                  <el-formItem label="开始日期" class="search-item">
-                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"
-                                   placeholder="请选择开始日期"></el-datePicker>
-                  </el-formItem>
-                  <el-formItem label="结束日期" class="search-item">
-                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"
-                                   placeholder="请选择结束日期"></el-datePicker>
-                  </el-formItem>
-                  <el-formItem class="search-item btn-box">
-                    <el-button
-                            type="primary"
-                            size="mini"
-                            class="common-button-primary"
+<!--                <el-form :model="standCommonlySearch" inline class="label-input-form">-->
+<!--&lt;!&ndash;                  <el-formItem label="类别" class="search-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.categorg" class="s-c-input" placeholder="标准/政策" clearable :maxlength="100"></el-input>&ndash;&gt;-->
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <el-formItem label="关键字" class="search-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <el-input v-model="standCommonlySearch.cname" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100"></el-input>&ndash;&gt;-->
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <el-formItem label="开始日期" class="search-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.start" :editable="false"&ndash;&gt;-->
+<!--&lt;!&ndash;                                   placeholder="请选择开始日期"></el-datePicker>&ndash;&gt;-->
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+<!--&lt;!&ndash;                  <el-formItem label="结束日期" class="search-item">&ndash;&gt;-->
+<!--&lt;!&ndash;                    <el-datePicker v-model="standCommonlySearch.end" :editable="false"&ndash;&gt;-->
+<!--&lt;!&ndash;                                   placeholder="请选择结束日期"></el-datePicker>&ndash;&gt;-->
+<!--&lt;!&ndash;                  </el-formItem>&ndash;&gt;-->
+<!--                  <el-formItem class="search-item btn-box">-->
+<!--                    <el-button-->
+<!--                            type="primary"-->
+<!--                            size="mini"-->
+<!--                            class="common-button-primary"-->
 
-                            @click="sarStandCompareHisInfo">查询</el-button>
-                    <el-button
-                            class="common-button-default"
-                            size="mini"
-                            @click="clearSearchStand">清空</el-button>
-                  </el-formItem>
-                </el-form>
+<!--                            @click="sarStandCompareHisInfo">查询</el-button>-->
+<!--                    <el-button-->
+<!--                            class="common-button-default"-->
+<!--                            size="mini"-->
+<!--                            @click="clearSearchStand">清空</el-button>-->
+<!--                  </el-formItem>-->
+<!--                </el-form>-->
               </div>
             </div>
           </table-tools-bar>
@@ -220,10 +219,17 @@
                 @selection-change="handleSelection"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
                 <el-table-column type="selection" width="55" align="center"/>
-                <el-table-column prop="category" label="标准" align="center"/>
-                <el-table-column prop="cname" label="标准名称/政策名称" align="center"/>
-                <el-table-column prop="endTime" label="征求意见周期" align="center"/>
-                <el-table-column prop="startTime" label="上传时间" align="center"/>
+                <el-table-column label="标准号" align="center">
+                  <template slot-scope="scope">
+                    <div v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div>
+                    <div v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cname" label="标准名称" align="center">
+                  <template slot-scope="scope">
+                    <div>{{ scope.row.standName }}</div>
+                  </template>
+                </el-table-column>
               </el-table>
             </div>
           </div>
@@ -326,12 +332,12 @@ export default {
       },
       // 标准征求意见数据可库
       standCommonlySearch: {
-        categorg: '',
-        cname: '',
-        start: '',
-        end: '',
+        // categorg: '',
+        // cname: '',
+        // start: '',
+        // end: '',
         page: 1,
-        size: this.$store.getters.userInfo.configContent
+        pageSize: this.$store.getters.userInfo.configContent
       },
       spinShow: false,
       standInfoList: [],
@@ -394,7 +400,7 @@ export default {
   },
   methods: {
     addZqyjList() {
-      this.title = '标准征求意见库'
+      this.title = '国内外标准库'
       this.listModel = true
     },
     /** 标准征求意见库方法*
@@ -416,15 +422,23 @@ export default {
     // 查询表格
     sarStandCompareHis () {
       this.spinShow = true
-      var form = this.standCommonlySearch
-      this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
-        _this: this
-      }, res => {
-        this.standInfoList = res.data.records
-        this.total = res.data.total
+      var formData = this.standCommonlySearch
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+                _this: this
+              }, res => {
+        this.standInfoList = res.data.list
+        this.total = res.data.count
         this.spinShow = false
-      }, e => {
       })
+      // var form = this.standCommonlySearch
+      // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
+      //   _this: this
+      // }, res => {
+      //   this.standInfoList = res.data.records
+      //   this.total = res.data.total
+      //   this.spinShow = false
+      // }, e => {
+      // })
     },
     pageChange (page) {
       this.standCommonlySearch.page = page
@@ -457,9 +471,12 @@ export default {
         for (let i = 0; i < this.selectedList.length; i++) {
           bringData.push(deposit.get(this.selectedList[i]));
         }
-        this.form.cid = bringData[0].cid
-        this.form.cname = bringData[0].cname;
-        this.form.endTime = bringData[0].endTime;
+        if (bringData[0].standYear) {
+          this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
+        } else {
+          this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
+        }
+        this.form.cname = bringData[0].standName;
         this.listModel = false;
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue
index b8dc2838e..e67bc49f0 100644
--- a/src/pages/processCenter/pages/newProcess/index.vue
+++ b/src/pages/processCenter/pages/newProcess/index.vue
@@ -12,6 +12,7 @@
         <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
         <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
         <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
+        <div class="process-name" @click="handleCreateProcess('9')">标准解读流程</div>
       </div>
     </div>
     <div v-if="zcgllc">
@@ -98,6 +99,10 @@ export default {
           })
           break
         case '9':
+          // 标准解读流程
+          this.$router.push({
+            name:'bzjdStep1'
+          })
           break
         case '10':
           break
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index f4560e1ba..0227134b8 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -344,7 +344,6 @@ export default {
             })
           }
           break;
-          break
         case '3':
           if (row.taskInfo === '责任对接人选择责任人') {
             this.$router.push({
@@ -489,7 +488,19 @@ export default {
             })
           }
           break
-
+        case '9':
+          if (row.taskInfo === '') {
+            this.$router.push({
+              name: 'bzjdStep2',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }
       }
     },
     ...mapMutations(['setProcess', 'setHandleInfo']),
diff --git a/src/router/index.js b/src/router/index.js
index a61dcc0e4..5ffdff44e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -591,6 +591,24 @@ const routes = [
           title: '标准调研流程'
         }
       },
+      {
+        path: '/bzjdStep1',
+        name: 'bzjdStep1',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/bzjdStep2',
+        name: 'bzjdStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step2.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具

From c70d436e0f570487216f15ab759a40bf896be8c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 14 Jul 2021 13:48:06 +0800
Subject: [PATCH 07/25] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step1.vue         | 126 ++--
 .../pages/creatProcess/xmpg/step2.vue         |  11 +-
 .../pages/creatProcess/xmpg/step3.vue         |  24 +-
 .../pages/creatProcess/xmpg/step4.vue         | 180 +++++-
 .../pages/creatProcess/xmpg/step5.vue         | 554 +++++++++++++++++-
 .../tabComponents/processCenter/index.vue     |  22 +
 6 files changed, 823 insertions(+), 94 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index d0a06cde7..2fcc2a5ed 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -17,6 +17,7 @@
         <el-form
           :model="listForm"
           :rules="formRules"
+          ref="xmpgForm"
           class="label-input-form prc-content-border"
           label-width="150px"
         >
@@ -39,18 +40,17 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.certifiedEngineer"
+                  v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                   clearable
                   @click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
                 ></el-input>
-                <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
               </el-form-item>
-              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.qualityEngineer"
+                  v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                   clearable
                   @click.native="choiceZRR(null,'qualityEngineer', '选择质量工程师', roleForm.qualityEngineer)"
@@ -139,12 +139,12 @@
             </el-timeline-item>
             <el-timeline-item timestamp="标准法规部领导审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
               <el-card>
-                <el-form-item prop="directorUserName" style="margin-bottom: 0">
+                <el-form-item prop="ministerUserName" style="margin-bottom: 0">
                   <h4>标准法规部领导</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="请选择标准法规部领导"
-                              @click.native="choiceZRR(null,'directorUser', '选择标准法规部领导', roleForm.directorUser)"></el-input>
+                    <el-input v-model="roleForm.ministerUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.ministerUserName" placeholder="请选择标准法规部领导"
+                              @click.native="choiceZRR(null,'ministerUser', '选择标准法规部领导', roleForm.ministerUser)"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -354,26 +354,35 @@ export default {
         startUser: this.$store.getters.userInfo.id,
         qualityEngineer: "",
         certifiedEngineer:"",
+        qualityEngineerName: "",
+        certifiedEngineerName:"",
         distributePerson: "",
+        dockUser:'',
+        ministerUser:"",
+        dockUserName:'',
+        ministerUserName:"",
       },
       formRules: {
-        listType: [
-          { required: true, message: "请选择清单类型", trigger: "blur" }
+        standName: [
+          { required: true, message: "请填写标准名称", trigger: "change" }
+        ],
+        standNumber: [
+          { required: true, message: "请填写标准编号", trigger: "change" }
+        ],
+        qualityEngineer: [
+          { required: true, message: "请选择质量工程师", trigger: "change" }
+        ],
+        certifiedEngineer: [
+          { required: true, message: "请选择认证工程师", trigger: "change" }
         ],
-        listName: [
-          { required: true, message: "请填写清单名称", trigger: "change" }
-        ]
       },
       roleFormRules: {
-        // dockUserName: [
-        //   { required: true, message: "请选择会签责任人", trigger: "blur" }
-        // ],
+        dockUserName: [
+          { required: true, message: "请选择业务经理", trigger: "change" }
+        ],
         ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "blur" }
+          { required: true, message: "请选择标准法规部领导", trigger: "change" }
         ],
-        directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "blur" }
-        ]
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
@@ -440,16 +449,16 @@ export default {
       } else if (this.type === "ministerUser") {
         this.roleForm.ministerUser = this.roleRow.id;
         this.roleForm.ministerUserName = this.roleRow.name;
-      } else if (this.type === "directorUser") {
-        this.roleForm.directorUser = this.roleRow.id;
-        this.roleForm.directorUserName = this.roleRow.name;
-      } else if (this.type === "presidentUser") {
-        this.roleForm.presidentUser = this.roleRow.id;
-        this.roleForm.presidentUserName = this.roleRow.name;
       } else if (this.type === "qualityEngineer") {
-        this.listForm.qualityEngineer = this.roleRow.name;
+        this.roleForm.qualityEngineer = this.roleRow.id;
+        this.roleForm.qualityEngineerName = this.roleRow.name;
+        this.listForm.qualityEngineer = this.roleForm.qualityEngineer;
+        this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName;
       } else if (this.type === "certifiedEngineer") {
-        this.listForm.certifiedEngineer = this.roleRow.name;
+        this.roleForm.certifiedEngineer = this.roleRow.id;
+        this.roleForm.certifiedEngineerName = this.roleRow.name;
+        this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer;
+        this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName;
       } else if (this.type === "distributePerson") {
         this.listForm.distributePerson = this.roleRow.name;
         this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id
@@ -527,32 +536,41 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      let json = this.listForm;
-      json.zrUserId = this.$store.getters.userInfo.userId;
-      json.jlUserId = this.$store.getters.userInfo.userId;
-      json.applyUpdUserId = this.$store.getters.userInfo.userId;
-      json.approvalOpinion = "";
-      json.prcCreateUser = this.$store.getters.userInfo.userId;
-      json.prcCreateUserName = this.$store.getters.userInfo.account;
+      console.log(this.roleForm)
+      console.log(this.listForm);
+      // var json = this.listForm
+      var json = Object.assign(this.listForm, this.roleForm)
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standId = this.listForm.standId;
-      this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          this.$http.post("lawss/activiti/completeTask", {
-            taskIds: res.data,
-            userId: this.$store.getters.userInfo.userId,
-            json: JSON.stringify(json)
-          }, {
-            _this: this
-          }, res => {
-            if (res.success) {
-              this.$message.success(res.message);
-              this.$router.push("/processCenter");
+      this.$refs["xmpgForm"].validate((valid) => {
+        if (valid) {
+          this.$refs["Form"].validate((valid) => {
+            if (valid) {
+              this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
+                _this: this
+              }, res => {
+                if (res.ok) {
+                  this.$http.post("lawss/activiti/completeTask", {
+                    taskIds: res.data,
+                    userId: this.$store.getters.userInfo.userId,
+                    json: JSON.stringify(json)
+                  }, {
+                    _this: this
+                  }, res => {
+                    if (res.success) {
+                      this.$message.success(res.message);
+                      this.$router.push("/processCenter");
+                    }
+                  });
+                }
+              });
+            } else {
+              return this.$message.warning("请完善人员信息");
             }
           });
+        } else {
+          return this.$message.warning("请完善基础信息");
         }
       });
     },
@@ -600,7 +618,9 @@ export default {
       this.standList = data;
     },
     choiceZRR(scope,type, title, id) {
-      if(scope!=null)this.dsadadadsada=scope.$index;
+      if(scope!=null){
+        this.dsadadadsada = scope.$index;
+      }
       this.nodeList = [];
       this.nodeList.push(id);
       this.type = type;
@@ -632,8 +652,8 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res.data.records);
-        this.productData = res.data.records;
+        console.log(res.data);
+        this.productData = res.data;
         this.totalNo = res.data.total;
       }, e => {
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 5802df6c1..cc668d048 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -35,16 +35,16 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.certifiedEngineer"
+                  v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.qualityEngineer"
+                  v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                   clearable
                 ></el-input>
@@ -234,6 +234,8 @@ export default {
         standName: "",//标准名称
         certifiedEngineer: "", //认证工程师
         qualityEngineer: "", //质量工程师
+        certifiedEngineerName: "", //认证工程师
+        qualityEngineerName: "", //质量工程师
         breakdownList: [{
           applyArctic: "",
           busStandCover: "",
@@ -302,6 +304,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.getFormFieldList(processForm)
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 1f5b0c1a7..fc188ebc6 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -35,16 +35,16 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.certifiedEngineer"
+                  v-model="listForm.certifiedEngineerName"
                   placeholder="请选择认证工程师"
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+              <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-model="listForm.qualityEngineer"
+                  v-model="listForm.qualityEngineerName"
                   placeholder="请选择质量工程师"
                   clearable
                 ></el-input>
@@ -97,6 +97,16 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="newTime"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="oldTime"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
           <el-table-column
             fixed="right"
             prop="implementer"
@@ -382,7 +392,11 @@ export default {
             distributePerson: item.pepdtos[i].distributePerson,
             distributePersonId: item.pepdtos[i].distributePersonId,
             uname: item.pepdtos[i].uname,
-            projectManager: item.pepdtos[i].projectManager
+            projectManager: item.pepdtos[i].projectManager,
+            certifiedEngineer: item.pepdtos[i].certifiedEngineer,
+            qualityEngineer: item.pepdtos[i].qualityEngineer,
+            standNumber: item.pepdtos[i].standNumber,
+            standName: item.pepdtos[i].standName,
           });
         }
       }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 401699a58..1d5416736 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -3,7 +3,7 @@
   <div class="xmpg-step4">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程</template>
-      <template slot="proNode">分发责任人分发任务</template>
+      <template slot="proNode">落实人填写评估反馈</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -75,90 +75,166 @@
           <el-table-column
             prop="productLine"
             align="center"
+            width="200"
             label="产品线">
           </el-table-column>
           <el-table-column
             prop="projectNumber"
             align="center"
+            width="200"
             label="项目编号">
           </el-table-column>
           <el-table-column
             prop="projectName"
             align="center"
+            width="200"
             label="项目名称">
           </el-table-column>
           <el-table-column
             prop="itemNum"
             align="center"
+            width="200"
             label="条款号">
           </el-table-column>
           <el-table-column
             prop="itemsName"
+            width="200"
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="newTime"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="oldTime"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
           <el-table-column
             prop="productType"
-            width="450"
             align="center"
             label="在研产品">
-            <el-table-column
-              prop="researchImplementationTime"
-              align="center"
-              label="实施时间">
-            </el-table-column>
             <el-table-column
               prop="researchCompliance"
               align="center"
+              width="160"
               label="合规">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="dataList[scope.$index].complianceReasons"
+                  placeholder="请输入合规原因"
+                >
+                </el-input>
+              </template>
             </el-table-column>
             <el-table-column
               align="center"
+              width="160"
               prop="researchNonCompliance"
               label="不合规">
               <el-table-column
                 prop="researchNonCompliance"
                 align="center"
+                width="160"
                 label="不合规项目">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].noCompliance"
+                    placeholder="请输入不合规项目"
+                  >
+                  </el-input>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="researchCountermeasures"
                 align="center"
+                width="160"
                 label="应对措施">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].countermeasures"
+                    placeholder="请输入应对措施"
+                  >
+                  </el-input>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="researchCompletionTime"
                 align="center"
+                width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="dataList[scope.$index].completionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
           <el-table-column
             align="center"
-            width="450"
             label="在产产品">
-            <el-table-column
-              prop="productionImplementationTime"
-              align="center"
-              label="实施时间">
-            </el-table-column>
             <el-table-column
               prop="productionCompliance"
               align="center"
+              width="160"
               label="合规(具体情况)">
+              <template slot-scope="scope">
+                <el-input
+                  v-model="dataList[scope.$index].zcComplianceReasons"
+                  placeholder="请输入合规原因"
+                >
+                </el-input>
+              </template>
             </el-table-column>
             <el-table-column
               align="center"
+              width="160"
               label="不合规">
+              <el-table-column
+                prop="productionNonCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].zcNoCompliance"
+                    placeholder="请输入不合规项目"
+                  >
+                  </el-input>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="productionCountermeasures"
                 align="center"
+                width="160"
                 label="应对措施">
+                <template slot-scope="scope">
+                  <el-input
+                    v-model="dataList[scope.$index].zcCountermeasures"
+                    placeholder="请输入应对措施"
+                  >
+                  </el-input>
+                </template>
               </el-table-column>
               <el-table-column
                 prop="productionCompletionTime"
                 align="center"
+                width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <el-date-picker
+                    v-model="dataList[scope.$index].zcCompletionTime"
+                    type="date"
+                    placeholder="选择日期">
+                  </el-date-picker>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
@@ -285,6 +361,7 @@ export default {
   },
   data() {
     return {
+
       detailData: [],
       sarProStateTableHeight: null, // 项目列表高度
       // 当前流程类型(1待办/2已办)
@@ -307,24 +384,62 @@ export default {
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       listForm: {
-        listType: "", //区分是哪个清单
-        listName: "", //清单名称
-        applyRegion: "", //适用区域
-        descriptionList: "", //清单说明
-        enclosure: "", //附件
-        inforlist: "",//用来存放标准的id
+          standNumber: "", //标准编号
+          standName: "",//标准名称
+          certifiedEngineer: "", //认证工程师
+          qualityEngineer: "", //质量工程师
         dataList: [{
-          standNumber: "", //标准号
-          cnName: "", //中文名称
-          enName: "", //英文名称
-          isSubTime: "", //发布日期
-          newCarTime: "", //新车型实施日期
-          oldCarTime: "", //在产车实施日期
-          applyCar: "", //适用车型
-          textState: "", //文本状态
-          id: ""
+          projectManager: '',
+          itemsName: '',
+          uname: '',
+          projectNumber: '',
+          implementer: '',
+          implementerId: '',
+          productLine: '',
+          itemNum:'',
+          distributePerson:'',
+          projectName:'',
+          distributePersonId:'',
+          complianceReasons:'', //在研合规原因
+          noCompliance:'', //在研不合规项目
+          countermeasures:'', //在研应对措施
+          completionTime:'', //在研完成时间
+          zcComplianceReasons: '', //在产的合规原因
+          zcNoCompliance:'', //在产不合规项目
+          zcCountermeasures:'', //在产的应对措施
+          zcCompletionTime:'', //在产的完成时间
         }]
       },
+      // listForm: {
+      //   standNumber: "", //标准编号
+      //   standName: "",//标准名称
+      //   certifiedEngineer: "", //认证工程师
+      //   qualityEngineer: "", //质量工程师
+      //   dataList: [{
+      //     certifiedEngineer: '',
+      //     projectManager: '',
+      //     standNumber: '',
+      //     itemsName: '',
+      //     uname: '',
+      //     projectNumber: '',
+      //     implementer: '',
+      //     implementerId: '',
+      //     productLine: '',
+      //     itemNum:'',
+      //     qualityEngineer: '',
+      //     distributePerson:'',
+      //     projectName:'',
+      //     standName:'',
+      //     distributePersonId:'',
+      //     complianceReasons:'', //在研合规原因
+      //     noCompliance:'', //在研不合规项目
+      //     countermeasures:'', //在研应对措施
+      //     completionTime:'', //在研完成时间
+      //     zcComplianceReasons: '', //在产的合规原因
+      //     zcCountermeasures:'', //在产的应对措施
+      //     zcCompletionTime:'', //在产的完成时间
+      //   }]
+      // },
       choiceForm: {}, //选择标准清单列表
       countryOptions: [], //适用区域下拉框数据
       user1: "",
@@ -358,6 +473,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.getFormFieldList(processForm)
@@ -375,8 +491,11 @@ export default {
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
-        this.listForm.dataList = item.dataList
-        this.dataList = item.dataList
+        this.dataList = item.step3DTOS
+        this.listForm.standName = item.step3DTOS[0].standName
+        this.listForm.standNumber = item.step3DTOS[0].standNumber
+        this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+        this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
       })
     },
 
@@ -394,6 +513,7 @@ export default {
       this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
+      this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index d657db275..e73024ac3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -1,13 +1,563 @@
+<!--评估流程 - 分析审批 -->
 <template>
+  <div class="xmpg-step5">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">审批评估反馈</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-if="active == '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-if="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.commentText}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep5"
+  name: "xmpgStep5",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    processTable () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : '',
+        shunxu: this.shunxu
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step5 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 6ba2be88c..81adb0245 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -498,6 +498,28 @@ export default {
                 prcType: row.prcType
               }
             })
+          }else if(row.taskInfo === '合规性评估'){
+            this.$router.push({
+              name: 'xmpgStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          }else if(row.taskInfo === '分发责任人审核'){
+            this.$router.push({
+              name: 'xmpgStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
 

From 7ec73c26e91f0870aa17599488b406262cb8f203 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 14 Jul 2021 14:19:48 +0800
Subject: [PATCH 08/25] commit

---
 .../personal/pages/individual-plate/index.vue |   2 +-
 .../pages/creatProcess/bzjd/step1.vue         |   3 +
 .../pages/creatProcess/bzjd/step2.vue         |  55 ++--
 .../pages/creatProcess/bzjd/step3.vue         | 297 ++++++++++++++++++
 .../tabComponents/processCenter/index.vue     |  13 +-
 src/router/index.js                           |   9 +
 6 files changed, 348 insertions(+), 31 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

diff --git a/src/pages/personal/pages/individual-plate/index.vue b/src/pages/personal/pages/individual-plate/index.vue
index 5cfbe5636..ff7c46b70 100644
--- a/src/pages/personal/pages/individual-plate/index.vue
+++ b/src/pages/personal/pages/individual-plate/index.vue
@@ -192,7 +192,7 @@ export default {
       height:100% !important;
     }
     .el-transfer-panel__list.is-filterable {
-      height: 360px;
+      height: calc(~'100% - 100px');
       padding-top: 0;
       overflow-y: auto;
     }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index de83172fa..fe16bf313 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -265,6 +265,7 @@
         name: "bzjdStep1",
         data() {
             return {
+                standId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -416,6 +417,7 @@
                         this.form.name = bringData[0].standName
                     }
                     this.form.id = bringData[0].id
+                    this.standId = bringData[0].standId
                     this.listModel = false;
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
                         infoId: this.form.id,
@@ -508,6 +510,7 @@
                                     if (res.ok) {
                                         var json = Object.assign(this.form, this.roleForm)
                                         json.commentText = this.commentText
+                                        json.standInData = this.standId
                                         json.itemList = this.itemList
                                         this.$http.post('lawss/activiti/completeTask', {
                                             json: JSON.stringify(json),
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 8f931edfe..e7904ad72 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -26,7 +26,7 @@
                                 <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
-                                            v-model="form.cid"
+                                            v-model="form.number"
                                             placeholder="请输入标准编号"
                                             clearable
                                     ></el-input>
@@ -34,26 +34,18 @@
                                 <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
-                                            v-model="form.cname"
+                                            v-model="form.name"
                                             placeholder="请输入标准名称"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.endTime"
-                                            type="date"
-                                            placeholder="请选择结束日期">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
+                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
                                     <el-input
-                                            v-model="form.responUserList"
+                                            v-model="form.zxUserId"
                                             style="display: none;"
                                             clearable
                                     ></el-input>
-                                    <el-input v-model="form.responUserListName" placeholder="请选择责任人" @click.native="choiceZRR"></el-input>
+                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -140,15 +132,14 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
-                    cid: '', // 编号
-                    endTime: '', // 结束日期
-                    cname: '', // 名称
-                    responUserList: '',
-                    responUserListName: ''
+                    number: '', // 编号
+                    name: '', // 结束日期
+                    zxUserId: '',
+                    zxUserIdName: ''
                 },
                 formRules: {
-                    responUserList: [
-                        { required: true, message: '请选择责任人', trigger: 'change' },
+                    zxUserId: [
+                        { required: true, message: '请选择执行人', trigger: 'change' },
                     ]
                 },
                 json: {}
@@ -171,8 +162,8 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.form.responUserList = idList
-                this.form.responUserListName = nameList
+                this.form.zxUserId = idList
+                this.form.zxUserIdName = nameList
                 this.modalshowflag = false
             },
             cancleUserInfo () {
@@ -180,8 +171,8 @@
             },
             choiceZRR () {
                 this.nodeList = []
-                if (this.form.responUserList.length > 0) {
-                    this.nodeList = this.form.responUserList.split(',')
+                if (this.form.zxUserId.length > 0) {
+                    this.nodeList = this.form.zxUserId.split(',')
                 }
                 this.modalshowflag = true
             },
@@ -199,8 +190,15 @@
                     if (valid) {
                         var json = this.json
                         json.commentText = this.commentText
-                        json.responUserList = this.form.responUserList
-                        json.responUserListName = this.form.responUserListName
+                        var arr = this.form.zxUserId.split(',')
+                        var newArr = []
+                        arr.forEach(item => {
+                            var json1 = {}
+                            json1.id = item
+                            newArr.push(json1)
+                        })
+                        json.zxUserId = newArr
+                        json.zxUserIdName = this.form.zxUserIdName
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -223,9 +221,8 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.cid = data.cid
-                        this.form.endTime = data.endTime
-                        this.form.cname = data.cname
+                        this.form.number = data.number
+                        this.form.name = data.name
                         this.json = data
                     }).catch(e => {
                     })
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
new file mode 100644
index 000000000..d0da3fac1
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -0,0 +1,297 @@
+<template>
+    <div class="bzjdStep3">
+        <!--    标准调研流程-->
+        <ProcessHeader toggle>
+            <template slot="proName">标准征求意见流程</template>
+            <template slot="proNode">对接人选择责任人</template>
+        </ProcessHeader>
+        <div class="headerTabs">
+            <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+        </div>
+        <div class="content" v-show="active === '1'">
+            <div style="flex: auto; overflow: auto;">
+                <el-form
+                        ref="bzzqyjForm"
+                        :model="form"
+                        :rules="formRules"
+                        class="label-input-form"
+                        label-width="210px"
+                >
+                    <ProcessTitle>
+                        <template slot="title">基础信息</template>
+                    </ProcessTitle>
+                    <div class="prc-content-border">
+                        <el-row :gutter="24">
+                            <el-col :span="24">
+                                <el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number"
+                                            placeholder="请输入标准编号"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name"
+                                            placeholder="请输入标准名称"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.zxUserId"
+                                            style="display: none;"
+                                            clearable
+                                    ></el-input>
+                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </el-form>
+            </div>
+            <el-collapse accordion>
+                <el-collapse-item title="意见填写">
+                    <div style="margin: 10px 0;">
+                        <el-input
+                                type="textarea"
+                                :rows="3"
+                                resize="none"
+                                placeholder="请输入意见"
+                                v-model="commentText">
+                        </el-input>
+                    </div>
+                </el-collapse-item>
+            </el-collapse>
+        </div>
+        <ProcessFooter
+                show-save
+                show-submit
+                :submitLoading="isSubmit"
+                :saveLoading="saveLoading"
+                @save="handleSave"
+                @submit="handleSubmit"
+        >
+        </ProcessFooter>
+        <el-drawer
+                title="选择责任人"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalshowflag"
+                    style="height: 100%; overflow: auto;"
+                    node-key="id"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
+    </div>
+</template>
+
+<script>
+    import ProcessHeader from '../../components/ProcessHeader'
+    import ProcessFooter from '../../components/ProcessFooter'
+    import ProcessTitle from '../../components/ProcessTitle'
+    import {inboundLiaisonDetail,processCreateStand} from 'api/process'
+
+    export default {
+        name: "bzjdStep3",
+        data() {
+            return {
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                roleRow: {},
+                nodeList: [],
+                type: '',
+                defaultProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                treeData: [], // 人员数据
+                modalshowflag: false, // drawer开关
+                drawerTitle: '', //drawer标题
+                textarea: '', // 意见
+                ListModel: false, // 新增编辑抽屉开关
+                active: '1', // 默认显示
+                isSubmit: false,
+                saveLoading: false,
+                form: {
+                    number: '', // 编号
+                    name: '', // 结束日期
+                    zxUserId: '',
+                    zxUserIdName: ''
+                },
+                formRules: {
+                    zxUserId: [
+                        { required: true, message: '请选择执行人', trigger: 'change' },
+                    ]
+                },
+                json: {}
+            }
+        },
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle
+        },
+        methods: {
+            saveUserInfo () {
+                var idList = ''
+                var nameList = ''
+                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                })
+                this.form.zxUserId = idList
+                this.form.zxUserIdName = nameList
+                this.modalshowflag = false
+            },
+            cancleUserInfo () {
+                this.modalshowflag = false
+            },
+            choiceZRR () {
+                this.nodeList = []
+                if (this.form.zxUserId.length > 0) {
+                    this.nodeList = this.form.zxUserId.split(',')
+                }
+                this.modalshowflag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            handleTabs(name) {
+                this.active = name
+            },
+            handleSave() {},
+            handleSubmit() {
+                this.$refs['bzzqyjForm'].validate((valid) => {
+                    if (valid) {
+                        var json = this.json
+                        json.commentText = this.commentText
+                        var arr = this.form.zxUserId.split(',')
+                        var newArr = []
+                        arr.forEach(item => {
+                            var json1 = {}
+                            json1.id = item
+                            newArr.push(json1)
+                        })
+                        json.zxUserId = newArr
+                        json.zxUserIdName = this.form.zxUserIdName
+                        this.$http.post('lawss/activiti/completeTask', {
+                            json: JSON.stringify(json),
+                            taskId: this.taskIds,
+                            userId: this.$store.getters.userInfo.userId
+                        }, {}, res => {
+                            if (res.success) {
+                                this.$message.success('提交成功')
+                                this.$router.push('/processCenter')
+                            }
+                        })
+                    } else {
+                        return this.$message.warning('请完善基础信息')
+                    }
+                })
+            },
+            getData() {
+                return new Promise((resolve, reject) => {
+                    inboundLiaisonDetail({
+                        taskIds: this.taskIds,
+                        pId: this.pId
+                    }).then(res => {
+                        let data = JSON.parse(res.mesg)
+                        this.form.number = data.number
+                        this.form.name = data.name
+                        this.json = data
+                    }).catch(e => {
+                    })
+                })
+            },
+        },
+        mounted () {
+            this.getTree()
+            this.getData()
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+    @import '~@/assets/styles/style';
+    .bzjdStep3 {
+        /deep/.el-drawer__container {
+            .prc-content-border {
+                border: none;
+                padding: 0 20px 0;
+            }
+        }
+        .fileClass {
+            cursor: pointer;
+        }
+        .fileClass:hover{
+            color: #0c91e5;
+        }
+        position: relative;
+        height: 100%;
+        .headerTabs {
+            height: 52px;
+            display: flex;
+            align-items: center;
+            position: absolute;
+            top: 0;
+            right: 10px;
+            .headerTabsItem {
+                border: 1px solid #c1c1c1;
+                padding: 0 5px;
+                height: 30px;
+                line-height: 30px;
+                cursor: pointer;
+            }
+            .active {
+                border: 1px solid #E6A23C;
+                color: #fff;
+                background: #E6A23C;
+            }
+        }
+        .content {
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
+            height: calc(~'100% - 103px');
+            overflow: auto;
+            .tableTitle {
+                margin-bottom: 10px;
+                height: 30px;
+                line-height: 30px;
+                position: relative;
+                font-size: 13px;
+                font-weight: bold;
+                .tableButton {
+                    position: absolute;
+                    right: 0;
+                    top: 0;
+                }
+            }
+        }
+    }
+</style>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 18d4bb768..16fe988bb 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -547,7 +547,7 @@ export default {
           }
           break
         case '9':
-          if (row.taskInfo === '') {
+          if (row.taskInfo === '选择执行人') {
             this.$router.push({
               name: 'bzjdStep2',
               query: {
@@ -558,6 +558,17 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '填写解读分析') {
+            this.$router.push({
+              name: 'bzjdStep3',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
       }
     },
diff --git a/src/router/index.js b/src/router/index.js
index 9aef11b99..4fdfc96b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -609,6 +609,15 @@ const routes = [
           title: '标准解读流程'
         }
       },
+      {
+        path: '/bzjdStep3',
+        name: 'bzjdStep3',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step3.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具

From 1391041a2c7c8328e6b39b5e4137d7ec88613471 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 14 Jul 2021 14:31:04 +0800
Subject: [PATCH 09/25] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home1/components/searchGroup/index.vue    | 61 ++++++++++++-------
 .../components/solicitopinions/index.vue      | 13 ++--
 .../searchCenter/pages/standardSearch.vue     |  4 ++
 3 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/pages/home1/components/searchGroup/index.vue b/src/pages/home1/components/searchGroup/index.vue
index ee628b2be..72691d218 100644
--- a/src/pages/home1/components/searchGroup/index.vue
+++ b/src/pages/home1/components/searchGroup/index.vue
@@ -2,26 +2,27 @@
 <template>
   <div class="search-group">
     <el-select
-      v-model="selectKey"
+      v-model="checkState"
       class="search-group-item"
       placeholder="请选择"
     >
       <el-option
         v-for="item in jumpPage"
-        :key="item.selectKey"
+        :key="item.value"
         :label="item.label"
-        :value="item.selectKey"
+        :value="item.value"
       ></el-option>
     </el-select>
 
     <div class="search-condition">
       <el-input
-        v-model="keywords"
+        @keyup.native.enter="search"
+        v-model="checkContent">
         type="text"
         placeholder="请输入关键词"
         clearable
       ></el-input>
-      <el-button class="primary_button" type="primary">搜索</el-button>
+      <el-button class="primary_button" type="primary" @click="search">搜索</el-button>
     </div>
   </div>
 </template>
@@ -33,36 +34,50 @@ export default {
   mixins: [],
   data() {
     return {
-      selectKey: '',
-      keywords: '',
+      // 当前查询状态
+      checkState: 'All',
+      // 查询内容
+      checkContent: '',
       jumpPage: [
         {
-          selectKey: '选项1',
-          label: '国内外标准法规',
+          label: '全部',
+          value: 'All'
         },
         {
-          selectKey: '选项2',
-          label: '研究报告',
+          label: '国内标准法规',
+          value: 'stand'
+        },
+        {
+          label: '海外标准法规', // value没改
+          value: 'bussstand'
+        },
+        {
+          label: '国内外政策',
+          value: 'laws'
         },
         {
-          selectKey: '选项3',
           label: '企业标准',
-        },
-        {
-          selectKey: '选项4',
-          label: '动态&通知',
-        },
-        {
-          selectKey: '选项5',
-          label: '流程中心',
-        },
+          value: 'enterprise'
+        }
       ],
     }
   },
   computed: {},
   watch: {},
-  mounted() {},
-  methods: {},
+  methods: {
+    search() {
+      this.$router.push({
+        name: 'StandardSearch',
+        params: {
+          selectKey: this.checkState,
+          searchValue: this.checkContent || undefined
+        }
+      })
+    },
+  },
+  mounted(){
+
+  },
 }
 </script>
 
diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index 2da7e6647..e6279110f 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -43,12 +43,13 @@ export default {
        } )
     },
     standForComments (item) {
-         this.$router.push({
-           name:'standardForComments',
-           params: {
-             id: item.id
-           }
-         },)
+      this.$store.commit('setDetailMap',this.$router.path)
+      this.$router.push({
+        name: 'consultationDetails',
+        query: {
+          item: item
+        }
+      })
     },
   },
 }
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 62876a7b3..04ef5ace5 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -363,6 +363,10 @@ export default {
   mounted() {
     //查询所有选项
     this.queryOptions();
+    let globalInputSearch = this.$route.params.searchValue
+    if (globalInputSearch !== 'allvalue') {
+      this.keywords = globalInputSearch
+    }
 
   },
   unmounted() {

From b2e04ae8ca1dc1d21cebd95b47efb85be8932ad9 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Wed, 14 Jul 2021 16:14:57 +0800
Subject: [PATCH 10/25] =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9?=
 =?UTF-8?q?=E6=95=B4=E6=94=B9=E6=B5=81=E7=A8=8B=E7=AC=AC=E4=BA=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/wfhxzg/step2.vue       | 119 +++++++++---------
 1 file changed, 59 insertions(+), 60 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index 687f3930a..ea9bab914 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -12,23 +12,23 @@
         <ProcessTitle>
           <template slot="title">基础信息</template>
         </ProcessTitle>
-        <el-form :modal="dataList" inline class="label-input-form">
+        <el-form :modal="nonSearch" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
-              <el-input v-model="dataList.standId"
+              <el-input v-model="nonSearch.standId"
                 size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item label="项目名称" class="search-item">
-              <el-input v-model="dataList.productName"
+              <el-input v-model="nonSearch.productName"
                 size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-              <el-input v-model="dataList.responsibleUnit" v-show="false"/>
+              <el-input v-model="nonSearch.responsibleUnit" v-show="false"/>
               <el-popover
                 placement="bottom"
                 popper-class="user-dept-popper"
@@ -38,7 +38,7 @@
                 <el-input
                   size="small"
                   slot="reference"
-                  v-model="dataList.responseUnitShow"
+                  v-model="nonSearch.responseUnitShow"
                   placeholder="根据责任部门查找"
                   readonly
                   clearable
@@ -62,7 +62,7 @@
                 class="common-button-primary"
                 size="mini"
                 v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-                @click="getTableByPage">
+                @click="getTableByPage(nonSearch)">
                 查询
               </el-button>
             </el-form-item>
@@ -105,15 +105,15 @@
           <el-table-column prop="dutyEngineer" label="责任工程师"/>
           <el-table-column label="选择分发责任人" prop="dutyPeopleInfo">
               <template slot-scope="scope">
-                <span v-if="scope.row.show">
                   <el-input
+                    style="display: none"
                     v-model="scope.row.dutyPeopleInfo"
                     size="mini"
                     placeholder="请输入内容"
-                    @click.native="choiceDuty"
-                  />
-                </span>
-                <span v-else>{{scope.row.dutyPeopleInfo}}</span>
+                    />
+                <div v-if="scope.row.dutyPeopleInfo"  class="fileClass">
+                  {{ scope.row.dutyPeopleInfo || '-'}}
+                </div>
             </template>
           </el-table-column>
         </el-table>
@@ -187,7 +187,7 @@ export default {
       ListModel: false, // 新增编辑抽屉开关
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -206,15 +206,6 @@ export default {
       myLoading: false,
       // 责任部门
       zNodesSItem: [],
-      unqualidiedData: [{
-        standId: '',
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
       clearSelection: false,
       nodeList: [],
       drawerTitle: '', //drawer标题
@@ -244,11 +235,19 @@ export default {
     this.getData()
     this.getTree()
   },
-  methods: {
+  watch: {
+    nonSearch(val) {
+      this.nonSearch = val
+    }
+  },
+    methods: {
     getData() {
       const params = {
         taskIds: this.taskIds,
         pId: this.pId,
+        standId: '', // 标准号/名称
+        productName: '', // 项目名称
+        responsibleUnit: '' // 责任部门
       }
       inboundLiaisonDetail(params).then(res => {
         const processForm = JSON.parse(res.mesg)
@@ -261,30 +260,19 @@ export default {
       })
     },
     // 批量选择分发责任人
-    dutyEngineerList() {
+    dutyEngineerList(id) {
       if (this.multipleSelection.length === 0) {
         this.$message.warning("请选择至少一条数据进行分发责任人");
       } else {
-        this.multipleSelection.map((i, index)=> {
-          i.show = true
-          this.$set(this.dataList, i, index)
-        })
+        this.nodeList = []
+        this.nodeList.push(id)
+        this.modalshowflag = true
       }
     },
     // 选择勾选项的集合
     handleSelectionChange(value) {
       this.multipleSelection = value
-    },
-    // 选择分发责任人时
-    choiceDuty(type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
-      this.type = type
-      this.drawerTitle = title
-      this.modalshowflag = true
-    },
-    selectPeople(row) {
-      this.modalshowflag = true
+      console.log(value)
     },
     handleTabs(name) {
       this.active = name
@@ -313,10 +301,7 @@ export default {
       }
       let json = {
         dockUserList: list,
-        // engineer: this.$store.getters.userInfo.userId,
-        // standardInfoList: list[0].standardInfoList,
       }
-      console.log(json)
       let flag=false
       this.dataList.forEach(item => {
         if (item.dutyPeopleInfo === '') {
@@ -364,19 +349,13 @@ export default {
     // 流程节点负责人抽屉保存按钮
     saveUserInfo () {
       // 选取负责人时的操作
-      for (let i = 0; i < this.multipleSelection.length; i++ ) {
-        this.multipleSelection[i].dutyPeopleInfo = this.roleRow[0].name
-        this.multipleSelection[i].dutyPeopleInfoId = this.roleRow[0].id
-        for (let b = 0; b < this.multipleSelection.length; b++) {
-          this.dataList[b].dutyPeopleInfo = this.multipleSelection[i].dutyPeopleInfo
-          this.dataList[b].dutyPeopleInfoId = this.multipleSelection[i].dutyPeopleInfoId
-          this.dataList.forEach(val=> {
-            val.show = false
-          })
-        }
-        this.lastDataList = this.dataList
-        this.$refs.multipleTable.clearSelection();
-      }
+      this.multipleSelection.forEach(item => {
+        item.dutyPeopleInfo = this.roleRow[0].name
+        item.dutyPeopleInfoId = this.roleRow[0].id
+      })
+      this.lastDataList = this.dataList
+      this.$refs.multipleTable.clearSelection();
+      // 选取流程信息完成
       this.roleForm.dutyUserInfoName = this.roleRow.name
       this.modalshowflag = false
     },
@@ -385,17 +364,37 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-    getTableByPage() {
-      this.getData()
-    },
+      getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+        this.realList = this.dataList.filter(item => {
+          let matchId = true; // 标准号 筛选
+          let matchName = true; // 项目名称 筛选
+          let matchUnit = true; // 部门 筛选
+
+          if (standId) {
+            const keysId = standId
+              .toUpperCase() // 转大写
+              .replace(' ', '') // 删掉空格
+              .split('') // 切割成 单个字
+            matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+          }
+          if (productName) {
+            matchName = item.productName === productName;
+          }
+          if (responsibleUnit) {
+            matchUnit = item.responsibleUnit === responsibleUnit;
+          }
+          return matchId && matchName && matchUnit;
+        })
+        this.dataList = this.realList
+      },
     // 清空 查询条件
-    clearAllSearch (search = true) {
-      this.nonConformitySearch = {
+    clearAllSearch () {
+      this.nonSearch = {
         standId: '',
         productName: '',
         responsibleUnit: ''
       }
-      this.getTableByPage()
+      this.getData()
     },
     // 分页事件
     pageChange (page) {

From 8b4e61300d30c99b8ecc7f9903a96e5f93ecd4a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 14 Jul 2021 17:15:50 +0800
Subject: [PATCH 11/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       |  2 +-
 .../pages/creatProcess/xmpg/step1.vue         | 16 ++++++--------
 .../pages/creatProcess/xmpg/step2.vue         |  4 ++--
 .../pages/creatProcess/xmpg/step3.vue         | 10 +++++----
 .../pages/creatProcess/xmpg/step4.vue         | 16 +++++++-------
 .../pages/creatProcess/xmpg/step5.vue         | 16 ++++++++++++--
 .../page/listOfCountries.vue                  | 20 ++++++++---------
 .../page/listOther.vue                        | 22 +++++++++----------
 .../page/listProject.vue                      |  3 +--
 9 files changed, 60 insertions(+), 49 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 94e7d8975..c077f5604 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -9,7 +9,7 @@
       <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-if="active == '1'">
+    <div class="content" v-show ="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 2fcc2a5ed..b89020428 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -9,7 +9,7 @@
       <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-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -17,7 +17,7 @@
         <el-form
           :model="listForm"
           :rules="formRules"
-          ref="xmpgForm"
+          ref="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
         >
@@ -109,7 +109,7 @@
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-form
-            ref="Form"
+            ref="roleForm"
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
@@ -536,16 +536,15 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      console.log(this.roleForm)
-      console.log(this.listForm);
-      // var json = this.listForm
       var json = Object.assign(this.listForm, this.roleForm)
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standId = this.listForm.standId;
-      this.$refs["xmpgForm"].validate((valid) => {
+      json.XCXSSRQ =  this.sarAccessListDatas[0].attrInfoMap.XCXSSRQ
+      json.ZCCSSRQ =  this.sarAccessListDatas[0].attrInfoMap.ZCCSSRQ
+      this.$refs['listForm'].validate((valid) => {
         if (valid) {
-          this.$refs["Form"].validate((valid) => {
+          this.$refs['roleForm'].validate((valid) => {
             if (valid) {
               this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
                 _this: this
@@ -652,7 +651,6 @@ export default {
       }, {
         _this: this
       }, res => {
-        console.log(res.data);
         this.productData = res.data;
         this.totalNo = res.data.total;
       }, e => {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index cc668d048..d9e41a3e0 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -110,7 +110,7 @@
       </div>
     </div>
 
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index fc188ebc6..6b19abc68 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -98,12 +98,12 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="newTime"
+            prop="xCXSSRQ"
             align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
-            prop="oldTime"
+            prop="zCCSSRQ"
             align="center"
             label="在产车实施日期">
           </el-table-column>
@@ -155,7 +155,7 @@
       </div>
     </div>
 
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"
@@ -397,6 +397,8 @@ export default {
             qualityEngineer: item.pepdtos[i].qualityEngineer,
             standNumber: item.pepdtos[i].standNumber,
             standName: item.pepdtos[i].standName,
+            xCXSSRQ:  item.pepdtos[i].xCXSSRQ,
+            zCCSSRQ:  item.pepdtos[i].zCCSSRQ,
           });
         }
       }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 1d5416736..1ce002bf2 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -103,13 +103,13 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="newTime"
+            prop="xCXSSRQ"
             width="200"
             align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
-            prop="oldTime"
+            prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
@@ -264,7 +264,7 @@
       </div>
     </div>
 
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"
@@ -492,10 +492,10 @@ export default {
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
         this.dataList = item.step3DTOS
-        this.listForm.standName = item.step3DTOS[0].standName
-        this.listForm.standNumber = item.step3DTOS[0].standNumber
-        this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
-        this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
+        // this.listForm.standName = item.step3DTOS[0].standName
+        // this.listForm.standNumber = item.step3DTOS[0].standNumber
+        // this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+        // this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
       })
     },
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index e73024ac3..26afeda56 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -102,6 +102,18 @@
             align="center"
             label="条款名称">
           </el-table-column>
+          <el-table-column
+            prop="XCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="ZCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
           <el-table-column
             prop="productType"
             align="center"
@@ -203,7 +215,7 @@
       </div>
     </div>
 
-    <div class="content" v-if="active === '3'">
+    <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
           height="100%"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 7b55ad910..98aed73cb 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -295,19 +295,18 @@ export default {
     },
     // 批量删除
     deleteSarAccess(flag, id) {
-      if (flag === "delOne") {
+      if (flag === 'delOne') {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
-      if (!this.selectedList.length) {
-        this.$message.warning("请选择要删除的数据");
+      if (this.selectedList.length === 0) {
+        this.$message.warning('请选择要删除的数据')
       } else {
-        this.$confirm("确认删除选中数据？", "确认删除", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          confirmButtonClass: "common-button-primary",
-          roundButton: false,
-          type: "warning"
+        this.$confirm('确定删除这些数据？', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type: 'warning',
         }).then(() => {
           const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
           this.$http.postDelete(URL, {}, res => {
@@ -317,7 +316,8 @@ export default {
           }, e => {
           });
         }).catch(() => {
-        });
+
+        })
       }
     },
     // 表格选择框
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 9ab5e43c8..2bcab6947 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -300,31 +300,31 @@ export default {
         name: "OtherAddEit"
       });
     },
-    // 删除
+    //批量删除
     deleteSarAccess(flag, id) {
-      if (flag === "delOne") {
+      if (flag === 'delOne') {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
       if (this.selectedList.length === 0) {
-        this.$message.warning("请选择要删除的数据");
+        this.$message.warning('请选择要删除的数据')
       } else {
-        this.$confirm("确认删除这些数据？", "提示", {
-          confirmButtonText: "确认",
-          confirmButtonClass: "common-button-primary",
-          cancelButtonText: "取消",
-          type: "warning"
+        this.$confirm('确定删除这些数据？', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          type: 'warning',
         }).then(() => {
-          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(",")}`;
+          const URL = `sarLawsDetailedList/sar-laws-detailed-list/deleteListAll?idList=${this.selectedList.join(',')}`
           this.$http.postDelete(URL, {}, res => {
             this.searchSarAccess();
             this.selectedList = [];
-            this.$message.success("删除成功");
+            this.$message.success('删除成功')
           }, e => {
           });
         }).catch(() => {
 
-        });
+        })
       }
     },
     // 表格选择框
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index bc2abd6a1..34ac7c354 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -309,7 +309,7 @@ export default {
         this.selectedList = [];
         this.selectedList[0] = id;
       }
-      if (this.selectedList === 0) {
+      if (this.selectedList.length === 0) {
         this.$message.warning('请选择要删除的数据')
       } else {
         this.$confirm('确定删除这些数据？', '提示', {
@@ -329,7 +329,6 @@ export default {
 
         })
       }
-
     },
     // 表格选择框
     selectOne(data) {

From 61f7f1342b4a607a668b2e3d4b79c8c25b88e44c Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Wed, 14 Jul 2021 18:00:35 +0800
Subject: [PATCH 12/25] commit

---
 .../config/pages/mechanismManage/index.vue    |  5 +-
 .../pages/creatProcess/bzdy/step1.vue         | 63 +++++++++++++++++--
 .../pages/creatProcess/bzdy/step2.vue         |  2 +
 .../pages/creatProcess/bzdy/step3.vue         |  2 +
 .../pages/creatProcess/bzdy/step4.vue         |  4 ++
 .../pages/creatProcess/bzdy/step5.vue         |  2 +
 .../pages/creatProcess/bzdy/step6.vue         |  4 ++
 .../pages/creatProcess/bzdy/step7.vue         |  4 ++
 .../pages/creatProcess/bzdy/step8.vue         |  4 ++
 .../pages/creatProcess/bzdy/step9.vue         |  4 ++
 .../pages/creatProcess/bzzqyj/step1.vue       |  2 +
 .../pages/creatProcess/bzzqyj/step2.vue       |  2 +
 .../pages/creatProcess/bzzqyj/step3.vue       |  2 +
 .../pages/creatProcess/bzzqyj/step4.vue       |  2 +
 .../pages/creatProcess/bzzqyj/step5.vue       |  2 +
 .../pages/creatProcess/bzzqyj/step6.vue       |  4 ++
 .../pages/creatProcess/bzzqyj/step7.vue       |  4 ++
 .../pages/creatProcess/bzzqyj/step8.vue       |  4 ++
 .../pages/creatProcess/bzzqyj/step9.vue       |  4 ++
 19 files changed, 115 insertions(+), 5 deletions(-)

diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index b6d7808e3..a5be0b950 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -70,9 +70,12 @@
             label="所属岗位">
           </el-table-column>
           <el-table-column
-            prop="state"
             label="状态"
             width="170px">
+            <template slot-scope="scope">
+              <div v-if="scope.row.disableFlag === '1'">已禁用</div>
+              <div v-else>已启用</div>
+            </template>
           </el-table-column>
           <el-table-column
             label="操作"
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 123abce88..fd4a84a06 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -91,7 +91,7 @@
                   <h4>流程发起人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -101,8 +101,8 @@
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
-                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -154,6 +154,31 @@
         @submit="handleSubmit"
     >
     </ProcessFooter>
+    <el-drawer
+            title="选择责任部门对接人"
+            :visible.sync="modalshowflag2"
+            :wrapperClosable="false"
+            size="800px">
+      <el-tree
+              v-if="modalshowflag2"
+              style="height: 100%; overflow: auto;"
+              node-key="id"
+              class="filter-tree"
+              :data="treeData"
+              :props="defaultProps"
+              :default-checked-keys="nodeList2"
+              highlight-current
+              check-strictly
+              default-expand-all
+              :expand-on-click-node="false"
+              show-checkbox
+              ref="tree2">
+      </el-tree>
+      <div id="roleFormButton2" class="demo-drawer-footer">
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
+      </div>
+    </el-drawer>
     <el-drawer
             :title="drawerTitle"
             :visible.sync="modalshowflag"
@@ -247,7 +272,7 @@ export default {
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
-        dockUser: '',
+        dockUserList: '',
         responUserList: '',
         ministerUser: '',
         directorUser: '',
@@ -274,6 +299,9 @@ export default {
       },
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
+      nodeList2: [],
+      modalshowflag2: false,
+
     }
   },
   components: {
@@ -282,6 +310,31 @@ export default {
     ProcessTitle
   },
   methods: {
+    choiceZRRS () {
+      this.nodeList2 = []
+      if ( this.roleForm.dockUserList.length > 0) {
+        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      }
+      this.modalshowflag2 = true
+    },
+    saveUserInfo2 () {
+      var idList = ''
+      var nameList = ''
+      this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.roleForm.dockUserList = idList
+      this.roleForm.dockUserName = nameList
+      this.modalshowflag2 = false
+    },
+    cancleUserInfo2 () {
+      this.modalshowflag2 = false
+    },
     // 导入按钮 上传之前的钩子
     beginImportFile (file) {
       var filename = file.name
@@ -372,6 +425,7 @@ export default {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
+              this.isSubmit = true
               this.$http.get('lawss/activiti/startProcess', {
                 type: '2'
               }, {}, res => {
@@ -391,6 +445,7 @@ export default {
                 } else {
                   this.$message.warning('流程启动失败')
                 }
+                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
index fa3455caa..13e9b5058 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
@@ -200,6 +200,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.responUserList = this.form.responUserList
@@ -213,6 +214,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index d438ee1c6..14af91974 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -209,6 +209,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.fileId = this.form.fileId
@@ -222,6 +223,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
index 89b5009a2..11c25dc64 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
@@ -141,6 +141,7 @@
             },
             handleSave() {},
             handleSubmit() { // 同意
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -153,10 +154,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -169,6 +172,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index baaf52bdd..00b5d764b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -233,6 +233,7 @@
             handleSubmit() {
                 this.$refs['qbkwForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.hzfileId = this.form.hzfileId
@@ -246,6 +247,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 })
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index e9b958273..13cb22e11 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index e009bbe74..e8cf6fc3e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.commentText = this.commentText
                     json.actionFlag = 1
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index 344fd3282..d58302118 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.commentText = this.commentText
                     json.actionFlag = 1
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 9af0cf7ab..4d56b7895 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -229,6 +229,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -241,10 +242,12 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.commentText = this.commentText
                     json.actionFlag = 1
@@ -257,6 +260,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index b62928f2d..de3c10b13 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -557,6 +557,7 @@ export default {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
+              this.isSubmit = true
               this.$http.get('lawss/activiti/startProcess', {
                 type: '3'
               }, {}, res => {
@@ -576,6 +577,7 @@ export default {
                 } else {
                   this.$message.warning('流程启动失败')
                 }
+                this.isSubmit = false
               })
             } else {
               return this.$message.warning('请完善人员信息')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index b3580f59a..6c33b73fb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -197,6 +197,7 @@
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.responUserList = this.form.responUserList
@@ -210,6 +211,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     } else {
                         return this.$message.warning('请完善基础信息')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index e44dbca0f..137f08c2b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -257,6 +257,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.commentText = this.commentText
                         json.info = this.data
@@ -270,6 +271,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 78655e47e..270c67bb6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -175,6 +175,7 @@
             },
             handleSave() {},
             handleSubmit() {
+                this.isSubmit = true
                 var json = this.json
                 json.actionFlag = 0
                 json.commentText = this.commentText
@@ -187,6 +188,7 @@
                         this.$message.success('提交成功')
                         this.$router.push('/processCenter')
                     }
+                    this.isSubmit = false
                 })
             },
             handleSubmitNo () {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index a2bb22b44..242bb8b39 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.oldinfo = this.oldData
                         json.commentText = this.commentText
@@ -253,6 +254,7 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 0fe14f99c..a04ced37a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -238,6 +238,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -250,12 +251,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -268,6 +271,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index c6c16671a..5b85f6e87 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -253,12 +254,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -271,6 +274,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 5a0415f34..755e59d0b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -253,12 +254,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -271,6 +274,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 02a8a2e72..c1af9cd25 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -241,6 +241,7 @@
                     } else if (c > 0) {
                         this.$message.warning('请输入意见内容')
                     } else {
+                        this.isSubmit = true
                         var json = this.json
                         json.actionFlag = 0
                         json.commentText = this.commentText
@@ -253,12 +254,14 @@
                                 this.$message.success('提交成功')
                                 this.$router.push('/processCenter')
                             }
+                            this.isSubmit = false
                         })
                     }
                 }
             },
             handleSubmitNo() {
                 if (this.commentText) {
+                    this.isSubmit = true
                     var json = this.json
                     json.actionFlag = 1
                     json.commentText = this.commentText
@@ -271,6 +274,7 @@
                             this.$message.success('驳回成功')
                             this.$router.push('/processCenter')
                         }
+                        this.isSubmit = false
                     })
                 } else {
                     this.$message.warning('请输入反馈意见')

From 9be9f1664d899b714c87cfd93dbbc2c1bf57d5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 14 Jul 2021 21:02:11 +0800
Subject: [PATCH 13/25] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step4.vue         |   8 +-
 .../pages/creatProcess/xmpg/step5.vue         |  18 +-
 .../pages/creatProcess/xmpg/step6.vue         | 572 +++++++++++++++++-
 .../pages/creatProcess/xmpg/step7.vue         | 572 +++++++++++++++++-
 .../tabComponents/processCenter/index.vue     |  22 +
 5 files changed, 1177 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 1ce002bf2..ac5dba73c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -492,10 +492,10 @@ export default {
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
         this.dataList = item.step3DTOS
-        // this.listForm.standName = item.step3DTOS[0].standName
-        // this.listForm.standNumber = item.step3DTOS[0].standNumber
-        // this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
-        // this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
+        this.listForm.standName = item.step3DTOS[0].standName
+        this.listForm.standNumber = item.step3DTOS[0].standNumber
+        this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+        this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
       })
     },
 
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index 26afeda56..d9b691b9c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -3,7 +3,7 @@
   <div class="xmpg-step5">
     <ProcessHeader toggle>
       <template slot="proName">项目合规评估流程</template>
-      <template slot="proNode">审批评估反馈</template>
+      <template slot="proNode">分发责任人审批</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -103,13 +103,13 @@
             label="条款名称">
           </el-table-column>
           <el-table-column
-            prop="XCXSSRQ"
+            prop="xCXSSRQ"
             width="200"
             align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
-            prop="ZCCSSRQ"
+            prop="zCCSSRQ"
             width="200"
             align="center"
             label="在产车实施日期">
@@ -146,6 +146,9 @@
                 align="center"
                 width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
@@ -179,6 +182,9 @@
                 align="center"
                 width="160"
                 label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
               </el-table-column>
             </el-table-column>
           </el-table-column>
@@ -440,15 +446,13 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
       this.listForm.commentText = this.commentText;
       this.listForm.standId = this.listForm.standId;
       this.listForm.fenFlag = "1";
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
+      console.log(json);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 5055d7ae2..8d126d1f9 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -1,13 +1,581 @@
+<!--评估流程 - 产品线责任人审批 -->
 <template>
+  <div class="xmpg-step6">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">产品线责任人审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.commentText}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep6"
+  name: "xmpgStep6",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    processTable () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : '',
+        shunxu: this.shunxu
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step6 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 54c131391..58902008e 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -1,13 +1,581 @@
+<!--评估流程 - 标准法规部领导审批 -->
 <template>
+  <div class="xmpg-step7">
+    <ProcessHeader toggle>
+      <template slot="proName">项目合规评估流程</template>
+      <template slot="proNode">标准法规部领导审批</template>
+    </ProcessHeader>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standNumber"
+                  placeholder="请输入标准编号"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.standName"
+                  placeholder="请输入标准名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="认证工程师" prop="certifiedEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.certifiedEngineer"
+                  placeholder="请选择认证工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="质量工程师" prop="qualityEngineer" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.qualityEngineer"
+                  placeholder="请选择质量工程师"
+                  clearable
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <div class="tableTitle">
+        </div>
+        <el-table
+          ref="multipleTable"
+          :data="dataList"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          @selection-change="selectStandChange"
+          :height="sarProStateTableHeight"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+             fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="productLine"
+            align="center"
+            width="200"
+            label="产品线">
+          </el-table-column>
+          <el-table-column
+            prop="projectNumber"
+            align="center"
+            width="200"
+            label="项目编号">
+          </el-table-column>
+          <el-table-column
+            prop="projectName"
+            align="center"
+            width="200"
+            label="项目名称">
+          </el-table-column>
+          <el-table-column
+            prop="itemNum"
+            align="center"
+            width="200"
+            label="条款号">
+          </el-table-column>
+          <el-table-column
+            prop="itemsName"
+            width="200"
+            align="center"
+            label="条款名称">
+          </el-table-column>
+          <el-table-column
+            prop="xCXSSRQ"
+            width="200"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zCCSSRQ"
+            width="200"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="productType"
+            align="center"
+            label="在研产品">
+            <el-table-column
+              prop="complianceReasons"
+              align="center"
+              width="160"
+              label="合规">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              prop="researchNonCompliance"
+              label="不合规">
+              <el-table-column
+                prop="noCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="countermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="completionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            label="在产产品">
+            <el-table-column
+              prop="zcComplianceReasons"
+              align="center"
+              width="160"
+              label="合规(具体情况)">
+            </el-table-column>
+            <el-table-column
+              align="center"
+              width="160"
+              label="不合规">
+              <el-table-column
+                prop="zcNoCompliance"
+                align="center"
+                width="160"
+                label="不合规项目">
+              </el-table-column>
+              <el-table-column
+                prop="zcCountermeasures"
+                align="center"
+                width="160"
+                label="应对措施">
+              </el-table-column>
+              <el-table-column
+                prop="zcCompletionTime"
+                align="center"
+                width="160"
+                label="完成时间">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="implementer"
+            label="落实人">
+          </el-table-column>
+          <el-table-column
+            fixed="right"
+            align="center"
+            width="150"
+            prop="distributePerson"
+            label="责任人">
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="意见填写">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
 
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list">
+        <el-table
+          height="100%"
+          ref="selection"
+          :data="detailData"
+          tooltip-effect="dark"
+          style="width: 100%"
+          border
+          row-key="id"
+          :no-data-text="listNoDataText"
+          :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+        >
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="name"
+            label="任务步骤"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="assignee"
+            label="任务受理人"
+            align="center"
+            sortable="custom"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="createTime"
+            label="创建时间"
+            sortable="custom"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="endTime"
+            label="完成时间"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="comment"
+            label="审批意见"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{scope.row.commentText}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="completeFlag"
+            label="状态"
+            align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <loading :loading="loading">流程列表加载中</loading>
+      </div>
+    </div>
+
+    <ProcessFooter
+      show-back
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      :approval="true"
+      @back="beforeBack"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+  </div>
 </template>
 
 <script>
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, queryDetail } from "api/process";
+
 export default {
-  name: "xmpgStep7"
+  name: "xmpgStep7",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      detailData: [],
+      sarProStateTableHeight: null, // 项目列表高度
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      loading: false,
+      dataList: [],
+      active: "1",
+      userId:this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      commentText: "", //填写会签意见
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      listForm: {
+        fenFlag: '1',  //1为通过 其他为驳回
+        standNumber: "", //标准编号
+        standName: "",//标准名称
+        certifiedEngineer: "", //认证工程师
+        qualityEngineer: "", //质量工程师
+        breakdownList: [{    //分解单数据
+          implementer: "",
+          applyArctic: "",
+          busStandCover: "",
+          claimType: "",
+          id: "",
+          itemsName: "",
+          itemsNum: "",
+          responsibleUnit: "",
+          standId: "",
+          svpps: ""
+        }],
+        dataList: [{
+          implementer: "",
+          projectLine: "", //产品线
+          uname: "",//产品线责任人
+          distributePerson: "", //分发责任人
+          distributePersonId: "", //分发责任人id
+          id: "",
+          sarStandProjectLibraries: [{
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
+          }]
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      countryOptions: [], //适用区域下拉框数据
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
+    };
+  },
+  methods: {
+    processTable () {
+      this.$http.get('lawss/activiti/get_list_by_instance', {
+        prcNum: this.$route.query.prcNum,
+        sortWord: this.shunxu ? this.paixu : '',
+        shunxu: this.shunxu
+      }, {
+        loading: 'loading',
+        _this: this
+      }, res => {
+        this.detailData = res
+      }, e => {})
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          console.log(res.mesg);
+          if (res) {
+            const processForm = JSON.parse(res.mesg)
+            this.getFormFieldList(processForm)
+          }
+        }).catch(e => {
+        })
+      })
+    },
+    /**
+     * @description: 动态表单读取
+     */
+    getFormFieldList (item) {
+      console.log(item.dataList);
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item))
+        this.listForm.prcNum = this.prcNum
+        this.listForm.prcName = this.prcName
+        this.listForm['id'] = item.id
+        this.dataList = item.dataList
+      })
+    },
+
+
+    //驳回事件
+    beforeBack () {
+      this.listForm.fenFlag = '2'
+      this.handleSubmit()
+    },
+    //提交事件
+    handleSubmit() {
+      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
+      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.commentText = this.commentText;
+      this.listForm.standId = this.listForm.standId;
+      this.listForm.fenFlag = "1";
+      this.listForm.dataList = this.dataList
+      const json = JSON.stringify(this.listForm);
+      this.$http.post('lawss/activiti/completeTask', {
+        taskIds: this.taskIds,
+        userId: this.userId,
+        json: json,
+      }, {
+        _this: this
+      }, res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
+        }
+      }, e => {
+
+      });
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    selectThree() {
+
+    },
+    pageChange(page) {
+      this.page = page;
+      this.searchData();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.searchData();
+    }
+  },
+  computed: {
+    listNoDataText () {
+      return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
+    },
+  },
+  mounted() {
+    this.processTable()
+    this.getData()
+    // console.log(this.$store.getters.getHandleInfo);
+  }
 };
 </script>
 
-<style scoped>
+<style lang="less" scoped>
+@import '~@/assets/styles/style';
 
+.xmpg-step7 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .headerTabs {
+    height: 52px;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    top: 0;
+    right: 10px;
+
+    .headerTabsItem {
+      border: 1px solid #c1c1c1;
+      padding: 0 5px;
+      height: 30px;
+      line-height: 30px;
+      cursor: pointer;
+    }
+
+    .active {
+      border: 1px solid #E6A23C;
+      color: #fff;
+      background: #E6A23C;
+    }
+  }
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: calc(~'100% - 103px');
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 0ac07ba53..5d55a3700 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -518,6 +518,28 @@ export default {
                 prcType: row.prcType
               }
             })
+          // }else if(row.taskInfo === '标准法规部领导审核'){
+          //   this.$router.push({
+          //     name: 'xmpgStep6',
+          //     query: {
+          //       taskIds: row.taskIds,
+          //       prcId: row.prcId,
+          //       prcNum: row.prcNum,
+          //       prcName: row.prcName,
+          //       prcType: row.prcType
+          //     }
+          //   })
+          }else if(row.taskInfo === '标准法规部领导审核'){
+            this.$router.push({
+              name: 'xmpgStep7',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
           break
         //未符合项整改流程

From 3f3dd1ea356bad57645a4f3f85bf355fd2d9d86e Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 15 Jul 2021 09:09:50 +0800
Subject: [PATCH 14/25] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/treeSelect/treeSelect.vue      |  12 +-
 .../details/otherStandardDetails/index.vue    |   7 +-
 .../pages/creatProcess/bzrk/step1.vue         | 672 +++++++++++++++---
 .../pages/creatProcess/bzrk/step2.vue         |  11 +-
 .../pages/creatProcess/bzrk/step3.vue         |  11 +-
 .../pages/creatProcess/bzrk/step4.vue         | 391 +++++++++-
 .../domesticStandardsAndRegulations/index.vue |   1 +
 7 files changed, 958 insertions(+), 147 deletions(-)

diff --git a/src/components/treeSelect/treeSelect.vue b/src/components/treeSelect/treeSelect.vue
index f52259f19..f980c43f9 100644
--- a/src/components/treeSelect/treeSelect.vue
+++ b/src/components/treeSelect/treeSelect.vue
@@ -92,17 +92,11 @@
                 }
             },
             width: {
-                type: Number,
+                type: String,
                 default () {
-                    return 593;
+                    return "";
                 }
             },
-            height: {
-                type: Number,
-                default () {
-                    return 300;
-                }
-            }
         },
         data () {
             return {
@@ -110,7 +104,7 @@
                 isShowSelect: false, // 是否显示树状选择器
                 options: [],
                 selectedData: [], // 选中的节点
-                style: 'width:' + this.width + 'px;' + 'height:' + this.height + 'px;',
+                style: 'width:' + this.width + 'px;' + 'height:100%;',
                 selectStyle: 'width:100%;',
                 checkedIds: [],
                 checkedData: []
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 43f10be3d..b4cb77b38 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -2621,9 +2621,9 @@ export default {
       const dynamicFormField = standEO ? standEO.attrInfoMap : {}
       formFieldList.forEach((field) => {
         // 相关流程权限
-        if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
-          return
-        }
+        // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
+        //   return
+        // }
         console.log("displayLocation");
         console.log(displayLocation);
         displayLocation.forEach((location) => {
@@ -2693,6 +2693,7 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
+        console.log(this.dynamicFormField)
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 30b380397..aa6cb8d76 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -7,16 +7,17 @@
         </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 class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
         </div>
-        <div class="content" v-if="active === '1'">
-            <div style="flex: auto; overflow: auto;">
-                <el-form
-                        ref="qbkwForm"
-                        :model="form"
-                        class="label-input-form"
-                        label-width="210px"
-                >
+        <div class="content">
+            <el-form
+                    ref="form"
+                    :model="form"
+                    :rules="rules"
+                    class="label-input-form"
+                    label-width="210px"
+            >
+            <div style="flex: auto; overflow: auto;" v-show="active === '1'">
                     <ProcessTitle>
                         <template slot="title">基础信息</template>
                     </ProcessTitle>
@@ -41,12 +42,11 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.standYear"
-                                            type="year"
-                                            placeholder="请选择标准年份"
-                                            value-format="yyyy">
-                                    </el-date-picker>
+                                    <el-input
+                                            v-model.number="form.standYear"
+                                            placeholder="请输入标准标准年份"
+                                            clearable
+                                    ></el-input>
                                 </el-form-item>
                                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                                     <el-input
@@ -115,6 +115,7 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                                     <tree-select
+                                            width = "340"
                                             :data="standSystemOptions"
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                                             :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
@@ -621,6 +622,13 @@
                                             placeholder="请输入代替标准号"
                                             clearable
                                     ></el-input>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            size="mini"
+                                            style="position:absolute;top: 10px;right: 0;"
+                                            @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                                    >{{'手动查找'}}</el-button>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.cbcd" placeholder="请选择采标程度">
@@ -628,13 +636,13 @@
                                         <el-option label="采标程度2" value="2"></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.xglc"
-                                            placeholder="请输入相关流程"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+<!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
+<!--                                    <el-input-->
+<!--                                            v-model="form.xglc"-->
+<!--                                            placeholder="请输入相关流程"-->
+<!--                                            clearable-->
+<!--                                    ></el-input>-->
+<!--                                </el-form-item>-->
                                 <el-form-item label="关联文件" prop="glwj" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
@@ -663,6 +671,13 @@
                                             placeholder="请输入引用标准"
                                             clearable
                                     ></el-input>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            size="mini"
+                                            style="position:absolute;top: 10px;right: 0;"
+                                            @click="selectLaws('yybj'),config.attrName = '引用标准'"
+                                    >{{'手动查找'}}</el-button>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                                     <el-input
@@ -677,21 +692,78 @@
                                             placeholder="请输入被引用标准"
                                             clearable
                                     ></el-input>
+                                    <el-button
+                                            type="primary"
+                                            class="common-button-primary"
+                                            size="mini"
+                                            style="position:absolute;top: 10px;right: 0;"
+                                            @click="selectLaws('byybj'),config.attrName = '被引用标准'"
+                                    >{{'手动查找'}}</el-button>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.chjl"
-                                            placeholder="请输入参会记录"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+<!--                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
+<!--                                    <el-input-->
+<!--                                            v-model="form.chjl"-->
+<!--                                            placeholder="请输入参会记录"-->
+<!--                                            clearable-->
+<!--                                    ></el-input>-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>
-                </el-form>
             </div>
-            <el-collapse accordion>
-                <el-collapse-item title="意见填写">
+            <div class="block" style="padding-top: 20px;" v-show="active === '2'">
+                    <el-timeline>
+                        <el-form
+                                ref="userForm"
+                                :model="roleForm"
+                                :rules="roleRules"
+                                class="label-input-form">
+                        <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.prcCreateUserName ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="prcCreateUserName" style="margin-bottom: 0">
+                                    <h4>流程发起人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input disabled v-model="roleForm.prcCreateUserName" placeholder="流程发起人"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="选择会签责任人" prop="zrUserName" placement="top" :color="roleForm.zrUserName ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="zrUserName" style="margin-bottom: 0">
+                                    <h4>会签责任人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.zrUserName" placeholder="选择会签责任人" @click.native="choiceZRR('zrUserId', '选择责任人', form.zrUserId)">
+                                        </el-input></div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="修订申请人" placement="top" :color="roleForm.applyUpdUserName ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="applyUpdUserName" style="margin-bottom: 0">
+                                    <h4>修订申请人</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input disabled v-model="roleForm.applyUpdUserName" placeholder="修订申请人"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        <el-timeline-item timestamp="选择标准法规业务经理" prop="jlUserName" placement="top" :color="roleForm.jlUserName ? '#66b1ff' : ''">
+                            <el-card>
+                                <el-form-item prop="jlUserName" style="margin-bottom: 0">
+                                    <h4>标准法规业务经理</h4>
+                                    <div style="margin-top: 10px;width: 300px;">
+                                        <el-input v-model="roleForm.jlUserName" placeholder="标准法规业务经理" @click.native="choiceZRR('jlUserId', '选择标准法规业务经理', form.jlUserId)"></el-input>
+                                    </div>
+                                </el-form-item>
+                            </el-card>
+                        </el-timeline-item>
+                        </el-form>
+                    </el-timeline>
+                </div>
+            </el-form>
+            <el-collapse v-model="activeName" accordion>
+                <el-collapse-item title="意见填写" name="1">
                     <div style="margin: 10px 0;">
                         <el-input
                                 type="textarea"
@@ -704,52 +776,6 @@
                 </el-collapse-item>
             </el-collapse>
         </div>
-        <div class="content" v-if="active === '2'">
-            <div class="block" style="padding-top: 20px;">
-                <el-timeline>
-                    <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
-                        <el-card>
-                            <h4>流程发起人</h4>
-                            <div style="margin-top: 10px;width: 300px;">
-                                <el-input v-model="user1" placeholder="流程发起人"></el-input>
-                            </div>
-                        </el-card>
-                    </el-timeline-item>
-                    <el-timeline-item timestamp="选择责任人" placement="top" :color="user2 ? '#66b1ff' : ''">
-                        <el-card>
-                            <h4>责任人</h4>
-                            <div style="margin-top: 10px;width: 300px;">
-                                <el-input v-model="user2" placeholder="选择责任人">
-                                </el-input></div>
-                        </el-card>
-                    </el-timeline-item>
-                    <el-timeline-item timestamp="填写意见" placement="top" :color="user3 ? '#66b1ff' : ''">
-                        <el-card>
-                            <h4>责任人</h4>
-                            <div style="margin-top: 10px;width: 300px;">
-                                <el-input v-model="user3" placeholder="责任人"></el-input>
-                            </div>
-                        </el-card>
-                    </el-timeline-item>
-                    <el-timeline-item timestamp="意见汇总并发起会签" placement="top" :color="user4 ? '#66b1ff' : ''">
-                        <el-card>
-                            <h4>标准法规工程师</h4>
-                            <div style="margin-top: 10px;width: 300px;">
-                                <el-input v-model="user4" placeholder="标准法规工程师"></el-input>
-                            </div>
-                        </el-card>
-                    </el-timeline-item>
-                    <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
-                        <el-card>
-                            <h4>责任对接人，标准法规部部门负责人</h4>
-                            <div style="margin-top: 10px;width: 300px;">
-                                <el-input v-model="user5" placeholder="责任对接人，标准法规部部门负责人"></el-input>
-                            </div>
-                        </el-card>
-                    </el-timeline-item>
-                </el-timeline>
-            </div>
-        </div>
         <ProcessFooter
                 show-save
                 show-submit
@@ -777,6 +803,130 @@
                 </div>
             </el-upload>
         </el-dialog>
+        <el-dialog
+                :title="config.attrName"
+                :visible.sync="replaceLawsNumModel"
+                width="875px"
+                :close-on-click-modal="false"
+                @close="replaceLawsNumModelCancel"
+                :append-to-body="true"
+        >
+            <div class="search-area">
+                <div class="left">
+                    <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+                        <el-form-item label="标准来源" class="search-item" v-if="dataSource">
+                            <el-select
+                                    v-model="replaceLawsNumForm.standType"
+                                    placeholder="请选择标准来源"
+                                    @change="dataSourceChange">
+                                <el-option value="INLAND" label="国内标准库"></el-option>
+                                <el-option value="FOREIGN" label="国外标准库"></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item label="编号/名称" class="search-item">
+                            <el-input
+                                    v-model="replaceLawsNumForm.standNumber"
+                                    placeholder="根据编号/名称查找"
+                                    clearable
+                                    :maxlength="100"></el-input>
+                        </el-form-item>
+                        <el-form-item class="search-item btn-box">
+                            <el-button
+                                    icon="el-icon-search"
+                                    type="primary"
+                                    class="common-button-primary"
+                                    round
+                                    @click="getReplaceLawsNumRowFirst">
+                            </el-button>
+                        </el-form-item>
+                        <el-form-item class="search-item btn-box">
+                            <el-button
+                                    class="common-button-default"
+                                    icon="el-icon-refresh-left"
+                                    round
+                                    type="default"
+                                    @click="getResetLawsNumRow"></el-button>
+                        </el-form-item>
+                    </el-form>
+                </div>
+            </div>
+            <el-table
+                    ref="selections"
+                    :data="replaceLawsNumRow"
+                    tooltip-effect="dark"
+                    style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+                    border
+                    :height="300"
+                    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+                    @selection-change="selectReplaceStandNumRowChange">
+                <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="标准编号">
+                    <template slot-scope="scope">
+                        <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                        <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="standName"
+                        label="标准名称">
+                </el-table-column>
+                <el-table-column
+                        prop="issueTime"
+                        label="发布日期"
+                        width="130">
+                    <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
+                </el-table-column>
+                <el-table-column
+                        prop="standStateShow"
+                        label="标准状态"
+                        width="130">
+                </el-table-column>
+            </el-table>
+            <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
+            <!--分页-->
+            <pagination
+                    style="position: relative;"
+                    :page="replacePage"
+                    :total="replaceTotal"
+                    @pageChange="pageChangeReplace"
+                    @pageSizeChange="pageSizeChangeReplace"></pagination>
+            <div slot="footer" class="demo-drawer-footer">
+                <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+                <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+            </div>
+        </el-dialog>
+        <el-drawer
+                :title="drawerTitle"
+                :visible.sync="modalShowFlag"
+                :wrapperClosable="false"
+                size="800px">
+            <el-tree
+                    v-if="modalShowFlag"
+                    node-key="id"
+                    style="height: 100%; overflow: auto;"
+                    class="filter-tree"
+                    :data="treeData"
+                    :props="defaultUserProps"
+                    :default-checked-keys="nodeList"
+                    highlight-current
+                    check-strictly
+                    @check="drawerCheck"
+                    default-expand-all
+                    :expand-on-click-node="false"
+                    show-checkbox
+                    ref="tree">
+            </el-tree>
+            <div id="roleFormButton" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
+            </div>
+        </el-drawer>
     </div>
 </template>
 
@@ -791,8 +941,36 @@
         name: "bzrkStep1",
         data () {
             return {
+              activeName:'1',
+                roleRow: {},
               commentText: '', // 意见
                 title: '', // 新增编辑抽屉标题
+                config: {
+                    attrName : '',
+                },
+                dataSource: false,
+                replaceLawsNumModel: false,
+                replaceLawType: '',
+                sarBussionessLawsEO: {
+                    replaceLawsNum: ''
+                },
+                // 代替标准号
+                replaceLawsNumForm: {
+                    dataSource: '',
+                    standNumber: '', // 标准编号
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    total: 0,
+                    standType: 'INLAND',
+                    quoteIdList: '',
+                    validFlag: '0',
+                    menuId: 'nomenu'
+                },
+                replaceLawsNumRow: [], // 代替政策号 数组内容
+                replaceTotal: 0,
+                selectedListRep: [],
+                replaceLoading: true,
+                replacePage: 1,
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
@@ -801,6 +979,15 @@
                     children: 'children',
                     label: 'menuName'
                 },
+                nodeList: [],
+                type: '',
+                defaultUserProps: {
+                    children: 'children',
+                    label: 'name'
+                },
+                treeData: [], // 人员数据
+                modalShowFlag: false, // drawer开关
+                drawerTitle: '', //drawer标题
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
                 fileUrl: 'api/att/attFile/upload',
@@ -877,6 +1064,58 @@
                     xglc: '', // 相关流程
                     chjl: '', // 参会记录
                 }, // 标准信息
+                roleForm:{
+                    zrUserId: '',
+                    zrUserName: '',
+                    jlUserId: '',
+                    jlUserName: '',
+                    applyUpdUserId: this.$store.getters.userInfo.userId,
+                    applyUpdUserName: this.$store.getters.userInfo.userName,
+                    prcCreateUser: this.$store.getters.userInfo.userId,
+                    prcCreateUserName: this.$store.getters.userInfo.userName,
+                },
+                roleRules:{
+                    zrUserName: [
+                        { required: true, message: '请选择会签责任人', trigger: 'blur' },
+                    ],
+                    jlUserName: [
+                        { required: true, message: '选择标准法规业务经理', trigger: 'blur' },
+                    ],
+                },
+                rules:{
+                    standSort: [
+                        { required: true, message: '请选择标准类别', trigger: 'change' }
+                    ],
+                    standNumber: [
+                        { required: true, message: '请输入标准编号', trigger: 'blur' },
+                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+                    ],
+                    standYear: [
+                        { required: true, message: '请输入标准年份'},
+                        { type: 'number', message: '年标准年份必须为数字值'}
+                    ],
+                    standName: [
+                        { required: true, message: '请输入标准名称', trigger: 'blur' },
+                        { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+                    ],
+                    standNature: [
+                        { required: false, message: '请选择标准性质', trigger: 'change' }
+                    ],
+                    textStatus: [
+                        { required: true, message: '请选择文本状态', trigger: 'change' }
+                    ],
+                    issueTime: [
+                        { required: true, message: '请选择标准发布日期', trigger: 'change' }
+                    ],
+                    qcdw: [
+                        { required: true, message: '请选择起草单位', trigger: 'change' }
+                    ],
+                    cysd: [
+                        { required: true, message: '请选择我司参与深度', trigger: 'change' }
+                    ],
+                },
+                zrUserIds: [], // 选择多个会签责任人
+                userType:'', // 选择用户ID判断
                 standSortOptions: [], // 标准类别
                 standNatureOptions: [], // 标准性质
                 standStateOptions: [], // 文本状态
@@ -891,11 +1130,6 @@
                 txlbOptions: [], // 体系类别
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
-                user1: '',
-                user2: '',
-                user3: '',
-                user4: '',
-                user5: '',
             }
         },
         components: {
@@ -905,6 +1139,225 @@
             TreeSelect
         },
         methods: {
+            saveUserInfo () {
+                if (this.userType === 'zrUserId') {
+                    this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
+                    this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
+                } else if (this.userType === 'jlUserId') {
+                    this.roleForm.jlUserId = this.roleRow.id
+                    this.roleForm.jlUserName = this.roleRow.name
+                }
+
+                this.modalShowFlag = false
+            },
+            cancelUserInfo () {
+                this.modalShowFlag = false
+            },
+            drawerCheck (data) {
+                if(this.userType === 'zrUserId'){
+
+                    if(this.zrUserIds.length > 0){
+                        const list = this.zrUserIds.filter ( item => item.id === data.id);
+                        if(list.length === 0){
+                            this.zrUserIds.push(data)
+                        }else {
+                            this.zrUserIds.forEach((item,index) => {
+                                if(item.id === data.id){
+                                    this.zrUserIds.splice(index,1)
+                                }
+                            })
+                        }
+                    }else {
+                        this.zrUserIds.push(data)
+                    }
+
+                    console.log(this.zrUserIds)
+                }else {
+                    var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+                    if(getlist.length == 1) {
+                        this.roleRow = getlist[0]
+                    }else {
+                        this.$refs.tree.setCheckedKeys([data.id]);
+                        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
+                    }
+                }
+            },
+            choiceZRR (type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.userType = type
+                this.drawerTitle = title
+                this.modalShowFlag = true
+            },
+            getTree () {
+                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
+                    this.treeData = res.data
+                })
+            },
+            // 代替政策号 请求数据
+            getReplaceLawsNumRowFirst () {
+                if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+                    this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+                } else {
+                    this.quoteIdList1 = []
+                    this.replaceLawsNumForm.quoteIdList = ''
+                }
+                this.replaceLawsNumForm.page = 1
+                this.replacePage = 1
+                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+                    _this: this,
+                    loading: 'replaceLoading'
+                }, res => {
+                    this.replaceLawsNumRow = res.data.list
+                    this.replaceTotal = res.data.count
+                    if (this.selectedListRep.length !== 0) {
+                        this.selectedListRep.map((list) => {
+                            this.replaceLawsNumRow.map((item) => {
+                                if (list.id === item.id) {
+                                    item._checked = true
+                                }
+                            })
+                        })
+                    }
+                }, e => {
+                })
+            },
+            dataSourceChange (val) {
+            },
+            handleChange (event) {
+                // const value = event.target.value
+                const value = event
+                this.$emit('input', value)
+                if (value.length==1000){
+                    return  this.$message({
+                        message: '相关标准不能输入超过1000个字符',
+                        type: 'warning'
+                    });
+                }
+            },
+            // 代替政策编号-取消
+            replaceLawsNumModelCancel () {
+                // this.replaceLawsNumModel = false
+                this.$refs.selections.clearSelection()
+            },
+            // 代替政策号 table选择事件
+            selectReplaceStandNumRowChange (row) {
+                this.selectedListRep = row
+            },
+            // 代替政策分页
+            pageChangeReplace (page) {
+                this.replacePage = page
+                this.replaceLawsNumForm.page = page
+                this.getReplaceLawsNumRow()
+            },
+            pageSizeChangeReplace (pageSize) {
+                // this.replaceRows = pageSize
+                this.replaceLawsNumForm.pageSize = pageSize
+                this.getReplaceLawsNumRow()
+            },
+            // 代替政策编号确定
+            replaceLawsNumModelBt () {
+                let textArr = []
+
+                if (typeof this.value === 'string') {
+                    if (this.value) {
+                        textArr = this.value.split(',')
+                    }
+                }
+                if (this.selectedListRep.length === 0) {
+                    return this.$message({
+                        message: '请先选择数据',
+                        type: 'warning'
+                    })
+                }
+                if (this.selectedListRep.length + textArr.length > 20) {
+                    return this.$message({
+                        message: '标准最多选择20项',
+                        type: 'warning'
+                    })
+                }
+                this.selectedListRep.map((item) => {
+                    let texts = ''
+                    if (item.standYear != null && item.standYear !== '') {
+                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                    } else {
+                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                    }
+                    textArr.push(texts)
+                    textArr = [...new Set(textArr)]
+                    this.replaceLawsNumModel = false
+                })
+                // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+                if(this.replaceLawType === 'dtbjh'){
+                    this.form.dtbjh = textArr.join(',')
+                }else if(this.replaceLawType === 'yybj'){
+                    this.form.yybj = textArr.join(',')
+                }else {
+                    this.form.byybj = textArr.join(',')
+                }
+                // this.$emit('input', textArr.join(','))
+                this.$refs.selections.clearSelection()
+            },
+            // 点击查看
+            handlePreview (item) {
+                let routeUrl = this.$router.resolve({
+                    name: 'OtherStandardDetails',
+                    params: {
+                        id: item.id,
+                        pageType: 'INLAND_STAND'
+                    }
+                })
+                window.open(routeUrl.href, '_blank')
+            },
+            getResetLawsNumRow () {
+                this.replaceLawsNumForm = {
+                    standNumber: '', // 标准编号
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    total: 0,
+                    standType: 'INLAND',
+                    quoteIdList: '',
+                    validFlag: '0'
+                }
+                this.getReplaceLawsNumRow()
+            },
+            selectLaws (type) {
+                // if (this.standNumFlag === 1) {
+                // this.$refs.selections.selectAll(false)
+                // }
+                // this.sarBussionessLawsEO.replaceLawsNum = ''
+                this.replaceLawsNumModel = true
+                this.replaceLawType = ''
+                this.replaceLawType = type
+                this.getReplaceLawsNumRow()
+            },
+            // 代替政策号 请求数据
+            getReplaceLawsNumRow () {
+                if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+                    this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+                } else {
+                    this.quoteIdList1 = []
+                    this.replaceLawsNumForm.quoteIdList = ''
+                }
+                this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+                    _this: this,
+                    loading: 'replaceLoading'
+                }, res => {
+                    this.replaceLawsNumRow = res.data.list
+                    this.replaceTotal = res.data.count
+                    if (this.selectedListRep.length !== 0) {
+                        this.selectedListRep.map((list) => {
+                            this.replaceLawsNumRow.map((item) => {
+                                if (list.id === item.id) {
+                                    item._checked = true
+                                }
+                            })
+                        })
+                    }
+                }, e => {
+                })
+            },
             beginImportFile (file) {
                 var filename = file.name
                 var index1 = filename.lastIndexOf('.')
@@ -1026,33 +1479,46 @@
               })
             },
             handleSubmit() {
-                var json = this.form
-                json.zrUserId = this.$store.getters.userInfo.userId
-                json.jlUserId = this.$store.getters.userInfo.userId
-                json.commentText = this.commentText
-                json.applyUpdUserId = this.$store.getters.userInfo.userId
-                json.prcCreateUser = this.$store.getters.userInfo.userId
-                json.prcCreateUserName = this.$store.getters.userInfo.account
-                this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
-                    _this: this
-                }, res => {
-                    if (res.ok) {
-                        this.$http.post('lawss/activiti/completeTask', {
-                            taskIds: res.data,
-                            userId : this.$store.getters.userInfo.userId,
-                            json: JSON.stringify(json)
-                        }, {
-                            _this: this
-                        }, res => {
-                            if (res.success) {
-                                this.$message.success(res.message)
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        this.$refs['userForm'].validate((valid) => {
+                            if (valid) {
+                                var json = Object.assign(this.form, this.roleForm)
+                                json.zrUserId = this.form.zrUserId
+                                json.jlUserId = this.form.jlUserId
+                                json.commentText = this.commentText
+                                json.applyUpdUserId = this.form.applyUpdUserId
+                                json.prcCreateUser = this.form.prcCreateUser
+                                json.prcCreateUserName = this.form.prcCreateUserName
+                                this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
+                                    _this: this
+                                }, res => {
+                                    if (res.ok) {
+                                        this.$http.post('lawss/activiti/completeTask', {
+                                            taskIds: res.data,
+                                            userId : this.$store.getters.userInfo.userId,
+                                            json: JSON.stringify(json)
+                                        }, {
+                                            _this: this
+                                        }, res => {
+                                            if (res.success) {
+                                                this.$message.success(res.message)
+                                            }
+                                        })
+                                    }
+                                })
+                            }else {
+                                this.$message.warning('请检查人员信息表单是否填写完整')
                             }
                         })
+                     } else {
+                        this.$message.warning('请检查基础信息表单是否填写完整')
                     }
                 })
             }
         },
         mounted () {
+            this.getTree()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
             }, res => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 06544ba2a..f1a9cb9f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -350,10 +350,10 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="fbjg" class="add-form-item form-item-disabled">
+                                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
-                                            v-model="form.fbjg"
+                                            v-model="form.qcdw"
                                             placeholder="请选择起草单位"
                                             clearable
                                     ></el-input>
@@ -521,8 +521,8 @@
                 </el-form>
             </div>
             <div>
-                <el-collapse accordion>
-                    <el-collapse-item title="意见填写">
+                <el-collapse accordion v-model="activeName">
+                    <el-collapse-item title="意见填写" name = "1">
                         <div style="margin: 10px 0;">
                             <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
                                 <el-option label="驳回" value="1"></el-option>
@@ -678,6 +678,7 @@
         name: "bzrkStep2",
         data () {
             return {
+              activeName:'1',
               // 当前流程类型(1待办/2已办)
               processType: 1,
                 detailData: [],
@@ -743,7 +744,7 @@
                     // 适用范围
                     txlb: '', // 体系类别
                     gkdw: '', // 归口管理部门
-                    fbjg: '', // 起草单位
+                    qcdw: '', // 起草单位
                     wssmr: '', // 我司署名人
                     cysd: '', // 我司参与深度
                     cllx: '', // 适用车型
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 652ca5446..99355c242 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -343,10 +343,10 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="fbjg" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                   <el-input
                       disabled
-                      v-model="form.fbjg"
+                      v-model="form.qcdw"
                       placeholder="请选择起草单位"
                       clearable
                   ></el-input>
@@ -514,8 +514,8 @@
         </el-form>
       </div>
       <div>
-        <el-collapse accordion>
-          <el-collapse-item title="意见填写">
+        <el-collapse accordion v-model="activeName">
+          <el-collapse-item title="意见填写" name="1">
             <div style="margin: 10px 0;">
 <!--              <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
 <!--                <el-option label="驳回" value="1"></el-option>-->
@@ -671,6 +671,7 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      activeName:'1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
       detailData: [],
@@ -735,7 +736,7 @@ export default {
         // 适用范围
         txlb: '', // 体系类别
         gkdw: '', // 归口管理部门
-        fbjg: '', // 起草单位
+        qcdw: '', // 起草单位
         wssmr: '', // 我司署名人
         cysd: '', // 我司参与深度
         cllx: '', // 适用车型
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index ed2fbb46f..4c459acc8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -13,8 +13,9 @@
     <div class="content" v-if="active === '1'">
       <div style="flex: auto; overflow: auto;">
         <el-form
-            ref="qbkwForm"
+            ref="form"
             :model="form"
+            :rules="rules"
             class="label-input-form"
             label-width="210px"
         >
@@ -115,6 +116,7 @@
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <tree-select v-if="treeStatus"
+                               width = "340"
                           :data="standSystemOptions"
                           :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                           :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
@@ -509,9 +511,9 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="fbjg" class="add-form-item form-item-disabled">
+                <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                   <el-input
-                      v-model="form.fbjg"
+                      v-model="form.qcdw"
                       placeholder="请选择起草单位"
                       clearable
                   ></el-input>
@@ -612,6 +614,13 @@
                       placeholder="请输入代替标准号"
                       clearable
                   ></el-input>
+                  <el-button
+                          type="primary"
+                          class="common-button-primary"
+                          size="mini"
+                          style="position:absolute;top: 10px;right: 0;"
+                          @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                  >{{'手动查找'}}</el-button>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
                   <el-select v-model="form.cbcd" placeholder="请选择采标程度">
@@ -654,6 +663,13 @@
                       placeholder="请输入引用标准"
                       clearable
                   ></el-input>
+                  <el-button
+                          type="primary"
+                          class="common-button-primary"
+                          size="mini"
+                          style="position:absolute;top: 10px;right: 0;"
+                          @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                  >{{'手动查找'}}</el-button>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                   <el-input
@@ -668,6 +684,13 @@
                       placeholder="请输入被引用标准"
                       clearable
                   ></el-input>
+                  <el-button
+                          type="primary"
+                          class="common-button-primary"
+                          size="mini"
+                          style="position:absolute;top: 10px;right: 0;"
+                          @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                  >{{'手动查找'}}</el-button>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">
                   <el-input
@@ -682,8 +705,8 @@
         </el-form>
       </div>
       <div>
-        <el-collapse accordion>
-          <el-collapse-item title="意见填写">
+        <el-collapse accordion v-model="activeName">
+          <el-collapse-item title="意见填写" name="1">
             <div style="margin: 10px 0;">
 <!--              <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
 <!--                <el-option label="驳回" value="1"></el-option>-->
@@ -843,6 +866,104 @@
         </div>
       </el-upload>
     </el-dialog>
+    <el-dialog
+            :title="config.attrName"
+            :visible.sync="replaceLawsNumModel"
+            width="875px"
+            :close-on-click-modal="false"
+            @close="replaceLawsNumModelCancel"
+            :append-to-body="true"
+    >
+      <div class="search-area">
+        <div class="left">
+          <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
+            <el-form-item label="标准来源" class="search-item" v-if="dataSource">
+              <el-select
+                      v-model="replaceLawsNumForm.standType"
+                      placeholder="请选择标准来源"
+                      @change="dataSourceChange">
+                <el-option value="INLAND" label="国内标准库"></el-option>
+                <el-option value="FOREIGN" label="国外标准库"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="编号/名称" class="search-item">
+              <el-input
+                      v-model="replaceLawsNumForm.standNumber"
+                      placeholder="根据编号/名称查找"
+                      clearable
+                      :maxlength="100"></el-input>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                      icon="el-icon-search"
+                      type="primary"
+                      class="common-button-primary"
+                      round
+                      @click="getReplaceLawsNumRowFirst">
+              </el-button>
+            </el-form-item>
+            <el-form-item class="search-item btn-box">
+              <el-button
+                      class="common-button-default"
+                      icon="el-icon-refresh-left"
+                      round
+                      type="default"
+                      @click="getResetLawsNumRow"></el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <el-table
+              ref="selections"
+              :data="replaceLawsNumRow"
+              tooltip-effect="dark"
+              style="width: 100%;overflow-y: auto;overflow-x: hidden;"
+              border
+              :height="300"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectReplaceStandNumRowChange">
+        <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+        </el-table-column>
+        <el-table-column
+                label="标准编号">
+          <template slot-scope="scope">
+            <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+            <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="standName"
+                label="标准名称">
+        </el-table-column>
+        <el-table-column
+                prop="issueTime"
+                label="发布日期"
+                width="130">
+          <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
+        </el-table-column>
+        <el-table-column
+                prop="standStateShow"
+                label="标准状态"
+                width="130">
+        </el-table-column>
+      </el-table>
+      <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
+      <!--分页-->
+      <pagination
+              style="position: relative;"
+              :page="replacePage"
+              :total="replaceTotal"
+              @pageChange="pageChangeReplace"
+              @pageSizeChange="pageSizeChangeReplace"></pagination>
+      <div slot="footer" class="demo-drawer-footer">
+        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -857,6 +978,7 @@ export default {
   name: "bzrkStep4",
   data () {
     return {
+      activeName:'1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
       detailData: [],
@@ -880,6 +1002,64 @@ export default {
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
       fileType: '',
+      config: {
+        attrName : '',
+      },
+      dataSource: false,
+      replaceLawsNumModel: false,
+      replaceLawType: '',
+      sarBussionessLawsEO: {
+        replaceLawsNum: ''
+      },
+      // 代替标准号
+      replaceLawsNumForm: {
+        dataSource: '',
+        standNumber: '', // 标准编号
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'INLAND',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
+      replaceLawsNumRow: [], // 代替政策号 数组内容
+      replaceTotal: 0,
+      selectedListRep: [],
+      replaceLoading: true,
+      replacePage: 1,
+      rules:{
+        standSort: [
+          { required: true, message: '请选择标准类别', trigger: 'change' }
+        ],
+        standNumber: [
+          { required: true, message: '请输入标准编号', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+        ],
+        standYear: [
+          { required: true, message: '请输入标准年份'},
+          { type: 'number', message: '年标准年份必须为数字值'}
+        ],
+        standName: [
+          { required: true, message: '请输入标准名称', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+        ],
+        standNature: [
+          { required: false, message: '请选择标准性质', trigger: 'change' }
+        ],
+        textStatus: [
+          { required: true, message: '请选择文本状态', trigger: 'change' }
+        ],
+        issueTime: [
+          { required: true, message: '请选择标准发布日期', trigger: 'change' }
+        ],
+        qcdw: [
+          { required: true, message: '请选择起草单位', trigger: 'change' }
+        ],
+        cysd: [
+          { required: true, message: '请选择我司参与深度', trigger: 'change' }
+        ],
+      },
       form: {
         // 基础信息
         textStatus: '', // 文本状态
@@ -926,7 +1106,7 @@ export default {
         // 适用范围
         txlb: '', // 体系类别
         gkdw: '', // 归口管理部门
-        fbjg: '', // 起草单位
+        qcdw: '', // 起草单位
         wssmr: '', // 我司署名人
         cysd: '', // 我司参与深度
         cllx: '', // 适用车型
@@ -992,6 +1172,170 @@ export default {
     },
   },
   methods: {
+    // 代替政策号 请求数据
+    getReplaceLawsNumRowFirst () {
+      if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+        this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+      } else {
+        this.quoteIdList1 = []
+        this.replaceLawsNumForm.quoteIdList = ''
+      }
+      this.replaceLawsNumForm.page = 1
+      this.replacePage = 1
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+        _this: this,
+        loading: 'replaceLoading'
+      }, res => {
+        this.replaceLawsNumRow = res.data.list
+        this.replaceTotal = res.data.count
+        if (this.selectedListRep.length !== 0) {
+          this.selectedListRep.map((list) => {
+            this.replaceLawsNumRow.map((item) => {
+              if (list.id === item.id) {
+                item._checked = true
+              }
+            })
+          })
+        }
+      }, e => {
+      })
+    },
+    dataSourceChange (val) {
+    },
+    handleChange (event) {
+      // const value = event.target.value
+      const value = event
+      this.$emit('input', value)
+      if (value.length==1000){
+        return  this.$message({
+          message: '相关标准不能输入超过1000个字符',
+          type: 'warning'
+        });
+      }
+    },
+    // 代替政策编号-取消
+    replaceLawsNumModelCancel () {
+      // this.replaceLawsNumModel = false
+      this.$refs.selections.clearSelection()
+    },
+    // 代替政策号 table选择事件
+    selectReplaceStandNumRowChange (row) {
+      this.selectedListRep = row
+    },
+    // 代替政策分页
+    pageChangeReplace (page) {
+      this.replacePage = page
+      this.replaceLawsNumForm.page = page
+      this.getReplaceLawsNumRow()
+    },
+    pageSizeChangeReplace (pageSize) {
+      // this.replaceRows = pageSize
+      this.replaceLawsNumForm.pageSize = pageSize
+      this.getReplaceLawsNumRow()
+    },
+    // 代替政策编号确定
+    replaceLawsNumModelBt () {
+      let textArr = []
+
+      if (typeof this.value === 'string') {
+        if (this.value) {
+          textArr = this.value.split(',')
+        }
+      }
+      if (this.selectedListRep.length === 0) {
+        return this.$message({
+          message: '请先选择数据',
+          type: 'warning'
+        })
+      }
+      if (this.selectedListRep.length + textArr.length > 20) {
+        return this.$message({
+          message: '标准最多选择20项',
+          type: 'warning'
+        })
+      }
+      this.selectedListRep.map((item) => {
+        let texts = ''
+        if (item.standYear != null && item.standYear !== '') {
+          texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+        } else {
+          texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+        }
+        textArr.push(texts)
+        textArr = [...new Set(textArr)]
+        this.replaceLawsNumModel = false
+      })
+      // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+      if(this.replaceLawType === 'dtbjh'){
+        this.form.dtbjh = textArr.join(',')
+      }else if(this.replaceLawType === 'yybj'){
+        this.form.yybj = textArr.join(',')
+      }else {
+        this.form.byybj = textArr.join(',')
+      }
+      // this.$emit('input', textArr.join(','))
+      this.$refs.selections.clearSelection()
+    },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    getResetLawsNumRow () {
+      this.replaceLawsNumForm = {
+        standNumber: '', // 标准编号
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'INLAND',
+        quoteIdList: '',
+        validFlag: '0'
+      }
+      this.getReplaceLawsNumRow()
+    },
+    selectLaws (type) {
+      // if (this.standNumFlag === 1) {
+      // this.$refs.selections.selectAll(false)
+      // }
+      // this.sarBussionessLawsEO.replaceLawsNum = ''
+      this.replaceLawsNumModel = true
+      this.replaceLawType = ''
+      this.replaceLawType = type
+      this.getReplaceLawsNumRow()
+    },
+    // 代替政策号 请求数据
+    getReplaceLawsNumRow () {
+      if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
+        this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
+      } else {
+        this.quoteIdList1 = []
+        this.replaceLawsNumForm.quoteIdList = ''
+      }
+      this.replaceLawsNumForm.standType = this.form.standInData === '1' ? 'FOREIGN' : 'INLAND'
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.replaceLawsNumForm, {
+        _this: this,
+        loading: 'replaceLoading'
+      }, res => {
+        this.replaceLawsNumRow = res.data.list
+        this.replaceTotal = res.data.count
+        if (this.selectedListRep.length !== 0) {
+          this.selectedListRep.map((list) => {
+            this.replaceLawsNumRow.map((item) => {
+              if (list.id === item.id) {
+                item._checked = true
+              }
+            })
+          })
+        }
+      }, e => {
+      })
+    },
     beginImportFile (file) {
       var filename = file.name
       var index1 = filename.lastIndexOf('.')
@@ -1128,22 +1472,25 @@ export default {
     },
     handleSave() {},
     handleSubmit() {
-      this.form.commentText = this.commentText
-      this.form.approvalOpinion = this.approvalOpinion
-      const json = JSON.stringify(this.form);
-      console.log(json)
-      this.$http.post('lawss/activiti/completeTask', {
-        taskIds: this.taskIds,
-        userId : this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message)
-        }else {
-          this.$message.success(res.message)
-        }
+      this.$refs['form'].validate((valid) => {
+          if (valid) {
+            this.form.commentText = this.commentText
+            this.form.approvalOpinion = this.approvalOpinion
+            const json = JSON.stringify(this.form);
+            this.$http.post('lawss/activiti/completeTask', {
+              taskIds: this.taskIds,
+              userId : this.userId,
+              json: json
+            }, {
+              _this: this
+            }, res => {
+              if (res.success) {
+                this.$message.success(res.message)
+              }else {
+                this.$message.success(res.message)
+              }
+            })
+          }
       })
     },
 
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 137c40c5f..bb42023d4 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -395,6 +395,7 @@
                   >
                       <template slot="label">标准体系</template>
                       <tree-select
+                              width = "593"
                               :data="standSystemOptions"
                               :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                               :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>

From 8eedeaa9f5aee13e698fe44806266a29d53040d4 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 15 Jul 2021 09:10:25 +0800
Subject: [PATCH 15/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shangqi-iconfont-replace/demo_index.html  | 858 +++++++++---------
 .../pages/attributeCustom/components/buss.vue |   2 +-
 .../pages/standLawsAttrManage/index.vue       |   3 +-
 src/pages/localTool/standContrast/index.vue   |  42 +-
 .../localTool/standardRecognition/index.vue   |   8 +-
 5 files changed, 456 insertions(+), 457 deletions(-)

diff --git a/src/assets/styles/shangqi-iconfont-replace/demo_index.html b/src/assets/styles/shangqi-iconfont-replace/demo_index.html
index 9fbc2eab1..8e8874e61 100644
--- a/src/assets/styles/shangqi-iconfont-replace/demo_index.html
+++ b/src/assets/styles/shangqi-iconfont-replace/demo_index.html
@@ -22,860 +22,860 @@
         <li class="dib"><span>Font class</span></li>
         <li class="dib"><span>Symbol</span></li>
       </ul>
-      
+
       <a href="https://www.iconfont.cn/manage/index?manage_type=myprojects&projectId=2142768" target="_blank" class="nav-more">查看项目</a>
-      
+
     </div>
     <div class="tab-container">
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe683;</span>
                 <div class="name">帮助与支持</div>
                 <div class="code-name">&amp;#xe683;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe64e;</span>
                 <div class="name">对比2</div>
                 <div class="code-name">&amp;#xe64e;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb43;</span>
                 <div class="name">标签</div>
                 <div class="code-name">&amp;#xeb43;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe64c;</span>
                 <div class="name">线性-标记</div>
                 <div class="code-name">&amp;#xe64c;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe686;</span>
                 <div class="name">已读</div>
                 <div class="code-name">&amp;#xe686;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb42;</span>
                 <div class="name">已读</div>
                 <div class="code-name">&amp;#xeb42;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe657;</span>
                 <div class="name">小组</div>
                 <div class="code-name">&amp;#xe657;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe646;</span>
                 <div class="name">单据-错误</div>
                 <div class="code-name">&amp;#xe646;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe649;</span>
                 <div class="name">保养计划</div>
                 <div class="code-name">&amp;#xe649;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe644;</span>
                 <div class="name">毅进06-积分政策</div>
                 <div class="code-name">&amp;#xe644;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe643;</span>
                 <div class="name">对比分析</div>
                 <div class="code-name">&amp;#xe643;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe641;</span>
                 <div class="name">角色管理</div>
                 <div class="code-name">&amp;#xe641;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb41;</span>
                 <div class="name">识别</div>
                 <div class="code-name">&amp;#xeb41;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe662;</span>
                 <div class="name">权限块状</div>
                 <div class="code-name">&amp;#xe662;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe618;</span>
                 <div class="name">条件筛选</div>
                 <div class="code-name">&amp;#xe618;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe619;</span>
                 <div class="name">返回</div>
                 <div class="code-name">&amp;#xe619;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe654;</span>
                 <div class="name">随你后台-新闻</div>
                 <div class="code-name">&amp;#xe654;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe675;</span>
                 <div class="name">待办</div>
                 <div class="code-name">&amp;#xe675;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe69f;</span>
                 <div class="name">分享</div>
                 <div class="code-name">&amp;#xe69f;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe61d;</span>
                 <div class="name">国内</div>
                 <div class="code-name">&amp;#xe61d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe622;</span>
                 <div class="name">国际</div>
                 <div class="code-name">&amp;#xe622;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe633;</span>
                 <div class="name">设置</div>
                 <div class="code-name">&amp;#xe633;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6ca;</span>
                 <div class="name">首页</div>
                 <div class="code-name">&amp;#xe6ca;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe629;</span>
                 <div class="name">日历 (1)</div>
                 <div class="code-name">&amp;#xe629;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe62a;</span>
                 <div class="name">云</div>
                 <div class="code-name">&amp;#xe62a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe62b;</span>
                 <div class="name">设置</div>
                 <div class="code-name">&amp;#xe62b;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe62c;</span>
                 <div class="name">向下d</div>
                 <div class="code-name">&amp;#xe62c;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe62d;</span>
                 <div class="name">向上d</div>
                 <div class="code-name">&amp;#xe62d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe803;</span>
                 <div class="name">企业 工厂 建筑2</div>
                 <div class="code-name">&amp;#xe803;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe663;</span>
                 <div class="name">全球</div>
                 <div class="code-name">&amp;#xe663;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe62e;</span>
                 <div class="name">中国地图</div>
                 <div class="code-name">&amp;#xe62e;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe63a;</span>
                 <div class="name">前进</div>
                 <div class="code-name">&amp;#xe63a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe631;</span>
                 <div class="name">返回</div>
                 <div class="code-name">&amp;#xe631;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe636;</span>
                 <div class="name">返回</div>
                 <div class="code-name">&amp;#xe636;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe637;</span>
                 <div class="name">预警</div>
                 <div class="code-name">&amp;#xe637;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe7ed;</span>
                 <div class="name">全文检索库</div>
                 <div class="code-name">&amp;#xe7ed;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe63c;</span>
                 <div class="name">数据检索</div>
                 <div class="code-name">&amp;#xe63c;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe63d;</span>
                 <div class="name">展开侧边栏</div>
                 <div class="code-name">&amp;#xe63d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe665;</span>
                 <div class="name">WiFi</div>
                 <div class="code-name">&amp;#xe665;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe63e;</span>
                 <div class="name">验证码</div>
                 <div class="code-name">&amp;#xe63e;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe63f;</span>
                 <div class="name">car</div>
                 <div class="code-name">&amp;#xe63f;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe74a;</span>
                 <div class="name">car</div>
                 <div class="code-name">&amp;#xe74a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe67a;</span>
                 <div class="name">信息</div>
                 <div class="code-name">&amp;#xe67a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6a7;</span>
                 <div class="name">云端</div>
                 <div class="code-name">&amp;#xe6a7;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe635;</span>
                 <div class="name">流程</div>
                 <div class="code-name">&amp;#xe635;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe60a;</span>
                 <div class="name">配置</div>
                 <div class="code-name">&amp;#xe60a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe66f;</span>
                 <div class="name">数据分析</div>
                 <div class="code-name">&amp;#xe66f;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe63b;</span>
                 <div class="name">检索</div>
                 <div class="code-name">&amp;#xe63b;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe60d;</span>
                 <div class="name">团队</div>
                 <div class="code-name">&amp;#xe60d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe656;</span>
                 <div class="name">法规库</div>
                 <div class="code-name">&amp;#xe656;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6ee;</span>
                 <div class="name">分析工具,红字分析</div>
                 <div class="code-name">&amp;#xe6ee;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe60e;</span>
                 <div class="name">搜索</div>
                 <div class="code-name">&amp;#xe60e;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe651;</span>
                 <div class="name">轮胎</div>
                 <div class="code-name">&amp;#xe651;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe648;</span>
                 <div class="name">回到顶部</div>
                 <div class="code-name">&amp;#xe648;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6f0;</span>
                 <div class="name">web__暂无记录</div>
                 <div class="code-name">&amp;#xe6f0;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe64b;</span>
                 <div class="name">文件夹</div>
                 <div class="code-name">&amp;#xe64b;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe61a;</span>
                 <div class="name">arrow down</div>
                 <div class="code-name">&amp;#xe61a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe61c;</span>
                 <div class="name">汽车-28</div>
                 <div class="code-name">&amp;#xe61c;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe640;</span>
                 <div class="name">系统运维-部门</div>
                 <div class="code-name">&amp;#xe640;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe60f;</span>
                 <div class="name">员工渠道APP-我的</div>
                 <div class="code-name">&amp;#xe60f;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe621;</span>
                 <div class="name">选中个人中心</div>
                 <div class="code-name">&amp;#xe621;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe721;</span>
                 <div class="name">资源库</div>
                 <div class="code-name">&amp;#xe721;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe614;</span>
                 <div class="name">车-03</div>
                 <div class="code-name">&amp;#xe614;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe616;</span>
                 <div class="name">车-02</div>
                 <div class="code-name">&amp;#xe616;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe617;</span>
                 <div class="name">车-01</div>
                 <div class="code-name">&amp;#xe617;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb3d;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xeb3d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe609;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xe609;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe634;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xe634;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe615;</span>
                 <div class="name">委托</div>
                 <div class="code-name">&amp;#xe615;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe608;</span>
                 <div class="name">保存</div>
                 <div class="code-name">&amp;#xe608;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe64d;</span>
                 <div class="name">图表</div>
                 <div class="code-name">&amp;#xe64d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe61f;</span>
                 <div class="name">pdf</div>
                 <div class="code-name">&amp;#xe61f;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe769;</span>
                 <div class="name">翻译</div>
                 <div class="code-name">&amp;#xe769;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe607;</span>
                 <div class="name">word</div>
                 <div class="code-name">&amp;#xe607;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe612;</span>
                 <div class="name">流程</div>
                 <div class="code-name">&amp;#xe612;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe606;</span>
                 <div class="name">报表</div>
                 <div class="code-name">&amp;#xe606;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6ec;</span>
                 <div class="name">报表</div>
                 <div class="code-name">&amp;#xe6ec;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe630;</span>
                 <div class="name">配置</div>
                 <div class="code-name">&amp;#xe630;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe748;</span>
                 <div class="name">清单</div>
                 <div class="code-name">&amp;#xe748;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe613;</span>
                 <div class="name">动态</div>
                 <div class="code-name">&amp;#xe613;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe689;</span>
                 <div class="name">工具</div>
                 <div class="code-name">&amp;#xe689;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe7d2;</span>
                 <div class="name">配置</div>
                 <div class="code-name">&amp;#xe7d2;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe645;</span>
                 <div class="name">检索管理</div>
                 <div class="code-name">&amp;#xe645;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6ed;</span>
                 <div class="name">法规库</div>
                 <div class="code-name">&amp;#xe6ed;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe703;</span>
                 <div class="name">法律法规库</div>
                 <div class="code-name">&amp;#xe703;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe660;</span>
                 <div class="name">首页</div>
                 <div class="code-name">&amp;#xe660;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe605;</span>
                 <div class="name">清单</div>
                 <div class="code-name">&amp;#xe605;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe825;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xe825;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe669;</span>
                 <div class="name">配置</div>
                 <div class="code-name">&amp;#xe669;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe611;</span>
                 <div class="name">移除</div>
                 <div class="code-name">&amp;#xe611;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe726;</span>
                 <div class="name">预警</div>
                 <div class="code-name">&amp;#xe726;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe695;</span>
                 <div class="name">基础信息管理</div>
                 <div class="code-name">&amp;#xe695;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe664;</span>
                 <div class="name">基础配置管理</div>
                 <div class="code-name">&amp;#xe664;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe684;</span>
                 <div class="name">搜索</div>
                 <div class="code-name">&amp;#xe684;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe639;</span>
                 <div class="name">个人中心-我的</div>
                 <div class="code-name">&amp;#xe639;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe603;</span>
                 <div class="name">下  拉</div>
                 <div class="code-name">&amp;#xe603;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe65d;</span>
-                <div class="name">上传</div>
+                <div class="name"></div>
                 <div class="code-name">&amp;#xe65d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe67d;</span>
                 <div class="name">关 闭</div>
                 <div class="code-name">&amp;#xe67d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe642;</span>
                 <div class="name">日期</div>
                 <div class="code-name">&amp;#xe642;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe610;</span>
                 <div class="name">对</div>
                 <div class="code-name">&amp;#xe610;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe7a5;</span>
                 <div class="name">筛 选</div>
                 <div class="code-name">&amp;#xe7a5;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe61b;</span>
                 <div class="name">删 除</div>
                 <div class="code-name">&amp;#xe61b;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6de;</span>
                 <div class="name">导入</div>
                 <div class="code-name">&amp;#xe6de;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6e9;</span>
                 <div class="name">导出</div>
                 <div class="code-name">&amp;#xe6e9;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe61e;</span>
                 <div class="name">更多</div>
                 <div class="code-name">&amp;#xe61e;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb3c;</span>
                 <div class="name">编辑</div>
                 <div class="code-name">&amp;#xeb3c;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe602;</span>
                 <div class="name">删除／数字面板编辑态</div>
                 <div class="code-name">&amp;#xe602;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe84e;</span>
                 <div class="name">新增</div>
                 <div class="code-name">&amp;#xe84e;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe601;</span>
                 <div class="name">删除筛选项</div>
                 <div class="code-name">&amp;#xe601;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb3f;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xeb3f;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe60c;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xe60c;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe620;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xe620;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe64a;</span>
                 <div class="name">文件夹</div>
                 <div class="code-name">&amp;#xe64a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe84d;</span>
                 <div class="name">上传</div>
                 <div class="code-name">&amp;#xe84d;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe655;</span>
                 <div class="name">查看</div>
                 <div class="code-name">&amp;#xe655;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb37;</span>
                 <div class="name">上传</div>
                 <div class="code-name">&amp;#xeb37;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb38;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xeb38;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb39;</span>
                 <div class="name">下载</div>
                 <div class="code-name">&amp;#xeb39;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb3a;</span>
                 <div class="name">查看</div>
                 <div class="code-name">&amp;#xeb3a;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb3b;</span>
                 <div class="name">文件夹</div>
                 <div class="code-name">&amp;#xeb3b;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe638;</span>
                 <div class="name">导出</div>
                 <div class="code-name">&amp;#xe638;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe870;</span>
                 <div class="name">星星</div>
                 <div class="code-name">&amp;#xe870;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe732;</span>
                 <div class="name">会议记录</div>
                 <div class="code-name">&amp;#xe732;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb36;</span>
                 <div class="name">分开</div>
                 <div class="code-name">&amp;#xeb36;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe627;</span>
                 <div class="name">待办提醒</div>
                 <div class="code-name">&amp;#xe627;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe600;</span>
                 <div class="name">AK-MN消息2_fill</div>
                 <div class="code-name">&amp;#xe600;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe626;</span>
                 <div class="name">首页</div>
                 <div class="code-name">&amp;#xe626;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe628;</span>
                 <div class="name">爱生活-个人中心-头像</div>
                 <div class="code-name">&amp;#xe628;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe632;</span>
                 <div class="name">头像（通用）</div>
                 <div class="code-name">&amp;#xe632;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe69b;</span>
                 <div class="name">头像修改</div>
                 <div class="code-name">&amp;#xe69b;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe647;</span>
                 <div class="name">折叠</div>
                 <div class="code-name">&amp;#xe647;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe604;</span>
                 <div class="name">重置</div>
                 <div class="code-name">&amp;#xe604;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe715;</span>
                 <div class="name">维修扳手</div>
                 <div class="code-name">&amp;#xe715;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe62f;</span>
                 <div class="name">首页</div>
                 <div class="code-name">&amp;#xe62f;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe625;</span>
                 <div class="name">数据分析</div>
                 <div class="code-name">&amp;#xe625;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xeb35;</span>
                 <div class="name">流程</div>
                 <div class="code-name">&amp;#xeb35;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe6da;</span>
                 <div class="name">法律法规</div>
                 <div class="code-name">&amp;#xe6da;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe771;</span>
                 <div class="name">shouye</div>
                 <div class="code-name">&amp;#xe771;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe624;</span>
                 <div class="name">搜索</div>
                 <div class="code-name">&amp;#xe624;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe60b;</span>
                 <div class="name">团队</div>
                 <div class="code-name">&amp;#xe60b;</div>
               </li>
-          
+
             <li class="dib">
               <span class="icon iconfont">&#xe623;</span>
                 <div class="name">shouye</div>
                 <div class="code-name">&amp;#xe623;</div>
               </li>
-          
+
           </ul>
           <div class="article markdown">
           <h2 id="unicode-">Unicode 引用</h2>
@@ -925,7 +925,7 @@
       </div>
       <div class="content font-class">
         <ul class="icon_lists dib-box">
-          
+
           <li class="dib">
             <span class="icon iconfont icon-bangzhuyuzhichi"></span>
             <div class="name">
@@ -934,7 +934,7 @@
             <div class="code-name">.icon-bangzhuyuzhichi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-duibi"></span>
             <div class="name">
@@ -943,7 +943,7 @@
             <div class="code-name">.icon-duibi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-biaoqian-copy"></span>
             <div class="name">
@@ -952,7 +952,7 @@
             <div class="code-name">.icon-biaoqian-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xianxing-biaoji"></span>
             <div class="name">
@@ -961,7 +961,7 @@
             <div class="code-name">.icon-xianxing-biaoji
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yidu"></span>
             <div class="name">
@@ -970,7 +970,7 @@
             <div class="code-name">.icon-yidu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yidu-copy"></span>
             <div class="name">
@@ -979,7 +979,7 @@
             <div class="code-name">.icon-yidu-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiaozu"></span>
             <div class="name">
@@ -988,7 +988,7 @@
             <div class="code-name">.icon-xiaozu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-danju-cuowu-tianchong"></span>
             <div class="name">
@@ -997,7 +997,7 @@
             <div class="code-name">.icon-danju-cuowu-tianchong
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-baoyangjihua"></span>
             <div class="name">
@@ -1006,7 +1006,7 @@
             <div class="code-name">.icon-baoyangjihua
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yijin06-jifenzhengce"></span>
             <div class="name">
@@ -1015,7 +1015,7 @@
             <div class="code-name">.icon-yijin06-jifenzhengce
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-duibifenxi"></span>
             <div class="name">
@@ -1024,7 +1024,7 @@
             <div class="code-name">.icon-duibifenxi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-jiaoseguanli"></span>
             <div class="name">
@@ -1033,7 +1033,7 @@
             <div class="code-name">.icon-jiaoseguanli
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shibie"></span>
             <div class="name">
@@ -1042,7 +1042,7 @@
             <div class="code-name">.icon-shibie
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-quanxiankuaizhuang"></span>
             <div class="name">
@@ -1051,7 +1051,7 @@
             <div class="code-name">.icon-quanxiankuaizhuang
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-tiaojianshaixuan"></span>
             <div class="name">
@@ -1060,7 +1060,7 @@
             <div class="code-name">.icon-tiaojianshaixuan
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-fanhui"></span>
             <div class="name">
@@ -1069,7 +1069,7 @@
             <div class="code-name">.icon-fanhui
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-suini-new-2"></span>
             <div class="name">
@@ -1078,7 +1078,7 @@
             <div class="code-name">.icon-suini-new-2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-iconfontrenwu"></span>
             <div class="name">
@@ -1087,7 +1087,7 @@
             <div class="code-name">.icon-iconfontrenwu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-fenxiang"></span>
             <div class="name">
@@ -1096,7 +1096,7 @@
             <div class="code-name">.icon-fenxiang
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-guonei"></span>
             <div class="name">
@@ -1105,7 +1105,7 @@
             <div class="code-name">.icon-guonei
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-guoji"></span>
             <div class="name">
@@ -1114,7 +1114,7 @@
             <div class="code-name">.icon-guoji
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shezhi1"></span>
             <div class="name">
@@ -1123,7 +1123,7 @@
             <div class="code-name">.icon-shezhi1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shouye5"></span>
             <div class="name">
@@ -1132,7 +1132,7 @@
             <div class="code-name">.icon-shouye5
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-rili"></span>
             <div class="name">
@@ -1141,7 +1141,7 @@
             <div class="code-name">.icon-rili
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yun"></span>
             <div class="name">
@@ -1150,7 +1150,7 @@
             <div class="code-name">.icon-yun
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shezhi2"></span>
             <div class="name">
@@ -1159,7 +1159,7 @@
             <div class="code-name">.icon-shezhi2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-icon-angle-double-bottom"></span>
             <div class="name">
@@ -1168,7 +1168,7 @@
             <div class="code-name">.icon-icon-angle-double-bottom
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-icon-angle-double-top"></span>
             <div class="name">
@@ -1177,7 +1177,7 @@
             <div class="code-name">.icon-icon-angle-double-top
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-qiyegongchangjianzhu2"></span>
             <div class="name">
@@ -1186,7 +1186,7 @@
             <div class="code-name">.icon-qiyegongchangjianzhu2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-quanqiu"></span>
             <div class="name">
@@ -1195,7 +1195,7 @@
             <div class="code-name">.icon-quanqiu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-zhongguoditu"></span>
             <div class="name">
@@ -1204,7 +1204,7 @@
             <div class="code-name">.icon-zhongguoditu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-tuanduicankaoxian_huaban"></span>
             <div class="name">
@@ -1213,7 +1213,7 @@
             <div class="code-name">.icon-tuanduicankaoxian_huaban
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-fanhui1"></span>
             <div class="name">
@@ -1222,7 +1222,7 @@
             <div class="code-name">.icon-fanhui1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-fanhui2"></span>
             <div class="name">
@@ -1231,7 +1231,7 @@
             <div class="code-name">.icon-fanhui2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yujing1"></span>
             <div class="name">
@@ -1240,7 +1240,7 @@
             <div class="code-name">.icon-yujing1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-wulumuqishigongandashujuguanlipingtai-ico-"></span>
             <div class="name">
@@ -1249,7 +1249,7 @@
             <div class="code-name">.icon-wulumuqishigongandashujuguanlipingtai-ico-
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shujujiansuo"></span>
             <div class="name">
@@ -1258,7 +1258,7 @@
             <div class="code-name">.icon-shujujiansuo
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-zhankaicebianlan"></span>
             <div class="name">
@@ -1267,7 +1267,7 @@
             <div class="code-name">.icon-zhankaicebianlan
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-WiFi"></span>
             <div class="name">
@@ -1276,7 +1276,7 @@
             <div class="code-name">.icon-WiFi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-securityCode-b"></span>
             <div class="name">
@@ -1285,7 +1285,7 @@
             <div class="code-name">.icon-securityCode-b
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-car"></span>
             <div class="name">
@@ -1294,7 +1294,7 @@
             <div class="code-name">.icon-car
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-car1"></span>
             <div class="name">
@@ -1303,7 +1303,7 @@
             <div class="code-name">.icon-car1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xinxi"></span>
             <div class="name">
@@ -1312,7 +1312,7 @@
             <div class="code-name">.icon-xinxi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-icon-technology-cloud"></span>
             <div class="name">
@@ -1321,7 +1321,7 @@
             <div class="code-name">.icon-icon-technology-cloud
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-liucheng1"></span>
             <div class="name">
@@ -1330,7 +1330,7 @@
             <div class="code-name">.icon-liucheng1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-peizhi3"></span>
             <div class="name">
@@ -1339,7 +1339,7 @@
             <div class="code-name">.icon-peizhi3
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-data-ana"></span>
             <div class="name">
@@ -1348,7 +1348,7 @@
             <div class="code-name">.icon-data-ana
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-jiansuo"></span>
             <div class="name">
@@ -1357,7 +1357,7 @@
             <div class="code-name">.icon-jiansuo
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-i"></span>
             <div class="name">
@@ -1366,7 +1366,7 @@
             <div class="code-name">.icon-i
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-faguiku1"></span>
             <div class="name">
@@ -1375,7 +1375,7 @@
             <div class="code-name">.icon-faguiku1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-fenxigongjuhongzifenxi"></span>
             <div class="name">
@@ -1384,7 +1384,7 @@
             <div class="code-name">.icon-fenxigongjuhongzifenxi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-sousuo2"></span>
             <div class="name">
@@ -1393,7 +1393,7 @@
             <div class="code-name">.icon-sousuo2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-icon-loading"></span>
             <div class="name">
@@ -1402,7 +1402,7 @@
             <div class="code-name">.icon-icon-loading
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-huidaodingbu"></span>
             <div class="name">
@@ -1411,7 +1411,7 @@
             <div class="code-name">.icon-huidaodingbu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-zanwu"></span>
             <div class="name">
@@ -1420,7 +1420,7 @@
             <div class="code-name">.icon-zanwu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-wenjianjia1"></span>
             <div class="name">
@@ -1429,7 +1429,7 @@
             <div class="code-name">.icon-wenjianjia1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-arrowdown"></span>
             <div class="name">
@@ -1438,7 +1438,7 @@
             <div class="code-name">.icon-arrowdown
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-qicheqianlian-"></span>
             <div class="name">
@@ -1447,7 +1447,7 @@
             <div class="code-name">.icon-qicheqianlian-
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xitongyunweibumen"></span>
             <div class="name">
@@ -1456,7 +1456,7 @@
             <div class="code-name">.icon-xitongyunweibumen
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-wode"></span>
             <div class="name">
@@ -1465,7 +1465,7 @@
             <div class="code-name">.icon-wode
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-icon-test"></span>
             <div class="name">
@@ -1474,7 +1474,7 @@
             <div class="code-name">.icon-icon-test
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-ziyuanku1"></span>
             <div class="name">
@@ -1483,7 +1483,7 @@
             <div class="code-name">.icon-ziyuanku1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-che-3"></span>
             <div class="name">
@@ -1492,7 +1492,7 @@
             <div class="code-name">.icon-che-3
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-che-1"></span>
             <div class="name">
@@ -1501,7 +1501,7 @@
             <div class="code-name">.icon-che-1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-che-2"></span>
             <div class="name">
@@ -1510,7 +1510,7 @@
             <div class="code-name">.icon-che-2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-svg34-copy-copy"></span>
             <div class="name">
@@ -1519,7 +1519,7 @@
             <div class="code-name">.icon-svg34-copy-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-svg34-copy"></span>
             <div class="name">
@@ -1528,7 +1528,7 @@
             <div class="code-name">.icon-svg34-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiazai3"></span>
             <div class="name">
@@ -1537,7 +1537,7 @@
             <div class="code-name">.icon-xiazai3
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-weituo"></span>
             <div class="name">
@@ -1546,7 +1546,7 @@
             <div class="code-name">.icon-weituo
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-baocun"></span>
             <div class="name">
@@ -1555,7 +1555,7 @@
             <div class="code-name">.icon-baocun
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-tubiao"></span>
             <div class="name">
@@ -1564,7 +1564,7 @@
             <div class="code-name">.icon-tubiao
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-pdf"></span>
             <div class="name">
@@ -1573,7 +1573,7 @@
             <div class="code-name">.icon-pdf
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-fanyi"></span>
             <div class="name">
@@ -1582,7 +1582,7 @@
             <div class="code-name">.icon-fanyi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-word1"></span>
             <div class="name">
@@ -1591,7 +1591,7 @@
             <div class="code-name">.icon-word1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-liucheng-A-"></span>
             <div class="name">
@@ -1600,7 +1600,7 @@
             <div class="code-name">.icon-liucheng-A-
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-baobiao"></span>
             <div class="name">
@@ -1609,7 +1609,7 @@
             <div class="code-name">.icon-baobiao
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-baobiao1"></span>
             <div class="name">
@@ -1618,7 +1618,7 @@
             <div class="code-name">.icon-baobiao1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-peizhi1"></span>
             <div class="name">
@@ -1627,7 +1627,7 @@
             <div class="code-name">.icon-peizhi1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-qingdan1"></span>
             <div class="name">
@@ -1636,7 +1636,7 @@
             <div class="code-name">.icon-qingdan1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-dongtai"></span>
             <div class="name">
@@ -1645,7 +1645,7 @@
             <div class="code-name">.icon-dongtai
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-gongju"></span>
             <div class="name">
@@ -1654,7 +1654,7 @@
             <div class="code-name">.icon-gongju
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-peizhi2"></span>
             <div class="name">
@@ -1663,7 +1663,7 @@
             <div class="code-name">.icon-peizhi2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-jiansuoguanli"></span>
             <div class="name">
@@ -1672,7 +1672,7 @@
             <div class="code-name">.icon-jiansuoguanli
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-faguiku"></span>
             <div class="name">
@@ -1681,7 +1681,7 @@
             <div class="code-name">.icon-faguiku
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-falvfaguiku"></span>
             <div class="name">
@@ -1690,7 +1690,7 @@
             <div class="code-name">.icon-falvfaguiku
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shouye4"></span>
             <div class="name">
@@ -1699,7 +1699,7 @@
             <div class="code-name">.icon-shouye4
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-qingdan"></span>
             <div class="name">
@@ -1708,7 +1708,7 @@
             <div class="code-name">.icon-qingdan
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiazai2"></span>
             <div class="name">
@@ -1717,7 +1717,7 @@
             <div class="code-name">.icon-xiazai2
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-peizhi"></span>
             <div class="name">
@@ -1726,7 +1726,7 @@
             <div class="code-name">.icon-peizhi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yichu"></span>
             <div class="name">
@@ -1735,7 +1735,7 @@
             <div class="code-name">.icon-yichu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yujing"></span>
             <div class="name">
@@ -1744,7 +1744,7 @@
             <div class="code-name">.icon-yujing
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-jichuxinxiguanli"></span>
             <div class="name">
@@ -1753,7 +1753,7 @@
             <div class="code-name">.icon-jichuxinxiguanli
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-jichupeizhiguanli"></span>
             <div class="name">
@@ -1762,7 +1762,7 @@
             <div class="code-name">.icon-jichupeizhiguanli
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-sousuo1"></span>
             <div class="name">
@@ -1771,7 +1771,7 @@
             <div class="code-name">.icon-sousuo1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-yonghu"></span>
             <div class="name">
@@ -1780,7 +1780,7 @@
             <div class="code-name">.icon-yonghu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiala"></span>
             <div class="name">
@@ -1789,7 +1789,7 @@
             <div class="code-name">.icon-xiala
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shangchuan1"></span>
             <div class="name">
@@ -1798,7 +1798,7 @@
             <div class="code-name">.icon-shangchuan1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-guanbi"></span>
             <div class="name">
@@ -1807,7 +1807,7 @@
             <div class="code-name">.icon-guanbi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-riqi"></span>
             <div class="name">
@@ -1816,7 +1816,7 @@
             <div class="code-name">.icon-riqi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-dui"></span>
             <div class="name">
@@ -1825,7 +1825,7 @@
             <div class="code-name">.icon-dui
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shaixuan"></span>
             <div class="name">
@@ -1834,7 +1834,7 @@
             <div class="code-name">.icon-shaixuan
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shanchu"></span>
             <div class="name">
@@ -1843,7 +1843,7 @@
             <div class="code-name">.icon-shanchu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-daoru"></span>
             <div class="name">
@@ -1852,7 +1852,7 @@
             <div class="code-name">.icon-daoru
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-daochu1"></span>
             <div class="name">
@@ -1861,7 +1861,7 @@
             <div class="code-name">.icon-daochu1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-gengduo"></span>
             <div class="name">
@@ -1870,7 +1870,7 @@
             <div class="code-name">.icon-gengduo
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-bianji-copy"></span>
             <div class="name">
@@ -1879,7 +1879,7 @@
             <div class="code-name">.icon-bianji-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-chuyidong"></span>
             <div class="name">
@@ -1888,7 +1888,7 @@
             <div class="code-name">.icon-chuyidong
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xinzeng"></span>
             <div class="name">
@@ -1897,7 +1897,7 @@
             <div class="code-name">.icon-xinzeng
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-chushaixuanxiang"></span>
             <div class="name">
@@ -1906,7 +1906,7 @@
             <div class="code-name">.icon-chushaixuanxiang
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiazai1-copy-copy"></span>
             <div class="name">
@@ -1915,7 +1915,7 @@
             <div class="code-name">.icon-xiazai1-copy-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiazai"></span>
             <div class="name">
@@ -1924,7 +1924,7 @@
             <div class="code-name">.icon-xiazai
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiazai1"></span>
             <div class="name">
@@ -1933,7 +1933,7 @@
             <div class="code-name">.icon-xiazai1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-wenjianjia"></span>
             <div class="name">
@@ -1942,7 +1942,7 @@
             <div class="code-name">.icon-wenjianjia
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shangchuan"></span>
             <div class="name">
@@ -1951,7 +1951,7 @@
             <div class="code-name">.icon-shangchuan
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-chakan"></span>
             <div class="name">
@@ -1960,7 +1960,7 @@
             <div class="code-name">.icon-chakan
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shangchuan-copy"></span>
             <div class="name">
@@ -1969,7 +1969,7 @@
             <div class="code-name">.icon-shangchuan-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiazai1-copy"></span>
             <div class="name">
@@ -1978,7 +1978,7 @@
             <div class="code-name">.icon-xiazai1-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xiazai-copy"></span>
             <div class="name">
@@ -1987,7 +1987,7 @@
             <div class="code-name">.icon-xiazai-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-chakan-copy"></span>
             <div class="name">
@@ -1996,7 +1996,7 @@
             <div class="code-name">.icon-chakan-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-wenjianjia-copy"></span>
             <div class="name">
@@ -2005,7 +2005,7 @@
             <div class="code-name">.icon-wenjianjia-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-daochu"></span>
             <div class="name">
@@ -2014,7 +2014,7 @@
             <div class="code-name">.icon-daochu
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-xingxing"></span>
             <div class="name">
@@ -2023,7 +2023,7 @@
             <div class="code-name">.icon-xingxing
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-214"></span>
             <div class="name">
@@ -2032,7 +2032,7 @@
             <div class="code-name">.icon-214
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-fenkai-copy"></span>
             <div class="name">
@@ -2041,7 +2041,7 @@
             <div class="code-name">.icon-fenkai-copy
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-daibantixing"></span>
             <div class="name">
@@ -2050,7 +2050,7 @@
             <div class="code-name">.icon-daibantixing
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-mn_xiaoxi_fill"></span>
             <div class="name">
@@ -2059,7 +2059,7 @@
             <div class="code-name">.icon-mn_xiaoxi_fill
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shouye3"></span>
             <div class="name">
@@ -2068,7 +2068,7 @@
             <div class="code-name">.icon-shouye3
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-touxiang"></span>
             <div class="name">
@@ -2077,7 +2077,7 @@
             <div class="code-name">.icon-touxiang
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-touxiangtongyong"></span>
             <div class="name">
@@ -2086,7 +2086,7 @@
             <div class="code-name">.icon-touxiangtongyong
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-touxiangxiugai"></span>
             <div class="name">
@@ -2095,7 +2095,7 @@
             <div class="code-name">.icon-touxiangxiugai
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-zhedie"></span>
             <div class="name">
@@ -2104,7 +2104,7 @@
             <div class="code-name">.icon-zhedie
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-zhongzhi"></span>
             <div class="name">
@@ -2113,7 +2113,7 @@
             <div class="code-name">.icon-zhongzhi
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-weixiubanshou"></span>
             <div class="name">
@@ -2122,7 +2122,7 @@
             <div class="code-name">.icon-weixiubanshou
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shouye"></span>
             <div class="name">
@@ -2131,7 +2131,7 @@
             <div class="code-name">.icon-shouye
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-data-analysis"></span>
             <div class="name">
@@ -2140,7 +2140,7 @@
             <div class="code-name">.icon-data-analysis
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-liucheng"></span>
             <div class="name">
@@ -2149,7 +2149,7 @@
             <div class="code-name">.icon-liucheng
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-falvfagui"></span>
             <div class="name">
@@ -2158,7 +2158,7 @@
             <div class="code-name">.icon-falvfagui
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shouye1"></span>
             <div class="name">
@@ -2167,7 +2167,7 @@
             <div class="code-name">.icon-shouye1
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-sousuo"></span>
             <div class="name">
@@ -2176,7 +2176,7 @@
             <div class="code-name">.icon-sousuo
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-tuandui"></span>
             <div class="name">
@@ -2185,7 +2185,7 @@
             <div class="code-name">.icon-tuandui
             </div>
           </li>
-          
+
           <li class="dib">
             <span class="icon iconfont icon-shouye2"></span>
             <div class="name">
@@ -2194,7 +2194,7 @@
             <div class="code-name">.icon-shouye2
             </div>
           </li>
-          
+
         </ul>
         <div class="article markdown">
         <h2 id="font-class-">font-class 引用</h2>
@@ -2223,7 +2223,7 @@
       </div>
       <div class="content symbol">
           <ul class="icon_lists dib-box">
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-bangzhuyuzhichi"></use>
@@ -2231,7 +2231,7 @@
                 <div class="name">帮助与支持</div>
                 <div class="code-name">#icon-bangzhuyuzhichi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-duibi"></use>
@@ -2239,7 +2239,7 @@
                 <div class="name">对比2</div>
                 <div class="code-name">#icon-duibi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-biaoqian-copy"></use>
@@ -2247,7 +2247,7 @@
                 <div class="name">标签</div>
                 <div class="code-name">#icon-biaoqian-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xianxing-biaoji"></use>
@@ -2255,7 +2255,7 @@
                 <div class="name">线性-标记</div>
                 <div class="code-name">#icon-xianxing-biaoji</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yidu"></use>
@@ -2263,7 +2263,7 @@
                 <div class="name">已读</div>
                 <div class="code-name">#icon-yidu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yidu-copy"></use>
@@ -2271,7 +2271,7 @@
                 <div class="name">已读</div>
                 <div class="code-name">#icon-yidu-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiaozu"></use>
@@ -2279,7 +2279,7 @@
                 <div class="name">小组</div>
                 <div class="code-name">#icon-xiaozu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-danju-cuowu-tianchong"></use>
@@ -2287,7 +2287,7 @@
                 <div class="name">单据-错误</div>
                 <div class="code-name">#icon-danju-cuowu-tianchong</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-baoyangjihua"></use>
@@ -2295,7 +2295,7 @@
                 <div class="name">保养计划</div>
                 <div class="code-name">#icon-baoyangjihua</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yijin06-jifenzhengce"></use>
@@ -2303,7 +2303,7 @@
                 <div class="name">毅进06-积分政策</div>
                 <div class="code-name">#icon-yijin06-jifenzhengce</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-duibifenxi"></use>
@@ -2311,7 +2311,7 @@
                 <div class="name">对比分析</div>
                 <div class="code-name">#icon-duibifenxi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jiaoseguanli"></use>
@@ -2319,7 +2319,7 @@
                 <div class="name">角色管理</div>
                 <div class="code-name">#icon-jiaoseguanli</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shibie"></use>
@@ -2327,7 +2327,7 @@
                 <div class="name">识别</div>
                 <div class="code-name">#icon-shibie</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-quanxiankuaizhuang"></use>
@@ -2335,7 +2335,7 @@
                 <div class="name">权限块状</div>
                 <div class="code-name">#icon-quanxiankuaizhuang</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tiaojianshaixuan"></use>
@@ -2343,7 +2343,7 @@
                 <div class="name">条件筛选</div>
                 <div class="code-name">#icon-tiaojianshaixuan</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fanhui"></use>
@@ -2351,7 +2351,7 @@
                 <div class="name">返回</div>
                 <div class="code-name">#icon-fanhui</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-suini-new-2"></use>
@@ -2359,7 +2359,7 @@
                 <div class="name">随你后台-新闻</div>
                 <div class="code-name">#icon-suini-new-2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-iconfontrenwu"></use>
@@ -2367,7 +2367,7 @@
                 <div class="name">待办</div>
                 <div class="code-name">#icon-iconfontrenwu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fenxiang"></use>
@@ -2375,7 +2375,7 @@
                 <div class="name">分享</div>
                 <div class="code-name">#icon-fenxiang</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guonei"></use>
@@ -2383,7 +2383,7 @@
                 <div class="name">国内</div>
                 <div class="code-name">#icon-guonei</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guoji"></use>
@@ -2391,7 +2391,7 @@
                 <div class="name">国际</div>
                 <div class="code-name">#icon-guoji</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shezhi1"></use>
@@ -2399,7 +2399,7 @@
                 <div class="name">设置</div>
                 <div class="code-name">#icon-shezhi1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shouye5"></use>
@@ -2407,7 +2407,7 @@
                 <div class="name">首页</div>
                 <div class="code-name">#icon-shouye5</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-rili"></use>
@@ -2415,7 +2415,7 @@
                 <div class="name">日历 (1)</div>
                 <div class="code-name">#icon-rili</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yun"></use>
@@ -2423,7 +2423,7 @@
                 <div class="name">云</div>
                 <div class="code-name">#icon-yun</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shezhi2"></use>
@@ -2431,7 +2431,7 @@
                 <div class="name">设置</div>
                 <div class="code-name">#icon-shezhi2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon-angle-double-bottom"></use>
@@ -2439,7 +2439,7 @@
                 <div class="name">向下d</div>
                 <div class="code-name">#icon-icon-angle-double-bottom</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon-angle-double-top"></use>
@@ -2447,7 +2447,7 @@
                 <div class="name">向上d</div>
                 <div class="code-name">#icon-icon-angle-double-top</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-qiyegongchangjianzhu2"></use>
@@ -2455,7 +2455,7 @@
                 <div class="name">企业 工厂 建筑2</div>
                 <div class="code-name">#icon-qiyegongchangjianzhu2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-quanqiu"></use>
@@ -2463,7 +2463,7 @@
                 <div class="name">全球</div>
                 <div class="code-name">#icon-quanqiu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zhongguoditu"></use>
@@ -2471,7 +2471,7 @@
                 <div class="name">中国地图</div>
                 <div class="code-name">#icon-zhongguoditu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tuanduicankaoxian_huaban"></use>
@@ -2479,7 +2479,7 @@
                 <div class="name">前进</div>
                 <div class="code-name">#icon-tuanduicankaoxian_huaban</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fanhui1"></use>
@@ -2487,7 +2487,7 @@
                 <div class="name">返回</div>
                 <div class="code-name">#icon-fanhui1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fanhui2"></use>
@@ -2495,7 +2495,7 @@
                 <div class="name">返回</div>
                 <div class="code-name">#icon-fanhui2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yujing1"></use>
@@ -2503,7 +2503,7 @@
                 <div class="name">预警</div>
                 <div class="code-name">#icon-yujing1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wulumuqishigongandashujuguanlipingtai-ico-"></use>
@@ -2511,7 +2511,7 @@
                 <div class="name">全文检索库</div>
                 <div class="code-name">#icon-wulumuqishigongandashujuguanlipingtai-ico-</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shujujiansuo"></use>
@@ -2519,7 +2519,7 @@
                 <div class="name">数据检索</div>
                 <div class="code-name">#icon-shujujiansuo</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zhankaicebianlan"></use>
@@ -2527,7 +2527,7 @@
                 <div class="name">展开侧边栏</div>
                 <div class="code-name">#icon-zhankaicebianlan</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-WiFi"></use>
@@ -2535,7 +2535,7 @@
                 <div class="name">WiFi</div>
                 <div class="code-name">#icon-WiFi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-securityCode-b"></use>
@@ -2543,7 +2543,7 @@
                 <div class="name">验证码</div>
                 <div class="code-name">#icon-securityCode-b</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-car"></use>
@@ -2551,7 +2551,7 @@
                 <div class="name">car</div>
                 <div class="code-name">#icon-car</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-car1"></use>
@@ -2559,7 +2559,7 @@
                 <div class="name">car</div>
                 <div class="code-name">#icon-car1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xinxi"></use>
@@ -2567,7 +2567,7 @@
                 <div class="name">信息</div>
                 <div class="code-name">#icon-xinxi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon-technology-cloud"></use>
@@ -2575,7 +2575,7 @@
                 <div class="name">云端</div>
                 <div class="code-name">#icon-icon-technology-cloud</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-liucheng1"></use>
@@ -2583,7 +2583,7 @@
                 <div class="name">流程</div>
                 <div class="code-name">#icon-liucheng1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-peizhi3"></use>
@@ -2591,7 +2591,7 @@
                 <div class="name">配置</div>
                 <div class="code-name">#icon-peizhi3</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-data-ana"></use>
@@ -2599,7 +2599,7 @@
                 <div class="name">数据分析</div>
                 <div class="code-name">#icon-data-ana</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jiansuo"></use>
@@ -2607,7 +2607,7 @@
                 <div class="name">检索</div>
                 <div class="code-name">#icon-jiansuo</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-i"></use>
@@ -2615,7 +2615,7 @@
                 <div class="name">团队</div>
                 <div class="code-name">#icon-i</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-faguiku1"></use>
@@ -2623,7 +2623,7 @@
                 <div class="name">法规库</div>
                 <div class="code-name">#icon-faguiku1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fenxigongjuhongzifenxi"></use>
@@ -2631,7 +2631,7 @@
                 <div class="name">分析工具,红字分析</div>
                 <div class="code-name">#icon-fenxigongjuhongzifenxi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-sousuo2"></use>
@@ -2639,7 +2639,7 @@
                 <div class="name">搜索</div>
                 <div class="code-name">#icon-sousuo2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon-loading"></use>
@@ -2647,7 +2647,7 @@
                 <div class="name">轮胎</div>
                 <div class="code-name">#icon-icon-loading</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-huidaodingbu"></use>
@@ -2655,7 +2655,7 @@
                 <div class="name">回到顶部</div>
                 <div class="code-name">#icon-huidaodingbu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zanwu"></use>
@@ -2663,7 +2663,7 @@
                 <div class="name">web__暂无记录</div>
                 <div class="code-name">#icon-zanwu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wenjianjia1"></use>
@@ -2671,7 +2671,7 @@
                 <div class="name">文件夹</div>
                 <div class="code-name">#icon-wenjianjia1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-arrowdown"></use>
@@ -2679,7 +2679,7 @@
                 <div class="name">arrow down</div>
                 <div class="code-name">#icon-arrowdown</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-qicheqianlian-"></use>
@@ -2687,7 +2687,7 @@
                 <div class="name">汽车-28</div>
                 <div class="code-name">#icon-qicheqianlian-</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xitongyunweibumen"></use>
@@ -2695,7 +2695,7 @@
                 <div class="name">系统运维-部门</div>
                 <div class="code-name">#icon-xitongyunweibumen</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wode"></use>
@@ -2703,7 +2703,7 @@
                 <div class="name">员工渠道APP-我的</div>
                 <div class="code-name">#icon-wode</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-icon-test"></use>
@@ -2711,7 +2711,7 @@
                 <div class="name">选中个人中心</div>
                 <div class="code-name">#icon-icon-test</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-ziyuanku1"></use>
@@ -2719,7 +2719,7 @@
                 <div class="name">资源库</div>
                 <div class="code-name">#icon-ziyuanku1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-che-3"></use>
@@ -2727,7 +2727,7 @@
                 <div class="name">车-03</div>
                 <div class="code-name">#icon-che-3</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-che-1"></use>
@@ -2735,7 +2735,7 @@
                 <div class="name">车-02</div>
                 <div class="code-name">#icon-che-1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-che-2"></use>
@@ -2743,7 +2743,7 @@
                 <div class="name">车-01</div>
                 <div class="code-name">#icon-che-2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-svg34-copy-copy"></use>
@@ -2751,7 +2751,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-svg34-copy-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-svg34-copy"></use>
@@ -2759,7 +2759,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-svg34-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiazai3"></use>
@@ -2767,7 +2767,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-xiazai3</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-weituo"></use>
@@ -2775,7 +2775,7 @@
                 <div class="name">委托</div>
                 <div class="code-name">#icon-weituo</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-baocun"></use>
@@ -2783,7 +2783,7 @@
                 <div class="name">保存</div>
                 <div class="code-name">#icon-baocun</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tubiao"></use>
@@ -2791,7 +2791,7 @@
                 <div class="name">图表</div>
                 <div class="code-name">#icon-tubiao</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-pdf"></use>
@@ -2799,7 +2799,7 @@
                 <div class="name">pdf</div>
                 <div class="code-name">#icon-pdf</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fanyi"></use>
@@ -2807,7 +2807,7 @@
                 <div class="name">翻译</div>
                 <div class="code-name">#icon-fanyi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-word1"></use>
@@ -2815,7 +2815,7 @@
                 <div class="name">word</div>
                 <div class="code-name">#icon-word1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-liucheng-A-"></use>
@@ -2823,7 +2823,7 @@
                 <div class="name">流程</div>
                 <div class="code-name">#icon-liucheng-A-</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-baobiao"></use>
@@ -2831,7 +2831,7 @@
                 <div class="name">报表</div>
                 <div class="code-name">#icon-baobiao</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-baobiao1"></use>
@@ -2839,7 +2839,7 @@
                 <div class="name">报表</div>
                 <div class="code-name">#icon-baobiao1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-peizhi1"></use>
@@ -2847,7 +2847,7 @@
                 <div class="name">配置</div>
                 <div class="code-name">#icon-peizhi1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-qingdan1"></use>
@@ -2855,7 +2855,7 @@
                 <div class="name">清单</div>
                 <div class="code-name">#icon-qingdan1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-dongtai"></use>
@@ -2863,7 +2863,7 @@
                 <div class="name">动态</div>
                 <div class="code-name">#icon-dongtai</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-gongju"></use>
@@ -2871,7 +2871,7 @@
                 <div class="name">工具</div>
                 <div class="code-name">#icon-gongju</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-peizhi2"></use>
@@ -2879,7 +2879,7 @@
                 <div class="name">配置</div>
                 <div class="code-name">#icon-peizhi2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jiansuoguanli"></use>
@@ -2887,7 +2887,7 @@
                 <div class="name">检索管理</div>
                 <div class="code-name">#icon-jiansuoguanli</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-faguiku"></use>
@@ -2895,7 +2895,7 @@
                 <div class="name">法规库</div>
                 <div class="code-name">#icon-faguiku</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-falvfaguiku"></use>
@@ -2903,7 +2903,7 @@
                 <div class="name">法律法规库</div>
                 <div class="code-name">#icon-falvfaguiku</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shouye4"></use>
@@ -2911,7 +2911,7 @@
                 <div class="name">首页</div>
                 <div class="code-name">#icon-shouye4</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-qingdan"></use>
@@ -2919,7 +2919,7 @@
                 <div class="name">清单</div>
                 <div class="code-name">#icon-qingdan</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiazai2"></use>
@@ -2927,7 +2927,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-xiazai2</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-peizhi"></use>
@@ -2935,7 +2935,7 @@
                 <div class="name">配置</div>
                 <div class="code-name">#icon-peizhi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yichu"></use>
@@ -2943,7 +2943,7 @@
                 <div class="name">移除</div>
                 <div class="code-name">#icon-yichu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yujing"></use>
@@ -2951,7 +2951,7 @@
                 <div class="name">预警</div>
                 <div class="code-name">#icon-yujing</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jichuxinxiguanli"></use>
@@ -2959,7 +2959,7 @@
                 <div class="name">基础信息管理</div>
                 <div class="code-name">#icon-jichuxinxiguanli</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jichupeizhiguanli"></use>
@@ -2967,7 +2967,7 @@
                 <div class="name">基础配置管理</div>
                 <div class="code-name">#icon-jichupeizhiguanli</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-sousuo1"></use>
@@ -2975,7 +2975,7 @@
                 <div class="name">搜索</div>
                 <div class="code-name">#icon-sousuo1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-yonghu"></use>
@@ -2983,7 +2983,7 @@
                 <div class="name">个人中心-我的</div>
                 <div class="code-name">#icon-yonghu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiala"></use>
@@ -2991,7 +2991,7 @@
                 <div class="name">下  拉</div>
                 <div class="code-name">#icon-xiala</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shangchuan1"></use>
@@ -2999,7 +2999,7 @@
                 <div class="name">上传</div>
                 <div class="code-name">#icon-shangchuan1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-guanbi"></use>
@@ -3007,7 +3007,7 @@
                 <div class="name">关 闭</div>
                 <div class="code-name">#icon-guanbi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-riqi"></use>
@@ -3015,7 +3015,7 @@
                 <div class="name">日期</div>
                 <div class="code-name">#icon-riqi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-dui"></use>
@@ -3023,7 +3023,7 @@
                 <div class="name">对</div>
                 <div class="code-name">#icon-dui</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shaixuan"></use>
@@ -3031,7 +3031,7 @@
                 <div class="name">筛 选</div>
                 <div class="code-name">#icon-shaixuan</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shanchu"></use>
@@ -3039,7 +3039,7 @@
                 <div class="name">删 除</div>
                 <div class="code-name">#icon-shanchu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-daoru"></use>
@@ -3047,7 +3047,7 @@
                 <div class="name">导入</div>
                 <div class="code-name">#icon-daoru</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-daochu1"></use>
@@ -3055,7 +3055,7 @@
                 <div class="name">导出</div>
                 <div class="code-name">#icon-daochu1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-gengduo"></use>
@@ -3063,7 +3063,7 @@
                 <div class="name">更多</div>
                 <div class="code-name">#icon-gengduo</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-bianji-copy"></use>
@@ -3071,7 +3071,7 @@
                 <div class="name">编辑</div>
                 <div class="code-name">#icon-bianji-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-chuyidong"></use>
@@ -3079,7 +3079,7 @@
                 <div class="name">删除／数字面板编辑态</div>
                 <div class="code-name">#icon-chuyidong</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xinzeng"></use>
@@ -3087,7 +3087,7 @@
                 <div class="name">新增</div>
                 <div class="code-name">#icon-xinzeng</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-chushaixuanxiang"></use>
@@ -3095,7 +3095,7 @@
                 <div class="name">删除筛选项</div>
                 <div class="code-name">#icon-chushaixuanxiang</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiazai1-copy-copy"></use>
@@ -3103,7 +3103,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-xiazai1-copy-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiazai"></use>
@@ -3111,7 +3111,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-xiazai</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiazai1"></use>
@@ -3119,7 +3119,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-xiazai1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wenjianjia"></use>
@@ -3127,7 +3127,7 @@
                 <div class="name">文件夹</div>
                 <div class="code-name">#icon-wenjianjia</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shangchuan"></use>
@@ -3135,7 +3135,7 @@
                 <div class="name">上传</div>
                 <div class="code-name">#icon-shangchuan</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-chakan"></use>
@@ -3143,7 +3143,7 @@
                 <div class="name">查看</div>
                 <div class="code-name">#icon-chakan</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shangchuan-copy"></use>
@@ -3151,7 +3151,7 @@
                 <div class="name">上传</div>
                 <div class="code-name">#icon-shangchuan-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiazai1-copy"></use>
@@ -3159,7 +3159,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-xiazai1-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xiazai-copy"></use>
@@ -3167,7 +3167,7 @@
                 <div class="name">下载</div>
                 <div class="code-name">#icon-xiazai-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-chakan-copy"></use>
@@ -3175,7 +3175,7 @@
                 <div class="name">查看</div>
                 <div class="code-name">#icon-chakan-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-wenjianjia-copy"></use>
@@ -3183,7 +3183,7 @@
                 <div class="name">文件夹</div>
                 <div class="code-name">#icon-wenjianjia-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-daochu"></use>
@@ -3191,7 +3191,7 @@
                 <div class="name">导出</div>
                 <div class="code-name">#icon-daochu</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xingxing"></use>
@@ -3199,7 +3199,7 @@
                 <div class="name">星星</div>
                 <div class="code-name">#icon-xingxing</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-214"></use>
@@ -3207,7 +3207,7 @@
                 <div class="name">会议记录</div>
                 <div class="code-name">#icon-214</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fenkai-copy"></use>
@@ -3215,7 +3215,7 @@
                 <div class="name">分开</div>
                 <div class="code-name">#icon-fenkai-copy</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-daibantixing"></use>
@@ -3223,7 +3223,7 @@
                 <div class="name">待办提醒</div>
                 <div class="code-name">#icon-daibantixing</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-mn_xiaoxi_fill"></use>
@@ -3231,7 +3231,7 @@
                 <div class="name">AK-MN消息2_fill</div>
                 <div class="code-name">#icon-mn_xiaoxi_fill</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shouye3"></use>
@@ -3239,7 +3239,7 @@
                 <div class="name">首页</div>
                 <div class="code-name">#icon-shouye3</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-touxiang"></use>
@@ -3247,7 +3247,7 @@
                 <div class="name">爱生活-个人中心-头像</div>
                 <div class="code-name">#icon-touxiang</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-touxiangtongyong"></use>
@@ -3255,7 +3255,7 @@
                 <div class="name">头像（通用）</div>
                 <div class="code-name">#icon-touxiangtongyong</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-touxiangxiugai"></use>
@@ -3263,7 +3263,7 @@
                 <div class="name">头像修改</div>
                 <div class="code-name">#icon-touxiangxiugai</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zhedie"></use>
@@ -3271,7 +3271,7 @@
                 <div class="name">折叠</div>
                 <div class="code-name">#icon-zhedie</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zhongzhi"></use>
@@ -3279,7 +3279,7 @@
                 <div class="name">重置</div>
                 <div class="code-name">#icon-zhongzhi</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-weixiubanshou"></use>
@@ -3287,7 +3287,7 @@
                 <div class="name">维修扳手</div>
                 <div class="code-name">#icon-weixiubanshou</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shouye"></use>
@@ -3295,7 +3295,7 @@
                 <div class="name">首页</div>
                 <div class="code-name">#icon-shouye</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-data-analysis"></use>
@@ -3303,7 +3303,7 @@
                 <div class="name">数据分析</div>
                 <div class="code-name">#icon-data-analysis</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-liucheng"></use>
@@ -3311,7 +3311,7 @@
                 <div class="name">流程</div>
                 <div class="code-name">#icon-liucheng</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-falvfagui"></use>
@@ -3319,7 +3319,7 @@
                 <div class="name">法律法规</div>
                 <div class="code-name">#icon-falvfagui</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shouye1"></use>
@@ -3327,7 +3327,7 @@
                 <div class="name">shouye</div>
                 <div class="code-name">#icon-shouye1</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-sousuo"></use>
@@ -3335,7 +3335,7 @@
                 <div class="name">搜索</div>
                 <div class="code-name">#icon-sousuo</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-tuandui"></use>
@@ -3343,7 +3343,7 @@
                 <div class="name">团队</div>
                 <div class="code-name">#icon-tuandui</div>
             </li>
-          
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-shouye2"></use>
@@ -3351,7 +3351,7 @@
                 <div class="name">shouye</div>
                 <div class="code-name">#icon-shouye2</div>
             </li>
-          
+
           </ul>
           <div class="article markdown">
           <h2 id="symbol-">Symbol 引用</h2>
diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue
index 728c33ecc..24fa0033f 100644
--- a/src/pages/config/pages/attributeCustom/components/buss.vue
+++ b/src/pages/config/pages/attributeCustom/components/buss.vue
@@ -341,7 +341,7 @@ export default {
           {required: true, message: '所属模块不能为空', trigger: 'change'}
         ],
         showIndex: [
-          { type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
+          { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
           { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },
diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue
index 609f9bc4f..9672fae8b 100644
--- a/src/pages/config/pages/standLawsAttrManage/index.vue
+++ b/src/pages/config/pages/standLawsAttrManage/index.vue
@@ -32,10 +32,9 @@
             <el-button
               class="common-button-primary"
               type="primary"
-              icon="el-icon-search"
               size="mini"
               @click="searchBtn"
-            ></el-button>
+            >搜索</el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button
diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue
index cbf624ed1..dd6f83608 100644
--- a/src/pages/localTool/standContrast/index.vue
+++ b/src/pages/localTool/standContrast/index.vue
@@ -97,32 +97,32 @@
                 label="操作"
                 width="50px"
                 align="center">
-                <!--              <template slot-scope="scope">-->
-                <!--                <el-button-->
-                <!--                  class="opera-btn"-->
-                <!--                  size="mini"-->
-                <!--                  type="primary"-->
-                <!--                  @click="handlePreview(scope.row)">查看</el-button>-->
-                <!--                <el-button-->
-                <!--                  class="opera-btn"-->
-                <!--                  size="mini"-->
-                <!--                  type="danger"-->
-                <!--                  @click="delFileEditInfo(scope.row.id)">删除</el-button>-->
-                <!--                <el-button-->
-                <!--                  class="opera-btn"-->
-                <!--                  size="mini"-->
-                <!--                  type="primary"-->
-                <!--                  @click="enjoyInfo(scope.row)">分享</el-button>-->
-                <!--                <el-button size="mini" class="opera-btn" type="primary" v-if="scope.row.collectBtn" @click="collectInfo(scope.row)">收藏</el-button>-->
-                <!--                <el-button size="mini" class="opera-btn" type="primary" v-else @click="cancelCollectInfo(scope.row)">取消收藏</el-button>-->
-                <!--              </template>-->
+<!--                              <template slot-scope="scope">
+                                <el-button
+                                  class="opera-btn"
+                                  size="mini"
+                                  type="primary"
+                                  @click="handlePreview(scope.row)">查看</el-button>
+                                <el-button
+                                  class="opera-btn"
+                                  size="mini"
+                                  type="danger"
+                                  @click="delFileEditInfo(scope.row.id)">删除</el-button>
+                                <el-button
+                                  class="opera-btn"
+                                  size="mini"
+                                  type="primary"
+                                  @click="enjoyInfo(scope.row)">分享</el-button>
+                                <el-button size="mini" class="opera-btn" type="primary" v-if="scope.row.collectBtn" @click="collectInfo(scope.row)">收藏</el-button>
+                                <el-button size="mini" class="opera-btn" type="primary" v-else @click="cancelCollectInfo(scope.row)">取消收藏</el-button>
+                              </template>-->
                 <template slot-scope="scope">
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item v-btn-permission="''" :command="[scope.row, '查看']">查看</el-dropdown-item>
                       <el-dropdown-item v-btn-permission="''" :command="[scope.row, '删除']">删除</el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item>
+<!--                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item>
                       <el-dropdown-item
                         v-if="scope.row.collectBtn"
                         v-btn-permission="''"
@@ -136,7 +136,7 @@
                         :command="[scope.row, '取消收藏']"
                       >
                         取消收藏
-                      </el-dropdown-item>
+                      </el-dropdown-item>-->
                     </el-dropdown-menu>
                   </el-dropdown>
                 </template>
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index 628d45181..b9a84f7e1 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -115,9 +115,9 @@
                     <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission=""
                       >删除</el-dropdown-item
                     >
-                    <el-dropdown-item :command="[scope.row, '在线编辑']" v-btn-permission=""
+<!--                    <el-dropdown-item :command="[scope.row, '在线编辑']" v-btn-permission=""
                       >在线编辑</el-dropdown-item
-                    >
+                    >-->
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -472,9 +472,9 @@ export default {
         case "删除":
           this.delSingalData(command[0]);
           break;
-        case "在线编辑":
+        /*case "在线编辑":
           this.downloadFile(command[0]);
-          break;
+          break;*/
       }
     },
     // 修改成表格样式后，选择项勾选改变

From 3cbb0111a0c4f2c184eadf7ee2cb470a5704970d Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 15 Jul 2021 15:19:22 +0800
Subject: [PATCH 16/25] commit

---
 .../pages/creatProcess/bzjd/step1.vue         | 185 +++++++++++++-----
 .../pages/creatProcess/bzjd/step4.vue         |  13 ++
 .../pages/creatProcess/bzjd/step5.vue         |  13 ++
 .../pages/creatProcess/bzjd/step6.vue         |  13 ++
 .../tabComponents/processCenter/index.vue     |  33 ++++
 src/router/index.js                           |  27 +++
 6 files changed, 234 insertions(+), 50 deletions(-)
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
 create mode 100644 src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index fe16bf313..194ae0752 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -10,7 +10,7 @@
             <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;">
+            <div style="overflow: auto;">
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
@@ -49,6 +49,52 @@
                     </div>
                 </el-form>
             </div>
+            <ProcessTitle>
+                <template slot="title">拆分信息</template>
+            </ProcessTitle>
+            <div class="action-bar">
+                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+            </div>
+            <el-table border
+                      ref="selection"
+                      :data="itemList"
+                      tooltip-effect="dark"
+                      style="width: 100%;"
+                      height="100%"
+                      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                      @selection-change="handleSelectionChange"
+                      row-key="id">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                        prop="itemsNum"
+                        label="条款号"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsName"
+                        label="条款名称"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        label="条款内容"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任人"
+                        width="170"
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.zrUserId" style="display: none;"/>
+                        <el-input v-model="scope.row.zrUserIdName" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <loading :loading="loading">数据获取中</loading>
             <el-collapse accordion>
                 <el-collapse-item title="意见填写">
                     <div style="margin: 10px 0;">
@@ -82,21 +128,6 @@
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-                        <el-timeline-item timestamp="对接部门责任人" placement="top" :color="roleForm.zrUserId ? '#66b1ff' : ''">
-                            <el-card>
-                                <el-form-item prop="zrUserId" style="margin-bottom: 0">
-                                    <h4>对接部门责任人</h4>
-                                    <div style="margin-top: 10px;width: 300px;">
-                                        <el-input v-model="roleForm.zrUserId" style="display: none;"/>
-                                        <el-input
-                                                v-model="roleForm.zrUserIdName"
-                                                placeholder="选择责任部门对接人"
-                                                @click.native="choiceZRRS">
-                                        </el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
                         <el-timeline-item timestamp="批准解读流程" placement="top" :color="roleForm.deptUserId ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="deptUserId" style="margin-bottom: 0">
@@ -126,7 +157,7 @@
         >
         </ProcessFooter>
         <el-drawer
-                title="标准征求意见数据库"
+                title="标准拆分数据库"
                 :visible.sync="listModel"
                 size="900px"
                 custom-class="demo-drawer"
@@ -234,14 +265,15 @@
                 size="800px">
             <el-tree
                     v-if="modalshowflag2"
-                    style="height: 100%; overflow: auto;"
                     node-key="id"
+                    style="height: 100%; overflow: auto;"
                     class="filter-tree"
                     :data="treeData"
                     :props="defaultProps"
                     :default-checked-keys="nodeList2"
                     highlight-current
                     check-strictly
+                    @check="drawerCheck2"
                     default-expand-all
                     :expand-on-click-node="false"
                     show-checkbox
@@ -265,6 +297,7 @@
         name: "bzjdStep1",
         data() {
             return {
+                loading: false,
                 standId: '',
                 commentText: '',
                 textarea: '', // 意见
@@ -303,8 +336,6 @@
                 roleForm: {
                     applyUserIdName: this.$store.getters.userInfo.userName,
                     applyUserId: this.$store.getters.userInfo.userId,
-                    zrUserId: '',
-                    zrUserIdName: '',
                     deptUserId: '',
                     deptUserIdName: ''
                 },
@@ -328,7 +359,10 @@
                     label: 'name'
                 },
                 roleRow: {},
-                itemList: []
+                itemList: [],
+                zrType: '',
+                zrIndex: '',
+                zrIdList: []
             }
         },
         components: {
@@ -401,6 +435,7 @@
             },
             enterDrawer() {
                 if (this.selectedList.length === 1) {
+                    this.loading = true
                     let deposit = new Map();
                     this.standInfoList.forEach(item => {
                         deposit.set(item.id, item);
@@ -427,9 +462,13 @@
                         _this: this
                     }, res => {
                         if (res.ok) {
+                            res.data.list.forEach(item => {
+                                item.zrUserId = ''
+                                item.zrUserIdName= ''
+                            })
                             this.itemList = res.data.list
-                            console.log(res);
                         }
+                        this.loading = false
                     })
                 } else if (this.selectedList.length > 1) {
                     this.$message.warning("只能选择一条数据进行带入");
@@ -470,12 +509,37 @@
                     this.roleRow = this.$refs.tree.getCheckedNodes()[0]
                 }
             },
-            choiceZRRS () {
-                this.nodeList2 = []
-                if ( this.roleForm.zrUserId.length > 0) {
-                    this.nodeList2 = this.roleForm.zrUserId.split(',')
+            drawerCheck2 (data) {
+                var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
+                if(getlist.length == 1) {
+                    this.roleRow = getlist[0]
+                }else {
+                    this.$refs.tree2.setCheckedKeys([data.id]);
+                    this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
+                }
+            },
+            handleSelectionChange (val) {
+                this.zrIdList = []
+                val.forEach( item => {
+                    this.zrIdList.push(item.id)
+                })
+            },
+            choiceZRRS (row, type, index) {
+                if (type === 1) {
+                    this.zrIndex= index
+                    this.zrType = type
+                    this.nodeList2.push(row)
+                    this.modalshowflag2 = true
+                } else {
+                    // 批量
+                    if (this.zrIdList.length > 0) {
+                        this.zrType = type
+                        this.nodeList2 = []
+                        this.modalshowflag2 = true
+                    } else {
+                     this.$message.warning('请选择要编辑的数据')
+                    }
                 }
-                this.modalshowflag2 = true
             },
             saveUserInfo2 () {
                 var idList = ''
@@ -488,8 +552,19 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.roleForm.zrUserId = idList
-                this.roleForm.zrUserIdName = nameList
+                if (this.zrType == 1) {
+                    this.itemList[this.zrIndex].zrUserId = idList
+                    this.itemList[this.zrIndex].zrUserIdName = nameList
+                } else {
+                    this.itemList.forEach( item => {
+                        this.zrIdList.forEach( items => {
+                            if (item.id === items) {
+                                item.zrUserId = idList
+                                item.zrUserIdName = nameList
+                            }
+                        })
+                    })
+                }
                 this.modalshowflag2 = false
             },
             cancleUserInfo2 () {
@@ -504,28 +579,38 @@
                     if (valid) {
                         this.$refs['Form'].validate((valid) => {
                             if (valid) {
-                                this.$http.get('lawss/activiti/startProcess', {
-                                    type: '9'
-                                }, {}, res => {
-                                    if (res.ok) {
-                                        var json = Object.assign(this.form, this.roleForm)
-                                        json.commentText = this.commentText
-                                        json.standInData = this.standId
-                                        json.itemList = this.itemList
-                                        this.$http.post('lawss/activiti/completeTask', {
-                                            json: JSON.stringify(json),
-                                            taskId: res.data,
-                                            userId: this.$store.getters.userInfo.userId
-                                        }, {}, res => {
-                                            if (res.success) {
-                                                this.$message.success('流程发起成功')
-                                                this.$router.push('/processCenter')
-                                            }
-                                        })
-                                    } else {
-                                        this.$message.warning('流程启动失败')
+                                let b = 0
+                                for (let a = 0; a < this.itemList.length; a++) {
+                                    if (!this.itemList[a].zrUserId) {
+                                        b++
                                     }
-                                })
+                                }
+                                if (b > 0) {
+                                    this.$message.warning('请选择责任人')
+                                } else {
+                                    this.$http.get('lawss/activiti/startProcess', {
+                                        type: '9'
+                                    }, {}, res => {
+                                        if (res.ok) {
+                                            var json = Object.assign(this.form, this.roleForm)
+                                            json.commentText = this.commentText
+                                            json.standInData = this.standId
+                                            json.itemList = this.itemList
+                                            this.$http.post('lawss/activiti/completeTask', {
+                                                json: JSON.stringify(json),
+                                                taskId: res.data,
+                                                userId: this.$store.getters.userInfo.userId
+                                            }, {}, res => {
+                                                if (res.success) {
+                                                    this.$message.success('流程发起成功')
+                                                    this.$router.push('/processCenter')
+                                                }
+                                            })
+                                        } else {
+                                            this.$message.warning('流程启动失败')
+                                        }
+                                    })
+                                }
                             } else {
                                 return this.$message.warning('请完善人员信息')
                             }
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
new file mode 100644
index 000000000..51fa5d16e
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "step4"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
new file mode 100644
index 000000000..e5703d7c0
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "step5"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
new file mode 100644
index 000000000..15b0a36dd
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "step6"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 5d55a3700..72f598fcc 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -613,6 +613,39 @@ export default {
                 prcType: row.prcType
               }
             })
+          } else if (row.taskInfo === '4') {
+            this.$router.push({
+              name: 'bzjdStep4',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '5') {
+            this.$router.push({
+              name: 'bzjdStep5',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
+          } else if (row.taskInfo === '6') {
+            this.$router.push({
+              name: 'bzjdStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }
       }
     },
diff --git a/src/router/index.js b/src/router/index.js
index 4fdfc96b2..4ab6e1b9d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -618,6 +618,33 @@ const routes = [
           title: '标准解读流程'
         }
       },
+      {
+        path: '/bzjdStep4',
+        name: 'bzjdStep4',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step4.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/bzjdStep5',
+        name: 'bzjdStep5',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step5.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
+      {
+        path: '/bzjdStep6',
+        name: 'bzjdStep6',
+        component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step6.vue'),
+        meta: {
+          requireAuth: true,
+          title: '标准解读流程'
+        }
+      },
     ]
   },
   // 本地工具

From 9190568fc83d9f7b41a97feffe3f6bfb8302926e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 15 Jul 2021 16:37:55 +0800
Subject: [PATCH 17/25] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 53 +++++++----
 .../pages/creatProcess/xmpg/step1.vue         |  4 +-
 .../pages/creatProcess/xmpg/step3.vue         |  1 -
 .../pages/creatProcess/xmpg/step6.vue         | 10 +-
 .../tabComponents/processCenter/index.vue     | 22 ++---
 .../pages/addEdit.vue                         | 84 +++++++++++++++--
 .../pages/details.vue                         | 94 +++++++++++++++----
 src/sysConfig/index.js                        |  2 +-
 8 files changed, 202 insertions(+), 68 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index c077f5604..06705c639 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -40,11 +40,25 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
-                <el-input
+<!--                <el-input-->
+<!--                  v-model="listForm.applyRegion"-->
+<!--                  placeholder="请输入适用区域"-->
+<!--                  clearable-->
+<!--                ></el-input>-->
+                <el-select
+                  width="120"
                   v-model="listForm.applyRegion"
-                  placeholder="请输入适用区域"
-                  clearable
-                ></el-input>
+                  placeholder="请选择"
+                  filterable
+                >
+                  <el-option
+                    v-for="item in countryOptions"
+                    :value="item.value"
+                    :key="item.value"
+                    :label="item.label"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                 <el-input
@@ -163,7 +177,7 @@
                   <h4>标准/政策法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -627,21 +641,21 @@ export default {
       },
       formRules: {
         listType: [
-          { required: true, message: "请选择清单类型", trigger: "blur" }
+          { required: true, message: "请选择清单类型", trigger: "change" }
         ],
         listName: [
           { required: true, message: "请填写清单名称", trigger: "change" }
         ]
       },
       roleFormRules: {
-        // dockUserName: [
-        //   { required: true, message: "请选择会签责任人", trigger: "blur" }
-        // ],
+        dockUserName: [
+          { required: true, message: "请选择会签责任人", trigger: "change" }
+        ],
         ministerUserName: [
-          { required: true, message: "请选择修订责任人", trigger: "blur" }
+          { required: true, message: "请选择修订责任人", trigger: "change" }
         ],
         directorUserName: [
-          { required: true, message: "请选择审批责任人", trigger: "blur" }
+          { required: true, message: "请选择审批责任人", trigger: "change" }
         ]
       },
       dataList: [],//清单里的标准数据
@@ -842,7 +856,8 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      let json = this.listForm;
+      // let json = this.listForm;
+      let json = Object.assign(this.listForm, this.roleForm)
       json.zrUserId = this.$store.getters.userInfo.userId;
       json.jlUserId = this.$store.getters.userInfo.userId;
       // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
@@ -958,7 +973,6 @@ export default {
               res.data=[]
           }
           this.dataList = res.data;
-          console.log(res.data);
           this.listForm.dataList = res.data;
           let formId = []
           this.dataList.map(item => {
@@ -979,7 +993,6 @@ export default {
       for (let i = 0; i < data.length; i++) {
         this.selectedList.push(data[i].id);
       }
-      console.log(this.selectedList);
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -1024,18 +1037,18 @@ export default {
   },
   computed: {},
   mounted() {
+    //从数据库中查询下拉框数据
+    this.$http.get("sys/dictype/getDicTypeListCode", {}, {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY;
+    });
     this.selectionList();
     this.selectSign();
     this.getTree();
     for (let i = 0; i < this.dataList.length; i++) {
       this.standMap.set(this.dataList[i].id, this.dataList[i]);
     }
-    //从数据查询下拉框数据
-    this.$http.get("sys/dictype/getDicTypeListCode", "", {
-      _this: this
-    }, res => {
-      this.countryOptions = res.data.COUNTRY;
-    });
   }
 
 };
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index b89020428..4060b6cbf 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -113,13 +113,13 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="发起流程"  placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人"></el-input>
+                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
                   </div>
                 </el-form-item>
               </el-card>
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 6b19abc68..1062dcb4d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -328,7 +328,6 @@ export default {
         implementer: ""
       },
       choiceForm: {}, //选择标准清单列表
-      countryOptions: [], //适用区域下拉框数据
       user1: "",
       user2: "",
       user3: "",
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index 8d126d1f9..b7ef99fb3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -428,17 +428,19 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList (item) {
-      console.log(item.dataList);
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item))
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm['id'] = item.id
-        this.dataList = item.dataList
+        this.dataList = item.step3DTOS
+        this.listForm.standName = item.step3DTOS[0].standName
+        this.listForm.standNumber = item.step3DTOS[0].standNumber
+        this.listForm.qualityEngineer = item.step3DTOS[0].qualityEngineer
+        this.listForm.certifiedEngineer = item.step3DTOS[0].certifiedEngineer
       })
     },
-
-
     //驳回事件
     beforeBack () {
       this.listForm.fenFlag = '2'
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 5d55a3700..9a77a42cf 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -518,17 +518,17 @@ export default {
                 prcType: row.prcType
               }
             })
-          // }else if(row.taskInfo === '标准法规部领导审核'){
-          //   this.$router.push({
-          //     name: 'xmpgStep6',
-          //     query: {
-          //       taskIds: row.taskIds,
-          //       prcId: row.prcId,
-          //       prcNum: row.prcNum,
-          //       prcName: row.prcName,
-          //       prcType: row.prcType
-          //     }
-          //   })
+          }else if(row.taskInfo === '汇总审核'){
+            this.$router.push({
+              name: 'xmpgStep6',
+              query: {
+                taskIds: row.taskIds,
+                prcId: row.prcId,
+                prcNum: row.prcNum,
+                prcName: row.prcName,
+                prcType: row.prcType
+              }
+            })
           }else if(row.taskInfo === '标准法规部领导审核'){
             this.$router.push({
               name: 'xmpgStep7',
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 939b755e1..db8cb5e14 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -208,6 +208,7 @@
           <el-table-column
             prop="code"
             fixed="left"
+            align="center"
             width="180px"
             label="标准号">
             <template slot-scope="scope">
@@ -218,22 +219,26 @@
           <el-table-column
             prop="standName"
             label="标准名称"
+            align="center"
             width="260px"
           >
           </el-table-column>
           <el-table-column
             prop="issueTime"
             sortable
+            align="center"
             label="发布日期">
           </el-table-column>
           <el-table-column
-            prop="xcxssrq"
+            prop="XCXSSRQ"
             sortable
+            align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="zccssrq"
+            prop="ZCCSSRQ"
+            align="center"
             sortable
             label="在产车实施日期">
           </el-table-column>
@@ -241,6 +246,7 @@
             show-overflow-tooltip
             prop="textStatus"
             width="120px"
+            align="center"
             label="文本状态">
           </el-table-column>
         </el-table>
@@ -323,6 +329,7 @@
         <el-table-column
           width="180px"
           fixed="left"
+          align="center"
           label="标准号">
           <template slot-scope="scope">
             <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
@@ -331,31 +338,86 @@
         </el-table-column>
         <el-table-column
           prop="standName"
-          label="标准名称"
-          width="260px"
+          label="中文名称"
+          align="center"
+          fixed="left"
+          width="180px"
         >
         </el-table-column>
         <el-table-column
           prop="issueTime"
-          sortable
-          label="发布日期">
+          align="center"
+          width="180px"
+          label="英文名称">
         </el-table-column>
         <el-table-column
-          prop="xcxssrq"
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="适用车型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
+          align="center"
+          width="180px"
+          label="能源类型">
+        </el-table-column>
+        <el-table-column
+          prop="issueTime"
           sortable
-          label="新车型实施日期">
+          align="center"
+          width="210px"
+          label="标准实施日期">
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="zccssrq"
           sortable
+          width="210px"
+          align="center"
           label="在产车实施日期">
         </el-table-column>
+        <el-table-column
+          prop="XCXSSRQ"
+          sortable
+          align="center"
+          width="210px"
+          label="新车型实施日期">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="zccssrq"
+          width="210px"
+          align="center"
+          label="责任部门">
+        </el-table-column>
         <el-table-column
           show-overflow-tooltip
           prop="textStatus"
-          width="120px"
-          label="文本状态">
+          width="180px"
+          align="center"
+          label="适用产品线">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          width="210px"
+          align="center"
+          label="乘用车VPPS中文名称">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS编码">
+        </el-table-column>
+        <el-table-column
+          show-overflow-tooltip
+          prop="textStatus"
+          align="center"
+          width="210px"
+          label="卡车VPPS中文名称">
         </el-table-column>
         <el-table-column>
           <template slot-scope="scope">
@@ -1174,6 +1236,7 @@ export default {
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
         _this: this
       }, res =>{
+        console.log(res.data.list);
         this.sarAccessInfoSearchList = res.data.list
       }, e => {
 
@@ -1634,6 +1697,7 @@ export default {
       this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
         _this: this
       }, res => {
+        console.log(res.data);
         this.sarAccessInfoList = res.data
       }, e => {
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index b7a1cda74..644a3cbf6 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -71,21 +71,21 @@
             </el-popover>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
+            <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
             </el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-default" @click="resetSelect" size="small">清空</el-button>
+            <el-button  v-btn-permission="'d55e2eb884449f04ecdb30f0523d965d'" class="common-button-default" @click="resetSelect" size="small">清空</el-button>
           </el-form-item>
 
           <el-button class="common-button-default export-button"
-                     v-btn-permission="'25859ea5afacb2ad49705f5daefe0d23'"
+                     v-btn-permission="'c7165a1baa667140f97e792971c89a71'"
                      size="small" @click="exportStandard()"
                      title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
                      icon="export"
           >导出
           </el-button>
-          <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
+          <el-button type="primary" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
             class="iconfont">&#xe7a5;</i>高级查询
           </el-button>
         </el-form>
@@ -111,42 +111,98 @@
             align="center">
           </el-table-column>
           <el-table-column
-            prop="code"
+            prop="standNumber"
             fixed="left"
             width="180px"
+            align="center"
             label="标准号">
             <template slot-scope="scope">
-              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.code }}</a>
-              <span v-else>{{ scope.row.code }}</span>
+              <a v-if="scope.row.resId" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
+              <span v-else>{{ scope.row.standNumber }}</span>
             </template>
           </el-table-column>
           <el-table-column
             prop="standName"
-            label="标准名称"
-            width="260px"
+            label="中文名称"
+            align="center"
+            fixed="left"
+            width="180px"
           >
           </el-table-column>
           <el-table-column
-            prop="isSubTime"
-            sortable
-            label="发布日期">
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="英文名称">
           </el-table-column>
           <el-table-column
-            prop="newPutTime"
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="适用车型">
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            width="180px"
+            label="能源类型">
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
             sortable
+            align="center"
+            width="210px"
+            label="标准实施日期">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="zccssrq"
+            sortable
+            width="210px"
+            align="center"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            sortable
+            align="center"
+            width="210px"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="prodPutTime"
-            sortable
-            label="在产车实施日期">
+            prop="zccssrq"
+            width="210px"
+            align="center"
+            label="责任部门">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-            prop="proEssessUser"
-            width="120px"
-            label="文本状态">
+            prop="textStatus"
+            width="180px"
+            align="center"
+            label="适用产品线">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            width="210px"
+            align="center"
+            label="乘用车VPPS中文名称">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="210px"
+            label="卡车VPPS编码">
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="210px"
+            label="卡车VPPS中文名称">
           </el-table-column>
         </el-table>
         <pagination :page="standardForm.page" :total="standardFormTotal" @pageChange="pageChange"
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 3337ef5b4..38c17d419 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.250'
+const devIp = '192.168.10.252'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'

From 49c6a49bef97568493f80364c8ce919c7d503678 Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Thu, 15 Jul 2021 17:49:07 +0800
Subject: [PATCH 18/25] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/attributeCustom/components/buss.vue |  4 +-
 .../pages/attributeCustom/components/laws.vue |  6 +-
 .../attributeCustom/components/stand.vue      | 16 ++---
 .../pages/standLawsAttrManage/index.vue       | 11 +++-
 .../pages/standLawsAttrDetails.vue            | 16 ++---
 src/pages/localTool/standContrast/index.vue   |  8 +--
 .../standContrast/pages/contrastDetails.vue   |  8 +--
 .../localTool/standardRecognition/index.vue   | 10 +--
 src/pages/localTool/standardWarning.vue       | 10 +--
 .../pages/creatProcess/wfhxzg/step1.vue       |  7 +-
 .../pages/creatProcess/wfhxzg/step2.vue       |  2 +-
 .../pages/creatProcess/wfhxzg/step3.vue       | 64 +++++++++++++++----
 .../pages/creatProcess/wfhxzg/step4.vue       | 43 +++++++++----
 .../pages/creatProcess/wfhxzg/step5.vue       | 41 +++++++++---
 14 files changed, 168 insertions(+), 78 deletions(-)

diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue
index 24fa0033f..1f2288f06 100644
--- a/src/pages/config/pages/attributeCustom/components/buss.vue
+++ b/src/pages/config/pages/attributeCustom/components/buss.vue
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'QNDKHM2VNP8D938ZA9CQ'">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'18f50c76137df9b3112d07942b0d517f'">编辑</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'"  v-btn-permission="'eca5a9d90a5de7bf86c349cd0e73b1cf'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue
index 17b16c7d0..f34bab654 100644
--- a/src/pages/config/pages/attributeCustom/components/laws.vue
+++ b/src/pages/config/pages/attributeCustom/components/laws.vue
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'XFFUQ8ASE5SS9HGDGANZ'">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'b1e60ec7b60389713bf5b450ec2d1115'">编辑</el-dropdown-item>
+                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" v-btn-permission="'c157be4e073787ea6c4a04bd39686c2d'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -331,7 +331,7 @@ export default {
           {required: true, message: '所属模块不能为空', trigger: 'change'}
         ],
         showIndex: [
-          { type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
+          { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
           { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },
diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 42917deb2..ecdc08ebb 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -2,8 +2,8 @@
 <template>
   <div class="attribute-custom v-class">
     <div class="action-bar1">
-      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
-      <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog">展示区域管理</el-button>
+      <el-button class="common-button-primary add-button" size="mini" v-btn-permission="'df57f63c9e993bbfb2a4b400d5257577'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
+      <el-button class="common-button-default" size="mini" v-btn-permission="'9557b51320a50728d7047448d01c57c6'" @click="showDisplayLocationDialog">展示区域管理</el-button>
     </div>
     <loading :loading="attributeDataLoading">数据处理中</loading>
     <div class="content">
@@ -76,8 +76,8 @@
               <el-dropdown trigger="click" @command="handleCommand">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-btn-permission="''" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'abba040e019fad5092624ffd71a70372'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'730c9240a8f80bcdb88c71adb37f2aa7'" :disabled="scope.row.isEdit==='1'" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -199,7 +199,7 @@
       width="400px"
     >
       <div style="margin-bottom: 10px;">
-        <el-button class="common-button-primary add-button" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
+        <el-button class="common-button-primary add-button" v-btn-permission="'e128da8f053dd19113e75772f2c70f29'" type="primary" icon="add" @click="showAddDisplayLocationDialog(undefined)">新增</el-button>
       </div>
       <el-table
         :loading="displayLocationDialogTableConfig.loading"
@@ -230,8 +230,8 @@
               <el-dropdown trigger="click" @command="handleCommand2">
 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '修改']">修改</el-dropdown-item>
-                  <el-dropdown-item :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'2a788bca1cca66384e97f8ff722d4232'" :command="[scope.row, '修改']">修改</el-dropdown-item>
+                  <el-dropdown-item v-btn-permission="'116a3f339f3600e639271d0073045912'" :disabled="scope.row.validFlag===1" :command="[scope.row, '删除']">删除</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
@@ -330,7 +330,7 @@ export default {
           {required: true, message: '所属模块不能为空', trigger: 'change'}
         ],
         showIndex: [
-          { type: 'number', required: true, message: '请输入排序号', trigger: 'blur' },
+          { type: 'number', required: true, message: '不能为空且为正整数', trigger: 'blur' },
           { type: 'number', min: 0, max: 999, message: '请输入0-999之间的整数', trigger: 'blur' }
         ]
       },
diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue
index 9672fae8b..6fd3dee73 100644
--- a/src/pages/config/pages/standLawsAttrManage/index.vue
+++ b/src/pages/config/pages/standLawsAttrManage/index.vue
@@ -39,10 +39,9 @@
           <el-form-item label="" class="search-item btn-box">
             <el-button
               class="common-button-default"
-              icon="el-icon-refresh-left"
               @click="resetSelect"
               size="mini"
-            ></el-button>
+            >清空</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -78,7 +77,7 @@
         }"
         @selection-change="handleSelectone"
       >
-        <el-table-column type="selection" width="55" align="center">
+        <el-table-column type="selection" :selectable="handleSelected" width="55" align="center">
         </el-table-column>
         <el-table-column prop="dictionaryCode" label="数据字典编码">
         </el-table-column>
@@ -406,6 +405,12 @@ export default {
         this.selectedList.push(data[i].id)
       }
     },
+    // 判断可选择的项
+    handleSelected(row, index) {
+      if (row.enable === '1') {
+        return true
+      }
+    },
     pageChange (page) {
       this.pageNo = page
       this.getAttrByPage()
diff --git a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
index 9a2b46b13..04eb43e8e 100644
--- a/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
+++ b/src/pages/config/pages/standLawsAttrManage/pages/standLawsAttrDetails.vue
@@ -17,26 +17,26 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-primary" type="primary" icon="el-icon-search" round @click="selectProductBtn"></el-button>
+            <el-button class="common-button-primary" type="primary" size="mini" @click="selectProductBtn">搜索</el-button>
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
-            <el-button class="common-button-default" icon="el-icon-refresh-left" @click="resetSelect" round></el-button>
+            <el-button class="common-button-default" size="mini"  @click="resetSelect" >清空</el-button>
           </el-form-item>
         </el-form>
       </div>
       <div class="right">
         <el-button class="common-button-primary add-button"
-                   v-btn-permission="'4UF7LY2ZSCFHBKYS7VE2'"
+                   v-btn-permission="'8969811dc465528909628a3a13529023'"
                    type="primary"
                    icon="add"
+                   size="small"
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
-                   round
                    @click="productAdd">新增</el-button>
         <el-button class="common-button-default delete-button"
-                   v-btn-permission="'7WBE2BGZ2F745MDQ8VVD'"
-                   round
+                   v-btn-permission="'df889d64e87c977e4bc9f9a0851d4c27'"
                    v-if="dictionaryId != 'ERDFGHGGJJ' && dictionaryId != 'D975E8V5KVQUY3DZFV7E' && dictionaryId != 'WQERWC39J4E8SV6WREP2'"
                    icon="delete"
+                   size="small"
                    @click="productBatchDel">删除</el-button>
       </div>
     </div>
@@ -85,8 +85,8 @@
                   <div v-if="relateDicId">
                     <el-dropdown-item :command="[scope.row, '查看']"  v-btn-permission="'AQCEYWZK8F4DL85BZPRB'">查看</el-dropdown-item>
                   </div>
-                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== 'D975E8V5KVQUY3DZFV7E' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'8DGUGJTPV32F9F478K4P'">编辑</el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== 'D975E8V5KVQUY3DZFV7E' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'7WBE2BGZ2F745MDQ8VVD'">删除</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '编辑']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '48723deaa90798f56e939aea6aa49a23' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">编辑</el-dropdown-item>
+                  <el-dropdown-item :command="[scope.row, '删除']"  v-if="dictionaryId !== 'ERDFGHGGJJ' && dictionaryId !== '982b2f92a26c3c91b6b868419f0e2d3b' && dictionaryId !== 'WQERWC39J4E8SV6WREP2'"  v-btn-permission="'27e0f6cdfb3e2af446c36f9923e90d76'">删除</el-dropdown-item>
                   <!--                    <el-dropdown-item :command="[scope.row, '流程']">流程</el-dropdown-item>-->
                 </el-dropdown-menu>
               </el-dropdown>
diff --git a/src/pages/localTool/standContrast/index.vue b/src/pages/localTool/standContrast/index.vue
index dd6f83608..b6817d47e 100644
--- a/src/pages/localTool/standContrast/index.vue
+++ b/src/pages/localTool/standContrast/index.vue
@@ -31,8 +31,8 @@
       </table-tools-bar>
       <div class="content">
         <div class="action-bar">
-          <el-button size="mini" v-btn-permission="''" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
-          <el-button size="mini" v-btn-permission="''" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+          <el-button size="mini" v-btn-permission="'36078b3c8e897f8c1b6d6974a612d0c7'" @click="contrastStandFile" style="width:77px; height:32px;">比对</el-button>
+          <el-button size="mini" v-btn-permission="'83981863baa8716bdcc9e52a1fb1d2dc'" @click="batchDelete"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
         </div>
         <div class="table-wrap">
           <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
@@ -120,8 +120,8 @@
                   <el-dropdown trigger="click" @command="handleCommand">
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
-                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '查看']">查看</el-dropdown-item>
-                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="'13219b54a6f41280818e7ade5cf2cfad'" :command="[scope.row, '查看']">查看</el-dropdown-item>
+                      <el-dropdown-item v-btn-permission="'b6b048e926ecc9334cad769d4be7c4ec'" :command="[scope.row, '删除']">删除</el-dropdown-item>
 <!--                      <el-dropdown-item v-btn-permission="''" :command="[scope.row, '分享']">分享</el-dropdown-item>
                       <el-dropdown-item
                         v-if="scope.row.collectBtn"
diff --git a/src/pages/localTool/standContrast/pages/contrastDetails.vue b/src/pages/localTool/standContrast/pages/contrastDetails.vue
index fa6580cf1..6e42c79aa 100644
--- a/src/pages/localTool/standContrast/pages/contrastDetails.vue
+++ b/src/pages/localTool/standContrast/pages/contrastDetails.vue
@@ -15,13 +15,13 @@
                 </el-formItem>
                 <el-formItem>
                   <el-button
-                    icon="el-icon-search"
                     type="primary"
                     size="mini"
                     class="common-button-primary"
                     @click="getSarFileSplitInfoEOPage">
+                    搜索
                   </el-button>
-                  <el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand"></el-button>
+                  <el-button size="mini" class="common-button-default" @click="clearSearchStand">清空</el-button>
                 </el-formItem>
               </el-form>
             </div>
@@ -103,13 +103,13 @@
                 </el-formItem>
                 <el-formItem class="search-item">
                   <el-button
-                    icon="el-icon-search"
                     size="mini"
                     type="primary"
                     class="common-button-primary"
                     @click="getSarFileSplitInfoEOPage2">
+                    搜索
                   </el-button>
-                  <el-button size="mini" icon="el-icon-refresh-left" class="common-button-default" @click="clearSearchStand2"></el-button>
+                  <el-button size="mini" class="common-button-default" @click="clearSearchStand2">清空</el-button>
                 </el-formItem>
               </el-form>
             </div>
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index b9a84f7e1..ccc4f7be3 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -4,10 +4,10 @@
     <div class="action-bar">
       <div slot="left">
         <!--          <el-button type="primary" @click="changeData">转化</Button>-->
-        <el-button size="mini" @click="uploadPdf" v-btn-permission="''"
+        <el-button size="mini" @click="uploadPdf" v-btn-permission="'f56e5f765a93c14cba88f8c3270388c6'"
           ><i class="iconfont">&#xe65d;</i>上传</el-button
         >
-        <el-button size="mini" @click="delData" v-btn-permission="''"
+        <el-button size="mini" @click="delData" v-btn-permission="'ef6262d0bf66a25633e903d76a93e579'"
           ><i class="iconfont">&#xe61b;</i>删除</el-button
         >
       </div>
@@ -106,13 +106,13 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '获取文件']" v-btn-permission=""
+                    <el-dropdown-item :command="[scope.row, '获取文件']" v-btn-permission="'018cb58e72025fc43a9bfe1bde00c14a'"
                       >获取文件</el-dropdown-item
                     >
-                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission=""
+                    <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'14bdb937d168478e65b139214e982a8c'"
                       >编辑</el-dropdown-item
                     >
-                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission=""
+                    <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'74cffbebad841dbe2e0597792e5aba3f'"
                       >删除</el-dropdown-item
                     >
 <!--                    <el-dropdown-item :command="[scope.row, '在线编辑']" v-btn-permission=""
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 07b8d55b1..f2d7528f7 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -29,7 +29,7 @@
                   </el-form>
                 </div>
                 <div class="content" style="height: 100%; padding-top: 5px; ">
-                  <el-divider content-position="left" class="dynamic-child-title">新车型实施日期预警</el-divider>
+                  <el-divider content-position="left" class="dynamic-child-title"></el-divider>
                   <el-table
                     :data="newItems"
                     :height="height"
@@ -59,7 +59,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="新车型实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
@@ -124,7 +124,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="在产车实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
@@ -190,7 +190,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
@@ -256,7 +256,7 @@
                     </el-table-column>
                     <el-table-column prop="putTime" label="实施日期" align="center" sortable>
                       <template slot-scope="scope">
-                        {{ (scope.row.putTime ? scope.row.putTime.substring(0, 11) : "") }}
+                        <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
                       </template>
                     </el-table-column>
                     <el-table-column prop="applyType" label="适用车型" align="center">
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 174ddb4bb..8e443909d 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -8,7 +8,7 @@
       <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-if="active === '1'">
+    <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
           <ProcessTitle>
             <template slot="title">基础信息</template>
@@ -50,7 +50,7 @@
         </el-collapse-item>
       </el-collapse>
     </div>
-    <div class="content" v-if="active === '2'">
+    <div class="content" v-show="active === '2'">
       <div class="block" style="padding-top: 20px;">
         <el-timeline>
           <el-form
@@ -378,6 +378,7 @@ export default {
         this.$message.warning("请选择至少一条数据进行带入");
       }
     },
+    // 勾选事件
     selectedChange(val) {
       this.selectedList = val
     },
@@ -433,7 +434,7 @@ export default {
       this.modalshowflag = true
     },
     drawerCheck (data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      let getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
       if(getlist.length == 1) {
         this.roleRow = getlist[0]
       }else {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
index ea9bab914..1a273dd00 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
@@ -364,7 +364,7 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-      getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
         this.realList = this.dataList.filter(item => {
           let matchId = true; // 标准号 筛选
           let matchName = true; // 项目名称 筛选
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 51d0aa452..a925e4f10 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -12,11 +12,11 @@
         <ProcessTitle>
           <template slot="title">基础信息</template>
         </ProcessTitle>
-        <el-form :modal="dataList" inline class="label-input-form">
+        <el-form :modal="nonSearch" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.standId"
+              v-model="nonSearch.standId"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
           <el-form-item label="项目名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.productName"
+              v-model="nonSearch.productName"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="dataList.responsibleUnit" v-show="false" />
+            <el-input v-model="nonSearch.responsibleUnit" v-show="false" />
             <el-popover
               placement="bottom"
               popper-class="user-dept-popper"
@@ -40,7 +40,7 @@
               <el-input
                 size="small"
                 slot="reference"
-                v-model="dataList.responseUnitShow"
+                v-model="nonSearch.responseUnitShow"
                 placeholder="根据责任部门查找"
                 readonly
                 clearable
@@ -64,7 +64,7 @@
               class="common-button-primary"
               size="mini"
               v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-              @click="getTableByPage('dataList')">
+              @click="getTableByPage(nonSearch)">
               查询
             </el-button>
           </el-form-item>
@@ -120,7 +120,7 @@
               :rows="3"
               resize="none"
               placeholder="请输入意见"
-              v-model="textarea">
+              v-model="commentText">
             </el-input>
           </div>
         </el-collapse-item>
@@ -129,8 +129,10 @@
     <ProcessFooter
       show-save
       show-submit
+      show-back
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
+      @back="handleSubmitNo"
       @save="handleSave"
       @submit="handleSubmit"
     >
@@ -174,10 +176,10 @@ export default {
   name: "wfhxzgStep3",
   data() {
     return {
-      textarea: '', // 意见
+      commentText: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -243,6 +245,25 @@ export default {
       this.active = name
     },
 
+    handleSubmitNo() {
+      if (this.commentText) {
+        var json = this.json
+        json.actionFlag = 1
+        json.commentText = this.commentText
+        this.$http.post('lawss/activiti/completeTask', {
+          json: JSON.stringify(json),
+          taskId: this.taskIds,
+          userId: this.$store.getters.userInfo.userId
+        }, {}, res => {
+          if (res.success) {
+            this.$message.success('驳回成功')
+            this.$router.push('/processCenter')
+          }
+        })
+      } else {
+        this.$message.warning('请输入反馈意见')
+      }
+    },
     // 保存按钮
     handleSave() {},
     // 提交按钮
@@ -317,11 +338,32 @@ export default {
       this.modalshowflag = false
     },
     //查询按钮
-    getTableByPage() {
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+      this.realList = this.dataList.filter(item => {
+        let matchId = true; // 标准号 筛选
+        let matchName = true; // 项目名称 筛选
+        let matchUnit = true; // 部门 筛选
+
+        if (standId) {
+          const keysId = standId
+            .toUpperCase() // 转大写
+            .replace(' ', '') // 删掉空格
+            .split('') // 切割成 单个字
+          matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+        }
+        if (productName) {
+          matchName = item.productName === productName;
+        }
+        if (responsibleUnit) {
+          matchUnit = item.responsibleUnit === responsibleUnit;
+        }
+        return matchId && matchName && matchUnit;
+      })
+      this.dataList = this.realList
     },
     // 清空 查询条件
     clearAllSearch (search = true) {
-      this.nonConformitySearch = {
+      this.nonSearch = {
         standId: '',
         productName: '',
         responsibleUnit: ''
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
index 480176623..1054cb987 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
@@ -12,11 +12,11 @@
         <ProcessTitle>
           <template slot="title">基础信息</template>
         </ProcessTitle>
-        <el-form :modal="dataList" inline class="label-input-form">
+        <el-form :modal="nonSearch" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.standId"
+              v-model="nonSearch.standId"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
           <el-form-item label="项目名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.productName"
+              v-model="nonSearch.productName"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="dataList.responsibleUnit" v-show="false" />
+            <el-input v-model="nonSearch.responsibleUnit" v-show="false" />
             <el-popover
               placement="bottom"
               popper-class="user-dept-popper"
@@ -40,7 +40,7 @@
               <el-input
                 size="small"
                 slot="reference"
-                v-model="dataList.responseUnitShow"
+                v-model="nonSearch.responseUnitShow"
                 placeholder="根据责任部门查找"
                 readonly
                 clearable
@@ -64,7 +64,7 @@
               class="common-button-primary"
               size="mini"
               v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-              @click="getTableByPage('dataList')">
+              @click="getTableByPage(nonSearch)">
               查询
             </el-button>
           </el-form-item>
@@ -177,7 +177,7 @@ export default {
       textarea: '', // 意见
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -323,16 +323,37 @@ export default {
     },
 
     //未整改项抽屉中的查询按钮
-    getTableByPage() {
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+      this.realList = this.dataList.filter(item => {
+        let matchId = true; // 标准号 筛选
+        let matchName = true; // 项目名称 筛选
+        let matchUnit = true; // 部门 筛选
+
+        if (standId) {
+          const keysId = standId
+            .toUpperCase() // 转大写
+            .replace(' ', '') // 删掉空格
+            .split('') // 切割成 单个字
+          matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+        }
+        if (productName) {
+          matchName = item.productName === productName;
+        }
+        if (responsibleUnit) {
+          matchUnit = item.responsibleUnit === responsibleUnit;
+        }
+        return matchId && matchName && matchUnit;
+      })
+      this.dataList = this.realList
     },
     // 清空 查询条件
-    clearAllSearch (search = true) {
-      this.nonConformitySearch = {
+    clearAllSearch () {
+      this.nonSearch = {
         standId: '',
         productName: '',
         responsibleUnit: ''
       }
-      this.getTableByPage()
+      this.getData()
     },
     // 分页事件
     pageChange (page) {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index a8b85cad1..9407ee22c 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -12,11 +12,11 @@
         <ProcessTitle>
           <template slot="title">基础信息</template>
         </ProcessTitle>
-        <el-form :modal="dataList" inline class="label-input-form">
+        <el-form :modal="nonSearch" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.standId"
+              v-model="nonSearch.standId"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
@@ -24,13 +24,13 @@
           <el-form-item label="项目名称" class="search-item">
             <el-input
               size="small"
-              v-model="dataList.productName"
+              v-model="nonSearch.productName"
               placeholder="请输入"
               clearable
               :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="dataList.responsibleUnit" v-show="false" />
+            <el-input v-model="nonSearch.responsibleUnit" v-show="false" />
             <el-popover
               placement="bottom"
               popper-class="user-dept-popper"
@@ -40,7 +40,7 @@
               <el-input
                 size="small"
                 slot="reference"
-                v-model="dataList.responseUnitShow"
+                v-model="nonSearch.responseUnitShow"
                 placeholder="根据责任部门查找"
                 readonly
                 clearable
@@ -64,7 +64,7 @@
               class="common-button-primary"
               size="mini"
               v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-              @click="getTableByPage('dataList')">
+              @click="getTableByPage(nonSearch)">
               查询
             </el-button>
           </el-form-item>
@@ -141,7 +141,7 @@ export default {
       title: '', // 新增编辑抽屉标题
       saveLoading: false,
       ListModel: false, // 新增编辑抽屉开关
-      nonConformitySearch: {
+      nonSearch: {
         standId: '', // 标准号/名称
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
@@ -231,16 +231,37 @@ export default {
       }
     },
     //未整改项抽屉中的查询按钮
-    getTableByPage() {
+    getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
+      this.realList = this.dataList.filter(item => {
+        let matchId = true; // 标准号 筛选
+        let matchName = true; // 项目名称 筛选
+        let matchUnit = true; // 部门 筛选
+
+        if (standId) {
+          const keysId = standId
+            .toUpperCase() // 转大写
+            .replace(' ', '') // 删掉空格
+            .split('') // 切割成 单个字
+          matchId = keysId.every(key => item.standId.toUpperCase().includes(key));
+        }
+        if (productName) {
+          matchName = item.productName === productName;
+        }
+        if (responsibleUnit) {
+          matchUnit = item.responsibleUnit === responsibleUnit;
+        }
+        return matchId && matchName && matchUnit;
+      })
+      this.dataList = this.realList
     },
     // 清空 查询条件
     clearAllSearch (search = true) {
-      this.nonConformitySearch = {
+      this.nonSearch = {
         standId: '',
         productName: '',
         responsibleUnit: ''
       }
-      this.getTableByPage()
+      this.getData()
     },
     // 分页事件
     pageChange (page) {

From 04ec966f28b7e3a8426ff1d23f099c6598434321 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 15 Jul 2021 18:36:44 +0800
Subject: [PATCH 19/25] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=9E=E7=8E=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 623 ++++++++++++++++--
 .../pages/creatProcess/bzrk/step2.vue         |   2 +-
 .../pages/creatProcess/bzrk/step3.vue         |   2 +-
 .../pages/creatProcess/bzrk/step4.vue         |   2 +-
 4 files changed, 553 insertions(+), 76 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index aa6cb8d76..852fb8bf4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -24,27 +24,16 @@
                     <div class="prc-content-border">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
+                                <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                                     <el-radio-group v-model="form.standInData">
                                         <el-radio label="0">国内标准入库</el-radio>
                                         <el-radio label="1">海外标准入库</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
-                                <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standSort" placeholder="请选择标准类别">
-                                        <el-option
-                                                v-for="item in standSortOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                                     <el-input
-                                            v-model.number="form.standYear"
-                                            placeholder="请输入标准标准年份"
+                                            v-model="form.standNumber"
+                                            placeholder="请输入标准编号"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
@@ -55,28 +44,51 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.standEnName"
-                                            placeholder="请输入标准英文名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
                                 <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
                                     <el-radio-group v-model="form.signFlag">
                                         <el-radio label="1">是</el-radio>
                                         <el-radio label="2">否</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                                <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
                                     <el-input
-                                            v-model="form.standNumber"
-                                            placeholder="请输入标准编号"
+                                            v-model.number="form.standYear"
+                                            placeholder="请输入标准标准年份"
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.textStatus" placeholder="请选择文本状态">
+                                        <el-option
+                                                v-for="item in standStateOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item v-show="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+                                    <el-date-picker
+                                            v-model="form.issueTime"
+                                            type="date"
+                                            placeholder="请选择标准发布日期"
+                                            value-format="yyyy-MM-dd">
+                                    </el-date-picker>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="12">
+                                <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.standSort" placeholder="请选择标准类别">
+                                        <el-option
+                                                v-for="item in standSortOptions"
+                                                placeholder="请选择"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
                                 <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.standNature" placeholder="请选择标准性质">
                                         <el-option
@@ -88,39 +100,35 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.textStatus" placeholder="请选择文本状态">
-                                        <el-option
-                                                v-for="item in standStateOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
+                                <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+                                    <el-input
+                                            v-model="form.standEnName"
+                                            placeholder="请输入标准英文名称"
+                                            clearable
+                                    ></el-input>
                                 </el-form-item>
-                                <el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.issueTime"
-                                            type="date"
-                                            placeholder="请选择标准发布日期"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
+                                <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
+                                    <el-button
+                                            type="primary"
+                                            :loading="loadSarStandard"
+                                            @click="handleSearchStandard">
+                                        根据类别、编号、中英文名称查询
+                                    </el-button>
                                 </el-form-item>
-                                <el-form-item label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
+                                <el-form-item v-show="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
                                     <el-radio-group v-model="form.isRelateAccess">
                                         <el-radio label="1">是</el-radio>
                                         <el-radio label="2">否</el-radio>
                                     </el-radio-group>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                                <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                                     <tree-select
                                             width = "340"
                                             :data="standSystemOptions"
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                                             :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
+                                <el-form-item v-show="verifySarStandard" v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.gxhbq"
                                             placeholder="请输入标签"
@@ -130,10 +138,10 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <ProcessTitle>
+                    <ProcessTitle v-show="verifySarStandard">
                         <template slot="title">实施日期</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-show="verifySarStandard" >
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="实施日期(标准文本)" prop="ssrq" class="add-form-item form-item-disabled">
@@ -189,10 +197,10 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <ProcessTitle>
+                    <ProcessTitle v-show="verifySarStandard">
                         <template slot="title">文本信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgd" class="add-form-item form-item-disabled">
@@ -223,7 +231,7 @@
                                         </el-button>
                                     </div>
                                 </el-form-item>
-                                <el-form-item label="发布稿" prop="fbgbjbd" class="add-form-item form-item-disabled">
+                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
@@ -452,10 +460,10 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <ProcessTitle>
+                    <ProcessTitle v-show="verifySarStandard">
                         <template slot="title">适用范围</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
@@ -492,22 +500,25 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.cycvppsbm" placeholder="请选择乘用车VPPS编码" multiple>
-                                        <el-option label="乘用车VPPS编码1" value="1"></el-option>
-                                        <el-option label="乘用车VPPS编码2" value="2"></el-option>
-                                    </el-select>
+                                    <tree-select
+                                            width = "340"
+                                            :data="busVppsOptions"
+                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
+                                            :nodeKey="nodeKey" @popoverHide="popoverHideBusVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.kccvppsbm" placeholder="请选择卡车VPPS编码" multiple>
-                                        <el-option label="卡车VPPS编码1" value="1"></el-option>
-                                        <el-option label="卡车VPPS编码2" value="2"></el-option>
-                                    </el-select>
+                                    <tree-select
+                                            width = "340"
+                                            :data="busVppsOptions"
+                                            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys"
+                                            :nodeKey="nodeKey" @popoverHide="popoverHideCarVs"></tree-select>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple>
-                                        <el-option label="模块结构单元变型号1" value="1"></el-option>
-                                        <el-option label="模块结构单元变型号2" value="2"></el-option>
-                                    </el-select>
+                                    <tree-select
+                                            width = "340"
+                                            :data="modelOptions"
+                                            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys"
+                                            :nodeKey="nodeKey" @popoverHide="popoverHideModel"></tree-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                     <el-input
@@ -518,7 +529,7 @@
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                                     <el-input
-                                            v-model="form.fbjg"
+                                            v-model="form.qcdw"
                                             placeholder="请选择起草单位"
                                             clearable
                                     ></el-input>
@@ -610,10 +621,10 @@
                             </el-col>
                         </el-row>
                     </div>
-                    <ProcessTitle>
+                    <ProcessTitle v-show="verifySarStandard">
                         <template slot="title">关联信息</template>
                     </ProcessTitle>
-                    <div class="prc-content-border">
+                    <div class="prc-content-border" v-show="verifySarStandard">
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
@@ -762,7 +773,7 @@
                     </el-timeline>
                 </div>
             </el-form>
-            <el-collapse v-model="activeName" accordion>
+            <el-collapse v-show="verifySarStandard" v-model="activeName" accordion>
                 <el-collapse-item title="意见填写" name="1">
                     <div style="margin: 10px 0;">
                         <el-input
@@ -777,6 +788,7 @@
             </el-collapse>
         </div>
         <ProcessFooter
+                v-show="verifySarStandard"
                 show-save
                 show-submit
                 :submitLoading="isSubmit"
@@ -927,6 +939,154 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
             </div>
         </el-drawer>
+        <!-- 选择标准的弹框 -->
+        <el-drawer
+                ref="standard"
+                title="查询结果"
+                size="1300px"
+                :visible.sync="standardDrawer"
+                direction="rtl"
+                :before-close="handleReviseDrawerClose">
+            <div class="standard-content">
+                <div class="content">
+                    <div class="standard-table-search">
+                        <el-form :model="standardSearchForm" inline class="label-input-form search-area">
+                            <el-formItem label="标准来源" prop="standType" class="search-item" >
+                                <el-select
+                                        v-model="standardSearchForm.standType"
+                                        placeholder="请选择标准来源">
+                                    <el-option value="INLAND" label="国内标准库"></el-option>
+                                    <el-option value="FOREIGN" label="国外标准库"></el-option>
+                                </el-select>
+                            </el-formItem>
+                            <el-form-item label="标准类别" prop="standSort" class="search-item" >
+                                <el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
+                                    <el-option
+                                            v-for="item in standSortOptions"
+                                            :key="item.value"
+                                            :value="item.value"
+                                            :label="item.label"
+                                    ></el-option>
+                                </el-select>
+                            </el-form-item>
+                            <el-form-item label="标准编号" prop="standNumber" class="search-item" >
+                                <el-input
+                                        v-model="standardSearchForm.standNumber"
+                                        placeholder="请输入标准编号"
+                                        clearable
+                                        :maxlength="100"></el-input>
+                            </el-form-item>
+                            <el-form-item label="中文名称" prop="standName" class="search-item" >
+                                <el-input v-model="standardSearchForm.standName"
+                                          placeholder="请输入标准名称"
+                                          clearable
+                                          :maxlength="500"></el-input>
+                            </el-form-item>
+                            <el-form-item label="英文名称" prop="standEnName" class="search-item">
+                                <el-input
+                                        v-model="standardSearchForm.standEnName"
+                                        maxlength="1000"
+                                        placeholder="请输入英文名称"
+                                        clearable></el-input>
+                            </el-form-item>
+                            <el-form-item>
+                                <el-button
+                                        icon="el-icon-search"
+                                        type="primary"
+                                        class="common-button-primary"
+                                        @click="handleSearchStandard"
+                                        round>
+                                </el-button>
+                                <el-button
+                                        class="common-button-default"
+                                        icon="el-icon-refresh-left"
+                                        @click="handleResetSearch"
+                                        round></el-button>
+                            </el-form-item>
+                        </el-form>
+                    </div>
+                    <div class="standard-table-wrap">
+                        <el-table
+                                ref="reviseDrawerTable"
+                                :data="tableData.standardData"
+                                tooltip-effect="dark"
+                                style="width: 100%;"
+                                :height="tableHeight.standardTableHeight"
+                                border
+                                class="drag-table"
+                                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+                                @selection-change="standSelectChange">
+                            <el-table-column
+                                    type="selection"
+                                    width="55"
+                                    align="center">
+                            </el-table-column>
+                            <el-table-column
+                                    type="index"
+                                    label="序号"
+                                    width="80"
+                                    align="center"
+                            ></el-table-column>
+                            <el-table-column
+                                    label="标准号"
+                                    align="center"
+                            >
+                                <template slot-scope="scope">
+                                    <a v-if="scope.row.standYear" @click="handlePreview(scope.row)">
+                                        {{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                                    <a v-else @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    prop="standName"
+                                    label="标准名称"
+                                    align="center">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="standStateShow"
+                                    label="标准状态"
+                                    align="center">
+                            </el-table-column>
+                            <el-table-column label="操作" align="center" width="80">
+                                <template slot-scope="scope">
+                                    <el-button
+                                            class="opera-btn"
+                                            size="mini"
+                                            type="primary"
+                                            @click="handlePreview(scope.row)">查看
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <pagination
+                            :page="standardSearchForm.page"
+                            :total="standardSearchForm.total"
+                            @pageChange="handleStandardPageChange"
+                            @pageSizeChange="handleStandardPageSizeChange"></pagination>
+                    <loading :loading="loadSarStandard">数据获取中</loading>
+                </div>
+            </div>
+            <div class="demo-drawer-footer">
+                <el-button
+                        round
+                        class="common-button-primary"
+                        icon="el-icon-check"
+                        type="primary"
+                        @click="handleProcessStandardNext(1)">新增</el-button>
+                <el-button
+                        round
+                        class="common-button-primary"
+                        icon="el-icon-check"
+                        type="primary"
+                        @click="handleProcessStandardNext(2)">带入</el-button>
+                <el-button
+                        round
+                        class="common-button-default"
+                        icon="el-icon-close"
+                        @click="handleProcessStandardNext(3)">取消</el-button>
+            </div>
+        </el-drawer>
     </div>
 </template>
 
@@ -941,8 +1101,32 @@
         name: "bzrkStep1",
         data () {
             return {
+              standardDrawer: false,
+              loadSarStandard: false,
+              verifySarStandard: false,
+              standardSearchForm: {
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    total: 0,
+                    standType: 'INLAND',
+                    standSort: '',
+                    standName: '',
+                    standEnName: '',
+                    standNumber: ''
+                },
+                tableData: {
+                    // 标准表格数据
+                    standardData: [],
+                    // 任务分解单数据
+                    taskTableData: []
+                },
+                tableHeight: {
+                    standardTableHeight: null
+                },
+                selectedList: [],
+                standardCheckedList: [],
               activeName:'1',
-                roleRow: {},
+              roleRow: {},
               commentText: '', // 意见
                 title: '', // 新增编辑抽屉标题
                 config: {
@@ -979,6 +1163,14 @@
                     children: 'children',
                     label: 'menuName'
                 },
+                defaultCodeProps: {
+                    children: 'children',
+                    label: 'code'
+                },
+                defaultModelProps: {
+                    children: 'children',
+                    label: 'model'
+                },
                 nodeList: [],
                 type: '',
                 defaultUserProps: {
@@ -1018,7 +1210,7 @@
                     zccssrqgj: '', // 在产车实施日期(国际)
                     // 文本信息
                     ca: '', // 草案
-                    fbgbjbd: '', // 发布稿
+                    FBGBJBD: '', // 发布稿
                     xgd: '', // 修改单
                     bpg: '', // 报批稿
                     ssg: '', // 送审稿
@@ -1120,6 +1312,8 @@
                 standNatureOptions: [], // 标准性质
                 standStateOptions: [], // 文本状态
                 standSystemOptions: [], // 标准体系
+                busVppsOptions: [], // 车系体系架构
+                modelOptions: [], // 模块体系架构
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
@@ -1132,6 +1326,59 @@
                 ListForm: {}, // 新增数据
             }
         },
+        watch:{
+            'form.standInData': {
+                handler: function() {
+                    this.verifySarStandard = false
+                    this.standardSearchForm.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+                },
+            },
+            'standardSearchForm.standType': {
+                handler: function() {
+                    this.form.standInData = this.standardSearchForm.standType === 'INLAND' ? '0' : '1'
+                },
+            },
+            'form.standNumber': {
+                handler: function() {
+                    this.standardSearchForm.standNumber = this.form.standNumber
+                },
+            },
+            'standardSearchForm.standNumber': {
+                handler: function() {
+                    this.form.standNumber = this.standardSearchForm.standNumber
+                },
+            },
+            'form.standSort': {
+                handler: function() {
+                    this.standardSearchForm.standSort = this.form.standSort
+                },
+            },
+            'standardSearchForm.standSort': {
+                handler: function() {
+                    this.form.standSort = this.standardSearchForm.standSort
+                },
+            },
+            'form.standName': {
+                handler: function() {
+                    this.standardSearchForm.standName = this.form.standName
+                },
+            },
+            'standardSearchForm.standName': {
+                handler: function() {
+                    this.form.standName = this.standardSearchForm.standName
+                },
+            },
+            'form.standEnName': {
+                handler: function() {
+                    this.standardSearchForm.standEnName = this.form.standEnName
+                },
+            },
+            'standardSearchForm.standEnName': {
+                handler: function() {
+                    this.form.standEnName = this.standardSearchForm.standEnName
+                },
+            },
+        },
         components: {
             ProcessHeader,
             ProcessFooter,
@@ -1139,6 +1386,179 @@
             TreeSelect
         },
         methods: {
+            clearFormData(data){
+                this.form = {
+                    // 基础信息
+                    textStatus: '', // 文本状态
+                        standYear: '', // 标准年份
+                        standInData: data.standInData ? data.standInData : '0', // 标准类型
+                        standSort: data.standSort ? data.standSort : '', // 标准类别
+                        standNumber: data.standNumber ? data.standNumber : '', // 标准编号
+                        standNature: data.standNature ? data.standNature : '', // 标准性质
+                        standEnName: data.standEnName ? data.standEnName : '', // 英文名称
+                        standName: data.standName ? data.standName : '', // 中文名称
+                        signFlag: data.signFlag ? data.signFlag : '1', // 是否需要会签
+                        issueTime: '', // 发布时间
+                        isRelateAccess: '', // 是否纳入认证清单
+                        standSystem: '',// 标准体系
+                        standSystemName: '',// 标准体系名称
+                        gxhbq: '', // 标签
+                        // 实施日期
+                        ssrq: '', // 实施日期(标准文本)
+                        xcxssrq: '', // 新车型实施日期(标准文本)
+                        zccssrq: '', // 在产车实施日期(标准文本)
+                        ssrqgj: '', // 实施日期(国际)
+                        xcxssrqgj: '', // 新车型实施日期(国际)
+                        zccssrqgj: '', // 在产车实施日期(国际)
+                        // 文本信息
+                        ca: '', // 草案
+                        fbgbjbd: '', // 发布稿
+                        xgd: '', // 修改单
+                        bpg: '', // 报批稿
+                        ssg: '', // 送审稿
+                        zqyjg: '', // 征求意见稿
+                        jdwj: '', // 解读文件
+                        zbjbd: '', // 增补件
+                        kwj: '', // 勘误件
+                        caName: '', // 草案
+                        fbgbjbdName: '', // 发布稿
+                        xgdName: '', // 修改单
+                        bpgName: '', // 报批稿
+                        ssgName: '', // 送审稿
+                        zqyjgName: '', // 征求意见稿
+                        jdwjName: '', // 解读文件
+                        zbjbdName: '', // 增补件
+                        kwjName: '', // 勘误件
+                        glwjName: '', // 关联文件
+                        // 适用范围
+                        txlb: '', // 体系类别
+                        gkdw: '', // 归口管理部门
+                        qcdw: '', // 起草单位
+                        wssmr: '', // 我司署名人
+                        cysd: '', // 我司参与深度
+                        cllx: '', // 适用车型
+                        nylx: '',// 能源类型
+                        sycpx: '',// 适用产品线
+                        syrz: '', // 适用认证
+                        zrbm: '', // 责任部门
+                        zrgcs: '', // 责任工程师
+                        cycvppsbm: '', // 关联模块--乘用车VPPS编码
+                        cycvppscn: '', // 关联模块--乘用车vpps中文名称
+                        kccvppsbm: '', // 关联模块--卡车VPPS编码
+                        kccvppscn: '', // 关联模块--卡车vpps中文名称
+                        dybxh: '', // 模块结构单元变型号
+                        dymc: '', // 模块结构单元名称
+                        // 关联信息
+                        dtbjh: '', // 代替标准号
+                        cbbh: '', // 采标编号
+                        cbcd: '', // 采标程度
+                        yybj: '', // 引用标准
+                        byybj: '', // 被引用标准
+                        glwj: '', // 关联文件
+                        xglc: '', // 相关流程
+                        chjl: '', // 参会记录
+                } // 标准信息
+            },
+            handleProcessStandardNext(status) {
+                switch (status) {
+                    // 新增
+                    case 1:
+                        this.selectedList = []
+                        this.standardCheckedList = []
+                        this.standardDrawer = false
+                        this.verifySarStandard = true
+                        this.clearFormData(this.form)
+                        break
+                    // 带入
+                    case 2:
+                        if (this.standardCheckedList.length === 1) {
+                            const bringData = this.standardCheckedList[0]
+                            bringData.signFlag = this.form.signFlag && this.form.signFlag != '' ? this.form.signFlag : '0'
+                            bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
+                            console.log(bringData)
+                            const json = Object.assign(bringData, bringData.attrInfoCaseMap);
+                            this.form = JSON.parse(JSON.stringify(json))
+                            this.defaultCheckedKeys = [this.form.standSystem];
+                            this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+                            this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
+                            this.form.prcNum = this.prcNum
+                            this.form.prcName = this.prcName
+                            this.form['id'] = bringData.id
+                            this.standardDrawer = false
+                            this.verifySarStandard = true
+                        } else if (this.standardCheckedList.length > 1) {
+                            this.$message.warning('最多可以带入一条标准信息')
+                        } else {
+                            this.$message.warning('请选择要带入的标准信息')
+                        }
+                        break
+                    // 取消
+                    case 3:
+                        this.selectedList = []
+                        this.standardCheckedList = []
+                        this.standardDrawer = false
+                        break
+                }
+            },
+            handleStandardPageChange (page) {
+                this.standardSearchForm.page = page
+                this.handleSearchStandard()
+            },
+            handleStandardPageSizeChange (pageSize) {
+                this.standardSearchForm.pageSize = pageSize
+                this.handleSearchStandard()
+            },
+            standSelectChange (data) {
+                this.selectedList = []
+                for (let i = 0; i < data.length; i++) {
+                    this.selectedList.push(data[i].id)
+                }
+                this.standardCheckedList = data
+            },
+            handleResetSearch() {
+                this.standardSearchForm.standType = 'INLAND'
+                this.standardSearchForm.standNumber = ''
+                this.standardSearchForm.standSort = ''
+                this.standardSearchForm.standName = ''
+                this.standardSearchForm.standEnName = ''
+                setTimeout(() => {
+                    this.handleSearchStandard()
+                }, 100)
+            },
+            /**
+             * 关闭修订 Drawer 的监听
+             * @param done
+             */
+            handleReviseDrawerClose (done) {
+                done()
+            },
+            getDomesticStandardTable () {
+                this.loadSarStandard = true
+                this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.standardSearchForm, {}, res => {
+                    this.loadSarStandard = false
+                    if (res.ok) {
+                        this.tableData.standardData = res.data.list
+                        this.standardSearchForm.total = res.data.count
+                    }
+                }, e => {
+                    this.loadSarStandard = false
+                })
+            },
+            handleSearchStandard () {
+                if (this.form.standType === '') {
+                    this.$message.warning('请选择标准来源')
+                } else {
+                    this.standardDrawer = true
+                    this.$nextTick(() => {
+                        // 动态设置表格高度
+                        this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+                        window.onresize = () => {
+                            this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+                        }
+                    })
+                    this.getDomesticStandardTable()
+                }
+            },
             saveUserInfo () {
                 if (this.userType === 'zrUserId') {
                     this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
@@ -1436,6 +1856,27 @@
                 this.form.standSystemName = checkedData.menuName
                 console.log(this.sarStandardsInfoEO.standSystem);
             },
+            popoverHideBusVs (checkedIds, checkedData) {
+                console.log(checkedIds);
+                console.log(checkedData);
+                this.form.cycvppsbm = checkedData.code
+                this.form.cycvppscn = checkedData.chineseName
+                console.log(this.sarStandardsInfoEO.standSystem);
+            },
+            popoverHideCarVs (checkedIds, checkedData) {
+                console.log(checkedIds);
+                console.log(checkedData);
+                this.form.kccvppsbm = checkedData.code
+                this.form.kccvppscn = checkedData.chineseName
+                console.log(this.sarStandardsInfoEO.standSystem);
+            },
+            popoverHideModel (checkedIds, checkedData) {
+                console.log(checkedIds);
+                console.log(checkedData);
+                this.form.dybxh = checkedData.model
+                this.form.dymc = checkedData.name
+                console.log(this.sarStandardsInfoEO.standSystem);
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -1515,7 +1956,21 @@
                         this.$message.warning('请检查基础信息表单是否填写完整')
                     }
                 })
-            }
+            },
+            busVsFunc(){
+                this.$http.get('sarVppsTree/list', '', {
+                    _this: this
+                }, res => {
+                    this.busVppsOptions = res.data
+                })
+            },
+            modelFunc(){
+                this.$http.get('sarModelTree/list', '', {
+                    _this: this
+                }, res => {
+                    this.modelOptions = res.data
+                })
+            },
         },
         mounted () {
             this.getTree()
@@ -1535,6 +1990,8 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
             })
+            this.busVsFunc()
+            this.modelFunc()
         }
     }
 </script>
@@ -1591,4 +2048,24 @@
             }
         }
     }
+    .standard-content {
+        height: 100%;
+        padding: 10px 0 0;
+        .content {
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            padding: 0 10px;
+            .standard-table-wrap {
+                flex: auto;
+                overflow-y: auto;
+            }
+            .pagination {
+                position: static;
+                /deep/ .pagination-slot {
+                    padding: 0;
+                }
+            }
+        }
+    }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index f1a9cb9f2..a2db959df 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -24,7 +24,7 @@
                     <div class="prc-content-border">
                         <el-row :gutter="24">
                             <el-col :span="12">
-                                <el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
+                                <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                                     <el-radio-group v-model="form.standInData" disabled>
                                         <el-radio label="0">国内标准入库</el-radio>
                                         <el-radio label="1">海外标准入库</el-radio>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 99355c242..5641ccae3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -24,7 +24,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
+                <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.standInData" disabled>
                     <el-radio label="0">国内标准入库</el-radio>
                     <el-radio label="1">海外标准入库</el-radio>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 4c459acc8..daf0be040 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -25,7 +25,7 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
+                <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.standInData">
                     <el-radio label="0">国内标准入库</el-radio>
                     <el-radio label="1">海外标准入库</el-radio>

From fe64b291642a008b4b2dd3f5a03befba2559c9a7 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 15 Jul 2021 19:38:46 +0800
Subject: [PATCH 20/25] commit

---
 .../pages/creatProcess/bzjd/step1.vue         |   3 +-
 .../pages/creatProcess/bzjd/step2.vue         | 186 +++++++++++++-----
 .../pages/creatProcess/bzjd/step3.vue         |  63 +++++-
 3 files changed, 192 insertions(+), 60 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 194ae0752..b6d86c38e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -136,7 +136,7 @@
                                         <el-input v-model="roleForm.deptUserId" style="display: none;"/>
                                         <el-input
                                                 v-model="roleForm.deptUserIdName"
-                                                placeholder="选择标准法规部部长·"
+                                                placeholder="选择标准法规部部长"
                                                 @click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
                                         />
                                     </div>
@@ -526,6 +526,7 @@
             },
             choiceZRRS (row, type, index) {
                 if (type === 1) {
+                    this.nodeList2 = []
                     this.zrIndex= index
                     this.zrType = type
                     this.nodeList2.push(row)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index e7904ad72..52ddae196 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -9,7 +9,7 @@
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
         </div>
         <div class="content" v-show="active === '1'">
-            <div style="flex: auto; overflow: auto;">
+            <div style="overflow: auto;">
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
@@ -39,19 +39,63 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.zxUserId"
-                                            style="display: none;"
-                                            clearable
-                                    ></el-input>
-                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
-                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
                 </el-form>
             </div>
+            <ProcessTitle>
+                <template slot="title">拆分信息</template>
+            </ProcessTitle>
+            <div class="action-bar">
+                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+            </div>
+            <el-table border
+                      ref="selection"
+                      :data="itemList"
+                      tooltip-effect="dark"
+                      style="width: 100%;"
+                      height="100%"
+                      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                      @selection-change="handleSelectionChange"
+                      row-key="id">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                        prop="itemsNum"
+                        label="条款号"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsName"
+                        label="条款名称"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        label="条款内容"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任人"
+                        width="170"
+                        prop="zrUserIdName"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="执行人"
+                        width="170"
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-input v-model="scope.row.zxUserId" style="display: none;"/>
+                        <el-input v-model="scope.row.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRRS(scope.row.zxUserId, 1, scope.$index)"/>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <loading :loading="loading">数据获取中</loading>
             <el-collapse accordion>
                 <el-collapse-item title="意见填写">
                     <div style="margin: 10px 0;">
@@ -76,28 +120,29 @@
         >
         </ProcessFooter>
         <el-drawer
-                title="选择责任人"
-                :visible.sync="modalshowflag"
+                title="选择责任部门对接人"
+                :visible.sync="modalshowflag2"
                 :wrapperClosable="false"
                 size="800px">
             <el-tree
-                    v-if="modalshowflag"
-                    style="height: 100%; overflow: auto;"
+                    v-if="modalshowflag2"
                     node-key="id"
+                    style="height: 100%; overflow: auto;"
                     class="filter-tree"
                     :data="treeData"
                     :props="defaultProps"
-                    :default-checked-keys="nodeList"
+                    :default-checked-keys="nodeList2"
                     highlight-current
                     check-strictly
+                    @check="drawerCheck2"
                     default-expand-all
                     :expand-on-click-node="false"
                     show-checkbox
-                    ref="tree">
+                    ref="tree2">
             </el-tree>
-            <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+            <div id="roleFormButton2" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
             </div>
         </el-drawer>
     </div>
@@ -113,18 +158,22 @@
         name: "bzjdStep2",
         data() {
             return {
-                commentText: '',
-                taskIds: this.$route.query.taskIds,
-                pId: this.$route.query.prcId,
-                roleRow: {},
-                nodeList: [],
-                type: '',
+                zxIndex: '',
+                zxType: '',
+                zxIdList: [],
+                modalshowflag2: false,
+                treeData: [],
+                nodeList2: [],
                 defaultProps: {
                     children: 'children',
                     label: 'name'
                 },
-                treeData: [], // 人员数据
-                modalshowflag: false, // drawer开关
+                loading: false,
+                commentText: '',
+                taskIds: this.$route.query.taskIds,
+                pId: this.$route.query.prcId,
+                roleRow: {},
+                type: '',
                 drawerTitle: '', //drawer标题
                 textarea: '', // 意见
                 ListModel: false, // 新增编辑抽屉开关
@@ -142,7 +191,8 @@
                         { required: true, message: '请选择执行人', trigger: 'change' },
                     ]
                 },
-                json: {}
+                json: {},
+                itemList: []
             }
         },
         components: {
@@ -151,10 +201,37 @@
             ProcessTitle
         },
         methods: {
-            saveUserInfo () {
+            drawerCheck2 (data) {
+                var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
+                if(getlist.length == 1) {
+                    this.roleRow = getlist[0]
+                }else {
+                    this.$refs.tree2.setCheckedKeys([data.id]);
+                    this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
+                }
+            },
+            choiceZRRS (row, type, index) {
+                if (type === 1) {
+                    this.nodeList2 = []
+                    this.zxIndex= index
+                    this.zxType = type
+                    this.nodeList2.push(row)
+                    this.modalshowflag2 = true
+                } else {
+                    // 批量
+                    if (this.zxIdList.length > 0) {
+                        this.zxType = type
+                        this.nodeList2 = []
+                        this.modalshowflag2 = true
+                    } else {
+                        this.$message.warning('请选择要编辑的数据')
+                    }
+                }
+            },
+            saveUserInfo2 () {
                 var idList = ''
                 var nameList = ''
-                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+                this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
                     if (nameList.length > 0) {
                         nameList += ','
                         idList += ','
@@ -162,19 +239,23 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.form.zxUserId = idList
-                this.form.zxUserIdName = nameList
-                this.modalshowflag = false
-            },
-            cancleUserInfo () {
-                this.modalshowflag = false
-            },
-            choiceZRR () {
-                this.nodeList = []
-                if (this.form.zxUserId.length > 0) {
-                    this.nodeList = this.form.zxUserId.split(',')
+                if (this.zxType == 1) {
+                    this.itemList[this.zxIndex].zxUserId = idList
+                    this.itemList[this.zxIndex].zxUserIdName = nameList
+                } else {
+                    this.itemList.forEach( item => {
+                        this.zxIdList.forEach( items => {
+                            if (item.id === items) {
+                                item.zxUserId = idList
+                                item.zxUserIdName = nameList
+                            }
+                        })
+                    })
                 }
-                this.modalshowflag = true
+                this.modalshowflag2 = false
+            },
+            cancleUserInfo2 () {
+                this.modalshowflag2 = false
             },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -189,16 +270,8 @@
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
                         var json = this.json
+                        json.itemList = this.itemList
                         json.commentText = this.commentText
-                        var arr = this.form.zxUserId.split(',')
-                        var newArr = []
-                        arr.forEach(item => {
-                            var json1 = {}
-                            json1.id = item
-                            newArr.push(json1)
-                        })
-                        json.zxUserId = newArr
-                        json.zxUserIdName = this.form.zxUserIdName
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -214,6 +287,12 @@
                     }
                 })
             },
+            handleSelectionChange (val){
+                this.zxIdList = []
+                val.forEach( item => {
+                    this.zxIdList.push(item.id)
+                })
+            },
             getData() {
                 return new Promise((resolve, reject) => {
                     inboundLiaisonDetail({
@@ -224,6 +303,13 @@
                         this.form.number = data.number
                         this.form.name = data.name
                         this.json = data
+                        var arr = []
+                        arr = JSON.parse(data.itemList)
+                        arr.forEach(item => {
+                            item.zxUserId = ''
+                            item.zxUserIdName = ''
+                        })
+                        this.itemList = arr
                     }).catch(e => {
                     })
                 })
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index d0da3fac1..1a0e8ddb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -9,7 +9,7 @@
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
         </div>
         <div class="content" v-show="active === '1'">
-            <div style="flex: auto; overflow: auto;">
+            <div style="overflow: auto;">
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
@@ -39,19 +39,60 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="执行人" prop="responUserList" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.zxUserId"
-                                            style="display: none;"
-                                            clearable
-                                    ></el-input>
-                                    <el-input v-model="form.zxUserIdName" placeholder="请选择执行人" @click.native="choiceZRR"></el-input>
-                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
                 </el-form>
             </div>
+            <ProcessTitle>
+                <template slot="title">拆分信息</template>
+            </ProcessTitle>
+            <div class="action-bar">
+                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+            </div>
+            <el-table border
+                      ref="selection"
+                      :data="itemList"
+                      tooltip-effect="dark"
+                      style="width: 100%;"
+                      height="100%"
+                      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                      @selection-change="handleSelectionChange"
+                      row-key="id">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column
+                        prop="itemsNum"
+                        label="条款号"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itemsName"
+                        label="条款名称"
+                        width="170"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        label="条款内容"
+                        show-overflow-tooltip
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任人"
+                        width="170"
+                        prop="zrUserIdName"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="执行人"
+                        width="170"
+                        prop="zxUserIdName"
+                        align="center">
+                </el-table-column>
+            </el-table>
+            <loading :loading="loading">数据获取中</loading>
             <el-collapse accordion>
                 <el-collapse-item title="意见填写">
                     <div style="margin: 10px 0;">
@@ -113,6 +154,8 @@
         name: "bzjdStep3",
         data() {
             return {
+                itemList: [],
+                loading: false,
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -151,6 +194,7 @@
             ProcessTitle
         },
         methods: {
+            handleSelectionChange () {},
             saveUserInfo () {
                 var idList = ''
                 var nameList = ''
@@ -224,6 +268,7 @@
                         this.form.number = data.number
                         this.form.name = data.name
                         this.json = data
+                        this.itemList = JSON.parse(data.itemList)
                     }).catch(e => {
                     })
                 })

From 2d933ec9fef7ac28c3a60abc6d9766b4b2e0bb40 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 15 Jul 2021 19:52:48 +0800
Subject: [PATCH 21/25] commit

---
 .../processCenter/pages/creatProcess/bzjd/step2.vue      | 9 +++++++++
 .../processCenter/pages/creatProcess/bzjd/step3.vue      | 6 ------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 52ddae196..0e2f2b4f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -269,6 +269,15 @@
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
+                        let b = 0
+                        for (let a = 0; a < this.itemList.length; a++) {
+                            if (!this.itemList[a].zxUserId) {
+                                b++
+                            }
+                        }
+                        if (b > 0) {
+                            this.$message.warning('请选择执行人')
+                        }
                         var json = this.json
                         json.itemList = this.itemList
                         json.commentText = this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 1a0e8ddb8..cbc3b1ac8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -85,12 +85,6 @@
                         prop="zrUserIdName"
                         align="center">
                 </el-table-column>
-                <el-table-column
-                        label="执行人"
-                        width="170"
-                        prop="zxUserIdName"
-                        align="center">
-                </el-table-column>
             </el-table>
             <loading :loading="loading">数据获取中</loading>
             <el-collapse accordion>

From 30dd40378ffd9ec8886bcc9689339761ed0fd604 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, 16 Jul 2021 09:05:49 +0800
Subject: [PATCH 22/25] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 203 ++++++++++++++----
 .../pages/creatProcess/bzqdfb/step2.vue       |   9 +-
 .../pages/creatProcess/bzqdfb/step3.vue       |   8 +-
 .../pages/creatProcess/bzqdfb/step4.vue       |   9 +-
 .../pages/details.vue                         |   8 +-
 .../pages/rectificationDatabase.vue           |   9 +-
 6 files changed, 192 insertions(+), 54 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 06705c639..b356531af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -39,7 +39,7 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
+              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">
 <!--                <el-input-->
 <!--                  v-model="listForm.applyRegion"-->
 <!--                  placeholder="请输入适用区域"-->
@@ -48,7 +48,7 @@
                 <el-select
                   width="120"
                   v-model="listForm.applyRegion"
-                  placeholder="请选择"
+                  placeholder="请选择适用区域"
                   filterable
                 >
                   <el-option
@@ -67,28 +67,48 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
-                <el-upload
-                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
-                  :action="uploadFileListPath"
-                  show-file-list
-                  :file-list="fileInfoList"
-                  name="file"
-                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
-                  :on-remove="delFileInfo"
-                  :on-success="uploadBackSuccess"
-                  :before-upload="beforeUpload"
-                >
-                  <el-button class="common-button-default" size="mini">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  style="display: none;"
+                  v-model="listForm.modelName"
+                  clearable
+                ></el-input>
+                <div v-if="listForm.modelName" @click="fileUpload" class="fileClass">
+                  {{ listForm.modelName }}
+                </div>
+                <div v-else>
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    @click="fileUpload"
+                    size="mini">
                     点击上传
                   </el-button>
-                </el-upload>
-                <el-input
-                  v-else
-                  v-model="listForm.fileId"
-                  placeholder=""
-                ></el-input>
+                </div>
               </el-form-item>
+<!--              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">-->
+<!--                <el-upload-->
+<!--                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "-->
+<!--                  :action="uploadFileListPath"-->
+<!--                  show-file-list-->
+<!--                  :file-list="fileInfoList"-->
+<!--                  name="file"-->
+<!--                  accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"-->
+<!--                  :on-remove="delFileInfo"-->
+<!--                  :on-success="uploadBackSuccess"-->
+<!--                  :before-upload="beforeUpload"-->
+<!--                >-->
+<!--                  <el-button class="common-button-default" size="mini">-->
+<!--                    点击上传-->
+<!--                  </el-button>-->
+<!--                </el-upload>-->
+<!--                <el-input-->
+<!--                  v-else-->
+<!--                  v-model="listForm.fileId"-->
+<!--                  placeholder=""-->
+<!--                ></el-input>-->
+<!--              </el-form-item>-->
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="signFlag" @change="selectSign">
                   <el-radio label="1">是</el-radio>
@@ -182,7 +202,7 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
-            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
               <el-card>
                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                   <h4>会签人</h4>
@@ -195,6 +215,19 @@
                 </el-form-item>
               </el-card>
             </el-timeline-item>
+            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
+              <el-card>
+                <el-form-item prop="dockUserName2" style="margin-bottom: 0">
+                  <h4>会签人</h4>
+                  <div style="margin-top: 10px;width: 300px;">
+                    <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
+                    <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
+                              @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">
+                    </el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
             <el-timeline-item timestamp="根据会签意见修订" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="ministerUserName" style="margin-bottom: 0">
@@ -598,6 +631,24 @@
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
       </div>
     </el-drawer>
+    <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
+      <el-upload
+        multiple
+        drag
+        :action="fileUrl"
+        ref="importfile"
+        name="file"
+        accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+        :before-upload="beginImportFile"
+        :on-success="importFileSuccess"
+        :show-file-list="false"
+      >
+        <div style="padding: 20px 0">
+          <i class="el-icon-upload" style="color: #3399ff"></i>
+          <p>点击或拖拽上传文件</p>
+        </div>
+      </el-upload>
+    </el-dialog>
   </div>
 </template>
 
@@ -617,6 +668,8 @@ export default {
   },
   data() {
     return {
+      fileUrl: 'api/att/attFile/upload',
+      fileMadel: false,
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -686,7 +739,9 @@ export default {
         listName: "", //清单名称
         applyRegion: "", //适用区域
         descriptionList: "", //清单说明
-        fileId: "", //附件
+        fileId:'',
+        model: '', // 上传模板
+        modelName: '',
         standId: "", //选择的清单的id
         signFlag: "1",  //是否会签  1为会签 2为不会签
         inforlist: "", //用来存放标准列表的标准id
@@ -856,12 +911,12 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      // let json = this.listForm;
-      let json = Object.assign(this.listForm, this.roleForm)
-      json.zrUserId = this.$store.getters.userInfo.userId;
-      json.jlUserId = this.$store.getters.userInfo.userId;
+      let json = this.listForm;
+      // let json = Object.assign(this.listForm, this.roleForm)
+      json.zrUserId = this.roleForm.dockUser; //会签人
+      json.jlUserId = this.roleForm.directorUser;   //业务经理
       // (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
-      json.applyUpdUserId = this.$store.getters.userInfo.userId;
+      json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
       json.approvalOpinion = "";
       json.prcCreateUser = this.$store.getters.userInfo.userId;
       json.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -900,23 +955,81 @@ export default {
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      // this.fileInfoList = fileList
+      this.fileInfoList = fileList
     },
-    // 上传文件成功回调
-    uploadBackSuccess(res, file, fileList) {
-      // if (res.ok) {
-      //   this.fileInfoList = fileList
-      //   this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
-      //   this.$message.success('上传成功')
-      // } else {
-      //   this.$message.error(res.message)
-      //   fileList.pop()
-      // }
+    fileUpload () {
+      this.fileMadel = true
     },
-    //上传之前的钩子
-    beforeUpload() {
-
+    // 导入标准数据成功后执行
+    importFileSuccess (response, file) {
+      if (response.ok) {
+        this.fileMadel = false
+        this.listForm.model = response.data.id
+        this.listForm.modelName = response.data.name
+        this.$message({
+          showClose: true,
+          message: response.message,
+          type: 'success'
+        })
+      }
     },
+    // 导入按钮 上传之前的钩子
+    beginImportFile (file) {
+      var filename = file.name
+      var index1 = filename.lastIndexOf('.')
+      var index2 = filename.length
+      var fileSuffix = filename.substring(index1, index2)
+      // const fileSuffix = file.name.split('.')[1] // 后缀名
+      // 判断上传文件格式
+      if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+            || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+            || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' ||
+        fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt'
+        || fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx'
+        || fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') {
+        return true
+      } else {
+        this.spinShow = false
+        this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+        return false
+      }
+      // 判断文件上传大小
+      // eslint-disable-next-line no-unreachable
+      if (file.size / 1024 / 1024 <= 200) {
+        return true
+      } else {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+        return false
+      }
+      return true
+    },
+    // beginImportFile (file) {
+    //   var filename = file.name
+    //   var index1 = filename.lastIndexOf('.')
+    //   var index2 = filename.length
+    //   var fileSuffix = filename.substring(index1, index2)
+    //   // const fileSuffix = file.name.split('.')[1] // 后缀名
+    //   // 判断上传文件格式
+    //   // 判断上传文件格式
+    //   if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+    //     || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+    //     || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+    //     return true
+    //   } else {
+    //     this.spinShow = false
+    //     this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+    //     return false
+    //   }
+    //   // 判断文件上传大小
+    //   // eslint-disable-next-line no-unreachable
+    //   if (file.size / 1024 / 1024 <= 200) {
+    //     return true
+    //   } else {
+    //     this.$message.error('文件' + file.name + '大小不超过200M')
+    //     return false
+    //   }
+    //   return true
+    // },
     //选择清单取消事件
     closeDrawer() {
       this.ListModel = false;
@@ -1123,7 +1236,11 @@ export default {
       }
     }
   }
-
+  .add-form-el-select{
+    /deep/ .el-select{
+      width: 210px;
+    }
+  }
   .demo-drawer-content {
     margin-top: 10px;
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index f6de56f6f..994a198e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -344,6 +344,7 @@ export default {
           taskIds: this.taskIds,
           pId: this.pId
         }).then(res => {
+          console.log(res.mesg);
           if (res) {
             const processForm = JSON.parse(res.mesg)
             this.getFormFieldList(processForm)
@@ -363,6 +364,9 @@ export default {
         this.listForm['id'] = item.id
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
+        this.listForm.applyUpdUserId = item.applyUpdUserId
+        this.listForm.jlUserId = item.jlUserId
+        this.listForm.zrUserId = item.zrUserId
       })
     },
 
@@ -373,10 +377,11 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+      this.listForm.zrUserId = this.listForm.zrUserId;
+      this.listForm.jlUserId = this.listForm.jlUserId;
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index f98995dff..eb8d88b53 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -499,6 +499,9 @@ export default {
         this.listForm['id'] = item.id
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
+        this.listForm.applyUpdUserId = item.applyUpdUserId
+        this.listForm.jlUserId = item.jlUserId
+        this.listForm.zrUserId = item.zrUserId
       })
     },
     //保存事件
@@ -515,11 +518,12 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+      this.listForm.zrUserId = this.listForm.zrUserId;
+      this.listForm.jlUserId = this.listForm.jlUserId;
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
       this.listForm.commentText = this.commentText;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.approvalOpinion = "";
       this.listForm.standId = this.listForm.standId;
       const json = JSON.stringify(this.listForm);
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 559444354..e9cadf774 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -335,6 +335,9 @@ export default {
         this.listForm['id'] = item.id
         this.listForm.dataList = item.dataList
         this.dataList = item.dataList
+        this.listForm.applyUpdUserId = item.applyUpdUserId
+        this.listForm.jlUserId = item.jlUserId
+        this.listForm.zrUserId = item.zrUserId
       })
     },
     //驳回事件
@@ -344,12 +347,12 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+      this.listForm.zrUserId = this.listForm.zrUserId;
+      this.listForm.jlUserId = this.listForm.jlUserId;
       this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
       this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
       this.listForm.commentText = this.commentText;
-      this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
       this.listForm.signflag = "";
       this.listForm.standId = this.listForm.standId;
       const json = JSON.stringify(this.listForm);
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 4783a3960..29bc99cf6 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -281,8 +281,12 @@ export default {
     exportProducdata() {},
     deleteStandLawsForProduct() {},
     selectStandLawsForProduct() {},
-    pageChangeLaws() {},
-    pageSizeChangeLaws() {},
+    pageChangeLaws() {
+
+    },
+    pageSizeChangeLaws() {
+
+    },
     standSelectChange() {},//选项值发生改变
 
   },
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 2f0b17269..67456cdbd 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -204,7 +204,11 @@
         </div>
       </div>
       <div class="footer">
-        <pagination :page="pageNo" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
+        <pagination
+          :page="pageNo"
+          :total="total"
+          @pageChange="pageChange"
+          @pageSizeChange="pageSizeChange"></pagination>
         <el-drawer
           title='查看'
           :visible.sync="historySee"
@@ -599,7 +603,8 @@ export default {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange () {
+    pageSizeChange (pageSize) {
+      console.log(pageSize);
       this.getTableByPage()
     },
   },

From df08287d6e86b0d3a4e90fac981ba2b358a51e0c Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Fri, 16 Jul 2021 09:46:33 +0800
Subject: [PATCH 23/25] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=81=EF=BC=81=EF=BC=81=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzqdfb/step2.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/bzqdfb/step3.vue  |  8 ++++----
 .../processCenter/pages/creatProcess/bzqdfb/step4.vue  | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 994a198e4..2baf4ee4b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active == '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -53,15 +53,15 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
                <el-input
-                 v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                 v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
                  placeholder="暂无数据"
                >
                </el-input>
                 <el-input
                   v-else
-                  v-model="listForm.fileId"
+                  v-model="listForm.modelName"
                   placeholder=""
                 ></el-input>
               </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index eb8d88b53..2b362a5af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active == '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -51,9 +51,9 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
                 <el-upload
-                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
+                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
                   :action="uploadFileListPath"
                   show-file-list
                   :file-list="fileInfoList"
@@ -69,7 +69,7 @@
                 </el-upload>
                 <el-input
                   v-else
-                  v-model="listForm.fileId"
+                  v-model="listForm.modelName"
                   placeholder=""
                 ></el-input>
               </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index e9cadf774..ac9bbeee9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -9,7 +9,7 @@
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
-    <div class="content" v-if="active == '1'">
+    <div class="content" v-show="active == '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
@@ -53,16 +53,16 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
+              <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
                 <el-input
-                  v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
-                  v-model="listForm.fileId"
+                  v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
+                  v-model="listForm.modelName"
                   placeholder="暂无数据"
                 >
                 </el-input>
                 <el-input
                   v-else
-                  v-model="listForm.fileId"
+                  v-model="listForm.modelName"
                   placeholder=""
                 ></el-input>
               </el-form-item>

From f3549f3a133e761b41d33efea33a4a7556b432e4 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 16 Jul 2021 11:29:09 +0800
Subject: [PATCH 24/25] commit

---
 .../pages/creatProcess/bzjd/step1.vue         | 176 +++++++++++++++--
 .../pages/creatProcess/bzjd/step2.vue         |  44 ++++-
 .../pages/creatProcess/bzjd/step3.vue         | 177 ++++++++++--------
 3 files changed, 295 insertions(+), 102 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index b6d86c38e..761ad3913 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -44,6 +44,34 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -232,6 +260,59 @@
                 </div>
             </div>
         </el-drawer>
+        <el-drawer
+                title="标准拆分数据库"
+                :visible.sync="listModel2"
+                size="900px"
+                custom-class="demo-drawer"
+        >
+            <div class="standardForComments">
+                <div class="content">
+                    <!-- 顶部工具栏 -->
+                    <div class="table-wrap">
+                        <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+                            <el-table
+                                    v-if="listModel2"
+                                    ref="selection"
+                                    :data="standInfoList2"
+                                    tooltip-effect="dark"
+                                    style="width: 100%;padding:0 0 20px 0;"
+                                    height="100%"
+                                    border
+                                    @selection-change="handleSelection2"
+                                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                                <el-table-column type="selection" width="55" align="center"/>
+                                <el-table-column
+                                        prop="showNumber"
+                                        label="标准号/政策号"
+                                        width="170"
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <div v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNumSplit }}</div>
+                                        <div v-else>{{ scope.row.showNumber }}</div>
+                                    </template>
+                                </el-table-column>
+                                <el-table-column
+                                        prop="standName"
+                                        label="标准名称/政策名称"
+                                        show-overflow-tooltip
+                                        align="center">
+                                    <template slot-scope="scope">
+                                        <span v-if=" scope.row.splitStatus === '0'">{{ scope.row.standNameSplit }}</span>
+                                        <span v-else>{{ scope.row.standName }}</span>
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </div>
+                    </div>
+                </div>
+                <pagination :page="standCommonlySearch2.page" :total="total2" @pageChange="pageChange2" @pageSizeChange="pageSizeChange2"></pagination>
+                <div class="demo-drawer-footer">
+                    <el-button size="mini" @click="closeDrawer2">取消</el-button>
+                    <el-button type="primary" size="mini" @click="enterDrawer2">确定</el-button>
+                </div>
+            </div>
+        </el-drawer>
         <el-drawer
                 :title="drawerTitle"
                 :visible.sync="modalshowflag"
@@ -297,6 +378,9 @@
         name: "bzjdStep1",
         data() {
             return {
+                listModel2: false,
+                standInfoList2: [],
+                sarType: '',
                 loading: false,
                 standId: '',
                 commentText: '',
@@ -311,6 +395,9 @@
                     number: '',
                     name: '',
                     id: '',
+                    number1: '',
+                    name1: '',
+                    id1: ''
                 },
                 formRules: {
                     number: [
@@ -325,13 +412,21 @@
                     numOrName: '',
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
-                    result: '1'
+                    result: '1',
+                },
+                standCommonlySearch2: {
+                    page: 1,
+                    pageSize: this.$store.getters.userInfo.configContent,
+                    result: '1',
+                    sarType: 'INLAND'
                 },
                 spinShow: false,
                 standInfoList: [],
                 tableHeight: null,
                 total: 0,
+                total2: 0,
                 selectedList: [],
+                selectedList2: [],
                 data: [],
                 roleForm: {
                     applyUserIdName: this.$store.getters.userInfo.userName,
@@ -370,14 +465,6 @@
             ProcessFooter,
             ProcessTitle
         },
-        mounted () {
-            this.getTree()
-            this.sarStandCompareHis()
-            this.tableHeight = $('.content').height() - 44
-            window.onresize = () => {
-                this.tableHeight = $('.content').height() - 44
-            }
-        },
         methods: {
             addZqyjList() {
                 this.title = '标准拆分数据库'
@@ -412,6 +499,16 @@
                 }, e => {
                 })
             },
+            sarStandCompareHis2 () {
+                var form = this.standCommonlySearch2
+                this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
+                    _this: this
+                }, res => {
+                    this.standInfoList2 = res.data.list
+                    this.total2 = res.data.total
+                }, e => {
+                })
+            },
             pageChange (page) {
                 this.standCommonlySearch.page = page
                 this.sarStandCompareHis()
@@ -419,9 +516,19 @@
             // 分页每页显示数改变后方法
             pageSizeChange (pageSize) {
                 this.$store.getters.userInfo.configContent = pageSize
-                this.standCommonlySearch.size = pageSize
+                this.standCommonlySearch.pageSize = pageSize
                 this.sarStandCompareHis()
             },
+            pageChange2 (page) {
+                this.standCommonlySearch2.page = page
+                this.sarStandCompareHis2()
+            },
+            // 分页每页显示数改变后方法
+            pageSizeChange2 (pageSize) {
+                this.$store.getters.userInfo.configContent = pageSize
+                this.standCommonlySearch2.pageSize = pageSize
+                this.sarStandCompareHis2()
+            },
             /** 选择带入数据的方法操作
              * */
             handleSelection(data) {
@@ -430,6 +537,12 @@
                     this.selectedList.push(data[i].id);
                 }
             },
+            handleSelection2 (data) {
+                this.selectedList2 = [];
+                for (let i = 0; i < data.length; i++) {
+                    this.selectedList2.push(data[i].id);
+                }
+            },
             closeDrawer() {
                 this.listModel = false
             },
@@ -452,8 +565,10 @@
                         this.form.name = bringData[0].standName
                     }
                     this.form.id = bringData[0].id
+                    this.sarType = bringData[0].sarType
                     this.standId = bringData[0].standId
                     this.listModel = false;
+                    this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
                         infoId: this.form.id,
                         page: 1,
@@ -476,6 +591,34 @@
                     this.$message.warning("请选择一条数据进行带入");
                 }
             },
+            closeDrawer2() {
+                this.listModel2 = false
+            },
+            enterDrawer2() {
+                if (this.selectedList2.length === 1) {
+                    let deposit = new Map();
+                    this.standInfoList2.forEach(item => {
+                        deposit.set(item.id, item);
+                    });
+                    let bringData = [];
+                    for (let i = 0; i < this.selectedList2.length; i++) {
+                        bringData.push(deposit.get(this.selectedList2[i]));
+                    }
+                    if (bringData[0].splitStatus === '0') {
+                        this.form.number1 = bringData[0].standNumSplit
+                        this.form.name1 = bringData[0].standNameSplit
+                    } else {
+                        this.form.number1 = bringData[0].showNumber
+                        this.form.name1 = bringData[0].standName
+                    }
+                    this.form.id1 = bringData[0].id
+                    this.listModel2 = false
+                } else if (this.selectedList2.length > 1) {
+                    this.$message.warning("只能选择一条数据进行带入");
+                } else {
+                    this.$message.warning("请选择一条数据进行带入");
+                }
+            },
             /*** **********************************************/
             /** 流程节点负责人的选择 *****************************/
             choiceZRR (type, title, id) {
@@ -595,7 +738,7 @@
                                         if (res.ok) {
                                             var json = Object.assign(this.form, this.roleForm)
                                             json.commentText = this.commentText
-                                            json.standInData = this.standId
+                                            json.standInData = this.sarType
                                             json.itemList = this.itemList
                                             this.$http.post('lawss/activiti/completeTask', {
                                                 json: JSON.stringify(json),
@@ -621,7 +764,16 @@
                     }
                 })
             }
-        }
+        },
+        mounted () {
+            this.getTree()
+            this.sarStandCompareHis()
+            this.sarStandCompareHis2()
+            this.tableHeight = $('.content').height() - 44
+            window.onresize = () => {
+                this.tableHeight = $('.content').height() - 44
+            }
+        },
     }
 </script>
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 0e2f2b4f2..2b4f133eb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -13,7 +13,6 @@
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
-                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -39,6 +38,34 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -158,6 +185,7 @@
         name: "bzjdStep2",
         data() {
             return {
+                sarType: '',
                 zxIndex: '',
                 zxType: '',
                 zxIdList: [],
@@ -181,15 +209,8 @@
                 isSubmit: false,
                 saveLoading: false,
                 form: {
-                    number: '', // 编号
-                    name: '', // 结束日期
-                    zxUserId: '',
-                    zxUserIdName: ''
-                },
-                formRules: {
-                    zxUserId: [
-                        { required: true, message: '请选择执行人', trigger: 'change' },
-                    ]
+                    number: '',
+                    name: '',
                 },
                 json: {},
                 itemList: []
@@ -311,6 +332,9 @@
                         let data = JSON.parse(res.mesg)
                         this.form.number = data.number
                         this.form.name = data.name
+                        this.form.number1 = data.number1
+                        this.form.name1 = data.name1
+                        this.sarType = data.standInData
                         this.json = data
                         var arr = []
                         arr = JSON.parse(data.itemList)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index cbc3b1ac8..ba0238f65 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -13,7 +13,6 @@
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
-                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -39,6 +38,34 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
+                                <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.number1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
+                                <el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
+                                    <el-input
+                                            disabled
+                                            v-model="form.name1"
+                                            clearable
+                                    ></el-input>
+                                </el-form-item>
                             </el-col>
                         </el-row>
                     </div>
@@ -48,7 +75,7 @@
                 <template slot="title">拆分信息</template>
             </ProcessTitle>
             <div class="action-bar">
-                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
+                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
             </div>
             <el-table border
                       ref="selection"
@@ -64,21 +91,76 @@
                 <el-table-column
                         prop="itemsNum"
                         label="条款号"
-                        width="170"
+                        width="70"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
-                        width="170"
+                        width="100"
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
+                        width="150"
                         label="条款内容"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="核心技术要求"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="基于上一版本差异"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="相对于国行标差异点"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="符合项状态"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="合规性分析"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="新车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="在产车型实施日期"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="itermsConditions"
+                        width="150"
+                        label="适用车型"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        label="责任部门"
+                        width="170"
+                        prop="deptName"
+                        align="center">
+                </el-table-column>
                 <el-table-column
                         label="责任人"
                         width="170"
@@ -110,31 +192,6 @@
                 @submit="handleSubmit"
         >
         </ProcessFooter>
-        <el-drawer
-                title="选择责任人"
-                :visible.sync="modalshowflag"
-                :wrapperClosable="false"
-                size="800px">
-            <el-tree
-                    v-if="modalshowflag"
-                    style="height: 100%; overflow: auto;"
-                    node-key="id"
-                    class="filter-tree"
-                    :data="treeData"
-                    :props="defaultProps"
-                    :default-checked-keys="nodeList"
-                    highlight-current
-                    check-strictly
-                    default-expand-all
-                    :expand-on-click-node="false"
-                    show-checkbox
-                    ref="tree">
-            </el-tree>
-            <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-            </div>
-        </el-drawer>
     </div>
 </template>
 
@@ -148,36 +205,21 @@
         name: "bzjdStep3",
         data() {
             return {
+                sarType: '',
                 itemList: [],
                 loading: false,
                 commentText: '',
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
-                roleRow: {},
-                nodeList: [],
-                type: '',
-                defaultProps: {
-                    children: 'children',
-                    label: 'name'
-                },
-                treeData: [], // 人员数据
-                modalshowflag: false, // drawer开关
-                drawerTitle: '', //drawer标题
                 textarea: '', // 意见
-                ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
                 saveLoading: false,
                 form: {
-                    number: '', // 编号
-                    name: '', // 结束日期
-                    zxUserId: '',
-                    zxUserIdName: ''
-                },
-                formRules: {
-                    zxUserId: [
-                        { required: true, message: '请选择执行人', trigger: 'change' },
-                    ]
+                    number: '',
+                    name: '',
+                    number1: '',
+                    name1: ''
                 },
                 json: {}
             }
@@ -189,36 +231,6 @@
         },
         methods: {
             handleSelectionChange () {},
-            saveUserInfo () {
-                var idList = ''
-                var nameList = ''
-                this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
-                    if (nameList.length > 0) {
-                        nameList += ','
-                        idList += ','
-                    }
-                    idList += item.id
-                    nameList += item.name
-                })
-                this.form.zxUserId = idList
-                this.form.zxUserIdName = nameList
-                this.modalshowflag = false
-            },
-            cancleUserInfo () {
-                this.modalshowflag = false
-            },
-            choiceZRR () {
-                this.nodeList = []
-                if (this.form.zxUserId.length > 0) {
-                    this.nodeList = this.form.zxUserId.split(',')
-                }
-                this.modalshowflag = true
-            },
-            getTree () {
-                this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-                    this.treeData = res.data
-                })
-            },
             handleTabs(name) {
                 this.active = name
             },
@@ -261,15 +273,20 @@
                         let data = JSON.parse(res.mesg)
                         this.form.number = data.number
                         this.form.name = data.name
+                        this.form.number1 = data.number1
+                        this.form.name1 = data.name1
+                        this.sarType = data.standInData
                         this.json = data
                         this.itemList = JSON.parse(data.itemList)
+                        this.itemList.forEach( item => {
+                            item.deptName = this.$store.getters.userInfo.orgName
+                        })
                     }).catch(e => {
                     })
                 })
             },
         },
         mounted () {
-            this.getTree()
             this.getData()
         }
     }

From 1f05451a701130d24cb07da3d45f95007677ab45 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, 16 Jul 2021 14:02:04 +0800
Subject: [PATCH 25/25] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=85=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 114 ++++++++++++++++--
 .../pages/creatProcess/xmpg/step1.vue         |  14 ++-
 .../page/listOfCountries.vue                  |   1 -
 src/sysConfig/index.js                        |   2 +-
 4 files changed, 116 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index b356531af..a3b48f73e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -145,6 +145,7 @@
             prop="code"
             fixed="left"
             width="180px"
+            align="center"
             label="标准号">
             <template slot-scope="scope">
               <a v-if="scope.row.standYear" class="table-jump"
@@ -157,26 +158,30 @@
           <el-table-column
             prop="standName"
             label="标准名称"
+            align="center"
             width="260px"
           >
           </el-table-column>
           <el-table-column
             prop="issueTime"
-            sortable
+            align="center"
             label="发布日期">
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
+            align="center"
             label="新车型实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="zccssrq"
+            align="center"
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="textStatus"
+            align="center"
             width="120px"
             label="文本状态">
           </el-table-column>
@@ -266,6 +271,50 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+            <div class="left">
+              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+<!--                <el-form-item label="国家/地区" class="search-item search-item-last">-->
+<!--                  <el-select-->
+<!--                    v-model="sarSarAccessEOSearch.countryArea"-->
+<!--                    placeholder="请选择"-->
+<!--                    filterable-->
+<!--                  >-->
+<!--                    <el-option-->
+<!--                      v-for="item in countryOptions"-->
+<!--                      :value="item.value"-->
+<!--                      :key="item.value"-->
+<!--                      :label="item.label"-->
+<!--                    >-->
+<!--                    </el-option>-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
+                <el-form-item label="清单名称" class="search-item search-item-last">
+                  <el-input
+                    v-model="sarSarAccessEOSearch.detailedListName"
+                    placeholder="请输入清单名称"
+                  ></el-input>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    :loading="searching"
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                    @click="selectionList">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                    @click="clearSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
             <el-table
               v-if="listType === 'country'"
               :data="sarAccessListDatas"
@@ -302,8 +351,9 @@
                 label="清单状态"
                 align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -380,8 +430,9 @@
                 label="清单状态"
                 align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -458,8 +509,9 @@
                 label="清单状态"
                 align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '0'">未发布</span>
+                  <span v-if="scope.row.detailedListState === '1'">已发布</span>
+                  <span v-if="scope.row.detailedListState === '3'">审核中</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -544,6 +596,7 @@
               <el-table-column
                 prop="code"
                 fixed="left"
+                align="center"
                 label="标准号">
                 <template slot-scope="scope">
                   <a v-if="scope.row.standYear" class="table-jump"
@@ -555,25 +608,30 @@
               </el-table-column>
               <el-table-column
                 prop="standName"
+                align="center"
                 label="标准名称"
               >
               </el-table-column>
               <el-table-column
                 prop="issueTime"
+                align="center"
                 label="发布日期">
               </el-table-column>
               <el-table-column
                 prop="xcxssrq"
+                align="center"
                 label="新车型实施日期">
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="zccssrq"
+                align="center"
                 label="在产车实施日期">
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="textStatus"
+                align="center"
                 label="文本状态">
               </el-table-column>
             </el-table>
@@ -670,6 +728,14 @@ export default {
     return {
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
+      searching: false,
+      // 查询相关参数
+      sarSarAccessEOSearch: {
+        countryArea: "",
+        detailedListName: "",
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent
+      },
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -811,10 +877,13 @@ export default {
     },
     // //判断当前选中的是哪个清单
     selectionList(type) {
+      type  = this.listType
+      console.log(type);
       if (type === "project") {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
           pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
           sortKey: 2
         }, {
           _this: this
@@ -827,6 +896,7 @@ export default {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
           pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
           sortKey: 3
         }, {
           _this: this
@@ -835,10 +905,11 @@ export default {
           this.total = res.data.total;
         }, e => {
         });
-      } else {
+      } else if(type === 'country') {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
           pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
           sortKey: 1
         }, {
           _this: this
@@ -849,13 +920,23 @@ export default {
         });
       }
     },
+    clearSearch() {
+      this.sarSarAccessEOSearch = {
+        countryArea: "",
+        detailedListName: ""
+      };
+      this.selectionList();
+    },
     //点击添加事件
     addList() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
         _this: this
       }, res => {
         this.standardData = res.data.list;
-        this.totalNo = res.data.pageCount
+        this.totalNo = res.data.count
       }, e => {
       });
       this.standModel = true;
@@ -960,6 +1041,17 @@ export default {
     fileUpload () {
       this.fileMadel = true
     },
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: 'INLAND_STAND'
+        }
+      })
+      window.open(routeUrl.href, '_blank')
+    },
     // 导入标准数据成功后执行
     importFileSuccess (response, file) {
       if (response.ok) {
@@ -1139,7 +1231,7 @@ export default {
       this.selectionList();
     },
     pageChangeNo(page){
-      this.page = page
+      this.pageNo = page
       this.addList()
     },
     pageSizeChangeNo(pageSize){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 4060b6cbf..9fc9873bc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -633,15 +633,19 @@ export default {
     },
     pageChange(page) {
       this.page = page;
+      this.getStandData()
     },
     pageSizeChange(pageSize) {
       this.pageSize = this.$store.getters.userInfo.configContent;
+      this.getStandData()
     },
     pageChangeNo(page) {
       this.pageNO = page;
+      this.getProductData()
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.getProductData()
     },
     //获取产品线数据
     getProductData() {
@@ -659,11 +663,17 @@ export default {
     },
     //获取标准数据
     getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+      console.log(this.page);
+      console.log(this.pageSize);
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        page: this.page,
+        pageSize: this.pageSize,
+      }, {
         _this: this
       }, res => {
+        console.log(res.data);
         this.sarAccessListDatas = res.data.list;
-        this.total = res.pageCount;
+        this.total = res.data.count;
       }, e => {
       });
     }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 98aed73cb..138c08178 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -285,7 +285,6 @@ export default {
         detailedListName: ""
       };
       this.searchSarAccess();
-
     },
     // 新增相关
     openModal(row, optType) {
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 38c17d419..192b22819 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.252'
+const devIp = '192.168.10.254'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'