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

src/pages/details/otherStandardDetails/index.vue

@@ -41,22 +41,36 @@
                 <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                 <p style="color: #C42626;">
                   <label style=" margin-right: 150px;">标准号</label>
-                  <span v-if="sarStandardsInfoEO.standYear">{{ sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear }}</span>
+                  <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.standName || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">中文名称</label><span>{{
-                <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
+                    sarStandardsInfoEO.standName || '-'
-                <p><label style=" margin-right: 150px;">标准性质</label><span>{{ standMap[sarStandardsInfoEO.standNature] || '-' }}</span></p>
+                  }}</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>
                 <p>
                   <label style=" margin-right: 132px;"
                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                   >文本状态<i class="el-icon-warning-outline"></i></label>
                   <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                 </p>
-                <p><label style=" margin-right: 150px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+                <p><label style=" margin-right: 150px;">发布日期</label><span>{{
-                <p><label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'}}</span></p>
+                    sarStandardsInfoEO.issueTime || '-'
-                <p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{ sarStandardsInfoEO.standSystem || '-' }}</span></p>
+                  }}</span></p>
+                <p>
+                  <label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}</span>
+                </p>
+                <p v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准体系</label><span>{{
+                    sarStandardsInfoEO.standSystem || '-'
+                  }}</span></p>
                 <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
                 <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
                 <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
@@ -381,7 +395,8 @@
                   @click="showItemsModel(child.attrField)"
                   class="decomposition-btn"
                   icon="icon-separate"
-                                        >标准分解单</el-button>
+                >标准分解单
+                </el-button>
               </div>
             </div>
 
@@ -395,7 +410,8 @@
         </div>
       </div>
     </div>
-    <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png"></div>
+    <div v-show="!isMoreAwayBtn" class="more" @click="moreClick">更多<img src="@/assets/images/shangqi/img/more.png">
+    </div>
     <!--    <div v-show="isMoreAwayBtn" class="put-away" @click="putAwayClick">收起<img src="@/assets/images/shangqi/img/more.png"></div>-->
     <!--查看标准条款列表-->
     <el-drawer
@@ -418,30 +434,10 @@
                 trigger="click"
                 :value="false"
               >
-<!--                <el-input-->
-<!--                  v-model="standItemSearch.orgName"-->
-<!--                  slot="reference"-->
-<!--                  placeholder="请选择部门"-->
-<!--                  readonly-->
-<!--                  id="searchInlandDeptBtn"-->
-<!--                  @on-change="inputChange"-->
-<!--                  style="margin-right: 0;"/>-->
-                <div class="api">
-<!--                  <laws-tree :zNodes="searchInlandNodes"-->
-<!--                             treeDivId="domesticTree1"-->
-<!--                             ref="reloadTree2"-->
-<!--                             deptSelect-->
-<!--                             showRMenu-->
-<!--                             @treeDblClick="searchInlandNodesClick"-->
-<!--                             class="ztree" style="width: 200px;height: 400px;overflow: auto">-->
-<!--                  </laws-tree>-->
-                </div>
               </el-popover>
             </el-form-item>
 
 
-
-
             <el-form-item class="search-item">
               <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable maxlength="100"></el-input>
             </el-form-item>
@@ -465,9 +461,6 @@
                 </el-date-picker>
               </div>
             </el-form-item>
-<!--            <el-form-item class="search-item">-->
-<!--              <el-input v-model="standItemSearch.parts" size="small" placeholder="根据涉及零部件查找" clearable maxlength="100"></el-input>-->
-<!--            </el-form-item>-->
             <el-form-item class="search-item btn-box">
               <el-button
                 :loading="searching"
@@ -491,14 +484,17 @@
       </div>
       <div class="action-bar">
         <el-button class="common-button-default export-button" icon="export" size="mini"
-                   @click="exportStandardItem" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">导出</el-button>
+                   @click="exportStandardItem" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
+          导出
+        </el-button>
         <el-button
           size="mini"
           type="primary"
           class="common-button-primary"
           @click="openRelatedTermsDrawer"
           v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '28CUM4KPUXDMCCMTFUQA' : 'R62HAB3QEMD27BZ7XHCM'"
-        >关联条款</el-button>
+        >关联条款
+        </el-button>
       </div>
       <div class="content">
         <el-table
@@ -531,29 +527,38 @@
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
-              prop="itemsTitle"
-              label="条款内容"
-          >
-          </el-table-column>
-          <el-table-column
             prop="termsConditions"
-            label="解读内容"
+            label="条款内容"
-            show-overflow-tooltip
             :resizable="false"
           >
             <template slot-scope="scope">
-              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
+              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
+                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
+              </div>
             </template>
           </el-table-column>
           <el-table-column
-              prop="XCXSSRQ"
+            prop="interpretationContent"
-              label="新车型实施日期(文本)"
+            label="解读内容"
-              width="180">
+            show-overflow-tooltip
+          >
+
           </el-table-column>
           <el-table-column
-              prop="ZCCSSRQ"
+            prop="xcxssrq"
+            label="新车型实施日期(文本)"
+            width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format('YYYY-MM-DD') : '' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
             label="在产车实施日期(文本)"
             width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format('YYYY-MM-DD') : '' }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -589,7 +594,8 @@
                 <el-dropdown trigger="click" @command="handleCommand">
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '查看']">查看</el-dropdown-item>
+                    <el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '查看']">查看
+                    </el-dropdown-item>
                     <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
                     <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
                   </el-dropdown-menu>
@@ -726,7 +732,9 @@
         </el-form>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag" @click="saveOrUpdateStandItem" :loading="isSubmit">保存</el-button>
+        <el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag" @click="saveOrUpdateStandItem" :loading="isSubmit">
+          保存
+        </el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
       </div>
     </el-drawer>
@@ -768,11 +776,15 @@
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="内容简介">内容简介</label>
-          <span class="see-drawer-val" :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{ standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' }}</span>
+          <span class="see-drawer-val" :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
+              standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
+            }}</span>
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任部门">责任部门</label>
-          <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{ standShowItemEO.responsibleUnit }}</span>
+          <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
+              standShowItemEO.responsibleUnit
+            }}</span>
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="FO">FO</label>
@@ -780,7 +792,9 @@
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="责任工程师">责任工程师</label>
-          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{ standShowItemEO.dutyEngineerShow }}</span>
+          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{
+              standShowItemEO.dutyEngineerShow
+            }}</span>
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="svpps">svpps</label>
@@ -796,7 +810,9 @@
         </div>
         <div class="see-drawer-div">
           <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>
-          <span class="see-drawer-val" :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{ standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover) }}</span>
+          <span class="see-drawer-val" :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{
+              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)
+            }}</span>
         </div>
       </div>
     </el-drawer>
@@ -833,11 +849,13 @@
                    class="common-button-primary add-button"
                    size="mini"
                    :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'"
-                   @click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增</el-button>
+                   @click="addknowledge(1)"><i class="iconfont">&#xe84e;</i>新增
+        </el-button>
         <el-button class="common-button-default delete-button"
                    size="mini"
                    :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
-                   @click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除</el-button>
+                   @click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除
+        </el-button>
       </div>
       <div class="knowContent">
         <el-table
@@ -882,8 +900,12 @@
                   <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
-                    <el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
+                    <el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'" :command="[scope.row, '编辑']">
-                    <el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                      编辑
+                    </el-dropdown-item>
+                    <el-dropdown-item :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'" :command="[scope.row, '删除']">
+                      删除
+                    </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -927,7 +949,9 @@
         </el-formItem>
       </el-form>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading" icon="el-icon-check" @click="AddKnowSub">确定</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading" icon="el-icon-check" @click="AddKnowSub">
+          确定
+        </el-button>
         <el-button class="common-button-default" icon="el-icon-close" @click="AddKnowClose">取消</el-button>
       </div>
     </el-dialog>
@@ -948,7 +972,9 @@
             @click="downloadFile(item.id)"
             :key="index">{{ item.oldFileName }}</span>
         </p>
-        <p><label>发布时间：</label><span>{{ knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : '' }}</span></p>
+        <p><label>发布时间：</label><span>{{
+            knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : ''
+          }}</span></p>
       </div>
     </el-dialog>
 
@@ -975,7 +1001,9 @@
               icon="el-icon-refresh-left"
               size="mini"
               @click="clearComparison()"></el-button>
-            <el-button type="primary" class="common-button-primary" size="mini" @click="addComparison"><i class="iconfont">&#xe84e;</i>新增</el-button>
+            <el-button type="primary" class="common-button-primary" size="mini" @click="addComparison">
+              <i class="iconfont">&#xe84e;</i>新增
+            </el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -989,7 +1017,9 @@
           </template>
         </div>
         <div slot="footer" class="demo-drawer-footer">
-          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="comparisonSub">确定</el-button>
+          <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="comparisonSub">
+            确定
+          </el-button>
           <el-button class="common-button-default" icon="el-icon-close" @click="comparisonClose">取消</el-button>
         </div>
       </div>
@@ -1021,8 +1051,11 @@
         </el-form>
       </div>
       <div id="listFormButton" class="demo-drawer-footer">
-        <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="submitDrawerForm('listVO')">确定</el-button>
+        <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="submitDrawerForm('listVO')">
-        <el-button class="common-button-default" icon="el-icon-close" @click="AddcomparisonDrawer = false">取消</el-button>
+          确定
+        </el-button>
+        <el-button class="common-button-default" icon="el-icon-close" @click="AddcomparisonDrawer = false">取消
+        </el-button>
       </div>
     </el-drawer>
     <!--      导入失败-->
@@ -1034,7 +1067,9 @@
         <p v-html="importForm.content"></p>
       </div>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">确认</el-button>
+        <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check" @click="importFailed = false">
+          确认
+        </el-button>
       </div>
     </el-dialog>
     <loading :loading="loading">数据获取中</loading>
@@ -1058,8 +1093,12 @@
         ></related-terms-select>
       </div>
       <div class="demo-drawer-footer">
-        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="handleRelatedTermsDrawerSubmit">{{$t('m.submit')}}</el-button>
+        <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="handleRelatedTermsDrawerSubmit">
-        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleRelatedTermsDrawerCancel">{{$t('m.cancel')}}</el-button>
+          {{ $t('m.submit') }}
+        </el-button>
+        <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleRelatedTermsDrawerCancel">
+          {{ $t('m.cancel') }}
+        </el-button>
       </div>
     </el-drawer>
     <!--内容简介-->
@@ -1372,8 +1411,7 @@ export default {
       standMap: {}
     }
   },
-  props: {
+  props: {},
-  },
   watch: {},
   methods: {
     FormatDate(date) {
@@ -1385,8 +1423,6 @@ export default {
         this.$set(this.textStatusMap, item.value, item.label)
         this.$set(this.standMap, item.value, item.label)
       })
-      console.log(this.textStatusMap, '文本状态的值')
-      console.log(this.standMap, '标准性质')
     },
     statusClick() {
       let routeUrl = this.$router.resolve({
@@ -1399,79 +1435,6 @@ export default {
     },
     closeDrawer() {
       this.modalStandItemflag = false
-      // svpps变化
-      // Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
-      //   const [displayLocation, standEO, formFieldList] = values
-      //   const dynamicFormField = standEO ? standEO.attrInfoMap : {}
-      //   formFieldList.forEach((field) => {
-      //     displayLocation.forEach((location) => {
-      //       location.isShowImp = '1'
-      //       if (dynamicFormField) {
-      //         let value = dynamicFormField[field.attrField]
-      //         if (field.attrField === 'SVPPS') {
-      //           let tips = dynamicFormField.SVPPSTips
-      //           field['tips'] = tips
-      //         }
-      //         if (value && typeof value === 'number') {
-      //           value = this.$dateFormat(value, 'yyyy-MM-dd')
-      //         }
-      //         field['value'] = value
-      //         if (field.showRegionId === location.value) {
-      //           if (!location.child) {
-      //             location['child'] = []
-      //           }
-      //           location['child'].push(field)
-      //           if (field.isShowImp === '0') {
-      //             location.isShowImp = '0'
-      //           }
-      //         }
-      //       }
-      //     })
-      //   })
-      //   displayLocation.forEach(location => {
-      //     const child = location.child || []
-      //     const one = []
-      //     const half = []
-      //     child.map(field => {
-      //       if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
-      //         half.push(field)
-      //       } else {
-      //         one.push(field)
-      //       }
-      //     })
-      //     const fieldsIsTextAreaOrFile = child.filter(field => {
-      //       return field.attrType === 'TEXTAREA' || field.attrType === 'FILE'
-      //     })
-      //     const fieldOthers = child.filter(field => {
-      //       return field.attrType !== 'TEXTAREA' && field.attrType !== 'FILE'
-      //     })
-      //     location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile]
-      //     location.one = one
-      //     location.half = half
-      //     location.showAll = false
-      //   })
-      //   this.$http.get('lawss/sarSarAccessInfo/selectProTimeInfoByStandId', {
-      //     standId: this.$route.params.id
-      //   }, {
-      //     _this: this
-      //   }, res => {
-      //     displayLocation.map(item => {
-      //       if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
-      //         for (let key in res.data) {
-      //           item.one.push({
-      //             attrName: key,
-      //             value: res.data[key].join(','),
-      //             isShowImp: '0',
-      //             id: key
-      //           })
-      //         }
-      //       }
-      //     })
-      //     this.dynamicFormField = displayLocation
-      //   })
-      //   sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
-      //   this.loading = false
-      // })
     },
     clearComparison() {
       this.comparisonTitle = ''
@@ -2095,7 +2058,8 @@ export default {
             this.zNodesSItem = treeNode
             this.searchInlandNodes = treeNode
           }
-        }, e => {})
+        }, e => {
+        })
     },
     getUserTreeSource() {
       this.$http.get('sys/org/getTree', {}, {_this: this},
@@ -2115,7 +2079,8 @@ export default {
             })
             this.zNodesSItemEngin = treeNode
           }
-        }, e => {})
+        }, e => {
+        })
     },
     // 查询相近标准
     selectCloseStand(id) {
@@ -2260,16 +2225,6 @@ export default {
           console.log("hello" + this.standItemList + res.data);
           this.standitemTotal = res.data.count // 分页需要
         }
-
-        // if (this.standItemList != null && this.standItemList.length > 0) {
-        //   for (let ind = 0; ind < this.standItemList.length; ind++) {
-        //     // 去掉html标签
-        //     let itemContent = this.standItemList[ind].termsConditions
-        //     itemContent = itemContent ? itemContent.replace(/<.*?>/ig, ' ') : ''
-        //     this.standItemList[ind].termsConditions = itemContent
-        //   }
-        // }
-
       }, e => {
       })
     },
@@ -2368,7 +2323,8 @@ export default {
         } else {
           this.$message.warning('暂无可导出的数据')
         }
-      }).catch(() => {})
+      }).catch(() => {
+      })
     },
     // 标准条款删除
     deleteStandItem(item, flag) {
@@ -2863,6 +2819,7 @@ export default {
 <style lang="less" scoped>
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
+
 /deep/ .btn1 #question {
   padding: 0 10px;
   margin-left: 10px;
@@ -2872,6 +2829,7 @@ export default {
   color: #409EFF;;
   border: 1px solid #409EFF;
   background: rgba(64, 158, 255, 0.1);
+
   .icon-separate {
     display: inline-block;
     margin-right: 3px;
@@ -2884,62 +2842,77 @@ export default {
     background-image: url("~assets/images/shangqi/standardDetails/separate.png");
   }
 }
+
 .other-standard-details {
   padding: 15px 30px 0;
   width: 1200px;
   margin: 0 auto;
   height: 100%;
+
   .itemsTextBox {
     min-height: 300px;
     max-height: 500px;
     overflow: auto;
     line-height: 20px;
+
     /deep/ td {
       border: 1px solid #606266;
       text-align: center;
     }
   }
+
   /deep/ .el-radio-group {
     display: block;
     margin-bottom: 10px;
   }
+
   .action-bar {
     border-top: 0px;
   }
+
   .fileCss {
     margin-right: 10px;
     cursor: pointer;
   }
+
   .fileCss:hover {
     color: #0c91e5;
   }
+
   .myDialog1 {
     /deep/ .el-dialog__body {
       padding: 0px 20px 10px;
     }
+
     .myRadio {
       min-height: 200px;
       max-height: 400px;
       overflow: auto;
     }
   }
+
   .myDialog {
     min-width: 700px;
+
     .el-dialog {
       min-width: 700px;
       width: 70%;
     }
+
     /deep/ .el-dialog__body {
       padding: 0px 20px 56px;
+
       .basic-information-content {
         color: #333333;
         font-size: 18px;
         font-weight: 400;
+
         .standard-text {
           height: 50px;
           line-height: 50px;
           border-bottom: 1px solid #E5E5E5;
         }
+
         & > p {
           min-height: 55px;
           line-height: 55px;
@@ -2947,34 +2920,42 @@ export default {
         }
       }
     }
+
     .knowContent {
       height: 500px;
     }
   }
+
   .details-header {
     padding: 34px 0;
     font-size: 20px;
     font-weight: bold;
     color: #555555;
     text-align: center;
+
     & > span {
       width: 100%;
     }
   }
+
   /deep/ .details-content {
     /*padding: 0 67px;*/
+
     .details-content-modular {
       margin-bottom: 20px;
+
       .modular-header {
         display: flex;
         align-items: center;
         justify-content: space-between;
         height: 50px;
         border-bottom: 1px solid #E5E5E5;
+
         .modular-header-title {
           font-size: 18px;
           font-weight: bold;
           color: #3B424C;
+
           & > .icon-modular-title {
             display: inline-block;
             margin-left: -28px;
@@ -2985,10 +2966,12 @@ export default {
             background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
             vertical-align: top;
           }
+
           & > span {
             padding-left: 10px;
           }
         }
+
         .modular-header-btn {
           & > button {
             height: 30px;
@@ -2996,6 +2979,7 @@ export default {
             font-size: 14px;
             padding: 0 10px;
             font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
+
             & > i {
               display: inline-block;
               margin-right: 3px;
@@ -3007,43 +2991,53 @@ export default {
               vertical-align: text-bottom;
             }
           }
+
           .collection-btn {
             padding: 0;
             border: none;
+
             i {
               color: #F2CB51;
               font-size: 18px;
               width: 18px;
               height: 18px;
             }
+
             /*background: rgba(244, 162, 39, 0.1);*/
+
             .icon-collection {
               background-image: url("~assets/images/shangqi/standardDetails/collection.png");
             }
+
             &:hover {
               background: transparent;
             }
           }
+
           .relation-btn {
             color: #409EFF;
             border: 1px solid #409EFF;
             background: rgba(64, 158, 255, 0.1);
+
             .icon-relation {
               background-image: url("~assets/images/shangqi/standardDetails/relation.png");
             }
           }
         }
       }
+
       .basic-information-content {
         color: #333333;
         font-size: 18px;
         font-weight: 400;
+
         .standard-text {
           height: 50px;
           line-height: 50px;
           border-bottom: 1px solid #E5E5E5;
         }
       }
+
       .modular-content {
         .modular-item-more {
           padding: 5px 0;
@@ -3054,23 +3048,29 @@ export default {
           display: flex;
           justify-content: center;
           align-items: center;
+
           .wrap {
             cursor: pointer;
+
             span {
               color: #409EFF;
             }
+
             img {
               height: 10px;
               margin-left: 5px;
               transition: all .2s linear;
+
               &.is-show-all {
                 transform: rotate(180deg);
               }
             }
           }
         }
+
         & > div:not(.modular-item-more) {
           border-bottom: 1px solid #E5E5E5;
+
           .modular-content-p-name {
             display: inline-block;
             width: 220px;
@@ -3083,6 +3083,7 @@ export default {
             white-space: nowrap;
             text-overflow: ellipsis;
           }
+
           .modular-content-p-val {
             display: inline-block;
             width: calc(~'100% - 225px');
@@ -3095,20 +3096,24 @@ export default {
             //white-space: nowrap;
             //text-overflow: ellipsis;
           }
+
           .modular-content-p-flies {
             position: relative;
             display: inline-block;
             width: calc(~'100% - 225px');
             min-height: 50px;
+
             & > .files-title {
               width: calc(~'100% - 120px');
               min-height: 50px;
               line-height: 50px;
               font-size: 16px;
               color: #409EFF;
+
               & > a {
                 cursor: pointer;
               }
+
               & > i {
                 display: inline-block;
                 margin-left: 3px;
@@ -3120,13 +3125,16 @@ export default {
                 vertical-align: sub;
                 cursor: pointer;
               }
+
               .icon-download {
                 background-image: url("~assets/images/shangqi/img/download.png");
               }
+
               .icon-download2 {
                 background-image: url("~assets/images/shangqi/img/download2.png");
               }
             }
+
             .decomposition-btn {
               position: absolute;
               top: 10px;
@@ -3138,6 +3146,7 @@ export default {
               color: #07C160;
               border: 1px solid #07C160;
               background: rgba(1, 193, 96, 0.1);
+
               .icon-separate {
                 display: inline-block;
                 margin-right: 3px;
@@ -3154,12 +3163,15 @@ export default {
         }
       }
     }
+
     .basic-information {
       border-top: 2px dashed #D1D1D1;
+
       .modular-header {
         height: 60px;
         border-bottom: none;
       }
+
       .basic-information-content {
         & > p {
           min-height: 55px;
@@ -3169,6 +3181,7 @@ export default {
       }
     }
   }
+
   .more, .put-away {
     position: fixed;
     bottom: 0;
@@ -3183,32 +3196,38 @@ export default {
     background-image: linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 70%);
     padding-bottom: 34px;
     padding-top: 34px;
+
     & > img {
       margin-left: 5px;
       width: 14px;
       height: 14px;
     }
   }
+
   .put-away {
     & > img {
       transform: rotate(180deg);
     }
   }
+
   .not-footer-drawer {
     .search-area {
       margin-bottom: 0;
       border-bottom: 5px solid #f6f6f6;
     }
+
     .content {
       padding: 0 10px;
       flex: auto;
       //height: calc(~'100% - 105px - 56px');
     }
+
     .pagination {
       position: static;
     }
   }
 }
+
 .half {
   width: 50%;
   float: left;
@@ -3217,33 +3236,40 @@ export default {
 .hidden {
   overflow: hidden;
 }
+
 .clearfix {
   &:after {
     clear: both;
   }
+
   &:after, &:before {
     display: table;
     content: "";
   }
 }
+
 .details-container .el-divider {
   height: 1px;
   background-color: #d5d8da;
 }
+
 .span-line:hover {
   text-decoration: underline;
 }
+
 .relateClass {
   .el-dialog__body {
     max-height: 460px;
     overflow-y: auto;
   }
 }
+
 ::v-deep .el-drawer__header {
   & > span:first-child {
     outline: none !important;
   }
 }
+
 ::v-deep .el-drawer {
   outline: none !important;
 }

src/pages/home1/components/release/index.vue

@@ -4,7 +4,7 @@
     <ul>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title">
         <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-        <span class="time">{{ getDate(item.issueTime) }}</span>
+        <span class="time">{{item.issueTime }}</span>
       </li>
     </ul>
   </div>

src/pages/localTool/standAutoSplit/index.vue

@@ -77,6 +77,18 @@
                 show-overflow-tooltip
                 align="center">
             </el-table-column>
+            <el-table-column
+                prop="splitStatus"
+                label="拆分状态"
+                align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.splitStatus == '0'">编辑中</span>
+                <span v-else-if="scope.row.splitStatus == '1'">审核中</span>
+                <span v-else-if="scope.row.splitStatus == '2'">已关联</span>
+                <span v-else-if="scope.row.splitStatus == '3'">解读中</span>
+                <span v-else>已完成</span>
+              </template>
+            </el-table-column>
             <el-table-column
                 prop="creationTime"
                 label="拆分时间"
@@ -822,7 +834,7 @@ export default {
         name: 'OtherStandardDetails',
         params: {
           id: item.standId,
-          pageType: 'INLAND_STAND'
+          pageType: item.standType + '_STAND'
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -833,7 +845,7 @@ export default {
         name: 'OtherStandardDetails',
         params: {
           id: item.standId,
-          pageType: item.sarType + '_STAND'
+          pageType: item.sarType + '_STAND',
         }
       })
       window.open(routeUrl.href, '_blank')
@@ -1369,6 +1381,7 @@ export default {
         query: {
           infoId: row.id,
           result: row.result,
+          splitStatus: row.splitStatus
         }
       })
     },

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -97,7 +97,8 @@
                     <i class="iconfont">&#xe61e;</i>
                     <el-dropdown-menu slot="dropdown">
                       <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
-                      <el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-if="splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '编辑',  scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
                     </el-dropdown-menu>
@@ -685,6 +686,7 @@ export default {
   },
   data () {
     return {
+      splitStatus: this.$route.query.splitStatus,
       auditFlag: this.$route.query.auditFlag,
       splitCheckDialog: false,
       submitLoading: false,
@@ -1306,7 +1308,6 @@ export default {
           if (cur[i].pId == null || cur[i].pId === '') {
             this.parentNode = cur[i]
           }
-          console.log(str);
           this.zNodes = str
         }
         // 查完左侧目录后，如果没有选中的，设置最外层选中

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -208,7 +208,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {inboundLiaisonDetail} from 'api/process'
+    import {inboundLiaisonDetail,saveTaskForPub} from 'api/process'
 
     export default {
         name: "bzdyStep5",

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -388,6 +388,7 @@
                 sarType: '',
                 loading: false,
                 standId: '',
+                statusId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
+                    statusId: '',
                     itemsNum1: '',
                     itemsName1: '',
                     oldNumber: ''
@@ -622,6 +624,8 @@
                     this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
+                    this.statusId = bringData[0].id
+                    this.form.statusId = bringData[0].id
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {

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

@@ -388,6 +388,7 @@
                 sarType: '',
                 loading: false,
                 standId: '',
+                statusId: '',
                 commentText: '',
                 textarea: '', // 意见
                 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
                     itemsNum: '',
                     itemsName: '',
                     standId: '',
+                    statusId: '',
                     itemsNum1: '',
                     itemsName1: '',
                     oldNumber: ''
@@ -627,6 +629,8 @@
                     this.form.standId = bringData[0].standId
                     this.sarType = bringData[0].standType
                     this.standId = bringData[0].standId
+                    this.statusId = bringData[0].id
+                    this.form.statusId = bringData[0].id
                     this.listModel = false;
                     this.listModel2 = true
                     this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {

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

@@ -304,11 +304,14 @@
           label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="putTime"
+          prop="ssrq"
           sortable
           align="center"
           width="210px"
           label="标准实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -458,7 +461,7 @@
           </el-form-item>
           <el-form-item label="标准实施日期" prop="putTime">
             <el-date-picker
-              v-model.trim="editRowData.putTime"
+              v-model.trim="editRowData.ssrq"
               type="date"
               value-format="yyyy-MM-dd"
               placeholder="选择日期">
@@ -582,7 +585,7 @@ export default {
         standEnName: '',
         typeApplicable: '',
         nylx: '',
-        putTime: '',
+        ssrq: '',
         zccssrqgj: '',
         xcxssrqgj: '',
         zrbm: '',
@@ -1108,66 +1111,6 @@ export default {
           }
         ]
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
-        // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
       }
     },
     /**
@@ -1305,10 +1248,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
+            if (this.sarAccessInfoList[i].ssrq === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
            if (this.sarAccessInfoList[i].xcxssrqgj === null) {
              rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1382,14 +1325,7 @@ export default {
         }
       })
     },
-    // 查询数据搜索 table 数据
+    pageInfo() {
-    selectLawsStands () {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-        this.sarAccessInfoSearch.standType = ''
-      } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
-      }
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1402,6 +1338,7 @@ export default {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
             this.$set(item, 'sycpx', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
             this.$set(item, 'zrbm', '')
@@ -1413,6 +1350,7 @@ export default {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
             this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
@@ -1426,12 +1364,18 @@ export default {
       }, e => {
       })
     },
-    selectBtn() {
+    // 查询数据搜索 table 数据
+    selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.pageInfo()
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.pageInfo()
       }
+
+    },
+    selectPage() {
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1443,6 +1387,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1454,6 +1399,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1468,6 +1414,15 @@ export default {
       }, e => {
       })
     },
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.selectPage()
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.selectPage()
+      }
+    },
     // 数据搜索table判断checked状态
     selectable (row) {
       return row.isRelateAccess === '1'
@@ -1479,6 +1434,7 @@ export default {
         if (item.attrInfoMap === null) {
           this.$set(item, 'zccssrqgj', '')
           this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'ssrq', '')
           this.$set(item, 'sycpx', '')
           this.$set(item, 'typeApplicable', '')
           this.$set(item, 'nylx', '')
@@ -1490,6 +1446,7 @@ export default {
         }else {
           this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
           this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+          this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1578,7 +1535,6 @@ export default {
     },
     // 导出确定功能
     exportTestItem () {
-      let exportNames = this.exportName
       let exportList = []
       if (this.sarAccessInfoListArry.length > 0) {
         exportList = this.sarAccessInfoListArry

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

@@ -150,11 +150,17 @@
             label="能源类型">
           </el-table-column>
           <el-table-column
-            prop="putTime"
+            prop="ssrq"
             sortable
             align="center"
             width="210px"
             label="标准实施日期">
+            <template slot-scope="scope">
+              <span v-if="scope.row.ssrq === null">
+                {{ scope.row.ssrq }}
+              </span>
+              <span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -757,11 +763,6 @@ export default {
     setMap(data){
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
-        this.$set(this.typeApplicableMap, item.value, item.label)
-        this.$set(this.nylxMap, item.value, item.label)
-        this.$set(this.zrbmMap, item.value, item.label)
-        this.$set(this.sycpxMap, item.value, item.label)
-        this.$set(this.countryAreaMap, item.value, item.label)
       })
     }
   },
@@ -797,12 +798,6 @@ export default {
       this.textStatusOptions = res.data.WBZTCLASS
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.setMap(this.textStatusOptions)
-      this.setMap(this.zrbmOptions)
-      this.setMap(this.categoryOptions)
-      this.setMap(this.sycpxOptions)
-      this.setMap(this.energyKindOptions)
-      this.setMap(this.drawerCountryOptions)
-      this.setMap(this.applyArcticOptions)
       this.getGzzOption();
     }, e => {
     });

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

@@ -288,11 +288,14 @@
           label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="putTime"
+          prop="ssrq"
           sortable
           align="center"
           width="210px"
           label="标准实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -440,9 +443,9 @@
         <el-form-item label="能源类型" prop="nylx">
           <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="标准实施日期" prop="putTime">
+        <el-form-item label="标准实施日期" prop="ssrq">
           <el-date-picker
-            v-model.trim="editRowData.putTime"
+            v-model.trim="editRowData.ssrq"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
@@ -566,7 +569,7 @@ export default {
         standEnName: '',
         typeApplicable: '',
         nylx: '',
-        putTime: '',
+        ssrq: '',
         zccssrqgj: '',
         xcxssrqgj: '',
         zrbm: '',
@@ -1076,66 +1079,6 @@ export default {
           }
         ]
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
-        // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
       }
     },
     /**
@@ -1274,10 +1217,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
+            if (this.sarAccessInfoList[i].ssrq === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1350,14 +1293,7 @@ export default {
         }
       })
     },
-    // 查询数据搜索 table 数据
+    pageInfo() {
-    selectLawsStands () {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-        this.sarAccessInfoSearch.standType = ''
-      } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
-      }
       StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1369,6 +1305,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1380,6 +1317,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1394,13 +1332,17 @@ export default {
       }, e => {
       })
     },
-    // 高级检索查询按钮
+    // 查询数据搜索 table 数据
-    selectBtn() {
+    selectLawsStands () {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.pageInfo()
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.pageInfo()
       }
+    },
+    selectPage() {
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1412,6 +1354,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1423,6 +1366,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1437,6 +1381,16 @@ export default {
       }, e => {
       })
     },
+    // 高级检索查询按钮
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.selectPage()
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.selectPage()
+      }
+    },
     // 数据搜索table判断checked状态
     selectable (row) {
       return row.isRelateAccess === '1'
@@ -1448,6 +1402,7 @@ export default {
         if (item.attrInfoMap === null) {
           this.$set(item, 'zccssrqgj', '')
           this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'ssrq', '')
           this.$set(item, 'sycpx', '')
           this.$set(item, 'typeApplicable', '')
           this.$set(item, 'nylx', '')
@@ -1459,6 +1414,7 @@ export default {
         }else {
           this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
           this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+          this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)

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

@@ -288,11 +288,14 @@
           label="能源类型">
         </el-table-column>
         <el-table-column
-          prop="putTime"
+          prop="ssrq"
           sortable
           align="center"
           width="210px"
           label="标准实施日期">
+          <template slot-scope="scope">
+            <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '' }}</span>
+          </template>
         </el-table-column>
         <el-table-column
           show-overflow-tooltip
@@ -439,9 +442,9 @@
         <el-form-item label="能源类型" prop="nylx">
           <el-input v-model.trim="editRowData.nylx" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="标准实施日期" prop="putTime">
+        <el-form-item label="标准实施日期" prop="ssrq">
           <el-date-picker
-            v-model.trim="editRowData.putTime"
+            v-model.trim="editRowData.ssrq"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择日期">
@@ -580,7 +583,7 @@ export default {
         standEnName: '',
         typeApplicable: '',
         nylx: '',
-        putTime: '',
+        ssrq: '',
         zccssrqgj: '',
         xcxssrqgj: '',
         zrbm: '',
@@ -1076,66 +1079,6 @@ export default {
           }
         ]
         // 国内外政策可查字段
-      }else if (val === 'FOREIGN_LAWS'){
-        this.twoOptions=[
-          {
-            label: '适用车辆类型',
-            value: 'SYCLLX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '政策编号',
-            value: 'LAWS_NUMBER',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '中文名称',
-            value: 'LAWS_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '英文名称',
-            value: 'LAWS_EN_NAME',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '个性化标签',
-            value: 'GXHBQXX',
-            type: 'SEL_OPTION',
-            disabled: false
-          }, {
-            label: '新车型实施日期(文本)',
-            value: 'XCXSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '在产车实施日期(文本)',
-            value: 'ZCCSSRQ',
-            type: 'DATE_PIC_OPTS',
-            disabled: false
-          }, {
-            label: '维护工程师',
-            value: 'ZCGCS',
-            type: 'SEL_OPTION',
-            selVal: "USERLIST",
-            disabled: false
-          }
-        ]
-        // 标准法规清单可查字段
-      }else {
-        this.twoOptions=[
-          {
-            label: '清单名称',
-            value: 'ACCESS_CONTENT',
-            type: 'INPUT',
-            disabled: false
-          }, {
-            label: '国家地区',
-            value: 'COUNTRY',
-            type: 'SEL_OPTION',
-            disabled: false
-          }
-        ]
       }
     },
     /**
@@ -1273,10 +1216,10 @@ export default {
           let rowlist3 = []
           for (let i = 0; i < this.sarAccessInfoList.length; i++) {
             rowlist.push(this.sarAccessInfoList[i].id)
-            if (this.sarAccessInfoList[i].putTime === null)  {
+            if (this.sarAccessInfoList[i].ssrq === null)  {
-              rowlist1.push(this.sarAccessInfoList[i].putTime = '-')
+              rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
             }else {
-              rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
+              rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
@@ -1350,13 +1293,7 @@ export default {
       })
     },
     // 查询数据搜索 table 数据
-    selectLawsStands () {
+    pageInfo() {
-      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
-        this.sarAccessInfoSearch.standType = ''
-      } else {
-        this.sarAccessInfoSearch.standType = 'FOREIGN'
-      }
       StandardsInfoPage(this.sarAccessInfoSearch, this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1368,6 +1305,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1379,6 +1317,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1393,13 +1332,17 @@ export default {
       }, e => {
       })
     },
-    /** 高级查询查询按钮*/
+    selectLawsStands () {
-    selectBtn() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
-        this.sarAccessInfoSearch.dataSource = 'INLAND_STAND'
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.pageInfo()
       } else {
         this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.pageInfo()
       }
+    },
+    /** 高级查询查询按钮*/
+    selectPage() {
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1411,6 +1354,7 @@ export default {
           if (item.attrInfoMap === null) {
             this.$set(item, 'zccssrqgj', '')
             this.$set(item, 'xcxssrqgj', '')
+            this.$set(item, 'ssrq', '')
             this.$set(item, 'sycpx', '')
             this.$set(item, 'typeApplicable', '')
             this.$set(item, 'nylx', '')
@@ -1422,6 +1366,7 @@ export default {
           }else {
             this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
             this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+            this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
             this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
             this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
             this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1436,6 +1381,15 @@ export default {
       }, e => {
       })
     },
+    selectBtn() {
+      if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
+        this.sarAccessInfoSearch.standType = 'INLAND'
+        this.selectPage()
+      } else {
+        this.sarAccessInfoSearch.standType = 'FOREIGN'
+        this.selectPage()
+      }
+    },
     // 数据搜索table判断checked状态
     selectable (row) {
       return row.isRelateAccess === '1'
@@ -1447,6 +1401,7 @@ export default {
         if (item.attrInfoMap === null) {
           this.$set(item, 'zccssrqgj', '')
           this.$set(item, 'xcxssrqgj', '')
+          this.$set(item, 'ssrq', '')
           this.$set(item, 'sycpx', '')
           this.$set(item, 'typeApplicable', '')
           this.$set(item, 'nylx', '')
@@ -1458,6 +1413,7 @@ export default {
         }else {
           this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
           this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
+          this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
           this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
           this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
           this.$set(item, 'nylx', item.attrInfoMap.NYLX)

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -239,7 +239,7 @@
                       </el-dropdown-item>
                       <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'e8d690904ee1895dd0d17d9c794fbcd7'">编辑</el-dropdown-item>
 <!--                      <el-dropdown-item :command="[scope.row, '分享']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">分享</el-dropdown-item>-->
-                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'413e676a155d6eb2dfbe08df8cbcf682'">删除</el-dropdown-item>
+                      <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'dbaf9df2990a595c8abea28e68b1a681'">删除</el-dropdown-item>
                     </el-dropdown-menu>
                   </el-dropdown>
                 </div>
@@ -391,8 +391,8 @@
               </el-select>
             </el-form-item>
             <!--            是否纳入标准清单-->
-            <el-form-item title="是否纳入标准清单" label="是否纳入标准清单">
+            <el-form-item  label="是否纳入标准清单" class="serch-form-item">
-              <el-select v-model="sarStandardsSearch.isRelateAccess" class="advanced-one" placeholder="根据是否纳入标准清单查找">
+              <el-select v-model="sarStandardsSearch.isRelateAccess"  placeholder="根据是否纳入标准清单查找">
                 <el-option value="yes" label="是"></el-option>
                 <el-option value="no" label="否"></el-option>
               </el-select>
@@ -437,7 +437,7 @@
             <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-option v-for="opt in wscysdOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
               </el-select>
             </el-form-item>
 
@@ -530,6 +530,23 @@
                 </el-option>
               </el-select>
             </el-form-item>
+
+<!--            标记-->
+            <!--            标签-->
+            <el-form-item label="标签">
+              <el-input v-model="sarStandardsSearch.tag" clearable
+                        placeholder="根据被标签查找"
+                        @keyup.enter.native="btnSearch"></el-input>
+            </el-form-item>
+
+
+            <!--            体系类别-->
+            <el-form-item label="体系类别">
+              <el-select v-model="sarStandardsSearch.txlbOption" placeholder="根据体系类别查找" clearable
+                         @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
+                <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
         <div class="demo-drawer-footer">
@@ -1428,7 +1445,10 @@ export default {
         replacedStandNum: '',
         synopsis: '', // 内容摘要
         // category: '', // 所属类别
-        standSort: '' // 标准类别
+        standSort: '', // 标准类别
+        txlbOption:'', //标准体系
+        tag:'' //标签
+
       }, // 分页查询过程中用到的对象
       loading: false,
       isCollapse: true,
@@ -1484,6 +1504,8 @@ export default {
       categoryConfigOptions: [], // 所属类别下拉框
       assemClassOptions: [], // 总成分类下拉框
       standAttributeList: [],
+      qcdwOptions:[],//起草单位
+      wscysdOptions:[], //我司参与深度
       // 树形结构
       // tree function
       MoveTest: '',
@@ -4283,6 +4305,7 @@ export default {
       this.categoryConfigOptions = res.data.CATEGORY
       this.standAttributeList = res.data.RULETYPE
       this.qcdwOptions = res.data.QCDW
+      this.wscysdOptions=res.data.WSCYSD;
       this.getGzzOption()
       this.setMap(this.standStateOptions)
     }, e => {

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -55,7 +55,7 @@
             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
             <el-table-column
               prop="category"
-              label="标准"
+              label="标准/政策"
               align="center">
               <template slot-scope="scope">
                 <a class="table-jump" @click.stop="handlePreview(scope.row)">{{ scope.row.category }}</a>

src/pages/searchCenter/pages/standardSearch.vue

@@ -233,7 +233,7 @@
                                     </div>
                                     <div class="AllBoxContent" v-html="item.textContent"></div>
                                     <div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">
-                                        <div style="margin-right: 15px;">发布日期11:  {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time)  : '--' }} </div>
+                                        <div style="margin-right: 15px;">发布日期:  {{ item.issue_time !== null && item.issue_time !== '' ? dateFormat2(item.issue_time)  : '--' }} </div>
                                         <!--              <div>{{$t('m.putTime')}}:  {{ item.issue_time !== null && item.issue_time !== '' ? $dateFormat(new Date(item.put_time), 'yyyy-MM-dd') : '&#45;&#45;' }} </div>-->
                                     </div>
                                 </div>