Merge remote-tracking branch 'origin/develop' into develop

src/common/verify/index.js

@@ -24,8 +24,9 @@ export default {
    * */
   validateStandardItem (rule, value, callback) {
     // return callback()
-    let testval = /^[A-Za-z0-9/ ,.-\\-（）()]+$/
+    let testval = /^[A-Za-z0-9/]+$/
-    if (value && !value.match(testval)) {
+    let testval1 = /[.-]+/
+    if (value && !value.match(testval) && !value.match(testval1)) {
       return callback(new Error('只能为（字母、数字、.、-）'))
     } else {
       callback()
@@ -457,9 +458,9 @@ export default {
       callback()
     }
   },
-  // 验证输入数字和英文
+  // 验证输入数字
   testNumberCode (rule, value, callback) {
-    let reg = /[0-9\-]/
+    let reg = /^[0-9]*$/
     if (value !== '' && !value.match(reg)) {
       return callback(new Error('只能输入数字'))
     } else {

src/pages/details/otherStandardDetails/index.vue

@@ -38,13 +38,13 @@
           <template v-if="item.label === '基础信息'" >
             <div class="details-content-modular basic-information" style="border-top:none">
               <div class="basic-information-content">
-                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>
+<!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                 <p style="color: #C42626;">
-                  <label style=" margin-right: 150px;">标准编号</label>
+                  <label style=" margin-right: 150px;">标准号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
                   <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                 </p>
-                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
+<!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
                 <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
                 <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
                 <p><label style=" margin-right: 150px;">标准性质</label><span>{{ standMap[sarStandardsInfoEO.standNature] || '-' }}</span></p>

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

@@ -1256,7 +1256,7 @@ export default {
         this.listForm.standId = bringData[0].id;
         this.listForm.listName = bringData[0].detailedListName;
         this.listForm.descriptionList = bringData[0].remark;
-        this.listForm.fileId = bringData[0].fileId;
+        this.listForm.fileId = bringData[0].fileIds;
         this.ListModel = false;
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
           { id: bringData[0].id, page: this.page, Size:this.pageSize}, {

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

@@ -158,14 +158,6 @@
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
-                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.xcxssrq"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(标准文本"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
                                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="form.zccssrq"
@@ -176,30 +168,38 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
-                                            v-model="form.ssrqgj"
+                                            v-model="form.xcxssrq"
                                             type="date"
-                                            placeholder="请选择实施日期(国际)"
+                                            placeholder="请选择新车型实施日期(标准文本"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.xcxssrqgj"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(国家)"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            v-model="form.zccssrqgj"
-                                            type="date"
-                                            placeholder="请选择在产车实施日期(国家)"
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
+<!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="form.ssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择实施日期(国际)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="form.xcxssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择新车型实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            v-model="form.zccssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择在产车实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>

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

@@ -147,15 +147,6 @@
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
-                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.xcxssrq"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(标准文本"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
                                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             disabled
@@ -167,33 +158,42 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             disabled
-                                            v-model="form.ssrqgj"
+                                            v-model="form.xcxssrq"
                                             type="date"
-                                            placeholder="请选择实施日期(国际)"
+                                            placeholder="请选择新车型实施日期(标准文本"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.xcxssrqgj"
-                                            type="date"
-                                            placeholder="请选择新车型实施日期(国家)"
-                                            value-format="yyyy-MM-dd">
-                                    </el-date-picker>
-                                </el-form-item>
-                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                                    <el-date-picker
-                                            disabled
-                                            v-model="form.zccssrqgj"
-                                            type="date"
-                                            placeholder="请选择在产车实施日期(国家)"
                                             value-format="yyyy-MM-dd">
                                     </el-date-picker>
                                 </el-form-item>
+<!--                                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            disabled-->
+<!--                                            v-model="form.ssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择实施日期(国际)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            disabled-->
+<!--                                            v-model="form.xcxssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择新车型实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
+<!--                                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                                    <el-date-picker-->
+<!--                                            disabled-->
+<!--                                            v-model="form.zccssrqgj"-->
+<!--                                            type="date"-->
+<!--                                            placeholder="请选择在产车实施日期(国家)"-->
+<!--                                            value-format="yyyy-MM-dd">-->
+<!--                                    </el-date-picker>-->
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>

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

@@ -145,14 +145,6 @@
                       placeholder="请选择标准实施日期(标准文本)">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      disabled
-                      v-model="form.xcxssrq"
-                      type="date"
-                      placeholder="请选择新车型实施日期(标准文本">
-                  </el-date-picker>
-                </el-form-item>
                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
                       disabled
@@ -163,30 +155,38 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      disabled
+                          disabled
-                      v-model="form.ssrqgj"
+                          v-model="form.xcxssrq"
-                      type="date"
+                          type="date"
-                      placeholder="请选择实施日期(国际)">
+                          placeholder="请选择新车型实施日期(标准文本">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      disabled
-                      v-model="form.xcxssrqgj"
-                      type="date"
-                      placeholder="请选择新车型实施日期(国家)">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      disabled
-                      v-model="form.zccssrqgj"
-                      type="date"
-                      placeholder="请选择在产车实施日期(国家)">
                   </el-date-picker>
                 </el-form-item>
+<!--                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      disabled-->
+<!--                      v-model="form.ssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择实施日期(国际)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      disabled-->
+<!--                      v-model="form.xcxssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择新车型实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      disabled-->
+<!--                      v-model="form.zccssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择在产车实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
               </el-col>
             </el-row>
           </div>

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

@@ -149,13 +149,6 @@
                       placeholder="请选择标准实施日期(标准文本)">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.xcxssrq"
-                      type="date"
-                      placeholder="请选择新车型实施日期(标准文本">
-                  </el-date-picker>
-                </el-form-item>
                 <el-form-item label="在产车实施日期(标准文本)" prop="zccssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
                       v-model="form.zccssrq"
@@ -165,27 +158,34 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">
+                <el-form-item label="新车型实施日期(标准文本)" prop="xcxssrq" class="add-form-item form-item-disabled">
                   <el-date-picker
-                      v-model="form.ssrqgj"
+                          v-model="form.xcxssrq"
-                      type="date"
+                          type="date"
-                      placeholder="请选择实施日期(国际)">
+                          placeholder="请选择新车型实施日期(标准文本">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.xcxssrqgj"
-                      type="date"
-                      placeholder="请选择新车型实施日期(国家)">
-                  </el-date-picker>
-                </el-form-item>
-                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">
-                  <el-date-picker
-                      v-model="form.zccssrqgj"
-                      type="date"
-                      placeholder="请选择在产车实施日期(国家)">
                   </el-date-picker>
                 </el-form-item>
+<!--                <el-form-item label="实施日期(国际)" prop="ssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      v-model="form.ssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择实施日期(国际)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="新车型实施日期(国际)" prop="xcxssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      v-model="form.xcxssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择新车型实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="在产车实施日期(国际)" prop="zccssrqgj" class="add-form-item form-item-disabled">-->
+<!--                  <el-date-picker-->
+<!--                      v-model="form.zccssrqgj"-->
+<!--                      type="date"-->
+<!--                      placeholder="请选择在产车实施日期(国家)">-->
+<!--                  </el-date-picker>-->
+<!--                </el-form-item>-->
               </el-col>
             </el-row>
           </div>

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue

@@ -289,10 +289,8 @@ export default {
       this.searchSarAccess();
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
+      this.sarSarAccessEOSearch.countryArea = ''
-        countryArea: "",
+      this.sarSarAccessEOSearch.detailedListName = ''
-        detailedListName: ""
-      };
       this.searchSarAccess();
     },
     // 新增相关

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue

@@ -165,12 +165,11 @@ export default {
       total: 0,
       page: 1,
       rows: 10,
+      pageSize: this.$store.getters.userInfo.configContent,
       // 查询相关参数
       sarSarAccessEOSearch: {
         detailedList: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -267,9 +266,9 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
-        ...this.sarSarAccessEOSearch,
         page: 1,
-        pageSize: 10,
+        pageSize: this.pageSize,
+        ...this.sarSarAccessEOSearch,
         sortKey: 3
       }, {
         _this: this
@@ -289,10 +288,8 @@ export default {
       this.searchSarAccess();
     },
     clearSearch() {
-      this.sarSarAccessEOSearch = {
+      this.sarSarAccessEOSearch.detailedList = ''
-        detailedList: "",
+      this.sarSarAccessEOSearch.detailedListName = ''
-        detailedListName: ""
-      };
       this.searchSarAccess();
     },
     // 新增相关

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -165,13 +165,12 @@ export default {
       searching: false,
       total: 0,
       page: 1,
+      pageSize: this.$store.getters.userInfo.configContent,
       rows: 10,
       // 查询相关参数
       sarSarAccessEOSearch: {
         projectName: "",
         detailedListName: "",
-        page: 1,
-        pageSize: this.$store.getters.userInfo.configContent
       },
       sarAccessListDatas: [],
       sarAccessListTotal: 0,
@@ -268,9 +267,9 @@ export default {
     //分页查询
     searchSarAccess() {
       this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
+        page: this.page,
+        pageSize: this.pageSize,
         ...this.sarSarAccessEOSearch,
-        page: 1,
-        pageSize: 10,
         sortKey: 2
       }, {
         _this: this
@@ -291,10 +290,8 @@ export default {
     },
     //清空
     clearSearch() {
-      this.sarSarAccessEOSearch = {
+      this.sarSarAccessEOSearch.projectName = ''
-        projectName: "",
+      this.sarSarAccessEOSearch.detailedListName = ''
-        detailedListName: "",
-      };
       this.searchSarAccess()
 
     },

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

@@ -1376,9 +1376,9 @@ export default {
     // 清单条目 table select事件
     sarAccessInfoSelect (selectData) {
       this.sarAccessInfoListArry = selectData
-      let sarAccessInfoListArryId =  []
+     /* let sarAccessInfoListArryId =  []
       for(let i=0; i<this.selectData.length; i++){
-      }
+      }*/
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1580,7 +1580,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         this.$message.success('导出信息成功')
       }

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

@@ -57,7 +57,21 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item" prop="responseUnit">
-            <el-input v-model="standardForm.responseUnit" v-show="false"></el-input>
+            <el-select
+              class="showBox"
+              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-input v-model="standardForm.responseUnit" v-show="false"></el-input>
             <el-popover placement="bottom" popper-class="user-dept-popper" trigger="click">
               <el-input
                 v-model="standardForm.responseUnit"
@@ -76,7 +90,7 @@
                            class="ztree" style="height: 300px;overflow: auto">
                 </laws-tree>
               </div>
-            </el-popover>
+            </el-popover>-->
           </el-form-item>
           <el-form-item label="" class="search-item btn-box">
             <el-button  v-btn-permission="'670dd74a8469a6232a0762c69b575775'" class="common-button-primary" type="primary" size="small" @click="selectProductBtn">查询
@@ -106,7 +120,7 @@
           <el-form  :model="standardForm" class="label-input-form" label-width="108px" inline>
             <el-form-item label="英文名称"  class="search-item">
               <el-input
-                v-model="standardForm.standEnName"
+                v-model="standardForm.standName"
                 placeholder="请输入"
                 :maxlength="100"
                 size="small"
@@ -144,6 +158,22 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="责任部门"  >
+              <el-select
+                class="showBox"
+                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
                 class="showBox"
@@ -490,11 +520,9 @@ export default {
     },
     // 重置搜索
     resetSelect() {
-      this.standardForm = {
+      this.standardForm.standName = ''
-        standName: "",
+      this.standardForm.responseUnit = ''
-        responseUnit: ""
+      this.selectInfobyAccid()
-      };
-      this.selectInfobyAccid();
     },
     exportStandard() {
       if (this.selectedList.length > 0) {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -1392,7 +1392,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -1390,7 +1390,7 @@ export default {
         for (var accessInfo in exportList) {
           accIdAndrestype.push(exportList[accessInfo].id)
         }
-        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
+        const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
         window.open(exportURL)
         // window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
         this.$message.success('导出信息成功')

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -524,6 +524,7 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
+                    v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"
@@ -1024,47 +1025,257 @@
           <el-button size="mini" type="primary"  class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
         </div>
       </el-dialog>
-      <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"
+<!--      <table-tools-bar v-model="isAdvancedSearch" @search="getDomesticStandardTableBtn(sarStandardsSearch)"-->
-                       @reset="clearAllSearch('sarStandardsSearch')" >
+<!--                       @reset="clearAllSearch('sarStandardsSearch')" >-->
-        <div slot="content">
+<!--        <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.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>-->
+<!--&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.standardYear')"  class="serch-form-item">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.standYear"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据标准年份查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            标准发布日期&ndash;&gt;-->
+<!--            <el-form-item label="标准发布日期"  class="serch-form-item">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.issueTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据标准发布日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            标准性质&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            是否纳入标准清单&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            实施日期&ndash;&gt;-->
+<!--            <el-form-item label="实施日期">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.putTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据实施日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            新车型实施日期&ndash;&gt;-->
+<!--            <el-form-item title="新车型实施日期" label="新车型实施日期">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.XCXTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据新车型实施日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            在产车实施日期&ndash;&gt;-->
+<!--            <el-form-item title="在产车实施日期" label="在产车实施日期">-->
+<!--              <el-date-picker-->
+<!--                  v-model="sarStandardsSearch.ZCCTime"-->
+<!--                  type="date"-->
+<!--                  placeholder="根据在产车实施日期查找">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            归口管理部门&ndash;&gt;-->
+<!--            <el-form-item label="归口管理部门">-->
+<!--              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据归口管理部门查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            起草单位&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            我司参与深度&ndash;&gt;-->
+<!--            <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>-->
+
+<!--&lt;!&ndash;            能源类型&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            适用车型&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableModels')"  class="serch-form-item">-->
+<!--              <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>-->
+<!--&lt;!&ndash;            适用产品线（新增字段）&ndash;&gt;-->
+<!--            <el-form-item :label="$t('m.applicableProductLine')"  class="serch-form-item">-->
+<!--              <el-select v-model="sarStandardsSearch.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable-->
+<!--                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">-->
+<!--                <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>-->
+<!--&lt;!&ndash;            适用认证&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            责任部门&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            责任工程师&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            关联模块-VPPS编码&ndash;&gt;-->
+<!--            <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>-->
+<!--&lt;!&ndash;            代替标准号&ndash;&gt;-->
+<!--            <el-form-item label="代替标准号">-->
+<!--              <el-input v-model="sarStandardsSearch.replaceStandNum" clearable placeholder="根据代替标准号查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            关联模块-中文名称&ndash;&gt;-->
+<!--            <el-form-item title="关联模块-中文名称" label="关联模块-中文名称" prop="standNumber">-->
+<!--              <el-input v-model="sarStandardsSearch.standNumber" clearable-->
+<!--                        placeholder="根据关联模块-中文名称"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            采标编号&ndash;&gt;-->
+<!--            <el-form-item label="采标编号" prop="nameShow">-->
+<!--              <el-input v-model="sarStandardsSearch.nameShow" clearable placeholder="根据采标编号查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            采标程度&ndash;&gt;-->
+<!--            <el-form-item label="采标程度" prop="standNumber">-->
+<!--              <el-input v-model="sarStandardsSearch.standNumber" clearable-->
+<!--                        placeholder="根据采标程度查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            引用标准&ndash;&gt;-->
+<!--            <el-form-item label="引用标准">-->
+<!--              <el-input v-model="sarStandardsSearch.citeStand" clearable placeholder="根据引用标准查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            被引用标准&ndash;&gt;-->
+<!--            <el-form-item label="被引用标准">-->
+<!--              <el-input v-model="sarStandardsSearch.citedStand" clearable-->
+<!--                        placeholder="根据被引用标准查找"-->
+<!--                        @keyup.enter.native="btnSearch"></el-input>-->
+<!--            </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">
               <el-input v-model="sarStandardsSearch.standNumber" :placeholder="$t('m.lookUpByStandardNumber')" clearable :maxlength="100"
                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"></el-input>
             </el-form-item>
-<!--            标准名称-->
+            <!--            标准名称-->
             <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>
-<!--            标准英文名称-->
+            <!--            标准英文名称-->
             <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"
+                  v-model="sarStandardsSearch.standSort"
-                :placeholder="$t('m.standardCategoryTips')"
+                  :placeholder="$t('m.standardCategoryTips')"
-                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
+                  @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)"
-                :options="standSortOptions"
+                  :options="standSortOptions"
-                clearable/>
+                  clearable/>
             </el-form-item>
-<!--            文本状态-->
+            <!--            文本状态-->
             <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>
-<!--            代替标准号-->
+            <!--            代替标准号-->
             <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>
-<!--            标准年份-->
+            <!--            标准年份-->
             <el-form-item :label="$t('m.standardYear')"  class="serch-form-item">
               <el-date-picker
                   v-model="sarStandardsSearch.standYear"
@@ -1080,21 +1291,21 @@
                   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"
@@ -1102,7 +1313,7 @@
                   placeholder="根据实施日期查找">
               </el-date-picker>
             </el-form-item>
-<!--            新车型实施日期-->
+            <!--            新车型实施日期-->
             <el-form-item title="新车型实施日期" label="新车型实施日期">
               <el-date-picker
                   v-model="sarStandardsSearch.XCXTime"
@@ -1110,7 +1321,7 @@
                   placeholder="根据新车型实施日期查找">
               </el-date-picker>
             </el-form-item>
-<!--            在产车实施日期-->
+            <!--            在产车实施日期-->
             <el-form-item title="在产车实施日期" label="在产车实施日期">
               <el-date-picker
                   v-model="sarStandardsSearch.ZCCTime"
@@ -1118,19 +1329,19 @@
                   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)">
@@ -1138,88 +1349,88 @@
               </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.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.sycpx" :placeholder="$t('m.searchByApplicableProductLine')" clearable
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
                 <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编码-->
+            <!--            关联模块-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
                          @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
@@ -1229,7 +1440,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>
     </div>
 <!--    分享 全部选人 -->
     <org-table

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -483,6 +483,7 @@
                 </template>
                 <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
                   <custom-date-pick
+                    v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
                     :key="field.attrField"
                     :config="field"
                     v-model="sarStandardsInfoEO[field.attrField]"

src/sysConfig/index.js

@@ -7,8 +7,8 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '10.96.170.173'
+const devIp = '101.36.227.25'
-const devInterfacePORT = '9999'
+const devInterfacePORT = '8038'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'