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/img/none-file.png b/src/assets/images/shangqi/img/none-file.png
new file mode 100644
index 000000000..4964ad315
Binary files /dev/null and b/src/assets/images/shangqi/img/none-file.png differ
diff --git a/src/assets/images/shangqi/img/tree-add.png b/src/assets/images/shangqi/img/tree-add.png
new file mode 100644
index 000000000..d0aa3f83e
Binary files /dev/null and b/src/assets/images/shangqi/img/tree-add.png differ
diff --git a/src/assets/images/shangqi/img/tree-show.png b/src/assets/images/shangqi/img/tree-show.png
new file mode 100644
index 000000000..20be364dc
Binary files /dev/null and b/src/assets/images/shangqi/img/tree-show.png differ
diff --git a/src/assets/images/shangqi/img/tree-sub.png b/src/assets/images/shangqi/img/tree-sub.png
new file mode 100644
index 000000000..65cdf3989
Binary files /dev/null and b/src/assets/images/shangqi/img/tree-sub.png differ
diff --git a/src/assets/images/shangqi/img/tree.png b/src/assets/images/shangqi/img/tree.png
new file mode 100644
index 000000000..f79bba76b
Binary files /dev/null and b/src/assets/images/shangqi/img/tree.png differ
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index f9cb687af..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'])
   },
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 4a5b94f9d..c00a70b96 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -65,14 +65,14 @@
           </template>
           <template
             v-for="(child, childIndex) in item.half"
-            v-if="child.isShowImp === '0'"
+            v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
           >
 <!--            代替标准编号-->
             <div
               :key="child.id"
               class="modular-item"
               :class="!(childIndex === item.half.length - 1) || childIndex % 2 === 1 ? 'half' : ''"
-              v-if="child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH'"
+              v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' "
             >
               <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
               <span
@@ -189,18 +189,18 @@
                     />
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
-                  <el-button
-                      @click="showItemsModel(child.attrField)"
-                      class="decomposition-btn"
-                      icon="icon-separate"
-                  >标准分解单</el-button>
+<!--                  <el-button-->
+<!--                      @click="showItemsModel(child.attrField)"-->
+<!--                      class="decomposition-btn"-->
+<!--                      icon="icon-separate"-->
+<!--                  >标准分解单</el-button>-->
                 </p>
               </div>
             </div>
 
           </template>
           <template
-            v-for="(child, childIndex) in item.one"
+            v-for="(child, childIndex) in item.child"
             v-if="child.isShowImp === '0' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
           >
             <div
@@ -217,7 +217,7 @@
                 </p>
               </template>
               <template
-                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ'"
+                v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
               >
                 <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
@@ -283,12 +283,12 @@
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
-                <el-button
-                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"
-                  @click="showItemsModel(child.attrField)"
-                  class="decomposition-btn"
-                  icon="icon-separate"
-                >标准分解单</el-button>
+<!--                <el-button-->
+<!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+<!--                  @click="showItemsModel(child.attrField)"-->
+<!--                  class="decomposition-btn"-->
+<!--                  icon="icon-separate"-->
+<!--                >标准分解单</el-button>-->
               </div>
             </div>
 
@@ -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">
@@ -2724,6 +2718,7 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
+          console.log(this.dynamicFormField)
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 302272626..4601f10bd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1066,8 +1066,10 @@ export default {
         middle.push(item.name);
         files.push(item.response.data.id);
       });
-      this.fileListName = middle;
-      this.fileIds = files;
+      this.listForm.fileName = middle.join(',');
+      this.listForm.fileId = files.join(',');
+      // this.fileListName = middle;
+      // this.fileIds = files;
     },
     fileUpload() {
       this.fileMadel = true;
@@ -1081,12 +1083,17 @@ export default {
         });
         this.fileListName = middle;
         this.fileIds.push(file.response.data.id);
-        if(this.listForm.fileName === null ){
+        if(this.listForm.fileName === null || this.listForm.fileName === undefined){
           this.listForm.fileName = this.fileListName.join(',')
-        }else {
+        } else {
           this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
         }
-        this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
+        if(this.listForm.fileId === null || this.listForm.fileId === undefined){
+          this.listForm.fileId = this.fileIds.join(',')
+        }else {
+          this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
+        }
+        console.log(this.listForm);
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.message);
@@ -1205,7 +1212,11 @@ export default {
             exits.push(item.id)
           }
         });
-        this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
+        if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
+          this.listForm.inforlist = exits.join(',')
+        } else {
+          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 617b6018c..b72ea854f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -78,13 +78,8 @@
             width="180px"
             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>
+              <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>
             </template>
           </el-table-column>
           <el-table-column
@@ -374,14 +369,11 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
-      this.listForm.zrUserId = this.listForm.zrUserId;
-      this.listForm.jlUserId = this.listForm.jlUserId;
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+      if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
+        this.$message.warning('请填写会签意见')
+      }
       this.listForm.commentText = this.commentText;
       this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       this.listForm.signFlag = "";
       const json = JSON.stringify(this.listForm);
       this.$http.post("lawss/activiti/completeTask", {
@@ -412,17 +404,6 @@ 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/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 18e8d27cd..df96a7531 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -527,14 +527,6 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
-      this.listForm.zrUserId = this.listForm.zrUserId;
-      this.listForm.jlUserId = this.listForm.jlUserId;
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
-      this.listForm.commentText = this.commentText;
-      this.listForm.approvalOpinion = "";
-      this.listForm.standId = this.listForm.standId;
       const json = JSON.stringify(this.listForm);
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 92b722e01..0bb01ebaf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -376,14 +376,10 @@
             },
             //提交事件
             handleSubmit() {
-                this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
-                this.listForm.zrUserId = this.listForm.zrUserId;
-                this.listForm.jlUserId = this.listForm.jlUserId;
-                this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-                this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
+            if (this.commentText === null || this.commentText === undefined || this.commentText === ''){
+              this.$message.warning('请填写审批意见')
+            }
                 this.listForm.commentText = this.commentText;
-                this.listForm.signflag = "";
-                this.listForm.standId = this.listForm.standId;
                 const json = JSON.stringify(this.listForm);
                 this.$http.post('lawss/activiti/completeTask', {
                     taskIds: this.taskIds,
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index c7ada11bb..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>
@@ -963,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;"
@@ -1158,6 +1162,7 @@
         },
         data () {
             return {
+              filterText:'',
               textStatusMap: {}, // 文本状态id与name对应
                 standardDrawer: false,
                 loadSarStandard: false,
@@ -1391,6 +1396,7 @@
                 modelOptions: [], // 模块体系架构
                 modelChildOptions: [], // 模块体系架构子集合
                 applyArcticOptions: [], // 适用车型
+                gkglbmOptions: [], // 归口管理部门
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
@@ -1405,6 +1411,9 @@
             }
         },
         watch:{
+          filterText(val) {
+            this.$refs.tree.filter(val);
+          },
             'form.standInData': {
                 handler: function() {
                     this.verifySarStandard = false
@@ -1458,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
@@ -1669,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(",")
@@ -1680,6 +1695,7 @@
                 this.modalShowFlag = false
             },
             cancelUserInfo () {
+                this.filterText = ''
                 this.modalShowFlag = false
             },
             drawerCheck (data) {
@@ -2082,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
@@ -2175,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 6bbadff45..8119b4907 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -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
@@ -821,6 +818,7 @@
                 standStateOptions: [], // 文本状态
                 standSystemOptions: [], // 标准体系
                 applyArcticOptions: [], // 适用车型
+                gkglbmOptions: [], // 归口管理部门
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
@@ -1070,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 599e5826a..195c686e1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -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>
@@ -795,6 +792,7 @@ export default {
       standStateOptions: [], // 文本状态
       standSystemOptions: [], // 标准体系
       applyArcticOptions: [], // 适用车型
+      gkglbmOptions: [], // 归口管理部门
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
@@ -1054,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 6c3ddd005..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>
@@ -1225,6 +1223,7 @@ export default {
       modelOptions: [], // 模块体系架构
       applyArcticOptions: [], // 适用车型
       categoryOptions: [], // 能源类型
+      gkglbmOptions: [], // 归口管理部门
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
       wssmrOptions: [], // 我司署名人
@@ -1750,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 b062aa82e..cd985bbda 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -344,14 +344,11 @@
                                       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-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 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
@@ -784,6 +781,7 @@
                 standSystemOptions: [], // 标准体系
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
+                 gkglbmOptions: [], // 归口管理部门
                 applyAuthOptions: [], // 适用认证
                 cysdOptions: [], // 我司参与深度
                 sycpxOptions: [], // 适用产品线
@@ -978,6 +976,7 @@
                 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/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index 4cea23209..a04520354 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -407,7 +407,7 @@ export default {
       this.modalshowflag = true
     },
     drawerCheck (data) {
-      this.roleForm.dockUserName = data[0].id
+      this.roleForm.dockUser = data[0].id
       this.roleForm.dockUserName = data[0].name
       this.modalshowflag = false
     },
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
index 599337f8c..d6d601ff7 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
@@ -193,7 +193,6 @@ export default {
   },
   created() {
     this.getData()
-    this.getTree()
   },
   methods: {
     getData() {
@@ -293,8 +292,8 @@ export default {
     drawerCheck (data) {
       this.roleForm = data[0]
       // 选择责任人时input框内值
-      this.newDataList.dutyPeople = this.roleRow.name
-      this.newDataList.dutyPeopleId = this.roleRow.id
+      this.newDataList.dutyPeople = this.roleForm.name
+      this.newDataList.dutyPeopleId = this.roleForm.id
       this.lastDataList = this.dataList
       this.modalshowflag = false
     },
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index 2fbc81167..7a6c84f02 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -94,7 +94,7 @@
           <el-table-column prop="dutyEngineer" label="负责人"/>
           <el-table-column label="佐证材料" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-button  type="text" @click="download" >{{scope.row.fileText}}</el-button>
+              <el-button  type="text" @click="download(scope.row)" >{{scope.row.fileText}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -187,9 +187,7 @@ export default {
     },
     getFormFieldList (item) {
       this.$nextTick(() => {
-        console.log(item)
         this.dataList = JSON.parse(JSON.stringify(item)).info.fileDataList
-        console.log(this.dataList)
       })
     },
 
@@ -266,14 +264,8 @@ export default {
       this.getData()
     },
     download(row) {
-      // window.open(process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + tPath)
-      var name = row.fileText;
-      var url = row.fileTextPath;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + "/hospital/file/downloadFile?tPath=" + url)
-      a.click()
+      let attId = row.fileTextId
+      window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
     },
     // 分页事件
     pageChange (page) {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 81a044722..c1c65b777 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -28,16 +28,16 @@
               </el-form-item>
               <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
+                  disabled
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
@@ -93,13 +93,22 @@
           <el-table-column
             prop="distributePerson"
             label="分发责任人">
+<!--                        <template slot-scope="scope">-->
+<!--                          <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
+<!--                          <el-input-->
+<!--                            v-model="dataList.distributePerson"-->
+<!--                            placeholder="请选择分发责任人"-->
+<!--                            @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
+<!--                            readonly-->
+<!--                            v-if="dataList[scope.$index].distributePerson==null"-->
+<!--                          />-->
+<!--                        </template>-->
             <template slot-scope="scope,text" v-if="showColumn">
               <div>
                 <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
-                  {{listForm.dataList[scope.$index].distributePerson==null?"请选择分发负责人":listForm.dataList[scope.$index].distributePerson}}
+                  {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
                 </div>
               </div>
-
             </template>
           </el-table-column>
         </el-table>
@@ -113,7 +122,7 @@
             :model="roleForm"
             :rules="roleFormRules"
             class="label-input-form">
-            <el-timeline-item timestamp="发起流程"  placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
+            <el-timeline-item timestamp="发起流程" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="startUserName" style="margin-bottom: 0">
                   <h4>标准法规工程师</h4>
@@ -241,17 +250,26 @@
               >
               </el-table-column>
               <el-table-column
-                prop="issueTime"
+                prop="putTime"
                 label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.putTime ? $moment(scope.row.putTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
               </el-table-column>
               <el-table-column
-                prop="xcxssrq"
+                prop="xcxssrqgj"
                 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="zccssrq"
+                prop="zccssrqgj"
                 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
@@ -370,20 +388,20 @@ export default {
       // 查询相关参数
       searching: false,
       standardSearch: {
-        standType:'',
-        standName:'',
+        standType: "",
+        standName: ""
       },
       standardTypeOptions: [
         {
-          value: 'INLAND',
-          label: '国内标准法规',
-          item:'INLAND',
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
         },
         {
-          value: 'FOREIGN',
-          label: '海外标准法规',
-          item:'FOREIGN',
-        },
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
       ],
       nodeList: [],
       defaultProps: {
@@ -394,14 +412,14 @@ export default {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.id,
         qualityEngineer: "",
-        certifiedEngineer:"",
+        certifiedEngineer: "",
         qualityEngineerName: "",
-        certifiedEngineerName:"",
+        certifiedEngineerName: "",
         distributePerson: "",
-        dockUser:'',
-        ministerUser:"",
-        dockUserName:'',
-        ministerUserName:"",
+        dockUser: "",
+        ministerUser: "",
+        dockUserName: "",
+        ministerUserName: ""
       },
       formRules: {
         standName: [
@@ -415,7 +433,7 @@ export default {
         ],
         certifiedEngineer: [
           { required: true, message: "请选择认证工程师", trigger: "change" }
-        ],
+        ]
       },
       roleFormRules: {
         dockUserName: [
@@ -423,7 +441,7 @@ export default {
         ],
         ministerUserName: [
           { required: true, message: "请选择标准法规部领导", trigger: "change" }
-        ],
+        ]
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
@@ -459,29 +477,29 @@ export default {
         dataList: [{
           projectLine: "", //产品线
           uname: "",//产品线责任人
-          projectManager:"",// 产品线责任人id
+          projectManager: "",// 产品线责任人id
           distributePerson: "", //分发责任人
           distributePersonId: "", //分发责任人id
           id: "",
           sarStandProjectLibraries: [{
-            projectManager: '',
-            projectLevel: '',
-            projectNumber: '',
-            projectEndDate: '',
-            currentNode: '',
-            projectGroup: '',
-            productLine: '',
-            projectClassification: '',
-            projectStatus: '',
-            projectStartDate: '',
-            id: '',
-            projectName: '',
-            projectPlatfor: ''
+            projectManager: "",
+            projectLevel: "",
+            projectNumber: "",
+            projectEndDate: "",
+            currentNode: "",
+            projectGroup: "",
+            productLine: "",
+            projectClassification: "",
+            projectStatus: "",
+            projectStartDate: "",
+            id: "",
+            projectName: "",
+            projectPlatfor: ""
           }]
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      showColumn:true
+      showColumn: true
     };
   },
   methods: {
@@ -491,25 +509,26 @@ export default {
         this.roleForm.dockUserName = data[0].name;
       } else if (this.type === "ministerUser") {
         this.roleForm.ministerUser = data[0].id;
-        this.roleForm.ministerUserName =  data[0].name;
+        this.roleForm.ministerUserName = data[0].name;
       } else if (this.type === "qualityEngineer") {
         this.roleForm.qualityEngineer = data[0].id;
-        this.roleForm.qualityEngineerName =  data[0].name;
+        this.roleForm.qualityEngineerName = data[0].name;
         this.listForm.qualityEngineer = data[0].id;
         this.listForm.qualityEngineerName = data[0].name;
       } else if (this.type === "certifiedEngineer") {
         this.roleForm.certifiedEngineer = data[0].id;
         this.roleForm.certifiedEngineerName = data[0].name;
-        this.listForm.certifiedEngineer =  data[0].id;
-        this.listForm.certifiedEngineerName =  data[0].name;
+        this.listForm.certifiedEngineer = data[0].id;
+        this.listForm.certifiedEngineerName = data[0].name;
       } else if (this.type === "distributePerson") {
-        this.listForm.distributePerson = data[0].name;
-        this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id
-        this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name
+        // this.dataList.distributePerson = data[0].id;
+        // this.dataList.distributePersonName = data[0].name;
+        this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
+        this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
         this.showColumn = false;
         this.$nextTick(() => {
-          this.showColumn = true
-        })
+          this.showColumn = true;
+        });
       }
       this.modalshowflag = false;
     },
@@ -521,7 +540,7 @@ export default {
       this.active = name;
     },
     typeChange(type) {
-      this.standardSearch.standType = type
+      this.standardSearch.standType = type;
     },
     choiceShow() {
       this.ListModel = true;
@@ -542,32 +561,32 @@ export default {
     //点击添加事件
     addList() {
       this.standModel = true;
-      this.$refs.projectTable.clearSelection()
+      this.$refs.projectTable.clearSelection();
     },
     // 点击批量删除事件
     deleteList() {
-       if(this.selectList.length < 1){
-         this.$message.warning('请选择一条数据进行删除')
-       }else {
-          this.$confirm('您确认删除这些数据？', '提示', {
-            confirmButtonText: "确认",
-            confirmButtonClass: "common-button-primary",
-            cancelButtonText: "取消",
-            type: "warning"
-          }). then(() => {
-            this.selectList.map(item => {
-              let index;
-            index =  this.dataList.findIndex(items => {
-                return items.productLine = item
-              })
-              if (index > -1) {
-                this.dataList.splice(index, 1);
-              }
+      if (this.selectList.length < 1) {
+        this.$message.warning("请选择一条数据进行删除");
+      } else {
+        this.$confirm("您确认删除这些数据？", "提示", {
+          confirmButtonText: "确认",
+          confirmButtonClass: "common-button-primary",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.selectList.map(item => {
+            let index;
+            index = this.dataList.findIndex(items => {
+              return items.productLine = item;
             });
-            this.selectList = [];
-          }).catch(() => {
-          })
-       }
+            if (index > -1) {
+              this.dataList.splice(index, 1);
+            }
+          });
+          this.selectList = [];
+        }).catch(() => {
+        });
+      }
     },
     //取消添加事件
     cancelStand() {
@@ -576,21 +595,21 @@ export default {
     //确认添加事件
     okStand() {
       let proData = [];
-      if(this.dataList.length >= 1){
-       this.dataList.forEach(item => {
-         if(proData.length === 0){
-           proData.push(item.productLine)
-         }else if(!proData.includes(item.productLine)){
-           proData.push(item.productLine)
-         }
-       })
-        this.standList.forEach(items => {
-          if(!proData.includes(items.productLine)){
-            this.dataList.push(items)
+      if (this.dataList.length >= 1) {
+        this.dataList.forEach(item => {
+          if (proData.length === 0) {
+            proData.push(item.productLine);
+          } else if (!proData.includes(item.productLine)) {
+            proData.push(item.productLine);
           }
-        })
+        });
+        this.standList.forEach(items => {
+          if (!proData.includes(items.productLine)) {
+            this.dataList.push(items);
+          }
+        });
         this.standModel = false;
-      }else{
+      } else {
         if (this.standList.length >= 1) {
           this.dataList = this.standList;
           this.roleForm.directorUser = this.dataList[0].uname;
@@ -607,7 +626,7 @@ export default {
       let _formData = new FormData();
       _formData.append("createUser", this.$store.getters.userInfo.userId);
       _formData.append("createUserName", this.$store.getters.userInfo.uName);
-      _formData.append("prcType", '5');
+      _formData.append("prcType", "5");
       _formData.append("json", JSON.stringify({
         prcForm: this.prcForm,
         sarAccessInfoList: this.sarAccessInfoList,
@@ -625,19 +644,17 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      if (this.dataList.length < 1) {
+        this.$message.warning("请添加产品线信息");
+      }
       this.dataList.forEach(item => {
-        if(item.distributePerson === '' || item.distributePerson === null || item.distributePerson === undefined){
-          this.$message.warning('请选择分发责任人')
+        if (item.distributePerson === "" || item.distributePerson === null || item.distributePerson === undefined) {
+          this.$message.warning("请选择分发责任人");
         } else {
-          var json = Object.assign(this.listForm, this.roleForm)
-          json.prcCreateUser = this.$store.getters.userInfo.userId;
-          json.prcCreateUserName = this.$store.getters.userInfo.uName;
-          json.standId = this.listForm.standId;
-          json.XCXSSRQ =  this.sarAccessListDatas[0].xcxssrqgj
-          json.ZCCSSRQ =  this.sarAccessListDatas[0].zccssrqgj
-          this.$refs['listForm'].validate((valid) => {
+          var json = Object.assign(this.listForm, this.roleForm);
+          this.$refs["listForm"].validate((valid) => {
             if (valid) {
-              this.$refs['roleForm'].validate((valid) => {
+              this.$refs["roleForm"].validate((valid) => {
                 if (valid) {
                   this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
                     _this: this
@@ -666,7 +683,7 @@ export default {
             }
           });
         }
-      })
+      });
 
     },
     //选择拆分标准取消事件
@@ -723,8 +740,8 @@ export default {
     selectThree(data) {
       this.standList = data;
     },
-    choiceZRR(scope,type, title, id) {
-      if(scope!=null){
+    choiceZRR(scope, type, title, id) {
+      if (scope != null) {
         this.dsadadadsada = scope.$index;
       }
       this.nodeList = [];
@@ -740,19 +757,19 @@ export default {
     },
     pageChange(page) {
       this.page = page;
-      this.getStandData()
+      this.getStandData();
     },
     pageSizeChange(pageSize) {
       this.pageSize = this.$store.getters.userInfo.configContent;
-      this.getStandData()
+      this.getStandData();
     },
     pageChangeNo(page) {
       this.pageNO = page;
-      this.getProductData()
+      this.getProductData();
     },
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
-      this.getProductData()
+      this.getProductData();
     },
     //获取产品线数据
     getProductData() {
@@ -769,27 +786,27 @@ export default {
       });
     },
     //获取标准数据
-    getStandData(){
-      this.$http.post('SarStandItems/sar-stand-items/findStand',{
+    getStandData() {
+      this.$http.post("SarStandItems/sar-stand-items/findStand", {
         page: this.page,
         size: this.pageSize,
-        ...this.standardSearch,
-      },{
-        _this: this,
+        ...this.standardSearch
+      }, {
+        _this: this
       }, res => {
         this.sarAccessListDatas = res.records;
-        this.total = res.total
+        this.total = res.total;
       }, e => {
 
-      })
+      });
     },
     clearSearch() {
       this.standardSearch = {
         standName: "",
-        standType:"",
+        standType: ""
       };
       this.getStandData();
-    },
+    }
   },
   computed: {},
   mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 7c9ef4c0b..123463a43 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index fbe139e45..439803ab4 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index 420fd9107..97fe79a24 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index f5d42974e..8e59d2f47 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index eaa28bcd6..ea95b1152 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 467b93137..7540a8b3a 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -25,14 +25,14 @@
                 <el-input
                   v-model="listForm.standNumber"
                   placeholder="请输入标准编号"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="标准名称" prop="standName" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.standName"
                   placeholder="请输入标准名称"
-                  clearable
+                  disabled
                 ></el-input>
               </el-form-item>
               <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 60757cd0d..f2c52fcc1 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="更新时间"
@@ -269,6 +259,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records
+        this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 36b0a7b56..1340cb86d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -266,6 +266,7 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        current: 1,
         page: 1,
         pageSize: this.pageSize,
         ...this.sarSarAccessEOSearch,
@@ -274,6 +275,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records;
+        this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total;
       }, e => {
       });
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index d90958400..9cb9ccc1f 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -267,7 +267,7 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
-        page: this.page,
+        page: 1,
         pageSize: this.pageSize,
         ...this.sarSarAccessEOSearch,
         sortKey: 2
@@ -275,6 +275,7 @@ export default {
         _this: this
       }, res => {
         this.sarAccessListDatas = res.data.records;
+        this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
       }, e => {
       });
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index f001bac6b..8d81c22bc 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1168,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('请选中需要添加到 清单条目 的(标准号/政策编号)')
@@ -1329,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 => {
             })
@@ -1363,6 +1367,7 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
@@ -1374,16 +1379,29 @@ 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 => {
@@ -1403,16 +1421,29 @@ 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 => {
@@ -1426,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 => {
         // 责任部门转换
@@ -1834,7 +1878,7 @@ export default {
     },
     // 点击查看
     handlePreview (data) {
-      let routerName = data.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+      let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
@@ -1947,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 => {
       })
@@ -2020,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 {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index 08ec91a6c..df8f46aec 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -346,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"
@@ -360,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>
@@ -396,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>
@@ -451,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: '',
@@ -1022,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()
           }
@@ -1069,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
@@ -1126,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(',')
           // 判断是否有附件
@@ -1150,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 => {
             })
@@ -1184,6 +1333,7 @@ export default {
     selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = ''
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
       }
@@ -1195,16 +1345,29 @@ 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 => {
@@ -1225,16 +1388,29 @@ 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 => {
@@ -1248,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 => {
         // 责任部门转换
@@ -1656,13 +1845,13 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+    handlePreview (data) {
+      let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
-          pageType: item.sarType
+          id: data.id,
+          pageType: this.sarAccessInfoSearch.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1771,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 => {
 
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index a784e604c..fc4bc99ef 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -346,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"
@@ -360,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>
@@ -396,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>
@@ -466,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: [
@@ -1024,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()
           }
@@ -1070,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
@@ -1127,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(',')
           // 判断是否有附件
@@ -1151,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 => {
             })
@@ -1185,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'
       }
@@ -1196,16 +1344,29 @@ 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 => {
@@ -1226,16 +1387,29 @@ 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 => {
@@ -1249,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 => {
         // 责任部门转换
@@ -1659,13 +1846,13 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (item) {
-      let routerName = item.sarType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
+    handlePreview (data) {
+      let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
         params: {
-          id: item.resId,
-          pageType: item.sarType
+          id: data.id,
+          pageType: this.sarAccessInfoSearch.dataSource
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1776,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 => {
 
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index bc158ef55..a4a42d0cf 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -10,7 +10,9 @@
         <el-tree
                 ref="tree"
                 node-key="id"
-                class="filter-tree"
+                class="tree-line"
+                icon-class="icon-tree"
+                :indent="0"
                 :props="props"
                 :data="treeList"
                 highlight-current
@@ -19,7 +21,7 @@
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                        <span> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
                         <span>
                           <el-button
                                   type="text"
@@ -439,7 +441,7 @@
                   ></custom-date-pick-group>
                 </template>
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'CHJL'">
-                  <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'BYYBJ' || field.attrField === 'CBBH'">
+                  <template v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'CBBH' || field.attrField === 'BFDTBZ'">
                     <custom-input-for-standards
                       :key="field.attrField"
                       :config="field"
@@ -502,6 +504,14 @@
                             ></el-input>
                         </el-form-item>
                     </template>
+                    <template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
+                        <custom-input
+                                :key="field.attrField"
+                                :config="field"
+                                v-model="sarStandardsInfoEO[field.attrField]"
+                                :disabled="true"
+                        ></custom-input>
+                    </template>
                     <template v-else>
                         <custom-input
                                 :key="field.attrField"
@@ -2689,7 +2699,6 @@ 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 +3371,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, {
@@ -4724,6 +4733,93 @@ export default {
   }
 }
 </script>
+<style lang="less" scoped>
+    /deep/ .icon-tree {
+        margin:0  5px 0 10px;
+        position:relative;
+        background:url('~@/assets/images/shangqi/img/tree-add.png');
+        background-size:100% 100%;
+    }
+    /deep/ .expanded{
+        background:url('~@/assets/images/shangqi/img/tree-sub.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf{
+        background-image:none;
+        background-size:100% 100%;
+    }
+    /deep/ .is-leaf-none{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/none-file.png');
+        background-size:100% 100%;
+    }
+    /deep/ .is-show{
+        position: relative;
+        display: inline-block;
+        width: 15px;
+        height: 15px;
+        background:url('~@/assets/images/shangqi/img/tree.png');
+        background-size:100% 100%;
+    }
+    /deep/.tree-line{
+        .el-tree-node {
+            position: relative;
+            padding-left: 0px; // 缩进量
+        }
+        .el-tree-node__children {
+            padding-left: 16px; // 缩进量
+        }
+
+        // 竖线
+        .el-tree-node::before {
+            content: "";
+            height: 100%;
+            width: 1px;
+            position: absolute;
+            left: -3px;
+            top: -26px;
+            border-width: 1px;
+            border-left: 1px dashed #858990e0;
+        }
+        // 当前层最后一个节点的竖线高度固定
+        .el-tree-node:last-child::before {
+            height: 38px; // 可以自己调节到合适数值
+        }
+
+        // 横线
+        .el-tree-node::after {
+            content: "";
+            width: 11px;
+            height: 20px;
+            position: absolute;
+            left: -3px;
+            top: 12px;
+            border-width: 1px;
+            border-top: 1px dashed #858990e0;
+        }
+
+        // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+        & > .el-tree-node::after {
+            border-top: none;
+        }
+        & > .el-tree-node::before {
+            border-left: none;
+        }
+
+        // 展开关闭的icon
+        .el-tree-node__expand-icon{
+            font-size: 16px;
+            // 叶子节点（无子节点）
+            &.is-leaf{
+                color: transparent;
+                // display: none; // 也可以去掉
+            }
+        }
+    }
+</style>
 
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 6556822d2..d406fb59f 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -10,7 +10,9 @@
         <el-tree
                 ref="tree"
                 node-key="id"
-                class="filter-tree"
+                class="tree-line"
+                icon-class="icon-tree"
+                :indent="0"
                 :props="props"
                 :data="treeList"
                 highlight-current
@@ -19,7 +21,7 @@
                 default-expand-all
                 :expand-on-click-node="false">
                 <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
-                        <span> {{ node.label}} </span>
+                        <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
                         <span>
                           <el-button
                                   type="text"
@@ -261,9 +263,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 +341,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 +367,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 +532,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"
@@ -4092,6 +4315,93 @@ export default {
 }
 </script>
 
+<style lang="less" scoped>
+  /deep/ .icon-tree {
+    margin:0  5px 0 10px;
+    position:relative;
+    background:url('~@/assets/images/shangqi/img/tree-add.png');
+    background-size:100% 100%;
+  }
+  /deep/ .expanded{
+    background:url('~@/assets/images/shangqi/img/tree-sub.png');
+    background-size:100% 100%;
+  }
+  /deep/ .is-leaf{
+    background-image:none;
+    background-size:100% 100%;
+  }
+  /deep/ .is-leaf-none{
+    position: relative;
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    background:url('~@/assets/images/shangqi/img/none-file.png');
+    background-size:100% 100%;
+  }
+  /deep/ .is-show{
+    position: relative;
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    background:url('~@/assets/images/shangqi/img/tree.png');
+    background-size:100% 100%;
+  }
+  /deep/.tree-line{
+    .el-tree-node {
+      position: relative;
+      padding-left: 0px; // 缩进量
+    }
+    .el-tree-node__children {
+      padding-left: 16px; // 缩进量
+    }
+
+    // 竖线
+    .el-tree-node::before {
+      content: "";
+      height: 100%;
+      width: 1px;
+      position: absolute;
+      left: -3px;
+      top: -26px;
+      border-width: 1px;
+      border-left: 1px dashed #858990e0;
+    }
+    // 当前层最后一个节点的竖线高度固定
+    .el-tree-node:last-child::before {
+      height: 38px; // 可以自己调节到合适数值
+    }
+
+    // 横线
+    .el-tree-node::after {
+      content: "";
+      width: 11px;
+      height: 20px;
+      position: absolute;
+      left: -3px;
+      top: 12px;
+      border-width: 1px;
+      border-top: 1px dashed #858990e0;
+    }
+
+    // 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
+    & > .el-tree-node::after {
+      border-top: none;
+    }
+    & > .el-tree-node::before {
+      border-left: none;
+    }
+
+    // 展开关闭的icon
+    .el-tree-node__expand-icon{
+      font-size: 16px;
+      // 叶子节点（无子节点）
+      &.is-leaf{
+        color: transparent;
+        // display: none; // 也可以去掉
+      }
+    }
+  }
+</style>
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
@@ -4273,6 +4583,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;
@@ -4280,6 +4593,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 5cfaa58ff..e881b4ce8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue
@@ -345,6 +345,7 @@ export default {
         this.querySarProStateZero()
       }, // 查看项目符合性
       querySarProStateZero () {
+        this.sarProStateTotalPage = 1
         var form = this.sarProStateEO
         // form.standId = this.standId
         form.current = this.sarProStateTotalPage
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index d79752675..e1715915f 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -25,33 +25,39 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="historySearch.responseUnitShow" v-show="false" />
-            <el-popover
-              placement="bottom"
-              popper-class="user-dept-popper"
-              trigger="click"
-              :value="false"
-            >
-              <el-input
-                slot="reference"
-                v-model="historySearch.responseUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
+            <el-select v-model="historySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+              <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="责任部门" class="search-item">-->
+<!--            <el-input v-model="historySearch.responseUnitShow" v-show="false" />-->
+<!--            <el-popover-->
+<!--              placement="bottom"-->
+<!--              popper-class="user-dept-popper"-->
+<!--              trigger="click"-->
+<!--              :value="false"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                slot="reference"-->
+<!--                v-model="historySearch.responseUnitShow"-->
+<!--                placeholder="根据责任部门查找"-->
+<!--                readonly-->
+<!--                clearable-->
+<!--                id="searchResp"-->
+<!--              />-->
+<!--              <div class="api">-->
+<!--                <laws-tree-->
+<!--                  :zNodes="zNodesSItem"-->
+<!--                  treeDivId="zNodesSItemSearch"-->
+<!--                  deptSelect-->
+<!--                  showRMenu-->
+<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+<!--                </laws-tree>-->
+<!--              </div>-->
+<!--            </el-popover>-->
+<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -374,6 +380,7 @@ export default {
       total: 0,
       // 当前页数
       pageNo: 1,
+      zrbmOptions:[],
       // 单页数量
       pageSize: this.$store.getters.userInfo.configContent,
       // 历史数据查看
@@ -652,6 +659,17 @@ export default {
     }
   },
   mounted () {
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.allSelectOptions = res.data || {}
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.getGzzOption()
+      this.setMap(this.standStateOptions)
+    }, e => {
+    })
     this.getTableBtn()
     this.getOrgTreeSource()
   }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 38daf3d9b..0dfe97778 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -17,33 +17,39 @@
                       :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
-            <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />
-            <el-popover
-              placement="bottom"
-              popper-class="user-dept-popper"
-              trigger="click"
-              :value="false"
-            >
-              <el-input
-                slot="reference"
-                v-model="nonConformitySearch.responsibleUnitShow"
-                placeholder="根据责任部门查找"
-                readonly
-                clearable
-                id="searchResp"
-              />
-              <div class="api">
-                <laws-tree
-                  :zNodes="zNodesSItem"
-                  treeDivId="zNodesSItemSearch"
-                  deptSelect
-                  showRMenu
-                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                  class="ztree" style="width: 200px;height: 400px;overflow: auto">
-                </laws-tree>
-              </div>
-            </el-popover>
+            <el-select v-model="nonConformitySearch.responsibleUnit" placeholder="根据责任部门查找" clearable>
+              <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="责任部门" class="search-item">-->
+<!--            <el-input v-model="nonConformitySearch.responsibleUnit" v-show="false" />-->
+<!--            <el-popover-->
+<!--              placement="bottom"-->
+<!--              popper-class="user-dept-popper"-->
+<!--              trigger="click"-->
+<!--              :value="false"-->
+<!--            >-->
+<!--              <el-input-->
+<!--                slot="reference"-->
+<!--                v-model="nonConformitySearch.responsibleUnitShow"-->
+<!--                placeholder="根据责任部门查找"-->
+<!--                readonly-->
+<!--                clearable-->
+<!--                id="searchResp"-->
+<!--              />-->
+<!--              <div class="api">-->
+<!--                <laws-tree-->
+<!--                  :zNodes="zNodesSItem"-->
+<!--                  treeDivId="zNodesSItemSearch"-->
+<!--                  deptSelect-->
+<!--                  showRMenu-->
+<!--                  @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"-->
+<!--                  class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
+<!--                </laws-tree>-->
+<!--              </div>-->
+<!--            </el-popover>-->
+<!--          </el-form-item>-->
           <el-form-item class="search-item btn-box">
             <el-button
               type="primary"
@@ -427,6 +433,7 @@ export default {
         productName: '', // 项目名称
         responsibleUnit: '' // 责任部门
       },
+      zrbmOptions: [], // 责任部门下拉框
       // 责任部门
       zNodesSItem: [],
       myLoading: {
@@ -654,6 +661,17 @@ export default {
     },
   },
   mounted () {
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.allSelectOptions = res.data || {}
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.getGzzOption()
+      this.setMap(this.standStateOptions)
+    }, e => {
+    })
     this.getTableByPage()
     // 加载所有的部门
     this.getOrgTreeSource()