Merge branch 'develop' into 'test'

Develop

See merge request !95

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -138,7 +138,7 @@
         @pageChange="pageChangeReplace"
         @pageSizeChange="pageSizeChangeReplace"></pagination>
       <div slot="footer" class="demo-drawer-footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
+        <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
         <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
       </div>
     </el-dialog>

src/components/navMenu/index.vue

@@ -135,11 +135,11 @@ export default {
             // // //   title: '本地产品/项目库',
             // // //   path: '/localProductsOrProjectLibrary'
             // // // },
-            /*{
+            {
               title: '企业标准库',
               path: '/enterpriseStandardDatabase',
-              menuId: '01ed8f752748227777b3572d56ee9ab5'
+              menuId: '7feeb73929c25a6f1fd67952704ec02b'
-            },*/
+            },
             // {
             //   title: '企标制修订计划',
             //   path: '/enterBSysRevPlanManaLib',

src/pages/details/otherBussStandardDetails/index.vue

@@ -3,52 +3,11 @@
   <div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
     <!--title 标题-->
     <div class="details-header">
-      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
+      <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
     </div>
     <!--主体内容-->
     <div class="details-content">
       <div class="details-content-modular basic-information">
-        <div class="modular-header">
-          <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>
-          </div>
-          <div class="modular-header-btn">
-            <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
-            <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
-            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
-          </div>
-        </div>
-        <div class="basic-information-content">
-          <p style="color: #C42626;"><label>企标编号：</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
-          <p><label>中文名称：</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
-          <p><label>英文名称：</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
-          <p>
-            <label
-              title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
-            >标准状态<i class="el-icon-warning-outline"></i>：</label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
-          </p>
-          <p><label>发布日期：</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
-          <p><label>标准实施日期：</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
-          <p><label>代替企标编号：</label>
-            <span v-if="sarStandardsInfoEO.replaceStandNum != null && sarStandardsInfoEO.replaceStandNum !== '' && sarStandardsInfoEO.replaceStandNum.split(',').length > 0">
-            <span v-for="(item, index) in sarStandardsInfoEO.replaceStandNum.split(',')" :key="index">
-              <a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-            </span>
-            </span>
-            <span v-else>
-            {{'-' }}
-            </span>
-          </p>
-          <p><label>被代替企标编号：</label>
-            <span v-if="sarStandardsInfoEO.replacedStandNum != null && sarStandardsInfoEO.replacedStandNum !== '' && sarStandardsInfoEO.replacedStandNum.split(',').length > 0">
-            <span v-for="(item, index) in sarStandardsInfoEO.replacedStandNum.split(',')" :key="index">
-              <a @click="showReplaceLawsInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
-            </span>
-            </span>
-            <span v-else>
-            {{'-' }}
-            </span>
-          </p>
-        </div>
       </div>
       <div
         class="details-content-modular clearfix"
@@ -56,10 +15,36 @@
         :key="index"
         v-if="item.isShowImp === '0'"
       >
-        <div class="modular-header">
+        <div class="modular-header" v-if="item.label !== '基础信息'">
-          <div class="modular-header-title"><i class="icon-modular-title" /><span>{{ item.label }}</span></div>
+          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+        </div>
+        <div class="modular-header" v-if="item.label === '基础信息'">
+          <div class="modular-header-title"><i class="icon-modular-title"/><span>{{ item.label }}</span></div>
+          <!-- <div class="modular-header-title"><i class="icon-modular-title" /><span>企标信息</span>-->
+          <!--              </div>-->
+          <div class="modular-header-btn">
+            <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="icon-collection" :loading="isSubmit"></el-button>
+            <el-button v-else @click="collectClick()" title="收藏" class="collection-btn" icon="el-icon-star-off" :loading="isSubmit"></el-button>
+            <el-button class="relation-btn" icon="icon-relation" @click="relateEvent()">更新LOG</el-button>
+          </div>
         </div>
         <div class="modular-content">
+          <template v-if = "item.label === '基础信息'">
+            <div class="details-content-modular basic-information" style="margin-bottom: 0">
+              <div class="basic-information-content">
+              <p style="color: #C42626;"><label style=" margin-right: 171px;">企标号</label><span>{{ sarStandardsInfoEO.standCode }}</span></p>
+              <p><label style=" margin-right: 157px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
+              <p><label style=" margin-right: 157px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
+              <p>
+                <label style=" margin-right: 139px;"
+                        title="“修订中”为现行有效版本；“已修订”标准的有效性需根据实际实施情况判定"
+                >文本状态<i class="el-icon-warning-outline"></i></label><span style="color: #409EFF;">{{ sarStandardsInfoEO.standStatusShow || '-' }}</span>
+              </p>
+              <p><label style=" margin-right: 157px;">发布日期</label><span>{{ sarStandardsInfoEO.issueTime || '-' }}</span></p>
+              <p><label style=" margin-right: 122px;">标准实施日期</label><span>{{ sarStandardsInfoEO.putTime || '-' }}</span></p>
+            </div>
+            </div>
+          </template>
           <template
             v-for="(child, childIndex) in item.child"
             v-if="child.isShowImp === '0'"
@@ -1453,7 +1438,7 @@ export default {
         return true
       }
       // 缺少文件
-      if (this.$hasPermission('Lgfdg6839L')) {
+      if (this.$hasPermission('43ae63abc1b64e6bd5cf3bb75b423bc2')) {
         this.$http.get('lawss/sarBussStandFile/queryConvertAtt', {
           attId: attId
         }, {
@@ -2032,8 +2017,8 @@ export default {
     })
     Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
-      const relatedPlansRes = await this.queryRelatedPlans()
+      // const relatedPlansRes = await this.queryRelatedPlans()
-      const relatedPlans = relatedPlansRes.list
+      // const relatedPlans = relatedPlansRes.list
       formFieldList.forEach((field) => {
         displayLocation.forEach((location) => {
           location.isShowImp = '0'
@@ -2114,7 +2099,7 @@ export default {
   /deep/.details-content{
     /*padding: 0 67px;*/
     .details-content-modular{
-      margin-bottom: 20px;
+      /*margin-bottom: 20px;*/
       .modular-header{
         display: flex;
         align-items: center;
@@ -2186,8 +2171,8 @@ export default {
       }
       .basic-information-content{
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
         .standard-text{
           height: 50px;
           line-height: 50px;
@@ -2281,7 +2266,7 @@ export default {
       }
     }
     .basic-information{
-      border-top: 2px dashed #D1D1D1;
+      /*border-top: 2px dashed #D1D1D1;*/
       border-bottom: 2px dashed #D1D1D1;
       .modular-header{
         height: 60px;
@@ -2291,6 +2276,7 @@ export default {
         & > p{
           min-height: 55px;
           line-height: 55px;
+          border-bottom: 1px solid #E5E5E5;
         }
       }
     }

src/pages/details/otherStandardDetails/index.vue

@@ -44,7 +44,7 @@
               <div class="basic-information-content">
                 <!--                <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: 164px;">标准号</label>
                   <span v-if="sarStandardsInfoEO.standYear">{{
                       sarStandardsInfoEO.standSortShow + ' ' + sarStandardsInfoEO.standNumber + '-' + sarStandardsInfoEO.standYear
                     }}</span>
@@ -70,7 +70,7 @@
                     sarStandardsInfoEO.issueTime || '-'
                   }}</span></p>
                 <p>
-                  <label style=" margin-right: 76px;">是否纳入认证清单</label><span>{{
+                  <label style=" margin-right: 84px;">是否纳入认证清单</label><span>{{
                     sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
                   }}</span>
                 </p>
@@ -287,6 +287,8 @@
                         class="icon-download2"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
+
+                    <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -306,12 +308,12 @@
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
-                <!--                <el-button-->
+<!--                                <el-button-->
-                <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+<!--                                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
-                <!--                  @click="showItemsModel(child.attrField)"-->
+<!--                                  @click="showItemsModel(child.attrField)"-->
-                <!--                  class="decomposition-btn"-->
+<!--                                  class="decomposition-btn"-->
-                <!--                  icon="icon-separate"-->
+<!--                                  icon="icon-separate"-->
-                <!--                >标准分解单</el-button>-->
+<!--                                >标准分解单</el-button>-->
               </div>
             </div>
 
@@ -383,6 +385,11 @@
                         class="icon-download2"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
+<!--                    OCR按钮,根据文件名取后缀判断是否出现-->
+
+                      <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>
+
+
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -1513,6 +1520,14 @@ export default {
   props: {},
   watch: {},
   methods: {
+    judgeSuffix(fileName){
+      if ('pdf'===fileName.substring(fileName.lastIndexOf('.') + 1)){
+        return true;
+      }else return false;
+    },
+    ocrFunction(file){
+      return "ocr"
+    },
     FormatDate(date) {
       return moment(date).format('YYYY-MM-DD');
     },
@@ -2089,16 +2104,11 @@ export default {
     },
     // 分页点击后方法
     pageChange(page) {
-      console.log("page");
-      console.log(page);
-
       this.standItemSearch.page = page
       this.selectSarStandItems()
     },
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
-      console.log("pageSize");
-      console.log(pageSize);
       // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
       this.standItemSearch.pageSize = pageSize;
       this.selectSarStandItems()
@@ -2124,7 +2134,7 @@ export default {
           if (this.sarStandardsInfoEO.replaceStandNum != null && this.sarStandardsInfoEO.replaceStandNum !== '') {
             this.replaceNumList = this.sarStandardsInfoEO.replaceStandNum.split(',')
           }
-          // eslint-disable-next-line no-mixed-operators
+          // // eslint-disable-next-line no-mixed-operators
           Object.keys((this.sarStandardsInfoEO && this.sarStandardsInfoEO.attrInfoMap) || {}).forEach((key) => {
             if (this.sarStandardsInfoEO.attrInfoMap[key]) {
               this.sarStandardsInfoEO[key] = this.sarStandardsInfoEO.attrInfoMap[key]
@@ -2502,9 +2512,7 @@ export default {
     },
     // 分解单-查看
     handlePreview(item) {
-      console.log(item);
       this.standShowItemEO = item
-      console.log(this.standShowItemEO);
       this.showItemInfoModal = true
       let fileList = []
       item.defaultFileList = []
@@ -2608,8 +2616,6 @@ export default {
                 // const { data: { STAND: data } } = res
                 const {data = {}} = res
                 this.formFieldListData = data[this.$route.params.pageType]
-                console.log('this.formFieldListData')
-                console.log(this.formFieldListData);
                 // this.resolveFormFieldList()
                 resolve(data[this.$route.params.pageType])
               } else {
@@ -2836,14 +2842,14 @@ export default {
       this.setMap(res.data.SARPROPERTY) // 标准性质
     }, e => {
     })
-    Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
+    Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then  ((values) => {
       const [displayLocation, standEO, formFieldList] = values
       const dynamicFormField = standEO ? standEO.attrInfoMap : {}
       formFieldList.forEach((field) => {
         // 相关流程权限
-        // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
+        if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
-        //   return
+          return
-        // }
+        }
         displayLocation.forEach((location) => {
           location.isShowImp = '0'
           if (dynamicFormField) {
@@ -2893,6 +2899,8 @@ export default {
         location.half = half
         location.showAll = false
       })
+      console.log(standEO);
+
       this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
         id: this.$route.params.id
       }, {
@@ -2911,7 +2919,6 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
-        console.log(this.dynamicFormField)
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false
@@ -3023,8 +3030,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;
@@ -3147,8 +3154,8 @@ export default {
 
       .basic-information-content {
         color: #333333;
-        font-size: 18px;
+        font-size: 16px;
-        font-weight: 400;
+        /*font-weight: 400;*/
 
         .standard-text {
           height: 50px;

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

@@ -1224,6 +1224,7 @@ export default {
     },
     //添加标准确定事件
     okStand() {
+      this.getStandData();
       if (this.standList.length < 1) {
         this.$message.warning("请选择需要添加进清单的数据");
       } else {

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

@@ -236,6 +236,7 @@
                         json.commentText = this.commentText
                         json.responUserList = this.form.responUserList
                         json.responUserListName = this.form.responUserListName
+                        json.introduce = false
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,

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

@@ -357,6 +357,7 @@
                         json.commentText = this.commentText
                         json.info = this.data
                         json.department = this.$store.getters.userInfo.orgName
+                        json.introduce = true
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -382,7 +383,17 @@
                         this.form.endTime = data.endTime
                         this.form.cname = data.cname
                         this.json = data
+                        if (data.introduce) {
                             this.data = data.info || []
+                        } else {
+                            this.$http.get('slrs/sar-public-idea-all/getPublicIdea', {
+                                unique: data.uniques
+                            }, {}, res => {
+                                res.data.forEach(item => {
+                                    this.data.push(item)
+                                })
+                            })
+                        }
                     }).catch(e => {
                     })
                 })

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

@@ -84,7 +84,7 @@
             align="center">
         </el-table-column>
         <el-table-column
-          prop="countryArea"
+            prop="countryAreaShow"
             label="国家/地区"
             align="center">
         </el-table-column>
@@ -114,7 +114,8 @@
             align="center">
           <template slot-scope="scope">
             <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
+                v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
+                scope.row.detailedListVision
               }}</span>
           </template>
         </el-table-column>
@@ -123,7 +124,10 @@
             label="更新时间"
             align="center">
           <template slot-scope="scope">
-            <div>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD')  : scope.row.updateTime }}</div>
+            <div>{{
+                scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : scope.row.updateTime
+              }}
+            </div>
           </template>
         </el-table-column>
         <el-table-column
@@ -137,11 +141,14 @@
               <el-dropdown trigger="click" @command="handleCommand">
                 <i class="iconfont">&#xe61e;</i>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">查看
+                  <el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b736f2469d49b3214cc8087419a24b60'">
+                    查看
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">编辑
+                  <el-dropdown-item :command="[scope.row, '编辑']" v-btn-permission="'4733577057bf2470fc5c1f88d81eaf1d'">
+                    编辑
                   </el-dropdown-item>
-                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">删除
+                  <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="'ff411226afb759fd2f4a2798ceac322a'">
+                    删除
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -190,14 +197,14 @@ export default {
       drawerTotal: 0, // 抽屉分页的总条数
       sarAccessEORules: {
         region: [
-          { required: true, message: "区域不能为空", trigger: "change" }
+          {required: true, message: "区域不能为空", trigger: "change"}
         ],
         country: [
-          { required: true, message: "国家不能为空", trigger: "change" }
+          {required: true, message: "国家不能为空", trigger: "change"}
         ],
         detailedListName: [
-          { required: true, message: "清单名称不能为空", trigger: "blur" },
+          {required: true, message: "清单名称不能为空", trigger: "blur"},
-          { type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur" }
+          {type: "string", max: 100, message: "清单名称不能超过100个字符", trigger: "blur"}
         ]
       },
       countryOptions: [],
@@ -216,10 +223,10 @@ export default {
         applyAuth: "" // 认证类型
       },
       dataSourceOptions: [
-        { value: "INLAND_STAND", label: "国内标准法规" },
+        {value: "INLAND_STAND", label: "国内标准法规"},
-        { value: "FOREIGN_STAND", label: "海外标准法规" },
+        {value: "FOREIGN_STAND", label: "海外标准法规"},
-        { value: "FOREIGN_LAWS", label: "国内外政策" },
+        {value: "FOREIGN_LAWS", label: "国内外政策"},
-        { value: "BUSINESS", label: "企业标准 " }
+        {value: "BUSINESS", label: "企业标准 "}
       ],
       tableLoading: true,
       sarAccessInfoSearchList: [],
@@ -260,24 +267,25 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessListDatas = res.data.records
+        let arr = res.data.records;
-        this.sarAccessListDatas.forEach(item => {
+        arr.forEach(item => {
           // 国家地区转换
           if (item.countryArea !== null || item.countryArea !== "") {
             let k = (item.countryArea || "").split(',')
             for (let i in this.countryOptions) {
-              for (let m = 0; m< k.length; m++) {
+              for (let m = 0; m < k.length; m++) {
                 if (this.countryOptions[i].value === k[m]) {
                   k[m] = this.countryOptions[i].label
                 }
-                item.countryArea = k.join(',')
+                item.countryAreaShow = k.join(',')
               }
             }
           }
         })
+        this.sarAccessListDatas = arr
+        this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
-        this.tableLoading = false
       }, e => {
 
       });
@@ -360,7 +368,7 @@ export default {
       });
     },
     // 将文本状态的id与name对应
-    setMap(data){
+    setMap(data) {
       data.forEach(item => {
         this.$set(this.countryAreaMap, item.value, item.label)
       })
@@ -400,6 +408,7 @@ export default {
     flex: auto;
     width: 100%;
     height: calc(100% - 110px) !important;
+
     .pagination {
       position: static;
 

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

@@ -85,7 +85,7 @@
           align="center">
         </el-table-column>
         <el-table-column
-          prop="carType"
+          prop="carTypeShow"
           label="车型类别"
           align="center">
         </el-table-column>
@@ -279,8 +279,8 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessListDatas = res.data.records
+        let arr = res.data.records;
-        this.sarAccessListDatas.forEach(item =>{
+        arr.forEach(item =>{
           // 适用车型转换
           if (item.carType !== null) {
             let k = (item.carType || "").split(',')
@@ -289,11 +289,12 @@ export default {
                 if (this.energyKindOptions[i].value === k[m]) {
                   k[m]  = this.energyKindOptions[i].label
                 }
-                item.carType = k.join(',')
+                item.carTypeShow = k.join(',')
               }
             }
           }
         })
+        this.sarAccessListDatas = arr
         this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total
@@ -393,8 +394,8 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.sarAccessListDatas = res.data.records
+        let arr = res.data.records
-        this.sarAccessListDatas.forEach(item =>{
+       arr.forEach(item =>{
           // 适用车型转换
           if (item.carType !== null) {
             let k = (item.carType || "").split(',')
@@ -403,11 +404,12 @@ export default {
                 if (this.energyKindOptions[i].value === k[m]) {
                   k[m]  = this.energyKindOptions[i].label
                 }
-                item.carType = k.join(',')
+                item.carTypeShow = k.join(',')
               }
             }
           }
         })
+        this.sarAccessListDatas = arr
         this.tableLoading = false
         this.sarSarAccessEOSearch.page = 1
         this.sarAccessListTotal = res.data.total

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

@@ -1360,11 +1360,12 @@ export default {
               loading: 'loadData'
             }, res => {
               if (res.ok) {
-                //this.$message.success('编辑成功')
+                this.$message.success('修改成功')
-                this.isNext = true
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
+              } else {
+                this.$message.error('已存在此国家/地区清单，修改失败')
               }
             }, e => {
             })

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

@@ -1304,6 +1304,7 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })

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

@@ -6,7 +6,8 @@
       <el-divider content-position="left">基础信息</el-divider>
       <div class="search-area">
         <div class="left">
-          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules" label-width="80px">
+          <el-form inline :model="sarAccessEO" ref="sarAccessForm" class="label-input-form" :rules="sarAccessEORules"
+                   label-width="80px">
             <el-form-item label="清单名称" prop="detailedListName" class="search-item">
               <el-input v-model="sarAccessEO.detailedListName" :disabled="disabledFlag" placeholder="请输入"></el-input>
             </el-form-item>
@@ -97,7 +98,8 @@
               <el-button
                   class="common-button-default"
                   size="small"
-                @click="clearSearchLaws">清空</el-button>
+                  @click="clearSearchLaws">清空
+              </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn">
@@ -166,18 +168,21 @@
       <div class="action-bar">
         <el-button
             class="common-button-default"
-          size="mini" @click="addSarAccess">添加</el-button>
+            size="mini" @click="addSarAccess">添加
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="showTableFlag"
             size="mini" @click="isShowTable"
-        >{{$t('m.showAddDataList')}}</el-button>
+        >{{ $t('m.showAddDataList') }}
+        </el-button>
         <el-button
             class="common-button-default"
             v-if="!showTableFlag"
             size="mini"
             @click="isShowTable"
-        >{{$t('m.hideAddDataList')}}</el-button>
+        >{{ $t('m.hideAddDataList') }}
+        </el-button>
       </div>
       <div class="standards-drawer-table standards-drawer-table-one" v-if="!showTableFlag">
         <el-table
@@ -271,7 +276,7 @@
         </el-table>
         <pagination :page="drawerPage" :total="drawerTotal" @pageChange="drawerPageChange"
                     @pageSizeChange="drawerPageSizeChange"></pagination>
-        <loading :loading="dataLoading">{{$t('m.dataAcquisition')}}</loading>
+        <loading :loading="dataLoading">{{ $t('m.dataAcquisition') }}</loading>
       </div>
     </div>
     <!--清单条目-->
@@ -282,12 +287,14 @@
             class="common-button-default export-button"
             size="mini" @click="exportAccessInfo('apart')"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe6e9;</i>导出</el-button>
+        ><i class="iconfont">&#xe6e9;</i>导出
+        </el-button>
         <el-button
             class="common-button-default delete-button"
             size="mini" @click="deleteSelectSarAccessInfo"
             v-btn-permission="''"
-        ><i class="iconfont">&#xe61b;</i>删除</el-button>
+        ><i class="iconfont">&#xe61b;</i>删除
+        </el-button>
       </div>
       <el-table
           :data="sarAccessInfoList"
@@ -366,7 +373,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
+            <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -378,7 +385,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
             </span>
-            <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
+            <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -430,26 +437,33 @@
                 type="primary"
                 size="small" @click="moveUp(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >上移</el-button>
+            >上移
+            </el-button>
             <el-button
                 class="common-button-default"
                 type="danger"
                 size="small" @click="moveDown(scope.$index, scope.row)"
                 v-if="!disabledFlag"
-            >下移</el-button>
+            >下移
+            </el-button>
             <el-button
                 size="small"
                 @click="editTghisRow(scope.row)"
                 class="common-button-default"
                 type="warning"
-            >编辑</el-button>
+            >编辑
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div class="footer">
-      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess" v-if="!disabledFlag" :loading="loadData">{{$t('m.submit')}}</el-button>
+      <el-button class="common-button-primary" icon="el-icon-check" size="mini" type="primary" @click="saveSarAccess"
-      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal" v-if="!disabledFlag">{{$t('m.cancel')}}</el-button>
+                 v-if="!disabledFlag" :loading="loadData">{{ $t('m.submit') }}
+      </el-button>
+      <el-button class="common-button-default" icon="el-icon-close" size="mini" @click="backCancal"
+                 v-if="!disabledFlag">{{ $t('m.cancel') }}
+      </el-button>
     </div>
     <el-dialog :visible.sync="exportTestItemNameFlag" title="导出文件" width="300px">
       <el-form :inline="true" class="label-input-form search-area">
@@ -459,7 +473,8 @@
       </el-form>
       <span slot="footer" class="demo-drawer-footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancal">取消</el-button>
-        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="exportTestItem">提交</el-button>
+        <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                   @click="exportTestItem">提交</el-button>
       </span>
     </el-dialog>
     <!--导入模态框-->
@@ -551,14 +566,16 @@
             size="mini"
             icon="el-icon-check"
             @click="saveInfo"
-        >提交</el-button
+        >提交
+        </el-button
         >
         <el-button
             size="mini"
             icon="el-icon-close"
             class="common-button-default"
             @click="cancelInfo"
-        >取消</el-button
+        >取消
+        </el-button
         >
       </div>
     </el-drawer>
@@ -579,14 +596,15 @@ import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
 import TreePopover from '@/components/CustomFormComponents/TreePopover'
 import CustomOrg from '@/components/CustomFormComponents/OrgTree'
 import CustomEopDatePick from '@/components/CustomFormComponents/DatePickerWithText'
-import CustomDatePickWithText ,{ formatText }from '@/components/CustomFormComponents/DatePickerGroupWithText'
+import CustomDatePickWithText, {formatText} from '@/components/CustomFormComponents/DatePickerGroupWithText'
 import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
 import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPolicy'
 import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
 import stand from "../../../config/pages/attributeCustom/components/stand";
-import { mapGetters } from 'vuex'
+import {mapGetters} from 'vuex'
 import {interfaceUrl} from "@/sysConfig";
 import {dicTypeData, StandardsInfoPage} from "@/api/unqualProcess"
+
 export default {
   name: 'OtherAddEit',
   components: {
@@ -609,10 +627,10 @@ export default {
     CustomInputForPolicy,
     CustomRoleTree
   },
-  data () {
+  data() {
     return {
       textStatusMap: {},
-      selectSearch : [],
+      selectSearch: [],
       // 新增、编辑 基础信息字段
       sarAccessEO: {
         id: '',
@@ -637,7 +655,7 @@ export default {
       editRowData: {
         id: '',
         standName: '',
-        standSortShow:'',
+        standSortShow: '',
         standEnName: '',
         typeApplicable: '',
         syrz: '',
@@ -664,6 +682,9 @@ export default {
         detailedListName: [
           {required: true, message: '清单名称不能为空', trigger: 'blur'},
           {type: 'string', max: 100, message: '清单名称不能超过100个字符', trigger: 'blur'}
+        ],
+        carType: [
+          {required: true,message: '车型类别不能为空', trigger: 'blur'}
         ]
       },
       disabledFlag: false,
@@ -900,31 +921,31 @@ export default {
           // {validator: this.verify.checkSpecialCharacter, trigger: 'blur'} gaoyan 2018-11-07 客户提到特殊符号校验问题
         ],
         lawsNumber: [
-          { required: true, message: '政策编号不能为空', trigger: 'change' },
+          {required: true, message: '政策编号不能为空', trigger: 'change'},
-          { type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change' },
+          {type: 'string', max: 100, message: '政策编号不能超过100个字符', trigger: 'change'},
           {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
         ],
         lawsName: [
-          { required: true, message: '中文名称不能为空', trigger: 'blur' },
+          {required: true, message: '中文名称不能为空', trigger: 'blur'},
-          { type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change' }
+          {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
         lawsEnName: [
-          { required: true, message: '英文名称不能为空', trigger: 'change' },
+          {required: true, message: '英文名称不能为空', trigger: 'change'},
-          { type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change' }
+          {type: 'string', max: 1000, message: '英文名称不能超过1000个字符', trigger: 'change'}
           // { validator: this.verify.valiateEnName, trigger: 'blur' }
         ],
         lawsState: [
-          { required: true, message: '文本状态不能为空', trigger: 'change' }
+          {required: true, message: '文本状态不能为空', trigger: 'change'}
         ],
         countryArea: [
-          { required: true, message: '适用区域不能为空', trigger: 'change' }
+          {required: true, message: '适用区域不能为空', trigger: 'change'}
         ],
         replaceLawsNum: [
-          { required: true, message: '代替政策编号不能为空', trigger: 'change' },
+          {required: true, message: '代替政策编号不能为空', trigger: 'change'},
-          { type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur' }
+          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}
         ],
         issueTime: [
-          { required: true, message: '发布日期不能为空', trigger: 'change' }
+          {required: true, message: '发布日期不能为空', trigger: 'change'}
         ]
       },
       formFieldListData: [], // 存储从接口取过来的原始数据
@@ -950,13 +971,13 @@ export default {
   },
   methods: {
     // 高级检索
-    selectMoreBtn () {
+    selectMoreBtn() {
       this.showSelectBox = !this.showSelectBox
       this.showTableFlag = false
       this.selectLawsStands()
     },
     // 法规维护人树
-    getDept () {
+    getDept() {
       return new Promise((resolve, reject) => {
         let url = 'sys/org/getTree'
         this.$http.get(url, {}, {
@@ -986,11 +1007,11 @@ export default {
       })
     },
     // 删除上传的文件
-    delFileInfo (file, fileList) {
+    delFileInfo(file, fileList) {
       this.fileInfoList = fileList
     },
     // 上传文件成功回调
-    uploadBackSuccess (res, file, fileList) {
+    uploadBackSuccess(res, file, fileList) {
       if (res.ok) {
         this.fileInfoList = fileList
         this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
@@ -1001,20 +1022,20 @@ export default {
       }
     },
     // 相关附件 上传之前钩子
-    beforeUpload (file) {
+    beforeUpload(file) {
       var filename = file.name
       var index1 = filename.lastIndexOf('.')
       var index2 = filename.length
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       //把后缀转大写
-      if(fileSuffix !== undefined && fileSuffix !== null){
+      if (fileSuffix !== undefined && fileSuffix !== null) {
         fileSuffix = fileSuffix.toUpperCase()
       }
       // 判断上传文件格式
       if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
-        || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+          || fileSuffix === '.PPTX' || fileSuffix === '.XLS' || fileSuffix === '.XLSX'
-        || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+          || fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
         return true
       } else {
         this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
@@ -1027,24 +1048,24 @@ export default {
       }
       return true
     },
-    moreSearch () {
+    moreSearch() {
       this.selectLawsStands()
       this.moreSearchShow = !this.moreSearchShow
       this.moreSearchBtn = !this.moreSearchBtn
     },
     // 点击显示隐藏数据列表 按钮事件
-    isShowTable () {
+    isShowTable() {
       this.selectLawsStands()
       this.showTableFlag = !this.showTableFlag
       this.selectedAccInfoSearchList = [] // 清空
     },
     // 点数据搜索 查询按钮 事件
-    searchLawsStands () {
+    searchLawsStands() {
       this.showTableFlag = false
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
-    clearSearchLaws () {
+    clearSearchLaws() {
       this.sarAccessInfoSearch.standName = ''
       this.sarAccessInfo.standName = ''
       this.sarAccessInfo.standNumber = ''
@@ -1057,14 +1078,14 @@ export default {
       this.selectLawsStands()
     },
     // 数据来源change事件
-    dataSourceChange (val) {
+    dataSourceChange(val) {
       this.isListType = val === 'TEMP'
       this.sarAccessInfoSearch.advanceSearchVOStr = ''
       // 国内标准法规可查字段
-      if (val === 'INLAND_STAND'){
+      if (val === 'INLAND_STAND') {
         this.selectLawsStands()
         // 海外标准法规可查字段
-      }else if (val === 'FOREIGN_STAND'){
+      } else if (val === 'FOREIGN_STAND') {
         this.selectLawsStands()
         // 国内外政策可查字段
       }
@@ -1073,7 +1094,7 @@ export default {
      * 点击数据搜索 添加按钮事件
      * 判断是否添加重复数据
      */
-    addSarAccess () {
+    addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
         // 追加字段
@@ -1082,12 +1103,12 @@ export default {
           addList = this.sarAccessInfoList.findIndex(items => {
             return items.id === item.id
           })
-          if(addList > -1){
+          if (addList > -1) {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
             this.$message.warning('请勿添加重复数据')
-          } else{
+          } else {
             this.sarAccessInfoList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
@@ -1102,7 +1123,7 @@ export default {
       }
     },
     // 上移 事件
-    moveUp (index, row) {
+    moveUp(index, row) {
       if (index === 0) {
         this.$message({
           message: '已经是列表中第一个素材！',
@@ -1114,7 +1135,7 @@ export default {
         this.$set(this.sarAccessInfoList, index, temp)
       }
     },
-    moveDown (index) {
+    moveDown(index) {
       if (index === (this.sarAccessInfoList.length - 1)) {
         this.$message({
           message: '已经是列表中最后一个素材！',
@@ -1143,21 +1164,21 @@ export default {
       this.drawerEdit = false
     },
     // 点击清单条目导入按钮事件
-    importmodalFlags () {
+    importmodalFlags() {
       this.importmodalFlag = true
       this.$nextTick(() => {
         this.$refs['importfile'].clearFiles()
       })
     },
     // 点击 模板下载 按钮事件
-    uploadImportModal () {
+    uploadImportModal() {
       window.open('/api/lawss/sarSarAccess/exportTemplate?fileName=标准法规清单导入模板.xlsx')
     },
     /**
      * 点击清单条目 删除按钮 事件
      * 删除不想添加的AccessInfo信息
      */
-    deleteSelectSarAccessInfo () {
+    deleteSelectSarAccessInfo() {
       if (this.sarAccessInfoListArry.length > 0) {
         this.$confirm('确认删除选中数据？', '确认删除', {
           confirmButtonText: '确定',
@@ -1179,26 +1200,27 @@ export default {
           })
           this.sarAccessInfoListArry = []
           this.$refs.entryTable.clearSelection()
-        }).catch(() => {})
+        }).catch(() => {
+        })
       } else {
         this.$message.error('请选择需要删除的清单条目!')
       }
     },
     // 清单条目 table select事件
-    sarAccessInfoSelect (selectData) {
+    sarAccessInfoSelect(selectData) {
       this.sarAccessInfoListArry = []
       for (let i = 0; i < selectData.length; i++) {
         this.sarAccessInfoListArry.push(selectData[i].id);
       }
     },
     // 点击取消按钮 返回事件
-    backCancal () {
+    backCancal() {
       this.$router.push({
         name: 'AccessStandardsAndRegulations'
       })
     },
     // 提交按钮 事件
-    saveSarAccess () {
+    saveSarAccess() {
       this.$refs['sarAccessForm'].validate((valid) => {
         if (valid) {
           let rowlist = []
@@ -1209,17 +1231,17 @@ export default {
             rowlist.push(this.sarAccessInfoList[i].id)
             if (this.sarAccessInfoList[i].ssrq === null) {
               rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
-            }else {
+            } else {
               rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
             }
             if (this.sarAccessInfoList[i].xcxssrqgj === null) {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
-            }else {
+            } else {
               rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
             }
             if (this.sarAccessInfoList[i].zccssrqgj === null) {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
-            }else {
+            } else {
               rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
             }
           }
@@ -1290,14 +1312,17 @@ export default {
             }, res => {
               if (res.ok) {
                 this.isNext = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   name: 'AccessStandardsAndRegulations'
                 })
+              } else {
+                this.$message.error('已存在此车型类别清单，修改失败')
               }
             }, e => {
             })
           }
-        }else {
+        } else {
           this.$message.error('请检查表单是否填写正确')
         }
       })
@@ -1398,7 +1423,7 @@ export default {
         if (item.zrbm !== null || item.zrbm !== "") {
           let k = (item.zrbm || "").split(',')
           for (let i in this.zrbmOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.zrbmOptions[i].value === k[m]) {
                 k[m] = this.zrbmOptions[i].label
               }
@@ -1410,7 +1435,7 @@ export default {
         if (item.nylx !== null) {
           let k = (item.nylx || "").split(',')
           for (let i in this.categoryOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.categoryOptions[i].value === k[m]) {
                 k[m] = this.categoryOptions[i].label
               }
@@ -1422,7 +1447,7 @@ export default {
         if (item.typeApplicable !== null) {
           let k = (item.typeApplicable || "").split(',')
           for (let i in this.CycxOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.CycxOptions[i].value === k[m]) {
                 k[m] = this.CycxOptions[i].label
               }
@@ -1434,7 +1459,7 @@ export default {
         if (item.sycpx !== null) {
           let k = (item.sycpx || "").split(',')
           for (let i in this.sycpxOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.sycpxOptions[i].value === k[m]) {
                 k[m] = this.sycpxOptions[i].label
               }
@@ -1446,7 +1471,7 @@ export default {
         if (item.syrz !== null) {
           let k = (item.syrz || "").split(',')
           for (let i in this.syrzOptions) {
-            for (let m = 0; m< k.length; m++) {
+            for (let m = 0; m < k.length; m++) {
               if (this.syrzOptions[i].value === k[m]) {
                 k[m] = this.syrzOptions[i].label
               }
@@ -1471,7 +1496,7 @@ export default {
         this.$set(item, 'cycvppscn', '')
         this.$set(item, 'kccvppsbm', '')
         this.$set(item, 'kccvppscn', '')
-      }else {
+      } else {
         this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
         this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
         this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
@@ -1488,7 +1513,7 @@ export default {
     },
     // 查询数据搜索 table 数据
     pageInfo() {
-      StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
+      StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1504,7 +1529,7 @@ export default {
       })
     },
     //  查询按钮
-    selectLawsStands () {
+    selectLawsStands() {
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
@@ -1515,7 +1540,7 @@ export default {
     },
     /** 高级查询查询按钮*/
     selectPage() {
-      StandardsInfoPage(this.sarAccessInfo).then(res =>{
+      StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
           if (item.standYear === null) {
@@ -1541,11 +1566,11 @@ export default {
       }
     },
     // 数据搜索table判断checked状态
-    selectable (row) {
+    selectable(row) {
       return row.isRelateAccess === '1'
     },
     // 数据搜索 table select事件
-    sarAccessInfoSearchSelect (val) {
+    sarAccessInfoSearchSelect(val) {
       this.selectedAccInfoSearchList = val
       this.selectedAccInfoSearchList.forEach(item => {
         this.addWord(item)
@@ -1553,32 +1578,32 @@ export default {
       this.changeText(this.selectedAccInfoSearchList)
     },
     // 数据搜索 清单类型 table select事件
-    accessSarTypeSelect (selectData) {
+    accessSarTypeSelect(selectData) {
       this.accessSarTypeList = selectData
     },
     // 数据搜索table分页页码改变回调
-    drawerPageChange (page) {
+    drawerPageChange(page) {
       this.drawerPage = page
       this.sarAccessInfoSearch.page = this.drawerPage
       this.selectLawsStands()
     },
 
     // 数据搜索table分页条数改变回调
-    drawerPageSizeChange () {
+    drawerPageSizeChange() {
       this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
       this.selectLawsStands()
     },
     // 点击 导出、全部导出按钮事件
-    exportAccessInfo (type) {
+    exportAccessInfo(type) {
       if (this.sarAccessInfoListArry.length > 0) {
         this.exportTestItemNameFlag = true
         this.exportName = ''
-      }else {
+      } else {
         this.$message.warning('请选择数据进行导出')
       }
     },
     // 导出确定功能
-    exportTestItem () {
+    exportTestItem() {
       let exportNames = this.exportName
       let exportList = []
       if (this.sarAccessInfoListArry.length > 0) {
@@ -1591,7 +1616,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' + '&ids=' + 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('导出信息成功')
@@ -1601,11 +1626,11 @@ export default {
       this.exportTestItemNameFlag = false
     },
     // 导出取消按钮关闭模态、置空
-    cancal () {
+    cancal() {
       this.exportTestItemNameFlag = false
     },
     // 导入 beforeUpload 事件
-    handleFormatbeforeUpload (file) {
+    handleFormatbeforeUpload(file) {
       let filename = file.name
       let index1 = filename.lastIndexOf('.')
       let index2 = filename.length
@@ -1623,7 +1648,7 @@ export default {
       return true
     },
     // 导入成功事件
-    importFileSuccess (response, file, fileList) {
+    importFileSuccess(response, file, fileList) {
       var a
       var b = ''
       if (response.data) {
@@ -1670,7 +1695,7 @@ export default {
       }
     },
     // 点击清单条目 新增按钮 事件
-    addEntry () {
+    addEntry() {
       this.editAddType = 1
       this.addEditTitle = '新增'
       this.isDisabled = false
@@ -1683,13 +1708,13 @@ export default {
       this.addEntryForm.authObjId = ''
       this.addEntryForm.proEssessUserId = ''
       this.addEntryForm.sarType = 'TEMP'
-      this.addEntryForm.attrField=''
+      this.addEntryForm.attrField = ''
       this.$nextTick(() => {
         this.$refs['addEntryForm'].resetFields()
       })
     },
     // 请求部门结构树
-    getOrgTreeSource () {
+    getOrgTreeSource() {
       this.$http.get('sys/org/getTree', {}, {_this: this},
           res => {
             if (res.ok) {
@@ -1712,7 +1737,7 @@ export default {
           })
     },
     // 新增提交事件
-    saveOrUpdateStands () {
+    saveOrUpdateStands() {
       this.isSubmit = true
       this.$refs['addEntryForm'].validate((valid) => {
         if (valid) {
@@ -1766,7 +1791,8 @@ export default {
               this.isSubmit = false
               this.$message.warning('标准编号已存在')
             }
-          }, e => {})
+          }, e => {
+          })
         } else {
           this.isSubmit = false
           this.$message({
@@ -1777,7 +1803,7 @@ export default {
       })
     },
     // 标准号验证
-    validateStandNumber (standinfo) {
+    validateStandNumber(standinfo) {
       return new Promise((resolve, reject) => {
         let obj = JSON.parse(JSON.stringify(standinfo))
         this.$http.post('lawss/sarStandardsInfo/validateStandNumber', obj, {
@@ -1794,20 +1820,20 @@ export default {
       })
     },
     // 表单清空
-    resetForm () {
+    resetForm() {
       this.isSubmit = false
       this.$refs['addEntryForm'].resetFields()
     },
     /**
      * 获取新增弹框的表单
      */
-    getAddFormFieldList (ruKu) {
+    getAddFormFieldList(ruKu) {
       return new Promise((resolve, reject) => {
         this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this},
             res => {
               if (res.ok) {
                 // const { data: { STAND: data } } = res
-              const { data = {} } = res
+                const {data = {}} = res
                 this.formFieldListData = data[ruKu] || []
                 // this.resolveFormFieldList()
                 resolve()
@@ -1817,7 +1843,7 @@ export default {
             })
       })
     },
-    resolveFormFieldList (isEdit) {
+    resolveFormFieldList(isEdit) {
       const data = this.formFieldListData
       this.formFieldList = data.map((item) => {
         // FO 法规
@@ -1844,7 +1870,7 @@ export default {
     /**
      * 展示位置
      */
-    queryDisplayLocation (accessType) {
+    queryDisplayLocation(accessType) {
       return new Promise((resolve, reject) => {
         let sarType = accessType === 'INLAND_STAND' ? 'STAND' : accessType === 'FOREIGN_STAND' ? 'INLAND_STAND' : 'FOREIGN_LAWS'
         this.$http.get('lawssBase/utArea/getAreaList', {
@@ -1860,7 +1886,7 @@ export default {
       })
     },
     // 点击查看
-    handlePreview (data) {
+    handlePreview(data) {
       let routerName = data.standType === 'FOREIGN_LAWS' ? 'OtherLawsDetails' : 'OtherStandardDetails'
       let routeUrl = this.$router.resolve({
         name: routerName,
@@ -1872,7 +1898,7 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     // 请求上传的文件信息
-    getFileInfo () {
+    getFileInfo() {
       this.$http.get('att/attFile/getMultiFileInfos', {
         fileIds: this.$route.query.fileIds
       }, {
@@ -1893,7 +1919,7 @@ export default {
       })
     },
     // 获取工作组信息下拉框信息
-    getGzzOption () {
+    getGzzOption() {
       this.$http.get('lawss/sarGroupMenu/queryGroup', '', {
         _this: this
       }, res => {
@@ -1910,7 +1936,7 @@ export default {
       })
     },
     // 新增、编辑标准时验证标准编号是否重复
-    validCode (rule, value, callback) {
+    validCode(rule, value, callback) {
       let find = 0
       this.sarAccessInfoList.map(item => {
         if (item.code === value) {
@@ -1925,7 +1951,7 @@ export default {
       callback()
     },
     // 新增、编辑项目评估角色change事件
-    roleListChange (val) {
+    roleListChange(val) {
       this.ROLELIST.map(item => {
         if (item.value === val) {
           this.addEntryForm.proEssessUser = item.label
@@ -1933,7 +1959,7 @@ export default {
       })
     },
     // 表格回显要求类型
-    getAskType (val) {
+    getAskType(val) {
       let askTypeName = ''
       this.accessSarTypeOptions.map(item => {
         if (item.value === val) {
@@ -1943,7 +1969,7 @@ export default {
       return askTypeName
     },
     // 表格回显监管类型
-    getAskNature (val) {
+    getAskNature(val) {
       if (!val) {
         val = ''
       }
@@ -1953,7 +1979,7 @@ export default {
 
       return askTypeName.join(',')
     },
-    onChecked () {
+    onChecked() {
       this.sarStandardsInfoEO.FO = ''
       this.sarStandardsInfoEO.XMPGJS = ''
     },
@@ -1984,7 +2010,7 @@ export default {
       })
     },
     // 将文本状态的id与name对应
-    setMap(data){
+    setMap(data) {
       data.forEach(item => {
         this.$set(this.textStatusMap, item.value, item.label)
       })
@@ -1999,7 +2025,7 @@ export default {
   },
   watch: {
     // 监听 清单类型
-    isListType (newVal, oldVal) {
+    isListType(newVal, oldVal) {
       this.sarAccessInfoSearchList = []
       this.sarAccessInfoSearch.page = 1
       this.drawerTotal = 0
@@ -2010,8 +2036,8 @@ export default {
   computed: {
     ...mapGetters(['getAccessStandardRegRow']),
   },
-  mounted () {
+  mounted() {
-    this.zqaId =this.$route.query.id;
+    this.zqaId = this.$route.query.id;
     this.page = this.$route.query.page
     this.Size = this.$route.query.Size
     //this.getData()
@@ -2051,7 +2077,7 @@ export default {
         //this.sarAccessEO.countryArea = accessRow.countryArea.split(',')
         // this.sarAccessEO.applicationScope = accessRow.applicationScope.split(',')
         this.sarAccessEO.detailedListName = accessRow.detailedListName
-        this.sarAccessEO.projectName = accessRow.projectName
+        this.sarAccessEO.carType = accessRow.carType
         this.sarAccessEO.id = accessRow.id
         this.sarAccessEO.remark = accessRow.remark || ''
         this.sarAccessEO.relateFile = accessRow.relateFile
@@ -2077,40 +2103,46 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-.list-of-standards-and-regulations-details{
+.list-of-standards-and-regulations-details {
   height: calc(~'100% - 50px');
   background: #ffffff;
   overflow-y: auto;
-  .basic-information{
+
-    & > .search-area{
+  .basic-information {
-      & > .left{
+    & > .search-area {
+      & > .left {
         width: 100%;
       }
     }
   }
-  .basic-information, .data-search, .list-entry{
+
+  .basic-information, .data-search, .list-entry {
     padding-top: 0.1px;
     background: #ffffff;
-    .el-divider{
+
-      .el-divider__text{
+    .el-divider {
+      .el-divider__text {
         color: #409EFF;
         font-size: 16px;
       }
     }
   }
-  .data-search{
+
-    .standards-drawer-table-one{
+  .data-search {
+    .standards-drawer-table-one {
       position: relative;
       padding: 0 10px;
       height: 356px;
     }
   }
-  .list-entry{
+
-    .el-tabs{
+  .list-entry {
+    .el-tabs {
       padding: 0 10px;
     }
   }
-  .footer{
+
+  .footer {
     position: absolute;
     bottom: 0;
     padding: 0 10px;
@@ -2121,32 +2153,39 @@ export default {
     text-align: right;
   }
 }
+
 .labelBox {
   /deep/ .el-form-item__label {
     padding-right: 5px;
     padding-left: 23px;
   }
 }
+
 .labelBox1 {
   /deep/ .el-form-item__label {
     padding-right: 5px;
   }
 }
+
 .un-select {
   user-select: none;
 }
-::v-deep .el-drawer__header{
+
-  &>span:first-child{
+::v-deep .el-drawer__header {
-    outline: none!important;
+  & > span:first-child {
+    outline: none !important;
   }
 }
-::v-deep .el-drawer{
+
-  outline: none!important;
+::v-deep .el-drawer {
+  outline: none !important;
 }
-/deep/.wx-resolve {
+
+/deep/ .wx-resolve {
   .el-select__tags {
     padding: 4px;
   }
+
   .el-tag {
     margin: 2px;
   }

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3126,6 +3126,7 @@ export default {
                           // 处理动态表单的时间和下拉框格式
                           const formFieldList = this.formFieldList
                           const sarStandAttrObj = {}
+
                           formFieldList.forEach((item) => {
                               const value = nowstandinfo[item.attrField]
                               // 时间格式处理
@@ -3140,6 +3141,8 @@ export default {
                               }
                               sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
                           })
+
+
                           nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
                         console.log("nowstandinfo");
                         console.log(nowstandinfo);
@@ -3153,10 +3156,35 @@ export default {
                                   if (this.addOrUPdateFlag === 1) {
                                       sessionStorage.removeItem('STAND_INLAND')
                                   }
+
+                                console.log("hello")
+                                console.log(formFieldList);
+                                let standardToLawsInfo={'countryArea':'','standId':'','ssrq':'','zccssrqgj':'','xcxssrqgj':''}
+                                standardToLawsInfo.countryArea=nowstandinfo.country;
+                                standardToLawsInfo.standId=nowstandinfo.id;
+                                standardToLawsInfo.ssrq=nowstandinfo.SSRQ;
+                                standardToLawsInfo.zccssrqgj=nowstandinfo.ZCCSSRQ;
+                                standardToLawsInfo.xcxssrqgj=nowstandinfo.XCXSSRQ;
+
+                                console.log("country")
+                                console.log(standardToLawsInfo);
+                                this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/standardToLaws',
+                                    standardToLawsInfo,
+                                    {_this:this}
+                                )
+
+
+
                               }
                           }, e => {
                               this.isSubmit = false
                           })
+
+
+
+
+
+
                       } else {
                           this.isSubmit = false
                       }

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -699,68 +699,52 @@ export default {
     cancelStand() {
       this.standModel = false;
     },
-    //添加标准确定事件
+
-    okStand(){
+    okStand() {
-     if(this.standList.length > 0){
+      let _this = this;
-       this.standList.forEach(item => {
+      if (this.standList.length < 1) {
-         let addIndex
+        _this.$message.warning("请选择标准");
-         addIndex = this.dataList.findIndex(items => {
+      } else {
-           return items.standId === item.id
+        for (let i = 0; i < this.dataList.length; i++) {
-         })
+          let newStand = false;
-         if(addIndex > -1){
+          for (let j = 0; j < this.standList.length; j++) {
-           this.$message.warning('请勿重复添加数据')
+            if (this.standList[j].id == this.dataList[i].standId) {
-         }else{
+              newStand = true;
-           this.dataList.push(item)
+              this.standList.splice(j, 1)
+              j--
             }
+          }
+          if (newStand) {
+            _this.$message.warning("请勿重复添加数据");
+          } else {
+            // _this.dataList.push(item);
+          }
+        }
+        this.standardData = []
+        _this.standModel = false;
+        for (var i = 0; i < this.standList.length; i++) {
+          this.standList1.push({
+            standId: this.standList[i].id,
+            projectId: this.localProEO.id
           })
-     }else{
+        }
-       this.$message.warning('请至少选择一条数据进行添加')
+        if (this.standList1 != '') {
+          this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              // this.$message.success(res.message)
+              this.getDataList()
+            }
+          }, e => {
+          });
+        }
+        this.standList = []
+        this.standList1 = []
+        _this.detailedListModel = false;
+        _this.standModel = false;
       }
     },
-    // okStand() {
-    //   let _this = this;
-    //   if (this.standList.length < 1) {
-    //     _this.$message.warning("请选择标准");
-    //   } else {
-    //     for (let i = 0; i < this.dataList.length; i++) {
-    //       let newStand = false;
-    //       for (let j = 0; j < this.standList.length; j++) {
-    //         if (this.standList[j].id == this.dataList[i].standId) {
-    //           newStand = true;
-    //           this.standList.splice(j, 1)
-    //           j--
-    //         }
-    //       }
-    //       if (newStand) {
-    //         _this.$message.warning("请勿重复添加数据");
-    //       } else {
-    //         // _this.dataList.push(item);
-    //       }
-    //     }
-    //     this.standardData = []
-    //     _this.standModel = false;
-    //     for (var i = 0; i < this.standList.length; i++) {
-    //       this.standList1.push({
-    //         standId: this.standList[i].id,
-    //         projectId: this.localProEO.id
-    //       })
-    //     }
-    //     if (this.standList1 != '') {
-    //       this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
-    //         _this: this
-    //       }, res => {
-    //         if (res.ok) {
-    //           // this.$message.success(res.message)
-    //           this.getDataList()
-    //         }
-    //       }, e => {
-    //       });
-    //     }
-    //     this.standList = []
-    //     this.standList1 = []
-    //     _this.standModel = false;
-    //   }
-    // },
     //获取标准
     getStandrd(data){
       this.detailedId = data.id

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -109,6 +109,13 @@
           <div class="search-area">
             <div class="left">
               <el-form :inline="true" :model="sarProStateEO" class="label-input-form">
+                <el-form-item label="项目编号" class="search-item search-item-last">
+                  <el-input
+                      v-model="sarProStateEO.productId"
+                      placeholder="根据项目编号查找"
+                      :maxlength="100"
+                      clearable></el-input>
+                </el-form-item>
                 <el-form-item label="项目名称" class="search-item search-item-last">
                   <el-input
                     v-model="sarProStateEO.productName"
@@ -116,13 +123,6 @@
                     :maxlength="100"
                     clearable></el-input>
                 </el-form-item>
-                <el-form-item label="项目编号" class="search-item search-item-last">
-                  <el-input
-                    v-model="sarProStateEO.standId"
-                    placeholder="根据项目编号查找"
-                    :maxlength="100"
-                    clearable></el-input>
-                </el-form-item>
                 <el-form-item class="search-item btn-box">
                   <el-button
                     type="primary"
@@ -327,7 +327,7 @@ export default {
       pageSize: this.$store.getters.userInfo.configContent,
       sarProStateEO: {
         productName: "",
-        standId: "",
+        productId: "",
         type: ""
       },
       sarProStateTotal: 0,
@@ -335,7 +335,7 @@ export default {
       sarProStatePageSize: this.$store.getters.userInfo.configContent,
       sarProStateListDatas: [], // 符合性项目列表数据
       sarProStateTableHeight: null, // 符合性项目列表高度
-      standId: "" // 符合性项目Id
+      productId: "" // 符合性项目Id
     };
   },
   methods: {
@@ -384,16 +384,18 @@ export default {
     }, // 外层清空条件查询
     handleProjectCompliance(row) {
       this.sarProStateEO.type = row.type
-      this.standId = row.standId;
+      this.productId = row.productId;
       this.querySarProStateZero();
     }, // 查看项目符合性
     querySarProStateZero(page) {
+      console.log(page)
       if (page) {
         this.sarProStateTotalPage = page
       } else {
         this.sarProStateTotalPage = 1;
       }
       var form = this.sarProStateEO;
+      console.log('395',form)
       // form.standId = this.standId
       form.current = this.sarProStateTotalPage;
       form.size = this.sarProStatePageSize;
@@ -416,15 +418,15 @@ export default {
     }, // 查询项目数据
     clearSearchProState() {
       this.sarProStateEO.productName = "";
-      this.sarProStateEO.standId = "";
+      this.sarProStateEO.productId = "";
       this.sarProStateTotalPage = 1;
       this.querySarProStateZero();
     }, // 清空条件查询
     clearSearchPro() {
       this.sarProStateEO.productName = "";
-      this.sarProStateEO.standId = "";
+      this.sarProStateEO.productId = "";
       this.showSarProStateModal = false;
-      this.standId = "";
+      this.productId = "";
     }, // 关闭查看事件
     pageProStateChange(page) {
       this.sarProStateTotalPage = page;

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -183,6 +183,7 @@
                 },
                 standinfoList: [], // 详情列表
                 form: {
+                    ideaId: this.$route.query.item.id,
                     cid: this.$route.query.item.cid,
                     page: 1,
                     size: this.$store.getters.userInfo.configContent,
@@ -309,6 +310,7 @@
                     if (valid) {
                         var url = ''
                         var form = {
+                            ideaId: this.$route.query.item.id,
                             cid: this.$route.query.item.cid,
                             content: this.opinionContent.content,
                             oldText: this.opinionContent.oldText,

src/router/index.js

@@ -1288,7 +1288,7 @@ const routes = [
         meta: {
           requireAuth: true,
           title: '企业标准库',
-          menuId: '3YVZP8R4TC',
+          menuId: '7feeb73929c25a6f1fd67952704ec02b',
           parentPath: '/enterpriseStandardDatabase'
         }
       },

src/sysConfig/index.js

@@ -4,10 +4,10 @@
  * @date: 2018-09-04 17:47:46
  */
 // 服务器地址
-// const devIp = '10.96.10.171'
+const devIp = '10.96.10.171'
-// const devInterfacePORT = '9999'
-const devIp = '10.96.170.156'
 const devInterfacePORT = '9999'
+// const devIp = '10.5.103.101'
+// const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'