Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

src/pages/config/pages/postManage/index.vue

@@ -45,7 +45,7 @@
                         width="170px">
                 </el-table-column>
                 <el-table-column
-                        prop="createTime"
+                        prop="operateTime"
                         label="操作时间"
                         width="170px">
                 </el-table-column>

src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue

@@ -29,7 +29,9 @@
                                     <el-radio label="project">项目清单</el-radio>
                                     <el-radio label="other">其他清单</el-radio>
                                 </el-radio-group>
-                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>
+                                <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
+                                    选择清单
+                                </el-button>
                             </el-form-item>
                             <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
                                 <el-input
@@ -39,27 +41,27 @@
                                         clearable
                                 ></el-input>
                             </el-form-item>
-              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">
+                            <!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">-->
-<!--                <el-input-->
+                            <!--&lt;!&ndash;                <el-input&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  v-model="listForm.applyRegion"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  placeholder="请输入适用区域"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  clearable&ndash;&gt;-->
+                            <!--&lt;!&ndash;                ></el-input>&ndash;&gt;-->
+                            <!--                <el-select-->
+                            <!--                  width="120"-->
                             <!--                  v-model="listForm.applyRegion"-->
-<!--                  placeholder="请输入适用区域"-->
+                            <!--                  placeholder="请选择适用区域"-->
-<!--                  clearable-->
+                            <!--                  filterable-->
-<!--                ></el-input>-->
+                            <!--                >-->
-                <el-select
+                            <!--                  <el-option-->
-                  width="120"
+                            <!--                    v-for="item in countryOptions"-->
-                  v-model="listForm.applyRegion"
+                            <!--                    :value="item.value"-->
-                  placeholder="请选择适用区域"
+                            <!--                    :key="item.value"-->
-                  filterable
+                            <!--                    :label="item.label"-->
-                >
+                            <!--                  >-->
-                  <el-option
+                            <!--                  </el-option>-->
-                    v-for="item in countryOptions"
+                            <!--                </el-select>-->
-                    :value="item.value"
+                            <!--              </el-form-item>-->
-                    :key="item.value"
-                    :label="item.label"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
                             <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                                 <el-input
                                         v-model="listForm.descriptionList"
@@ -202,12 +204,14 @@
                                     <h4>标准/政策法规工程师</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input>
+                                        <el-input v-model="roleForm.startUserName" placeholder="流程发起人"
+                                                  disabled></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
+                        <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
+                                          :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
                             <el-card>
                                 <el-form-item prop="dockUserName" style="margin-bottom: 0">
                                     <h4>会签人</h4>
@@ -220,7 +224,8 @@
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-            <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
+                        <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
+                                          :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
                             <el-card>
                                 <el-form-item prop="dockUserName2" style="margin-bottom: 0">
                                     <h4>会签人</h4>
@@ -233,7 +238,8 @@
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-            <el-timeline-item timestamp="根据会签意见修订" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="根据会签意见修订" placement="top"
+                                          :color="roleForm.ministerUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="ministerUserName" style="margin-bottom: 0">
                                     <h4>标准/政策法规工程师</h4>
@@ -245,7 +251,8 @@
                                 </el-form-item>
                             </el-card>
                         </el-timeline-item>
-            <el-timeline-item timestamp="审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''">
+                        <el-timeline-item timestamp="审批" placement="top"
+                                          :color="roleForm.directorUser ? '#66b1ff' : ''">
                             <el-card>
                                 <el-form-item prop="directorUserName" style="margin-bottom: 0">
                                     <h4>业务经理</h4>
@@ -272,7 +279,8 @@
                 <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
                     <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
                         <div class="left">
-              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                            <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
+                                     style="margin-left:10px">
                                 <!--                <el-form-item label="国家/地区" class="search-item search-item-last">-->
                                 <!--                  <el-select-->
                                 <!--                    v-model="sarSarAccessEOSearch.countryArea"-->
@@ -343,7 +351,8 @@
                                     align="center"
                             >
                                 <template slot-scope="scope">
-                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                                        scope.row.detailedListName }}</a>
                                 </template>
                             </el-table-column>
                             <el-table-column
@@ -383,7 +392,8 @@
                                     align="center">
                                 <template slot-scope="scope">
                                     <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
+                                        hh:mm:ss") : scope.row.updateTime
                                         }}
                                     </div>
                                 </template>
@@ -422,7 +432,8 @@
                                     align="center"
                             >
                                 <template slot-scope="scope">
-                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                                        scope.row.detailedListName }}</a>
                                 </template>
                             </el-table-column>
                             <el-table-column
@@ -462,7 +473,8 @@
                                     align="center">
                                 <template slot-scope="scope">
                                     <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
+                                        hh:mm:ss") : scope.row.updateTime
                                         }}
                                     </div>
                                 </template>
@@ -501,7 +513,8 @@
                                     align="center"
                             >
                                 <template slot-scope="scope">
-                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
+                                    <a class="table-jump" @click.stop="showTable(scope.row)">{{
+                                        scope.row.detailedListName }}</a>
                                 </template>
                             </el-table-column>
                             <el-table-column
@@ -541,7 +554,8 @@
                                     align="center">
                                 <template slot-scope="scope">
                                     <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
+                                        {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD
+                                        hh:mm:ss") : scope.row.updateTime
                                         }}
                                     </div>
                                 </template>
@@ -578,7 +592,8 @@
                 <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
                     <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
                         <div class="left">
-                          <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                            <el-form :modal="standardSearch" :inline="true" class="label-input-form"
+                                     style="margin-left:10px">
                                 <el-form-item label="类型" class="search-item search-item-last">
                                     <el-select
                                             @change="typeChange"
@@ -645,9 +660,11 @@
                                     label="标准号">
                                 <template slot-scope="scope">
                                     <a v-if="scope.row.standYear" class="table-jump"
-                     @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
+                                       @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 }}
+                                    <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
+                                        scope.row.standSortShow }}
                                         {{ scope.row.standNumber }}</a>
                                 </template>
                             </el-table-column>
@@ -728,10 +745,12 @@
                     ref="tree">
             </el-tree>
             <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
+                           @click="saveUserInfo">
                     确定
                 </el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消
+                </el-button>
             </div>
         </el-drawer>
         <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
@@ -833,6 +852,7 @@ export default {
       sarAccessListDatas: [], //国家地区清单表格
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
       fileInfoList: [], // 上传的附件
+      fileIds: [], // 上传的附件
       fileListName: [], //上传的附件名称
       standardData: [], //添加标准数据
       standardData1: [], //添加标准数据
@@ -856,7 +876,7 @@ export default {
       listForm: {
         listType: "", //区分是哪个清单
         listName: "", //清单名称
-        applyRegion: "", //适用区域
+        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         fileId:'',
         model: '', // 上传模板
@@ -875,7 +895,7 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      countryOptions: [], //适用区域下拉框数据
+      // countryOptions: [], //适用区域下拉框数据
       standardTypeOptions: [
         {
           value: 'INLAND',
@@ -1064,10 +1084,10 @@ export default {
     //提交事件
     handleSubmit() {
       let json = this.listForm;
-      console.log(this.fileInfoList);
+      this.listForm.fileId = this.fileIds.join(',')
-      console.log(this.fileInfoList.join(','));
-      this.listForm.fileId = this.fileInfoList.join(',')
       this.listForm.fileName =  this.fileListName.join(',')
+      this.listForm.model=this.listForm.fileId
+      this.listForm.modelName=this.listForm.fileName
         // let json = Object.assign(this.listForm, this.roleForm)
       json.zrUserId = this.roleForm.dockUser; //会签人
       json.jlUserId = this.roleForm.directorUser;   //业务经理
@@ -1111,12 +1131,14 @@ export default {
     },
     // 删除上传的文件
     delFileInfo(file, fileList) {
-      this.fileInfoList = fileList
       let middle = []
+      let files=[]
       fileList.forEach(item => {
         middle.push(item.name)
+          files.push(item.response.data.id)
       })
       this.fileListName = middle
+        this.fileIds=files
     },
     fileUpload () {
       this.fileMadel = true
@@ -1129,9 +1151,7 @@ export default {
           middle.push(item.name)
         })
         this.fileListName = middle
-       let files = []
+        this.fileIds.push(file.response.data.id)
-        this.flielist
-        // this.fileInfoList = fileList
         // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
         // this.$message.success('上传成功')
       } else {
@@ -1456,11 +1476,13 @@ export default {
                 }
             }
         }
+
         .add-form-el-select {
             /deep/ .el-select {
                 width: 210px;
             }
         }
+
         .demo-drawer-content {
             margin-top: 10px;
         }

src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue

@@ -37,14 +37,14 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
+<!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
-                <el-input
+<!--                <el-input-->
-                  disabled
+<!--                  disabled-->
-                  v-model="listForm.applyRegion"
+<!--                  v-model="listForm.applyRegion"-->
-                  placeholder="请输入适用区域"
+<!--                  placeholder="请输入适用区域"-->
-                  clearable
+<!--                  clearable-->
-                ></el-input>
+<!--                ></el-input>-->
-              </el-form-item>
+<!--              </el-form-item>-->
               <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                 <el-input
                   disabled
@@ -250,7 +250,7 @@ export default {
       listForm: {
         listType: "", //区分是哪个清单
         listName: "", //清单名称
-        applyRegion: "", //适用区域
+        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         enclosure: "", //附件
         inforlist: "",//用来存放标准的id
@@ -267,7 +267,7 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      countryOptions: [], //适用区域下拉框数据
+      // countryOptions: [], //适用区域下拉框数据
       user1: "",
       user2: "",
       user3: "",

src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue

@@ -37,13 +37,13 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
+<!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
-                <el-input
+<!--                <el-input-->
-                  v-model="listForm.applyRegion"
+<!--                  v-model="listForm.applyRegion"-->
-                  placeholder="请输入适用区域"
+<!--                  placeholder="请输入适用区域"-->
-                  clearable
+<!--                  clearable-->
-                ></el-input>
+<!--                ></el-input>-->
-              </el-form-item>
+<!--              </el-form-item>-->
               <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                 <el-input
                   v-model="listForm.descriptionList"
@@ -340,7 +340,7 @@ export default {
       pageSizeNo: this.$store.getters.userInfo.configContent,
       listForm: {
         listName: "", //清单名称
-        applyRegion: "", //适用区域
+        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         enclosure: "", //附件
         signFlag: "1",   //是否会签 1为会签 2为不会签
@@ -357,7 +357,7 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      countryOptions: [], //适用区域下拉框数据
+      // countryOptions: [], //适用区域下拉框数据
       user1: "",
       user2: "",
       user3: "",

src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue

@@ -37,14 +37,14 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
+<!--              <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
-                <el-input
+<!--                <el-input-->
-                  disabled
+<!--                  disabled-->
-                  v-model="listForm.applyRegion"
+<!--                  v-model="listForm.applyRegion"-->
-                  placeholder="请输入适用区域"
+<!--                  placeholder="请输入适用区域"-->
-                  clearable
+<!--                  clearable-->
-                ></el-input>
+<!--                ></el-input>-->
-              </el-form-item>
+<!--              </el-form-item>-->
               <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
                 <el-input
                   disabled
@@ -253,7 +253,7 @@ export default {
       listForm: {
         listType: "", //区分是哪个清单
         listName: "", //清单名称
-        applyRegion: "", //适用区域
+        // applyRegion: "", //适用区域
         descriptionList: "", //清单说明
         enclosure: "", //附件
         signFlag: "1",   //是否会签 1为会签 2为不会签
@@ -271,7 +271,7 @@ export default {
         }]
       },
       choiceForm: {}, //选择标准清单列表
-      countryOptions: [], //适用区域下拉框数据
+      // countryOptions: [], //适用区域下拉框数据
       userId:this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -122,12 +122,17 @@
                                     </el-radio-group>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                                    <tree-select-new
                                             :key="key"
-                                            width = "340"
+                                            :multiple=false
+                                            :lazy=false
+                                            :modalShowFlag="modalShowFlag1"
+                                            :drawerTitle="drawerTitle"
+                                            width = "800"
                                             :data="standSystemOptions"
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>
+                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
@@ -501,28 +506,46 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.cycvppsbm" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', form.cycvppsbm)"></el-input>
-                                            width = "340"
+                                    <tree-select-new
+                                            width = "800"
                                             :key="key1"
-                                            :data="busVppsOptions"
+                                            :lazy=true
+                                            :multiple=false
+                                            :modalShowFlag="modalShowFlag2"
+                                            :drawerTitle="drawerTitle"
+                                            :url="url"
+                                            :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
-                                            width = "340"
+                                    <tree-select-new
+                                            width = "800"
                                             :key="key2"
-                                            :data="busVppsOptions"
+                                            :lazy=true
+                                            :multiple=false
+                                            :modalShowFlag="modalShowFlag3"
+                                            :drawerTitle="drawerTitle"
+                                            :url="url"
+                                            :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
-                                    <tree-select
+                                    <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
+                                    <tree-select-new
+                                            width = "800"
                                             :key="key3"
-                                            width = "340"
+                                            :lazy=true
-                                            :data="modelOptions"
+                                            :multiple=false
+                                            :modalShowFlag="modalShowFlag4"
+                                            :drawerTitle="drawerTitle"
+                                            :url="url"
+                                            :urlChild="urlChild"
                                             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select>
+                                            :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
@@ -1104,9 +1127,17 @@
     import ProcessTitle from '../../components/ProcessTitle'
     import {saveTaskFirst} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+    import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
 
     export default {
         name: "bzrkStep1",
+        components: {
+            ProcessHeader,
+            ProcessFooter,
+            ProcessTitle,
+            TreeSelect,
+            TreeSelectNew
+        },
         data () {
             return {
                 standardDrawer: false,
@@ -1191,6 +1222,12 @@
                 key3:4,
                 treeData: [], // 人员数据
                 modalShowFlag: false, // drawer开关
+                modalShowFlag1: false, // drawer开关
+                modalShowFlag2: false, // drawer开关
+                modalShowFlag3: false, // drawer开关
+                modalShowFlag4: false, // drawer开关
+                url:'',
+                urlChild:'',
                 drawerTitle: '', //drawer标题
                 nodeKey: 'id',
                 defaultCheckedKeys: [],
@@ -1248,15 +1285,15 @@
                     // 适用范围
                     txlb: '', // 体系类别
                     gkdw: '', // 归口管理部门
-                    qcdw: '', // 起草单位
+                    qcdw: [], // 起草单位
-                    wssmr: '', // 我司署名人
+                    wssmr: [], // 我司署名人
                     cysd: '', // 我司参与深度
-                    cllx: '', // 适用车型
+                    cllx: [], // 适用车型
-                    nylx: '',// 能源类型
+                    nylx: [],// 能源类型
-                    sycpx: '',// 适用产品线
+                    sycpx: [],// 适用产品线
-                    syrz: '', // 适用认证
+                    syrz: [], // 适用认证
-                    zrbm: '', // 责任部门
+                    zrbm: [], // 责任部门
-                    zrgcs: '', // 责任工程师
+                    zrgcs: [], // 责任工程师
                     cycvppsbm: '', // 关联模块--乘用车VPPS编码
                     cycvppscn: '', // 关联模块--乘用车vpps中文名称
                     kccvppsbm: '', // 关联模块--卡车VPPS编码
@@ -1330,7 +1367,9 @@
                 standStateOptions: [], // 文本状态
                 standSystemOptions: [], // 标准体系
                 busVppsOptions: [], // 车系体系架构
+                busVppsChildOptions: [], // 车系体系架构子集合
                 modelOptions: [], // 模块体系架构
+                modelChildOptions: [], // 模块体系架构子集合
                 applyArcticOptions: [], // 适用车型
                 categoryOptions: [], // 能源类型
                 applyAuthOptions: [], // 适用认证
@@ -1398,12 +1437,6 @@
                 },
             },
         },
-        components: {
-            ProcessHeader,
-            ProcessFooter,
-            ProcessTitle,
-            TreeSelect
-        },
         methods: {
             clearFormData(data){
                 this.form = {
@@ -1452,15 +1485,15 @@
                     // 适用范围
                     txlb: '', // 体系类别
                     gkdw: '', // 归口管理部门
-                        qcdw: '', // 起草单位
+                    qcdw: [], // 起草单位
-                        wssmr: '', // 我司署名人
+                    wssmr: [], // 我司署名人
                     cysd: '', // 我司参与深度
-                        cllx: '', // 适用车型
+                    cllx: [], // 适用车型
-                        nylx: '',// 能源类型
+                    nylx: [],// 能源类型
-                        sycpx: '',// 适用产品线
+                    sycpx: [],// 适用产品线
-                        syrz: '', // 适用认证
+                    syrz: [], // 适用认证
-                        zrbm: '', // 责任部门
+                    zrbm: [], // 责任部门
-                        zrgcs: '', // 责任工程师
+                    zrgcs: [], // 责任工程师
                     cycvppsbm: '', // 关联模块--乘用车VPPS编码
                     cycvppscn: '', // 关联模块--乘用车vpps中文名称
                     kccvppsbm: '', // 关联模块--卡车VPPS编码
@@ -1628,7 +1661,6 @@
                         this.zrUserIds.push(data)
                     }
 
-                    console.log(this.zrUserIds)
                 }else {
                     var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
                     if(getlist.length == 1) {
@@ -1646,6 +1678,38 @@
                 this.drawerTitle = title
                 this.modalShowFlag = true
             },
+            choiceZRR1 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag1 = true
+                this.key++
+            },
+            choiceZRR2 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag2 = true
+                this.url = ''
+                this.urlChild = ''
+                this.url="sarVppsTree/list"
+                this.urlChild="sarVppsTree/childByList"
+                this.key1++
+            },
+            choiceZRR3 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag3 = true
+                this.url = ''
+                this.urlChild = ''
+                this.url="sarVppsTree/list"
+                this.urlChild="sarVppsTree/childByList"
+                this.key2++
+            },
+            choiceZRR4 (type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag4 = true
+                this.url = ''
+                this.urlChild = ''
+                this.url="sarModelTree/list"
+                this.urlChild="sarModelTree/childByList"
+                this.key3++
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
                     this.treeData = res.data
@@ -1889,29 +1953,51 @@
                 this.fileMadel = true
                 this.fileType = type;
             },
-            popoverHide (checkedIds, checkedData) {
+            popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
-                    this.form.standSystem = checkedData.id
+                    if(checkedData.length > 0){
-                    this.form.standSystemName = checkedData.menuName
+                        this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+                    }else {
+                        this.form.standSystem = checkedData.menuName
                     }
+                }
+                this.modalShowFlag1 = false
             },
-            popoverHideBusVs (checkedIds, checkedData) {
+            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
+                    if(checkedData.length > 0){
+                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                    }else {
                         this.form.cycvppsbm = checkedData.code
                         this.form.cycvppscn = checkedData.chineseName
                     }
+                }
+                this.modalShowFlag2 = false
             },
-            popoverHideCarVs (checkedIds, checkedData) {
+            popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
+                    if(checkedData.length > 0){
+                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+                    }else {
                         this.form.kccvppsbm = checkedData.code
                         this.form.kccvppscn = checkedData.chineseName
                     }
+                }
+                this.modalShowFlag3 = false
             },
-            popoverHideModel (checkedIds, checkedData) {
+            popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
+                    if(checkedData.length > 0){
+                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                        this.form.dymc = checkedData.map(item => item.name).join(",")
+                    }else {
                         this.form.dybxh = checkedData.model
                         this.form.dymc = checkedData.name
                     }
+                }
+                this.modalShowFlag4 = false
             },
             closeDrawer() {
                 this.ListModel = false
@@ -2006,6 +2092,14 @@
                     this.busVppsOptions = res.data
                 })
             },
+            busVsChildFunc(id){
+                this.$http.get('sarVppsTree/childByList', {id:id}, {
+                    _this: this
+                }, res => {
+                    this.busVppsChildOptions = []
+                    this.busVppsChildOptions = res.data
+                })
+            },
             modelFunc(){
                 this.$http.get('sarModelTree/list', '', {
                     _this: this

src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue

@@ -192,32 +192,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
-    <el-drawer
+    <Role-tree
-      :title="drawerTitle"
+      check-box
-      :visible.sync="modalshowflag"
+      :is-title="drawerTitle"
-      :wrapperClosable="false"
+      :is-visible.sync="modalshowflag"
-      size="800px">
+      :nodeList="nodeList"
-      <el-tree
+      @checkedRole="drawerCheck"
-        v-if="modalshowflag"
+    />
-        style="height: 100%; overflow: auto;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
   </div>
 </template>
 
@@ -308,7 +289,6 @@ export default {
     ProcessTitle
   },
   mounted () {
-    this.getTree()
     this.getJsonData()
   },
   methods: {
@@ -418,13 +398,6 @@ export default {
         }
       }
     },
-    // 获取流程节点数据
-    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
-        console.log(res.data)
-      })
-    },
     // 流程阶段负责人选择
     choiceZRR (type, title, id) {
       this.nodeList = []
@@ -434,22 +407,8 @@ export default {
       this.modalshowflag = true
     },
     drawerCheck (data) {
-      let getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      this.roleForm.dockUserName = data[0].id
-      if(getlist.length == 1) {
+      this.roleForm.dockUserName = data[0].name
-        this.roleRow = getlist[0]
-      }else {
-        this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
-      }
-    },
-    // 流程节点负责人抽屉保存按钮
-    saveUserInfo () {
-      this.roleForm.dockUser = this.roleRow.id
-      this.roleForm.dockUserName = this.roleRow.name
-      this.modalshowflag = false
-    },
-    // 流程节点负责人抽屉取消按钮
-    cancleUserInfo () {
       this.modalshowflag = false
     },
     //未整改项抽屉中的查询按钮

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -142,32 +142,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
-    <el-drawer
+    <Role-tree
-      :title="drawerTitle"
+      check-box
-      :visible.sync="modalshowflag"
+      :is-title="drawerTitle"
-      :wrapperClosable="false"
+      :is-visible.sync="modalshowflag"
-      size="800px">
+      :nodeList="nodeList"
-      <el-tree
+      @checkedRole="drawerCheck"
-        v-if="modalshowflag"
+    />
-        style="height: 100%; overflow: auto;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
   </div>
 </template>
 
@@ -330,24 +311,8 @@ export default {
       this.drawerTitle = title
       this.modalshowflag = true
     },
-    // 获取流程节点数据
-    getTree () {
-      roleTreeData().then(res => {
-        this.treeData = res.data
-        this.dutyUserCaseData = res.data
-      })
-    },
     drawerCheck (data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      this.roleRow = data
-      if(getlist.length !== 0) {
-        this.roleRow = getlist
-      }else {
-        this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()
-      }
-    },
-    // 流程节点负责人抽屉保存按钮
-    saveUserInfo () {
       // 选取负责人时的操作
       this.multipleSelection.forEach(item => {
         item.dutyPeopleInfo = this.roleRow[0].name
@@ -356,11 +321,7 @@ export default {
       this.lastDataList = this.dataList
       this.$refs.multipleTable.clearSelection();
       // 选取流程信息完成
-      this.roleForm.dutyUserInfoName = this.roleRow.name
+      this.roleForm.dutyUserInfoName = this.roleRow[0].name
-      this.modalshowflag = false
-    },
-    // 流程节点负责人抽屉取消按钮
-    cancleUserInfo () {
       this.modalshowflag = false
     },
     //查询按钮

src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue

@@ -137,32 +137,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
-    <el-drawer
+    <Role-tree
-      :title="drawerTitle"
+      check-box
-      :visible.sync="modalshowflag"
+      :is-title="drawerTitle"
-      :wrapperClosable="false"
+      :is-visible.sync="modalshowflag"
-      size="800px">
+      :nodeList="nodeList"
-      <el-tree
+      @checkedRole="drawerCheck"
-        v-if="modalshowflag"
+    />
-        style="height: 100%; overflow: auto;"
-        node-key="id"
-        class="filter-tree"
-        :data="treeData"
-        :props="defaultProps"
-        :default-checked-keys="nodeList"
-        highlight-current
-        check-strictly
-        @check="drawerCheck"
-        default-expand-all
-        :expand-on-click-node="false"
-        show-checkbox
-        ref="tree">
-      </el-tree>
-      <div id="roleFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
-      </div>
-    </el-drawer>
   </div>
 </template>
 
@@ -309,34 +290,15 @@ export default {
       })
     },
 
-    // 获取流程节点数据
-    getTree () {
-      this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
-        this.treeData = res.data
-      })
-    },
     drawerCheck (data) {
-      var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
+      this.roleForm = data[0]
-      if(getlist.length == 1) {
-        this.roleRow = getlist[0]
-      }else {
-        this.$refs.tree.setCheckedKeys([data.id]);
-        this.roleRow = this.$refs.tree.getCheckedNodes()[0]
-      }
-    },
-    // 流程节点负责人抽屉保存按钮
-    saveUserInfo () {
       // 选择责任人时input框内值
       this.newDataList.dutyPeople = this.roleRow.name
       this.newDataList.dutyPeopleId = this.roleRow.id
       this.lastDataList = this.dataList
-      console.log(this.dataList)
-      this.modalshowflag = false
-    },
-    // 流程节点负责人抽屉取消按钮
-    cancleUserInfo () {
       this.modalshowflag = false
     },
+
     //查询按钮
     getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
       this.realList = this.dataList.filter(item => {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -28,24 +28,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-<!--            <el-form-item label="适用领域" prop="applicationScope" class="search-item">
-              <el-select
-                  v-model="sarAccessEO.applicationScope"
-                  multiple
-                  placeholder="请选择"
-                  filterable
-                  :disabled="disabledFlag"
-                  class="wx-resolve"
-              >
-                <el-option
-                    v-for="item in applyOptions"
-                    :value="item.value"
-                    :key="item.value"
-                    :label="item.label"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>-->
             <br/><br/>
             <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
               <el-input
@@ -163,7 +145,11 @@
                   @click="clearSearchLaws">清空</el-button>
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
+              <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+                <i class="iconfont">&#xe7a5;</i>
+                高级查询
+              </el-button>
+              <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
                 <i class="iconfont">&#xe7a5;</i>
                 高级查询
               </el-button>
@@ -171,6 +157,58 @@
           </el-form>
         </div>
       </div>
+      <div class="showSelectBox" v-if="!showSelectBox">
+        <el-form  :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
+          <el-form-item label="标准名称"  class="search-item"  v-show="!isListType">
+            <el-input
+              v-model="sarAccessInfoSearch.standName"
+              placeholder="请输入"
+              :maxlength="100"
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="文本状态"  v-show="!isListType">
+            <el-select
+              v-model="sarAccessInfoSearch.textStatus"
+              placeholder="请选择"
+              filterable
+              size="small"
+            >
+              <el-option
+                v-for="item in textStatusOptions"
+                :value="item.value"
+                :key="item.value"
+                :label="item.label"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="发布日期"  v-show="!isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.issueTime"
+              type="date"
+              value-format="yyyy-MM-DD"
+              size="small"
+              placeholder="选择发布日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item lable="更新时间"  v-show="isListType">
+            <el-date-picker
+              v-model="sarAccessInfoSearch.modifyTime"
+              type="date"
+              value-format="yyyy-MM-DD"
+              size="small"
+              placeholder="选择发布日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="更新人"  v-show="isListType">
+            <el-input
+              v-model="sarAccessInfoSearch.standName"
+              placeholder="请输入"
+              :maxlength="100"
+              size="small"/>
+          </el-form-item>
+        </el-form>
+      </div>
       <div class="action-bar">
         <el-button
             class="common-button-default"
@@ -274,9 +312,15 @@
               align="center">
           </el-table-column>
           <el-table-column
-              prop="countryArea"
+              prop="country"
               label="国家/地区"
               align="center">
+            <template slot-scope="scope">
+            <span v-if="scope.row.country !== null && scope.row.country.indexOf(',')  > 0">
+              <span>{{ scope.row.country }}</span>
+            </span>
+              <span v-else>{{ countryAreaMap[scope.row.country] }}</span>
+            </template>
           </el-table-column>
           <el-table-column
               prop="detailedListName"
@@ -514,7 +558,7 @@
       :wrapperClosable="false"
       size="800px"
       >
-      <el-form :modal="editRowData" ref="editRowData" label-width="auto" style="margin: 20px">
+      <el-form :modal="editRowData" ref="editRowData" label-width="150px" style="margin: 20px">
           <el-form-item label="标准号">
             <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>
           </el-form-item>
@@ -656,6 +700,7 @@ export default {
     // }
     return {
       textStatusMap: {},
+      countryAreaMap: {},
       typeApplicableMap: {},
       nylxMap: {},
       zrbmMap: {},
@@ -712,6 +757,7 @@ export default {
       disabledFlag: false,
       regionOptions: [], // 基础信息 区域list
       drawerCountryOptions: [], // 基础信息 国家list
+      textStatusOptions: [], // 文本状态
       applyOptions: [], //基础信息适用领域list
       applyArcticOptions: [], // 基础车型 适用车型list
       energyKindOptions: [], // 能源种类list
@@ -733,6 +779,9 @@ export default {
       sarAccessInfoSearch: {
         id: '',
         countryArea: '', // 国家
+        issueTime: '',
+        standName: '',
+        textStatus: '',
         // applicationScope: '', //适用区域
         keywords: '', // 关键字
         detailedListName: '', //清单名称
@@ -746,6 +795,7 @@ export default {
       },
       moreSearchBtn: true, // 多属性搜索按钮 状态
       showTableFlag: true, // 显示添加列表 状态
+      showSelectBox: true, // 显示高级查询 状态
       sarAccessInfoSearchList: [], // 数据搜索 table列表数据
       importmodalFlag: false, // 导入model 状态
       searching: false,
@@ -959,6 +1009,15 @@ export default {
   methods: {
     // 高级检索
     selectMoreBtn () {
+      this.showSelectBox = !this.showSelectBox
+      this.showTableFlag = false
+      if (!this.showSelectBox) {
+        this.sarAccessInfoSearch.standName = ''
+        this.sarAccessInfoSearch.issueTime = ''
+        this.sarAccessInfoSearch.textStatus = ''
+        this.sarAccessInfoSearch.modifyTime = ''
+      }
+      this.selectLawsStands()
     },
     // 法规维护人树
     getDept () {
@@ -1062,6 +1121,9 @@ export default {
       this.sarAccessInfoSearch.askType = '' // 监管类型
       this.sarAccessInfoSearch.detailedListName = '' // 清单名称
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
+      this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfoSearch.putTime = ''
+      this.sarAccessInfoSearch.textStatus = ''
       this.isListType = false
       this.selectLawsStands()
     },
@@ -1346,12 +1408,31 @@ 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())
             }
+          }
+          console.log(rowlist2)
           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(',')
           // 判断是否有附件
@@ -1418,7 +1499,6 @@ export default {
           this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
           this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
         })
-        console.log(this.sarAccessInfoSearchList)
       }, e => {
       })
     },
@@ -1883,6 +1963,7 @@ export default {
     // 将文本状态的id与name对应
     setMap(data){
       data.forEach(item => {
+        this.$set(this.countryAreaMap, item.value, item.label)
         this.$set(this.textStatusMap, item.value, item.label)
         this.$set(this.typeApplicableMap, item.value, item.label)
         this.$set(this.nylxMap, item.value, item.label)
@@ -1934,6 +2015,7 @@ export default {
       this.setMap(this.categoryOptions)
       this.setMap(this.sycpxOptions)
       this.setMap(this.energyKindOptions)
+      this.setMap(this.drawerCountryOptions)
       this.getGzzOption()
     }, e => {
     })
@@ -1992,6 +2074,9 @@ export default {
       }
     }
   }
+  .showSelectBox {
+    padding: 10px;
+  }
   .data-search{
     .standards-drawer-table-one{
       position: relative;

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -4,8 +4,12 @@
       <div class="back" title="返回" @click="back">
         <i class="el-icon-back"></i>
       </div>
-      <div class="title">{{ sarAccessEO.detailedListName }}<i class="el-icon-s-order"
+      <div class="title">
-                                                              @click="heightShow = !heightShow"></i></div>
+        {{ sarAccessEO.detailedListName }}
+        <i class="el-icon-s-order"
+           @click="heightShow = !heightShow">
+        </i>
+      </div>
     </div>
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
@@ -88,12 +92,136 @@
                      icon="export"
           >导出
           </el-button>
-          <el-button type="primary" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" class="common-button-primary" size="mini" @click="selectMoreBtn"><i
+          <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
-            class="iconfont">&#xe7a5;</i>高级查询
+            <i class="iconfont">&#xe7a5;</i>
+            高级查询
+          </el-button>
+          <el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
+            <i class="iconfont">&#xe7a5;</i>
+            高级查询
           </el-button>
         </el-form>
+        <div v-if="!showSelectBox">
+          <el-form  :model="standardForm" class="label-input-form" label-width="auto" inline>
+            <el-form-item label="中文名称"  class="search-item">
+              <el-input
+                v-model="standardForm.standName"
+                placeholder="请输入"
+                :maxlength="100"
+                size="small"
+              />
+            </el-form-item>
+            <el-form-item label="英文名称"  class="search-item">
+              <el-input
+                v-model="standardForm.standEnName"
+                placeholder="请输入"
+                :maxlength="100"
+                size="small"
+              />
+            </el-form-item>
+            <el-form-item label="适用车型"  >
+              <el-select
+                v-model="standardForm.typeApplicable"
+                placeholder="请选择"
+                filterable
+                size="small"
+              >
+                <el-option
+                  v-for="item in applyArcticOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="能源类型"  >
+              <el-select
+                v-model="standardForm.nylx"
+                placeholder="请选择"
+                filterable
+                size="small"
+              >
+                <el-option
+                  v-for="item in energyKindOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="责任部门"  >
+              <el-select
+                v-model="standardForm.zrbm"
+                placeholder="请选择"
+                filterable
+                size="small"
+              >
+                <el-option
+                  v-for="item in zrbmOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="适用产品线"  >
+              <el-select
+                v-model="standardForm.sycpx"
+                placeholder="请选择"
+                filterable
+                size="small"
+              >
+                <el-option
+                  v-for="item in sycpxOptions"
+                  :value="item.value"
+                  :key="item.value"
+                  :label="item.label"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="乘用车VPPS编码"  class="search-item">
+              <el-input
+                v-model="standardForm.cycvppsbm"
+                placeholder="请输入"
+                :maxlength="100"
+                size="small"
+              />
+            </el-form-item>
+            <el-form-item label="乘用车VPPS中文名称"  class="search-item">
+              <el-input
+                v-model="standardForm.cycvppscn"
+                placeholder="请输入"
+                :maxlength="100"
+                size="small"
+              />
+            </el-form-item>
+            <el-form-item label="卡车VPPS编码"  class="search-item">
+              <el-input
+                v-model="standardForm.kccvppsbm"
+                placeholder="请输入"
+                :maxlength="100"
+                size="small"
+              />
+            </el-form-item>
+            <el-form-item label="卡车VPPS中文名称"  class="search-item">
+              <el-input
+                v-model="standardForm.kccvppscn"
+                placeholder="请输入"
+                :maxlength="100"
+                size="small"
+              />
+            </el-form-item>
+<!--            <el-form-item label="标准实施日期">
+              <el-date-picker
+                v-model="standardForm.issueTime"
+                type="date"
+                value-format="yyyy-MM-DD"
+                size="small"
+                placeholder="选择发布日期">
+              </el-date-picker>
+            </el-form-item>-->
+          </el-form>
         </div>
-      <div class="right">
       </div>
     </div>
     <div class="container" style="position:relative;">
@@ -142,7 +270,10 @@
             width="180px"
             label="适用车型">
             <template slot-scope="scope">
-              <span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
+              <span v-if="scope.row.typeApplicable !== null && scope.row.typeApplicable.indexOf(',')  > 0">
+              {{ scope.row.typeApplicable }}
+              </span>
+              <span v-else>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -151,7 +282,10 @@
             width="180px"
             label="能源类型">
             <template slot-scope="scope">
-              <span>{{ nylxMap[scope.row.nylx] }}</span>
+              <span v-if="scope.row.nylx !== null && scope.row.nylx.indexOf(',')  > 0">
+              {{ scope.row.nylx }}
+              </span>
+              <span v-else>{{ nylxMap[scope.row.nylx] }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -160,9 +294,6 @@
             align="center"
             width="210px"
             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
             show-overflow-tooltip
@@ -172,7 +303,10 @@
             align="center"
             label="在产车实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-if="scope.row.zccssrqgj === null">
+                {{ scope.row.zccssrqgj }}
+              </span>
+              <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -182,7 +316,10 @@
             width="210px"
             label="新车型实施日期">
             <template slot-scope="scope">
-              <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
+              <span v-if="scope.row.xcxssrqgj === null">
+                {{ scope.row.xcxssrqgj }}
+              </span>
+              <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -192,7 +329,10 @@
             align="center"
             label="责任部门">
             <template slot-scope="scope">
-              <span>{{ zrbmMap[scope.row.zrbm] }}</span>
+              <span v-if="scope.row.zrbm !== null && scope.row.zrbm.indexOf(',')  > 0">
+              {{ scope.row.zrbm }}
+              </span>
+              <span v-else>{{ zrbmMap[scope.row.zrbm] }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -202,6 +342,9 @@
             align="center"
             label="适用产品线">
             <template slot-scope="scope">
+              <span v-if="scope.row.sycpx !== null && scope.row.sycpx.indexOf(',')  > 0">
+              {{ scope.row.sycpx }}
+              </span>
               <span>{{ sycpxMap[scope.row.sycpx] }}</span>
             </template>
           </el-table-column>
@@ -280,11 +423,12 @@
 
 <script>
 import { interfaceUrl } from "@/sysConfig";
-
 export default {
   name: "AccessStandardDetails",
   data() {
     return {
+      // 高级检索状态
+      showSelectBox: true,
       textStatusMap: {},
       typeApplicableMap: {},
       nylxMap: {},
@@ -292,6 +436,14 @@ export default {
       sycpxMap: {},
       countryAreaMap: {},
       standinfoList: [],
+      // 适用车型
+      applyArcticOptions: [],
+      // 能源类型
+      energyKindOptions: [],
+      // 责任部门
+      zrbmOptions: [],
+      // 适用产品线
+      sycpxOptions: [],
       standardFormTotal: 0,
       relateDialog: false,
       relateList: [],
@@ -304,7 +456,7 @@ export default {
         standName: "",
         responseUnit: "",
         page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
+        Size: this.$store.getters.userInfo.configContent
       },
       page: 1,
       // pageSize: this.$store.getters.userInfo.configContent,
@@ -456,7 +608,7 @@ export default {
       this.selectInfobyAccid();
     },
     pageSizeChange(pageSize) {
-      this.standardForm.pageSize = this.$store.getters.userInfo.configContent;
+      this.standardForm.Size = this.$store.getters.userInfo.configContent;
       this.selectInfobyAccid();
     },
     // 请求部门结构树
@@ -561,6 +713,17 @@ export default {
      * 高级检索
      */
     selectMoreBtn() {
+      this.showSelectBox = !this.showSelectBox
+      this.showTableFlag = false
+      if (!this.showSelectBox) {
+        // this.standardForm = {}
+        // this.standardForm.issueTime = ''
+        // this.standardForm.textStatus = ''
+        // this.standardForm.modifyTime = ''
+      }
+      this.page = 1
+      this.standardForm.page = 1
+      this.selectInfobyAccid()
     },
     // 获取工作组信息下拉框信息
     getGzzOption() {
@@ -646,6 +809,7 @@ export default {
       this.setMap(this.sycpxOptions)
       this.setMap(this.energyKindOptions)
       this.setMap(this.drawerCountryOptions)
+      this.setMap(this.applyArcticOptions)
       this.getGzzOption();
     }, e => {
     });

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -116,7 +116,7 @@
         <el-button class="common-button-default export-button"
                    @click="exportStandard()"
                    size="mini"
-                   v-btn-permission="'84035c53f4e7c3e2f343a83e6c6e291d'"
+                   v-btn-permission="'b17f1d035219c47344032e261342d87d'"
                    title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出</el-button>
         <el-button class="common-button-default delete-button"
                    :loading="delLoading"
@@ -521,7 +521,8 @@
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
-                    :disabled="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' || formdisableflag"
+                    :disabled="formdisableflag"
+                    :class="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' ? 'classDisplay' : ''"
                   ></custom-date-pick>
                 </template>
                 <template v-else-if="field.attrType === 'FILE'">
@@ -1914,7 +1915,9 @@ export default {
         synopsis: '',
         // replaceStandNumCope: '',
         replacedStandNum: '',
-        orderBy:''
+        orderBy:'',
+        nowOrder: '',
+        nowOrderBy: '',
       }, // 分页查询过程中用到的对象
       configStandList: [],
       configStandtotal: 0,
@@ -1930,6 +1933,8 @@ export default {
       delLoading: false,
       standState: '',
       orderBy :'',
+      nowOrder: '',
+      nowOrderBy: '',
       textStatusMap: {} // 文本状态id与name对应
     }
   },
@@ -2697,16 +2702,36 @@ export default {
     },
     // 表格排序
     sortChange (sortObj) {
+      console.log(sortObj, '升降序')
       if (sortObj.column.order !== 'normal') {
-        switch (sortObj.column.property) {
+        switch (sortObj.prop) {
           case 'issueTime' :
             // 后台联调
-            this.orderBy = 'issueTime ' + sortObj.order
+            this.nowOrderBy = '1'
-            break
+            break;
+          case 'xcxssrq' :
+            // 后台联调
+            this.nowOrderBy = '2'
+            break;
+          case 'zccssrq' :
+            // 后台联调
+            this.nowOrderBy = '3'
+            break;
+            case 'textStatus' :
+            // 后台联调
+            this.nowOrderBy = '4'
+            break;
+        }
+        switch (sortObj.order) {
+          case 'ascending' :
+            this.nowOrder = '2'
+          break;
+          case 'descending' :
+            this.nowOrder = '1'
+          break;
         }
       }
       this.getDomesticStandardTable(this.tableFlag)
-
     },
     // 修改成表格样式后，选择项勾选改变
     standSelectChange (data) {
@@ -3125,7 +3150,9 @@ export default {
       }
 
       // 排序
-      formData.orderBy = this.orderBy
+      formData.nowOrder = this.nowOrder
+      formData.nowOrderBy = this.nowOrderBy
+      // formData.orderBy = this.orderBy
       // 处理我的收藏和个性化标签传参
       if (this.selectSarMenu.id === 'wdsc') {
         formData.menuId = undefined
@@ -3828,12 +3855,28 @@ export default {
           switch (sortObj.prop) {
             case 'issueTime' :
               // 后台联调
-              this.sarConfigStandSearch.orderBy = 'issueTime ' + sortObj.order
+              this.sarConfigStandSearch.nowOrderBy = '1'
-              break
+              break;
-            case 'XCXSSRQ' :
+            case 'xcxssrq' :
               // 后台联调
-              this.sarConfigStandSearch.orderBy = 'XCXSSRQ ' + sortObj.order
+              this.sarConfigStandSearch.nowOrderBy = '2'
-              break
+              break;
+            case 'zccssrq' :
+              // 后台联调
+              this.sarConfigStandSearch.nowOrderBy = '3'
+              break;
+            case 'textStatus' :
+              // 后台联调
+              this.sarConfigStandSearch.nowOrderBy = '4'
+              break;
+          }
+          switch (sortObj.order) {
+            case 'ascending' :
+              this.sarConfigStandSearch.nowOrder = '2'
+              break;
+            case 'descending' :
+              this.sarConfigStandSearch.nowOrder = '1'
+              break;
           }
         }
       this.selectConfiguraStand()
@@ -4501,5 +4544,7 @@ export default {
 .el-date-editor.el-input, .el-date-editor.el-input__inner{
   width: 190px
 }
-
+.classDisplay{
+  display: none;
+}
 </style>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -580,6 +580,7 @@
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
+                    :class="field.attrName === '在产车实施日期(国家）' || field.attrName === '新车型实施日期(国家）'|| field.attrName === '实施日期(国际）' ? 'classDisplay' : ''"
                     :disabled="formdisableflag"
                   ></custom-date-pick>
                 </template>
@@ -4256,5 +4257,8 @@ export default {
       border-radius: 0 !important;
     }
   }
+  .classDisplay{
+    display: none;
+  }
 }
 </style>