From 82d7a3aaefe37e4226a2ffa15621c427e9a9191c Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 22 Feb 2022 15:48:52 +0800
Subject: [PATCH] commit

---
 .../InputForStandardsForEnterprise.vue        |  4 +-
 .../otherBussStandardDetails/index.vue        | 11 +++++-
 .../details/otherStandardDetails/index.vue    | 37 +++----------------
 .../pages/creatProcess/bzrk/step1.vue         |  1 -
 .../pages/creatProcess/bzzqyj/step3.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step4-1.vue     |  1 -
 .../pages/creatProcess/bzzqyj/step4-2.vue     |  1 -
 .../pages/creatProcess/bzzqyj/step4.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step5.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step6.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step7.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step8.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step9.vue       |  1 -
 .../components/EnterpriseStandardDatabase.vue |  1 +
 14 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue b/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
index 35f498e6d..ef68b3685 100644
--- a/src/components/CustomFormComponents/InputForStandardsForEnterprise.vue
+++ b/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
           }
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 3216c77e1..86cfcdc9d 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/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
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 5516dea4c..a1849a6c3 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b13b07f8b..d9b74b335 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/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) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index f8c70ada3..56fc1e45c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/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">-->
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index fb5cba415..0fa536160 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index 0efeaeadd..6c911e5b3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 7bb1073ba..1b42f72b8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 901197fa7..8053a57c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 7507556a4..35128dd28 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/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>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 2ffc5c284..cb2a2541e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/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
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index e2e5d7b22..7aa4d7b7f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/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">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 18de82b77..7ade43e12 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/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>
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index 8c8c338e8..7518cb8cb 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/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' : ''"