diff --git a/src/assets/images/shangqi/img/logo4.png b/src/assets/images/shangqi/img/logo4.png
new file mode 100644
index 000000000..735b23c00
Binary files /dev/null and b/src/assets/images/shangqi/img/logo4.png differ
diff --git a/src/assets/images/shangqi/sideBar/newside-bar-bg1.png b/src/assets/images/shangqi/sideBar/newside-bar-bg1.png
new file mode 100644
index 000000000..a66bc8bdf
Binary files /dev/null and b/src/assets/images/shangqi/sideBar/newside-bar-bg1.png differ
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 2e85d241d..5f429c122 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -434,7 +434,7 @@ export default {
   },
   computed: {
     logo () {
-      return this.isCollapse ? require('assets/images/shangqi/img/logo-isCollapse.png') : require('assets/images/shangqi/img/logo2.png')
+      return this.isCollapse ? require('assets/images/shangqi/img/logo4.png') : require('assets/images/shangqi/img/logo2.png')
     },
     ...mapGetters(['getDynamicTotal', 'isCollapse'])
   },
@@ -458,7 +458,7 @@ export default {
     overflow-y: auto;
     user-select: none;
     box-sizing: border-box;
-    background: url("~assets/images/shangqi/sideBar/side-bar-isCollapse-bg.png") no-repeat;
+    background: url("~assets/images/shangqi/sideBar/newside-bar-bg1.png") no-repeat;
     background-size: 100% 100%;
     &:not(.is-collapse) {
       width: 212px;
diff --git a/src/pages/config/pages/linkManage/index.vue b/src/pages/config/pages/linkManage/index.vue
index 783a6a8dc..6f7caa83e 100644
--- a/src/pages/config/pages/linkManage/index.vue
+++ b/src/pages/config/pages/linkManage/index.vue
@@ -163,33 +163,46 @@
             },
             //表格中操作列删除操作弹窗
             deleteLink (row) {
+              this.$confirm('此操作将删除该链接, 是否继续?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+
                 this.$http.delete('sarUrl/tsUrl/delete', {
-                    id: row.id
+                  id: row.id
                 }, {
-                    _this: this,
-                    loading: 'Loading'
+                  _this: this,
+                  loading: 'Loading'
                 }, res => {
-                    if (res.ok) {
-                        this.$message.success('删除成功')
-                        let arr = []
-                        for (let a = 0; a < this.linkList.length; a++) {
-                            if (this.linkList[a].id === row.id) {
-                                this.linkList.splice(a, 1)
-                            }
-                        }
-                        this.linkList.forEach((item, index) => {
-                            let json = {}
-                            json.id = item.id
-                            json.orderBy = index + 1
-                            arr.push(json)
-                        })
-                        this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
-                            this.getLink()
-                        })
-                    }else {
-                        this.$message.warning(res.message)
+                  if (res.ok) {
+                    this.$message.success('删除成功')
+                    let arr = []
+                    for (let a = 0; a < this.linkList.length; a++) {
+                      if (this.linkList[a].id === row.id) {
+                        this.linkList.splice(a, 1)
+                      }
                     }
+                    this.linkList.forEach((item, index) => {
+                      let json = {}
+                      json.id = item.id
+                      json.orderBy = index + 1
+                      arr.push(json)
+                    })
+                    this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
+                      this.getLink()
+                    })
+                  }else {
+                    this.$message.warning(res.message)
+                  }
                 })
+              }).catch(() => {
+                this.$message({
+                  type: 'info',
+                  message: '已取消删除'
+                });
+              });
+
             },
             //头部删除按钮
             deleteAllLink() {
@@ -202,28 +215,39 @@
                     this.$message.warning('请选择要删除的链接')
                 } else {
                     this.modalRole = true
+                  this.$confirm('此操作将删除链接, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                  }).then(() => {
                     this.$http.delete('sarUrl/tsUrl/deleteBatch', {
-                        ids: this.ids
+                      ids: this.ids
                     }, {}, res => {
-                        if (res.ok) {
-                            this.$message.success('删除成功')
-                            let arr = this.linkList.filter(items => {
-                                if (!this.ids.includes(items.id)) return items;
-                            })
-                            let newArr = []
-                            arr.forEach((item, index) => {
-                                let json = {}
-                                json.id = item.id
-                                json.orderBy = index + 1
-                                newArr.push(json)
-                            })
-                            this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
-                                this.getLink()
-                            })
-                        }else {
-                            this.$message.warning(res.message)
-                        }
+                      if (res.ok) {
+                        this.$message.success('删除成功')
+                        let arr = this.linkList.filter(items => {
+                          if (!this.ids.includes(items.id)) return items;
+                        })
+                        let newArr = []
+                        arr.forEach((item, index) => {
+                          let json = {}
+                          json.id = item.id
+                          json.orderBy = index + 1
+                          newArr.push(json)
+                        })
+                        this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
+                          this.getLink()
+                        })
+                      }else {
+                        this.$message.warning(res.message)
+                      }
                     })
+                  }).catch(() => {
+                    this.$message({
+                      type: 'info',
+                      message: '已取消删除'
+                    });
+                  });
                 }
             },
             //弹窗关闭操作
diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
index e3853293a..d30c6b433 100644
--- a/src/pages/config/pages/postManage/index.vue
+++ b/src/pages/config/pages/postManage/index.vue
@@ -147,7 +147,8 @@
                 },
                 sarStandardsInfoRules: {
                     name: [
-                        { required: true, message: '请输入岗位名称', trigger: 'blur' }
+                        { required: true, message: '请输入岗位名称', trigger: 'blur' },
+                        { min: 0, max: 100, message: '长度应不超过100个字符', trigger: 'blur' }
                     ]
                 },
                 modalRole: false,
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 0e9a838b7..5c51e4129 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -404,27 +404,23 @@
             show-overflow-tooltip
             prop="itemsNum"
             label="条款号"
-            width="150"
           >
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="itemsName"
             label="条款名称"
-            width="150"
             >
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="itemsName"
               label="条款内容"
-              width="150"
           >
           </el-table-column>
           <el-table-column
             prop="termsConditions"
             label="解读内容"
-            width="250"
             show-overflow-tooltip
             :resizable="false"
           >
@@ -433,28 +429,28 @@
             </template>
           </el-table-column>
           <el-table-column
-              show-overflow-tooltip
-              prop="putTime"
-              label="实施日期"
-              width="150"
-          >
+              prop="XCXSSRQ"
+              label="新车型实施日期(文本)"
+              width="180">
+          </el-table-column>
+          <el-table-column
+              prop="ZCCSSRQ"
+              label="在产车实施日期(文本)"
+              width="180">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="putTime"
               label="适用车型"
-              width="150"
           >
           </el-table-column>
           <el-table-column
             prop="responsibleUnitShow"
-            label="责任部门"
-            width="150">
+            label="责任部门">
           </el-table-column>
           <el-table-column
             prop="zrgcs"
-            label="责任工程师"
-            width="150">
+            label="责任工程师">
           </el-table-column>
           <el-table-column
             prop="dutyEngineerShow"
@@ -464,13 +460,11 @@
           <el-table-column
             show-overflow-tooltip
             prop="svppsShow"
-            label="符合性状态"
-            width="150">
+            label="符合性状态">
           </el-table-column>
           <el-table-column
             prop="applyArcticShow"
-            label="合规性分析"
-            width="150">
+            label="合规性分析">
           </el-table-column>
           <el-table-column label="操作" align="center" width="50" fixed="right">
             <template slot-scope="scope">
@@ -1267,6 +1261,9 @@ export default {
   },
   watch: {},
   methods: {
+    FormatDate(date){
+        return moment(date).format('YYYY-MM-DD');
+    },
     // 将文本状态的id与name对应
     setMap(data){
       data.forEach(item => {
@@ -2703,8 +2700,8 @@ export default {
         location.half = half
         location.showAll = false
       })
-      this.$http.get('sarSarAccessInfo/sar-sar-access-info/selectProTimeInfoByStandId', {
-        standId: this.$route.params.id
+      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
+        id: this.$route.params.id
       }, {
         _this: this
       }, res => {
@@ -2721,7 +2718,6 @@ 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/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index 6f7638f37..bb093c810 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -327,11 +327,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index db34d6fd9..4bed4251c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -318,11 +318,11 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
         return true
       } else {
         this.spinShow = false
-        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+        this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
         return false
       }
       // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
index 94122ef61..2166ae91f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
@@ -236,11 +236,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 47f247302..fd03d1776 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -260,11 +260,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
index d9e652faa..307627111 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
@@ -259,11 +259,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
index 699657b95..caf5acd2d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
@@ -259,11 +259,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
index 220de8e65..df88eaaca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
@@ -259,11 +259,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
index 91fa08324..16c896fdb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
@@ -259,11 +259,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx'|| fileSuffix === '.pdf'|| fileSuffix === '.PDF'|| fileSuffix === '.jpg'|| fileSuffix === '.JPG'|| fileSuffix === '.png'|| fileSuffix === '.PNG') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
                     this.spinShow = false
-                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件或图片')
+                    this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
                     return false
                 }
                 // 判断文件上传大小
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 1ac24ea1b..d240a7ac1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -165,7 +165,7 @@
                                         <el-input
                                                 v-model="roleForm.deptUserIdName"
                                                 placeholder="选择标准法规部部长"
-                                                @click.native="choiceZRR('deptUserId', '选择标准法规部部长', roleForm.deptUserId)"
+                                                @click.native="choiceZRRS(roleForm.deptUserId, 0, '')"
                                         />
                                     </div>
                                 </el-form-item>
@@ -313,58 +313,63 @@
                 </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"
-                    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
-                    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>
+        <Role-tree
+                check-box
+                :is-title="drawerTitle"
+                :is-visible.sync="modalshowflag"
+                @checkedRole="saveUserInfo"
+                :nodeList="nodeList"
+        ></Role-tree>
+<!--        <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"-->
+<!--                    :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"-->
+<!--                    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"-->
+<!--                    :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>
 
@@ -392,6 +397,7 @@
                 saveLoading: false,
                 // 基础信息form表单
                 form: {
+                    id: '',
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
@@ -570,7 +576,7 @@
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
-                        infoId: this.form.id,
+                        infoId: this.form.standId,
                         page: 1,
                         pageSize: 9999
                     }, {
@@ -621,46 +627,25 @@
             },
             /*** **********************************************/
             /** 流程节点负责人的选择 *****************************/
-            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
+            saveUserInfo (data) {
+                if (this.type === 0) {
+                    this.roleForm.deptUserId = data[0].id
+                    this.roleForm.deptUserIdName = data[0].name
+                } else if (this.type === 1) {
+                    this.itemList[this.zrIndex].zrUserId = data[0].id
+                    this.itemList[this.zrIndex].zrUserIdName = data[0].name
+                } else {
+                    this.itemList.forEach( item => {
+                        this.zrIdList.forEach( items => {
+                            if (item.id === items) {
+                                item.zrUserId = data[0].id
+                                item.zrUserIdName = data[0].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]
-                }
-            },
-            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 => {
@@ -668,51 +653,30 @@
                 })
             },
             choiceZRRS (row, type, index) {
+                this.type = type
                 if (type === 1) {
-                    this.nodeList2 = []
-                    this.zrIndex= index
+                    this.drawerTitle = '选择责任人'
+                    this.nodeList = []
+                    this.zrIndex = index
                     this.zrType = type
-                    this.nodeList2.push(row)
-                    this.modalshowflag2 = true
-                } else {
+                    this.nodeList.push(row)
+                    this.modalshowflag = true
+                } else if (type === 2) {
                     // 批量
                     if (this.zrIdList.length > 0) {
                         this.zrType = type
-                        this.nodeList2 = []
-                        this.modalshowflag2 = true
+                        this.nodeList = []
+                        this.modalshowflag = true
+                        this.drawerTitle = '批量选择责任人'
                     } else {
                      this.$message.warning('请选择要编辑的数据')
                     }
-                }
-            },
-            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
-                })
-                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.nodeList = []
+                    this.nodeList.push(row)
+                    this.drawerTitle = '选择标准法规部部长'
+                    this.modalshowflag = true
                 }
-                this.modalshowflag2 = false
-            },
-            cancleUserInfo2 () {
-                this.modalshowflag2 = false
             },
             handleTabs(name) {
                 this.active = name
@@ -766,7 +730,6 @@
             }
         },
         mounted () {
-            this.getTree()
             this.sarStandCompareHis()
             this.sarStandCompareHis2()
             this.tableHeight = $('.content').height() - 44
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index bc2aba78e..6d6626e98 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -1,1456 +1,1431 @@
 <!--标准清单发布/更新流程-->
 <template>
-    <div class="bzqdfb-step1">
-        <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">
-                <process-title>
-                    <template slot="title">基础信息</template>
-                </process-title>
-                <el-form
-                        ref="qdfbForm"
-                        :model="listForm"
-                        :rules="formRules"
-                        class="label-input-form prc-content-border"
-                        label-width="150px"
-                >
-                    <el-row :gutter="24">
-                        <el-col :span="24">
-                            <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
-                                <el-radio-group v-model="listType" @change="selectionList">
-                                    <el-radio label="country">国家/地区清单</el-radio>
-                                    <el-radio label="project">项目清单</el-radio>
-                                    <el-radio label="other">其他清单</el-radio>
-                                </el-radio-group>
-                                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
-                                    选择清单
-                                </el-button>
-                            </el-form-item>
-                            <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        disabled
-                                        v-model="listForm.listName"
-                                        placeholder="请输入清单名称"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="listForm.descriptionList"
-                                        placeholder="请输入清单说明"
-                                        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-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>
-                                    <el-radio label="2">否</el-radio>
-                                </el-radio-group>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-                <process-title>
-                    <template slot="title">填写信息</template>
-                </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="deleteList">批量删除</el-button>
-                    </div>
-                </div>
-                <el-table
-                        :data="dataList"
-                        border
-                        ref="selection"
-                        height="49%"
-                        style="width: 100%;"
-                        @selection-change="selectStandChange"
-                        :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-              fontWeight: 'bold', height: '48px'}">
-                    <el-table-column
-                            type="selection"
-                            width="55"
-                            align="center">
-                    </el-table-column>
-                    <el-table-column
-                            prop="code"
-                            fixed="left"
-                            width="180px"
-                            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>
-                            <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
-                                {{ scope.row.standNumber }}</a>
-                        </template>
-                    </el-table-column>
-                    <el-table-column
-                            prop="standName"
-                            label="标准名称"
-                            align="center"
-                            width="260px"
-                    >
-                    </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"
-                            width="120px"
-                            label="文本状态">
-                    </el-table-column>
-                </el-table>
-            </div>
-        </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.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="流程发起人"
-                                                  disabled></el-input>
-                                    </div>
-                                </el-form-item>
-                            </el-card>
-                        </el-timeline-item>
-                        <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>
-                                    <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="choiceZRRS">
-                                        </el-input>
-                                    </div>
-                                </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">
-                                    <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-form>
-                </el-timeline>
-            </div>
-        </div>
-        <!-- 选择清单抽屉-->
-        <el-drawer
-                title="选择清单"
-                :visible.sync="ListModel"
-                size="900px"
-                custom-class="demo-drawer"
-        >
-            <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-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="queryDetailsData">
-                                        查询
-                                    </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"
-                                tooltip-effect="dark"
-                                style="width: 100%"
-                                border
-                                height="100%"
-                                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="selectListChange"
-                                ref="selection"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="countryArea"
-                                    label="国家/地区"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListName"
-                                    label="清单名称"
-                                    align="center"
-                            >
-                                <template slot-scope="scope">
-                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                                        scope.row.detailedListName }}</a>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListState"
-                                    label="清单状态"
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <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
-                                    prop="detailedListVision"
-                                    label="清单版本"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="applicationScope"
-                                    label="适用领域"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updateTime"
-                                    label="更新时间"
-                                    sortable
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <div>
-                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
-                                        }}
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updatePeople"
-                                    label="更新人"
-                                    align="center">
-                            </el-table-column>
-                        </el-table>
-                        <el-table
-                                v-if="listType === 'project'"
-                                :data="sarAccessListDatas"
-                                tooltip-effect="dark"
-                                style="width: 100%"
-                                border
-                                height="100%"
-                                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="selectListChange"
-                                ref="selection"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="projectName"
-                                    label="项目名称"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListName"
-                                    label="清单名称"
-                                    align="center"
-                            >
-                                <template slot-scope="scope">
-                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                                        scope.row.detailedListName }}</a>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListState"
-                                    label="清单状态"
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <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
-                                    prop="detailedListVision"
-                                    label="清单版本"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="applicationScope"
-                                    label="适用领域"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updateTime"
-                                    label="更新时间"
-                                    sortable
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <div>
-                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
-                                        }}
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updatePeople"
-                                    label="更新人"
-                                    align="center">
-                            </el-table-column>
-                        </el-table>
-                        <el-table
-                                v-if="listType === 'other'"
-                                :data="sarAccessListDatas"
-                                tooltip-effect="dark"
-                                style="width: 100%"
-                                border
-                                height="100%"
-                                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="selectListChange"
-                                ref="selection"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedList"
-                                    label="清单类别"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListName"
-                                    label="清单名称"
-                                    align="center"
-                            >
-                                <template slot-scope="scope">
-                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
-                                        scope.row.detailedListName }}</a>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="detailedListState"
-                                    label="清单状态"
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <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
-                                    prop="detailedListVision"
-                                    label="清单版本"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="applicationScope"
-                                    label="适用领域"
-                                    align="center">
-                                <template slot-scope="scope">
-            <span
-                    v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updateTime"
-                                    label="更新时间"
-                                    sortable
-                                    align="center">
-                                <template slot-scope="scope">
-                                    <div>
-                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
-                                        }}
-                                    </div>
-                                </template>
-                            </el-table-column>
-                            <el-table-column
-                                    prop="updatePeople"
-                                    label="更新人"
-                                    align="center">
-                            </el-table-column>
-                        </el-table>
-                    </div>
-                    <pagination
-                            :page="page"
-                            :pageSize="pageSize"
-                            :total="total"
-                            @pageChange="pageChange"
-                            @pageSizeChange="pageSizeChange"
-                    />
-                </div>
-            </div>
-            <div class="demo-drawer-footer">
-                <el-button size="mini" @click="closeDrawer">取消</el-button>
-                <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
-            </div>
-        </el-drawer>
-        <!--    添加标准抽屉-->
-        <el-drawer
-                title="添加标准"
-                :visible.sync="standModel"
-                size="900px"
-                custom-class="demo-drawer"
-        >
-            <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="standardSearch" :inline="true" class="label-input-form"
-                                     style="margin-left:10px">
-                                <el-form-item label="类型" class="search-item search-item-last">
-                                    <el-select
-                                            @change="typeChange"
-                                            v-model="standardSearch.standType"
-                                            placeholder="请选择"
-                                            filterable
-                                    >
-                                        <el-option
-                                                v-for="item in standardTypeOptions"
-                                                :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="standardSearch.standNumber"
-                                            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="addList">
-                                        查询
-                                    </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="clearStandSearch">清空
-                                    </el-button>
-                                </el-form-item>
-                            </el-form>
-                        </div>
-                        <el-table
-                                :data="standardData"
-                                tooltip-effect="dark"
-                                style="width: 100%"
-                                border
-                                ref="table"
-                                height="100%"
-                                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-                                @selection-change="selectThree"
-                        >
-                            <el-table-column
-                                    type="selection"
-                                    width="55"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="code"
-                                    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>
-                                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
-                                        scope.row.standSortShow }}
-                                        {{ scope.row.standNumber }}</a>
-                                </template>
-                            </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>
-                    </div>
-                    <pagination
-                            :page="pageNo"
-                            :pageSize="pageSizeNo"
-                            :total="totalNo"
-                            @pageChange="pageChangeNo"
-                            @pageSizeChange="pageSizeChangeNo"
-                    />
-                </div>
-            </div>
-            <div class="demo-drawer-footer">
-                <el-button size="mini" @click="cancelStand">取消</el-button>
-                <el-button type="primary" size="mini" @click="okStand">添加</el-button>
-            </div>
-        </el-drawer>
-
-        <ProcessFooter
-                show-save
-                show-submit
-                :submitLoading="isSubmit"
-                :saveLoading="saveLoading"
-                @save="handleSave"
-                @submit="handleSubmit"
-        >
-        </ProcessFooter>
-        <!--    选择责任人-->
-        <Role-tree
-                is-title="选择责任部门对接人"
-                :is-visible.sync="modalshowflag2"
-                @checkedRole="checkedRole2"
-                :nodeList="nodeList2"
-        ></Role-tree>
-        <Role-tree
-                check-box
-                :is-title="drawerTitle"
-                :is-visible.sync="modalshowflag"
-                @checkedRole="checkedRole"
-                :nodeList="nodeList"
-        ></Role-tree>
-        <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 class="bzqdfb-step1">
+    <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">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          ref="qdfbForm"
+          :model="listForm"
+          :rules="formRules"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
+                <el-radio-group v-model="listType" @change="selectionList">
+                  <el-radio label="country">国家/地区清单</el-radio>
+                  <el-radio label="project">项目清单</el-radio>
+                  <el-radio label="other">其他清单</el-radio>
+                </el-radio-group>
+                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
+                  选择清单
+                </el-button>
+              </el-form-item>
+              <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
+                <el-input
+                  disabled
+                  v-model="listForm.listName"
+                  placeholder="请输入清单名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.descriptionList"
+                  placeholder="请输入清单说明"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
+                <div>
+                  <p>
+                    {{ listForm.fileName }}
+                    <el-upload
+                      :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>
+                  </p>
+                </div>
+              </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>
+                  <el-radio label="2">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </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="deleteList">批量删除</el-button>
+          </div>
+        </div>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="49%"
+          style="width: 100%;"
+          @selection-change="selectStandChange"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="code"
+            fixed="left"
+            width="180px"
+            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>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            label="标准名称"
+            align="center"
+            width="260px"
+          >
+          </el-table-column>
+          <el-table-column
+            prop="issueTime"
+            align="center"
+            label="发布日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrqgj"
+            align="center"
+            label="新车型实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="zccssrqgj"
+            align="center"
+            label="在产车实施日期">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            show-overflow-tooltip
+            prop="textStatus"
+            align="center"
+            width="120px"
+            label="文本状态">
+          </el-table-column>
+        </el-table>
+      </div>
+    </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.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="流程发起人"
+                              disabled></el-input>
+                  </div>
+                </el-form-item>
+              </el-card>
+            </el-timeline-item>
+            <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>
+                  <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="choiceZRRS">
+                    </el-input>
+                  </div>
+                </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">
+                  <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-form>
+        </el-timeline>
+      </div>
+    </div>
+    <!-- 选择清单抽屉-->
+    <el-drawer
+      title="选择清单"
+      :visible.sync="ListModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <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-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="queryDetailsData">
+                    查询
+                  </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"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="countryArea"
+                label="国家/地区"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                      scope.row.detailedListName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <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
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="applicationScope"
+                label="适用领域"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                sortable
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-if="listType === 'project'"
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="projectName"
+                label="项目名称"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                      scope.row.detailedListName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <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
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="applicationScope"
+                label="适用领域"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                sortable
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-if="listType === 'other'"
+              :data="sarAccessListDatas"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectListChange"
+              ref="selection"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedList"
+                label="清单类别"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="detailedListName"
+                label="清单名称"
+                align="center"
+              >
+                <template slot-scope="scope">
+                  <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                      scope.row.detailedListName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="detailedListState"
+                label="清单状态"
+                align="center">
+                <template slot-scope="scope">
+                  <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
+                prop="detailedListVision"
+                label="清单版本"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="applicationScope"
+                label="适用领域"
+                align="center">
+                <template slot-scope="scope">
+            <span
+              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updateTime"
+                label="更新时间"
+                sortable
+                align="center">
+                <template slot-scope="scope">
+                  <div>
+                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                    }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="updatePeople"
+                label="更新人"
+                align="center">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="page"
+            :pageSize="pageSize"
+            :total="total"
+            @pageChange="pageChange"
+            @pageSizeChange="pageSizeChange"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="closeDrawer">取消</el-button>
+        <el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
+      </div>
+    </el-drawer>
+    <!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <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="standardSearch" :inline="true" class="label-input-form"
+                       style="margin-left:10px">
+                <el-form-item label="类型" class="search-item search-item-last">
+                  <el-select
+                    @change="typeChange"
+                    v-model="standardSearch.standType"
+                    placeholder="请选择"
+                    filterable
+                  >
+                    <el-option
+                      v-for="item in standardTypeOptions"
+                      :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="standardSearch.standNumber"
+                    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="addList">
+                    查询
+                  </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="clearStandSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="standardData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              height="100%"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                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>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                      scope.row.standSortShow }}
+                    {{ scope.row.standNumber }}</a>
+                </template>
+              </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="xcxssrqgj"
+                align="center"
+                label="新车型实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="zccssrqgj"
+                align="center"
+                label="在产车实施日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="textStatus"
+                align="center"
+                label="文本状态">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
+    </el-drawer>
+
+    <ProcessFooter
+      show-save
+      show-submit
+      :submitLoading="isSubmit"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <!--    选择责任人-->
+    <Role-tree
+      is-title="选择责任部门对接人"
+      :is-visible.sync="modalshowflag2"
+      @checkedRole="checkedRole2"
+      :nodeList="nodeList2"
+    ></Role-tree>
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="modalshowflag"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
+    <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>
 
 <script>
-    import ProcessHeader from "../../components/ProcessHeader";
-    import ProcessFooter from "../../components/ProcessFooter";
-    import ProcessTitle from "../../components/ProcessTitle";
-    import { saveTaskFirst, queryTaskFirst } from "api/process";
-    import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { saveTaskFirst, queryTaskFirst } from "api/process";
+import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
 
-    export default {
-        name: "bzqdfbStep1-1",
-        components: {
-            ProcessHeader,
-            ProcessFooter,
-            ProcessTitle
+export default {
+  name: "bzqdfbStep1-1",
+  components: {
+    ProcessHeader,
+    ProcessFooter,
+    ProcessTitle
+  },
+  data() {
+    return {
+      fileUrl: "api/att/attFile/upload",
+      fileMadel: false,
+      searching: false,
+      // 查询选择清单相关参数
+      sarSarAccessEOSearch: {
+        countryArea: "",
+        detailedListName: ""
+      },
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
+      standList: [], //新添加的标准
+      modalshowflag: false, // drawer开关
+      modalshowflag2: false,
+      nodeList2: [],
+      drawerTitle: "", //drawer标题
+      nodeList: [],
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+      roleForm: {
+        startUserName: this.$store.getters.userInfo.userName,
+        startUser: this.$store.getters.userInfo.userId,
+        dockUser: "",
+        ministerUser: "",
+        directorUser: "",
+        dockUserName: "",
+        ministerUserName: "",
+        directorUserName: "",
+      },
+      formRules: {
+        listType: [
+          { required: true, message: "请选择清单类型", trigger: "change" }
+        ],
+        listName: [
+          { required: true, message: "请填写清单名称", trigger: "change" }
+        ]
+      },
+      roleFormRules: {
+        dockUserName: [
+          { required: true, message: "请选择会签责任人", trigger: "change" }
+        ],
+        ministerUserName: [
+          { required: true, message: "请选择修订责任人", trigger: "change" }
+        ],
+        directorUserName: [
+          { required: true, message: "请选择审批责任人", trigger: "change" }
+        ]
+      },
+      dataList: [],//清单里的标准数据
+      sarAccessListDatas: [], //国家地区清单表格
+      uploadFileListPath: "api/att/attFile/upload", // 上传的地址
+      fileInfoList: [], // 上传的附件
+      fileIds: [], // 上传的附件
+      fileListName: [], //上传的附件名称
+      standardData: [], //添加标准数据
+      standardData1: [], //添加标准数据
+      ListModel: false, //选择清单抽屉状态
+      standModel: false, // 选择标准抽屉状态
+      active: "1",
+      signFlag: "1",   //是否会签 1为会签 2为不会签
+      listType: "country",  //选择的清单类型
+      isSubmit: false,
+      saveLoading: false,
+      tabValue: "listOfCountries",
+      selectedList: [],  //选择清单的选择框
+      selectList: [], //选择标准的选择框
+      bringData: [],
+      page: 1,
+      total: 0,
+      pageSize: this.$store.getters.userInfo.configContent,
+      pageNo: 1,
+      totalNo: 0,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      listForm: {
+        listType: "", //区分是哪个清单
+        listName: "", //清单名称
+        // applyRegion: "", //适用区域
+        descriptionList: "", //清单说明
+        fileId: "",
+        model: "", // 上传模板
+        modelName: "",
+        standId: "", //选择的清单的id
+        signFlag: "1",  //是否会签  1为会签 2为不会签
+        inforlist: "", //用来存放标准列表的标准id
+        dataList: [{
+          code: "", //标准号
+          standName: "", //标准名称
+          issueTime: "", //发布日期
+          xcxssrqgj: "", //新车型实施日期
+          zccssrqgj: "", //在产车实施日期
+          textStatus: "", //文本状态
+          id: ""
+        }]
+      },
+      choiceForm: {}, //选择标准清单列表
+      // countryOptions: [], //适用区域下拉框数据
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
         },
-        data() {
-            return {
-                fileUrl: "api/att/attFile/upload",
-                fileMadel: false,
-                searching: false,
-                // 查询选择清单相关参数
-                sarSarAccessEOSearch: {
-                    countryArea: "",
-                    detailedListName: "",
-                },
-                //查询添加标准相关数据
-                standardSearch: {
-                    standType: "",
-                    standNumber: "",
-                    pageNo: 1,
-                    pageSizeNo: this.$store.getters.userInfo.configContent
-                },
-                standList: [], //新添加的标准
-                modalshowflag: false, // drawer开关
-                modalshowflag2: false,
-                nodeList2: [],
-                drawerTitle: "", //drawer标题
-                nodeList: [],
-                defaultProps: {
-                    children: "children",
-                    label: "name"
-                },
-                roleForm: {
-                    startUserName: this.$store.getters.userInfo.userName,
-                    startUser: this.$store.getters.userInfo.id,
-                    dockUser: "",
-                    responUserList: "",
-                    ministerUser: "",
-                    directorUser: "",
-                    presidentUser: "",
-                    dockUserName: "",
-                    responUserListName: "",
-                    ministerUserName: "",
-                    directorUserName: "",
-                    presidentUserName: ""
-                },
-                formRules: {
-                    listType: [
-                        { required: true, message: "请选择清单类型", trigger: "change" }
-                    ],
-                    listName: [
-                        { required: true, message: "请填写清单名称", trigger: "change" }
-                    ]
-                },
-                roleFormRules: {
-                    dockUserName: [
-                        { required: true, message: "请选择会签责任人", trigger: "change" }
-                    ],
-                    ministerUserName: [
-                        { required: true, message: "请选择修订责任人", trigger: "change" }
-                    ],
-                    directorUserName: [
-                        { required: true, message: "请选择审批责任人", trigger: "change" }
-                    ]
-                },
-                dataList: [],//清单里的标准数据
-                sarAccessListDatas: [], //国家地区清单表格
-                uploadFileListPath: "api/att/attFile/upload", // 上传的地址
-                fileInfoList: [], // 上传的附件
-                fileIds: [], // 上传的附件
-                fileListName: [], //上传的附件名称
-                standardData: [], //添加标准数据
-                standardData1: [], //添加标准数据
-                ListModel: false, //选择清单抽屉状态
-                standModel: false, // 选择标准抽屉状态
-                active: "1",
-                signFlag: "1",   //是否会签 1为会签 2为不会签
-                listType: "country",  //选择的清单类型
-                isSubmit: false,
-                saveLoading: false,
-                tabValue: "listOfCountries",
-                selectedList: [],  //选择清单的选择框
-                selectList: [], //选择标准的选择框
-                bringData: [],
-                page: 1,
-                total: 0,
-                pageSize: this.$store.getters.userInfo.configContent,
-                pageNo: 1,
-                totalNo: 0,
-                pageSizeNo: this.$store.getters.userInfo.configContent,
-                listForm: {
-                    listType: "", //区分是哪个清单
-                    listName: "", //清单名称
-                    // applyRegion: "", //适用区域
-                    descriptionList: "", //清单说明
-                    fileId: "",
-                    model: "", // 上传模板
-                    modelName: "",
-                    standId: "", //选择的清单的id
-                    signFlag: "1",  //是否会签  1为会签 2为不会签
-                    inforlist: "", //用来存放标准列表的标准id
-                    dataList: [{
-                        code: "", //标准号
-                        standName: "", //标准名称
-                        issueTime: "", //发布日期
-                        xcxssrq: "", //新车型实施日期
-                        zccssrq: "", //在产车实施日期
-                        textStatus: "", //文本状态
-                        id: ""
-                    }]
-                },
-                choiceForm: {}, //选择标准清单列表
-                // countryOptions: [], //适用区域下拉框数据
-                standardTypeOptions: [
-                    {
-                        value: "INLAND",
-                        label: "国内标准法规",
-                        item: "INLAND"
-                    },
-                    {
-                        value: "FOREIGN",
-                        label: "海外标准法规",
-                        item: "FOREIGN"
-                    }
-                ],
-                user1: "",
-                user2: "",
-                user3: "",
-                user4: "",
-                user5: "",
-                standMap: new Map()
-            };
-        },
-        methods: {
-            getData () {
-                queryTaskFirst({
-                    bpnId: this.$route.query.bpnId
-                }).then(res => {
-                    console.log(res.mes);
-                    let mes = JSON.parse(res.mes)
-                    this.listForm =mes.form
-                    this.dataList = mes.form.dataList
-                    this.roleForm = mes.roleForm
-                    this.commentText = mes.commentText
-                })
-            },
-            checkedRole(data) {
-                if (this.type === "dockUser") {
-                    this.roleForm.dockUser = this.roleRow.id;
-                    this.roleForm.dockUserName = this.roleRow.name;
-                } else if (this.type === "ministerUser") {
-                    this.roleForm.ministerUser = data[0].id;
-                    this.roleForm.ministerUserName = data[0].name;
-                } else if (this.type === "directorUser") {
-                    this.roleForm.directorUser = data[0].id;
-                    this.roleForm.directorUserName = data[0].name;
-                } else if (this.type === "presidentUser") {
-                    this.roleForm.presidentUser = data[0].id;
-                    this.roleForm.presidentUserName = data[0].name;
-                }
-                this.modalshowflag = false;
-            },
-            checkedRole2(data) {
-                var idList = "";
-                var nameList = "";
-                data.forEach(item => {
-                    if (nameList.length > 0) {
-                        nameList += ",";
-                        idList += ",";
-                    }
-                    idList += item.id;
-                    nameList += item.name;
-                });
-                this.roleForm.dockUser = idList;
-                this.roleForm.dockUserName = nameList;
-            },
-            cancleUserInfo() {
-                this.modalshowflag = false;
-            },
-            //tab发生变化
-            handleTabs(name) {
-                this.active = name;
-            },
-            choiceShow() {
-                this.ListModel = true;
-            },
-            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];
-                }
-            },
-            //判断当前是否会签
-            selectSign(type) {
-                if (type === "1") {
-                    this.listForm.signFlag = 1;
-                } else if (type == "2") {
-                    this.listForm.signFlag = 2;
-                }
-            },
-            queryDetailsData(){
-                this.page = 1
-                this.selectionList()
-            },
-            // //判断当前选中的是哪个清单
-            selectionList(type) {
-                type = this.listType;
-                if (type === "project") {
-                    this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
-                        page: this.page,
-                        pageSize: this.pageSize,
-                        ...this.sarSarAccessEOSearch,
-                        sortKey: 2
-                    }, {
-                        _this: this
-                    }, res => {
-                        this.sarAccessListDatas = res.data.records;
-                        this.total = res.data.total;
-                    }, e => {
-                    });
-                } else if (type === "other") {
-                    this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
-                        page: this.page,
-                        pageSize: this.pageSize,
-                        ...this.sarSarAccessEOSearch,
-                        sortKey: 3
-                    }, {
-                        _this: this
-                    }, res => {
-                        this.sarAccessListDatas = res.data.records;
-                        this.total = res.data.total;
-                    }, e => {
-                    });
-                } 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
-                    }, res => {
-                        this.sarAccessListDatas = res.data.records;
-                        this.total = res.data.total;
-                    }, e => {
-                    });
-                }
-            },
-            clearSearch() {
-                this.sarSarAccessEOSearch = {
-                    countryArea: "",
-                    detailedListName: ""
-                };
-                this.selectionList();
-            },
-            clearStandSearch(){
-                this.standardSearch = {
-                    standType: "",
-                    standNumber: ""
-                };
-                this.addList();
-            },
-            //点击添加事件
-            addList() {
-                this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
-                    standType: this.standardSearch.standType,
-                    standNumber: this.standardSearch.standNumber,
-                    page: this.pageNo,
-                    pageSize: this.pageSizeNo
-                }, {
-                    _this: this
-                }, res => {
-                    this.standardData = res.data.list;
-                    this.totalNo = res.data.count;
-                }, e => {
-                });
-                this.standModel = true;
-            },
-            // 点击批量删除事件
-            deleteList() {
-                if (this.selectList.length < 1) {
-                    this.$message.warning("请选择一条数据进行删除");
-                } else {
-                    this.$confirm("您确认删除这些数据?", "提示", {
-                        confirmButtonText: "确认",
-                        confirmButtonClass: "common-button-primary",
-                        cancelButtonText: "取消",
-                        type: "warning"
-                    }).then(() => {
-                        let exits = [];
-                        this.selectList.map(item => {
-                            let index;
-                            index = this.dataList.findIndex(items => {
-                                return items.id = item;
-                            });
-                            if (index > -1) {
-                                this.dataList.splice(index, 1);
-                            }
-                            exits.push(item);
-                        });
-                        this.selectList = [];
-                    }).catch(() => {
-                    });
-                }
-            },
-            //保存事件
-            handleSave() {
-                this.saveLoading = true
-                let _formData = new FormData()
-                _formData.append('id', this.bpnId || '')
-                _formData.append('createUser', this.$store.getters.userInfo.userId)
-                _formData.append('createUserName', this.$store.getters.userInfo.userName)
-                _formData.append('prcType', '4')
-                _formData.append('json', JSON.stringify({
-                    form: this.form,
-                    roleForm: this.roleForm,
-                    commentText: this.commentText
-                }))
-                saveTaskFirst(_formData).then(res => {
-                    this.saveLoading = false
-                    this.$message.success('保存成功')
-                    this.bpnId = res.result
-                }).catch(e => {
-                    this.saveLoading = false
-                })
-            },
-            //提交事件
-            handleSubmit() {
-                if(this.dataList.length < 1){
-                    this.$message.warning('标准不能为空')
-                }else{
-                    let json = this.listForm;
-                    this.listForm.fileId = this.fileIds.join(",");
-                    this.listForm.fileName = this.fileListName.join(",");
-                    this.listForm.model = this.listForm.fileId;
-                    this.listForm.modelName = this.listForm.fileName;
-                    json.zrUserId = this.roleForm.dockUser; //会签人
-                    json.jlUserId = this.roleForm.directorUser;   //业务经理
-                    json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
-                    json.approvalOpinion = "";
-                    json.prcCreateUser = this.$store.getters.userInfo.userId;
-                    json.prcCreateUserName = this.$store.getters.userInfo.uName;
-                    json.standName = this.listForm.listName;
-                    json.standId = this.listForm.standId;
-                    this.$refs["qdfbForm"].validate((valid) => {
-                        if (valid) {
-                            this.$refs["Form"].validate((valid) => {
-                                if (valid) {
-                                    this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
-                                        _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("请完善基础信息");
-                        }
-                    });
-                }
-            },
-            // 删除上传的文件
-            delFileInfo(file, fileList) {
-                let middle = [];
-                let files = [];
-                fileList.forEach(item => {
-                    middle.push(item.name);
-                    files.push(item.response.data.id);
-                });
-                this.fileListName = middle;
-                this.fileIds = files;
-            },
-            fileUpload() {
-                this.fileMadel = true;
-            },
-            // 上传文件成功回调
-            uploadBackSuccess(res, file, fileList) {
-                if (res.ok) {
-                    let middle = [];
-                    fileList.forEach(item => {
-                        middle.push(item.name);
-                    });
-                    this.fileListName = middle;
-                    this.fileIds.push(file.response.data.id);
-                    // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
-                    // this.$message.success('上传成功')
-                } else {
-                    this.$message.error(res.message);
-                    fileList.pop();
-                }
-            },
-            // 相关附件 上传之前钩子
-            beforeUpload(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 !== undefined && fileSuffix !== null) {
-                    fileSuffix = fileSuffix.toUpperCase();
-                }
-                // 判断上传文件格式
-                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.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
-                    return false;
-                }
-                // 判断文件上传大小
-                if (file.size / 1024 / 1024 > 300) {
-                    this.$message.warning("文件" + file.name + "大小不能超过300M");
-                    return false;
-                }
-                return 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) {
-                    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;
-            },
-            typeChange(type) {
-                this.standardSearch.standType = type;
-            },
-            //添加标准取消事件
-            cancelStand() {
-                this.standModel = false;
-            },
-            //添加标准确定事件
-            okStand() {
-                let _this = this;
-                if (this.standList.length < 1) {
-                    _this.$message.warning("请选择需要添加进清单的数据");
-                } else {
-                    _this.standList.map(item => {
-                        let newStand = false;
-                        for (let itemKey of _this.dataList) {
-                            if (item.id == itemKey.id) {
-                                newStand = true;
-                                break;
-                            }
-                        }
-                        if (newStand) {
-                            _this.$message.warning("请勿重复添加数据");
-                        } else {
-                            _this.dataList.push(item);
-                        }
-                    });
-                    this.standardData = [];
-                    _this.standModel = false;
-                }
-            },
-            //选择清单确定事件
-            OkDrawer() {
-                if (this.selectedList.length === 1) {
-                    let deposit = new Map();
-                    this.sarAccessListDatas.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]));
-                    }
-                    this.listForm.standId = bringData[0].id;
-                    this.listForm.listName = bringData[0].detailedListName;
-                    this.listForm.applyRegion = bringData[0].applicationScope;
-                    this.listForm.descriptionList = bringData[0].remark;
-                    this.listForm.fileId = bringData[0].fileId;
-                    this.ListModel = false;
-                    this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
-                        _this: this
-                    }, res => {
-                        if (res.data == null) {
-                            res.data = [];
-                        }
-                        this.dataList = res.data;
-                        this.listForm.dataList = res.data;
-                        let formId = [];
-                        this.dataList.map(item => {
-                            formId.push(item.id);
-                        });
-                        this.listForm.inforlist = formId.join(",");
-                    }, e => {
-                    });
-                } else if (this.selectedList.length > 1) {
-                    this.$message.warning("只能选择一条数据进行带入");
-                } else {
-                    this.$message.warning("请选择一条数据进行带入");
-                }
-            },
-            //选择清单选择框改变
-            selectListChange(data) {
-                this.selectedList = [];
-                for (let i = 0; i < data.length; i++) {
-                    this.selectedList.push(data[i].id);
-                }
-            },
-            //标准表格选择框改变
-            selectStandChange(data) {
-                this.selectList = [];
-                for (let i = 0; i < data.length; i++) {
-                    this.selectList.push(data[i].id);
-                }
-            },
-            //添加标准select的改变
-            selectThree(data) {
-                this.standList = data;
-            },
-            choiceZRR(type, title, id) {
-                this.nodeList = [];
-                this.nodeList.push(id);
-                this.type = type;
-                this.drawerTitle = title;
-                this.modalshowflag = true;
-            },
-            choiceZRRS() {
-                this.nodeList2 = [];
-                if (this.roleForm.dockUser.length > 0) {
-                    this.nodeList2 = this.roleForm.dockUser.split(",");
-                }
-                this.modalshowflag2 = true;
-            },
-            getTree() {
-                this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
-                    this.treeData = res.data;
-                });
-            },
-            pageChange(page) {
-                console.log(page);
-                this.page = page;
-                this.selectionList();
-            },
-            pageSizeChange(pageSize) {
-                this.pageSize = this.$store.getters.userInfo.configContent;
-                this.selectionList();
-            },
-            pageChangeNo(page) {
-                this.pageNo = page;
-                this.addList();
-            },
-            pageSizeChangeNo(pageSize) {
-                this.pageSizeNo = this.$store.getters.userInfo.configContent;
-                this.addList();
-
-            }
-        },
-        computed: {},
-        mounted() {
-            this.getData()
-            //从数据库中查询下拉框数据
-            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]);
-            }
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
         }
-
+      ],
+      user1: "",
+      user2: "",
+      user3: "",
+      user4: "",
+      user5: "",
+      standMap: new Map()
     };
+  },
+  methods: {
+    getData() {
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        console.log(res.mes);
+        let mes = JSON.parse(res.mes);
+        this.listForm = mes.form;
+        this.dataList = mes.form.dataList;
+        this.roleForm = mes.roleForm;
+        this.commentText = mes.commentText;
+      });
+    },
+    checkedRole(data) {
+      if (this.type === "dockUser") {
+        this.roleForm.dockUser = this.roleRow.id;
+        this.roleForm.dockUserName = this.roleRow.name;
+      } else if (this.type === "ministerUser") {
+        this.roleForm.ministerUser = data[0].id;
+        this.roleForm.ministerUserName = data[0].name;
+      } else if (this.type === "directorUser") {
+        this.roleForm.directorUser = data[0].id;
+        this.roleForm.directorUserName = data[0].name;
+      }
+      this.modalshowflag = false;
+    },
+    checkedRole2(data) {
+      var idList = "";
+      var nameList = "";
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ",";
+          idList += ",";
+        }
+        idList += item.id;
+        nameList += item.name;
+      });
+      this.roleForm.dockUser = idList;
+      this.roleForm.dockUserName = nameList;
+    },
+    cancleUserInfo() {
+      this.modalshowflag = false;
+    },
+    //tab发生变化
+    handleTabs(name) {
+      this.active = name;
+    },
+    choiceShow() {
+      this.ListModel = true;
+    },
+    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];
+      }
+    },
+    //判断当前是否会签
+    selectSign(type) {
+      if (type === "1") {
+        this.listForm.signFlag = 1;
+      } else if (type == "2") {
+        this.listForm.signFlag = 2;
+      }
+    },
+    queryDetailsData() {
+      this.page = 1;
+      this.selectionList();
+    },
+    // //判断当前选中的是哪个清单
+    selectionList(type) {
+      type = this.listType;
+      if (type === "project") {
+        this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+          page: this.page,
+          pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
+          sortKey: 2
+        }, {
+          _this: this
+        }, res => {
+          this.sarAccessListDatas = res.data.records;
+          this.total = res.data.total;
+        }, e => {
+        });
+      } else if (type === "other") {
+        this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+          page: this.page,
+          pageSize: this.pageSize,
+          ...this.sarSarAccessEOSearch,
+          sortKey: 3
+        }, {
+          _this: this
+        }, res => {
+          this.sarAccessListDatas = res.data.records;
+          this.total = res.data.total;
+        }, e => {
+        });
+      } 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
+        }, res => {
+          this.sarAccessListDatas = res.data.records;
+          this.total = res.data.total;
+        }, e => {
+        });
+      }
+    },
+    clearSearch() {
+      this.sarSarAccessEOSearch = {
+        countryArea: "",
+        detailedListName: ""
+      };
+      this.selectionList();
+    },
+    clearStandSearch() {
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.addList();
+    },
+    //点击添加事件
+    addList() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+        })
+        this.totalNo = res.data.count;
+      }, e => {
+      });
+      this.standModel = true;
+    },
+    // 点击批量删除事件
+    deleteList() {
+      if (this.selectList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据?", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          let exits = [];
+          this.selectList.map(item => {
+            let index;
+            index = this.dataList.findIndex(items => {
+              return items.id = item;
+            });
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+            exits.push(item);
+          });
+          this.selectList = [];
+        }).catch(() => {
+        });
+      }
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("createUser", this.$store.getters.userInfo.userId);
+      _formData.append("createUserName", this.$store.getters.userInfo.userName);
+      _formData.append("prcType", "4");
+      _formData.append("json", JSON.stringify({
+        form: this.form,
+        roleForm: this.roleForm,
+        commentText: this.commentText
+      }));
+      saveTaskFirst(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      if (this.dataList.length < 1) {
+        this.$message.warning("标准不能为空");
+      } else {
+        var json = Object.assign(this.listForm, this.roleForm)
+        console.log(json);
+        // this.$refs["qdfbForm"].validate((valid) => {
+        //   if (valid) {
+        //     this.$refs["Form"].validate((valid) => {
+        //       if (valid) {
+        //         this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+        //           _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("请完善基础信息");
+        //   }
+        // });
+      }
+    },
+    // 删除上传的文件
+    delFileInfo(file, fileList) {
+      let middle = [];
+      let files = [];
+      fileList.forEach(item => {
+        middle.push(item.name);
+        files.push(item.response.data.id);
+      });
+      this.fileListName = middle;
+      this.fileIds = files;
+    },
+    fileUpload() {
+      this.fileMadel = true;
+    },
+    // 上传文件成功回调
+    uploadBackSuccess(res, file, fileList) {
+      if (res.ok) {
+        let middle = [];
+        // let fids = [];
+        fileList.forEach(item => {
+          middle.push(item.name);
+          // fids.push(item.response.data.attId)
+        });
+        this.fileListName = middle;
+        this.fileIds.push(file.response.data.id);
+        // this.listForm.fileId = this.listForm.fileId + ',' + fids.join(',')
+        // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
+        // this.$message.success('上传成功')
+      } else {
+        this.$message.error(res.message);
+        fileList.pop();
+      }
+    },
+    // 相关附件 上传之前钩子
+    beforeUpload(file) {
+      var filename = file.name;
+      this.listForm.fileName = this.listForm.fileName + ',' + file.name
+      var index1 = filename.lastIndexOf(".");
+      var index2 = filename.length;
+      var fileSuffix = filename.substring(index1, index2);
+      //把后缀转大写
+      if (fileSuffix !== undefined && fileSuffix !== null) {
+        fileSuffix = fileSuffix.toUpperCase();
+      }
+      // 判断上传文件格式
+      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.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
+        return false;
+      }
+      // 判断文件上传大小
+      if (file.size / 1024 / 1024 > 300) {
+        this.$message.warning("文件" + file.name + "大小不能超过300M");
+        return false;
+      }
+      return 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) {
+        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);
+      // 判断上传文件格式
+      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;
+    },
+    //选择清单取消事件
+    closeDrawer() {
+      this.ListModel = false;
+    },
+    typeChange(type) {
+      this.standardSearch.standType = type;
+    },
+    //添加标准取消事件
+    cancelStand() {
+      this.standModel = false;
+    },
+    //添加标准确定事件
+    okStand() {
+      let _this = this;
+      if (this.standList.length < 1) {
+        _this.$message.warning("请选择需要添加进清单的数据");
+      } else {
+        let exits = []
+        _this.standList.map(item => {
+          let newStand = false;
+          for (let itemKey of _this.dataList) {
+            if (item.id == itemKey.id) {
+              newStand = true;
+              break;
+            }
+          }
+          if (newStand) {
+            _this.$message.warning("请勿重复添加数据");
+          } else {
+            _this.dataList.push(item);
+            exits.push(item.id)
+          }
+        });
+        this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+        this.standardData = [];
+        _this.standModel = false;
+      }
+    },
+    //选择清单确定事件
+    OkDrawer() {
+      if (this.selectedList.length === 1) {
+        let deposit = new Map();
+        this.sarAccessListDatas.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]));
+        }
+        this.listForm.standId = bringData[0].id;
+        this.listForm.listName = bringData[0].detailedListName;
+        this.listForm.applyRegion = bringData[0].applicationScope;
+        this.listForm.descriptionList = bringData[0].remark;
+        this.listForm.fileId = bringData[0].fileId;
+        this.ListModel = false;
+        this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
+          _this: this
+        }, res => {
+          if (res.data == null) {
+            res.data = [];
+          }
+          this.dataList = res.data;
+          this.listForm.dataList = res.data;
+          let formId = [];
+          this.dataList.map(item => {
+            formId.push(item.id);
+          });
+          this.listForm.inforlist = formId.join(",");
+        }, e => {
+        });
+      } else if (this.selectedList.length > 1) {
+        this.$message.warning("只能选择一条数据进行带入");
+      } else {
+        this.$message.warning("请选择一条数据进行带入");
+      }
+    },
+    //选择清单选择框改变
+    selectListChange(data) {
+      this.selectedList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectedList.push(data[i].id);
+      }
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = [];
+      for (let i = 0; i < data.length; i++) {
+        this.selectList.push(data[i].id);
+      }
+    },
+    //添加标准select的改变
+    selectThree(data) {
+      this.standList = data;
+    },
+    choiceZRR(type, title, id) {
+      this.nodeList = [];
+      this.nodeList.push(id);
+      this.type = type;
+      this.drawerTitle = title;
+      this.modalshowflag = true;
+    },
+    choiceZRRS() {
+      this.nodeList2 = [];
+      if (this.roleForm.dockUser.length > 0) {
+        this.nodeList2 = this.roleForm.dockUser.split(",");
+      }
+      this.modalshowflag2 = true;
+    },
+    getTree() {
+      this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
+        this.treeData = res.data;
+      });
+    },
+    pageChange(page) {
+      console.log(page);
+      this.page = page;
+      this.selectionList();
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = this.$store.getters.userInfo.configContent;
+      this.selectionList();
+    },
+    pageChangeNo(page) {
+      this.pageNo = page;
+      this.addList();
+    },
+    pageSizeChangeNo(pageSize) {
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.addList();
+
+    }
+  },
+  computed: {},
+  mounted() {
+    this.getData();
+    //从数据库中查询下拉框数据
+    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]);
+    }
+  }
+
+};
 </script>
 
 <style lang="less" scoped>
-    @import '~@/assets/styles/style';
+@import '~@/assets/styles/style';
 
-    .bzqdfb-step1 {
-        /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%;
-                }
-            }
-        }
-
-        .add-form-el-select {
-            /deep/ .el-select {
-                width: 210px;
-            }
-        }
-
-        .demo-drawer-content {
-            margin-top: 10px;
-        }
+.bzqdfb-step1 {
+  /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%;
+      }
+    }
+  }
+
+  .add-form-el-select {
+    /deep/ .el-select {
+      width: 210px;
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index c274edff0..302272626 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -49,26 +49,25 @@
                 ></el-input>
               </el-form-item>
               <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
-                <div class="file-box" v-if="listForm.fileName">
-                  <p>{{listForm.fileName}}
+                <div>
+                  <p>
+                    {{ listForm.fileName }}
+                    <el-upload
+                      :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>
                   </p>
                 </div>
-                <div v-else>
-                  <el-upload
-                    :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>
-                </div>
               </el-form-item>
               <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
                 <el-radio-group v-model="signFlag" @change="selectSign">
@@ -741,17 +740,13 @@ export default {
       },
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
-        startUser: this.$store.getters.userInfo.id,
+        startUser: this.$store.getters.userInfo.userId,
         dockUser: "",
-        responUserList: "",
         ministerUser: "",
         directorUser: "",
-        presidentUser: "",
         dockUserName: "",
-        responUserListName: "",
         ministerUserName: "",
         directorUserName: "",
-        presidentUserName: ""
       },
       formRules: {
         listType: [
@@ -806,7 +801,7 @@ export default {
         modelName: "",
         standId: "", //选择的清单的id
         signFlag: "1",  //是否会签  1为会签 2为不会签
-        inforlist: "", //用来存放标准列表的标准id
+        inforlist: " ", //用来存放标准列表的标准id
         dataList: [{
           code: "", //标准号
           standName: "", //标准名称
@@ -850,9 +845,6 @@ export default {
       } else if (this.type === "directorUser") {
         this.roleForm.directorUser = data[0].id;
         this.roleForm.directorUserName = data[0].name;
-      } else if (this.type === "presidentUser") {
-        this.roleForm.presidentUser = data[0].id;
-        this.roleForm.presidentUserName = data[0].name;
       }
       this.modalshowflag = false;
     },
@@ -1032,19 +1024,8 @@ export default {
       if (this.dataList.length < 1) {
         this.$message.warning("标准不能为空");
       } else {
-        let json = this.listForm;
-        this.listForm.fileId = this.fileIds.join(",");
-        this.listForm.fileName = this.fileListName.join(",");
-        this.listForm.model = this.listForm.fileId;
-        this.listForm.modelName = this.listForm.fileName;
-        json.zrUserId = this.roleForm.dockUser; //会签人
-        json.jlUserId = this.roleForm.directorUser;   //业务经理
-        json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
-        json.approvalOpinion = "";
-        json.prcCreateUser = this.$store.getters.userInfo.userId;
-        json.prcCreateUserName = this.$store.getters.userInfo.uName;
-        json.standName = this.listForm.listName;
-        json.standId = this.listForm.standId;
+        var json = Object.assign(this.listForm, this.roleForm)
+        console.log(json);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
@@ -1100,6 +1081,12 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
+        if(this.listForm.fileName === null ){
+          this.listForm.fileName = this.fileListName.join(',')
+        }else {
+          this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
+        }
+        this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1202,6 +1189,7 @@ export default {
       if (this.standList.length < 1) {
         this.$message.warning("请选择需要添加进清单的数据");
       } else {
+        let exits = []
         this.standList.map(item => {
           let newStand = false;
           for (let itemKey of this.dataList) {
@@ -1214,8 +1202,10 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            exits.push(item.id)
           }
         });
+        this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
         this.standardData = [];
         this.standModel = false;
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 976a14cda..617b6018c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -78,8 +78,13 @@
             width="180px"
             label="标准号">
             <template slot-scope="scope">
-              <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
-              <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
+              <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
@@ -407,6 +412,17 @@ export default {
     },
     selectThree() {
 
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
     },
     pageChange(page) {
       this.page = page;
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 9348fdfa0..a752a4237 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -554,11 +554,9 @@
                                             :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.gkdw"
-                                            placeholder="请输入归口管理部门"
-                                            clearable
-                                    ></el-input>
+                                  <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                                    <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                                  </el-select>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                                     <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -733,6 +731,13 @@
                                             placeholder="请输入采标编号"
                                             clearable
                                     ></el-input>
+                                  <el-button
+                                      type="primary"
+                                      class="common-button-primary"
+                                      size="mini"
+                                      style="position:absolute;top: 10px;right: 0;"
+                                      @click="selectLaws('cbbh'),config.attrName = '采标编号'"
+                                  >{{'手动查找'}}</el-button>
                                 </el-form-item>
 <!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
 <!--                                    <el-input-->
@@ -956,7 +961,13 @@
                 :visible.sync="modalShowFlag"
                 :wrapperClosable="false"
                 size="800px">
+          <el-input
+              style="width:70%;padding: 10px"
+              placeholder="请输入姓名"
+              v-model="filterText">
+          </el-input>
             <el-tree
+                    :filter-node-method="filterNode"
                     v-if="modalShowFlag"
                     node-key="id"
                     style="height: 100%; overflow: auto;"
@@ -1151,6 +1162,7 @@
         },
         data () {
             return {
+              filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
                 loadSarStandard: false,
@@ -1384,6 +1396,7 @@
                 modelOptions: [], // 模块体系架构
                 modelChildOptions: [], // 模块体系架构子集合
                 applyArcticOptions: [], // 适用车型
+                gkglbmOptions: [], // 归口管理部门
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
@@ -1398,6 +1411,9 @@
             }
         },
         watch:{
+          filterText(val) {
+            this.$refs.tree.filter(val);
+          },
             'form.standInData': {
                 handler: function() {
                     this.verifySarStandard = false
@@ -1451,6 +1467,11 @@
             },
         },
         methods: {
+          // z责任人会签姓名搜索
+          filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+          },
           getTaskId () {
             queryTaskFirst({
               bpnId: this.$route.query.bpnId
@@ -1662,6 +1683,7 @@
                 }
             },
             saveUserInfo () {
+              this.filterText = ''
                 if (this.userType === 'zrUserId') {
                     this.roleForm.zrUserId = this.zrUserIds.map(item => item.id).join(",")
                     this.roleForm.zrUserName = this.zrUserIds.map(item => item.name).join(",")
@@ -1673,6 +1695,7 @@
                 this.modalShowFlag = false
             },
             cancelUserInfo () {
+                this.filterText = ''
                 this.modalShowFlag = false
             },
             drawerCheck (data) {
@@ -1841,12 +1864,15 @@
                     this.replaceLawsNumModel = false
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+              // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'dtbjh'){
-                    this.form.dtbjh = textArr.join(',')
+                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'yybj'){
-                    this.form.yybj = textArr.join(',')
+                    this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
+                }else if(this.replaceLawType === 'cbbh'){
+                    this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
-                    this.form.byybj = textArr.join(',')
+                    this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
@@ -2072,8 +2098,6 @@
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
-                    // 流程保存之后，应该流转至草稿页面
-                    this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
                     // this.bpnId = res.result
                 }).catch(e => {
                     this.saveLoading = false
@@ -2165,7 +2189,8 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.qcdwOption = res.data.QCDW // 体系类别
-              this.setMap(this.standStateOptions)
+                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+                this.setMap(this.standStateOptions)
             })
             this.busVsFunc()
             this.modelFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 1a4702620..8119b4907 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -201,84 +201,84 @@
                         <template slot="title">文本信息</template>
                     </ProcessTitle>
                     <div class="prc-content-border">
-                        <el-row :gutter="24">
-                            <el-col :span="12">
-                                <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="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="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="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="ssgName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.ssgName">
-                                        {{ form.ssgName }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                            <el-col :span="12">
-                                <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="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="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="jdwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.jdwjName">
-                                        {{ form.jdwjName }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
+                      <el-row :gutter="24">
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
+                              {{ form.xgdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
+                              {{ form.fbgbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
+                              {{ form.zbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                              {{ form.bpgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                              {{ form.ssgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
+                              {{ form.kwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                              {{ form.zqyjgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
+                              {{ form.caName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
+                              {{ form.jdwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
                     </div>
                     <ProcessTitle>
                         <template slot="title">适用范围</template>
@@ -328,14 +328,11 @@
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.dybxh" disabled></el-input>
                                 </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.gkdw"
-                                            placeholder="请输入归口管理部门"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                                  <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
                                         <el-option
@@ -467,14 +464,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                                    <div v-if="form.glwjName">
-                                        {{ form.glwjName }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
+                              <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                                <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
+                                  {{ form.glwjName }}
+                                </div>
+                                <div v-else>
+                                  - -
+                                </div>
+                              </el-form-item>
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -685,6 +682,16 @@
         name: "bzrkStep2",
         data () {
             return {
+              xgdFileId: '',
+              fbgbjbdFileId: '',
+              bpgFileId: '',
+              ssgFileId: '',
+              zqyjgFileId: '',
+              jdwjFileId: '',
+              kwjFileId: '',
+              glwjFileId: '',
+              caFileId: '',
+              zbjbdFileId:'',
               rules: {
                 commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
                 approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
@@ -811,6 +818,7 @@
                 standStateOptions: [], // 文本状态
                 standSystemOptions: [], // 标准体系
                 applyArcticOptions: [], // 适用车型
+                gkglbmOptions: [], // 归口管理部门
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
@@ -844,6 +852,29 @@
         },
       },
         methods: {
+          downloadFile (fileType) {
+            if(fileType === 'fbgbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+            }else if(fileType === 'xgd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+            }else if(fileType === 'bpg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+            }else if(fileType === 'ssg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+            }else if(fileType === 'zqyjg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+            }else if(fileType === 'jdwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+            }else if(fileType === 'kwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+            }else if(fileType === 'glwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+            }else if(fileType === 'ca'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+            }else if(fileType === 'zbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+            }
+          },
           getRule(){
             if (this.formTongGuo.approvalOpinion !== '1') {
               this.$refs.formTongGuo.clearValidate('commentText')
@@ -910,6 +941,16 @@
                     }).then(res => {
                         if (res) {
                           const processForm = JSON.parse(res.mesg)
+                          this.xgdFileId = processForm.xgd
+                          this.fbgbjbdFileId = processForm.fbgbjbd
+                          this.bpgFileId = processForm.bpg
+                          this.ssgFileId = processForm.ssg
+                          this.zqyjgFileId = processForm.zqyjg
+                          this.jdwjFileId = processForm.jdwj
+                          this.kwjFileId = processForm.kwj
+                          this.glwjFileId = processForm.glwj
+                          this.caFileId = processForm.ca
+                          this.zbjbdFileId = processForm.zbjbd
                           this.getFormFieldList(processForm)
                         }
                     }).catch(e => {
@@ -1027,6 +1068,7 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
                 this.key++
             })
             this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 254066498..195c686e1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -197,7 +197,7 @@
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.xgdName">
+                  <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
                     {{ form.xgdName }}
                   </div>
                   <div v-else>
@@ -205,7 +205,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.fbgbjbdName">
+                  <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
                     {{ form.fbgbjbdName }}
                   </div>
                   <div v-else>
@@ -213,7 +213,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zbjbdName">
+                  <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
                     {{ form.zbjbdName }}
                   </div>
                   <div v-else>
@@ -221,7 +221,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.bpgName">
+                  <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
                     {{ form.bpgName }}
                   </div>
                   <div v-else>
@@ -229,7 +229,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssgName">
+                  <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
                     {{ form.ssgName }}
                   </div>
                   <div v-else>
@@ -239,7 +239,7 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.kwjName">
+                  <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
                     {{ form.kwjName }}
                   </div>
                   <div v-else>
@@ -247,7 +247,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zqyjgName">
+                  <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
                     {{ form.zqyjgName }}
                   </div>
                   <div v-else>
@@ -255,7 +255,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                  <div v-if="form.caName">
+                  <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
                     {{ form.caName }}
                   </div>
                   <div v-else>
@@ -263,7 +263,7 @@
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.jdwjName">
+                  <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
                     {{ form.jdwjName }}
                   </div>
                   <div v-else>
@@ -322,12 +322,9 @@
                   <el-input v-model="form.dybxh" disabled></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      disabled
-                      v-model="form.gkdw"
-                      placeholder="请输入归口管理部门"
-                      clearable
-                  ></el-input>
+                  <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                    <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                     <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
@@ -461,7 +458,7 @@
 <!--                  ></el-input>-->
 <!--                </el-form-item>-->
                 <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.glwjName">
+                  <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
                     {{ form.glwjName }}
                   </div>
                   <div v-else>
@@ -666,6 +663,16 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      xgdFileId: '',
+      fbgbjbdFileId: '',
+      bpgFileId: '',
+      ssgFileId: '',
+      zqyjgFileId: '',
+      jdwjFileId: '',
+      kwjFileId: '',
+      glwjFileId: '',
+      caFileId: '',
+      zbjbdFileId:'',
       activeName:'1',
       // 当前流程类型(1待办/2已办)
       processType: 1,
@@ -785,6 +792,7 @@ export default {
       standStateOptions: [], // 文本状态
       standSystemOptions: [], // 标准体系
       applyArcticOptions: [], // 适用车型
+      gkglbmOptions: [], // 归口管理部门
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
@@ -818,6 +826,29 @@ export default {
     },
   },
   methods: {
+    downloadFile (fileType) {
+      if(fileType === 'fbgbjbd'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+      }else if(fileType === 'xgd'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+      }else if(fileType === 'bpg'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+      }else if(fileType === 'ssg'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+      }else if(fileType === 'zqyjg'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+      }else if(fileType === 'jdwj'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+      }else if(fileType === 'kwj'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+      }else if(fileType === 'glwj'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+      }else if(fileType === 'ca'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+      }else if(fileType === 'zbjbd'){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+      }
+    },
     popoverHide (checkedIds, checkedData) {
       if(checkedData) {
         this.form.standSystem = checkedData.id
@@ -879,6 +910,16 @@ export default {
         }).then(res => {
           if (res) {
             const processForm = JSON.parse(res.mesg)
+            this.xgdFileId = processForm.xgd
+            this.fbgbjbdFileId = processForm.fbgbjbd
+            this.bpgFileId = processForm.bpg
+            this.ssgFileId = processForm.ssg
+            this.zqyjgFileId = processForm.zqyjg
+            this.jdwjFileId = processForm.jdwj
+            this.kwjFileId = processForm.kwj
+            this.glwjFileId = processForm.glwj
+            this.caFileId = processForm.ca
+            this.zbjbdFileId = processForm.zbjbd
             this.getFormFieldList(processForm)
           }
         }).catch(e => {
@@ -1011,6 +1052,7 @@ export default {
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
       this.key++
     })
     this.busVsFunc()
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 1a84a2fe9..72d26af15 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -534,11 +534,9 @@
                           :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                  <el-input
-                      v-model="form.gkdw"
-                      placeholder="请输入归口管理部门"
-                      clearable
-                  ></el-input>
+                  <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                    <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                  </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
                     <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple>
@@ -709,7 +707,7 @@
                           class="common-button-primary"
                           size="mini"
                           style="position:absolute;top: 10px;right: 0;"
-                          @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                          @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">
@@ -718,6 +716,13 @@
                       placeholder="请输入采标编号"
                       clearable
                   ></el-input>
+                  <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="position:absolute;top: 10px;right: 0;"
+                      @click="selectLaws('cbbh'),config.attrName = '采标编号'"
+                  >{{'手动查找'}}</el-button>
                 </el-form-item>
                 <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
                   <el-input
@@ -730,7 +735,7 @@
                           class="common-button-primary"
                           size="mini"
                           style="position:absolute;top: 10px;right: 0;"
-                          @click="selectLaws('dtbjh'),config.attrName = '代替标准号'"
+                          @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">
@@ -1218,6 +1223,7 @@ export default {
       modelOptions: [], // 模块体系架构
       applyArcticOptions: [], // 适用车型
       categoryOptions: [], // 能源类型
+      gkglbmOptions: [], // 归口管理部门
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
       wssmrOptions: [], // 我司署名人
@@ -1398,12 +1404,15 @@ export default {
         this.replaceLawsNumModel = false
       })
       // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
+      // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
       if(this.replaceLawType === 'dtbjh'){
-        this.form.dtbjh = textArr.join(',')
+        this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
       }else if(this.replaceLawType === 'yybj'){
-        this.form.yybj = textArr.join(',')
-      }else {
-        this.form.byybj = textArr.join(',')
+        this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
+      }else if(this.replaceLawType === 'cbbh'){
+        this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+      } else {
+        this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
       }
       // this.$emit('input', textArr.join(','))
       this.$refs.selections.clearSelection()
@@ -1740,6 +1749,7 @@ export default {
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
       this.treeStatus = true
       this.key++
     })
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index eb5a19493..cd985bbda 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -42,13 +42,11 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.standYear"
-                                            type="year"
-                                            placeholder="请选择标准年份"
-                                            value-format="yyyy">
-                                    </el-date-picker>
+                                  <el-input
+                                      v-model.number="form.standYear"
+                                      placeholder="请输入标准标准年份"
+                                      disabled
+                                  ></el-input>
                                 </el-form-item>
                                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                                     <el-input
@@ -119,10 +117,16 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <tree-select
-                                            :data="standSystemOptions"
-                                            :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
+                                  <el-input
+                                      disabled
+                                      v-model="form.standSystem"
+                                      placeholder="请选择标准体系"
+                                      clearable
+                                  ></el-input>
+<!--                                    <tree-select-->
+<!--                                            :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-input
@@ -198,84 +202,84 @@
                         <template slot="title">文本信息</template>
                     </ProcessTitle>
                     <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 }}
-                                    </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 }}
-                                    </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 }}
-                                    </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 }}
-                                    </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 }}
-                                    </div>
-                                    <div v-else>
-                                      - -
-                                    </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 }}
-                                    </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 }}
-                                    </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 }}
-                                    </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 }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
-                            </el-col>
-                        </el-row>
+                      <el-row :gutter="24">
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">
+                              {{ form.xgdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+                            <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
+                              {{ form.fbgbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
+                              {{ form.zbjbdName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
+                              {{ form.bpgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
+                              {{ form.ssgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
+                              {{ form.kwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
+                            <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
+                              {{ form.zqyjgName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
+                            <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
+                              {{ form.caName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                          <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">
+                            <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
+                              {{ form.jdwjName }}
+                            </div>
+                            <div v-else>
+                              - -
+                            </div>
+                          </el-form-item>
+                        </el-col>
+                      </el-row>
                     </div>
                     <ProcessTitle>
                         <template slot="title">适用范围</template>
@@ -317,39 +321,45 @@
                                     </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 disabled>
-                                        <el-option label="乘用车VPPS编码1" value="1"></el-option>
-                                        <el-option label="乘用车VPPS编码2" value="2"></el-option>
-                                    </el-select>
+                                    <el-input
+                                        disabled
+                                        v-model.number="form.cycvppsbm"
+                                        placeholder="请选择关联模块--乘用车VPPS编码"
+                                        clearable
+                                    ></el-input>
                                 </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 disabled>
-                                        <el-option label="卡车VPPS编码1" value="1"></el-option>
-                                        <el-option label="卡车VPPS编码2" value="2"></el-option>
-                                    </el-select>
+                                  <el-input
+                                      disabled
+                                      v-model.number="form.kccvppsbm"
+                                      placeholder="关联模块--卡车VPPS编码"
+                                      clearable
+                                  ></el-input>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.dybxh" placeholder="请选择模块结构单元变型号" multiple disabled>
-                                        <el-option label="模块结构单元变型号1" value="1"></el-option>
-                                        <el-option label="模块结构单元变型号2" value="2"></el-option>
-                                    </el-select>
-                                </el-form-item>
-                                <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.gkdw"
-                                            placeholder="请输入归口管理部门"
-                                            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-input
-                                            disabled
-                                            v-model="form.fbjg"
-                                            placeholder="请选择起草单位"
-                                            clearable
-                                    ></el-input>
+                                  <el-input
+                                      disabled
+                                      v-model.number="form.dybxh"
+                                      placeholder="请选择模块结构单元变型号"
+                                      clearable
+                                  ></el-input>
                                 </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
+                                <el-select disabled :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
+                                  <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
+                                </el-select>
+                              </el-form-item>
+                              <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                                  <el-option
+                                      v-for="item in qcdwOption"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
                                         <el-option
@@ -457,22 +467,23 @@
                                         <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
-                                            disabled
-                                            v-model="form.xglc"
-                                            placeholder="请输入相关流程"
-                                            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 }}
-                                    </div>
-                                    <div v-else>
-                                       - -
-                                    </div>
-                                </el-form-item>
+<!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
+<!--                                    <el-input-->
+<!--                                            disabled-->
+<!--                                            v-model="form.xglc"-->
+<!--                                            placeholder="请输入相关流程"-->
+<!--                                            clearable-->
+<!--                                    ></el-input>-->
+<!--                                </el-form-item>-->
+                              <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
+                                <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
+                                  {{ form.glwjName }}
+                                </div>
+                                <div v-else>
+                                  - -
+                                </div>
+                              </el-form-item>
+
                             </el-col>
                             <el-col :span="12">
                                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -491,22 +502,22 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            disabled
-                                            v-model="form.byybj"
-                                            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
-                                            disabled
-                                            v-model="form.chjl"
-                                            placeholder="请输入参会记录"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+<!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-input-->
+<!--                                            disabled-->
+<!--                                            v-model="form.byybj"-->
+<!--                                            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-->
+<!--                                            disabled-->
+<!--                                            v-model="form.chjl"-->
+<!--                                            placeholder="请输入参会记录"-->
+<!--                                            clearable-->
+<!--                                    ></el-input>-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>
@@ -670,6 +681,16 @@
         name: "bzrkStep5",
         data () {
             return {
+              xgdFileId: '',
+              fbgbjbdFileId: '',
+              bpgFileId: '',
+              ssgFileId: '',
+              zqyjgFileId: '',
+              jdwjFileId: '',
+              kwjFileId: '',
+              glwjFileId: '',
+              caFileId: '',
+              zbjbdFileId:'',
               // 当前流程类型(1待办/2已办)
               processType: 1,
                 detailData: [],
@@ -760,12 +781,14 @@
                 standSystemOptions: [], // 标准体系
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
+                 gkglbmOptions: [], // 归口管理部门
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
                 sycpxOptions: [], // 适用产品线
                 zrbmOptions: [], // 责任部门
                 zrgcsOptions: [], // 责任工程师
                 txlbOptions: [], // 体系类别
+              qcdwOption: [], // 起草单位
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
                 user1: '',
@@ -790,6 +813,29 @@
         },
       },
         methods: {
+          downloadFile (fileType) {
+            if(fileType === 'fbgbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+            }else if(fileType === 'xgd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+            }else if(fileType === 'bpg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+            }else if(fileType === 'ssg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+            }else if(fileType === 'zqyjg'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+            }else if(fileType === 'jdwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+            }else if(fileType === 'kwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+            }else if(fileType === 'glwj'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+            }else if(fileType === 'ca'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+            }else if(fileType === 'zbjbd'){
+              window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+            }
+          },
             popoverHide (checkedIds, checkedData) {
                 console.log(checkedIds);
                 console.log(checkedData);
@@ -816,6 +862,21 @@
                     }).then(res => {
                         if (res) {
                           const processForm = JSON.parse(res.mesg)
+                          this.xgdFileId = processForm.xgd
+                          this.fbgbjbdFileId = processForm.fbgbjbd
+                          this.bpgFileId = processForm.bpg
+                          this.ssgFileId = processForm.ssg
+                          this.zqyjgFileId = processForm.zqyjg
+                          this.jdwjFileId = processForm.jdwj
+                          this.kwjFileId = processForm.kwj
+                          this.glwjFileId = processForm.glwj
+                          this.caFileId = processForm.ca
+                          this.zbjbdFileId = processForm.zbjbd
+                          this.form.standYear = processForm.standYear
+                          this.form.standSystem = processForm.standSystem
+                          this.form.kccvppsbm = processForm.kccvppsbm
+                          this.form.cycvppsbm = processForm.cycvppsbm
+                          this.form.dybxh = processForm.dybxh
                           this.getFormFieldList(processForm)
                         }
                     }).catch(e => {
@@ -914,6 +975,8 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.qcdwOption = res.data.QCDW // 体系类别
+                this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
             })
         }
     }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
index b0315ca40..8d4cf8c13 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
@@ -84,7 +84,7 @@
           <el-table-column label="责任人" prop="workPeople" align="center">
             <template slot-scope="scope">
               <div :class="{'fileClass': !scope.row.workPeople}">
-                {{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
+                {{ scope.row.workPeople ? scope.row.workPeople: '' }}</div>
             </template>
           </el-table-column>
         </el-table>
@@ -304,8 +304,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.dataList.forEach(item => {
-        if (item.workPeople !== undefined) {
           this.listForm.commentText = this.commentText;
           const json = JSON.stringify(this.listForm);
           this.$http.post("lawss/activiti/completeTask", {
@@ -321,10 +319,6 @@ export default {
             }
           }, e => {
           });
-        } else {
-          this.$message.warning("请选择分发负责人");
-        }
-      });
     },
     //批量分发按钮
     batchOperation(id) {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index 2e9643307..a68ddea6e 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'4f71b81686079ba2b7e3739d3994e0af'">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index 647a5fd38..d1bdadf80 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 64152b927..b28ec60cb 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -124,7 +124,7 @@
           <el-table-column :label="$t('m.operation')" align="center" width="50">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
-                <el-dropdown trigger="click" @command="handleCommand">
+                <el-dropdown trigger="click" @command="handleCommand" v-btn-permission="'4219fdb5e33dbbc84d845af98c947e66'">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
@@ -600,6 +600,72 @@ export default {
                   prcType: row.prcType
                 }
               })
+            } else if(row.taskInfo === '分发负责人审批') {
+              this.$router.push({
+                name: 'xmpg2Step7',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '架构经理审批') {
+              this.$router.push({
+                name: 'xmpg2Step8',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '工程经理审批') {
+              this.$router.push({
+                name: 'xmpg2Step9',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '标准法规部经理审批') {
+              this.$router.push({
+                name: 'xmpg2Step10',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '汇总审批') {
+              this.$router.push({
+                name: 'xmpg2Step11',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
+            } else if(row.taskInfo === '标准法规部部长审批') {
+              this.$router.push({
+                name: 'xmpg2Step12',
+                query: {
+                  taskIds: row.taskIds,
+                  prcId: row.prcId,
+                  prcNum: row.prcNum,
+                  prcName: row.prcName,
+                  prcType: row.prcType
+                }
+              })
             }
             break
         //未符合项整改流程
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 3029caa96..f42b51d7a 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -127,7 +127,7 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '办理']">办理</el-dropdown-item>
+                    <el-dropdown-item :command="[scope.row, '办理']" v-btn-permission="'fa19fb2dc2cf3055a64732dab6c40cb9'">办理</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 60757cd0d..960328388 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -117,16 +117,6 @@
               }}</span>
           </template>
         </el-table-column>
-<!--        <el-table-column
-          prop="applicationScope"
-          label="适用领域"
-          align="center">
-          <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-          </template>
-        </el-table-column>-->
         <el-table-column
           prop="updateTime"
           label="更新时间"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 9f4a1bb79..8d81c22bc 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -87,26 +87,6 @@
                   :maxlength="100"
               ></el-input>
             </el-form-item>
-            <el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
-                <el-option
-                    v-for="item in energyKindOptions"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.askType">
-                <el-option
-                    v-for="item in accessSarTypeOptions"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                   type="primary"
@@ -137,52 +117,22 @@
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
         <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准名称" class="search-item">
+          <el-form-item label="标准号" class="labelBox">
+            <el-input
+              v-model="sarAccessInfo.standNumber"
+              placeholder="请输入"
+              size="small"
+              clearable/>
+          </el-form-item>
+          <el-form-item label="标准名称" class="labelBox">
             <el-input
               v-model="sarAccessInfo.standName"
               placeholder="请输入"
               size="small"
               clearable/>
           </el-form-item>
-          <el-form-item label="文本状态">
-            <el-select
-              v-model="sarAccessInfo.textStatus"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in textStatusOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期" >
-            <el-date-picker
-              v-model="sarAccessInfo.issueTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="更新人"  v-show="isListType">
-            <el-input
-              v-model="sarAccessInfoSearch.standName"
-              placeholder="请输入"
-              :maxlength="100"
-              size="small"/>
-          </el-form-item>
-          <el-form-item label="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
-              size="small"
-              value-format="yyyy-MM-DD"
-              placeholder="选择更新日期">
-            </el-date-picker>
+          <el-form-item>
+            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -292,6 +242,7 @@
             v-btn-permission="''"
         ><i class="iconfont">&#xe61b;</i>删除</el-button>
       </div>
+      <!--   清单条目的列表页   -->
       <el-table
           ref="entryTable"
           :data="sarAccessInfoList"
@@ -479,21 +430,19 @@
       >
       <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
           <el-form-item label="标准号">
-            <el-input  v-model.trim="editRowData.standNumber"  :disabled="true">
-<!--              <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
-            </el-input>
+            <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
           </el-form-item>
           <el-form-item label="标准名称" prop="standName">
-            <el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.standName" :disabled="true"/>
           </el-form-item>
           <el-form-item label="英文名称" prop="standEnName">
-            <el-input v-model.trim="editRowData.standEnName" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
           </el-form-item>
           <el-form-item label="适用车型" prop="typeApplicable">
-            <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
           </el-form-item>
           <el-form-item label="能源类型" prop="nylx">
-            <el-input v-model.trim="editRowData.nylx" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
           </el-form-item>
           <el-form-item label="标准实施日期" prop="putTime">
             <el-date-picker
@@ -520,22 +469,22 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item label="责任部门" prop="zrbm">
-            <el-input v-model.trim="editRowData.zrbm" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
           </el-form-item>
           <el-form-item label="适用产品线" prop="sycpx">
-            <el-input v-model.trim="editRowData.sycpx" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
           </el-form-item>
           <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
-            <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
           </el-form-item>
           <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
-            <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
           </el-form-item>
           <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
-            <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
           </el-form-item>
           <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
-            <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"></el-input>
+            <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
           </el-form-item>
         </el-form>
       <div class="demo-drawer-footer">
@@ -689,14 +638,7 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        countryArea: '', // 国家
-        issueTime: '',
         standName: '',
-        textStatus: '',
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -706,13 +648,8 @@ export default {
       },
       sarAccessInfo: {
         id: '',
-        issueTime: '',
+        standNumber: '',
         standName: '',
-        textStatus: '',
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -1058,15 +995,11 @@ export default {
     },
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
-      this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.applyArctic = '' // 能源种类
-      this.sarAccessInfoSearch.keywords = '' // 关键字
       this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.detailedListName = '' // 清单名称
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
       this.sarAccessInfoSearch.standName = ''
-      this.sarAccessInfoSearch.putTime = ''
-      this.sarAccessInfoSearch.textStatus = ''
+      this.sarAccessInfo.standName = ''
+      this.sarAccessInfo.standNumber = ''
       this.isListType = false
       this.selectLawsStands()
     },
@@ -1235,19 +1168,19 @@ export default {
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
-            this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
-            this.$refs.searchTable.clearSelection()
-          } else{
-            this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
-            this.$refs.searchTable.clearSelection()
-          }
+              this.$message.warning('请勿添加重复数据')
+              // this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            } else{
+              this.sarAccessInfoList.push(item)
+              // this.$refs.accessTypeSelect.clearSelection()
+              this.$refs.entryTable.clearSelection()
+              this.$refs.searchTable.clearSelection()
+            }
         })
       } else {
         this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
@@ -1396,12 +1329,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              } else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1430,10 +1367,11 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
-      StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
+      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1441,16 +1379,71 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
+        })
+        this.drawerTotal = res.data.list.length
+      }, e => {
+      })
+    },
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+        this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
         this.drawerTotal = res.data.list.length
       }, e => {
@@ -1464,16 +1457,29 @@ export default {
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
-        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        }
       })
       this.selectedAccInfoSearchList.forEach(item => {
         // 责任部门转换
@@ -1985,6 +1991,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
       }, e => {
       })
@@ -2058,8 +2087,8 @@ export default {
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
         this.sarAccessInfoSearch.validFlag = 0
-        this.getFileInfo()
         this.getData()
+        this.getFileInfo()
         this.selectLawsStands()
       })
     } else {
@@ -2126,6 +2155,12 @@ export default {
     text-align: right;
   }
 }
+.labelBox {
+  /deep/ .el-form-item__label {
+    padding-right: 5px;
+    padding-left: 10px;
+  }
+}
 .un-select {
   user-select: none;
 }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 926055172..df8f46aec 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -65,40 +65,13 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
+            <el-form-item label="标准名称"  class="search-item">
               <el-input
                 v-model="sarAccessInfoSearch.standName"
                 placeholder="请输入"
                 :maxlength="100"
               ></el-input>
             </el-form-item>
-            <el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
-                <el-option
-                  v-for="item in energyKindOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.askType">
-                <el-option
-                  v-for="item in accessSarTypeOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
-              <el-input
-                v-model="sarAccessInfoSearch.detailedListName"
-                placeholder="请输入"
-                :maxlength="100"
-              ></el-input>
-            </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                 type="primary"
@@ -129,52 +102,22 @@
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
         <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准名称" class="search-item">
+          <el-form-item label="标准号" class="labelBox">
+            <el-input
+              v-model="sarAccessInfo.standNumber"
+              placeholder="请输入"
+              size="small"
+              clearable/>
+          </el-form-item>
+          <el-form-item label="标准名称" class="labelBox">
             <el-input
               v-model="sarAccessInfo.standName"
               placeholder="请输入"
               size="small"
               clearable/>
           </el-form-item>
-          <el-form-item label="文本状态">
-            <el-select
-              v-model="sarAccessInfo.textStatus"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in textStatusOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期" >
-            <el-date-picker
-              v-model="sarAccessInfo.issueTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="更新人"  v-show="isListType">
-            <el-input
-              v-model="sarAccessInfoSearch.standName"
-              placeholder="请输入"
-              :maxlength="100"
-              size="small"/>
-          </el-form-item>
-          <el-form-item label="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
-              size="small"
-              value-format="yyyy-MM-DD"
-              placeholder="选择更新日期">
-            </el-date-picker>
+          <el-form-item>
+            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -263,46 +206,6 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-table
-          v-show="isListType"
-          :data="sarAccessInfoSearchList"
-          style="width: 100%"
-          border
-          height="300px"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-          @selection-change="accessSarTypeSelect"
-          ref="accessTypeSelect"
-        >
-          <el-table-column
-            type="selection"
-            width="55"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="detailedList"
-            label="清单类别"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="detailedListName"
-            label="清单名称"
-            align="center">
-          </el-table-column>
-          <el-table-column
-            prop="modifyTime"
-            label="更新时间"
-            align="center">
-            <template slot-scope="scope">
-              <div>{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="uname"
-            label="更新人"
-            align="center">
-          </el-table-column>
-        </el-table>
         <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
                     @pageSizeChange="drawerPageSizeChange"></pagination>
         <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
@@ -407,16 +310,6 @@
           width="210px"
           align="center"
           label="责任部门">
-          <template slot-scope="scope">
-            <span
-              v-for="(item, index) in zrbmOptions"
-              :key="index"
-              :value="item.value"
-              v-if="scope.row.value == item.value"
-            >
-              {{ item.label }}
-            </span>
-          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -453,7 +346,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" align="center" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -467,6 +360,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
+            <el-button
+              size="small"
+              @click="editTghisRow(scope.row)"
+              class="common-button-default"
+              type="warning"
+            >编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -503,6 +402,90 @@
         </div>
       </el-upload>
     </el-dialog>
+    <!--编辑-->
+    <el-drawer
+      title="编辑清单条目"
+      :visible.sync="drawerEdit"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
+        <el-form-item label="标准号">
+          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准名称" prop="standName">
+          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName">
+          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="typeApplicable">
+          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="nylx">
+          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准实施日期" prop="putTime">
+          <el-date-picker
+            v-model.trim="editRowData.putTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.zccssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.xcxssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="责任部门" prop="zrbm">
+          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="sycpx">
+          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
+          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
+          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
+          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-footer">
+        <el-button
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
+        >提交</el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelInfo"
+        >取消</el-button
+        >
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -558,6 +541,26 @@ export default {
       zrbmMap: {},
       sycpxMap: {},
       selectSearch : [],
+      // 编辑抽屉状态
+      drawerEdit: false,
+      // 编辑框数据
+      editRowData: {
+        id: '',
+        standName: '',
+        standSortShow:'',
+        standEnName: '',
+        typeApplicable: '',
+        nylx: '',
+        putTime: '',
+        zccssrqgj: '',
+        xcxssrqgj: '',
+        zrbm: '',
+        sycpx: '',
+        cycvppsbm: '',
+        cycvppscn: '',
+        kccvppsbm: '',
+        kccvppscn: ''
+      },
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -616,11 +619,7 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        countryArea: '', // 国家
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
+        standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -630,13 +629,8 @@ export default {
       },
       sarAccessInfo: {
         id: '',
-        issueTime: '',
         standName: '',
-        textStatus: '',
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
+        standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -873,6 +867,9 @@ export default {
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.showSelectBox = !this.showSelectBox
+      this.showTableFlag = false
+      this.selectLawsStands()
     },
     // 法规维护人树
     getDept () {
@@ -963,11 +960,10 @@ export default {
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
       this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfo.standName = ''
+      this.sarAccessInfo.standNumber = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.applyArctic = '' // 能源种类
-      this.sarAccessInfoSearch.keywords = '' // 关键字
       this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.detailedListName = '' // 清单名称
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
       this.isListType = false
       this.selectLawsStands()
@@ -1136,17 +1132,18 @@ export default {
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
+
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           } else{
             this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           }
@@ -1183,6 +1180,22 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
+    // 编辑按钮
+    editTghisRow(row) {
+      this.rowList = row
+      this.editRowData = this.rowList
+      this.editRowData.standNumber = this.rowList.standNumber
+      this.drawerEdit = true
+    },
+    // 抽屉取消按钮
+    cancelInfo() {
+      this.drawerEdit = false
+    },
+    // 抽屉提交按钮
+    saveInfo() {
+      this.rowList = this.editRowData
+      this.drawerEdit = false
+    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true
@@ -1240,12 +1253,30 @@ export default {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
+          let rowlist1 = []
+          let rowlist2 = []
+          let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
+            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            }else {
+              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
+          rowlist1 = rowlist1.join(',')
+          rowlist2 = rowlist2.join(',')
+          rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1264,12 +1295,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              }else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1298,10 +1333,11 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
-      StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
+      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1309,16 +1345,72 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
+        })
+        this.drawerTotal = res.data.list.length
+      }, e => {
+      })
+    },
+    // 高级检索查询按钮
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+        this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
         this.drawerTotal = res.data.list.length
       }, e => {
@@ -1332,16 +1424,29 @@ export default {
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
-        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        }
       })
       this.selectedAccInfoSearchList.forEach(item => {
         // 责任部门转换
@@ -1855,6 +1960,29 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
       }, e => {
 
@@ -2005,6 +2133,12 @@ export default {
     text-align: right;
   }
 }
+.labelBox {
+  /deep/ .el-form-item__label {
+    padding-right: 5px;
+    padding-left: 10px;
+  }
+}
 .un-select {
   user-select: none;
 }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 339a88029..fc4bc99ef 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -72,33 +72,6 @@
                 :maxlength="100"
               ></el-input>
             </el-form-item>
-            <el-form-item label="适用车辆类型" class="search-item" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.applyArctic" filterable clearable>
-                <el-option
-                  v-for="item in energyKindOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="search-item" prop="askType" label="要求类型" v-show="moreSearchShow">
-              <el-select v-model="sarAccessInfoSearch.askType">
-                <el-option
-                  v-for="item in accessSarTypeOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
-              <el-input
-                v-model="sarAccessInfoSearch.detailedListName"
-                placeholder="请输入"
-                :maxlength="100"
-              ></el-input>
-            </el-form-item>
             <el-form-item class="search-item btn-box">
               <el-button
                 type="primary"
@@ -129,52 +102,22 @@
       </div>
       <div class="showSelectBox" v-if="!showSelectBox">
         <el-form  :model="sarAccessInfo" class="label-input-form" v-if="!disabledFlag" inline>
-          <el-form-item label="标准名称" class="search-item">
+          <el-form-item label="标准号" class="labelBox">
+            <el-input
+              v-model="sarAccessInfo.standNumber"
+              placeholder="请输入"
+              size="small"
+              clearable/>
+          </el-form-item>
+          <el-form-item label="标准名称" class="labelBox">
             <el-input
               v-model="sarAccessInfo.standName"
               placeholder="请输入"
               size="small"
               clearable/>
           </el-form-item>
-          <el-form-item label="文本状态">
-            <el-select
-              v-model="sarAccessInfo.textStatus"
-              placeholder="请选择"
-              filterable
-              size="small"
-            >
-              <el-option
-                v-for="item in textStatusOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期" >
-            <el-date-picker
-              v-model="sarAccessInfo.issueTime"
-              type="date"
-              value-format="yyyy-MM-DD"
-              size="small"
-              placeholder="选择发布日期">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="更新人"  v-show="isListType">
-            <el-input
-              v-model="sarAccessInfoSearch.standName"
-              placeholder="请输入"
-              :maxlength="100"
-              size="small"/>
-          </el-form-item>
-          <el-form-item label="更新时间"  v-show="isListType">
-            <el-date-picker
-              v-model="sarAccessInfoSearch.modifyTime"
-              type="date"
-              size="small"
-              value-format="yyyy-MM-DD"
-              placeholder="选择更新日期">
-            </el-date-picker>
+          <el-form-item>
+            <el-button size="small" type="primary" @click="selectBtn">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -403,7 +346,7 @@
           width="210px"
           label="卡车VPPS中文名称">
         </el-table-column>
-        <el-table-column width="150" align="center" label="操作">
+        <el-table-column width="240" align="center" label="操作">
           <template slot-scope="scope">
             <el-button
               class="common-button-default"
@@ -417,6 +360,12 @@
               size="small" @click="moveDown(scope.$index, scope.row)"
               v-if="!disabledFlag"
             >下移</el-button>
+            <el-button
+              size="small"
+              @click="editTghisRow(scope.row)"
+              class="common-button-default"
+              type="warning"
+            >编辑</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -453,6 +402,89 @@
         </div>
       </el-upload>
     </el-dialog>
+    <el-drawer
+      title="编辑清单条目"
+      :visible.sync="drawerEdit"
+      :wrapperClosable="false"
+      size="800px"
+    >
+      <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
+        <el-form-item label="标准号">
+          <el-input  v-model.trim="editRowData.standNumber"  :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准名称" prop="standName">
+          <el-input v-model.trim="editRowData.standName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="英文名称" prop="standEnName">
+          <el-input v-model.trim="editRowData.standEnName" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用车型" prop="typeApplicable">
+          <el-input v-model.trim="editRowData.typeApplicable" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="nylx">
+          <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="标准实施日期" prop="putTime">
+          <el-date-picker
+            v-model.trim="editRowData.putTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="在产车实施日期" prop="zccssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.zccssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="新车型实施日期" prop="xcxssrqgj">
+          <el-date-picker
+            v-model.trim="editRowData.xcxssrqgj"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="责任部门" prop="zrbm">
+          <el-input v-model.trim="editRowData.zrbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="sycpx">
+          <el-input v-model.trim="editRowData.sycpx" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS编码" prop="cycvppsbm">
+          <el-input v-model.trim="editRowData.cycvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="乘用车VPPS中文名称" prop="cycvppscn">
+          <el-input v-model.trim="editRowData.cycvppscn" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS编码" prop="kccvppsbm">
+          <el-input v-model.trim="editRowData.kccvppsbm" :disabled="true"/>
+        </el-form-item>
+        <el-form-item label="卡车VPPS中文名称" prop="kccvppscn">
+          <el-input v-model.trim="editRowData.kccvppscn" :disabled="true"/>
+        </el-form-item>
+      </el-form>
+      <div class="demo-drawer-footer">
+        <el-button
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          icon="el-icon-check"
+          @click="saveInfo"
+        >提交</el-button
+        >
+        <el-button
+          size="mini"
+          icon="el-icon-close"
+          class="common-button-default"
+          @click="cancelInfo"
+        >取消</el-button
+        >
+      </div>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -523,6 +555,26 @@ export default {
       },
       fileInfoList: [], // 上传的附件
       uploadFileListPath: 'api/att/attFile/upload', // 上传的地址
+      // 编辑抽屉状态
+      drawerEdit: false,
+      // 编辑框数据
+      editRowData: {
+        id: '',
+        standName: '',
+        standSortShow:'',
+        standEnName: '',
+        typeApplicable: '',
+        nylx: '',
+        putTime: '',
+        zccssrqgj: '',
+        xcxssrqgj: '',
+        zrbm: '',
+        sycpx: '',
+        cycvppsbm: '',
+        cycvppscn: '',
+        kccvppsbm: '',
+        kccvppscn: ''
+      },
       // 新增、编辑 基础信息验证条件
       sarAccessEORules: {
         type: [
@@ -566,11 +618,7 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        countryArea: '', // 国家
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
+        standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -580,13 +628,8 @@ export default {
       },
       sarAccessInfo: {
         id: '',
-        issueTime: '',
         standName: '',
-        textStatus: '',
-        // applicationScope: '', //适用区域
-        keywords: '', // 关键字
-        detailedListName: '', //清单名称
-        applyArctic: '', // 能源种类
+        standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
@@ -917,11 +960,10 @@ export default {
     // 点击清空查询条件 按钮事件
     clearSearchLaws () {
       this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfo.standName = ''
+      this.sarAccessInfo.standNumber = ''
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
-      this.sarAccessInfoSearch.applyArctic = '' // 能源种类
-      this.sarAccessInfoSearch.keywords = '' // 关键字
       this.sarAccessInfoSearch.askType = '' // 监管类型
-      this.sarAccessInfoSearch.detailedListName = '' // 清单名称
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
       this.isListType = false
       this.selectLawsStands()
@@ -1091,16 +1133,16 @@ export default {
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id == item.id
-          })
+              return items.id == item.id
+            })
           if(addList > -1){
             this.$message.warning('请勿添加重复数据')
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           } else{
             this.sarAccessInfoList.push(item)
-            this.$refs.accessTypeSelect.clearSelection()
+            // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
           }
@@ -1137,6 +1179,22 @@ export default {
         this.$set(this.sarAccessInfoList, index, i)
       }
     },
+    // 编辑按钮
+    editTghisRow(row) {
+      this.rowList = row
+      this.editRowData = this.rowList
+      this.editRowData.standNumber = this.rowList.standNumber
+      this.drawerEdit = true
+    },
+    // 抽屉取消按钮
+    cancelInfo() {
+      this.drawerEdit = false
+    },
+    // 抽屉提交按钮
+    saveInfo() {
+      this.rowList = this.editRowData
+      this.drawerEdit = false
+    },
     // 点击清单条目导入按钮事件
     importmodalFlags () {
       this.importmodalFlag = true
@@ -1194,12 +1252,30 @@ export default {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
+          let rowlist1 = []
+          let rowlist2 = []
+          let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
+            if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null)  {
+              rowlist1.push(this.sarAccessInfoList[i].putTime)
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
+            }else {
+              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
+              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
+            }
           }
           rowlist = rowlist.join(',')
+          rowlist1 = rowlist1.join(',')
+          rowlist2 = rowlist2.join(',')
+          rowlist3 = rowlist3.join(',')
           let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
           sarAccessEO.inforlist = JSON.stringify(rowlist)
+          sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
+          sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
+          sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
           // sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
           // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
           // 判断是否有附件
@@ -1218,12 +1294,16 @@ export default {
               _this: this,
               loading: 'loadData'
             }, res => {
-              if (res.ok) {
-                this.$message.success('新增成功')
-                this.isNext = true
-                this.$router.push({
-                  name: 'AccessStandardsAndRegulations'
-                })
+              if (this.sarAccessInfoList.length !== 0) {
+                if (res.ok) {
+                  this.$message.success('新增成功')
+                  this.isNext = true
+                  this.$router.push({
+                    name: 'AccessStandardsAndRegulations'
+                  })
+                }
+              }else {
+                this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
               }
             }, e => {
             })
@@ -1252,6 +1332,7 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
@@ -1263,16 +1344,72 @@ export default {
           } else {
             item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
           }
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
+        })
+        this.drawerTotal = res.data.list.length
+      }, e => {
+      })
+    },
+    /** 高级查询查询按钮*/
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+      }
+      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+        this.sarAccessInfoSearchList = res.data.list
+        this.sarAccessInfoSearchList.forEach(item => {
+          if (item.standYear === null) {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber
+          } else {
+            item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
+          }
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
         this.drawerTotal = res.data.list.length
       }, e => {
@@ -1286,16 +1423,29 @@ export default {
     sarAccessInfoSearchSelect (val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
-        this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-        this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-        this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-        this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-        this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-        this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-        this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-        this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-        this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-        this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        if (item.attrInfoMap === null) {
+          this.$set(item, 'zccssrqgj', '')
+          this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'sycpx', '')
+          this.$set(item, 'typeApplicable', '')
+          this.$set(item, 'nylx', '')
+          this.$set(item, 'zrbm', '')
+          this.$set(item, 'cycvppsbm', '')
+          this.$set(item, 'cycvppscn', '')
+          this.$set(item, 'kccvppsbm', '')
+          this.$set(item, 'kccvppscn', '')
+        }else {
+          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+        }
       })
       this.selectedAccInfoSearchList.forEach(item => {
         // 责任部门转换
@@ -1813,16 +1963,29 @@ export default {
           }
         })
         this.sarAccessInfoSearchList.forEach(item => {
-          this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
-          this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
-          this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
-          this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
-          this.$set(item, 'nylx', item.attrInfoMap.NYLX)
-          this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
-          this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
-          this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
-          this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
-          this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          if (item.attrInfoMap === null) {
+            this.$set(item, 'zccssrqgj', '')
+            this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'sycpx', '')
+            this.$set(item, 'typeApplicable', '')
+            this.$set(item, 'nylx', '')
+            this.$set(item, 'zrbm', '')
+            this.$set(item, 'cycvppsbm', '')
+            this.$set(item, 'cycvppscn', '')
+            this.$set(item, 'kccvppsbm', '')
+            this.$set(item, 'kccvppscn', '')
+          }else {
+            this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
+            this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
+            this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
+            this.$set(item, 'nylx', item.attrInfoMap.NYLX)
+            this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
+            this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
+            this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
+            this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
+            this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
+          }
         })
       }, e => {
 
@@ -1973,6 +2136,12 @@ export default {
     text-align: right;
   }
 }
+.labelBox {
+  /deep/ .el-form-item__label {
+    padding-right: 5px;
+    padding-left: 10px;
+  }
+}
 .un-select {
   user-select: none;
 }
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 80c28f02a..4986f378b 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -188,22 +188,21 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="xcxssrq"
+              prop="XCXSSRQ"
               sortable="custom"
               width="150px"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
+                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
-              prop="zccssrq"
+              prop="ZCCSSRQ"
               sortable="custom"
               width="150px"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
-
+                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -2516,7 +2515,6 @@ export default {
           console.log(item, 'itemitemitemitem')
           const formFieldList = this.formFieldList
             this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
-          console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
           if(this.sarStandardsInfoEO.standSystem){
               this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
           }
@@ -2679,10 +2677,11 @@ export default {
       },
       // 树节点鼠标移入移出
       mouseenter(data){
-          console.log(data)
-          this.$set(data, 'show', true)
-          if(data.parentId !== null){
-              this.$set(data, 'showDel', true)
+          if(data.menuName !== '我的收藏'){
+              this.$set(data, 'show', true)
+              if(data.parentId !== null){
+                  this.$set(data, 'showDel', true)
+              }
           }
       },
       mouseleave(data){
@@ -2690,6 +2689,7 @@ export default {
           this.$set(data, 'showDel', false)
       },
     treeClick (treeNode) {
+        console.log(treeNode)
       this.selectSarMenu = treeNode
       this.standCommonlySearch.menuId = treeNode.id
       this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
@@ -3362,8 +3362,8 @@ export default {
                 this.isSubmit = false
                 if (res.ok) {
                   this.personCollect.collectType = 'INLAND_STAND'
-                  this.personCollect.id = this.id
-                  this.personCollect.collectResId = this.collectId
+                  this.personCollect.id = this.collectId
+                  this.personCollect.collectResId = this.id
                   this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
                   this.personCollect.userId = this.$store.getters.userInfo.userId
                   this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
@@ -3431,8 +3431,9 @@ export default {
       formData.nowOrder = this.nowOrder
       formData.nowOrderBy = this.nowOrderBy
       // formData.orderBy = this.orderBy
+        console.log(this.selectSarMenu.id)
       // 处理我的收藏和个性化标签传参
-      if (this.selectSarMenu.id === 'wdsc') {
+      if (this.selectSarMenu.menuName === '我的收藏') {
         formData.menuId = undefined
         formData.labelMenuId = undefined
         formData.collectMenuId = 'wdsc'
@@ -3472,6 +3473,7 @@ export default {
             }
           }
           this.stahndinfoList = res.data.list
+          console.log(this.stahndinfoList)
           this.total = res.data.count
           if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
             this.pageChange(1)
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 131840831..dccbd54bf 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -184,21 +184,21 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="XCXSSRQ"
-              sortable="custom"
-              width="150px"
-              label="新车型实施日期">
+                prop="XCXSSRQ"
+                sortable="custom"
+                width="150px"
+                label="新车型实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
+                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
-              prop="ZCCSSRQ"
-              sortable="custom"
-              width="150px"
-              label="在产车实施日期">
+                prop="ZCCSSRQ"
+                sortable="custom"
+                width="150px"
+                label="在产车实施日期">
               <template slot-scope="scope">
-                <span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
+                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -261,9 +261,73 @@
           <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
         </span>
       </el-dialog>
-      <table-tools-bar v-model="isAdvancedSearch"  @search="getDomesticStandardTableBtn(sarStandardsSearch)"
-                       @reset="clearAllSearch('sarStandardsSearch')">
-        <div slot="content">
+<!--      <table-tools-bar v-model="isAdvancedSearch"  @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
+<!--                       @reset="clearAllSearch('sarStandardsSearch')">-->
+<!--        <div slot="content">-->
+<!--          <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">-->
+<!--            &lt;!&ndash;            标准号&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            标准名称&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standName')" class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            标准类别&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">-->
+<!--              <search-select-->
+<!--                v-model="sarStandardsSearch.standSort"-->
+<!--                :placeholder="$t('m.standardCategoryTips')"-->
+<!--                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"-->
+<!--                :options="standSortOptions"-->
+<!--                clearable/>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            文本状态&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.textStatus" :placeholder="$t('m.lookupByStandardStatus')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in standStateOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            代替标准号&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.substituteStandardNumber')"  class="serch-form-item">-->
+<!--              <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"-->
+<!--                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            适用车型&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            关联模块（新增字段）&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </div>-->
+<!--      </table-tools-bar>-->
+      <!--    高级筛选-->
+      <el-drawer
+          title="高级搜索"
+          size="700px"
+          :wrapperClosable="false"
+          :visible.sync="isAdvancedSearch">
+        <div class="demo-drawer-content">
           <el-form :model="sarStandardsSearch" :inline="true" class="label-input-form table-lattice" style="display: flex;flex-wrap: wrap">
             <!--            标准号-->
             <el-form-item :label="$t('m.standardNo')"  class="serch-form-item">
@@ -275,14 +339,19 @@
               <el-input v-model="sarStandardsSearch.standName" :placeholder="$t('m.searchByStandardName')" clearable :maxlength="500"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+            <!--            标准英文名称-->
+            <el-form-item :label="$t('m.standardEnglishName')" class="serch-form-item">
+              <el-input v-model="sarStandardsSearch.standEnName" :placeholder="$t('m.searchAccordingToStandardEnglishName')" clearable :maxlength="500"
+                        @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
+            </el-form-item>
             <!--            标准类别-->
             <el-form-item :label="$t('m.standardCategory')"  class="serch-form-item">
               <search-select
-                v-model="sarStandardsSearch.standSort"
-                :placeholder="$t('m.standardCategoryTips')"
-                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
-                :options="standSortOptions"
-                clearable/>
+                  v-model="sarStandardsSearch.standSort"
+                  :placeholder="$t('m.standardCategoryTips')"
+                  @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                  :options="standSortOptions"
+                  clearable/>
             </el-form-item>
             <!--            文本状态-->
             <el-form-item :label="$t('m.standStateShow')"  class="serch-form-item">
@@ -296,20 +365,161 @@
               <el-input v-model="sarStandardsSearch.dtbjh" :placeholder="$t('m.lookUpByAlternativeCriteria')" clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
+            <!--            标准年份-->
+            <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
+              <el-date-picker
+                  v-model="sarStandardsSearch.standYear"
+                  type="date"
+                  placeholder="根据标准年份查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            标准发布日期-->
+            <el-form-item label="标准发布日期"  class="serch-form-item">
+              <el-date-picker
+                  v-model="sarStandardsSearch.issueTime"
+                  type="date"
+                  placeholder="根据标准发布日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            标准性质-->
+            <el-form-item :label="$t('m.standNatureShow')" class="serch-form-item">
+              <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            是否纳入标准清单-->
+            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
+              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+                <el-option value="yes" label="是"></el-option>
+                <el-option value="no" label="否"></el-option>
+              </el-select>
+            </el-form-item>
+            <!--            实施日期-->
+            <el-form-item label="实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.putTime"
+                  type="date"
+                  placeholder="根据实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            新车型实施日期-->
+            <el-form-item title="新车型实施日期" label="新车型实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.XCXTime"
+                  type="date"
+                  placeholder="根据新车型实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            在产车实施日期-->
+            <el-form-item title="在产车实施日期" label="在产车实施日期">
+              <el-date-picker
+                  v-model="sarStandardsSearch.ZCCTime"
+                  type="date"
+                  placeholder="根据在产车实施日期查找">
+              </el-date-picker>
+            </el-form-item>
+            <!--            归口管理部门-->
+            <el-form-item label="归口管理部门">
+              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            起草单位-->
+            <el-form-item label="起草单位">
+              <el-select v-model="sarStandardsSearch.qcdw" placeholder="根据起草单位查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            我司参与深度-->
+            <el-form-item label="我司参与深度">
+              <el-select v-model="sarStandardsSearch.nameShow" placeholder="请选择我司参与深度" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+
+            <!--            能源类型-->
+            <el-form-item label="能源类型">
+              <el-select v-model="sarStandardsSearch.energyKind" placeholder="请选择能源类型" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in nylxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
             <!--            适用车型-->
             <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.cllx" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
+              <el-select v-model="sarStandardsSearch.applyArctic" :placeholder="$t('m.searchAccordingToThApplicableModel')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <el-option v-for="opt in applyArcticOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
             <!--            适用产品线（新增字段）-->
             <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.nylx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
+              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                <el-option v-for="opt in categoryOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                <el-option v-for="opt in sycpxOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
+            <!--            适用认证-->
+            <el-form-item label="适用认证">
+              <el-select v-model="sarStandardsSearch.syzr" placeholder="根据适用认证查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in syzrOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            责任部门-->
+            <el-form-item label="责任部门">
+              <el-select v-model="sarStandardsSearch.zrbm" placeholder="根据责任部门查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in zrbmOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            责任工程师-->
+            <el-form-item label="责任工程师">
+              <el-select v-model="sarStandardsSearch.dutyEngineer" placeholder="根据责任工程师查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in zrgcsOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
+            <!--            关联模块-VPPS编码-->
+            <el-form-item title="关联模块-VPPS编码" label="关联模块-VPPS编码" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.svpps" clearable
+                        placeholder="根据关联模块-VPPS编码查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            代替标准号-->
+            <el-form-item label="代替标准号">
+              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            关联模块-中文名称-->
+            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.standNumber" clearable
+                        placeholder="根据关联模块-中文名称"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            采标编号-->
+            <el-form-item label="采标编号" prop="nameShow">
+              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            采标程度-->
+            <el-form-item label="采标程度" prop="standNumber">
+              <el-input v-model="sarStandardsSearch.standNumber" clearable
+                        placeholder="根据采标程度查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            引用标准-->
+            <el-form-item label="引用标准">
+              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+            <!--            被引用标准-->
+            <el-form-item label="被引用标准">
+              <el-input v-model="sarStandardsSearch.citedStand" clearable
+                        placeholder="根据被引用标准查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
             <!--            关联模块（新增字段）-->
             <el-form-item :label="$t('m.associatedModule')"  class="serch-form-item">
               <el-select v-model="sarStandardsSearch.cycvppsbm" :placeholder="$t('m.SearchByAssociatedModule')" clearable
@@ -320,7 +530,18 @@
             </el-form-item>
           </el-form>
         </div>
-      </table-tools-bar>
+        <div class="demo-drawer-footer">
+          <el-button
+              class="common-button-primary"
+              icon="el-icon-check"
+              type="primary"
+              @click="getDomesticStandardTableBtn(sarStandardsSearch)">搜索</el-button>
+          <el-button
+              class="common-button-default"
+              icon="el-icon-close"
+              @click="clearAllSearch('sarStandardsSearch')">取消</el-button>
+        </div>
+      </el-drawer>
       <!-- 新增海外标准 -->
       <el-drawer
         :title="modalshowtitle"
@@ -2217,10 +2438,11 @@ export default {
     },
     // 树节点鼠标移入移出
     mouseenter(data){
-      console.log(data)
-      this.$set(data, 'show', true)
-      if(data.parentId !== null){
-        this.$set(data, 'showDel', true)
+      if(data.menuName !== '我的收藏'){
+        this.$set(data, 'show', true)
+        if(data.parentId !== null){
+          this.$set(data, 'showDel', true)
+        }
       }
     },
     mouseleave(data){
@@ -2878,7 +3100,7 @@ export default {
       formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
       formData.nowOrder = this.nowOrder
       // 处理我的收藏和个性化标签传参
-      if (this.selectSarMenu.id === 'wdsc') {
+      if (this.selectSarMenu.menuName === '我的收藏') {
         formData.menuId = undefined
         formData.labelMenuId = undefined
         formData.collectMenuId = 'wdsc'
@@ -4272,6 +4494,9 @@ export default {
       text-align: center;
       margin-top: 6px;
       background: #F9F9F9;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis
     }
     /deep/.el-input__inner {
       height: 30px;
@@ -4279,6 +4504,9 @@ export default {
       border-radius: 0 !important;
     }
   }
+  .el-date-editor.el-input, .el-date-editor.el-input__inner{
+    width: 190px
+  }
   .classDisplay{
     display: none;
   }
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
index d526d1e58..e881b4ce8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -138,7 +138,7 @@
               ref="multipleTable"
               :data="sarProStateListDatas"
               tooltip-effect="dark"
-              style="width: 100%"
+              style="width: 100%;"
               border
               :height="sarProStateTableHeight"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -157,7 +157,7 @@
             <el-table-column
               width="150px"
               align="center"
-                prop="standNumber"
+                prop="productId"
                 label="项目编号">
             </el-table-column>
             <el-table-column
@@ -345,6 +345,7 @@ export default {
         this.querySarProStateZero()
       }, // 查看项目符合性
       querySarProStateZero () {
+        this.sarProStateTotalPage = 1
         var form = this.sarProStateEO
         // form.standId = this.standId
         form.current = this.sarProStateTotalPage
@@ -354,6 +355,13 @@ export default {
           loading: 'loading'
         }, res => {
           if (res.ok) {
+            res.data.records.forEach((item)=>{
+              for(let key  in item){
+                if(item[key] == null){
+                  item[key]='无'
+                }
+              }
+            })
             this.sarProStateListDatas = res.data.records
             this.sarProStateTotal = res.data.total
           }
@@ -385,8 +393,10 @@ export default {
   mounted () {
     this.queryStandAndLaws()
     this.tableHeight = $('.regulatory-repository').height() - 159
+    this.sarProStateTableHeight=$('.regulatory-repository').height() -120
     window.onresize = () => {
       this.tableHeight = $('.regulatory-repository').height() - 159
+      this.sarProStateTableHeight=$('.regulatory-repository').height() - 120
     }
   }
 }
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 262bdadba..684ffedb8 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -19,16 +19,17 @@
               </p>
               <p class="transition-box-p">
                   <label class="transition-box-label">上传时间：</label>
+                  <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
+              </p>
+              <p class="transition-box-p">
+                  <label class="transition-box-label">征求意见周期：</label>
                   <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
-                  <span class="transition-box-span">-</span>
-              </p> <p class="transition-box-p">
-              <label class="transition-box-label">征求意见周期：</label>
-              <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
-          </p>
+                  <span class="transition-box-span" v-else>-</span>
+              </p>
           </div>
       </transition>
       <div class="effect">
-          <el-button type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
+          <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
           <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
       </div>
       <div class="container" style="position:relative;">
@@ -64,7 +65,7 @@
                           label="提出人"
                   >
                   </el-table-column>
-                  <el-table-column label="操作" align="center" width="50" fixed="right">
+                  <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
                       <template slot-scope="scope">
                           <div @click.stop style="display: inline-block">
                               <el-dropdown trigger="click" @command="handleCommand">
@@ -146,7 +147,9 @@ export default {
             page: 1,
             size: this.$store.getters.userInfo.configContent,
             userId: this.$store.getters.userInfo.userId,
-        } // 详情数据
+            endTime:  this.$route.query.item.endTime
+        }, // 详情数据
+        ideaKey: false
     }
   },
   methods: {
@@ -162,6 +165,13 @@ export default {
               this.standinfoList = res.data.records
               this.total = res.data.total
               this.spinShow = false
+              res.data.records.forEach(item => {
+                  if (item.ideaKey == 1) {
+                      this.ideaKey = false
+                  } else {
+                      this.ideaKey = true
+                  }
+              })
           }, e => {
           })
       },
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 91385b552..e4412898b 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,12 +4,9 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '39.98.140.126'
-// const devInterfacePORT = '10005'
-// const devIp = '192.168.10.248'
-// const devIp = '101.36.227.25'
-// const devInterfacePORT = '8038'
-const devIp = '10.96.170.156'
+// const devIp = '10.96.10.171'
+// const devInterfacePORT = '9999'
+const devIp = '192.168.1.145'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'