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

src/common/preview/index.js

@@ -13,7 +13,7 @@ export default attId => {
             if(editFileInfo.fileSuffix.toLowerCase() === 'pdg'){
                 window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
             }else if(editFileInfo.fileSuffix.toLowerCase() === 'pdf'){
-                window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
+                window.open('./static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
             }else {
                 const nowTime = new Date().getTime()
                 // window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -36,22 +36,22 @@
             <div class="search-area">
                 <div class="left">
                     <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form">
+                      <el-form-item label="国内/海外" class="search-item">
+                        <el-select
+                          v-model="replaceLawsNumForm.standType"
+                          placeholder="请选择"
+                        >
+                          <el-option v-if="enterpriseStandard" value="1" label="企标"></el-option>
+                          <el-option value="INLAND" label="国内"></el-option>
+                          <el-option value="FOREIGN" label="海外"></el-option>
+                        </el-select>
+                      </el-form-item>
                         <el-form-item label="标准编号" class="search-item">
                             <el-input v-model="replaceLawsNumForm.standNumber" placeholder="根据标准编号查找" clearable :maxlength="100"></el-input>
                         </el-form-item>
                         <el-form-item label="标准名称" class="search-item">
                             <el-input v-model="replaceLawsNumForm.standName" placeholder="根据标准名称查找" clearable :maxlength="100"></el-input>
                         </el-form-item>
-                        <el-form-item label="国内/海外" class="search-item">
-                            <el-select
-                                    v-model="replaceLawsNumForm.standType"
-                                    placeholder="请选择"
-                            >
-                                <el-option v-if="enterpriseStandard" value="1" label="企标"></el-option>
-                                <el-option value="INLAND" label="国内"></el-option>
-                                <el-option value="FOREIGN" label="海外"></el-option>
-                            </el-select>
-                        </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
                                     type="primary"

src/components/CustomFormComponents/InputForStandardsForEnterprise.vue

@@ -314,7 +314,6 @@ export default {
     // 代替政策编号确定
     replaceLawsNumModelBt() {
       let textArr = []
-
       if (typeof this.value === 'string') {
         if (this.value) {
           textArr = this.value.split(',')
@@ -337,7 +336,8 @@ export default {
         // 判断数据是国内外法规标准还是企业标准
         if (this.dataSource === 'BUSINESS') {
           if (item.standYear != null && item.standYear !== '') {
-            texts = item.standCode + '-' + item.standYear
+            // texts = item.standCode + '-' + item.standYear
+            texts = item.standCode
           } else {
             texts = item.standCode
           }

src/pages/details/complianceDetails/index.vue

@@ -43,7 +43,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="evaluationPeople"
+          prop="evaluationPeopleName"
           label="评估人"
           width="160"
           align="center"
@@ -88,7 +88,7 @@
          >
          </el-table-column>
          <el-table-column
-           prop="evaluationPeople"
+           prop="evaluationPeopleName"
            label="评估人"
            width="160"
            align="center"
@@ -126,13 +126,13 @@
       >
       </el-table-column>
       <el-table-column
-        prop="researchNonCompliance"
+        prop="noInvolve"
         label="不涉及"
         align="center"
       >
       </el-table-column>
       <el-table-column
-        prop="evaluationPeople"
+        prop="evaluationPeopleName"
         label="评估人"
         width="160"
         align="center"

src/pages/details/otherBussStandardDetails/index.vue

@@ -502,6 +502,15 @@
                       :title="child.tips || '-'"
                   >
                 {{ !child.value || child.value === 'null' ? '-' : child.value }}
+              </span>
+                  <span
+                          v-else-if="child.attrField === 'DTQBBHBUSS'"
+                          class="modular-content-p-val"
+                          :title="child.value || '-'"
+                  >
+                    <span v-if="child.value" @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                          class="span-line">{{ child.value }}</span>
+                    <span v-else>-</span>
               </span>
                   <span
                       v-else-if="child.attrType !== 'FILE'"
@@ -3191,7 +3200,7 @@ export default {
         })
         location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile].sort(this.compare('orderNum'))
       })
-
+      console.log(displayLocation);
       this.dynamicFormField = displayLocation
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false

src/pages/details/otherStandardDetails/index.vue

@@ -457,7 +457,7 @@
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                   <a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
                      class="span-line">{{ item }}</a>
-                </span>
+                  </span>
                     </p>
                   </template>
                   <template
@@ -477,13 +477,14 @@
                     :title="child.tips || '-'"
                   >
                 {{ !child.value || child.value === 'null' ? '-' : child.value }}
-              </span>
+                  </span>
                   <span
                     v-else-if="child.attrType !== 'FILE'"
                     class="modular-content-p-val"
                     :title="child.value || '-'"
                   >
                 {{ child.value || '-' }}
+<!--                    被代替标准号-->
               </span>
                   <div v-else class="modular-content-p-flies">
                     <p
@@ -542,7 +543,6 @@
                     <!--                                >标准分解单</el-button>-->
                   </div>
                 </div>
-
               </template>
               <template
                 v-for="(child, childIndex) in item.one"
@@ -2122,7 +2122,6 @@ export default {
   watch: {},
   methods: {
     child1Func(child1) {
-      console.log('1943', child1)
       const list = []
       if (child1 && child1.length > 1) {
         for (let i = 0; i < child1.length; i++) {
@@ -2133,7 +2132,6 @@ export default {
       return child1
     },
     child3Func(child3) {
-      console.log('1943', child3)
       const list = []
       if (child3 && child3.length > 1) {
         list.push(child3[0])
@@ -2142,7 +2140,6 @@ export default {
       return child3
     },
     child4Func(child4) {
-      console.log('1943', child4)
       const list = []
       if (child4 && child4.length > 1) {
         list.push(child4[0])
@@ -2151,7 +2148,6 @@ export default {
       return child4
     },
     child5Func(child5) {
-      console.log('1943', child5)
       const list = []
       if (child5 && child5.length > 1) {
         list.push(child5[0])
@@ -2160,7 +2156,6 @@ export default {
       return child5
     },
     handleChange(val) {
-      console.log('1724', val)
     },
     handleChange1(val) {
       if (val && val === '基础信息') {
@@ -2764,7 +2759,6 @@ export default {
       }
     },
     choiceZRRS(type, title, id) {
-      console.log('2077', type, title, id)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -2772,7 +2766,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2(data) {
-      console.log('1712', this.drawerTitle)
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -2799,14 +2792,11 @@ export default {
     selectAllStand(alldata) {
       this.selectedItemList = []
       this.selectedItemList.push(alldata[alldata.length - 1])
-      console.log('2333', this.selectedItemList)
     },
     editResolveList() {
-      console.log('2337', this.selectedItemList)
       if (this.selectedItemList.length > 0) {
         this.editResolveListShowflag = true
         let editItem = JSON.parse(JSON.stringify(this.selectedItemList[0]))
-        console.log('2518', editItem)
         this.resolveListForm = editItem
         this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : ''
         // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
@@ -2817,7 +2807,6 @@ export default {
       }
     },
     saveEditInfo() {
-      console.log('2530', typeof this.resolveListForm.xccssrq)
       if (typeof this.resolveListForm.xccssrq !== 'string') {
         this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
       }
@@ -2834,7 +2823,6 @@ export default {
           _this: this,
         },
         (res) => {
-          console.log(res)
           if (res.ok) {
             this.$message.success('修改成功')
             this.resetEditResolveListForm()
@@ -2863,10 +2851,9 @@ export default {
         this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
           _this: this
         }, res => {
+          console.log(res.data);
           this.sarStandardsInfoEO = res.data || {}
           this.itemExistList = this.sarStandardsInfoEO.attrInfoMap.itemExistList;
-          console.log(this.itemExistList)
-          console.log("hllo", this.sarStandardsInfoEO);
           if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
             this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
           }
@@ -3005,7 +2992,6 @@ export default {
               .then(res => {
                 if (res) {
                   const editFileInfo = res
-                  console.log(editFileInfo)
                   if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
                     window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
                   } else {
@@ -3023,8 +3009,6 @@ export default {
             }, {
               _this: this
             }, res => {
-
-              console.log("res.data", res.data);
               if (res.data) {
                 let fileObj = {}
                 fileObj.fileId = res.data.attId
@@ -3117,7 +3101,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res);
         })
       }else{
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
@@ -3127,7 +3110,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res);
         })
       }
     },
@@ -3159,7 +3141,6 @@ export default {
       }, {}, res => {
         this.selectedItemList = []
         if (res.ok) {
-          console.log('3092', res.data.list)
           res.data.list.forEach(item => {
             let k = (item.applyArctic || "").split(',')
             for (let i in this.applyArcticOptions.options) {
@@ -3177,7 +3158,6 @@ export default {
         }
       }, e => {
       })
-      console.log(this.standItemSearch);
     },
     downloadFile(attId) {
       if (attId != null && attId !== '') {
@@ -3193,7 +3173,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res);
         })
       }else{
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
@@ -3203,7 +3182,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res);
         })
       }
 
@@ -3226,7 +3204,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res);
         })
       }else{
         let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
@@ -3236,7 +3213,6 @@ export default {
         }, {
           _this: this
         }, res => {
-          console.log(res);
         })
       }
     },
@@ -3744,9 +3720,7 @@ export default {
         // if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
         //   return
         // }
-        console.log(displayLocation)
         displayLocation.forEach((location) => {
-          console.log(location.child)
           location.isShowImp = '0'
           if (dynamicFormField) {
             let value = dynamicFormField[field.attrField]
@@ -3773,7 +3747,6 @@ export default {
           }
         })
       })
-      console.log(displayLocation)
       displayLocation.forEach(location => {
         // 动态属性字段-FBGBJBD 单独添加至基础信息
         const list = displayLocation.filter(item => item.label === '过程稿件');
@@ -3843,7 +3816,6 @@ export default {
             }
           }
         })
-        console.log(child)
         const fieldsIsTextAreaOrFile = child.filter(field => {
           return field.attrType === 'TEXTAREA' || field.attrType === 'FILE'
         })
@@ -3873,6 +3845,7 @@ export default {
           }
         })
         this.dynamicFormField = displayLocation
+        console.log(displayLocation);
       })
       sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
       this.loading = false

src/pages/home2/components/todoList/index.vue

@@ -14,7 +14,7 @@
                 style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item) }}</span>
           <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>
             <span @click="dealWith(item)"
-                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 24) + '...' }}</span>
+                  style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>
           </el-tooltip>
         </div>
       </li>

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

@@ -1031,6 +1031,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.dataList = this.dataList
       this.listForm.fileName = this.fileInfoList
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");

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

@@ -368,6 +368,7 @@ export default {
       }, e => {
       });
     },
+    //预览
     clickButtonToUpload2(file) {
       const attId = file
       this.$preview(attId)

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

@@ -3145,7 +3145,6 @@ export default {
 
     },
     handleSubmit() {
-
       // this.form.country=this.countryArr;
       this.$refs['form'].validate((valid) => {
         if (valid) {

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

@@ -121,7 +121,6 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
-                            sortable
                             label="章条编号"
                             width="101px">
 <!--                        <template slot-scope="scope">-->

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue

@@ -110,7 +110,6 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
-                            sortable
                             label="章条编号"
                             width="101px">
                     </el-table-column>

src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue

@@ -102,7 +102,6 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
-                            sortable
                             label="章条编号"
                             width="101px">
                     </el-table-column>

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

@@ -130,7 +130,6 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
-            sortable
             label="章条编号"
             width="101px">
           </el-table-column>

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

@@ -102,7 +102,6 @@
           <el-table-column
                   prop="chapterNumber"
                   align="center"
-                  sortable
                   label="章条编号"
                   width="101px">
           </el-table-column>

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

@@ -122,7 +122,6 @@
           <el-table-column
                   prop="chapterNumber"
                   align="center"
-                  sortable
                   label="章条编号"
                   width="101px">
           </el-table-column>

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

@@ -115,7 +115,6 @@
             prop="chapterNumber"
             align="center"
             label="章条编号"
-            sortable
             width="101px">
           </el-table-column>
           <el-table-column

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

@@ -113,7 +113,6 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
-            sortable
             align="center"
             label="章条编号"
             width="101px">

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

@@ -114,7 +114,6 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
-            sortable
             label="章条编号"
             width="101px">
           </el-table-column>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -559,9 +559,14 @@ export default {
      }, res => {
        this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
        this.BZList = res.data.ENERGYTYPES //适用车型
-       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+       // this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
        this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
+       res.data.BUSSSTANDCLASS.forEach(item => {
+         if(item.label){
+           this.standSortOptions.push(item)   //企标类别
+         }
+       })
      })
     if(this.$route.query.bpnId === undefined && this.$route.query.taskIds === undefined){
       this.$http.get('/lawss/activiti/saveEditFile', {

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

@@ -404,12 +404,6 @@ export default {
     addList() {
       this.loading = true
       dicTypeData().then(res => {
-        if (this.pageNo !== undefined) {
-          this.queryUnqualidiedData.current = this.pageNo
-        }
-        if (this.size !== undefined) {
-          this.queryUnqualidiedData.size = this.size
-        }
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         standUnqualified(this.queryUnqualidiedData).then(res => {
           this.unqualidiedData = res.data.records
@@ -631,6 +625,7 @@ export default {
     },
     //未整改项抽屉中的查询按钮
     getTableByPage() {
+      this.queryUnqualidiedData.current = 1
       this.addList()
     },
     // 清空 查询条件
@@ -642,12 +637,12 @@ export default {
     },
     // 分页事件
     pageChange(page) {
-      this.pageNo = page
-      this.getTableByPage()
+      this.queryUnqualidiedData.current = page
+      this.addList()
     },
     pageSizeChange(pageSize) {
-      this.size = pageSize
-      this.getTableByPage(pageSize)
+      this.queryUnqualidiedData.size = pageSize
+      this.addList()
     },
   }
 }

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

@@ -740,7 +740,7 @@ export default {
       this.standInfoTableLoading = true
       if(this.sarAccessEO.sortKey === '1'){
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-          ...this.standardFormList,
+          ...this.sarAccessInfo,
           ...this.standardForm,
           id: this.pageId,
           types: '1',
@@ -762,13 +762,13 @@ export default {
                 item.zrbm = null
               }
               if (item.zccssrqgj === "undefined") {
-                item.zccssrqgj = '-'
+                item.zccssrqgj = ''
               }
               if (item.xcxssrqgj === "undefined") {
-                item.xcxssrqgj = '-'
+                item.xcxssrqgj = ''
               }
-              if (item.ssrq === "undefined") {
-                item.ssrq = '-'
+              if (item.ssrq === "undefined" || item.ssrq === 'null' || item.ssrq) {
+                item.ssrq = ''
               }
             });
             this.standinfoList = res.data.records;
@@ -791,7 +791,7 @@ export default {
         });
       }else{
         this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-          ...this.standardFormList,
+          ...this.sarAccessInfo,
           ...this.standardForm,
           id: this.pageId
         }, {
@@ -833,7 +833,7 @@ export default {
     },
     selectInfoMore() {
       this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
-        ...this.standardFormList,
+        ...this.sarAccessInfo,
         id: this.pageId
       }, {
         _this: this
@@ -1077,7 +1077,7 @@ export default {
       this.showQueryMore = true;
       this.page = 1;
       this.standardForm.page = 1;
-      this.selectInfoMore();
+      // this.selectInfoMore();
     },
     queryInfo() {
       this.page = 1;
@@ -1086,11 +1086,11 @@ export default {
       this.isAdvancedSearch = false;
     },
     backInfo() {
-      this.standardFormList.standName = "";
-      this.standardFormList.typeApplicable = "";
-      this.standardFormList.nylx = "";
-      this.standardFormList.zrbm = "";
-      this.standardFormList.sycpx = "";
+      this.sarAccessInfo.standName = "";
+      this.sarAccessInfo.typeApplicable = "";
+      this.sarAccessInfo.nylx = "";
+      this.sarAccessInfo.zrbm = "";
+      this.sarAccessInfo.sycpx = "";
       this.isAdvancedSearch = false;
     },
     // 获取工作组信息下拉框信息

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -709,6 +709,7 @@
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DTQBBHBUSS' || field.attrField === 'CYBZ' || field.attrField === 'YYBZ'">
+                    123
                     <custom-input-for-standards
                       :config="field"
                       :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"