From 9438f0cf7407a50ff7b92f814587563d2777cb30 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 23 Dec 2021 21:54:52 +0800
Subject: [PATCH 01/51] feat:new

---
 src/sysConfig/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index da842af88..43472f822 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -22,7 +22,7 @@ const webLoginType = 'idm'
 const onlyOfficeUrl = 'http://10.100.5.116:8088'
 
 // 配置 kkFileView 前端服务
-const kkFileViewUrl = 'https://srms.foton.com.cn/preview/'
+const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'

From bb1ff5bb683a7396309851630b8209017845df08 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 12 Jan 2022 12:20:32 +0800
Subject: [PATCH 02/51] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 4ef277c07..b8302a8f7 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -2148,6 +2148,22 @@ export default {
       this.selectSarStandItems()
       // 此处需要调用接口，修改个人配置
     },
+
+    getdicTypeListCode(){
+      // 从数据库中查询各下拉框数据
+      this.$http.get('sys/dictype/getDicTypeListCode', '', {
+        _this: this
+      }, res => {
+        this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
+        this.emergyKindOptions = res.data.ENERGYTYPES
+        this.requestOptions = res.data.REQUESTTYPE
+        this.textOptions = res.data.TEXTSTATUSBUSS //企标文本状态
+        this.mjOptions = res.data.MJ
+        this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
+      }, e => {
+      })
+
+    },
     selectStandMessage () {
       let url = this.$route.params.pageType === 'SUB' ? 'lawss/sarSubsionessStand/getStandInfoById' : 'lawss/sarBussionessStand/getStandInfoById'
 
@@ -2876,18 +2892,7 @@ export default {
   async mounted () {
     //查询动态评价总平均分和质量评价总平均分
     let standId = this.$route.params.id
-    // 从数据库中查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
-      this.emergyKindOptions = res.data.ENERGYTYPES
-      this.requestOptions = res.data.REQUESTTYPE
-      this.textOptions = res.data.TEXTSTATUSBUSS //企标文本状态
-      this.mjOptions = res.data.MJ
-      this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
-    }, e => {
-    })
+
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
       _this: this
     }, res => {
@@ -2930,7 +2935,7 @@ export default {
     this.sarStandardsInfoEO.id = this.$route.params.id
     this.getOrgTreeSource()
     this.standItemEO.standId = this.$route.params.id
-    Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
+    Promise.all([this.getdicTypeListCode(),this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
       // const relatedPlansRes = await this.queryRelatedPlans()
       // const relatedPlans = relatedPlansRes.list

From 94aaaa686a6aebe5e8ae6a45723a4523c0433d33 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 13 Jan 2022 10:49:25 +0800
Subject: [PATCH 03/51] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../otherBussStandardDetails/index.vue        | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index b8302a8f7..4ef277c07 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -2148,22 +2148,6 @@ export default {
       this.selectSarStandItems()
       // 此处需要调用接口，修改个人配置
     },
-
-    getdicTypeListCode(){
-      // 从数据库中查询各下拉框数据
-      this.$http.get('sys/dictype/getDicTypeListCode', '', {
-        _this: this
-      }, res => {
-        this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
-        this.emergyKindOptions = res.data.ENERGYTYPES
-        this.requestOptions = res.data.REQUESTTYPE
-        this.textOptions = res.data.TEXTSTATUSBUSS //企标文本状态
-        this.mjOptions = res.data.MJ
-        this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
-      }, e => {
-      })
-
-    },
     selectStandMessage () {
       let url = this.$route.params.pageType === 'SUB' ? 'lawss/sarSubsionessStand/getStandInfoById' : 'lawss/sarBussionessStand/getStandInfoById'
 
@@ -2892,7 +2876,18 @@ export default {
   async mounted () {
     //查询动态评价总平均分和质量评价总平均分
     let standId = this.$route.params.id
-
+    // 从数据库中查询各下拉框数据
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.applyArcticOptions = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车型”
+      this.emergyKindOptions = res.data.ENERGYTYPES
+      this.requestOptions = res.data.REQUESTTYPE
+      this.textOptions = res.data.TEXTSTATUSBUSS //企标文本状态
+      this.mjOptions = res.data.MJ
+      this.STANDSOURCEREVISION = res.data.STANDSOURCEREVISION
+    }, e => {
+    })
     this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
       _this: this
     }, res => {
@@ -2935,7 +2930,7 @@ export default {
     this.sarStandardsInfoEO.id = this.$route.params.id
     this.getOrgTreeSource()
     this.standItemEO.standId = this.$route.params.id
-    Promise.all([this.getdicTypeListCode(),this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
+    Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then(async(values) => {
       const [displayLocation, {attrInfoMap: dynamicFormField}, formFieldList] = values
       // const relatedPlansRes = await this.queryRelatedPlans()
       // const relatedPlans = relatedPlansRes.list

From 9d7f80d0f316544e61e102ce66bdd02948bc5b2a Mon Sep 17 00:00:00 2001
From: zyd <zhangyanduan@91isoft.com>
Date: Thu, 27 Jan 2022 22:58:09 +0800
Subject: [PATCH 04/51] =?UTF-8?q?update:=20=E5=9B=BD=E5=86=85=E3=80=81?=
 =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86=E6=96=B0=E5=A2=9E=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=8D=95=E5=85=83=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 104 +++++++++++++++---
 .../foreignStandardsAndRegulations/index.vue  | 100 +++++++++++++++--
 2 files changed, 178 insertions(+), 26 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 15e6262ed..ce7352bb3 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -584,18 +584,7 @@
                                 @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
-                  <template v-else-if="field.attrField === 'DYBXH'">
-                    <el-form-item
-                      prop="DYBXH"
-                      label-width="150px"
-                      class="add-form-item"
-                    >
-                      <template slot="label">模块结构单元变型号</template>
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号"
-                                clearable
-                                @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
-                    </el-form-item>
-                  </template>
+
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
                                   prop="cycvppscn" class="add-form-item">
@@ -630,8 +619,20 @@
                       ></el-input>
                     </el-form-item>
                   </template>
+                  <template v-else-if="field.attrField === 'DYBXH'">
+                    <el-form-item
+                            prop="DYBXH"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(卡车)</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
+                                clearable
+                                @click.native="choiceZRR4('TRUCK', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else-if="field.attrField === 'DYMC'">
-                    <el-form-item label="模块结构单元名称" label-width="150px" prop="dymc" class="add-form-item">
+                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="dymc" class="add-form-item">
                       <el-input
                         v-if="sarStandardsInfoEO.DYBXH === '' || sarStandardsInfoEO.DYBXH === undefined"
                         v-model="sarStandardsInfoEO.DYMC = ''"
@@ -646,6 +647,34 @@
                       ></el-input>
                     </el-form-item>
                   </template>
+                  <template v-else-if="field.attrField === 'DYBXHCAR'">
+                    <el-form-item
+                            prop="DYBXHCAR"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(乘用车)</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
+                                clearable
+                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYMCCAR'">
+                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="dymccar" class="add-form-item">
+                      <el-input
+                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+                              disabled
+                              clearable
+                      ></el-input>
+                      <el-input
+                              v-else
+                              v-model="sarStandardsInfoEO.DYMCCAR"
+                              disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
                     <custom-input
                       :config="field"
@@ -1287,10 +1316,24 @@
         :modalShowFlag="modalShowFlag4"
         :drawerTitle="drawerTitle"
         :url="url"
+        :type="modelType"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
         :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
         @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+      <tree-select-module
+              width="500"
+              :lazy=true
+              :multiple=true
+              :check-strictly=true
+              :modalShowFlag="modalShowFlag5"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :type="modelType"
+              :urlChild="urlChild"
+              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+              :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+              @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
       <!--      导入失败-->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -2148,8 +2191,10 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false,
       url: '',
       urlChild: '',
+      modelType: 'TRUCK',
       drawerTitle: '', //drawer标题
       nodeKey: 'id',
       nodeKeyCode: 'code',
@@ -2252,6 +2297,7 @@ export default {
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      defaultCheckedKeys4: [],
       defaultCodeProps: {
         children: 'children',
         label: 'code'
@@ -2438,6 +2484,8 @@ export default {
         KCCVPPSCN: '',
         DYBXH: '',
         DYMC: '',
+        DYBXHCAR: '',
+        DYMCCAR: '',
         CYSD: '',
         CLLX: '',
         NYLX: '',
@@ -2577,6 +2625,8 @@ export default {
         KCCVPPSCN: '',
         DYBXH: '',
         DYMC: '',
+        DYBXHCAR: '',
+        DYMCCAR: '',
         CYSD: '',
         CLLX: '',
         NYLX: '',
@@ -3053,7 +3103,17 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
-      this.url = "sarModelTree/list"
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+    },
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideQuery(ids, attrField) {
@@ -3122,6 +3182,22 @@ export default {
     popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",")
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.model
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverCarHideModelCancel() {
+      this.modalShowFlag5 = false
+    },
     busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
         _this: this
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 93b18b308..c655a3f20 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -1083,16 +1083,6 @@
                       <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" clearable @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
-                  <template v-else-if="field.attrField === 'DYBXH'">
-                    <el-form-item
-                      prop="DYBXH"
-                      label-width="150px"
-                      class="add-form-item"
-                    >
-                      <template slot="label">模块结构单元变型号</template>
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号" clearable @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
-                    </el-form-item>
-                  </template>
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item label="关联模块--乘用车vpps中文名称" label-width="150px" prop="CYCVPPSCN" class="add-form-item">
                       <el-input
@@ -1111,8 +1101,20 @@
                       ></el-input>
                     </el-form-item>
                   </template>
+                  <template v-else-if="field.attrField === 'DYBXH'">
+                    <el-form-item
+                            prop="DYBXH"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(卡车)</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号(卡车)"
+                                clearable
+                                @click.native="choiceZRR4('TRUCK', '模块结构单元(卡车)', sarStandardsInfoEO.dybxh)"></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else-if="field.attrField === 'DYMC'">
-                    <el-form-item label="模块结构单元名称" label-width="150px" prop="DYMC" class="add-form-item">
+                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMC" class="add-form-item">
                       <el-input
                         v-model="sarStandardsInfoEO.DYMC"
                         disabled
@@ -1120,6 +1122,34 @@
                       ></el-input>
                     </el-form-item>
                   </template>
+                  <template v-else-if="field.attrField === 'DYBXHCAR'">
+                    <el-form-item
+                            prop="DYBXHCAR"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(乘用车)</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXHCAR" placeholder="选择模块结构单元变型号(乘用车)"
+                                clearable
+                                @click.native="choiceZRR5('CAR', '模块结构单元(乘用车)', sarStandardsInfoEO.dybxhcar)"></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'DYMCCAR'">
+                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="DYMCCAR" class="add-form-item">
+                      <el-input
+                              v-if="sarStandardsInfoEO.DYBXHCAR === '' || sarStandardsInfoEO.DYBXHCAR === undefined"
+                              v-model="sarStandardsInfoEO.DYMCCAR = ''"
+                              disabled
+                              clearable
+                      ></el-input>
+                      <el-input
+                              v-else
+                              v-model="sarStandardsInfoEO.DYMCCAR"
+                              disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else>
                     <custom-input
                       :config="field"
@@ -1676,11 +1706,26 @@
         :modalShowFlag="modalShowFlag4"
         :drawerTitle="drawerTitle"
         :url="url"
+        :type="modelType"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
         :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
         @popoverHideCancel="popoverHideModelCancel()">
       </tree-select-module>
+      <tree-select-module
+              width="500"
+              :lazy=true
+              :multiple=true
+              :check-strictly=true
+              :modalShowFlag="modalShowFlag5"
+              :drawerTitle="drawerTitle"
+              :url="url"
+              :type="modelType"
+              :urlChild="urlChild"
+              :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+              :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+              @popoverHideCancel="popoverCarHideModelCancel()">
+      </tree-select-module>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -1816,14 +1861,17 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false,
       url: '',
       urlChild: '',
+      modelType: 'TRUCK',
       drawerTitle: '', //drawer标题
       nodeKey: 'id',
       defaultCheckedKeys: [],
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      defaultCheckedKeys4: [],
       defaultCodeProps: {
         children: 'children',
         label: 'code'
@@ -2168,6 +2216,8 @@ export default {
         KCCVPPSCN: '',
         DYBXH: '',
         DYMC: '',
+        DYBXHCAR: '',
+        DYMCCAR: '',
         CYSD: '',
         CLLX: '',
         NYLX: '',
@@ -2593,7 +2643,17 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
-      this.url = "sarModelTree/list"
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+    },
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
@@ -2642,6 +2702,22 @@ export default {
     }, popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.map(item => item.model).join(",")
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarStandardsInfoEO.DYBXHCAR = checkedData.model
+          this.sarStandardsInfoEO.DYMCCAR = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverCarHideModelCancel() {
+      this.modalShowFlag5 = false
+    },
     // 将文本状态的id与name对应
     setMap(data) {
       data.forEach(item => {

From 093a5c37ba441eb6077baa2968e51ac4f42e6d4d Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 18 Feb 2022 02:26:41 +0800
Subject: [PATCH 05/51] feat:new

---
 src/sysConfig/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index e74d49fc1..4b5e53eb3 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,10 +7,10 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.6'
-const devIp = '62.234.136.153'
-const devInterfacePORT = '8033'
-// const devIp = '10.19.11.243'
-// const devInterfacePORT = '4304'
+// const devIp = '62.234.136.153'
+// const devInterfacePORT = '8033'
+const devIp = '10.19.11.243'
+const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 
@@ -18,7 +18,7 @@ const ssoLogout = 'http://sso.foton.com.cn/logout?service='
 // 配置 前端服务
 const devWebUrl = 'https://srms.foton.com.cn/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
-const webLoginType = 'dev'
+const webLoginType = 'idm'
 
 // 配置onlyOffice 前端服务
 const onlyOfficeUrl = 'http://10.100.5.116:8088'

From 8adf8b1767a99570ffd82b15c124dc7b96a40caa Mon Sep 17 00:00:00 2001
From: zhangyanduan <zhangyanduan@91isoft.com>
Date: Mon, 7 Mar 2022 15:36:25 +0800
Subject: [PATCH 06/51] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E5=BA=93=E4=B8=AD=E6=A8=A1=E5=9D=97=E7=BB=93=E6=9E=84=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E5=90=8D=E7=A7=B0=20=20=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 3197d5939..c26795d83 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -616,18 +616,6 @@
                                 @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
-                  <template v-else-if="field.attrField === 'DYBXH'">
-                    <el-form-item
-                      prop="DYBXH"
-                      label-width="150px"
-                      class="add-form-item"
-                    >
-                      <template slot="label">模块结构单元变型号</template>
-                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号"
-                                clearable
-                                @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
-                    </el-form-item>
-                  </template>
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
                                   prop="cycvppscn" class="add-form-item">

From f182b5a64eceda018bc7aa801f30dbf61b1766f0 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 11:16:24 +0800
Subject: [PATCH 07/51] feat: There is no way the,

---
 .../pages/creatProcess/qbrk-product/step2.vue              | 7 ++++++-
 src/pages/processCenter/pages/creatProcess/qbrk/step2.vue  | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
index 47ed487f8..b88617eef 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
@@ -1908,7 +1908,12 @@
             },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 380715db5..edbbd87e5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -2153,7 +2153,12 @@
             },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId

From 0c659ff2b6674b9ed20bed4cc482aaf1a89a0817 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Wed, 30 Mar 2022 09:43:42 +0800
Subject: [PATCH 08/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052197=20=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=9A=E6=B5=81=E7=A8=8B=E7=9B=91=E6=8E=A7=E8=BF=9B=E5=8E=BB?=
 =?UTF-8?q?=E7=9A=84=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=9B=9E=E6=89=A7=E4=B8=8D=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
index 5c8951a5a..456f2430c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
@@ -126,11 +126,12 @@
           label="在产车实施日期">
         </el-table-column>
       </el-table>
-      <div v-show="!this.$route.query.unShowReceipt">
+      <div>
         <el-collapse accordion>
           <el-collapse-item title="回执说明">
             <div style="margin: 10px 0;">
               <el-input
+                :disabled="this.$route.query.unShowReceipt"
                 type="textarea"
                 :rows="3"
                 resize="none"

From 41aa90ef93ec20d591f3180efad0467855006467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 09:41:16 +0800
Subject: [PATCH 09/51] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzjd/step2.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index 77d27dd58..f96bd01c6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -780,6 +780,7 @@
                         }
                     }
                 }
+                this.$refs.filterTable.clearSelection()
                 this.PLmodalshowflag = false
             },
             cancleUserInfo2 () {
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 6ed7eec7b..e4b81cf05 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -431,7 +431,7 @@
                     }
                 }
                 this.modalshowflag = false
-               this.$refs.selections.clearSelection()
+               this.$refs.filterTable.clearSelection()
             },
             handleTabs(name) {
                 this.active = name

From d18f877baa0b63bbb2d99bc4a85066a6f657fb69 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 15:37:12 +0800
Subject: [PATCH 10/51] Merge branch '' of
 E:\Software\rtpro\Foton\New_Pro\laws-system-front-FOTON with conflicts.

---
 src/api/process.js                            |  2 +-
 src/components/CustomFormComponents/File.vue  |  2 +-
 .../dynamicInfomationDetails/index.vue        |  4 ++--
 .../dynamicInfomationDetails/index2.vue       |  2 +-
 .../pages/dynamicInformations/index.vue       |  2 +-
 .../enterBSysRevPlanManaLibDetail/index.vue   |  2 +-
 .../otherBussStandardDetails/index.vue        |  4 ++--
 .../otherLawsDetails/js/otherLawsDetails.js   |  4 ++--
 .../details/otherLawsStandDetails/index.vue   |  4 ++--
 .../details/otherStandardDetails/index.vue    |  4 ++--
 src/pages/details/process/ruku/index.vue      |  4 ++--
 src/pages/knowledgeGraph/index.vue            |  4 ++--
 .../standAutoSplit/pages/itemSplitInfo.vue    |  4 ++--
 src/pages/localTool/standCalendar/index.vue   |  2 +-
 .../CollectionBussStandardDetail.vue          |  2 +-
 .../CollectionStandardDetail.vue              |  2 +-
 .../collectionDetail/js/lawsDetails.js        |  2 +-
 .../pages/my-enterpriseStandard/index.vue     |  2 +-
 .../components/QuestionItemInfo.vue           |  2 +-
 .../components/CollapseItemInfo.vue           |  2 +-
 .../pages/creatProcess/bzdy/step1-1.vue       |  2 +-
 .../pages/creatProcess/bzdy/step1.vue         |  2 +-
 .../pages/creatProcess/bzhHd-rh/step1.vue     |  2 +-
 .../pages/creatProcess/bzhHd-rh/step2.vue     |  2 +-
 .../pages/creatProcess/bzhHd-rh/step3.vue     |  2 +-
 .../pages/creatProcess/bzhHd-rh/step4.vue     |  2 +-
 .../pages/creatProcess/bzhHd-rh/step5.vue     |  4 ++--
 .../pages/creatProcess/bzhHd-rh/step6-1.vue   |  2 +-
 .../pages/creatProcess/bzhHd-rh/step6.vue     |  2 +-
 .../pages/creatProcess/bzhHh-hh/step2.vue     |  6 +++---
 .../pages/creatProcess/bzhHy-ch/step1.vue     |  2 +-
 .../pages/creatProcess/bzhHy-ch/step2.vue     |  2 +-
 .../pages/creatProcess/bzhHy-ch/step3.vue     |  2 +-
 .../pages/creatProcess/bzhHy-ch/step4.vue     |  2 +-
 .../pages/creatProcess/bzhHy-ch/step5.vue     |  2 +-
 .../pages/creatProcess/bzhHy-ch/step6.vue     |  2 +-
 .../pages/creatProcess/bzqdfb/step1-3.vue     |  6 +++---
 .../pages/creatProcess/bzqdfb/step1-4.vue     |  4 ++--
 .../pages/creatProcess/bzqdfb/step2.vue       |  4 ++--
 .../pages/creatProcess/bzqdfb/step3.vue       |  6 +++---
 .../pages/creatProcess/bzqdfb/step4.vue       |  4 ++--
 .../pages/creatProcess/bzrk/step2.vue         | 20 +++++++++----------
 .../pages/creatProcess/bzrk/step3.vue         | 20 +++++++++----------
 .../pages/creatProcess/bzrk/step5.vue         | 20 +++++++++----------
 .../pages/creatProcess/bzzqyj/step1-1.vue     |  2 +-
 .../pages/creatProcess/bzzqyj/step1-9.vue     |  2 +-
 .../pages/creatProcess/bzzqyj/step1.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step2.vue       |  2 +-
 .../pages/creatProcess/bzzqyj/step3.vue       |  4 ++--
 .../pages/creatProcess/bzzqyj/step4-1.vue     |  4 ++--
 .../pages/creatProcess/bzzqyj/step4-2.vue     |  4 ++--
 .../pages/creatProcess/bzzqyj/step4.vue       |  4 ++--
 .../pages/creatProcess/bzzqyj/step5.vue       |  4 ++--
 .../pages/creatProcess/bzzqyj/step6.vue       |  4 ++--
 .../pages/creatProcess/bzzqyj/step7.vue       |  4 ++--
 .../pages/creatProcess/bzzqyj/step8.vue       |  4 ++--
 .../pages/creatProcess/bzzqyj/step9.vue       |  4 ++--
 .../pages/creatProcess/jrbzhxh/step3.vue      |  4 ++--
 .../pages/creatProcess/jrbzhxh/step4.vue      |  4 ++--
 .../pages/creatProcess/qbfs/bak/step1-4.vue   |  4 ++--
 .../pages/creatProcess/qbfs/bak/step3.vue     |  4 ++--
 .../pages/creatProcess/qbfs/bak/step4.vue     |  4 ++--
 .../creatProcess/qbfs/common/formList.vue     |  4 ++--
 .../qbfs/common/formListStep5.vue             |  4 ++--
 .../pages/creatProcess/qbfs/step1.vue         |  4 ++--
 .../pages/creatProcess/qbfs/step2.vue         |  4 ++--
 .../pages/creatProcess/qbfs/step3.vue         |  4 ++--
 .../pages/creatProcess/qbfs/step4.vue         |  4 ++--
 .../pages/creatProcess/qbfs/step5.vue         |  4 ++--
 .../pages/creatProcess/qbfs/stepC4.vue        |  4 ++--
 .../pages/creatProcess/qbfs/stepDetail.vue    |  4 ++--
 .../pages/creatProcess/qbfz/step1-7.vue       |  4 ++--
 .../pages/creatProcess/qbfz/step1.vue         |  4 ++--
 .../pages/creatProcess/qbfz/step4.vue         |  4 ++--
 .../pages/creatProcess/qbfz/step5.vue         |  4 ++--
 .../pages/creatProcess/qbfz/step6.vue         |  4 ++--
 .../pages/creatProcess/qbfz/step7.vue         |  4 ++--
 .../qbrk-product/common/formEditList.vue      |  6 +++---
 .../qbrk-product/common/formList.vue          |  4 ++--
 .../qbrk-product/common/formListIn.vue        |  4 ++--
 .../pages/creatProcess/qbrk-product/step1.vue |  2 +-
 .../creatProcess/qbrk-product/step10.vue      |  4 ++--
 .../creatProcess/qbrk-product/step11.vue      |  4 ++--
 .../creatProcess/qbrk-product/step12.vue      |  4 ++--
 .../creatProcess/qbrk-product/step13.vue      |  4 ++--
 .../creatProcess/qbrk-product/step14.vue      |  4 ++--
 .../pages/creatProcess/qbrk-product/step2.vue |  4 ++--
 .../pages/creatProcess/qbrk-product/step3.vue |  6 +++---
 .../pages/creatProcess/qbrk-product/step4.vue |  4 ++--
 .../pages/creatProcess/qbrk-product/step5.vue |  6 +++---
 .../pages/creatProcess/qbrk-product/step6.vue |  6 +++---
 .../pages/creatProcess/qbrk-product/step7.vue |  4 ++--
 .../pages/creatProcess/qbrk-product/step8.vue |  4 ++--
 .../pages/creatProcess/qbrk-product/step9.vue |  4 ++--
 .../creatProcess/qbrk-product/stepC3.vue      |  6 +++---
 .../creatProcess/qbrk-product/stepC6.vue      |  6 +++---
 .../creatProcess/qbrk-product/stepDetail.vue  |  4 ++--
 .../creatProcess/qbrk/common/formEditList.vue |  6 +++---
 .../creatProcess/qbrk/common/formList.vue     |  4 ++--
 .../creatProcess/qbrk/common/formListIn.vue   |  4 ++--
 .../pages/creatProcess/qbrk/step1.vue         |  2 +-
 .../pages/creatProcess/qbrk/step10.vue        |  4 ++--
 .../pages/creatProcess/qbrk/step11.vue        |  4 ++--
 .../pages/creatProcess/qbrk/step12.vue        |  6 +++---
 .../pages/creatProcess/qbrk/step13.vue        |  4 ++--
 .../pages/creatProcess/qbrk/step2.vue         |  4 ++--
 .../pages/creatProcess/qbrk/step3.vue         |  6 +++---
 .../pages/creatProcess/qbrk/step4.vue         |  4 ++--
 .../pages/creatProcess/qbrk/step5.vue         |  6 +++---
 .../pages/creatProcess/qbrk/step6.vue         |  6 +++---
 .../pages/creatProcess/qbrk/step7.vue         |  4 ++--
 .../pages/creatProcess/qbrk/step8.vue         |  4 ++--
 .../pages/creatProcess/qbrk/step9.vue         |  4 ++--
 .../pages/creatProcess/qbrk/stepC1.vue        |  4 ++--
 .../pages/creatProcess/qbrk/stepC3.vue        |  6 +++---
 .../pages/creatProcess/qbrk/stepC6.vue        |  6 +++---
 .../pages/creatProcess/qbrk/stepDetail.vue    |  4 ++--
 .../pages/creatProcess/qbzxdlx/step2.vue      |  4 ++--
 .../pages/creatProcess/wfhxzg/step5-1.vue     |  4 ++--
 .../pages/creatProcess/wfhxzg/step5.vue       |  4 ++--
 .../pages/creatProcess/zcrk/step1.vue         |  2 +-
 .../pages/creatProcess/zcrk/step2.vue         |  8 ++++----
 .../pages/creatProcess/zcrk/step5.vue         |  8 ++++----
 .../pages/phone/bzhHd-hh/step2.vue            |  2 +-
 .../pages/phone/bzqdfb/step2.vue              |  4 ++--
 .../pages/phone/bzqdfb/step4.vue              |  4 ++--
 .../pages/phone/bzzqyj/step2.vue              |  2 +-
 .../pages/phone/bzzqyj/step4-1.vue            |  4 ++--
 .../pages/phone/bzzqyj/step4-2.vue            |  4 ++--
 .../pages/phone/bzzqyj/step6.vue              |  4 ++--
 .../pages/phone/bzzqyj/step7.vue              |  4 ++--
 .../pages/phone/bzzqyj/step8.vue              |  4 ++--
 .../pages/phone/bzzqyj/step9.vue              |  4 ++--
 .../pages/phone/jrbzhxh/step3.vue             |  4 ++--
 .../pages/phone/jrbzhxh/step4.vue             |  4 ++--
 .../pages/phone/qbfs/common/formList.vue      |  4 ++--
 .../pages/phone/qbfs/common/formListStep5.vue |  4 ++--
 .../processCenter/pages/phone/qbfs/step5.vue  |  4 ++--
 .../processCenter/pages/phone/qbfz/step5.vue  |  4 ++--
 .../processCenter/pages/phone/qbfz/step6.vue  |  4 ++--
 .../processCenter/pages/phone/qbfz/step7.vue  |  4 ++--
 .../qbrk-product/common/formEditList.vue      |  6 +++---
 .../phone/qbrk-product/common/formList.vue    |  4 ++--
 .../phone/qbrk-product/common/formListIn.vue  |  4 ++--
 .../pages/phone/qbrk-product/step10.vue       |  4 ++--
 .../pages/phone/qbrk-product/step12.vue       |  4 ++--
 .../pages/phone/qbrk-product/step13.vue       |  4 ++--
 .../pages/phone/qbrk-product/step4.vue        |  4 ++--
 .../pages/phone/qbrk-product/step7.vue        |  4 ++--
 .../pages/phone/qbrk-product/step8.vue        |  4 ++--
 .../pages/phone/qbrk/common/formEditList.vue  |  6 +++---
 .../pages/phone/qbrk/common/formList.vue      |  4 ++--
 .../pages/phone/qbrk/common/formListIn.vue    |  4 ++--
 .../processCenter/pages/phone/qbrk/step10.vue |  4 ++--
 .../processCenter/pages/phone/qbrk/step11.vue |  4 ++--
 .../processCenter/pages/phone/qbrk/step13.vue |  4 ++--
 .../processCenter/pages/phone/qbrk/step4.vue  |  4 ++--
 .../processCenter/pages/phone/qbrk/step8.vue  |  4 ++--
 .../pages/phone/wfhxzg/step5.vue              |  2 +-
 .../pages/addEdit.vue                         |  2 +-
 .../pages/details.vue                         |  4 ++--
 .../pages/otherAddEit.vue                     |  2 +-
 .../pages/projectAddEit.vue                   |  2 +-
 .../dataCenter/dataCenterDetail.vue           |  4 ++--
 .../regulatoryRepository/dataCenter/index.vue |  2 +-
 .../dataStatis/miniPages/expendSubsidy.vue    |  4 ++--
 .../enterBSysRevPlanManaLib/index.vue         |  2 +-
 .../enterpriseStandardFiling/index.vue        |  4 ++--
 .../information/index2.vue                    |  2 +-
 .../nonConfomity/pages/businessDetails.vue    |  4 ++--
 .../nonConfomity/pages/historicalData.vue     |  4 ++--
 .../nonConfomity/pages/productDetails.vue     |  4 ++--
 .../pags/consultationDetails.vue              |  2 +-
 .../components/workingGroup1/index.vue        |  4 ++--
 .../components/workingGroup2/index.vue        |  2 +-
 src/pages/standardComparisonLibrary/view.vue  |  2 +-
 176 files changed, 353 insertions(+), 353 deletions(-)

diff --git a/src/api/process.js b/src/api/process.js
index b582172ae..69c92786c 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -799,7 +799,7 @@ export function updateMeet(data) {
 // 上传接口
 export function upFile(data) {
   return axios({
-    url: '/api/att/attFile/upload',
+    url: '/api/att/attFile/uploadNew',
     method: 'post',
     data
   })
diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index ade7948c6..bc82bcfbe 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -351,7 +351,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue
index dc59712d8..053e82cde 100644
--- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue
+++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue
@@ -480,7 +480,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -490,7 +490,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue
index 44e1c8863..a9d76a21c 100644
--- a/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue
+++ b/src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue
@@ -491,7 +491,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/config/pages/dynamicInformations/index.vue b/src/pages/config/pages/dynamicInformations/index.vue
index 34de9bad9..f53396ea8 100644
--- a/src/pages/config/pages/dynamicInformations/index.vue
+++ b/src/pages/config/pages/dynamicInformations/index.vue
@@ -323,7 +323,7 @@ export default {
     },
     saveFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
diff --git a/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue b/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue
index 12d32e7ed..dac9abe8f 100644
--- a/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue
+++ b/src/pages/details/enterBSysRevPlanManaLibDetail/index.vue
@@ -176,7 +176,7 @@
         downloadFile(attId) {
             if (attId != null && attId !== "") {
                 window.location.href =
-                    "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+                    "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
             } else {
                 this.$message.error("请选择要下载的文件");
             }
diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index cdc08821f..351ab4658 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -2523,7 +2523,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -2541,7 +2541,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/details/otherLawsDetails/js/otherLawsDetails.js b/src/pages/details/otherLawsDetails/js/otherLawsDetails.js
index c6e5ed06a..4cebe508a 100644
--- a/src/pages/details/otherLawsDetails/js/otherLawsDetails.js
+++ b/src/pages/details/otherLawsDetails/js/otherLawsDetails.js
@@ -712,7 +712,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -722,7 +722,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/details/otherLawsStandDetails/index.vue b/src/pages/details/otherLawsStandDetails/index.vue
index cb0fe24ab..7745be664 100644
--- a/src/pages/details/otherLawsStandDetails/index.vue
+++ b/src/pages/details/otherLawsStandDetails/index.vue
@@ -1614,7 +1614,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -1624,7 +1624,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 92543d09b..384b80992 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -3177,7 +3177,7 @@ export default {
     },
     downloadFile(attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -3207,7 +3207,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/details/process/ruku/index.vue b/src/pages/details/process/ruku/index.vue
index 1062bbda2..1b751eced 100644
--- a/src/pages/details/process/ruku/index.vue
+++ b/src/pages/details/process/ruku/index.vue
@@ -2085,7 +2085,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -2095,7 +2095,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/knowledgeGraph/index.vue b/src/pages/knowledgeGraph/index.vue
index c80549b2f..d9fcaf62d 100644
--- a/src/pages/knowledgeGraph/index.vue
+++ b/src/pages/knowledgeGraph/index.vue
@@ -2236,7 +2236,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -2246,7 +2246,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 7ce559099..f62e038e5 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -2058,7 +2058,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -2068,7 +2068,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index f28ef77e1..cd07387e3 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -521,7 +521,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
 
diff --git a/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue b/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue
index 1f875e64b..2397302d4 100644
--- a/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue
+++ b/src/pages/personal/pages/my-collection/collectionDetail/CollectionBussStandardDetail.vue
@@ -513,7 +513,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$Message.error('请选择要下载的文件')
       }
diff --git a/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue b/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue
index 133b15f34..eeb0bc3bf 100644
--- a/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue
+++ b/src/pages/personal/pages/my-collection/collectionDetail/CollectionStandardDetail.vue
@@ -657,7 +657,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$Message.error('请选择要下载的文件')
       }
diff --git a/src/pages/personal/pages/my-collection/collectionDetail/js/lawsDetails.js b/src/pages/personal/pages/my-collection/collectionDetail/js/lawsDetails.js
index 5ee84d4f8..2d4b8b421 100644
--- a/src/pages/personal/pages/my-collection/collectionDetail/js/lawsDetails.js
+++ b/src/pages/personal/pages/my-collection/collectionDetail/js/lawsDetails.js
@@ -292,7 +292,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$Message.error('请选择要下载的文件')
       }
diff --git a/src/pages/personal/pages/my-enterpriseStandard/index.vue b/src/pages/personal/pages/my-enterpriseStandard/index.vue
index 87835564d..ac1f61356 100644
--- a/src/pages/personal/pages/my-enterpriseStandard/index.vue
+++ b/src/pages/personal/pages/my-enterpriseStandard/index.vue
@@ -1033,7 +1033,7 @@ export default {
 
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
diff --git a/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue b/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue
index 39ca72e06..4bf70d3e8 100644
--- a/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue
+++ b/src/pages/personal/pages/questionsAndAnswers/components/QuestionItemInfo.vue
@@ -66,7 +66,7 @@ export default {
   methods: {
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
diff --git a/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue b/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue
index bb7328002..70f743850 100644
--- a/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue
+++ b/src/pages/personal/pages/questionsAndAnswers_old2/components/CollapseItemInfo.vue
@@ -67,7 +67,7 @@ export default {
   methods: {
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index 942224e43..b2636852d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -360,7 +360,7 @@
             clickButtonToUpload (file) {
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index a46686469..8d66b6d72 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -364,7 +364,7 @@ export default {
     clickButtonToUpload (file) {
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 218807876..3c582f085 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -673,7 +673,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.id
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index 1ce2f8320..8e7e65447 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -339,7 +339,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
index dfa40f025..bbdc46471 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
@@ -594,7 +594,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 7a77d843e..73c170810 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -427,7 +427,7 @@ export default {
       let attId = val
       if (attId != null && attId !== "") {
         if (type === 'down') {
-          window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
         } else {
           this.$preview(attId)
         }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
index d2312e5d0..09a6b5d8b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
@@ -629,7 +629,7 @@ export default {
     handlePreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
 
@@ -773,7 +773,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
index 2c1e42f4f..e11e077d2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue
@@ -338,7 +338,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     selectedDelete(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index ebdccd1f1..40b039b2c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -365,7 +365,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     selectedDelete(val) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
index 64b12093f..0f2d664bf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
@@ -343,21 +343,21 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     // 点击上传的文件进行下载
     onPreviewTheme(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     // 点击上传的文件进行下载
     onPreviewOther(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
 
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
index 84853cf1f..150ae2d03 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
@@ -614,7 +614,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.id
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index 85e7bc4e3..7e677b171 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -393,7 +393,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
index 660d45fa0..10cf81d1a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
@@ -450,7 +450,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
index f7eb8758d..25847e144 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
@@ -375,7 +375,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
index c683d401b..a833498e7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
@@ -552,7 +552,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
index 9a355c0cb..bc24438ee 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
@@ -440,7 +440,7 @@ export default {
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
index d665cc132..f4595db49 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
@@ -605,7 +605,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -616,7 +616,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
@@ -671,7 +671,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     //保存事件
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
index cb04ffdb8..de5424936 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
@@ -428,7 +428,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -439,7 +439,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index 4b32a2bf2..713b63ed1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -378,7 +378,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -388,7 +388,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index a3da3a5b3..d5c5515a1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -685,7 +685,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -696,7 +696,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
@@ -751,7 +751,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     getData() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 661221c74..3e9deaa1d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -447,7 +447,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -457,7 +457,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 515094088..cedbb0aab 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1021,25 +1021,25 @@ export default {
         if (this.fbgbjbdFileId.search(',')) {
           this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
         }
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.fbgbjbdFileId
       } else if (fileType === 'xgd') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.xgdFileId
       } else if (fileType === 'bpg') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.bpgFileId
       } else if (fileType === 'ssg') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.ssgFileId
       } else if (fileType === 'zqyjg') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.zqyjgFileId
       } else if (fileType === 'jdwj') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.jdwjFileId
       } else if (fileType === 'kwj') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.kwjFileId
       } else if (fileType === 'glwj') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.glwjFileId
       } else if (fileType === 'ca') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.caFileId
       } else if (fileType === 'zbjbd') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.zbjbdFileId
       }
     },
     getRule() {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 3c0b0ec26..7d81b9d0c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -986,26 +986,26 @@ export default {
     },
     downloadFile (fileType,fileId) {
       if(fileType === 'fbgbjbd'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + fileId;
       }else if(fileType === 'xgd'){
 
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'bpg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'ssg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'zqyjg'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'jdwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'kwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'glwj'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'ca'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }else if(fileType === 'zbjbd'){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' +  fileId;
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' +  fileId;
       }
     },
     popoverHide (checkedIds, checkedData) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 78dc13284..bbd3d410c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -870,25 +870,25 @@ export default {
           this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
           console.log(this.fbgbjbdFileId);
         }
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fbgbjbdFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.fbgbjbdFileId
       } else if (fileType === 'xgd') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.xgdFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.xgdFileId
       } else if (fileType === 'bpg') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.bpgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.bpgFileId
       } else if (fileType === 'ssg') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ssgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.ssgFileId
       } else if (fileType === 'zqyjg') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zqyjgFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.zqyjgFileId
       } else if (fileType === 'jdwj') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.jdwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.jdwjFileId
       } else if (fileType === 'kwj') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.kwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.kwjFileId
       } else if (fileType === 'glwj') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.glwjFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.glwjFileId
       } else if (fileType === 'ca') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.caFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.caFileId
       } else if (fileType === 'zbjbd') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.zbjbdFileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.zbjbdFileId
       }
     },
     popoverHide(checkedIds, checkedData) {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index ce998676c..91b471bb3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -508,7 +508,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
index 03d162d87..0b87159c2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
@@ -305,7 +305,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index 9198200ca..f477a26c5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -516,7 +516,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index a3f211cd2..7471c5d4d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -248,7 +248,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 08b58bf4a..fcbc992ee 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -410,7 +410,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -494,7 +494,7 @@
                 this.modalshowflag2 = false
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index dcc64a98d..2842bf7de 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -328,7 +328,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -354,7 +354,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index 05a7de9ab..3f274da50 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -320,7 +320,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -346,7 +346,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 9c62744e6..12eea8b0b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -415,7 +415,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
@@ -567,7 +567,7 @@ export default {
       this.itermsConditionsTitle = row
     },
     downloadFile (attId) {
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
     },
       handleTransfer() {
           this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 1f258b7f4..8a1e1a8cc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -419,7 +419,7 @@
       filesUpload (file) { // 下载
         const attId = file.attId
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -494,7 +494,7 @@
         }
       },
       downloadFile (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       },
       handleTransfer() {
         if(this.clickFlag){
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index f994d065e..36a6218ce 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -368,7 +368,7 @@
       filesUpload (file) { // 下载
         const attId = file.attId
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -385,7 +385,7 @@
         this.itermsConditionsTitle = row
       },
       downloadFile (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       },
       handleTransfer() {
         this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 65691709c..c44978deb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -337,7 +337,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
@@ -354,7 +354,7 @@ export default {
       this.itermsConditionsTitle = row
     },
     downloadFile (attId) {
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
     },
       handleTransfer() {
           this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 03fb15d75..fef5ad6d0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -337,7 +337,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
@@ -354,7 +354,7 @@ export default {
       this.itermsConditionsTitle = row
     },
     downloadFile (attId) {
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
     },
       handleTransfer() {
           this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 17d9cd36b..1a39fa879 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -337,7 +337,7 @@ export default {
     filesUpload (file) { // 下载
       const attId = file.attId
       if (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.warning('文件不存在,下载失败')
       }
@@ -354,7 +354,7 @@ export default {
       this.itermsConditionsTitle = row
     },
     downloadFile (attId) {
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
     },
       handleTransfer() {
           this.drawerModal = true
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
index b8ba7e11e..3242bbebe 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step3.vue
@@ -531,7 +531,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -542,7 +542,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
index c6523fe6f..2c3c8276c 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step4.vue
@@ -517,7 +517,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -528,7 +528,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue
index 5c9aa243f..aed710cce 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step1-4.vue
@@ -469,7 +469,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -480,7 +480,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue
index 42e1878cc..c2182e2ff 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step3.vue
@@ -410,7 +410,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -421,7 +421,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue
index 41c9e7d5a..10347be3a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/bak/step4.vue
@@ -480,7 +480,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -491,7 +491,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
index e56515f05..cff1b8221 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formList.vue
@@ -808,7 +808,7 @@ export default {
       }
       if (type === 'down') {
         if (attId) {
-          window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -818,7 +818,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
index 2b077d5f3..d858d9e78 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue
@@ -801,7 +801,7 @@ export default {
       }
       if (type === 'down') {
         if (attId) {
-          window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -811,7 +811,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
index 2165b1f48..4cd0deff1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
@@ -1307,7 +1307,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -1318,7 +1318,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
index f20c76fd1..c7e9756de 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
@@ -354,7 +354,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -365,7 +365,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
index 75eb475a5..c816cef11 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
@@ -696,7 +696,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -707,7 +707,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
index 7acc459f6..35aad9e12 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -663,7 +663,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -674,7 +674,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
index 269e48121..859c6b3b1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
@@ -762,7 +762,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -773,7 +773,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
index 54a5a7173..6b62c940a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
@@ -662,7 +662,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -673,7 +673,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
index 63c705664..0a11023a5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
@@ -758,7 +758,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -769,7 +769,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index 65cf19cdc..5cc397771 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -443,7 +443,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -454,7 +454,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
index 64e8f9364..b8295d37f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue
@@ -775,7 +775,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -786,7 +786,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
index d03935884..0c89e09c7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
@@ -435,7 +435,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -446,7 +446,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
index f236f1394..6b7b536db 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
@@ -462,7 +462,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -473,7 +473,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
index 86da5032c..72b7edc9c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
@@ -462,7 +462,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -473,7 +473,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
index 155c1d8bc..16dc9e07a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
@@ -462,7 +462,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -473,7 +473,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
index b7ad11b3a..3d9de8452 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
@@ -860,7 +860,7 @@
         this.dialogVisible = false
       },
       down(){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.fileId
         this.dialogVisible = false
       },
       // 文件预览及下载
@@ -873,7 +873,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -883,7 +883,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
index 006f92fa6..3f9d68ea1 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue
@@ -596,7 +596,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -606,7 +606,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
index 9befd2d4b..72c0b65f6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue
@@ -599,7 +599,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -609,7 +609,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 0bfc57dae..9a5529dc9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -2608,7 +2608,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
index 86447803d..c0d7b3e04 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
@@ -1884,7 +1884,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1942,7 +1942,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
index 05caa3d9f..185595fa5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
@@ -1884,7 +1884,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1942,7 +1942,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
index 8f6d360d1..e375a3109 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
@@ -1884,7 +1884,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1942,7 +1942,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index 3070d9abd..e4d33806d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -2048,7 +2048,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2126,7 +2126,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue
index 1e75b77c8..6ce01ece0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue
@@ -1992,7 +1992,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2050,7 +2050,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
index b88617eef..428dce6f7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
@@ -1916,7 +1916,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1966,7 +1966,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 2eb6a8e5c..6962b987d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -2099,7 +2099,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2117,7 +2117,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2172,7 +2172,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
index 019d13751..d4edc2542 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
@@ -1883,7 +1883,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1941,7 +1941,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 1b6ed4669..71e9e612e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -2302,7 +2302,7 @@
                 }
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2315,7 +2315,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2384,7 +2384,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 938d7e964..1a3fb9d7a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -2201,7 +2201,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2219,7 +2219,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2274,7 +2274,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
index 6cb4f325c..5864c92f9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
@@ -1962,7 +1962,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2020,7 +2020,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
index ce21748a7..d4d438762 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
@@ -1884,7 +1884,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1942,7 +1942,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
index f37602856..315dcf9b8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
@@ -1884,7 +1884,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1942,7 +1942,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 0d94a2bba..02723b8d3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -2100,7 +2100,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2118,7 +2118,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2173,7 +2173,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index b4ec6ee08..43d15c740 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -2212,7 +2212,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2230,7 +2230,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2285,7 +2285,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
index a91d8d5ed..ce27de3d9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
@@ -1826,7 +1826,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1884,7 +1884,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index ecdf8a9f1..457a2d6b7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -894,7 +894,7 @@ export default {
         this.dialogVisible = false
     },
     down(){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.fileId
         this.dialogVisible = false
     },
     // 文件预览及下载
@@ -907,7 +907,7 @@ export default {
       }
         if (type === 'down') {
             if (attId) {
-              window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+              window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
             } else {
                 this.$message.warning('文件不存在,下载失败')
             }
@@ -917,7 +917,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index 97ead9e9f..b7b32187e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -585,7 +585,7 @@ export default {
       }
       if (type === 'down') {
         if (attId) {
-          window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -595,7 +595,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
index da76d4727..37ab0d64a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
@@ -595,7 +595,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -605,7 +605,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 8dc1696f3..22a8e062b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -2539,7 +2539,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
index 68f6b2e3a..c2d970186 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -1883,7 +1883,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1941,7 +1941,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
index 4d318a2fd..6274dce34 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -1882,7 +1882,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1940,7 +1940,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 075d97218..434b9072f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -2072,7 +2072,7 @@
                 }
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2085,7 +2085,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2159,7 +2159,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 2bda8c0de..726f25f02 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -2075,7 +2075,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2149,7 +2149,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index edbbd87e5..3a4ed3fa7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -2161,7 +2161,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2208,7 +2208,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index a1e14cae4..427cea527 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -2127,7 +2127,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+                        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2145,7 +2145,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+                        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2196,7 +2196,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
index ef6528b4b..7f571ff8c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
@@ -1893,7 +1893,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1951,7 +1951,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index e26b054d2..b5e33cab5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -2468,7 +2468,7 @@
                 }
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2481,7 +2481,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2550,7 +2550,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 2ed39265e..2b2ea174b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -2476,7 +2476,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2494,7 +2494,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2549,7 +2549,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index fab8d1ffa..b8a840de8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -2107,7 +2107,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2165,7 +2165,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index 15ca339a5..b5b2ba175 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -1920,7 +1920,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1978,7 +1978,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index 8e58c99ed..5660a4548 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -2133,7 +2133,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2191,7 +2191,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 58bd5e539..6f5c7683d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -2253,7 +2253,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2327,7 +2327,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 50f8cd894..1260873b8 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -2127,7 +2127,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+                        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2145,7 +2145,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+                        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2196,7 +2196,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 5aea63be7..1d736acef 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -2474,7 +2474,7 @@
                 const attId = file.footFile
                 if (type === 'down') {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2492,7 +2492,7 @@
                 }
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -2547,7 +2547,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
index daddd5508..c1a2c0b5e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
@@ -1838,7 +1838,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
@@ -1896,7 +1896,7 @@
             },
             downloadFile (data) {
                 //文件id中出现了','字符,去除掉
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
             },
             fileUpload (type) {
                 this.fileType = '';
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
index 16572f9a7..597c94aa6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
@@ -955,7 +955,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -965,7 +965,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
index 44ddc3f6a..210b87d1f 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
@@ -259,7 +259,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     // 提交按钮
@@ -344,7 +344,7 @@ export default {
     },
     download(row) {
       let attId = row.fileTextId
-      window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
     },
     // 分页事件
     pageChange (page) {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
index b76f4048c..9af768425 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
@@ -287,7 +287,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     // 提交按钮
@@ -393,7 +393,7 @@ export default {
     },
     download(row) {
       let attId = row.fileTextId
-      window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
     },
     // 分页事件
     pageChange (page) {
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 769dc0c58..28e8d753a 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -2002,7 +2002,7 @@
                 const attId = file.response.data.id
                 if (this.preview) {
                     if (attId) {
-                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                     } else {
                         this.$message.warning('文件不存在,下载失败')
                     }
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
index fc4ccc519..ed526ee4f 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step2.vue
@@ -897,13 +897,13 @@
             downloadFile (fileType) {
                 //文件id中出现了','字符,去除掉
                 if(fileType === 'ZCWBLAWS'){
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ZCWBLAWSFileId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.ZCWBLAWSFileId
                 }else if(fileType === 'GCWBLAWS'){
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.GCWBLAWSFileId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.GCWBLAWSFileId
                 }else if(fileType === 'JDWJLAWS'){
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.JDWJLAWSFileId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.JDWJLAWSFileId
                 }else if(fileType === 'GLWJLAWS'){
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.GLWJLAWSFileId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.GLWJLAWSFileId
                 }
             },
             getRule(){
diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
index 573e62f57..a04c86954 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step5.vue
@@ -738,13 +738,13 @@
         methods: {
           downloadFile (fileType) {
               if(fileType === 'ZCWBLAWS'){
-                  window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.ZCWBLAWSFileId
+                  window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.ZCWBLAWSFileId
               }else if(fileType === 'GCWBLAWS'){
-                  window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.GCWBLAWSFileId
+                  window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.GCWBLAWSFileId
               }else if(fileType === 'JDWJLAWS'){
-                  window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.JDWJLAWSFileId
+                  window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.JDWJLAWSFileId
               }else if(fileType === 'GLWJLAWS'){
-                  window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.GLWJLAWSFileId
+                  window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.GLWJLAWSFileId
               }
           },
             popoverHide (checkedIds, checkedData) {
diff --git a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
index 7b40400a3..a45e0d881 100644
--- a/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
@@ -262,7 +262,7 @@ export default {
     onPreviewOther(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
 
diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step2.vue b/src/pages/processCenter/pages/phone/bzqdfb/step2.vue
index d345230de..b05d708bf 100644
--- a/src/pages/processCenter/pages/phone/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzqdfb/step2.vue
@@ -340,7 +340,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -350,7 +350,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
index fec05067e..235eacfce 100644
--- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
@@ -393,7 +393,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -404,7 +404,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
index a1213bdfd..6225edc9c 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
@@ -211,7 +211,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
index e0e87fb9a..2fbd9eba5 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
@@ -296,7 +296,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -322,7 +322,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
index fc51c1fe6..d571d1a9e 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
@@ -287,7 +287,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -313,7 +313,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
index 55732899e..46f86870f 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
@@ -295,7 +295,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -312,7 +312,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
index f8cc50e08..f8884928b 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
@@ -252,7 +252,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -269,7 +269,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
index ba7bc47eb..adfbfff54 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step8.vue
@@ -252,7 +252,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -269,7 +269,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
index a3e94b522..ce22c9357 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step9.vue
@@ -252,7 +252,7 @@
             filesUpload (file) { // 下载
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -284,7 +284,7 @@
                 this.itermsConditionsTitle = row
             },
             downloadFile (attId) {
-                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
             },
             handleTransfer() {
                 this.drawerModal = true
diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
index a60005f7f..6390f756a 100644
--- a/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
+++ b/src/pages/processCenter/pages/phone/jrbzhxh/step3.vue
@@ -465,7 +465,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -476,7 +476,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
index 1bbf60f87..6b937aa7c 100644
--- a/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
+++ b/src/pages/processCenter/pages/phone/jrbzhxh/step4.vue
@@ -451,7 +451,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -462,7 +462,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue
index ab57da038..6514b4b78 100644
--- a/src/pages/processCenter/pages/phone/qbfs/common/formList.vue
+++ b/src/pages/processCenter/pages/phone/qbfs/common/formList.vue
@@ -800,7 +800,7 @@ export default {
       }
       if (type === 'down') {
         if (attId) {
-          window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -810,7 +810,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue
index 5ea3efc7c..dd6ce86be 100644
--- a/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue
+++ b/src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue
@@ -735,7 +735,7 @@ export default {
       }
       if (type === 'down') {
         if (attId) {
-          window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -745,7 +745,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue
index 9b663b732..592b12ef1 100644
--- a/src/pages/processCenter/pages/phone/qbfs/step5.vue
+++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue
@@ -766,7 +766,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -777,7 +777,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/phone/qbfz/step5.vue b/src/pages/processCenter/pages/phone/qbfz/step5.vue
index c53548e21..0ce72ab4a 100644
--- a/src/pages/processCenter/pages/phone/qbfz/step5.vue
+++ b/src/pages/processCenter/pages/phone/qbfz/step5.vue
@@ -493,7 +493,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -504,7 +504,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/phone/qbfz/step6.vue b/src/pages/processCenter/pages/phone/qbfz/step6.vue
index abe344f25..10961048e 100644
--- a/src/pages/processCenter/pages/phone/qbfz/step6.vue
+++ b/src/pages/processCenter/pages/phone/qbfz/step6.vue
@@ -493,7 +493,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -504,7 +504,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/phone/qbfz/step7.vue b/src/pages/processCenter/pages/phone/qbfz/step7.vue
index 4c3d5ea6a..4f5f1ea2c 100644
--- a/src/pages/processCenter/pages/phone/qbfz/step7.vue
+++ b/src/pages/processCenter/pages/phone/qbfz/step7.vue
@@ -493,7 +493,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -504,7 +504,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue
index 96909918f..af7ede7dd 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue
@@ -844,7 +844,7 @@
         this.dialogVisible = false
       },
       down(){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.fileId
         this.dialogVisible = false
       },
       // 文件预览及下载
@@ -857,7 +857,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -867,7 +867,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
index fb3bc8f6b..171e328b5 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue
@@ -578,7 +578,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -588,7 +588,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
index 635047f5a..a96d8d9ed 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue
@@ -599,7 +599,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -609,7 +609,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue
index db88ffd4e..f2d37a7cd 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/step10.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step10.vue
@@ -1564,7 +1564,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1622,7 +1622,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue
index 3acf6e9cb..a7a026ec0 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/step12.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step12.vue
@@ -1564,7 +1564,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1622,7 +1622,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step13.vue b/src/pages/processCenter/pages/phone/qbrk-product/step13.vue
index e2b1010cd..3e836628d 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step13.vue
@@ -1630,7 +1630,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1708,7 +1708,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
index e55f24ab3..dcf5437b7 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue
@@ -1483,7 +1483,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1541,7 +1541,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue
index 9430bbcab..111679ec7 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step7.vue
@@ -1643,7 +1643,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1701,7 +1701,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue
index 113c45a16..76ade10a3 100644
--- a/src/pages/processCenter/pages/phone/qbrk-product/step8.vue
+++ b/src/pages/processCenter/pages/phone/qbrk-product/step8.vue
@@ -1564,7 +1564,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1622,7 +1622,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
index 784622707..58b6ca60d 100644
--- a/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formEditList.vue
@@ -869,7 +869,7 @@ export default {
         this.dialogVisible = false
     },
     down(){
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fileId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.fileId
         this.dialogVisible = false
     },
     // 文件预览及下载
@@ -882,7 +882,7 @@ export default {
       }
         if (type === 'down') {
             if (attId) {
-              window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+              window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
             } else {
                 this.$message.warning('文件不存在,下载失败')
             }
@@ -892,7 +892,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
index 88e59b6a9..9a0bc58e7 100644
--- a/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formList.vue
@@ -547,7 +547,7 @@ export default {
       }
       if (type === 'down') {
         if (attId) {
-          window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -557,7 +557,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+      window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
     },
     setMap(data){
       data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
index d0ff563ee..f49e09b36 100644
--- a/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue
@@ -582,7 +582,7 @@
         }
         if (type === 'down') {
           if (attId) {
-            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+            window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
           } else {
             this.$message.warning('文件不存在,下载失败')
           }
@@ -592,7 +592,7 @@
       },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
-        window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
+        window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + data.id)
       },
       setMap(data){
         data.forEach(item => {
diff --git a/src/pages/processCenter/pages/phone/qbrk/step10.vue b/src/pages/processCenter/pages/phone/qbrk/step10.vue
index f30ee8162..9b0c1c800 100644
--- a/src/pages/processCenter/pages/phone/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/step10.vue
@@ -1484,7 +1484,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1542,7 +1542,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk/step11.vue b/src/pages/processCenter/pages/phone/qbrk/step11.vue
index 44b1b78c0..21ea9c1cf 100644
--- a/src/pages/processCenter/pages/phone/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/step11.vue
@@ -1484,7 +1484,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1542,7 +1542,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk/step13.vue b/src/pages/processCenter/pages/phone/qbrk/step13.vue
index a69e5a357..1920eee79 100644
--- a/src/pages/processCenter/pages/phone/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/step13.vue
@@ -1484,7 +1484,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1542,7 +1542,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk/step4.vue b/src/pages/processCenter/pages/phone/qbrk/step4.vue
index 65d3a039f..413579f8c 100644
--- a/src/pages/processCenter/pages/phone/qbrk/step4.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/step4.vue
@@ -1420,7 +1420,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1478,7 +1478,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/qbrk/step8.vue b/src/pages/processCenter/pages/phone/qbrk/step8.vue
index 0ef8fbed9..7cc7176f7 100644
--- a/src/pages/processCenter/pages/phone/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/phone/qbrk/step8.vue
@@ -1598,7 +1598,7 @@ export default {
       const attId = file.response.data.id
       if (this.preview) {
         if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.warning('文件不存在,下载失败')
         }
@@ -1656,7 +1656,7 @@ export default {
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
-      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+      window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + data.id
     },
     fileUpload (type) {
       this.fileType = '';
diff --git a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
index 990f20db5..85c16bf99 100644
--- a/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+++ b/src/pages/processCenter/pages/phone/wfhxzg/step5.vue
@@ -316,7 +316,7 @@ export default {
     },
     download(row) {
       let attId = row.fileTextId
-      window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+      window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
     },
     // 分页事件
     pageChange (page) {
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 303d501de..33f1fb764 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1060,7 +1060,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     // 相关附件 上传之前钩子
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index 9e1fb8f91..ddcd87b5e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -1038,7 +1038,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -1049,7 +1049,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index c3166918c..2ce66d552 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -2123,7 +2123,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index 1d11479e3..4120a122d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -2053,7 +2053,7 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
   },
diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
index ba38edda4..63f10cf27 100644
--- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
@@ -162,7 +162,7 @@ export default {
      */
     downloadFile(attId) {
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
@@ -173,7 +173,7 @@ export default {
         this.$message.error("水印下载仅支持PDF,pdf格式文件");
       } else {
         if (attId != null && attId !== "") {
-          window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
+          window.location.href = "/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=" + attId;
         } else {
           this.$message.error("请选择要下载的文件");
         }
diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue
index c74ed9f61..3fa118963 100644
--- a/src/pages/regulatoryRepository/dataCenter/index.vue
+++ b/src/pages/regulatoryRepository/dataCenter/index.vue
@@ -180,7 +180,7 @@
           >
             <el-upload
                 class="upload-demo"
-                action="/api/att/attFile/upload"
+                action="/api/att/attFile/uploadNew"
                 :on-preview="handlePreview"
                 :on-remove="handleRemove"
                 :before-remove="beforeRemove"
diff --git a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
index e1e0fb8df..091195b29 100644
--- a/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
+++ b/src/pages/regulatoryRepository/dataStatis/miniPages/expendSubsidy.vue
@@ -534,14 +534,14 @@ export default {
     handleOnPreview(file) {
       let attId = file.id
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     },
     /** 点击对应附件进行下载*/
     previews(val) {
       let attId = val
       if (attId != null && attId !== "") {
-        window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+        window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       }
     }
   }
diff --git a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
index 5c27786fe..6c3cb9921 100644
--- a/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
+++ b/src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue
@@ -2872,7 +2872,7 @@ export default {
     downloadFile(attId) {
       if (attId != null && attId !== "") {
         window.location.href =
-          "/api/att/attFile/downloadFileForSar?fileId=" + attId;
+          "/api/att/attFile/downloadFileForSarNew?fileId=" + attId;
       } else {
         this.$message.error("请选择要下载的文件");
       }
diff --git a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
index 16d72cc19..dcfe613d5 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardFiling/index.vue
@@ -891,7 +891,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -901,7 +901,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/regulatoryRepository/information/index2.vue b/src/pages/regulatoryRepository/information/index2.vue
index 5a60470d4..041fe00ab 100644
--- a/src/pages/regulatoryRepository/information/index2.vue
+++ b/src/pages/regulatoryRepository/information/index2.vue
@@ -436,7 +436,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
index b0e508990..9b59d8d76 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue
@@ -327,7 +327,7 @@ export default {
     },
     downloadFile(attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -337,7 +337,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index 85902bad6..192c3f3a5 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -397,7 +397,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -407,7 +407,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
index 6c9827847..8c14e4c94 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDetails.vue
@@ -426,7 +426,7 @@ export default {
     },
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }
@@ -436,7 +436,7 @@ export default {
         this.$message.error('水印下载仅支持PDF,pdf格式文件')
       } else {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId
+          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 6224d8a42..bd79a4b7b 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -346,7 +346,7 @@ export default {
         }
       },
       downloadFile (attId) {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       },
       // 点击查看
       handlePreview(item) {
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
index 82c3903a4..c00bbfabe 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue
@@ -1037,7 +1037,7 @@
             updateFile (item) {
                 const attId = item.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
@@ -1045,7 +1045,7 @@
             clickButtonToUpload (file) {
                 const attId = file.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
index a63af522a..2655501f5 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
@@ -915,7 +915,7 @@
             updateFile (item) {
                 const attId = item.attId
                 if (attId) {
-                    window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
                 } else {
                     this.$message.warning('文件不存在,下载失败')
                 }
diff --git a/src/pages/standardComparisonLibrary/view.vue b/src/pages/standardComparisonLibrary/view.vue
index da95db813..ce3a689c6 100644
--- a/src/pages/standardComparisonLibrary/view.vue
+++ b/src/pages/standardComparisonLibrary/view.vue
@@ -1146,7 +1146,7 @@ export default {
 
     downloadFile (attId) {
       if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
       } else {
         this.$message.error('请选择要下载的文件')
       }

From 78c91621200b76d43f7ee8d3c554e01f678571ef Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Wed, 30 Mar 2022 10:30:21 +0800
Subject: [PATCH 11/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052213=20=E9=87=8D?=
 =?UTF-8?q?=E7=82=B9=E6=A0=87=E5=87=86=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?--=E4=BA=A7=E5=93=81=E7=B1=BB=E5=9E=8B=E5=AE=9E=E6=96=BD?=
 =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=9B=9E=E6=98=BE=E7=9A=84=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../page/listTracking.vue                       | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index dee4141ba..f9c6e5e90 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -94,7 +94,8 @@
           <el-table-column
             prop="productType"
             label="产品类型"
-            align="center">
+            align="center"
+            :formatter="reImplRequire">
           </el-table-column>
           <el-table-column
             prop="implTime"
@@ -105,9 +106,10 @@
           <el-table-column
             prop="implRequire"
             label="实施要求"
-            align="center">
+            align="center"
+            :formatter="reImplRequire">
           </el-table-column>
-          <el-table-column label="操作" min-width="50" align="center">
+          <el-table-column label="操作" min-width="50" align="center" >
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
                 <el-dropdown trigger="click" @command="handleCommand">
@@ -891,6 +893,15 @@ export default {
     }
   },
   methods: {
+    reImplRequire(row, column, cellValue, index) {
+      let str = ''
+      this.attrTypeOptions.forEach((item, index) => {
+        if (item.value === cellValue) {
+          str = item.label
+        }
+      })
+      return str
+    },
     formatIssueDate(str) {
       const momentDate = this.$moment(str)
       if (momentDate.isValid()) {

From 0ab7ab5615e1e75b9ef9d122543259b78748018c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 11:16:40 +0800
Subject: [PATCH 12/51] =?UTF-8?q?52247=20=E6=A0=87=E5=87=86=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E7=AC=AC=E4=B8=80=E6=AD=A5=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=EF=BC=8C=E4=B9=9F=E4=BC=9A=E5=AD=98=E5=88=B0?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=EF=BC=8C=E5=BA=94=E8=AF=A5=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E5=AD=98=E5=88=B0=E8=8D=89=E7=A8=BF=EF=BC=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step1.vue         | 118 ++++++++++++------
 1 file changed, 81 insertions(+), 37 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index 68f3769c4..5238e9904 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -498,7 +498,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, taskDel } from "api/process";
+import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, saveTaskForPub, taskDel } from "api/process";
 
 export default {
   name: "bzpgStep1",
@@ -544,6 +544,7 @@ export default {
         standType: "",
         standNumber: ""
       },
+      taskIds: this.$route.query.taskIds,
       decomposeOptions: [], //分解单数据
       standardTypeOptions: [
         {
@@ -699,24 +700,45 @@ export default {
     getFormFieldList (item) {
       item.commentText = ''
       this.$nextTick(() => {
-        this.hisListForm =  JSON.parse(JSON.stringify(item))
-        this.listForm = JSON.parse(JSON.stringify(item))
-        this.listForm.prcNum = this.prcNum
-        this.listForm.prcName = this.prcName
-        this.listForm['id'] = item.id
-        this.listForm.dataList = item.dataList
-        this.dataList = item.dataList
-        this.roleForm.dockUser = item.dockUser
-        this.roleForm.dockUserName = item.dockUserName
-        this.roleForm.ministerUser = item.ministerUser
-        this.roleForm.ministerUserName = item.ministerUserName
-        this.submitFlag = '修改节点'
-        this.dataList.distributePerson = item.dataList[0].distributePerson
-        this.$http.get("SarStandItems/sar-stand-items/getFileType", {
-          standId: item.standId
-        }, {}, res => {
-          this.decomposeOptions = res.data;
-        });
+        if(item.form){
+          this.hisListForm = JSON.parse(JSON.stringify(item.form))
+          this.listForm = JSON.parse(JSON.stringify(item.form))
+          this.listForm.prcNum = this.prcNum
+          this.listForm.prcName = this.prcName
+          this.listForm['id'] = item.id
+          this.listForm.dataList = item.form.dataList
+          this.dataList = item.form.dataList
+          this.roleForm.dockUser = item.form.dockUser
+          this.roleForm.dockUserName = item.form.dockUserName
+          this.roleForm.ministerUser = item.form.ministerUser
+          this.roleForm.ministerUserName = item.form.ministerUserName
+          this.submitFlag = '修改节点'
+          this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+            standId: item.standId
+          }, {}, res => {
+            this.decomposeOptions = res.data;
+          });
+        }else{
+          this.hisListForm =  JSON.parse(JSON.stringify(item))
+          this.listForm = JSON.parse(JSON.stringify(item))
+          this.listForm.prcNum = this.prcNum
+          this.listForm.prcName = this.prcName
+          this.listForm['id'] = item.id
+          this.listForm.dataList =  item.dataList
+          this.dataList =  item.dataList
+          this.roleForm.dockUser =  item.dockUser
+          this.roleForm.dockUserName = item.dockUserName
+          this.roleForm.ministerUser =  item.ministerUser
+          this.roleForm.ministerUserName =  item.ministerUserName
+          this.submitFlag = '修改节点'
+          this.dataList.distributePerson =  this.listForm.dataList[0].distributePerson
+          this.$http.get("SarStandItems/sar-stand-items/getFileType", {
+            standId: item.standId
+          }, {}, res => {
+            this.decomposeOptions = res.data;
+          });
+        }
       })
     },
     //折叠/展开基础信息方法
@@ -871,24 +893,46 @@ export default {
     },
     //保存事件
     handleSave() {
-      this.saveLoading = true;
-      this.listForm.dataList = this.dataList
-      let _formData = new FormData();
-      _formData.append("createUser", this.$store.getters.userInfo.userId);
-      _formData.append("createUserName", this.$store.getters.userInfo.uName);
-      _formData.append("prcType", "5");
-      _formData.append("json", JSON.stringify({
-        taskInfo: "选择已拆分标准",
-        form: this.listForm,
-        roleForm: this.roleForm,
-        commentText: this.commentText
-      }));
-      saveTaskFirst(_formData).then(res => {
-        this.saveLoading = false;
-        this.$message.success("保存成功");
-      }).catch(e => {
-        this.saveLoading = false;
-      });
+      if(!this.submitFlag){
+        this.saveLoading = true;
+        this.listForm.dataList = this.dataList
+        let _formData = new FormData();
+        _formData.append("createUser", this.$store.getters.userInfo.userId);
+        _formData.append("createUserName", this.$store.getters.userInfo.uName);
+        _formData.append("prcType", "5");
+        _formData.append("json", JSON.stringify({
+          taskInfo: "选择已拆分标准",
+          form: this.listForm,
+          roleForm: this.roleForm,
+          commentText: this.commentText
+        }));
+        saveTaskFirst(_formData).then(res => {
+          this.saveLoading = false;
+          this.$message.success("保存成功");
+        }).catch(e => {
+          this.saveLoading = false;
+        });
+      }else{
+        this.saveLoading = true;
+        this.listForm.dataList = this.dataList
+        let _formData = new FormData();
+        _formData.append("id", this.bpnId || "");
+        _formData.append("taskIds", this.taskIds);
+        _formData.append("prcType", "5");
+        _formData.append("json", JSON.stringify({
+          taskInfo: "选择已拆分标准",
+          form: this.listForm,
+          roleForm: this.roleForm,
+          commentText: this.commentText
+        }));
+        saveTaskForPub(_formData).then(res => {
+          this.saveLoading = false;
+          this.$message.success("保存成功");
+          this.bpnId = res.result;
+        }).catch(e => {
+          this.saveLoading = false;
+        });
+      }
     },
 
     //提交事件

From b056dec4b2b6e6c5159a3684f3d73253bb8fd136 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 13:38:33 +0800
Subject: [PATCH 13/51] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bu?=
 =?UTF-8?q?ss1-3=20=E5=BC=BA=E5=88=B6=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/processList/tabComponents/taskDraft/index.vue     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index c8928404b..0d369eb39 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -285,7 +285,7 @@ export default {
           }
           break
         case 'buss1':
-          if(mes !== null && mes.taskInfo !== null) {
+          if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
             if (mes.taskInfo === '企标编写') {
               this.$router.push({
                 name: 'bussLibrary2',
@@ -469,7 +469,7 @@ export default {
           }
           break
         case 'buss2':
-          if(mes !== null && mes.taskInfo !== null) {
+          if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
             if (mes.taskInfo === '企标编写') {
               this.$router.push({
                 name: 'bussLibraryProduct2',
@@ -564,7 +564,7 @@ export default {
           }
           break
           case 'buss3':
-              if(mes !== null && mes.taskInfo !== null) {
+              if(mes !== null && mes.taskInfo !== null && mes.taskInfo !== undefined) {
                 if (mes.taskInfo === '起草'){
                       this.$router.push({
                           name: 'qbfsStep1',

From b9c52adbe064112534ac0208c4a9f4a546014d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 11:23:24 +0800
Subject: [PATCH 14/51] =?UTF-8?q?52250=20=E6=A0=87=E5=87=86=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E8=BF=98=E6=9C=89=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzpg/step2.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step3.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step4.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step5.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step6.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step7.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue | 3 +--
 src/pages/processCenter/pages/creatProcess/bzpg/step8.vue   | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
index e41f61e51..13f7997e1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
@@ -165,7 +165,6 @@
         <el-table-column
           prop="createTime"
           label="创建时间"
-          sortable="custom"
           align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index 9f23d54af..21fccdec3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -185,7 +185,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
index 4dcc3d587..494056ebd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
@@ -230,7 +230,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index 877f9745c..e784e848d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -376,7 +376,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
index a586db27c..21a4ba3fa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
@@ -307,7 +307,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
index 8cd22da6c..9c6958979 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
@@ -316,7 +316,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
index 492d531bb..3bcbecd94 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
@@ -316,8 +316,7 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
-            align="center">
+            align="center"
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
index 6b9af8609..2a2589286 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
@@ -316,7 +316,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>

From 4ad687f3033d5f43b629b71238ba4f1093dcae9f Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Wed, 30 Mar 2022 11:25:44 +0800
Subject: [PATCH 15/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052200=20=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95--=E8=BD=A6=E5=9E=8B=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E6=B8=85=E5=8D=95=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=80=E7=9B=B4=E8=BD=AC=E5=9C=88=EF=BC=8Cloading?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/details.vue              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index ddcd87b5e..1145a49cd 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -815,6 +815,7 @@ export default {
             });
             this.standinfoList = res.data.records;
             this.standardFormTotal = res.data.total;
+            this.total = res.data.total;
             this.standinfoList.forEach(item => {
               if (item.standYear === null) {
                 item.standNumber = item.standSortShow + " " + item.standNumber;

From 8fb3914badb4f862fcc91f039910f68e8fe508ae Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 14:05:42 +0800
Subject: [PATCH 16/51] feat: There is no way the, bug #52254

---
 .../pages/creatProcess/qbrk-product/step6.vue | 37 +++++--------------
 .../creatProcess/qbrk-product/stepC3.vue      | 37 +++++--------------
 2 files changed, 20 insertions(+), 54 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index 1a3fb9d7a..b5d824933 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -2761,33 +2761,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 02723b8d3..5b762faf7 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -2671,33 +2671,16 @@
                 }
             },
             processTable () {
-                this.$nextTick(() => {
-                    Promise.all([this.getTaskId()]).then((value) => {
-                        if(value[0] &&value.length > 0){
-                            let mes = JSON.parse(value[0].mes)
-                            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
-                            this.form = mes.form
-                            this.taskIds = mes.taskIds;
-                            this.pId = mes.pId;
-                            this.userId = mes.userId;
-                            this.prcNum = mes.prcNum;
-                            this.prcName = mes.prcName;
-                            this.roleForm = mes.roleForm
-                            this.commentText = mes.commentText
-                        }
-                        this.loading = true
-                        this.$http.get('lawss/activiti/get_list_by_instance', {
-                            prcNum: this.prcNum,
-                            sortWord: this.shunxu ? this.paixu : '',
-                            shunxu: this.shunxu
-                        }, {
-                            loading: 'loading',
-                            _this: this
-                        }, res => {
-                            this.detailData = res
-                            this.loading = false
-                        }, e => {})
-                    })
+                this.$http.get("lawss/activiti/get_list_by_instance", {
+                    prcNum: this.$route.query.prcNum,
+                    sortWord: this.shunxu ? this.paixu : "",
+                    shunxu: this.shunxu
+                }, {
+                    loading: "loading",
+                    _this: this
+                }, res => {
+                    this.detailData = res
+                }, e => {
                 })
             },
         },

From 48b41d47b89d2986a22dc350d4bb11e9040a982f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 13:38:50 +0800
Subject: [PATCH 17/51] =?UTF-8?q?52001=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B--=E4=BC=9A=E7=AD=BE=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=9C=88=E4=B8=BB=E7=9A=84=E5=AD=97=E6=AE=B5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=B2=A1=E5=9B=9E=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 7d81b9d0c..c8b3f398a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -1129,6 +1129,13 @@ export default {
     getFormFieldList (item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
+        let wssmrName = this.form.wssmrname
+        this.form.wssmr = wssmrName
+        this.form.sycpx = this.form.sycpx.split(',')
+        this.form.nylx = this.form.nylx.split(',')
+        this.form.cllx = this.form.cllx.split(',')
+        this.form.syrz = this.form.syrz.split(',')
+        this.form.syrz = this.form.syrz.split(',')
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]

From 25491bc3ddba9ca76d15c7b5ea462a581a4e9d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 13:52:54 +0800
Subject: [PATCH 18/51] =?UTF-8?q?52249=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=EF=BC=8C=E9=80=89=E6=8B=A9=E6=B5=B7?=
 =?UTF-8?q?=E5=A4=96=EF=BC=8C=E5=88=B0=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=88=E4=BD=8F=E7=9A=84=E7=9C=8B=E7=9C=8B=E8=BF=99?=
 =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E6=A1=86=E8=83=BD=E4=B8=8D=E8=83=BD=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzrk/step2.vue      | 9 ++++-----
 .../processCenter/pages/creatProcess/bzrk/step3.vue      | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index cedbb0aab..bcd2d3a5e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1170,11 +1170,10 @@ export default {
         this.form = JSON.parse(JSON.stringify(item))
         let wssmrName = this.form.wssmrname
         this.form.wssmr = wssmrName
-        this.form.sycpx = this.form.sycpx.split(',')
-        this.form.nylx = this.form.nylx.split(',')
-        this.form.cllx = this.form.cllx.split(',')
-        this.form.syrz = this.form.syrz.split(',')
-        this.form.syrz = this.form.syrz.split(',')
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index c8b3f398a..9b5301fa0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -1131,11 +1131,10 @@ export default {
         this.form = JSON.parse(JSON.stringify(item))
         let wssmrName = this.form.wssmrname
         this.form.wssmr = wssmrName
-        this.form.sycpx = this.form.sycpx.split(',')
-        this.form.nylx = this.form.nylx.split(',')
-        this.form.cllx = this.form.cllx.split(',')
-        this.form.syrz = this.form.syrz.split(',')
-        this.form.syrz = this.form.syrz.split(',')
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]

From ae05cfbc5baf273d7934aa771ae223de86fc8b28 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 14:50:58 +0800
Subject: [PATCH 19/51] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?=
 =?UTF-8?q?=E4=BC=81=E6=A0=87=20=E5=A4=8D=E5=AE=A1=20=E6=8A=80=E6=9C=AF=20?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=20=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=A0=87=E5=A4=B4=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/qbfs/step2.vue | 6 ------
 src/pages/processCenter/pages/creatProcess/qbfs/step3.vue | 6 ------
 src/pages/processCenter/pages/creatProcess/qbfs/step4.vue | 6 ------
 src/pages/processCenter/pages/creatProcess/qbfs/step5.vue | 6 ------
 .../processCenter/pages/creatProcess/qbfs/stepC4.vue      | 6 ------
 .../processCenter/pages/creatProcess/qbfs/stepDetail.vue  | 6 ------
 .../pages/creatProcess/qbrk-product/step10.vue            | 8 --------
 .../pages/creatProcess/qbrk-product/step11.vue            | 8 --------
 .../pages/creatProcess/qbrk-product/step12.vue            | 8 --------
 .../pages/creatProcess/qbrk-product/step13.vue            | 8 --------
 .../pages/creatProcess/qbrk-product/step2.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/step3.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/step4.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/step5.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/step6.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/step7.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/step8.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/step9.vue             | 8 --------
 .../pages/creatProcess/qbrk-product/stepC3.vue            | 8 --------
 .../pages/creatProcess/qbrk-product/stepC6.vue            | 8 --------
 .../pages/creatProcess/qbrk-product/stepDetail.vue        | 8 --------
 .../processCenter/pages/creatProcess/qbrk/step10.vue      | 8 --------
 .../processCenter/pages/creatProcess/qbrk/step11.vue      | 8 --------
 .../processCenter/pages/creatProcess/qbrk/step12.vue      | 8 --------
 .../processCenter/pages/creatProcess/qbrk/step13.vue      | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step2.vue | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step4.vue | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step7.vue | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step8.vue | 8 --------
 src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 8 --------
 .../processCenter/pages/creatProcess/qbrk/stepC1.vue      | 8 --------
 .../processCenter/pages/creatProcess/qbrk/stepC3.vue      | 8 --------
 .../processCenter/pages/creatProcess/qbrk/stepC6.vue      | 8 --------
 .../processCenter/pages/creatProcess/qbrk/stepDetail.vue  | 8 --------
 37 files changed, 284 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
index c7e9756de..799da19dc 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
@@ -63,11 +63,6 @@
         :no-data-text="listNoDataText"
         :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
       >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center">
-        </el-table-column>
         <el-table-column
           prop="name"
           label="任务步骤"
@@ -83,7 +78,6 @@
         <el-table-column
           prop="createTime"
           label="创建时间"
-          sortable="custom"
           align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
index c816cef11..b4a745973 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step3.vue
@@ -64,11 +64,6 @@
                   :no-data-text="listNoDataText"
                   :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
           >
-            <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center">
-            </el-table-column>
             <el-table-column
                     prop="name"
                     label="任务步骤"
@@ -84,7 +79,6 @@
             <el-table-column
                     prop="createTime"
                     label="创建时间"
-                    sortable="custom"
                     align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
index 35aad9e12..299341e8c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4.vue
@@ -64,11 +64,6 @@
                   :no-data-text="listNoDataText"
                   :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
           >
-            <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center">
-            </el-table-column>
             <el-table-column
                     prop="name"
                     label="任务步骤"
@@ -84,7 +79,6 @@
             <el-table-column
                     prop="createTime"
                     label="创建时间"
-                    sortable="custom"
                     align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
index 859c6b3b1..1b3b8b2e2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step5.vue
@@ -64,11 +64,6 @@
                   :no-data-text="listNoDataText"
                   :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
           >
-            <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center">
-            </el-table-column>
             <el-table-column
                     prop="name"
                     label="任务步骤"
@@ -84,7 +79,6 @@
             <el-table-column
                     prop="createTime"
                     label="创建时间"
-                    sortable="custom"
                     align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
index 6b62c940a..9bad3576c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue
@@ -64,11 +64,6 @@
                   :no-data-text="listNoDataText"
                   :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
           >
-            <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center">
-            </el-table-column>
             <el-table-column
                     prop="name"
                     label="任务步骤"
@@ -84,7 +79,6 @@
             <el-table-column
                     prop="createTime"
                     label="创建时间"
-                    sortable="custom"
                     align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
index 0a11023a5..21e7a5fdd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/stepDetail.vue
@@ -64,11 +64,6 @@
                   :no-data-text="listNoDataText"
                   :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
           >
-            <el-table-column
-                    type="selection"
-                    width="55"
-                    align="center">
-            </el-table-column>
             <el-table-column
                     prop="name"
                     label="任务步骤"
@@ -84,7 +79,6 @@
             <el-table-column
                     prop="createTime"
                     label="创建时间"
-                    sortable="custom"
                     align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
index c0d7b3e04..c408a7e5e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step10.vue
@@ -148,29 +148,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
index 185595fa5..6ef2c8614 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step11.vue
@@ -148,29 +148,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
index e375a3109..278e260dd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step12.vue
@@ -148,29 +148,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
index e4d33806d..150c5968a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
@@ -168,29 +168,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
index 428dce6f7..addb56e40 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step2.vue
@@ -154,29 +154,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
index 6962b987d..bb7342dab 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
@@ -210,29 +210,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
index d4edc2542..5c26a6b2c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step4.vue
@@ -146,29 +146,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 71e9e612e..3b23a1de3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -231,29 +231,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
index b5d824933..d3a0cc9ef 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
@@ -280,29 +280,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
index 5864c92f9..69efa7c82 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
@@ -149,29 +149,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
index d4d438762..45b9fcc4f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step8.vue
@@ -148,29 +148,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
index 315dcf9b8..e2068c02a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step9.vue
@@ -148,29 +148,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
index 5b762faf7..5c31f402a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
@@ -210,29 +210,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
index 43d15c740..b53ebcf1a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
@@ -280,29 +280,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
index ce27de3d9..8e6a363a2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepDetail.vue
@@ -156,29 +156,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
index c2d970186..3155026a0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -156,29 +156,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
index 6274dce34..19e59fe0e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -156,29 +156,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 434b9072f..8c3f53234 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -169,29 +169,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
index 726f25f02..1c8fd95ae 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
@@ -170,29 +170,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 3a4ed3fa7..b53741a05 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -279,29 +279,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 427cea527..584c4d8ed 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -214,29 +214,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
index 7f571ff8c..6e6c494bf 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
@@ -154,29 +154,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index b5e33cab5..9cbf2df55 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -405,29 +405,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 2b2ea174b..155fb28be 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -417,29 +417,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index b8a840de8..7a3188f63 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -253,29 +253,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index b5b2ba175..1891dd02a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -77,29 +77,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index 5660a4548..b00747f81 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -262,29 +262,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 6f5c7683d..607ad60f4 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -290,29 +290,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 1260873b8..bffd028d0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -214,29 +214,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 1d736acef..396320100 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -417,29 +417,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
index c1a2c0b5e..fece31eb3 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
@@ -155,29 +155,21 @@
                             :no-data-text="listNoDataText"
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                     >
-                        <el-table-column
-                                type="selection"
-                                width="55"
-                                align="center">
-                        </el-table-column>
                         <el-table-column
                                 prop="name"
                                 label="任务步骤"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="assignee"
                                 label="任务受理人"
                                 align="center"
-                                sortable="custom"
                         >
                         </el-table-column>
                         <el-table-column
                                 prop="createTime"
                                 label="创建时间"
-                                sortable="custom"
                                 align="center">
                             <template slot-scope="scope">
                                 <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>

From 635b924b632bffd0ba5c415a96563e0a7a57e6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 14:07:02 +0800
Subject: [PATCH 20/51] =?UTF-8?q?52259=20=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=EF=BC=9A=E6=B7=BB=E5=8A=A0=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=20=E5=A4=84=E7=90=86=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E5=BA=94=E8=AF=A5=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standardForComments/pags/consultationDetails.vue          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index bd79a4b7b..da7104696 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -326,7 +326,9 @@ export default {
           return '上报'
         } else if (row === '2') {
           return '处理后上报'
-        } else {
+        } else if (!row) {
+          return ''
+        }else {
           return '不上报'
         }
       },

From 837cd05c539348a9b5668e881d98e1906558be32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 14:26:29 +0800
Subject: [PATCH 21/51] =?UTF-8?q?52237=20=E6=B5=B7=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=EF=BC=9A=E6=96=87=E6=9C=AC=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=9A=84=E4=B8=8A=E4=B8=8B=E4=B8=89=E8=A7=92=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue                    | 1 -
 .../standardForComments/pags/consultationDetails.vue            | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index f18f1b4e4..4bb965d10 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -315,7 +315,6 @@
             </el-table-column>
             <el-table-column
               prop="textStatus"
-              sortable="custom"
               width="110"
               label="文本状态">
               <!--              <template slot="header" slot-scope="scope">-->
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index da7104696..2ff6db3ea 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -83,7 +83,7 @@
         添加
       </el-button>
       <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll" v-btn-permission="'5af38c3aaad325741045c4db44e6850e'">导出</el-button>
-      <el-button type="primary" class="common-button-primary" size="mini"  @click="exportAll1" v-btn-permission="'d5a02a1e7a5bf9047e81a35bdc8d3a40'">导出上报意见</el-button>
+      <el-button v-if="!ideaKey" type="primary" class="common-button-primary" size="mini"  @click="exportAll1" v-btn-permission="'d5a02a1e7a5bf9047e81a35bdc8d3a40'">导出上报意见</el-button>
     </div>
     <div class="container">
       <el-table

From f082647c4a65d13dd7166801dc586d4abf261aa7 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 16:19:44 +0800
Subject: [PATCH 22/51] feat: There is no way the, bug #52159

---
 .../pages/creatProcess/qbrk-product/step1.vue | 92 ++++++++++++-------
 1 file changed, 58 insertions(+), 34 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index 9a5529dc9..f50056387 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -118,7 +118,7 @@
 <!--                                    </el-button>-->
 <!--                                </el-form-item>-->
                                 <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standStatus" filterable clearable>
+                                    <el-select v-model="form.standStatus" title="选中不可修改" filterable clearable @change="getStandInfoByReviseStatus">
                                         <el-option
                                                 v-for="item in opinionsStand"
                                                 :key="item.value"
@@ -141,7 +141,7 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+                                <el-form-item v-show="verifySarStandard"label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
                                     <el-datePicker v-model="form.expirationDate"
                                                    placeholder="请选择截止日期"
                                                    :editable="false"
@@ -1501,17 +1501,10 @@
             }
         },
         watch:{
-            'form.standSort': {
-                handler (val) {
-                    if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus("")
-                    }
-                }
-            },
             'form.standStatus': {
                 handler (val) {
                     if (val !== '' && val !== null && typeof (val) !== 'undefined') {
-                        this.getStandInfoByReviseStatus("1")
+
                     }
                 }
             },
@@ -1567,19 +1560,44 @@
                 if(this.form.standStatus === '2'){
                     this.form.id = ""
                     this.form.standCode = ""
-                    this.FBGBUSSFileList = []
-                    this.LSBBBUSSFileList = []
+                    this.FBGBUSSFileList=[];
+                    this.BZSMBUSSFileList=[];
+                    this.LSBBBUSSFileList=[];
+                    this.QTWJBUSSFileList=[];
+                    this.GLWJBUSSFileList=[];
+                    this.XGDFileList=[];
+                    this.$refs['form'].resetFields()
+                    this.form.standStatus = '2'
                     if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
                         this.$message.warning("请选择一条被代替企标编号")
                         return
                     }
-                    if(this.form.BDTQBBHBUSS !== undefined && this.form.BDTQBBHBUSS !== null){
-                        this.form.standSn = this.form.standNum
-                        this.form.standNumber = this.form.standNum
-                        this.form.standYear = this.regDate(year)
-                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
-                    }
                 }else if(this.form.standStatus === '3' ){
+                    if(type !== 'dr'){
+                        this.FBGBUSSFileList=[];
+                        this.BZSMBUSSFileList=[];
+                        this.LSBBBUSSFileList=[];
+                        this.QTWJBUSSFileList=[];
+                        this.GLWJBUSSFileList=[];
+                        this.XGDFileList=[];
+                        this.$refs['form'].resetFields()
+                        this.form.standStatus = '3'
+                    }else {
+                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+                        this.LSBBBUSSFileList = []
+                        if(this.LSBBBUSSFileList && this.LSBBBUSSFileList.length > 0){
+                            this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
+                        }else {
+                            this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                        }
+                        this.form.LSBBBUSS = this.form.FBGBUSS
+                        this.form.LSBBBUSSName = this.form.FBGBUSSName
+                        this.FBGBUSSFileList= []
+                        this.FBGBUSS = ""
+                        this.FBGBUSSName = ""
+                    }
                     this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
                     this.form.LSBBBUSS = this.form.FBGBUSS
                     this.form.LSBBBUSSName = this.form.FBGBUSSName
@@ -1593,7 +1611,15 @@
                 }else if(this.form.standStatus === '1' ){
                     this.form.id = ""
                     this.form.standCode = ""
-                    if(type === '1'){
+                    this.FBGBUSSFileList=[];
+                    this.BZSMBUSSFileList=[];
+                    this.LSBBBUSSFileList=[];
+                    this.QTWJBUSSFileList=[];
+                    this.GLWJBUSSFileList=[];
+                    this.XGDFileList=[];
+                    this.$refs['form'].resetFields()
+                    this.form.standStatus = '1'
+                    if(this.form.standStatus === '1'){
                         this.isSubmit = true
                         this.saveLoading = true
                     }
@@ -1608,7 +1634,7 @@
                         this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
                         this.FBGBUSSFileList = []
                         this.LSBBBUSSFileList = []
-                        if(type === '1'){
+                        if(this.form.standStatus === '1'){
                             this.isSubmit = false
                             this.saveLoading = false
                         }
@@ -2046,20 +2072,7 @@
                               this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                               this.standardDrawer = false
                               this.verifySarStandard = true
-                              this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-                              this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-                              this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                              this.LSBBBUSSFileList = []
-                              if(this.LSBBBUSSFileList && this.LSBBBUSSFileList.length > 0){
-                                this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName))
-                              }else {
-                                this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-                              }
-                              this.form.LSBBBUSS = this.form.FBGBUSS
-                              this.form.LSBBBUSSName = this.form.FBGBUSSName
-                              this.FBGBUSSFileList= []
-                              this.FBGBUSS = ""
-                              this.FBGBUSSName = ""
+                              this.getStandInfoByReviseStatus('dr')
                               this.$forceUpdate()
                             }
                             // 遍历对象初始化文件信息
@@ -2485,6 +2498,12 @@
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
                     this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
                     this.form.standNum = this.filterSetData(textArr2.join(','))
+                    if(this.form.BDTQBBHBUSS !== undefined && this.form.BDTQBBHBUSS !== null){
+                        this.form.standSn = this.form.standNum
+                        this.form.standNumber = this.form.standNum
+                        this.form.standYear = this.regDate(year)
+                        this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
+                    }
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -2895,6 +2914,11 @@
                     this.$message.warning("请选择一条被代替企标编号")
                     return
                 }
+
+                if((this.form.standStatus === '3') && (this.standardCheckedList === undefined ||this.standardCheckedList.length === 0)) {
+                    this.$message.warning("请选择一条企标标准")
+                    return
+                }
                 // this.changeTree(this.form.modelData)
                 this.$refs['form'].validate((valid) => {
                     if (valid) {

From cf00a2e841d7fade690c8a78fbe70e8d25d3eb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 16:08:56 +0800
Subject: [PATCH 23/51] =?UTF-8?q?52238=20=E5=9B=BD=E5=86=85=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D=E7=9A=84?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=B8=8D=E7=AE=A1=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue                | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 413a7e62b..b411eff1b 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -833,6 +833,7 @@
                           <el-input
                             :config="field"
                             clearable
+                            @input="change($event)"
                             v-model="sarStandardsInfoEO['QCDW']"
                             :disabled="formdisableflag" placeholder="选择或输入起草单位">
                           </el-input>
@@ -841,6 +842,7 @@
                           <el-input
                             :config="field"
                             clearable
+                            @input="change($event)"
                             v-model="sarStandardsInfoEO['QCDW']"
                             :disabled="formdisableflag" placeholder="选择或输入起草单位">
                           </el-input>
@@ -2929,6 +2931,9 @@ export default {
     }
   },
   methods: {
+    change(e){
+      this.$forceUpdate();
+    },
     BZTXhandle () {
       this.modalShowFlag6 = true
     },

From 64b28f87ba76b26bfa75a9593d6d32698fead625 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 16:23:40 +0800
Subject: [PATCH 24/51] feat: There is no way the, bug #52252

---
 .../processCenter/pages/creatProcess/qbrk-product/step5.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 3b23a1de3..944a5e951 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -1483,7 +1483,7 @@
                             children:[],
                         };
                         this.form.modelData.push(list);
-                        this.$message.success("新增成功！")
+                        this.$message.success("新增成功")
                         this.showForm.modelNum = ""
                         this.showForm.modelUpdBefore = ""
                         this.showForm.modelUpdAfter = ""

From 07c01ec8a32addb8bb829c318f75150dbb9affbd Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 16:39:15 +0800
Subject: [PATCH 25/51] feat: There is no way the,

---
 src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 9cbf2df55..d8beb83fb 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -1648,7 +1648,7 @@
                             children:[],
                         };
                         this.form.modelData.push(list);
-                        this.$message.success("新增成功！")
+                        this.$message.success("新增成功")
                         this.showForm.modelNum = ""
                         this.showForm.modelUpdBefore = ""
                         this.showForm.modelUpdAfter = ""

From 188a090ce8f0e8e94e6ee45b9d21805b8d771c8d Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 16:50:29 +0800
Subject: [PATCH 26/51] feat: There is no way the, bug #52093

---
 .../components/EnterpriseStandardDatabase.vue                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d2276dc9a..d233a7d4d 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -3614,7 +3614,7 @@ export default {
           idList.push(b)
         })
         idList = idList.join(',')
-        this.nodeList2.push(idList)
+        this.nodeList2 = idList.split(',')
       }
       this.userType = type
       this.drawerTitle = title

From a539f202c7987925af043eece19a2590237c5a64 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 17:31:43 +0800
Subject: [PATCH 27/51] feat: There is no way the, bug #52209

---
 .../components/EnterpriseStandardDatabase.vue | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d233a7d4d..c8acc30be 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1289,6 +1289,7 @@
                 <!--            能源类型-->
                 <template>
                   <custom-select-array
+                    :key="arrKey"
                     :config="categoryOptions"
                     style="margin-left: -14px"
                     v-model="sarBussionessSearch['NYLXCLASS']"
@@ -1296,6 +1297,7 @@
                 </template>
                 <template>
                   <custom-select-array
+                          :key="arrKey2"
                     :config="sycpxOptions"
                     style="margin-left: -14px"
                     v-model="sarBussionessSearch['SYCPXCLASS']"
@@ -2329,6 +2331,8 @@ export default {
         attrName: '适用认证',
         options: []
       }, // 适用认证下拉框
+      arrKey:0,
+      arrKey2:1,
       categoryOptions: {
         attrName: '能源类型',
         options: []
@@ -2982,7 +2986,6 @@ export default {
     // 高级检索
     selectMoreBtn() {
       this.isAdvancedSearch = true
-      this.sarBussionessSearch = {}
       // this.isAdvancedSearch = true
       // this.threeOptions = []
     },
@@ -4303,6 +4306,23 @@ export default {
         this.sarBussionessSearch.citationUser = ''
         this.sarBussionessSearch.TXLBBUSS = ''
         this.sarBussionessSearch.VPPSBMBUSS = ''
+        this.sarBussionessSearch.NYLXCLASS = ''
+        this.sarBussionessSearch.SYCPXCLASS = ''
+        this.sarBussionessSearch.SYCXCLASS = ''
+        this.sarBussionessSearch.CYCVPPSBMBUSS = ''
+        this.sarBussionessSearch.CYCVPPSCNBUSS = ''
+        this.sarBussionessSearch.KCVPPSBMBUSS = ''
+        this.sarBussionessSearch.KCVPPSCNBUSS = ''
+        this.sarBussionessSearch.DYBXHBUSS = ''
+        this.sarBussionessSearch.DYMCBUSS = ''
+        this.sarBussionessSearch.CYCDYBXHBUSS = ''
+        this.sarBussionessSearch.CYCDYMCBUSS = ''
+        this.sarBussionessSearch.QCRBUSS = ''
+        this.sarBussionessSearch.QCDW = ''
+        this.sarBussionessSearch.FZRQBUSS = ''
+        this.sarBussionessSearch.FSRQBUSS = ''
+        this.sarBussionessSearch.DTQBBHBUSS = ''
+        this.sarBussionessSearch.BDTQBBHBUSS = ''
         this.sarBussionessSearch.advanceSearchVOStr = ''
         this.sarBussionessSearch.standEnName = ''
         this.isAdvancedSearch = false
@@ -4410,6 +4430,7 @@ export default {
           const formFieldList = this.formFieldListData
           formFieldList.forEach((item) => {
             const value = this.sarBussionessSearch[item.attrField]
+            console.log(value)
             // 时间格式处理
             if (value !== undefined && value !== null && value !== "" && item.attrField === 'BARQ') {
                 advanceSearchVOList.push({
@@ -4426,11 +4447,17 @@ export default {
                 value: (value ? value[0]+','+value[1] : "") || "",
               });
             }else if (value !== undefined && value !== null && value !== "") {
+            let val = ""
+              if(value instanceof Array){
+                val = value.join(",")
+              }else {
+                val = value
+              }
               advanceSearchVOList.push({
                 connect: "and",
                 field: item.attrField || "",
                 type: 'like',
-                value: value
+                value: val
               });
             }
           })
@@ -4447,6 +4474,9 @@ export default {
         formData.putTime = null;
         formData.issueTime = null;
       }
+      formData.NYLXCLASS = null;
+      formData.SYCPXCLASS = null;
+      formData.SYCXCLASS = null;
       this.SarExportSearchEo = formData
       formData.isKU = '1'
       this.isAdvancedSearch = false

From 3300aaf15c2ffb17b002440847cbe4e5f730cc45 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 17:40:37 +0800
Subject: [PATCH 28/51] feat: There is no way the, bug #52189

---
 .../components/EnterpriseStandardDatabase.vue                   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index c8acc30be..e82071769 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -2237,6 +2237,8 @@ export default {
         KCVPPSCNBUSS: '',
         CYCVPPSBMBUSS: '',
         CYCVPPSCNBUSS: '',
+        CYCDYBXHBUSS:'',
+        CYCDYMCBUSS:'',
         DYBXHBUSS: '',
         DYMCBUSS: '',
         VPPSBMBUSS: '',

From c06e5603dce26c2e270d2d3f7de70f6ecaf1d8a8 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 30 Mar 2022 21:20:29 +0800
Subject: [PATCH 29/51] feat: There is no way the, bug #52267

---
 src/pages/processCenter/pages/creatProcess/zcrk/step1.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 28e8d753a..6392a4bf7 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -84,7 +84,7 @@
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard" label="政策文号" prop="lawsNo" class="add-form-item form-item-disabled">
                                     <el-input
-                                            v-model.number="form.lawsNo"
+                                            v-model="form.lawsNo"
                                             placeholder="请输入政策文号"
                                             clearable
                                     ></el-input>
@@ -1260,7 +1260,7 @@
                         {validator: this.verify.valiateEnName, trigger: 'change'}
                     ],
                     lawsNo: [
-                        {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
+                        {required: true, message: '政策文号不能为空', trigger: 'change'},
                         {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
                     ],
                     issueCompany: [

From 586834bc22d6c893410a7702cf8e8264d6421fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 17:54:23 +0800
Subject: [PATCH 30/51] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 18 ++++---
 .../foreignStandardsAndRegulations/index.vue  | 50 ++++++++++++++++++-
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index b411eff1b..93ed74549 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4618,14 +4618,16 @@ export default {
           });
         }
       }
-      if(item.advanceSearchVOStr){
-        advanceSearchVOList.push({
-          connect: item.advanceSearchVOStr[0].connect,
-          field: item.advanceSearchVOStr[0].field,
-          type: item.advanceSearchVOStr[0].type,
-          value: item.advanceSearchVOStr[0].value,
-        })
-      }
+     if(item){
+       if(item.advanceSearchVOStr.length){
+         advanceSearchVOList.push({
+           connect: item.advanceSearchVOStr[0].connect,
+           field: item.advanceSearchVOStr[0].field,
+           type: item.advanceSearchVOStr[0].type,
+           value: item.advanceSearchVOStr[0].value,
+         })
+       }
+     }
       formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
       this.SarExportSearchEo = formData
       formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 4bb965d10..9c191d188 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -3150,6 +3150,43 @@ export default {
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
+      // // 自定义属性字段高级搜索处理
+      //advanceSearchVOStr
+      const advanceSearchVOList = [];
+      for (let key in this.advanceSearchMapping) {
+        const value = this.advanceSearchMapping[key];
+        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX && item.CLLX.length > 0))) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        } else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        } else if (value !== null && value !== '' && (key === 'BARQ')) {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'equals',
+            value: value
+          });
+        } else if (value !== null && value !== '') {
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'like',
+            value: value
+          });
+        }
+      }
+      item.advanceSearchVOStr = advanceSearchVOList
+      sessionStorage.setItem('tableFlag', JSON.stringify(item))
       item.page = 1
       this.standCommonlySearch.page = 1
       this.standCommonlySearch.sarStandardsSearch = JSON.stringify(item) || ''
@@ -3860,7 +3897,6 @@ export default {
      * 1、空：普通检索  2：高级检索
      * */
     getDomesticStandardTable(item) {
-
       // if (item === 2) {
       //   data.standSort = ''
       //   data.standNumber = ''
@@ -3939,7 +3975,17 @@ export default {
         }
 
       }
-      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
+      if(item){
+        if(item.advanceSearchVOStr.length){
+          advanceSearchVOList.push({
+            connect: item.advanceSearchVOStr[0].connect,
+            field: item.advanceSearchVOStr[0].field,
+            type: item.advanceSearchVOStr[0].type,
+            value: item.advanceSearchVOStr[0].value,
+          })
+        }
+      }
+      formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList)
       this.SarExportSearchEo = formData
       formData.startIssueTime = formData.issueTime ? formData.issueTime[0] : null
       formData.endIssueTime = formData.issueTime ? formData.issueTime[1] : null

From 523ef218f43c3b41aeb7248f7a20d58f7d84d6e7 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 09:59:28 +0800
Subject: [PATCH 31/51] feat: There is no way the, bug #51979

---
 .../otherBussStandardDetails/index.vue        | 192 +++++++++---------
 1 file changed, 99 insertions(+), 93 deletions(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 351ab4658..b32a2ccd1 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -27,7 +27,7 @@
                 <el-dialog title="企业标准评价" :visible.sync="businessCommentDialog" :width="(commentAverageScoreTag === '1' && commentActiveName !== 'dynamicComment')?'90%':'65%'" :close-on-click-modal="false">
                   <el-tabs v-model="commentActiveName" @tab-click="tabsClickBtn">
                     <el-tab-pane label="动态评价" name="dynamicComment">
-                      <el-table ref="businessCommentTable" :data="businessCommentTable.filter((v) => v.code !== '3U9lb')" border style="width: 100%; flex: auto;margin-bottom: 2%"
+                      <el-table ref="businessCommentTable" :data="businessCommentTable" border style="width: 100%; flex: auto;margin-bottom: 2%"
                                 class="comment-table"
                                 :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
                                    fontWeight: 'bold', height: '48px'}">
@@ -1630,90 +1630,90 @@ export default {
 
     },
     tabsClickBtn(tab, event){
-      if (this.commentActiveName === 'dynamicComment'){
-          this.indexType = 'dynamic'
-        //查询评分表
-        const allData = {
-          lawId: this.$route.params.id,
-          userId: this.qualityFirstHistoryPeopleId,
-          evaluationType: this.indexType,
-        }
-        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
-          _this: this
-        }, res => {
-          this.qualityHistoryCommentTable = res.data
-          this.historyInfoLoading = false
-
-        }, e => {
-          this.historyInfoLoading = false
-        })
-      }
-      else if (this.commentActiveName === 'historyComment'){
-        this.historyInfoLoading = true
-        this.indexType = 'quality'
-        //查询评分表
-        const allData = {
-          lawId: this.$route.params.id,
-          userId: this.dynamicFirstHistoryPeopleId,
-          evaluationType: this.indexType
-        }
-        this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
-          _this: this
-        }, res => {
-          this.dynamicHistoryCommentTable = res.data
-          this.historyCommentForm.revise = res.data[0].targetScore
-          this.historyCommentForm.reviseReason = res.data[0].commentReason
-
-          let averageScore = 0
-          res.data.forEach(item => {
-            if (item.valueType === 'number'){
-              averageScore += parseInt(item.targetScore)
-            }
-          })
-          averageScore = averageScore / 4
-          this.historyCommentForm.averageScore = averageScore
-          this.historyInfoLoading = false
-        }, e => {
-          this.historyInfoLoading = false
-        })
-      }
-
-      //查询动态评价总平均分和质量评价总平均分
-      let standId = this.$route.params.id
-      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
-        _this: this
-      }, res => {
-        this.qualityCommentScore = res.data.quality.toFixed(3)/2
-        this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
-
-      }, e => {
-      })
-
-      // 刷新质量评价评分人表格和动态评价评分人表格
-      const qualityRequest = {
-        lawId: standId,
-        evaluationType: 'quality'
-      }
-      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
-        _this: this
-      }, res => {
-        this.qualityHistoryPeopleTable = res.data.records
-        this.qualityFirstHistoryPeopleId = res.data.records[0].userId
-
-      }, e => {
-      })
-      const dynamicRequest = {
-        lawId: standId,
-        evaluationType: 'dynamic'
-      }
-      this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
-        _this: this
-      }, res => {
-        this.dynamicHistoryPeopleTable = res.data.records
-        this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
-
-      }, e => {
-      })
+      // if (this.commentActiveName === 'dynamicComment'){
+      //     this.indexType = 'dynamic'
+      //   //查询评分表
+      //   const allData = {
+      //     lawId: this.$route.params.id,
+      //     userId: this.qualityFirstHistoryPeopleId,
+      //     evaluationType: this.indexType,
+      //   }
+      //   this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+      //     _this: this
+      //   }, res => {
+      //     this.qualityHistoryCommentTable = res.data
+      //     this.historyInfoLoading = false
+      //
+      //   }, e => {
+      //     this.historyInfoLoading = false
+      //   })
+      // }
+      // else if (this.commentActiveName === 'historyComment'){
+      //   this.historyInfoLoading = true
+      //   this.indexType = 'quality'
+      //   //查询评分表
+      //   const allData = {
+      //     lawId: this.$route.params.id,
+      //     userId: this.dynamicFirstHistoryPeopleId,
+      //     evaluationType: this.indexType
+      //   }
+      //   this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
+      //     _this: this
+      //   }, res => {
+      //     this.dynamicHistoryCommentTable = res.data
+      //     this.historyCommentForm.revise = res.data[0].targetScore
+      //     this.historyCommentForm.reviseReason = res.data[0].commentReason
+      //
+      //     let averageScore = 0
+      //     res.data.forEach(item => {
+      //       if (item.valueType === 'number'){
+      //         averageScore += parseInt(item.targetScore)
+      //       }
+      //     })
+      //     averageScore = averageScore / 4
+      //     this.historyCommentForm.averageScore = averageScore
+      //     this.historyInfoLoading = false
+      //   }, e => {
+      //     this.historyInfoLoading = false
+      //   })
+      // }
+      //
+      // //查询动态评价总平均分和质量评价总平均分
+      // let standId = this.$route.params.id
+      // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getScore', {lawId:standId}, {
+      //   _this: this
+      // }, res => {
+      //   this.qualityCommentScore = res.data.quality.toFixed(3)/2
+      //   this.dynamicCommentScore = res.data.dynamic.toFixed(3)/2
+      //
+      // }, e => {
+      // })
+      //
+      // // 刷新质量评价评分人表格和动态评价评分人表格
+      // const qualityRequest = {
+      //   lawId: standId,
+      //   evaluationType: 'quality'
+      // }
+      // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', qualityRequest, {
+      //   _this: this
+      // }, res => {
+      //   this.qualityHistoryPeopleTable = res.data.records
+      //   this.qualityFirstHistoryPeopleId = res.data.records[0].userId
+      //
+      // }, e => {
+      // })
+      // const dynamicRequest = {
+      //   lawId: standId,
+      //   evaluationType: 'dynamic'
+      // }
+      // this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getHistory', dynamicRequest, {
+      //   _this: this
+      // }, res => {
+      //   this.dynamicHistoryPeopleTable = res.data.records
+      //   this.dynamicFirstHistoryPeopleId = res.data.records[0].userId
+      //
+      // }, e => {
+      // })
 
     },
     tabsClick(tab, event){
@@ -3029,14 +3029,18 @@ export default {
         this.$http.get('sarEnterpriseStandardEvaluation/quality-evaluation/getEvaluationForm', allData , {
           _this: this
         }, res => {
-          let averageScore = 0
-          res.data.forEach(item=>{
-            item.targetScore = Number(item.targetScore)/2
-            averageScore += item.targetScore
-          })
-          this.businessCommentForm.averageScore = averageScore/4
-          this.businessCommentTable = res.data
-          this.historyInfoLoading = false
+          if(res.data && res.data.length > 0){
+            let averageScore = 0
+            res.data.forEach(item=>{
+              item.targetScore = Number(item.targetScore)/2
+              averageScore += item.targetScore
+            })
+            this.businessCommentForm.averageScore = averageScore/4
+            console.log(res.data)
+            this.businessCommentTable = res.data
+            this.historyInfoLoading = false
+            this.$forceUpdate()
+          }
 
         }, e => {
           this.historyInfoLoading = false
@@ -3139,6 +3143,8 @@ export default {
       _this: this
     }, res => {
       this.businessCommentTable = res.data
+      console.log(this.businessCommentTable)
+      this.$forceUpdate()
     }, e => {
     })
     this.sarStandardsInfoEO.id = this.$route.params.id

From 5cf4915488a8610f0521b544d452ae65c14ff1c9 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 10:00:22 +0800
Subject: [PATCH 32/51] feat: There is no way the,

---
 src/pages/details/otherBussStandardDetails/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index b32a2ccd1..d5f3667c4 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -3036,7 +3036,6 @@ export default {
               averageScore += item.targetScore
             })
             this.businessCommentForm.averageScore = averageScore/4
-            console.log(res.data)
             this.businessCommentTable = res.data
             this.historyInfoLoading = false
             this.$forceUpdate()

From 070c4b2d81295b3884d218cba9e4c9859d7a6b3a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 10:10:03 +0800
Subject: [PATCH 33/51] feat: There is no way the, bug #52304

---
 .../processCenter/pages/creatProcess/qbrk-product/step1.vue  | 5 +++--
 src/pages/processCenter/pages/creatProcess/qbrk/step1.vue    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
index f50056387..fafd2a81e 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
@@ -1344,7 +1344,7 @@
                     XGLC: '',
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
-                    XCSJBUSS: '',
+                    XCSJBUSS: this.dateFormatter(),
                 }, // 标准信息
                 roleForm:{
                     bussUser3: this.$store.getters.userInfo.userId,
@@ -1933,6 +1933,7 @@
                       mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                       this.form = mes.form
                       this.form['id'] = mes.form.id
+                      this.form.XCSJBUSS = this.dateFormatter()
                       this.standardCheckedList = []
                       this.standardCheckedList.push({id:mes.form.id})
                       this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
@@ -2017,7 +2018,7 @@
                     XGLC: '',
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
-                    XCSJBUSS: '',
+                    XCSJBUSS: this.dateFormatter(),
                 } // 标准信息
             },
             filterObj(obj){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 22a8e062b..1d0598332 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -1409,7 +1409,7 @@
                     XGLC: '',
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
-                    XCSJBUSS: '',
+                    XCSJBUSS: this.dateFormatter(),
                     CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
@@ -1862,6 +1862,7 @@
                       let mes = JSON.parse(res.mes)
                       mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                       this.form = mes.form
+                      this.form.XCSJBUSS = this.dateFormatter()
                       this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                       this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                       this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -1936,7 +1937,7 @@
                     XGLC: '',
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
-                    XCSJBUSS: '',
+                    XCSJBUSS: this.dateFormatter(),
                 } // 标准信息
             },
             filterObj(obj){

From 74ec1141bf2281e392fbff9399b885660e7defff Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 10:24:47 +0800
Subject: [PATCH 34/51] feat: There is no way the, bug #52305 #52306

---
 .../pages/creatProcess/qbrk/step1.vue         | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index 1d0598332..fcdd60081 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -2555,22 +2555,29 @@
               //   this.fileList = fileList.splice(0, 1)
               // }
                 if (response.ok) {
-
+                 const fileObj = {}
+                 fileObj.id = file.response.data.id
+                 fileObj.name = file.response.data.name
                   switch (this.fileType){
                       case 'FBGBUSS':
-                        this.FBGBUSSFileList = fileList
+                        this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                        this.FBGBUSSFileList.push(fileObj)
                         break;
                       case 'BZSMBUSS' :
-                        this.BZSMBUSSFileList = fileList
+                        this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                        this.BZSMBUSSFileList.push(fileObj)
                         break;
                       case 'LSBBBUSS':
-                        this.LSBBBUSSFileList = fileList
+                        this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                        this.LSBBBUSSFileList.push(fileObj)
                         break;
                       case 'QTWJBUSS':
-                        this.QTWJBUSSFileList = fileList
+                        this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
+                        this.QTWJBUSSFileList.push(fileObj)
                         break;
                       case 'GLWJBUSS':
-                        this.GLWJBUSSFileList = fileList
+                        this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                        this.GLWJBUSSFileList.push(fileObj)
                         break;
                     default : ;
                   }
@@ -2803,19 +2810,19 @@
           fileInfoHandle(){
 
             //拼接文件名和id 提交到流程Activity
-            this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+            this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
             this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
-            this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+            this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
             this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
 
-            this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+            this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
             this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
 
-            this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+            this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
             this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
 
-            this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+            this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
             this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
           },

From 83c866646874ff9e4e5a2f91fe9c7ea927d3a07a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 10:32:40 +0800
Subject: [PATCH 35/51] feat: There is no way the, bug #52308

---
 src/pages/processCenter/pages/creatProcess/qbrk/step3.vue  | 2 +-
 src/pages/processCenter/pages/creatProcess/qbrk/step8.vue  | 2 +-
 src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 584c4d8ed..2185734a5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -1488,7 +1488,7 @@
                 this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                 this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                 this.roleForm = mesg.roleForm
-                this.commentText = mesg.commentText
+                this.formTongGuo.commentText = mesg.commentText
                 this.formKey++
             },
             // 将文本状态的id与name对应
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index 1891dd02a..d058dbc22 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -1320,7 +1320,7 @@
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
                         this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
+                        this.formTongGuo.commentText = mesg.commentText
                     })
                 }else {
                     this.form.XCSJBUSS = this.dateFormatter()
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 396320100..3116a33a0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -1835,7 +1835,7 @@
                 this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                 this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
                 this.roleForm = mesg.roleForm
-                this.commentText = mesg.commentText
+                this.formTongGuo.commentText = mesg.commentText
                 this.formKey++
             },
             // 将文本状态的id与name对应

From 253bbfa965ec150231c67a04b0c9b3e940ad8fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 31 Mar 2022 10:25:38 +0800
Subject: [PATCH 36/51] =?UTF-8?q?52232=20=E6=A0=87=E5=87=86=E5=BE=81?=
 =?UTF-8?q?=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=EF=BC=9A=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E5=8F=8D=E9=A6=88=E8=8A=82=E7=82=B9=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E5=8F=91=E4=B8=A4=E4=B8=AA=E4=BA=BA=20?=
 =?UTF-8?q?=E8=83=A1=E5=9B=BD=E9=94=90=E5=92=8C=E9=99=88=E6=98=A5=E6=A2=85?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=83=A1=E5=9B=BD=E9=94=90=E7=9A=84=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=B8=AD=E6=96=B0=E5=A2=9E=E6=84=8F=E8=A7=81=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E7=9A=84=E8=8A=82=E7=82=B9=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E4=BA=86=EF=BC=8C=E4=B9=9F=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=BB=99=E4=BB=BB=E4=BD=95=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index fcbc992ee..bcaf57f6f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -691,6 +691,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                      console.log(data);
                         let commitStatus = res.commitStatus
                         if(commitStatus && commitStatus > 0){
                             this.acceptShow = true
@@ -710,7 +711,7 @@
                         this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
                         this.standId = data.standId
                         this.getItemList(data.standId,data.textType)
-                        this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : []))
+                        this.data = data.form ? (data.form.data ? data.form.data : []) : (data.data ? data.data : (data.info ? data.info : []))
                     }).catch(e => {
                     })
                 })

From 4c33cb879304aeb94dc88ee101a6f098ccdf335c Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 11:26:30 +0800
Subject: [PATCH 37/51] feat: There is no way the, bug #52277

---
 .../pages/creatProcess/qbrk/common/formEditList.vue            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index 457a2d6b7..2c814c55c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -345,7 +345,6 @@
           <el-input
                   v-model="form.DTQBBHBUSS"
                   placeholder="请输入代替标准号"
-                  readonly="readonly"
                   clearable
           ></el-input>
           <el-button
@@ -360,7 +359,6 @@
           <el-input
                   v-model="form.CYBZ"
                   placeholder="请输入采用标准"
-                  readonly="readonly"
                   clearable
           ></el-input>
           <el-button
@@ -375,7 +373,6 @@
           <el-input
                   v-model="form.YYBZ"
                   placeholder="请输入引用标准"
-                  readonly="readonly"
                   clearable
           ></el-input>
           <el-button

From 58a0e7f9d611944f2cc71b23d412a1a17a345fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 31 Mar 2022 10:53:53 +0800
Subject: [PATCH 38/51] =?UTF-8?q?52307=20=E5=B1=9E=E6=80=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=94=B9=E4=B8=BA=E5=B1=9E=E6=80=A7=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=EF=BC=8C=E5=92=8C=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0=E4=B8=80=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 8378db301..132846a8d 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -316,11 +316,6 @@
             'icon-class': 'el-icon-s-operation',
             menuId: 'adff323',
             children: [
-              {
-                title: '属性管理',
-                path: '/standLawsAttrManage',
-                menuId: '72a24657972d286b8b5d80735cf4eee2'
-              },
               {
                 title: '操作日志',
                 path: '/OperationLog',
@@ -380,6 +375,11 @@
               //       path: '/DynamicInformations',
               //       menuId: '3C87BSHJUF'
               //     },
+              {
+                title: '属性字典',
+                path: '/standLawsAttrManage',
+                menuId: '72a24657972d286b8b5d80735cf4eee2'
+              },
               {
                 title: '属性配置',
                 path: '/attributeCustom',

From ae9454007a933609fa0d6c58b3e9a276c53eecca Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 11:40:23 +0800
Subject: [PATCH 39/51] feat: There is no way the, bug #52317

---
 .../pages/creatProcess/qbrk/step3.vue         | 29 +++++++++++++++++++
 .../pages/creatProcess/qbrk/stepC1.vue        |  3 --
 .../pages/creatProcess/qbrk/stepC3.vue        | 29 +++++++++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 2185734a5..e8f81f873 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -2727,6 +2727,35 @@
             // this.getTaskId()
             this.getData()
             this.processTable()
+            this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                _this: this
+            }, res => {
+                this.countryOptions = res.data.COUNTRY
+                this.applyCountryOptions = res.data.COUNTRY
+                this.regionOptions = res.data.REGION // 区域
+                this.standStateOptions = res.data.BUSSSTATE
+                this.energyKindOptions = res.data.ENERGYTYPES
+                this.standGeneraOptions = res.data.BUSSBIGCLASS
+                this.standSubclassOptions = res.data.BUSSFINECLASS
+                this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+                this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+                this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+                this.categoryOptions = res.data.NYLXCLASS // 能源类型
+                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+                this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.qcdwOptions = res.data.QCDW // 起草单位
+                this.qcrOptions = res.data.QCRBUSS // 起草人
+                this.nylxOptions = res.data.NYLXCLASS // 能源类型
+                this.syrzOptions = res.data.SYRZCLASS // 适用认证
+                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+                this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+            })
         }
 
     }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index 607ad60f4..daba0ee7c 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -2880,10 +2880,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
-                this.setMap(this.standStateOptions)
             })
-            this.busVsFunc()
-            this.modelFunc()
         }
 
     }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index bffd028d0..3e716dd4d 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -2728,6 +2728,35 @@
             // this.getTaskId()
             this.getData()
             this.processTable()
+            this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                _this: this
+            }, res => {
+                this.countryOptions = res.data.COUNTRY
+                this.applyCountryOptions = res.data.COUNTRY
+                this.regionOptions = res.data.REGION // 区域
+                this.standStateOptions = res.data.BUSSSTATE
+                this.energyKindOptions = res.data.ENERGYTYPES
+                this.standGeneraOptions = res.data.BUSSBIGCLASS
+                this.standSubclassOptions = res.data.BUSSFINECLASS
+                this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+                this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+                this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+                this.categoryOptions = res.data.NYLXCLASS // 能源类型
+                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+                this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                this.txlbOptions = res.data.TXLBCLASS // 体系类别
+                this.qcdwOptions = res.data.QCDW // 起草单位
+                this.qcrOptions = res.data.QCRBUSS // 起草人
+                this.nylxOptions = res.data.NYLXCLASS // 能源类型
+                this.syrzOptions = res.data.SYRZCLASS // 适用认证
+                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+                this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+            })
         }
 
     }

From 92db426786ba1bd2322d7de10127698ada50f1c1 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 11:41:36 +0800
Subject: [PATCH 40/51] feat: There is no way the,

---
 src/pages/processCenter/pages/creatProcess/qbrk/step1.vue  | 3 ---
 src/pages/processCenter/pages/creatProcess/qbrk/step6.vue  | 3 ---
 src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
index fcdd60081..927d8ad27 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
@@ -3039,10 +3039,7 @@
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
                 this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
-                this.setMap(this.standStateOptions)
             })
-            this.busVsFunc()
-            this.modelFunc()
         }
 
     }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index 155fb28be..2188cf658 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -3120,10 +3120,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
-                this.setMap(this.standStateOptions)
             })
-            this.busVsFunc()
-            this.modelFunc()
         }
 
     }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index 3116a33a0..28b07c9a5 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -3119,10 +3119,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
-                this.setMap(this.standStateOptions)
             })
-            this.busVsFunc()
-            this.modelFunc()
         }
 
     }

From 63125cbd762a7ea0f234386453cbed2230371e7f Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 13:50:14 +0800
Subject: [PATCH 41/51] feat: There is no way the, bug #52314

---
 .../creatProcess/qbrk/common/formEditList.vue |   4 +-
 .../pages/creatProcess/qbrk/stepC1.vue        | 162 +++++++++++++-----
 2 files changed, 121 insertions(+), 45 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index 2c814c55c..552f1d6e2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -270,8 +270,8 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPSVPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--乘用车VPPS编码" @click.native="choiceZRR2('car', '关联模块--乘用车VPPSVPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+        <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--乘用车VPPS编码" @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
         </el-form-item>
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
index daba0ee7c..c4f2c1f6b 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
@@ -164,6 +164,7 @@
                         @formChoiceZRR2 = "formChoiceZRR2"
                         @formChoiceZRR3 = "formChoiceZRR3"
                         @formChoiceZRR4 = "formChoiceZRR4"
+                        @formChoiceZRR5 = "formChoiceZRR5"
                 />
                 <div>
                     <el-collapse accordion v-model="activeName">
@@ -690,7 +691,7 @@
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+            :nodeKey="nodeKey" @popoverHide="popoverHide"  @popoverHideCancel="popoverHideCancel"></tree-select-new>
     <tree-select-new
             width = "500"
             :lazy=true
@@ -698,10 +699,50 @@
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     <loading :loading="dataLoading">正在加载数据</loading>
 </div>
 </template>
@@ -714,6 +755,7 @@
     import {saveTaskForPub,changeAssigneeNew,saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList,evaluationHisListRepSum,evaluationHisListRep} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -724,7 +766,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            TreeSelectModule
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -916,10 +959,12 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                modelType: '',
                 drawerModal: false,
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
@@ -930,6 +975,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -987,6 +1033,8 @@
                     CYCVPPSCNBUSS: '',
                     DYBXHBUSS: '',
                     DYMCBUSS: '',
+                    CYCDYBXHBUSS: '',
+                    CYCDYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -1404,6 +1452,9 @@
             formChoiceZRR4(type, title, id){
                 this.choiceZRR4(type, title, id)
             },
+            formChoiceZRR5(type, title, id){
+                this.choiceZRR5(type, title, id)
+            },
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
@@ -2023,9 +2074,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -2380,19 +2441,6 @@
                     default : ;
                 }
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if(checkedData.length > 0){
@@ -2408,53 +2456,81 @@
                 this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.cycvppsbm = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+                if (checkedData && checkedData.length !== 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                    } else {
+                        this.form.CYCVPPSBMBUSS = checkedData.code
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag2 = false
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
                 }
-
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.kccvppsbm = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                if (checkedData && checkedData.length !== 0) {
+                    if (checkedData.length > 0) {
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
+                    } else {
+                        this.form.KCVPPSBMBUSS = checkedData.code
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
-
+                }else {
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
-                    }else {
-                        this.form.dybxh = checkedData.model
-                        this.form.dymc = checkedData.name
+                if (checkedData && checkedData.length !== 0) {
+                    if (checkedData.length > 0) {
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                    this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
             popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length !== 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }else {
+                    this.form.CYCDYBXHBUSS = ''
+                    this.form.CYCDYMCBUSS = ''
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },

From 4932f7f5bda3a386b832936f295094de4730db35 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 14:06:49 +0800
Subject: [PATCH 42/51] feat: There is no way the, bug #52261

---
 src/pages/processCenter/pages/creatProcess/zcrk/step1.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
index 6392a4bf7..65862a3d8 100644
--- a/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
@@ -1316,7 +1316,7 @@
                     ]
                   ,
                     issueTime: [
-                        { required: true, message: '请选择标准发布日期', trigger: 'change' }
+                        { required: false, message: '请选择标准发布日期', trigger: 'change' }
                     ],
                     qcdw: [
                         { required: true, message: '请选择起草单位', validator: validateQcdw, trigger: 'change' }

From 532df619c4c8285deef7718cbc94cfa2e8970f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 31 Mar 2022 13:51:15 +0800
Subject: [PATCH 43/51] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 132846a8d..7be6eb11c 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -316,6 +316,16 @@
             'icon-class': 'el-icon-s-operation',
             menuId: 'adff323',
             children: [
+              {
+                title: '属性字典',
+                path: '/standLawsAttrManage',
+                menuId: '72a24657972d286b8b5d80735cf4eee2'
+              },
+              {
+                title: '属性配置',
+                path: '/attributeCustom',
+                menuId: '9cdb9b40157dd967b664b9af462b960b'
+              },
               {
                 title: '操作日志',
                 path: '/OperationLog',
@@ -375,16 +385,6 @@
               //       path: '/DynamicInformations',
               //       menuId: '3C87BSHJUF'
               //     },
-              {
-                title: '属性字典',
-                path: '/standLawsAttrManage',
-                menuId: '72a24657972d286b8b5d80735cf4eee2'
-              },
-              {
-                title: '属性配置',
-                path: '/attributeCustom',
-                menuId: '9cdb9b40157dd967b664b9af462b960b'
-              },
               //     // {
               //     //   title: '流程分类管理',
               //     //   path: '/processClassificationManage',

From de3e1dffbb45c03c8947403b7a51c2c9f2d272d4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 31 Mar 2022 14:55:47 +0800
Subject: [PATCH 44/51] feat: There is no way the, bug #52320

---
 .../pages/creatProcess/qbrk-product/step5.vue      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
index 944a5e951..5ee012749 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
@@ -854,7 +854,6 @@
                 GLWJBUSSFileList: [],
                 caFileList: [],
                 FBGBJBDFileList: [],
-                xgdFileList: [],
                 ZCWBLAWSFileList: [],
                 GCWBLAWSFileList: [],
                 JDWJLAWSFileList: [],
@@ -1700,9 +1699,10 @@
                 this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
                 this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
                 this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-                this.summaryList=this.assemble(mesg.summary,mesg.summaryName);
+                this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
                 this.roleForm = mesg.roleForm
                 this.formTongGuo.commentText = mesg.commentText
+                // this.summaryList=this.assemble(mesg.summary,mesg.summaryName);
             },
             // 将文本状态的id与name对应
             setMap(data){
@@ -2535,8 +2535,8 @@
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
 
-                this.summary=this.summaryList.map(item => item.id).join(",")
-                this.summaryName=this.summaryList.map(item => item.name).join(",")
+                // this.summary=this.summaryList.map(item => item.id).join(",")
+                // this.summaryName=this.summaryList.map(item => item.name).join(",")
 
                 this.saveLoading = true
                 let _formData = new FormData()
@@ -2674,8 +2674,8 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
 
-                                this.summary=this.summaryList.map(item => item.id).join(",")
-                                this.summaryName=this.summaryList.map(item => item.name).join(",")
+                                // this.summary=this.summaryList.map(item => item.id).join(",")
+                                // this.summaryName=this.summaryList.map(item => item.name).join(",")
 
                                 this.form.commentText = this.formTongGuo.commentText
                                 // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
@@ -2759,7 +2759,7 @@
                     this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
                     this.QTWJBUSSFileList=this.assemble(item.QTWJBUSS,item.QTWJBUSSName);
                     this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
-                    this.summaryList=this.assemble(item.summary,item.summaryName);
+                    // this.summaryList=this.assemble(item.summary,item.summaryName);
                     this.XGDFileList=this.assemble(item.XGD,item.XGDName);
                 })
             },

From 4481303453bca9fc758020174b08e2d41b4aff1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 31 Mar 2022 14:55:38 +0800
Subject: [PATCH 45/51] =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E4=BF=9D=E5=AD=98=E5=8F=8A?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E5=8A=9E=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/components/ProcessMixin.vue         |  8 ++--
 .../pages/creatProcess/zczqyj/step1.vue       | 48 +++++++++++--------
 .../tabComponents/taskDraft/index.vue         | 10 ++++
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue
index 8a5330dfe..4ca8a60fe 100644
--- a/src/pages/processCenter/pages/components/ProcessMixin.vue
+++ b/src/pages/processCenter/pages/components/ProcessMixin.vue
@@ -48,6 +48,10 @@ export default {
           label: "项目合规评估流程-项目",
           value: "6"
         },
+        {
+          label: "政策征求意见流程",
+          value: "laws2"
+        },
         {
           label: "未符合项整改流程",
           value: "8"
@@ -80,10 +84,6 @@ export default {
           label: "参与外部标准制修订信息提报流程",
           value: "14"
         },
-        {
-          label: "政策征求意见流程",
-          value: "laws2"
-        },
         {
           label: "重点认证标准/政策合规性项目审查流程",
           value: "laws3"
diff --git a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
index 7d74ea179..46d713d54 100644
--- a/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/zczqyj/step1.vue
@@ -183,10 +183,10 @@
         @submit="handleSubmit"
     >
     </ProcessFooter>
-    <!-- 选择标准的弹框 -->
+    <!-- 选择征求意见政策的弹框 -->
     <el-drawer
         ref="standard"
-        title="查询结果"
+        title="征求意见政策"
         size="1000px"
         :visible.sync="standardDrawer"
         direction="rtl"
@@ -328,7 +328,7 @@
 import ProcessHeader from "../../components/ProcessHeader";
 import ProcessFooter from "../../components/ProcessFooter";
 import ProcessTitle from "../../components/ProcessTitle";
-import {saveTaskFirst} from "api/process";
+import { queryTaskFirst, saveTaskFirst } from "api/process";
 
 export default {
   name: "zczqyjStep1",
@@ -339,6 +339,8 @@ export default {
   },
   data() {
     return {
+      bpnId: '',
+      standardCheckedList: [],
       tableHeight: {
         standardTableHeight: null
       },
@@ -443,12 +445,26 @@ export default {
       saveLoading: false,
     }
   },
+  mounted(){
+    this.bpnId = this.$route.query.bpnId
+    if(this.bpnId){
+      this.getData()
+    }
+  },
   methods: {
+    getData(){
+      queryTaskFirst({
+        bpnId: this.$route.query.bpnId
+      }).then(res => {
+        let mes = JSON.parse(res.mes);
+        this.form = mes.form
+        this.roleForm = mes.roleForm
+      });
+    },
     handleProcessStandardNext(status) {
       switch (status) {
           // 新增
         case 1:
-          this.selectedList = []
           this.standardCheckedList = []
           this.standardDrawer = false
           this.verifySarStandard = true
@@ -456,13 +472,16 @@ export default {
           break
           // 带入
         case 2:
-          if (this.standardCheckedList.length === 1) {
+          if(!this.standardCheckedList.length){
+            this.$message.warning('请至少选择一条政策信息进行带入')
+          }else if(this.standardCheckedList.length > 1){
+              this.$message.warning('您只能选择一条政策信息进行带入')
+          }else{
             this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
               _this: this
             }, res => {
               if (res && res.data) {
                 const bringData = res.data
-
                 const json = Object.assign(bringData, bringData.attrInfoMap);
                 this.form = JSON.parse(JSON.stringify(json))
                 this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : []
@@ -488,16 +507,10 @@ export default {
               }
               console.log("res", res);
             })
-
-          } else if (this.standardCheckedList.length > 1) {
-            this.$message.warning('最多可以带入一条政策信息')
-          } else {
-            this.$message.warning('请选择要带入的政策信息')
           }
           break
           // 取消
         case 3:
-          this.selectedList = []
           this.standardCheckedList = []
           this.standardDrawer = false
           break
@@ -523,10 +536,6 @@ export default {
       window.open(routeUrl.href, '_blank')
     },
     standSelectChange(data) {
-      this.selectedList = []
-      for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id)
-      }
       this.standardCheckedList = data
     },
     //清空搜索条件
@@ -611,20 +620,19 @@ export default {
     handleSave() {
       this.saveLoading = true;
       let _formData = new FormData();
-      _formData.append("id", this.bpnId || "");
+      this.form.commentText = this.commentText
+      this.form.filesId = this.addFjList
       _formData.append("createUser", this.$store.getters.userInfo.userId);
       _formData.append("createUserName", this.$store.getters.userInfo.userName);
       _formData.append("prcType", "12");
       _formData.append("json", JSON.stringify({
-        taskInfo: "人确认",
-        form: this.infoForm,
+        form: this.form,
         roleForm: this.roleForm,
         commentText: this.commentText
       }));
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false;
         this.$message.success("保存成功");
-        this.bpnId = res.result;
       }).catch(e => {
         this.saveLoading = false;
       });
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 0d369eb39..522e7161c 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -724,6 +724,16 @@ export default {
             }
           })
           break
+        case '12':
+          this.$router.push({
+            name: 'zczqyjStep1',
+            query: {
+              type: '12',
+              processName: '政策征求意见流程',
+              bpnId: id
+            }
+          })
+          break
         case '17':
           this.$router.push({
             name: 'zcrhStep1-1',

From c9e6b68f49dc330c803beee2b50ac4d9b5ebcea5 Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Mon, 20 Jun 2022 17:23:19 +0800
Subject: [PATCH 46/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055758=20=E3=80=90?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E3=80=91=E5=85=A8=E5=B1=80=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=88=B0=E7=9A=84=E6=95=B0=E6=8D=AE-=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=AF=A6=E6=83=85=E6=97=A0=E6=B3=95=E4=B8=8B?=
 =?UTF-8?q?=E6=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/phone/domesticDetails.vue | 7306 +++++++++++++--------------
 1 file changed, 3614 insertions(+), 3692 deletions(-)

diff --git a/src/pages/phone/domesticDetails.vue b/src/pages/phone/domesticDetails.vue
index be9822212..7be089241 100644
--- a/src/pages/phone/domesticDetails.vue
+++ b/src/pages/phone/domesticDetails.vue
@@ -1,6 +1,6 @@
 <!--国内标准法规详情页-->
 <template>
-  <div class="other-standard-details v-class" :style="'width:' + (500) + 'px;'+'height:' + (screenHeight) + 'px'">
+  <div class="other-standard-details v-class" :style="'height:' + (screenHeight) + 'px'">
     <!--title 标题-->
     <div class="details-header">
       <span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
@@ -14,16 +14,9 @@
     <div class="details-content" style="position: relative">
       <div class="details-content-modular basic-information">
       </div>
-      <div
-        class="details-content-modular clearfix"
-        v-for="(item, index) in dynamicFormField"
-        :key="index"
-        v-if="item.isShowImp === '0'"
-      >
+      <div class="details-content-modular clearfix" v-for="(item, index) in dynamicFormField" :key="index" v-if="item.isShowImp === '0'">
         <el-collapse v-model="activeNames" @change="handleChange">
-          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
-               style="border-top:none;position: absolute;right: 36px;">
-          </div>
+          <div v-if="item.label === '基础信息'" class="details-content-modular basic-information" style="border-top:none;position: absolute;right: 36px;"> </div>
           <el-collapse-item :name="item.label" @click.native="handleChange1(item.label)">
             <template slot="title">
               <div class="modular-header" v-if="item.label === '基础信息'">
@@ -58,25 +51,27 @@
                         <label style="float: left">{{ child.attrName }}</label>
                         <template v-if="child.value && child.value.length > 0">
                           <!--                          单个文件时-->
-                      <div style="position: relative;margin-left: 19em; line-height: 32px">
-                        <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
-                          <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
-                            <a style="font-size:0.2rem;color: #409EFF;cursor: pointer;display: inline-block"
-                               @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                               :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-                          </span>
-                          <!--                          多个文件时-->
-                          <div v-else-if="child.value && child.value.length > 0">
-                            <span style="display: flex; align-items: center;">
-                              <a style="ffont-size:0.2rem;color: #409EFF;cursor: pointer"
+                          <div style="position: relative;margin-left: 19em; line-height: 32px">
+                            <div v-for="(file, fileIndex) in child1Func(child.value)" style="display: flex;">
+                            <span v-if="child.value && child.value.length > 0 && child.value.length === 1" style="display: flex; align-items: center;">
+                              <a style="font-size:0.2rem;color: #409EFF;cursor: pointer;display: inline-block"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
+                              <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                             </span>
-                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                              <!--                          多个文件时-->
+                              <div v-else-if="child.value && child.value.length > 0">
+                              <span style="display: flex; align-items: center;">
+                                <a style="ffont-size:0.2rem;color: #409EFF;cursor: pointer"
+                                   @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                                   :title="file.oldFileName">{{ file.oldFileName | ellipsis50}}</a>
+                              </span>
+                                <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                              </div>
+                            </div>
                           </div>
-                        </div>
-                      </div>
+                        </template>
+                      </p>
                     </template>
                     <template v-else-if="child.value === null">-</template>
                     <!--修订本-->
@@ -104,12 +99,11 @@
                     <template v-for="(child, childIndex) in item.child4">
                       <p class="files-title">
                         <label style=" margin-right: 164px;">{{ child.attrName }}</label>
-                        <template v-if="child.value && child.value.length > 0"
-                                  v-for="(file, fileIndex) in child4Func(child.value)">
+                        <template v-if="child.value && child.value.length > 0" v-for="(file, fileIndex) in child4Func(child.value)">
                           <span>
-                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
-                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
-                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                            <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                               @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                               :title="file.oldFileName">{{ file.oldFileName }}</a>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
                           <el-button v-if="child.value && child.value.length > 1"
@@ -142,39 +136,25 @@
                         <template v-if="child.value === null">-</template>
                       </p>
                     </template>
-                    </p>
-
-
-
-
-
-
                     <p class="half">
-                      <label style=" margin-right: 150px;"
-                             title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                      >文本状态</label>
+                      <label style=" margin-right: 150px;" title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。">文本状态</label>
                       <span>{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                     </p>
-                    <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
-                        sarStandardsInfoEO.issueTime || '-'
-                      }}</span></p>
-                    <!--                      <p class="half" v-if="saveStandType === 'INLAND_STAND'"><label style=" margin-right: 150px;">标准性质</label><span>{{-->
-                    <!--                          standMap[sarStandardsInfoEO.standNature] || '-'-->
-                    <!--                        }}</span></p>-->
-                    <!--<p class="half" v-if="saveStandType === 'INLAND_STAND'"><label
-                      style=" margin-right: 150px;">标准体系</label><span>{{
-                        sarStandardsInfoEO.standSystem || '-'
-                      }}</span>
-                    </p>-->
-                    <p class="half"><label
-                      style=" margin-right: 150px;">标准体系</label><span>{{
-                        sarStandardsInfoEO.standSystem || '-'
-                      }}</span>
+                    <p class="half">
+                      <label style=" margin-right: 150px;">发布日期</label>
+                      <span>{{ sarStandardsInfoEO.issueTime || '-' }}</span>
                     </p>
                     <p class="half">
-                      <label style=" margin-right: 11em;">是否纳入认证清单</label><span>{{
-                        sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-'
-                      }}</span>
+                      <label style=" margin-right: 150px;">标准体系</label>
+                      <span>
+                        {{ sarStandardsInfoEO.standSystem || '-' }}
+                      </span>
+                    </p>
+                    <p class="half">
+                      <label style=" margin-right: 11em;">是否纳入认证清单</label>
+                      <span>
+                        {{ sarStandardsInfoEO.isRelateAccess ? (sarStandardsInfoEO.isRelateAccess === '1' ? '是' : '否') : '-' }}
+                      </span>
                     </p>
                     <template v-for="(child, childIndex) in item.child2">
                       <p class="half">
@@ -182,9 +162,8 @@
                         <span>{{ child.value || '-' }}</span>
                       </p>
                     </template>
-                    <!--          <p><label>文本说明：</label><span style="color: #999999">{{ sarStandardsInfoEO.synopsis || '-' }}</span></p>-->
-                    <!--          <p><label>重要度：</label><span>{{ sarStandardsInfoEO.isRelateAccess === '1' ? 'A' : 'B'}}</span></p>-->
-                    <!--          <p><label>纳入标准法规清单的国家/地区：</label><span>{{ sarStandardsInfoEO.accessCountry || '-' }}</span></p>-->
+                  </div>
+                </div>
               </template>
               <div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
                 <div class="wrap" @click="handleToggleShowAll(item)">
@@ -192,300 +171,245 @@
                   <img :class="{'is-show-all': item.showAll}" src="@/assets/images/shangqi/img/more.png">
                 </div>
               </div>
-            </div>
+              <template v-for="(child, childIndex) in item.half" v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'">
+                <!--     modular-item half       代替标准编号-->
+                <div :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'" v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' ">
+                  <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  <span class="modular-content-p-val" :title="child.value || '-'">
+      <div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0">
+        <!--相关流程-->
+        <template v-if="child.attrField === 'XGLC' && child.value">
+          <p class="modular-content-p-val">
+            <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" :title="item">{{ item }}</a>
+            </span>
+          </p>
+        </template>
+        <!--是否授权-->
+        <template v-else-if="child.attrField === 'QBSQ' && child.value">
+          <p class="modular-content-p-val">
+            <span v-if="child.value === '1'">
+              是
+            </span>
+            <span v-else>
+              否
+            </span>
+          </p>
+        </template>
+        <!--其他-->
+        <template v-else>
+          <span v-for="(item, index) in child.value.split(',')" :key="index">
+          <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+             class="span-line" :title="item">{{ item }}</a>
+        </span>
+        </template>
       </div>
-</template>
-<template
-  v-for="(child, childIndex) in item.half"
-  v-if="child.isShowImp === '0' && child.attrField !== 'CBCD'"
->
-  <!--     modular-item half       代替标准编号-->
-  <div
-    :key="child.id"
-    :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
-    v-if=" child.attrField === 'DTBJH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'XGLC' || child.attrField === 'BDTBZBH' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ' "
-  >
-    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-    <span
-      class="modular-content-p-val"
-      :title="child.value || '-'"
-    >
-                <div v-if="child.value != null && child.value !== '' && child.value.split(',').length > 0">
+      <div v-else>
+        {{ '-' }}
+      </div>
+    </span>
+                </div>
+                <!--            其他项-->
+                <div v-else :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
+                  <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  <span v-if="child.attrField === 'FGWHR'" class="modular-content-p-val clearfix" :title="child.value || '-'">
+      <template v-if="child.value">
+        {{ child.value }}
+        <put-question-button
+          style="float: right;"
+          :resId="sarStandardsInfoEO.id"
+          :resType="saveStandType"
+        ></put-question-button>
+      </template>
+      <template v-else>
+        {{ '-' }}
+      </template>
+    </span>
+                  <span v-else-if="child.attrType === 'DATE_PICKER'" class="modular-content-p-val">
+      {{ child.value ? child.value : '-' }}
+    </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 class="files-title" v-for="(file, fileIndex) in child.value" :key="fileIndex">
+                      <!--发布稿、增补件单独设置下载权限-->
+                      <template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
+                        <a :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">
+                          {{ file.oldFileName }}
+                        </a>
+                      </template>
+                      <template v-else>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
+                          {{file.oldFileName}}
+                        </a>
+                      </template>
+                    </p>
+                  </div>
+                </div>
+              </template>
+              <template v-for="(child, childIndex) in item.child" v-if="child.isShowImp === '0' && item.label === '关联信息'">
+                <div :key="child.id" :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'">
+                  <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
                   <!--相关流程-->
                   <template v-if="child.attrField === 'XGLC' && child.value">
                     <p class="modular-content-p-val">
-                      <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" :title="item">{{ item }}</a>
-                      </span>
+        <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" :title="item">{{ item }}</a>
+        </span>
                     </p>
                   </template>
-                  <!--是否授权-->
-                  <template v-else-if="child.attrField === 'QBSQ' && child.value">
+                  <template v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'">
+                    <p class="modular-content-p-val" v-if="child.value">
+        <span v-for="(item, index) in child.value.split(',')" :key="index">
+          <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+             class="span-line" :title="item">{{ item }}</a>
+        </span>
+                    </p>
+                    <span class="modular-content-p-val" v-else>-</span>
+                  </template>
+                  <span v-else-if="child.attrField === 'SVPPS'" class="modular-content-p-val" :title="child.tips || '-'">
+      {{ !child.value || child.value === 'null' ? '-' : child.value }}
+    </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 class="files-title" v-for="(file, fileIndex) in child.value" :key="fileIndex">
+                      <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
+                      <!--发布稿、增补件单独设置下载权限-->
+                      <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
+                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
+                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
+                          {{file.oldFileName}}
+                        </a>
+                      </template>
+                      <template v-else>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">
+                          {{file.oldFileName}}
+                        </a>
+                      </template>
+                    </p>
+                  </div>
+                </div>
+              </template>
+              <template v-for="(child, childIndex) in item.one" v-if="child.isShowImp === '0' && item.label == '过程稿件'">
+                <!--                增补件（必读）和勘误件不放在过程稿件里了-->
+                <div
+                  v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
+                  :key="child.id"
+                  :class="'modular-item half'"
+                >
+                  <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  <span
+                    v-if="child.attrType !== 'FILE'"
+                    class="modular-content-p-val"
+                    :title="child.value || '-'"
+                  >
+                {{ child.value || '-' }}
+              </span>
+                  <div v-else class="modular-content-p-flies">
+                    <p
+                      class="files-title"
+                      v-for="(file, fileIndex) in child.value"
+                      :key="fileIndex"
+                    >
+                      <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
+                      <!--发布稿、增补件单独设置下载权限-->
+                      <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
+                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
+                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
+                          file.oldFileName | ellipsis
+                          }}</a>
+                      </template>
+                      <template v-else>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
+                          file.oldFileName | ellipsis
+                          }}</a>
+                      </template>
+                    </p>
+                  </div>
+                </div>
+              </template>
+              <template
+                v-for="(child, childIndex) in item.one"
+                v-if="child.isShowImp === '0' && item.label !== '关联信息' && item.label !== '过程稿件' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
+              >
+                <div
+                  :key="child.id"
+                  :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
+                >
+                  <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
+                  <!--相关流程-->
+                  <template v-if="child.attrField === 'XGLC' && child.value">
                     <p class="modular-content-p-val">
-                      <span v-if="child.value === '1'">
-                        是
-                      </span>
-                      <span v-else>
-                        否
-                      </span>
-                    </p>
-                  </template>
-                  <!--其他-->
-                  <template v-else>
-                    <span v-for="(item, index) in child.value.split(',')" :key="index">
-                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                       class="span-line" :title="item">{{ item }}</a>
-                  </span>
-                  </template>
-                </div>
-                <div v-else>
-                  {{ '-' }}
-                </div>
-              </span>
-  </div>
-  <!--            其他项-->
-  <div
-    v-else
-    :key="child.id"
-    :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
-  >
-    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-    <span
-      v-if="child.attrField === 'FGWHR'"
-      class="modular-content-p-val clearfix"
-      :title="child.value || '-'"
-    >
-                <template v-if="child.value">
-                  {{ child.value }}
-                  <put-question-button
-                    style="float: right;"
-                    :resId="sarStandardsInfoEO.id"
-                    :resType="saveStandType"
-                  ></put-question-button>
-                </template>
-                <template v-else>
-                  {{ '-' }}
-                </template>
-              </span>
-    <span
-      v-else-if="child.attrType === 'DATE_PICKER'"
-      class="modular-content-p-val"
-    >
-                {{ child.value ? child.value : '-' }}
-              </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
-        class="files-title"
-        v-for="(file, fileIndex) in child.value"
-        :key="fileIndex"
-      >
-        <!--发布稿、增补件单独设置下载权限-->
-        <template v-if="child.attrField === 'FBGBJBD' || child.attrField === 'ZBJBD'">
-          <a :title="file.oldFileName" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{
-              file.oldFileName
-            }}</a>
-        </template>
-        <template v-else>
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-              file.oldFileName
-            }}</a>
-          <!--                        <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
-        </template>
-      </p>
-    </div>
-  </div>
-
-</template>
-<template
-  v-for="(child, childIndex) in item.child"
-  v-if="child.isShowImp === '0' && item.label === '关联信息'"
->
-  <div
-    :key="child.id"
-    :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
-  >
-    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-    <!--相关流程-->
-    <template v-if="child.attrField === 'XGLC' && child.value">
-      <p class="modular-content-p-val">
-                  <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" :title="item">{{ item }}</a>
-                  </span>
-      </p>
-    </template>
-    <template
-      v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZH' || child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
-    >
-      <p class="modular-content-p-val" v-if="child.value">
-                  <span v-for="(item, index) in child.value.split(',')" :key="index">
-                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                       class="span-line" :title="item">{{ item }}</a>
-                  </span>
-      </p>
-      <span class="modular-content-p-val" v-else>-</span>
-    </template>
-    <span
-      v-else-if="child.attrField === 'SVPPS'"
-      class="modular-content-p-val"
-      :title="child.tips || '-'"
-    >
-                {{ !child.value || child.value === 'null' ? '-' : child.value }}
-                  </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
-        class="files-title"
-        v-for="(file, fileIndex) in child.value"
-        :key="fileIndex"
-      >
-        <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
-        <!--发布稿、增补件单独设置下载权限-->
-        <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
-                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
-                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-              file.oldFileName
-            }}</a>
-        </template>
-        <template v-else>
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-              file.oldFileName
-            }}</a>
-        </template>
-      </p>
-    </div>
-  </div>
-</template>
-<template
-  v-for="(child, childIndex) in item.one"
-  v-if="child.isShowImp === '0' && item.label == '过程稿件'"
->
-  <!--                增补件（必读）和勘误件不放在过程稿件里了-->
-  <div
-    v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
-    :key="child.id"
-    :class="'modular-item half'"
-  >
-    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-    <span
-      v-if="child.attrType !== 'FILE'"
-      class="modular-content-p-val"
-      :title="child.value || '-'"
-    >
-                {{ child.value || '-' }}
-              </span>
-    <div v-else class="modular-content-p-flies">
-      <p
-        class="files-title"
-        v-for="(file, fileIndex) in child.value"
-        :key="fileIndex"
-      >
-        <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
-        <!--发布稿、增补件单独设置下载权限-->
-        <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
-                  || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
-                  || child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-              file.oldFileName | ellipsis
-            }}</a>
-        </template>
-        <template v-else>
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-              file.oldFileName | ellipsis
-            }}</a>
-        </template>
-      </p>
-    </div>
-  </div>
-</template>
-<template
-  v-for="(child, childIndex) in item.one"
-  v-if="child.isShowImp === '0' && item.label !== '关联信息' && item.label !== '过程稿件' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
->
-  <div
-    :key="child.id"
-    :class="item.label !== '过程稿件' ? 'modular-item half' : 'modular-item'"
-  >
-    <label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
-    <!--相关流程-->
-    <template v-if="child.attrField === 'XGLC' && child.value">
-      <p class="modular-content-p-val">
                   <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" :title="item">{{ item }}</a>
                 </span>
-      </p>
-    </template>
-    <template
-      v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
-    >
-      <p class="modular-content-p-val" v-if="child.value">
+                    </p>
+                  </template>
+                  <template
+                    v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ' || child.attrField === 'BBFDTBZ'"
+                  >
+                    <p class="modular-content-p-val" v-if="child.value">
                   <span v-for="(item, index) in child.value.split(',')" :key="index">
                     <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
                        class="span-line" :title="item">{{ item }}</a>
                   </span>
-      </p>
-      <span class="modular-content-p-val" v-else>-</span>
-    </template>
-    <span
-      v-else-if="child.attrField === 'SVPPS'"
-      class="modular-content-p-val"
-      :title="child.tips || '-'"
-    >
+                    </p>
+                    <span class="modular-content-p-val" v-else>-</span>
+                  </template>
+                  <span
+                    v-else-if="child.attrField === 'SVPPS'"
+                    class="modular-content-p-val"
+                    :title="child.tips || '-'"
+                  >
                 {{ !child.value || child.value === 'null' ? '-' : child.value }}
               </span>
-    <span
-      v-else-if="child.attrType !== 'FILE'"
-      class="modular-content-p-val"
-      :title="child.value || '-'"
-    >
+                  <span
+                    v-else-if="child.attrType !== 'FILE'"
+                    class="modular-content-p-val"
+                    :title="child.value || '-'"
+                  >
                 {{ !child.value || child.value === 'null' || child.value === '[]' ? '-' : child.value }}
               </span>
-    <div v-else class="modular-content-p-flies">
-      <p
-        class="files-title"
-        v-for="(file, fileIndex) in child.value"
-        :key="fileIndex"
-      >
-        <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
-        <!--发布稿、增补件单独设置下载权限-->
-        <template v-if="child.attrField === 'GLWJ'">
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-              file.oldFileName
-            }}</a>
-        </template>
-        <template v-else>
-          <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
-              file.oldFileName
-            }}</a>
-        </template>
-      </p>
-
+                  <div v-else class="modular-content-p-flies">
+                    <p
+                      class="files-title"
+                      v-for="(file, fileIndex) in child.value"
+                      :key="fileIndex"
+                    >
+                      <!--                  <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
+                      <!--发布稿、增补件单独设置下载权限-->
+                      <template v-if="child.attrField === 'GLWJ'">
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
+                          file.oldFileName
+                          }}</a>
+                      </template>
+                      <template v-else>
+                        <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank" :title="file.oldFileName">{{
+                          file.oldFileName
+                          }}</a>
+                      </template>
+                    </p>
+                  
+                  </div>
+                </div>
+              
+              </template>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
   </div>
-
 </template>
-</div>
-</el-collapse-item>
-</el-collapse>
-</div>
-</div>
 <!--查看分解单-->
 <el-drawer
   title="查看分解单"
@@ -495,232 +419,232 @@
   class="not-footer-drawer"
   @close="closeDrawer"
 >
-<div class="search-area">
-  <div class="left">
-    <el-form inline :model="standardForm" ref="ruleForm" class="label-input-form">
-      <el-form-item class="search-item">
-        <el-input size="small" v-model="standItemSearch.orgName" v-show="false" style="height: 32px"/>
-        <el-input size="small" v-model="standItemSearch.responsibleUnit" v-show="false" style="height: 32px"/>
-        <el-popover
-          placement="bottom"
-          popper-class="user-dept-popper"
-          trigger="click"
-          :value="false"
-        >
-        </el-popover>
-      </el-form-item>
-
-
-      <el-form-item class="search-item">
-        <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable
-                  maxlength="100"></el-input>
-      </el-form-item>
-      <!--            新车实施日期-->
-      <el-form-item class="search-item">
-        <div class="block">
-          <el-date-picker
-            v-model="standItemSearch.XCXSSRQ"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="新车实施日期">
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <!--            //在产车实施日期-->
-      <el-form-item class="search-item">
-        <div class="block">
-          <el-date-picker
-            v-model="standItemSearch.ZCCSSRQ"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="在产车实施日期">
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <el-form-item class="search-item btn-box">
-        <el-button
-          :loading="searching"
-          type="primary"
-          size="mini"
-          class="common-button-primary"
-          @click="searchSarStandItems">
-          查询
-        </el-button>
-      </el-form-item>
-      <el-form-item class="search-item btn-box">
-        <el-button
-          class="common-button-default"
-          @click="clearAllSearch"
-          size="mini">
-          清空
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</div>
-<div class="action-bar">
-  <el-button class="common-button-default export-button" icon="export" size="mini"
-             @click="exportStandardItem"
-             v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
-    导出
-  </el-button>
-  <el-button
-    size="mini"
-    type="primary"
-    class="common-button-primary"
-    @click="openRelatedTermsDrawer"
-    v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
-  >关联条款
-  </el-button>
-  <el-button
-    size="mini"
-    type="primary"
-    class="common-button-primary"
-    @click="editResolveList"
-  >编辑
-  </el-button>
-</div>
-<div class="content">
-  <el-table
-    @sort-change='sort'
-    ref="multipleTable"
-    :data="standItemList"
-    tooltip-effect="dark"
-    border
-    style="width: 100%"
-    :height="tableHeight"
-    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-       fontWeight: 'bold', height: '48px'}"
-    @selection-change="selectAllStand">
-    <el-table-column
-      type="selection"
-      fixed="left"
-      width="60"
-    >
-    </el-table-column>
-    <el-table-column
-      sortable="custom"
-      show-overflow-tooltip
-      prop="itemsNum"
-      width="90"
-      label="条款号"
-    >
-    </el-table-column>
-    <el-table-column
-      show-overflow-tooltip
-      prop="itemsName"
-      min-width="300"
-      label="条款名称"
-    >
-    </el-table-column>
-    <el-table-column
-      prop="termsConditions"
-      min-width="200"
-      label="条款内容"
-      :resizable="false"
-    >
-      <template slot-scope="scope">
-        <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
-        <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
-        <!--              </div>-->
-        <el-tooltip placement="top">
-          <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>
-          <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
-            {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
+  <div class="search-area">
+    <div class="left">
+      <el-form inline :model="standardForm" ref="ruleForm" class="label-input-form">
+        <el-form-item class="search-item">
+          <el-input size="small" v-model="standItemSearch.orgName" v-show="false" style="height: 32px"/>
+          <el-input size="small" v-model="standItemSearch.responsibleUnit" v-show="false" style="height: 32px"/>
+          <el-popover
+            placement="bottom"
+            popper-class="user-dept-popper"
+            trigger="click"
+            :value="false"
+          >
+          </el-popover>
+        </el-form-item>
+        
+        
+        <el-form-item class="search-item">
+          <el-input v-model="standItemSearch.itemsName" size="small" placeholder="根据条款名称查找" clearable
+                    maxlength="100"></el-input>
+        </el-form-item>
+        <!--            新车实施日期-->
+        <el-form-item class="search-item">
+          <div class="block">
+            <el-date-picker
+              v-model="standItemSearch.XCXSSRQ"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="新车实施日期">
+            </el-date-picker>
           </div>
-        </el-tooltip>
-      </template>
-    </el-table-column>
-    <el-table-column
-      prop="readContent"
-      width="170"
-      label="核心技术要求/变化点"
-      show-overflow-tooltip
-    >
-    </el-table-column>
-    <el-table-column
-      show-overflow-tooltip
-      prop="comparedWithPrevious"
-      label="基于上一版本差异"
-      width="170">
-    </el-table-column>
-    <el-table-column
-      prop="xccssrq"
-      label="新车型实施日期(文本)"
-      width="180">
-    </el-table-column>
-    <el-table-column
-      prop="zccssrq"
-      label="在产车实施日期(文本)"
-      width="170">
-    </el-table-column>
-    <el-table-column
-      show-overflow-tooltip
-      prop="applyArctic"
-      label="适用车型"
-      width="90"
-    >
-    </el-table-column>
-    <!--          <el-table-column-->
-    <!--              prop="responsibleUnit"-->
-    <!--              label="责任部门">-->
-    <!--          </el-table-column>-->
-    <el-table-column
-      prop="dutyEngineer"
-      label="责任工程师"
-      width="100">
-    </el-table-column>
-    <el-table-column
-      show-overflow-tooltip
-      label="符合性状态"
-      width="100">
-      <template slot-scope="scope">
-        {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}
-      </template>
-    </el-table-column>
-    <el-table-column
-      show-overflow-tooltip
-      prop="complianceState"
-      label="合规性分析"
-      width="100">
-    </el-table-column>
-    <el-table-column label="操作" align="center" width="50" fixed="right">
-      <template slot-scope="scope">
-        <div @click.stop>
-          <el-dropdown trigger="click" @command="handleCommand">
-            <i class="iconfont">&#xe61e;</i>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '查看']">查看
-              </el-dropdown-item>
-              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
-              <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
-      </template>
-    </el-table-column>
-  </el-table>
-  <loading :loading="tableLoading">数据加载中...</loading>
-</div>
-<pagination
-  :page="page7"
-  :total="total7"
-  @pageChange="pageChange7"
-  @pageSizeChange="pageSizeChange7"></pagination>
-
-
-<!--      <el-pagination-->
-<!--          @size-change="pageSizeChange"-->
-<!--          @current-change="pageChange"-->
-<!--          :current-page="1"-->
-<!--          :page-sizes="[10, 20, 30, 50]"-->
-<!--          :page-size="100"-->
-<!--          layout="sizes, prev, pager, next, jumper"-->
-<!--          :total="standitemTotal">-->
-<!--      </el-pagination>-->
-
-<!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
-<!--                  @pageSizeChange="pageSizeChange"></pagination>-->
+        </el-form-item>
+        <!--            //在产车实施日期-->
+        <el-form-item class="search-item">
+          <div class="block">
+            <el-date-picker
+              v-model="standItemSearch.ZCCSSRQ"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="在产车实施日期">
+            </el-date-picker>
+          </div>
+        </el-form-item>
+        <el-form-item class="search-item btn-box">
+          <el-button
+            :loading="searching"
+            type="primary"
+            size="mini"
+            class="common-button-primary"
+            @click="searchSarStandItems">
+            查询
+          </el-button>
+        </el-form-item>
+        <el-form-item class="search-item btn-box">
+          <el-button
+            class="common-button-default"
+            @click="clearAllSearch"
+            size="mini">
+            清空
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+  <div class="action-bar">
+    <el-button class="common-button-default export-button" icon="export" size="mini"
+               @click="exportStandardItem"
+               v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '52HT9PLW49G6ZWS9RZSC' : '9CLEQQBS75SYV8JQQYFB'">
+      导出
+    </el-button>
+    <el-button
+      size="mini"
+      type="primary"
+      class="common-button-primary"
+      @click="openRelatedTermsDrawer"
+      v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+    >关联条款
+    </el-button>
+    <el-button
+      size="mini"
+      type="primary"
+      class="common-button-primary"
+      @click="editResolveList"
+    >编辑
+    </el-button>
+  </div>
+  <div class="content">
+    <el-table
+      @sort-change='sort'
+      ref="multipleTable"
+      :data="standItemList"
+      tooltip-effect="dark"
+      border
+      style="width: 100%"
+      :height="tableHeight"
+      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+       fontWeight: 'bold', height: '48px'}"
+      @selection-change="selectAllStand">
+      <el-table-column
+        type="selection"
+        fixed="left"
+        width="60"
+      >
+      </el-table-column>
+      <el-table-column
+        sortable="custom"
+        show-overflow-tooltip
+        prop="itemsNum"
+        width="90"
+        label="条款号"
+      >
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="itemsName"
+        min-width="300"
+        label="条款名称"
+      >
+      </el-table-column>
+      <el-table-column
+        prop="termsConditions"
+        min-width="200"
+        label="条款内容"
+        :resizable="false"
+      >
+        <template slot-scope="scope">
+          <!--              <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">-->
+          <!--                {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}-->
+          <!--              </div>-->
+          <el-tooltip placement="top">
+            <div slot="content" v-html="scope.row.termsConditions" :disabled="scope.row.termsConditions"></div>
+            <div class="table-jump" style=" overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">
+              {{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}
+            </div>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="readContent"
+        width="170"
+        label="核心技术要求/变化点"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="comparedWithPrevious"
+        label="基于上一版本差异"
+        width="170">
+      </el-table-column>
+      <el-table-column
+        prop="xccssrq"
+        label="新车型实施日期(文本)"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="zccssrq"
+        label="在产车实施日期(文本)"
+        width="170">
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="applyArctic"
+        label="适用车型"
+        width="90"
+      >
+      </el-table-column>
+      <!--          <el-table-column-->
+      <!--              prop="responsibleUnit"-->
+      <!--              label="责任部门">-->
+      <!--          </el-table-column>-->
+      <el-table-column
+        prop="dutyEngineer"
+        label="责任工程师"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        label="符合性状态"
+        width="100">
+        <template slot-scope="scope">
+          {{ scope.row.complianceRequire ? (scope.row.complianceRequire === '1' ? '是' : '否') : '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="complianceState"
+        label="合规性分析"
+        width="100">
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="50" fixed="right">
+        <template slot-scope="scope">
+          <div @click.stop>
+            <el-dropdown trigger="click" @command="handleCommand">
+              <i class="iconfont">&#xe61e;</i>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '查看']">查看
+                </el-dropdown-item>
+                <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>-->
+                <!--<el-dropdown-item :disabled="scope.row.enable==='0'" :command="[scope.row, '删除']">删除</el-dropdown-item>-->
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <loading :loading="tableLoading">数据加载中...</loading>
+  </div>
+  <pagination
+    :page="page7"
+    :total="total7"
+    @pageChange="pageChange7"
+    @pageSizeChange="pageSizeChange7"></pagination>
+  
+  
+  <!--      <el-pagination-->
+  <!--          @size-change="pageSizeChange"-->
+  <!--          @current-change="pageChange"-->
+  <!--          :current-page="1"-->
+  <!--          :page-sizes="[10, 20, 30, 50]"-->
+  <!--          :page-size="100"-->
+  <!--          layout="sizes, prev, pager, next, jumper"-->
+  <!--          :total="standitemTotal">-->
+  <!--      </el-pagination>-->
+  
+  <!--        <pagination :total="standitemTotal" @pageChange="pageChange"-->
+  <!--                  @pageSizeChange="pageSizeChange"></pagination>-->
 
 </el-drawer>
 <!--    编辑分解单的条款-->
@@ -732,173 +656,173 @@
   size="800px"
   :wrapperClosable="false"
 >
-<el-form :model="resolveListForm" ref="resolveListForm">
-  <el-input
-    v-show="false"
-    v-model="resolveListForm.id"
-  />
-  <el-form-item
-    label="条款号"
-    class="add-form-item"
-  >
+  <el-form :model="resolveListForm" ref="resolveListForm">
     <el-input
-      style="width: 45%"
-      v-model="resolveListForm.itemsNum"
-      disabled
+      v-show="false"
+      v-model="resolveListForm.id"
     />
-  </el-form-item>
-  <el-form-item
-    label="条款名称"
-    class="add-form-item"
-  >
-    <el-input
-      style="width: 45%"
-      v-model="resolveListForm.itemsName"
-      disabled
-    />
-  </el-form-item>
-  <el-form-item
-    label="条款内容"
-    class="add-form-item"
-  >
-    <el-input
-      style="width: 45%"
-      v-model="resolveListForm.termsConditions"
-      disabled
-    />
-  </el-form-item>
-  <el-form-item
-    label="核心技术要求/变化点"
-    class="add-form-item"
-  >
-    <el-input
-      style="width: 45%"
-      v-model="resolveListForm.readContent"
-      clearable
-    />
-  </el-form-item>
-  <el-form-item
-    label="基于上一版本差异"
-    class="add-form-item"
-  >
-    <el-input
-      style="width: 45%"
-      v-model="resolveListForm.comparedWithPrevious"
-      clearable
-    />
-  </el-form-item>
-  <el-form-item
-    label="新车型实施日期(文本)"
-    class="add-form-item"
-  >
-    <el-date-picker
-      type="dates"
-      value-format="yyyy-MM-dd"
-      style="width: 45%"
-      prefix-icon="none"
-      v-model="resolveListForm.xccssrq"
-      placeholder="请选择新车型实施日期">
-    </el-date-picker>
-    <!--          <el-input-->
-    <!--              style="width: 45%"-->
-    <!--              v-model.trim="resolveListForm.xccssrq"-->
-    <!--              clearable-->
-    <!--          />-->
-  </el-form-item>
-  <el-form-item
-    label="在产车实施日期(文本)"
-    class="add-form-item"
-  >
-    <el-date-picker
-      type="dates"
-      value-format="yyyy-MM-dd"
-      prefix-icon="none"
-      style="width: 45%"
-      v-model="resolveListForm.zccssrq"
-      placeholder="请选择在产车实施日期">
-    </el-date-picker>
-    <!--          <el-input-->
-    <!--              style="width: 45%"-->
-    <!--              v-model.trim="resolveListForm.zccssrq"-->
-    <!--              clearable-->
-    <!--          />-->
-  </el-form-item>
-  <!--适用车型-->
-  <template>
-    <custom-select-array
-      :config="applyArcticOptions"
-      v-model="resolveListForm.applyArctic"
-    ></custom-select-array>
-  </template>
-
-  <!--            责任工程师-->
-  <template>
     <el-form-item
-      prop="ZRGCSUser"
-      label-width="150px"
+      label="条款号"
       class="add-form-item"
     >
-      <template slot="label">责任工程师</template>
-      <el-input v-model="resolveListForm.dutyEngineer" placeholder="请选择责任工程师" clearable
-                @click.native="choiceZRRS('zrgcs', '查询责任工程师', resolveListForm.dutyEngineer)">
-      </el-input>
+      <el-input
+        style="width: 45%"
+        v-model="resolveListForm.itemsNum"
+        disabled
+      />
     </el-form-item>
-  </template>
-  <!--        <el-form-item-->
-  <!--            label="责任工程师"-->
-  <!--            class="add-form-item"-->
-  <!--        >-->
-  <!--          <el-input-->
-  <!--              style="width: 45%"-->
-  <!--              v-model="resolveListForm.dutyEngineer"-->
-  <!--              clearable-->
-  <!--          />-->
-  <!--        </el-form-item>-->
-  <el-form-item
-    label="符合性状态"
-    class="add-form-item"
-  >
+    <el-form-item
+      label="条款名称"
+      class="add-form-item"
+    >
+      <el-input
+        style="width: 45%"
+        v-model="resolveListForm.itemsName"
+        disabled
+      />
+    </el-form-item>
+    <el-form-item
+      label="条款内容"
+      class="add-form-item"
+    >
+      <el-input
+        style="width: 45%"
+        v-model="resolveListForm.termsConditions"
+        disabled
+      />
+    </el-form-item>
+    <el-form-item
+      label="核心技术要求/变化点"
+      class="add-form-item"
+    >
+      <el-input
+        style="width: 45%"
+        v-model="resolveListForm.readContent"
+        clearable
+      />
+    </el-form-item>
+    <el-form-item
+      label="基于上一版本差异"
+      class="add-form-item"
+    >
+      <el-input
+        style="width: 45%"
+        v-model="resolveListForm.comparedWithPrevious"
+        clearable
+      />
+    </el-form-item>
+    <el-form-item
+      label="新车型实施日期(文本)"
+      class="add-form-item"
+    >
+      <el-date-picker
+        type="dates"
+        value-format="yyyy-MM-dd"
+        style="width: 45%"
+        prefix-icon="none"
+        v-model="resolveListForm.xccssrq"
+        placeholder="请选择新车型实施日期">
+      </el-date-picker>
+      <!--          <el-input-->
+      <!--              style="width: 45%"-->
+      <!--              v-model.trim="resolveListForm.xccssrq"-->
+      <!--              clearable-->
+      <!--          />-->
+    </el-form-item>
+    <el-form-item
+      label="在产车实施日期(文本)"
+      class="add-form-item"
+    >
+      <el-date-picker
+        type="dates"
+        value-format="yyyy-MM-dd"
+        prefix-icon="none"
+        style="width: 45%"
+        v-model="resolveListForm.zccssrq"
+        placeholder="请选择在产车实施日期">
+      </el-date-picker>
+      <!--          <el-input-->
+      <!--              style="width: 45%"-->
+      <!--              v-model.trim="resolveListForm.zccssrq"-->
+      <!--              clearable-->
+      <!--          />-->
+    </el-form-item>
+    <!--适用车型-->
     <template>
-      <el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio>
-      <el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio>
+      <custom-select-array
+        :config="applyArcticOptions"
+        v-model="resolveListForm.applyArctic"
+      ></custom-select-array>
     </template>
+    
+    <!--            责任工程师-->
+    <template>
+      <el-form-item
+        prop="ZRGCSUser"
+        label-width="150px"
+        class="add-form-item"
+      >
+        <template slot="label">责任工程师</template>
+        <el-input v-model="resolveListForm.dutyEngineer" placeholder="请选择责任工程师" clearable
+                  @click.native="choiceZRRS('zrgcs', '查询责任工程师', resolveListForm.dutyEngineer)">
+        </el-input>
+      </el-form-item>
+    </template>
+    <!--        <el-form-item-->
+    <!--            label="责任工程师"-->
+    <!--            class="add-form-item"-->
+    <!--        >-->
     <!--          <el-input-->
     <!--              style="width: 45%"-->
-    <!--              v-model="resolveListForm.complianceRequire"-->
+    <!--              v-model="resolveListForm.dutyEngineer"-->
     <!--              clearable-->
     <!--          />-->
-  </el-form-item>
-  <el-form-item
-    label="合规性分析"
-    class="add-form-item"
-  >
-    <el-input
-      style="width: 45%"
-      v-model="resolveListForm.complianceState"
-      clearable
-    />
-  </el-form-item>
-</el-form>
-<div id="roleFormButton" class="demo-drawer-footer" style="margin-top: 8%">
-  <el-button
-    type="primary"
-    class="common-button-primary"
-    size="mini"
-    :loading="editLoading"
-    icon="el-icon-check"
-    @click="saveEditInfo"
-  >提交
-  </el-button
-  >
-  <el-button
-    size="mini"
-    icon="el-icon-close"
-    class="common-button-default"
-    @click="resetEditResolveListForm"
-  >取消
-  </el-button
-  >
-</div>
+    <!--        </el-form-item>-->
+    <el-form-item
+      label="符合性状态"
+      class="add-form-item"
+    >
+      <template>
+        <el-radio v-model="resolveListForm.complianceRequire" label="1">符合</el-radio>
+        <el-radio v-model="resolveListForm.complianceRequire" label="2">不符合</el-radio>
+      </template>
+      <!--          <el-input-->
+      <!--              style="width: 45%"-->
+      <!--              v-model="resolveListForm.complianceRequire"-->
+      <!--              clearable-->
+      <!--          />-->
+    </el-form-item>
+    <el-form-item
+      label="合规性分析"
+      class="add-form-item"
+    >
+      <el-input
+        style="width: 45%"
+        v-model="resolveListForm.complianceState"
+        clearable
+      />
+    </el-form-item>
+  </el-form>
+  <div id="roleFormButton" class="demo-drawer-footer" style="margin-top: 8%">
+    <el-button
+      type="primary"
+      class="common-button-primary"
+      size="mini"
+      :loading="editLoading"
+      icon="el-icon-check"
+      @click="saveEditInfo"
+    >提交
+    </el-button
+    >
+    <el-button
+      size="mini"
+      icon="el-icon-close"
+      class="common-button-default"
+      @click="resetEditResolveListForm"
+    >取消
+    </el-button
+    >
+  </div>
 </el-drawer>
 <Role-tree
   :is-title="drawerTitle"
@@ -921,143 +845,143 @@
   size="800px"
   destroy-on-close
 >
-<div class="demo-drawer-content">
-  <el-form
-    v-if="modalItemaddShowflag"
-    ref="sarStandardsItemForm"
-    :model="standItemEO"
-    class="label-input-form"
-    :rules="sarStandardItemRules"
-    label-width="150px"
-  >
-    <el-form-item label="条款号" prop="itemsNum" class="add-form-item">
-      <el-input v-model="standItemEO.itemsNum" :disabled="itemFormdisableflag" placeholder="请输入内容"></el-input>
-    </el-form-item>
-    <el-form-item label="条款名称" prop="itemsName" class="add-form-item">
-      <el-input v-model="standItemEO.itemsName" :disabled="itemFormdisableflag" placeholder="请输入内容"></el-input>
-    </el-form-item>
-    <el-form-item label="内容简介" prop="termsConditions" class="add-form-item">
-      <el-input v-model="standItemEO.termsConditions" :disabled="itemFormdisableflag" placeholder="请输入内容"/>
-    </el-form-item>
-    <el-row>
-      <custom-org
-        :config="{
+  <div class="demo-drawer-content">
+    <el-form
+      v-if="modalItemaddShowflag"
+      ref="sarStandardsItemForm"
+      :model="standItemEO"
+      class="label-input-form"
+      :rules="sarStandardItemRules"
+      label-width="150px"
+    >
+      <el-form-item label="条款号" prop="itemsNum" class="add-form-item">
+        <el-input v-model="standItemEO.itemsNum" :disabled="itemFormdisableflag" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item label="条款名称" prop="itemsName" class="add-form-item">
+        <el-input v-model="standItemEO.itemsName" :disabled="itemFormdisableflag" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item label="内容简介" prop="termsConditions" class="add-form-item">
+        <el-input v-model="standItemEO.termsConditions" :disabled="itemFormdisableflag" placeholder="请输入内容"/>
+      </el-form-item>
+      <el-row>
+        <custom-org
+          :config="{
                 attrName: '责任部门',
                 attrField: 'responsibleUnit',
                 selVal: 'ORGLIST',
                 valueName: standItemEO.orgName,
                 attrType: 'SEL_OPTION'
               }"
-        :zNodes="zNodesSItem"
-        v-model="standItemEO.responsibleUnit"
-        :data-model="standItemEO"
-        @on-checked="(checkName) => {standItemEO.ZRBM = standItemEO.responsibleUnit;standItemEO.orgName = checkName}"
-      ></custom-org>
-    </el-row>
-    <el-row>
-      <custom-org
-        :config="{
+          :zNodes="zNodesSItem"
+          v-model="standItemEO.responsibleUnit"
+          :data-model="standItemEO"
+          @on-checked="(checkName) => {standItemEO.ZRBM = standItemEO.responsibleUnit;standItemEO.orgName = checkName}"
+        ></custom-org>
+      </el-row>
+      <el-row>
+        <custom-org
+          :config="{
                 attrName: 'FO',
                 attrField: 'FO',
                 selVal: 'USERLIST',
                 valueName: standItemEO.foShow,
                 attrType: 'SEL_OPTION'
               }"
-        :zNodes="zNodesSItem"
-        v-model="standItemEO.FO"
-        :data-model="standItemEO"
-        @on-checked="(checkName) => {standItemEO.fo = standItemEO.FO;standItemEO.foShow = checkName}"
-      ></custom-org>
-    </el-row>
-    <el-row>
-      <custom-org
-        :config="{
+          :zNodes="zNodesSItem"
+          v-model="standItemEO.FO"
+          :data-model="standItemEO"
+          @on-checked="(checkName) => {standItemEO.fo = standItemEO.FO;standItemEO.foShow = checkName}"
+        ></custom-org>
+      </el-row>
+      <el-row>
+        <custom-org
+          :config="{
                 attrName: '责任工程师',
                 attrField: 'dutyEngineer',
                 selVal: 'USERLIST',
                 valueName: standItemEO.dutyEngineerShow,
                 attrType: 'SEL_OPTION'
               }"
-        :zNodes="zNodesSItem"
-        :data-model="standItemEO"
-        v-model="standItemEO.dutyEngineer"
-        @on-checked="(checkName) => {standItemEO.dutyEngineerShow = checkName}"
-      ></custom-org>
-    </el-row>
-    <el-row>
-      <custom-SVPPS
-        :config="{
+          :zNodes="zNodesSItem"
+          :data-model="standItemEO"
+          v-model="standItemEO.dutyEngineer"
+          @on-checked="(checkName) => {standItemEO.dutyEngineerShow = checkName}"
+        ></custom-org>
+      </el-row>
+      <el-row>
+        <custom-SVPPS
+          :config="{
                 attrName: 'SVPPS',
                 attrField: 'SVPPS',
                 valueName: standItemEO.svppsShow,
                 value: standItemEO.svpps
               }"
-        v-model="standItemEO.svpps"
-      ></custom-SVPPS>
-    </el-row>
-    <el-form-item label="适用车辆类型" prop="applyArctic" class="add-form-item">
-      <el-select v-model="standItemEO.applyArctic" multiple placeholder="请选择" :filterable="true">
-        <el-option
-          v-for="(opt, index) in applyArcticOptions"
-          :key="index"
-          :label="opt.label"
-          :value="opt.value">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="要求类型" prop="claimType" class="add-form-item">
-      <el-select v-model="standItemEO.claimType" placeholder="请选择" :filterable="true">
-        <el-option
-          v-for="(opt, index) in requestOptions"
-          :key="index"
-          :label="opt.label"
-          :value="opt.value">
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="企标覆盖关系" prop="busStandCover" class="add-form-item">
-      <el-select
-        v-model="standItemEO.busStandCover"
-        :disabled="itemFormdisableflag"
-        placeholder="请选择"
-      >
-        <el-option
-          v-for="(item, index) in BZFGGXOUIUJ"
-          :key="index"
-          :value="item.value"
-          :label="item.label"
-        ></el-option>
-      </el-select>
-    </el-form-item>
-  </el-form>
-</div>
-<div class="demo-drawer-footer">
-  <el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag"
-             @click="saveOrUpdateStandItem" :loading="isSubmit">
-    保存
-  </el-button>
-  <el-button class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
-</div>
+          v-model="standItemEO.svpps"
+        ></custom-SVPPS>
+      </el-row>
+      <el-form-item label="适用车辆类型" prop="applyArctic" class="add-form-item">
+        <el-select v-model="standItemEO.applyArctic" multiple placeholder="请选择" :filterable="true">
+          <el-option
+            v-for="(opt, index) in applyArcticOptions"
+            :key="index"
+            :label="opt.label"
+            :value="opt.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="要求类型" prop="claimType" class="add-form-item">
+        <el-select v-model="standItemEO.claimType" placeholder="请选择" :filterable="true">
+          <el-option
+            v-for="(opt, index) in requestOptions"
+            :key="index"
+            :label="opt.label"
+            :value="opt.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="企标覆盖关系" prop="busStandCover" class="add-form-item">
+        <el-select
+          v-model="standItemEO.busStandCover"
+          :disabled="itemFormdisableflag"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="(item, index) in BZFGGXOUIUJ"
+            :key="index"
+            :value="item.value"
+            :label="item.label"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+  </div>
+  <div class="demo-drawer-footer">
+    <el-button class="common-button-primary" icon="el-icon-check" type="primary" v-if="!itemFormdisableflag"
+               @click="saveOrUpdateStandItem" :loading="isSubmit">
+      保存
+    </el-button>
+    <el-button class="common-button-default" icon="el-icon-close" @click="resetForm">取消</el-button>
+  </div>
 </el-drawer>
 <!--导入模态窗-->
 <el-dialog width="400px" :visible.sync="importModalshowflag" title="导入文件" :footer-hide="true">
-<el-upload
-  multiple
-  drag
-  :show-file-list="showUploadlist"
-  :on-success="importFileSuccess"
-  :on-remove="removeOneFile"
-  :before-upload="beforeUpload"
-  :action="importExcelUrl"
-  :file-list="defaultFileList"
-  accept=".xlsx"
-  name="file"
-  ref="importFileAboutStand">
-  <div style="padding: 20px 0">
-    <i class="el-icon-upload" style="color: #3399ff"></i>
-    <p>点击或拖拽上传文件</p>
-  </div>
-</el-upload>
+  <el-upload
+    multiple
+    drag
+    :show-file-list="showUploadlist"
+    :on-success="importFileSuccess"
+    :on-remove="removeOneFile"
+    :before-upload="beforeUpload"
+    :action="importExcelUrl"
+    :file-list="defaultFileList"
+    accept=".xlsx"
+    name="file"
+    ref="importFileAboutStand">
+    <div style="padding: 20px 0">
+      <i class="el-icon-upload" style="color: #3399ff"></i>
+      <p>点击或拖拽上传文件</p>
+    </div>
+  </el-upload>
 </el-dialog>
 <!--分解单-查看 （标准拆分-属性）-->
 <el-drawer
@@ -1066,112 +990,112 @@
   title="查看属性信息"
   :visible.sync="showItemInfoModal"
 >
-<div class="see-drawer-content">
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{
+  <div class="see-drawer-content">
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{
         standShowItemEO.itemsNum
       }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{
         standShowItemEO.itemsName
       }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
-    <span class="see-drawer-val" style="font-size: 12px"
-          :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
+      <span class="see-drawer-val" style="font-size: 12px"
+            :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
         standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
       }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="核心技术要求">核心技术要求</label>
-    <span class="see-drawer-val" style="font-size: 12px"
-          :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="核心技术要求">核心技术要求</label>
+      <span class="see-drawer-val" style="font-size: 12px"
+            :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
         standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
       }}</span>
-  </div>
-
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
-    <span class="see-drawer-val" style="font-size: 12px"
-          :title="standShowItemEO.xcxssrq">{{
+    </div>
+    
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
+      <span class="see-drawer-val" style="font-size: 12px"
+            :title="standShowItemEO.xcxssrq">{{
         standShowItemEO.xccssrq
       }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="在产车实施日期">在产车实施日期</label>
-    <span class="see-drawer-val" style="font-size: 12px"
-          :title="standShowItemEO.zccssrq">{{
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="在产车实施日期">在产车实施日期</label>
+      <span class="see-drawer-val" style="font-size: 12px"
+            :title="standShowItemEO.zccssrq">{{
         standShowItemEO.zccssrq
       }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{
         standShowItemEO.applyArctic
       }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.responsibleUnit">{{
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.responsibleUnit">{{
         standShowItemEO.responsibleUnit
       }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="责任工程师">责任工程师</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.dutyEngineer">
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="责任工程师">责任工程师</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.dutyEngineer">
             {{ standShowItemEO.dutyEngineer }}</span>
-  </div>
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="基于上一版本差异">基于上一版本差异</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
+    </div>
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="基于上一版本差异">基于上一版本差异</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
             {{ standShowItemEO.comparedWithPrevious }}</span>
-  </div>
-
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
+    </div>
+    
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
               {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }}
           </span>
-
-  </div>
-
-  <div class="see-drawer-div">
-    <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
-    <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
+    
+    </div>
+    
+    <div class="see-drawer-div">
+      <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
+      <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
             {{ standShowItemEO.complianceState }}</span>
+    </div>
+    <!--        <div class="see-drawer-div">-->
+    <!--          <label class="see-drawer-name" title="FO">FO</label>-->
+    <!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
+    <!--        </div>-->
+    <!--        <div class="see-drawer-div">-->
+    <!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
+    <!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
+    <!--              standShowItemEO.dutyEngineerShow-->
+    <!--            }}</span>-->
+    <!--        </div>-->
+    <!--        <div class="see-drawer-div">-->
+    <!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
+    <!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
+    <!--        </div>-->
+    
+    <!--        <div class="see-drawer-div">-->
+    <!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
+    <!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
+    <!--        </div>-->
+    <!--        <div class="see-drawer-div">-->
+    <!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
+    <!--          <span class="see-drawer-val"-->
+    <!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
+    <!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
+    <!--            }}</span>-->
+    <!--        </div>-->
   </div>
-  <!--        <div class="see-drawer-div">-->
-  <!--          <label class="see-drawer-name" title="FO">FO</label>-->
-  <!--          <span class="see-drawer-val" :title="standShowItemEO.foShow">{{ standShowItemEO.foShow }}</span>-->
-  <!--        </div>-->
-  <!--        <div class="see-drawer-div">-->
-  <!--          <label class="see-drawer-name" title="责任工程师">责任工程师</label>-->
-  <!--          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineerShow">{{-->
-  <!--              standShowItemEO.dutyEngineerShow-->
-  <!--            }}</span>-->
-  <!--        </div>-->
-  <!--        <div class="see-drawer-div">-->
-  <!--          <label class="see-drawer-name" title="svpps">svpps</label>-->
-  <!--          <span class="see-drawer-val" :title="standShowItemEO.svppsShow">{{ standShowItemEO.svppsShow }}</span>-->
-  <!--        </div>-->
-
-  <!--        <div class="see-drawer-div">-->
-  <!--          <label class="see-drawer-name" title="要求类型">要求类型</label>-->
-  <!--          <span class="see-drawer-val" :title="standShowItemEO.claimTypeShow">{{ standShowItemEO.claimTypeShow }}</span>-->
-  <!--        </div>-->
-  <!--        <div class="see-drawer-div">-->
-  <!--          <label class="see-drawer-name" title="企标覆盖关系">企标覆盖关系</label>-->
-  <!--          <span class="see-drawer-val"-->
-  <!--                :title="standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)">{{-->
-  <!--              standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover)-->
-  <!--            }}</span>-->
-  <!--        </div>-->
-</div>
 </el-drawer>
 <el-dialog
   title="更多发布稿"
@@ -1179,22 +1103,22 @@
   class="relateClass"
   width="40%"
   :before-close="relateDialogClose1">
-<div
-  v-for="(file, index) in relateNowList1"
-  :key="index"
-  v-if="relateNowList1"
-  style="margin-bottom: 10px;line-height: 20px;max-height: 300px"
->
-  {{ index + 1 }}.
-  <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)"
-     target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
-  <div v-if="relateNowList.length >1">
-    <el-divider></el-divider>
+  <div
+    v-for="(file, index) in relateNowList1"
+    :key="index"
+    v-if="relateNowList1"
+    style="margin-bottom: 10px;line-height: 20px;max-height: 300px"
+  >
+    {{ index + 1 }}.
+    <a style="font-size: 16px;color: #409EFF;cursor: pointer" @click="openFileInPdf(file.id, file.oldFileName)"
+       target="_blank" :title="file.oldFileName">{{ file.oldFileName }}</a>
+    <div v-if="relateNowList.length >1">
+      <el-divider></el-divider>
+    </div>
+  </div>
+  <div slot="footer" class="dialog-footer">
+    <el-button type="primary" @click="relateDialogClose1">关 闭</el-button>
   </div>
-</div>
-<div slot="footer" class="dialog-footer">
-  <el-button type="primary" @click="relateDialogClose1">关 闭</el-button>
-</div>
 </el-dialog>
 <!-- 知识点分享 -->
 <el-dialog
@@ -1202,80 +1126,80 @@
   :visible.sync="knowledgeSharingDialog"
   width="800px"
   class="myDialog">
-<div class="action-bar">
-  <el-button type="primary"
-             class="common-button-primary add-button"
-             size="mini"
-             :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'"
-             @click="addknowledge(1)"><i class="el-icon-plus"></i>新增
-  </el-button>
-  <el-button class="common-button-default delete-button"
-             size="mini"
-             :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
-             @click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除
-  </el-button>
-</div>
-<div class="knowContent">
-  <el-table
-    :data="knowList"
-    tooltip-effect="dark"
-    style="width: 100%"
-    border
-    height="100%"
-    @selection-change="handleSelectionKnow"
-    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+  <div class="action-bar">
+    <el-button type="primary"
+               class="common-button-primary add-button"
+               size="mini"
+               :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'"
+               @click="addknowledge(1)"><i class="el-icon-plus"></i>新增
+    </el-button>
+    <el-button class="common-button-default delete-button"
+               size="mini"
+               :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
+               @click="deleteknowledge(2)"><i class="iconfont">&#xe61b;</i>批量删除
+    </el-button>
+  </div>
+  <div class="knowContent">
+    <el-table
+      :data="knowList"
+      tooltip-effect="dark"
+      style="width: 100%"
+      border
+      height="100%"
+      @selection-change="handleSelectionKnow"
+      :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-  >
-    <el-table-column
-      type="selection"
-      width="55"
-      align="center">
-    </el-table-column>
-    <el-table-column
-      show-overflow-tooltip
-      prop="title"
-      width="150"
-      label="标题">
-    </el-table-column>
-    <el-table-column
-      show-overflow-tooltip
-      prop="content"
-      label="内容">
-    </el-table-column>
-    <el-table-column
-      prop="creationTime"
-      width="150"
-      align="center"
-      label="时间">
-      <template slot-scope="scope">
-        {{ $moment(scope.row.creationTime).format('YYYY-MM-DD') }}
-      </template>
-    </el-table-column>
-    <el-table-column label="操作" align="center" width="50" fixed="right">
-      <template slot-scope="scope">
-        <div @click.stop style="display: inline-block">
-          <el-dropdown trigger="click" @command="handleCommand2">
-            <i class="iconfont">&#xe61e;</i>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
-              <el-dropdown-item
-                :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'"
-                :command="[scope.row, '编辑']">
-                编辑
-              </el-dropdown-item>
-              <el-dropdown-item
-                :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
-                :command="[scope.row, '删除']">
-                删除
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </div>
-      </template>
-    </el-table-column>
-  </el-table>
-  <pagination :total="total" @pageChange="pageChange1" @pageSizeChange="pageSizeChange1"></pagination>
-</div>
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center">
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="title"
+        width="150"
+        label="标题">
+      </el-table-column>
+      <el-table-column
+        show-overflow-tooltip
+        prop="content"
+        label="内容">
+      </el-table-column>
+      <el-table-column
+        prop="creationTime"
+        width="150"
+        align="center"
+        label="时间">
+        <template slot-scope="scope">
+          {{ $moment(scope.row.creationTime).format('YYYY-MM-DD') }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="50" fixed="right">
+        <template slot-scope="scope">
+          <div @click.stop style="display: inline-block">
+            <el-dropdown trigger="click" @command="handleCommand2">
+              <i class="iconfont">&#xe61e;</i>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
+                <el-dropdown-item
+                  :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? 'XPMLS6UV5HXG7C9ZR6B8' : '5ZC797XABNFV36KWJCA5'"
+                  :command="[scope.row, '编辑']">
+                  编辑
+                </el-dropdown-item>
+                <el-dropdown-item
+                  :v-btn-permission="$route.query.pageType === 'INLAND_STAND' ? '4V4592SVLAZY9HMC8WHU' : '485WL3QHGRJ27H2XD34Z'"
+                  :command="[scope.row, '删除']">
+                  删除
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :total="total" @pageChange="pageChange1" @pageSizeChange="pageSizeChange1"></pagination>
+  </div>
 </el-dialog>
 <!-- 知识点新增 -->
 <el-dialog
@@ -1285,39 +1209,39 @@
   destroy-on-close
   :close-on-click-modal="false"
   width="600px">
-<el-form ref="addForm" :model="addForm" :rules="addFormRules" class="label-input-form" label-width="130px">
-  <el-formItem label="标题" prop="title" class="add-form-item">
-    <el-input v-model="addForm.title" placeholder="请输入标题"></el-input>
-  </el-formItem>
-  <el-formItem label="内容" prop="content" class="add-form-item">
-    <el-input v-model="addForm.content" :autosize="{ minRows: 3, maxRows: 4}" resize="none" type="textarea"
-              placeholder="请输入内容"></el-input>
-  </el-formItem>
-  <el-formItem label="附件" prop="files" class="add-form-item">
-    <el-upload
-      style="margin-top: 15px;"
-      multiple
-      drag
-      :show-file-list="showUploadlist2"
-      :on-success="uploadSuccess1"
-      :before-upload="beforeUpload1"
-      :on-remove="removeOneFile1"
-      :action="importExcelUrl"
-      name="file"
-      :file-list="defaultFileList"
-      ref="importFileAboutStand">
-      <i class="el-icon-upload"></i>
-      <div class="el-upload__text">点击或拖拽上传文件</div>
-    </el-upload>
-  </el-formItem>
-</el-form>
-<div slot="footer" class="demo-drawer-footer">
-  <el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading"
-             icon="el-icon-check" @click="AddKnowSub">
-    确定
-  </el-button>
-  <el-button class="common-button-default" icon="el-icon-close" @click="AddKnowClose">取消</el-button>
-</div>
+  <el-form ref="addForm" :model="addForm" :rules="addFormRules" class="label-input-form" label-width="130px">
+    <el-formItem label="标题" prop="title" class="add-form-item">
+      <el-input v-model="addForm.title" placeholder="请输入标题"></el-input>
+    </el-formItem>
+    <el-formItem label="内容" prop="content" class="add-form-item">
+      <el-input v-model="addForm.content" :autosize="{ minRows: 3, maxRows: 4}" resize="none" type="textarea"
+                placeholder="请输入内容"></el-input>
+    </el-formItem>
+    <el-formItem label="附件" prop="files" class="add-form-item">
+      <el-upload
+        style="margin-top: 15px;"
+        multiple
+        drag
+        :show-file-list="showUploadlist2"
+        :on-success="uploadSuccess1"
+        :before-upload="beforeUpload1"
+        :on-remove="removeOneFile1"
+        :action="importExcelUrl"
+        name="file"
+        :file-list="defaultFileList"
+        ref="importFileAboutStand">
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">点击或拖拽上传文件</div>
+      </el-upload>
+    </el-formItem>
+  </el-form>
+  <div slot="footer" class="demo-drawer-footer">
+    <el-button type="primary" size="mini" class="common-button-primary" :loading="AddKnowSubLoading"
+               icon="el-icon-check" @click="AddKnowSub">
+      确定
+    </el-button>
+    <el-button class="common-button-default" icon="el-icon-close" @click="AddKnowClose">取消</el-button>
+  </div>
 </el-dialog>
 <!-- 查看知识点详情-->
 <el-dialog
@@ -1326,20 +1250,20 @@
   destroy-on-close
   class="myDialog"
   width="60%">
-<div class="basic-information-content">
-  <p><label>标题：</label><span>{{ knowSee.title }}</span></p>
-  <p><label>内容：</label><span>{{ knowSee.content }}</span></p>
-  <p><label>附件：</label>
-    <span
-      class="fileCss"
-      v-for="(item,index) in knowSee.fileList"
-      @click="downloadFile(item.id)"
-      :key="index">{{ item.oldFileName }}</span>
-  </p>
-  <p><label>发布时间：</label><span>{{
+  <div class="basic-information-content">
+    <p><label>标题：</label><span>{{ knowSee.title }}</span></p>
+    <p><label>内容：</label><span>{{ knowSee.content }}</span></p>
+    <p><label>附件：</label>
+      <span
+        class="fileCss"
+        v-for="(item,index) in knowSee.fileList"
+        @click="downloadFile(item.id)"
+        :key="index">{{ item.oldFileName }}</span>
+    </p>
+    <p><label>发布时间：</label><span>{{
       knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : ''
     }}</span></p>
-</div>
+  </div>
 </el-dialog>
 
 <el-dialog
@@ -1347,47 +1271,47 @@
   class="myDialog1"
   :before-close="comparisonClose"
   :visible.sync="comparisonDialog">
-<div class="search-area">
-  <el-form :inline="true" class="label-input-form">
-    <el-form-item label="关键字" class="search-item">
-      <el-input v-model="comparisonTitle" placeholder="请输入关键字"></el-input>
-    </el-form-item>
-    <el-form-item class="search-item btn-box">
-      <el-button
-        icon="el-icon-search"
-        type="primary"
-        class="common-button-primary"
-        size="mini"
-        @click="getComparison()">
-      </el-button>
-      <el-button
-        class="common-button-default"
-        icon="el-icon-refresh-left"
-        size="mini"
-        @click="clearComparison()"></el-button>
-      <el-button type="primary" class="common-button-primary" size="mini" @click="addComparison">
-        <i class="el-icon-plus"></i>新增
-      </el-button>
-    </el-form-item>
-  </el-form>
-</div>
-<div class="action-bar">
-  <div class="myRadio">
-    <template>
-      <el-radio-group v-for="(item, index) in comparisonList" :key="index" v-model="comparisonId">
-        <el-radio :label="item.id">{{ item.listName }}</el-radio>
-        <br>
-      </el-radio-group>
-    </template>
+  <div class="search-area">
+    <el-form :inline="true" class="label-input-form">
+      <el-form-item label="关键字" class="search-item">
+        <el-input v-model="comparisonTitle" placeholder="请输入关键字"></el-input>
+      </el-form-item>
+      <el-form-item class="search-item btn-box">
+        <el-button
+          icon="el-icon-search"
+          type="primary"
+          class="common-button-primary"
+          size="mini"
+          @click="getComparison()">
+        </el-button>
+        <el-button
+          class="common-button-default"
+          icon="el-icon-refresh-left"
+          size="mini"
+          @click="clearComparison()"></el-button>
+        <el-button type="primary" class="common-button-primary" size="mini" @click="addComparison">
+          <i class="el-icon-plus"></i>新增
+        </el-button>
+      </el-form-item>
+    </el-form>
   </div>
-  <div slot="footer" class="demo-drawer-footer">
-    <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
-               @click="comparisonSub">
-      确定
-    </el-button>
-    <el-button class="common-button-default" icon="el-icon-close" @click="comparisonClose">取消</el-button>
+  <div class="action-bar">
+    <div class="myRadio">
+      <template>
+        <el-radio-group v-for="(item, index) in comparisonList" :key="index" v-model="comparisonId">
+          <el-radio :label="item.id">{{ item.listName }}</el-radio>
+          <br>
+        </el-radio-group>
+      </template>
+    </div>
+    <div slot="footer" class="demo-drawer-footer">
+      <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check"
+                 @click="comparisonSub">
+        确定
+      </el-button>
+      <el-button class="common-button-default" icon="el-icon-close" @click="comparisonClose">取消</el-button>
+    </div>
   </div>
-</div>
 </el-dialog>
 <!-- 新增清单抽屉 -->
 <el-drawer
@@ -1396,49 +1320,49 @@
   size="800px"
   destroy-on-close
 >
-<div class="demo-drawer-content">
-  <el-form
-    ref="listVO"
-    :model="listVO"
-    :rules="listVOFormRules"
-    class="label-input-form"
-    label-width="150px"
-  >
-    <el-form-item label="清单名称" prop="name" class="add-form-item">
-      <el-input v-model.trim="listVO.name" placeholder="请输入清单名称" clearable/>
-    </el-form-item>
-    <el-form-item label="是否公开" prop="public" class="add-form-item">
-      <el-radio-group v-model="listVO.public"
-                      style="margin-bottom: 0px; display: flex; align-items: center; height: 50px;">
-        <el-radio :label="true">是</el-radio>
-        <el-radio :label="false">否</el-radio>
-      </el-radio-group>
-    </el-form-item>
-  </el-form>
-</div>
-<div id="listFormButton" class="demo-drawer-footer">
-  <el-button class="common-button-primary" icon="el-icon-check" type="primary"
-             @click="submitDrawerForm('listVO')">
-    确定
-  </el-button>
-  <el-button class="common-button-default" icon="el-icon-close" @click="AddcomparisonDrawer = false">取消
-  </el-button>
-</div>
+  <div class="demo-drawer-content">
+    <el-form
+      ref="listVO"
+      :model="listVO"
+      :rules="listVOFormRules"
+      class="label-input-form"
+      label-width="150px"
+    >
+      <el-form-item label="清单名称" prop="name" class="add-form-item">
+        <el-input v-model.trim="listVO.name" placeholder="请输入清单名称" clearable/>
+      </el-form-item>
+      <el-form-item label="是否公开" prop="public" class="add-form-item">
+        <el-radio-group v-model="listVO.public"
+                        style="margin-bottom: 0px; display: flex; align-items: center; height: 50px;">
+          <el-radio :label="true">是</el-radio>
+          <el-radio :label="false">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+  </div>
+  <div id="listFormButton" class="demo-drawer-footer">
+    <el-button class="common-button-primary" icon="el-icon-check" type="primary"
+               @click="submitDrawerForm('listVO')">
+      确定
+    </el-button>
+    <el-button class="common-button-default" icon="el-icon-close" @click="AddcomparisonDrawer = false">取消
+    </el-button>
+  </div>
 </el-drawer>
 <!--      导入失败-->
 <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
-<p slot="title" style="color:#f60">
-  <span>导入失败</span>
-</p>
-<div style="max-height: 300px;overflow: auto;padding: 10px 0;">
-  <p v-html="importForm.content"></p>
-</div>
-<div slot="footer" class="demo-drawer-footer">
-  <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check"
-             @click="importFailed = false">
-    确认
-  </el-button>
-</div>
+  <p slot="title" style="color:#f60">
+    <span>导入失败</span>
+  </p>
+  <div style="max-height: 300px;overflow: auto;padding: 10px 0;">
+    <p v-html="importForm.content"></p>
+  </div>
+  <div slot="footer" class="demo-drawer-footer">
+    <el-button type="primary" size="mini" class="common-button-default" icon="el-icon-check"
+               @click="importFailed = false">
+      确认
+    </el-button>
+  </div>
 </el-dialog>
 <loading :loading="loading">数据获取中</loading>
 
@@ -1452,876 +1376,773 @@
   :visible.sync="relatedTermsDrawerVisible"
   destroy-on-close
 >
-<div class="demo-drawer-content">
-  <related-terms-select
-    @func="handleChangeList"
-    ref="relatedTermsSelect"
-    :fileType="fileType"
-    :stand-id="standId"
-    @close="closeRelatedTermsDrawer"
-  ></related-terms-select>
-</div>
-<div class="demo-drawer-footer">
-  <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading"
-             @click="handleRelatedTermsDrawerSubmit">提交</el-button>
-  <el-button class="common-button-default" size="mini" icon="el-icon-close"
-             @click="handleRelatedTermsDrawerCancel">取消</el-button>
-</div>
+  <div class="demo-drawer-content">
+    <related-terms-select
+      @func="handleChangeList"
+      ref="relatedTermsSelect"
+      :fileType="fileType"
+      :stand-id="standId"
+      @close="closeRelatedTermsDrawer"
+    ></related-terms-select>
+  </div>
+  <div class="demo-drawer-footer">
+    <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading"
+               @click="handleRelatedTermsDrawerSubmit">提交</el-button>
+    <el-button class="common-button-default" size="mini" icon="el-icon-close"
+               @click="handleRelatedTermsDrawerCancel">取消</el-button>
+  </div>
 </el-drawer>
 <!--内容简介-->
 <el-dialog :visible.sync="itemsTextDialogs" title="内容简介" :close-on-click-modal="false">
-<div v-html="itemsText" class="itemsTextBox"></div>
-<div slot="footer">
-  <el-button type="primary" size="large" @click="itemsTextDialogs = false">关闭</el-button>
-</div>
+  <div v-html="itemsText" class="itemsTextBox"></div>
+  <div slot="footer">
+    <el-button type="primary" size="large" @click="itemsTextDialogs = false">关闭</el-button>
+  </div>
 </el-dialog>
-</div>
-</template>
 <script>
-import PutQuestionButton from '@/components/PutQuestionButton'
-import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
-import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
-import CustomOrg from '@/components/CustomFormComponents/OrgTree'
-import {dateFormat} from '@/common/date'
-// import RelatedTermsSelect from './components/RelatedTermsSelect'
-import RelatedTermsSelect from "@/pages/details/otherStandardDetails/components/RelatedTermsSelect";
-import {getBusStandFileByAttId} from 'api/process'
-import {dicTypeData} from "api/unqualProcess";
+  import PutQuestionButton from '@/components/PutQuestionButton'
+  import CustomSVPPS from '@/components/CustomFormComponents/SVPPS'
+  import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
+  import CustomOrg from '@/components/CustomFormComponents/OrgTree'
+  import {dateFormat} from '@/common/date'
+  // import RelatedTermsSelect from './components/RelatedTermsSelect'
+  import RelatedTermsSelect from "@/pages/details/otherStandardDetails/components/RelatedTermsSelect";
+  import {getBusStandFileByAttId} from 'api/process'
+  import {dicTypeData} from "api/unqualProcess";
 
 
-export default {
-  name: 'domesticDetails',
-  components: {
-    PutQuestionButton,
-    CustomSVPPS,
-    CustomSelectArray,
-    CustomOrg,
-    RelatedTermsSelect
-  },
-  filters: {
-    ellipsis(value) {
-      if (!value) return ''
-      if (value.length > 12) {
-        return value.slice(0, 12) + '...'
-      }
-      return value
+  export default {
+    name: 'domesticDetails',
+    components: {
+      PutQuestionButton,
+      CustomSVPPS,
+      CustomSelectArray,
+      CustomOrg,
+      RelatedTermsSelect
     },
-    ellipsis50 (value) {
-      if (!value) return ''
-      if (value.length > 50) {
-        return value.slice(0,50) + '...'
-      }
-      return value
-    }
-  },
-  data() {
-    return {
-      screenWidth: document.body.offsetWidth - 141,
-      screenHeight: document.documentElement.clientHeight,
-      externalStatus:'',
-      handleList: [],
-      CycxOptions: [],
-      activeNames: ['基础信息', '过程稿件', '实施日期'],
-      activeState: true,
-      itemExistList: [],
-      interpretationContent: '',
-      relatedTermsDrawerVisible: false,
-      btnLoading: false,
-      comparisonTitle: '',
-      AddKnowSubLoading: false,
-      listVO: {
-        name: '',
-        public: false
-      },
-      listVOFormRules: {
-        name: [
-          {required: true, message: '名称不能为空', trigger: 'blur'},
-          {type: 'string', max: 100, message: '名称不能超过100个字符', trigger: 'blur'}
-        ]
-      },
-      AddcomparisonDrawer: false,
-      comparisonId: '',
-      comparisonList: [],
-      comparisonDialog: false,
-      knowSee: [],
-      AddKnowledgDialogItem: false,
-      showUploadlist2: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
-      importFileFormat: [],
-      knowId: '',
-      knowType: '',
-      KnowTitle: '',
-      knowIdList: '',
-      order: '',
-      orderBy: '',
-      total7: 0,
-      page7: 1,
-      pageSize7: this.$store.getters.userInfo.configContent,
-      addForm: {
-        title: '',
-        content: '',
-        fileId: ''
-      },
-      addFormRules: {
-        title: [
-          {required: true, message: '标题不能为空', trigger: 'blur'},
-          {type: 'string', max: 200, message: '标题不能超过200个字符', trigger: 'change'}
-        ],
-        content: [
-          {required: true, message: '内容不能为空', trigger: 'blur'},
-          {type: 'string', max: 200, message: '内容不能超过200个字符', trigger: 'change'}
-        ]
-      },
-      total: 0,
-      pageNo: 1,
-      pageSize: 10,
-      knowList: [],
-      AddKnowledgDialog: false,
-      knowledgeSharingDialog: false,
-      relateDialog: false,
-      relateDialog1: false,
-      relateList: [],
-      relateNowList: [],
-      relateNowList1: [],
-      loading: false,
-      showItemInfoModal: false,
-      standShowItemEO: {},
-      // 提交状态
-      isSubmit: false,
-      zNodesSItem: [],
-      zNodesSItemEngin: [],
-      zNodesSItemFO: [],
-      sarStandardsInfoEO: {
-        id: '',
-        standType: 'INLAND', // 标准分类
-        country: 'CN',
-        standSort: '',
-        applyArctic: '',
-        standNumber: '',
-        standYear: '',
-        standName: '',
-        standEnName: '',
-        standState: '',
-        standNature: '',
-        replaceStandNum: '',
-        replacedStandNum: '',
-        interStandNum: '',
-        adoptExtent: '',
-        emergyKind: '',
-        registerPutTime: '',
-        applyAuth: '',
-        issueTime: '',
-        putTime: '',
-        newcarPutTime: '',
-        productPutTime: '',
-        newproductPutTime: '',
-        draftingUnit: '',
-        draftUser: '',
-        standFile: '',
-        standModifyFile: '',
-        draftFile: '',
-        opinionFile: '',
-        sentScreenFile: '',
-        approvalFile: '',
-        relevanceFile: '',
-        standFileList: [],
-        standModifyFileList: [],
-        draftFileList: [],
-        opinionFileList: [],
-        sentScreenFileList: [],
-        approvalFileList: [],
-        relevanceFileList: [],
-        tags: '',
-        synopsis: '',
-        responsibleUnit: '',
-        category: '',
-        remark: '',
-      }, // 标准新增过程中用到的对象
-      standItemEO: {
-        id: '',
-        standId: '',
-        itemsNum: '',
-        itemsName: '',
-        parts: '',
-        mainPointImplementation: '', // 实施要点
-        termsConditions: '', // 内容简介
-        tackTime: '',
-        applyArctic: '', // 试用车型
-        energyKind: '', // 能源种类
-        responsibleUnit: '',
-        remarks: '',
-        orgName: '',
-        quoteStand: '',
-        relevanceFile: '',
-        fo: '',
-        foShow: '',
-        dutyEngineer: '',
-        dutyEngineerShow: '',
-        svpps: '',
-        claimType: '',
-        busStandCover: '',
-        fileType: '',
-        ZRBM: '',
-        FO: ''
-      }, // 标准条款新增过程中用到对象
-      standItemEODefault: {
-        id: '',
-        standId: '',
-        itemsNum: '',
-        itemsName: '',
-        parts: '',
-        mainPointImplementation: '', // 实施要点
-        termsConditions: '', // 内容简介
-        tackTime: '',
-        applyArctic: '', // 试用车型
-        energyKind: '', // 能源种类
-        responsibleUnit: '',
-        remarks: '',
-        orgName: '',
-        quoteStand: '',
-        relevanceFile: '',
-        fo: '',
-        foShow: '',
-        dutyEngineer: '',
-        dutyEngineerShow: '',
-        svpps: '',
-        claimType: '',
-        busStandCover: '',
-        fileType: '',
-        ZRBM: '',
-        FO: ''
-      },
-      applyArcticOptions: {
-        attrName: '适用车型',
-        options: []
-      },  // 适用车辆类型下拉框
-      modalshowflagZRBM: false,
-      nodeListZRBM: [],
-      nodeList2: [],
-      nodeList: [],
-      userType: '',
-      drawerTitle: '',
-      modalShowRoleFlag: false,
-      emergyKindOptions: [], // 能源种类下拉框
-      requestOptions: [],
-      BZFGGXOUIUJ: [], // 企标覆盖关系
-      itemModalTitle: '',
-      modalItemaddShowflag: false,
-      editResolveListShowflag: false,
-      resolveListForm: {
-        id: '',
-        itemsNum: '',
-        itemsName: '',
-        termsConditions: '',
-        readContent: '',
-        comparedWithPrevious: '',
-        xccssrq: '',
-        zccssrq: '',
-        applyArctic: '',
-        dutyEngineer: '',
-        complianceRequire: '',
-        complianceState: '',
-      },
-      editLoading: false,
-      itemAddOrUPdateFlag: '',
-      itemFormdisableflag: false, // 查看标准条款不可编辑
-      recommendList: [],
-      showModalTitle: '查看分解单',
-      replaceNumList: [],
-      replacedNumList: [],
-      // 代替，被代替标准号页面跳转
-      replaceStandInfoEO: {},
-      personCookieEO: {
-        cookieType: '',
-        resTitle: '',
-        resId: ''
-      },
-      saveStandType: this.$route.query.pageType,
-      opinionsProcessList: [], // 标准征求意见审批流程
-      notifiProcessList: [], // 标准法规实施通知及排查流程
-      modalStandItemflag: false,
-      tableLoading: false,
-      standItemSearch: {
-        XCXSSRQ: '',
-        ZCCSSRQ: '',
-        standId: '',
-        fileType: '',
-        itemsName: '',
-        pageSize: this.$store.getters.userInfo.configContent,
-        page: 1,
-      },
-      standitemTotal: 0,
-      searching: false,
-      searchInlandNodes: [], // 条款部门选择树形结构
-      standItemList: [],
-      tableHeight: null,
-      selectedItemList: [],
-      sarStandardItemRules: {
-        itemsNum: [
-          {required: true, message: '条款号不能为空', trigger: 'change'},
-          {required: true, validator: this.verify.validateStandardItem, trigger: 'change'},
-          {type: 'string', max: 100, message: '条款号不能超过100个字符', trigger: 'change'},
-          {validator: this.validCode, trigger: 'blur'}
-        ],
-        itemsName: [
-          {required: true, message: '条款名称不能为空', trigger: 'change'},
-          {type: 'string', max: 100, message: '条款名称不能超过100个字符', trigger: 'change'}
-          // {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        ],
-        // mainPointImplementation: [
-        //   {type: 'string', max: 255, message: '实施要点不能超过255个字符', trigger: 'blur'}
-        //   // {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        // ],
-        termsConditions: [
-          {required: true, message: '内容简介不能为空', trigger: 'change'},
-          {type: 'string', max: 500, message: '内容简介不能超过500个字符', trigger: 'change'}
-          // {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        ],
-        responsibleUnit: [
-          {required: true, message: '责任部门不能为空', trigger: 'change'}
-        ],
-        fo: [
-          {required: true, message: 'fo不能为空', trigger: 'change'}
-          // {type: 'string', max: 100, message: 'fo不能超过100个字符', trigger: 'change'}
-          // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
-        ],
-        FO: [
-          {required: true, message: 'FO不能为空', trigger: 'change'}
-          // {type: 'string', max: 100, message: 'fo不能超过100个字符', trigger: 'change'}
-          // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
-        ],
-        dutyEngineer: [
-          {required: true, message: '责任工程师不能为空', trigger: 'change'}
-          // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
-        ],
-        svpps: [
-          {required: true, message: 'svpps不能为空', trigger: 'change'}
-          // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
-        ],
-        // tackTime: [],
-        applyArctic: [
-          {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
-        ],
-        claimType: [
-          {required: true, message: '要求类型不能为空', trigger: 'change'}
-        ],
-        busStandCover: [
-          {required: true, message: '企标覆盖关系不能为空', trigger: 'change'}
-          // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
-        ],
-        // energyKind: [
-        //   {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
-        // ],
-        //  orgName
-        remarks: [
-          {type: 'string', max: 1000, message: '备注不能超过1000个字符', trigger: 'change'}
-          // {validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        ]
-      },
-      importModalshowflag: false,
-      showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
-      importExcelUrl: 'api/att/attFile/uploadNew', // 导入EXCEL文档
-      exportModelFlag: false,
-      exportName: {},
-      standardForm: {},
-      defaultFileList: [], // 默认显示
-      currentFileList: '', // 当前操作的是哪个FormItem的上传
-      importModalshowflagtemp: false,
-      currentFile: '', // 当前操作的是哪个FormItem的上传
-      dynamicFormField: [],
-      displayLocation: [],
-      isMoreAwayBtn: false,
-      fileType: '',
-      editAddType: 1, // 1 新增、 2、编辑
-      importFailed: false,
-      importForm: {
-        content: ''
-      },
-      itemsText: '',
-      itemsTextDialogs: false,
-      textStatusMap: {},
-      standMap: {}
-    }
-  },
-  props: {},
-  watch: {},
-  methods: {
-    handleChangeList(data){
-      this.handleList = data
-    },
-    child1Func(child1) {
-      const list = []
-      if (child1 && child1.length > 1) {
-        for (let i = 0; i < child1.length; i++) {
-          list.push(child1[i])
+    filters: {
+      ellipsis(value) {
+        if (!value) return ''
+        if (value.length > 12) {
+          return value.slice(0, 12) + '...'
         }
-        return list
-      }
-      return child1
-    },
-    child3Func(child3) {
-      const list = []
-      if (child3 && child3.length > 1) {
-        list.push(child3[0])
-        return list
-      }
-      return child3
-    },
-    child4Func(child4) {
-      const list = []
-      if (child4 && child4.length > 1) {
-        list.push(child4[0])
-        return list
-      }
-      return child4
-    },
-    child5Func(child5) {
-      const list = []
-      if (child5 && child5.length > 1) {
-        list.push(child5[0])
-        return list
-      }
-      return child5
-    },
-    handleChange(val) {
-    },
-    handleChange1(val) {
-      if (val && val === '基础信息') {
-        this.activeState = true;
-      }
-    },
-    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');
-    },
-    // 将文本状态的id与name对应
-    setMap(data) {
-      data.forEach(item => {
-        this.$set(this.textStatusMap, item.value, item.label)
-        this.$set(this.standMap, item.value, item.label)
-      })
-    },
-    statusClick() {
-      let routeUrl = this.$router.resolve({
-        name: 'standInvolveProjectTwo',
-        query: {
-          resId: this.sarStandardsInfoEO.id
+        return value
+      },
+      ellipsis50 (value) {
+        if (!value) return ''
+        if (value.length > 50) {
+          return value.slice(0,50) + '...'
         }
-      })
-      window.open(routeUrl.href, '_blank')
-    },
-    closeDrawer() {
-      this.modalStandItemflag = false
-    },
-    clearComparison() {
-      this.comparisonTitle = ''
-      this.getComparison()
-    },
-    // 验证条款号是否唯一
-    validCode(rule, value, callback) {
-      let find = 0
-      this.standItemList.map(item => {
-        if (item.itemsNum === value) {
-          find++
-        }
-      })
-      if (find > 1 && this.editAddType === 2) {
-        return callback(new Error('条款号已存在'))
-      } else if (find > 0 && this.editAddType === 1) {
-        return callback(new Error('条款号已存在'))
+        return value
       }
-      callback()
     },
-    // 新增清单
-    submitDrawerForm(name) {
-      this.$refs[name].validate((valid) => {
-        if (valid) {
+    data() {
+      return {
+        screenWidth: document.body.offsetWidth - 141,
+        screenHeight: document.documentElement.clientHeight,
+        externalStatus:'',
+        handleList: [],
+        CycxOptions: [],
+        activeNames: ['基础信息', '过程稿件', '实施日期'],
+        activeState: true,
+        itemExistList: [],
+        interpretationContent: '',
+        relatedTermsDrawerVisible: false,
+        btnLoading: false,
+        comparisonTitle: '',
+        AddKnowSubLoading: false,
+        listVO: {
+          name: '',
+          public: false
+        },
+        listVOFormRules: {
+          name: [
+            {required: true, message: '名称不能为空', trigger: 'blur'},
+            {type: 'string', max: 100, message: '名称不能超过100个字符', trigger: 'blur'}
+          ]
+        },
+        AddcomparisonDrawer: false,
+        comparisonId: '',
+        comparisonList: [],
+        comparisonDialog: false,
+        knowSee: [],
+        AddKnowledgDialogItem: false,
+        showUploadlist2: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
+        importFileFormat: [],
+        knowId: '',
+        knowType: '',
+        KnowTitle: '',
+        knowIdList: '',
+        order: '',
+        orderBy: '',
+        total7: 0,
+        page7: 1,
+        pageSize7: this.$store.getters.userInfo.configContent,
+        addForm: {
+          title: '',
+          content: '',
+          fileId: ''
+        },
+        addFormRules: {
+          title: [
+            {required: true, message: '标题不能为空', trigger: 'blur'},
+            {type: 'string', max: 200, message: '标题不能超过200个字符', trigger: 'change'}
+          ],
+          content: [
+            {required: true, message: '内容不能为空', trigger: 'blur'},
+            {type: 'string', max: 200, message: '内容不能超过200个字符', trigger: 'change'}
+          ]
+        },
+        total: 0,
+        pageNo: 1,
+        pageSize: 10,
+        knowList: [],
+        AddKnowledgDialog: false,
+        knowledgeSharingDialog: false,
+        relateDialog: false,
+        relateDialog1: false,
+        relateList: [],
+        relateNowList: [],
+        relateNowList1: [],
+        loading: false,
+        showItemInfoModal: false,
+        standShowItemEO: {},
+        // 提交状态
+        isSubmit: false,
+        zNodesSItem: [],
+        zNodesSItemEngin: [],
+        zNodesSItemFO: [],
+        sarStandardsInfoEO: {
+          id: '',
+          standType: 'INLAND', // 标准分类
+          country: 'CN',
+          standSort: '',
+          applyArctic: '',
+          standNumber: '',
+          standYear: '',
+          standName: '',
+          standEnName: '',
+          standState: '',
+          standNature: '',
+          replaceStandNum: '',
+          replacedStandNum: '',
+          interStandNum: '',
+          adoptExtent: '',
+          emergyKind: '',
+          registerPutTime: '',
+          applyAuth: '',
+          issueTime: '',
+          putTime: '',
+          newcarPutTime: '',
+          productPutTime: '',
+          newproductPutTime: '',
+          draftingUnit: '',
+          draftUser: '',
+          standFile: '',
+          standModifyFile: '',
+          draftFile: '',
+          opinionFile: '',
+          sentScreenFile: '',
+          approvalFile: '',
+          relevanceFile: '',
+          standFileList: [],
+          standModifyFileList: [],
+          draftFileList: [],
+          opinionFileList: [],
+          sentScreenFileList: [],
+          approvalFileList: [],
+          relevanceFileList: [],
+          tags: '',
+          synopsis: '',
+          responsibleUnit: '',
+          category: '',
+          remark: '',
+        }, // 标准新增过程中用到的对象
+        standItemEO: {
+          id: '',
+          standId: '',
+          itemsNum: '',
+          itemsName: '',
+          parts: '',
+          mainPointImplementation: '', // 实施要点
+          termsConditions: '', // 内容简介
+          tackTime: '',
+          applyArctic: '', // 试用车型
+          energyKind: '', // 能源种类
+          responsibleUnit: '',
+          remarks: '',
+          orgName: '',
+          quoteStand: '',
+          relevanceFile: '',
+          fo: '',
+          foShow: '',
+          dutyEngineer: '',
+          dutyEngineerShow: '',
+          svpps: '',
+          claimType: '',
+          busStandCover: '',
+          fileType: '',
+          ZRBM: '',
+          FO: ''
+        }, // 标准条款新增过程中用到对象
+        standItemEODefault: {
+          id: '',
+          standId: '',
+          itemsNum: '',
+          itemsName: '',
+          parts: '',
+          mainPointImplementation: '', // 实施要点
+          termsConditions: '', // 内容简介
+          tackTime: '',
+          applyArctic: '', // 试用车型
+          energyKind: '', // 能源种类
+          responsibleUnit: '',
+          remarks: '',
+          orgName: '',
+          quoteStand: '',
+          relevanceFile: '',
+          fo: '',
+          foShow: '',
+          dutyEngineer: '',
+          dutyEngineerShow: '',
+          svpps: '',
+          claimType: '',
+          busStandCover: '',
+          fileType: '',
+          ZRBM: '',
+          FO: ''
+        },
+        applyArcticOptions: {
+          attrName: '适用车型',
+          options: []
+        },  // 适用车辆类型下拉框
+        modalshowflagZRBM: false,
+        nodeListZRBM: [],
+        nodeList2: [],
+        nodeList: [],
+        userType: '',
+        drawerTitle: '',
+        modalShowRoleFlag: false,
+        emergyKindOptions: [], // 能源种类下拉框
+        requestOptions: [],
+        BZFGGXOUIUJ: [], // 企标覆盖关系
+        itemModalTitle: '',
+        modalItemaddShowflag: false,
+        editResolveListShowflag: false,
+        resolveListForm: {
+          id: '',
+          itemsNum: '',
+          itemsName: '',
+          termsConditions: '',
+          readContent: '',
+          comparedWithPrevious: '',
+          xccssrq: '',
+          zccssrq: '',
+          applyArctic: '',
+          dutyEngineer: '',
+          complianceRequire: '',
+          complianceState: '',
+        },
+        editLoading: false,
+        itemAddOrUPdateFlag: '',
+        itemFormdisableflag: false, // 查看标准条款不可编辑
+        recommendList: [],
+        showModalTitle: '查看分解单',
+        replaceNumList: [],
+        replacedNumList: [],
+        // 代替，被代替标准号页面跳转
+        replaceStandInfoEO: {},
+        personCookieEO: {
+          cookieType: '',
+          resTitle: '',
+          resId: ''
+        },
+        saveStandType: this.$route.query.pageType,
+        opinionsProcessList: [], // 标准征求意见审批流程
+        notifiProcessList: [], // 标准法规实施通知及排查流程
+        modalStandItemflag: false,
+        tableLoading: false,
+        standItemSearch: {
+          XCXSSRQ: '',
+          ZCCSSRQ: '',
+          standId: '',
+          fileType: '',
+          itemsName: '',
+          pageSize: this.$store.getters.userInfo.configContent,
+          page: 1,
+        },
+        standitemTotal: 0,
+        searching: false,
+        searchInlandNodes: [], // 条款部门选择树形结构
+        standItemList: [],
+        tableHeight: null,
+        selectedItemList: [],
+        sarStandardItemRules: {
+          itemsNum: [
+            {required: true, message: '条款号不能为空', trigger: 'change'},
+            {required: true, validator: this.verify.validateStandardItem, trigger: 'change'},
+            {type: 'string', max: 100, message: '条款号不能超过100个字符', trigger: 'change'},
+            {validator: this.validCode, trigger: 'blur'}
+          ],
+          itemsName: [
+            {required: true, message: '条款名称不能为空', trigger: 'change'},
+            {type: 'string', max: 100, message: '条款名称不能超过100个字符', trigger: 'change'}
+            // {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
+          ],
+          // mainPointImplementation: [
+          //   {type: 'string', max: 255, message: '实施要点不能超过255个字符', trigger: 'blur'}
+          //   // {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
+          // ],
+          termsConditions: [
+            {required: true, message: '内容简介不能为空', trigger: 'change'},
+            {type: 'string', max: 500, message: '内容简介不能超过500个字符', trigger: 'change'}
+            // {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
+          ],
+          responsibleUnit: [
+            {required: true, message: '责任部门不能为空', trigger: 'change'}
+          ],
+          fo: [
+            {required: true, message: 'fo不能为空', trigger: 'change'}
+            // {type: 'string', max: 100, message: 'fo不能超过100个字符', trigger: 'change'}
+            // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
+          ],
+          FO: [
+            {required: true, message: 'FO不能为空', trigger: 'change'}
+            // {type: 'string', max: 100, message: 'fo不能超过100个字符', trigger: 'change'}
+            // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
+          ],
+          dutyEngineer: [
+            {required: true, message: '责任工程师不能为空', trigger: 'change'}
+            // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
+          ],
+          svpps: [
+            {required: true, message: 'svpps不能为空', trigger: 'change'}
+            // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
+          ],
+          // tackTime: [],
+          applyArctic: [
+            {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
+          ],
+          claimType: [
+            {required: true, message: '要求类型不能为空', trigger: 'change'}
+          ],
+          busStandCover: [
+            {required: true, message: '企标覆盖关系不能为空', trigger: 'change'}
+            // {type: 'string', validator: this.verify.checkSpecialCharacter2, trigger: 'blur'}
+          ],
+          // energyKind: [
+          //   {type: 'Array', validator: this.verify.valiCategory, trigger: 'change'}
+          // ],
+          //  orgName
+          remarks: [
+            {type: 'string', max: 1000, message: '备注不能超过1000个字符', trigger: 'change'}
+            // {validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
+          ]
+        },
+        importModalshowflag: false,
+        showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
+        importExcelUrl: 'api/att/attFile/uploadNew', // 导入EXCEL文档
+        exportModelFlag: false,
+        exportName: {},
+        standardForm: {},
+        defaultFileList: [], // 默认显示
+        currentFileList: '', // 当前操作的是哪个FormItem的上传
+        importModalshowflagtemp: false,
+        currentFile: '', // 当前操作的是哪个FormItem的上传
+        dynamicFormField: [],
+        displayLocation: [],
+        isMoreAwayBtn: false,
+        fileType: '',
+        editAddType: 1, // 1 新增、 2、编辑
+        importFailed: false,
+        importForm: {
+          content: ''
+        },
+        itemsText: '',
+        itemsTextDialogs: false,
+        textStatusMap: {},
+        standMap: {}
+      }
+    },
+    props: {},
+    watch: {},
+    methods: {
+      handleChangeList(data){
+        this.handleList = data
+      },
+      child1Func(child1) {
+        const list = []
+        if (child1 && child1.length > 1) {
+          for (let i = 0; i < child1.length; i++) {
+            list.push(child1[i])
+          }
+          return list
+        }
+        return child1
+      },
+      child3Func(child3) {
+        const list = []
+        if (child3 && child3.length > 1) {
+          list.push(child3[0])
+          return list
+        }
+        return child3
+      },
+      child4Func(child4) {
+        const list = []
+        if (child4 && child4.length > 1) {
+          list.push(child4[0])
+          return list
+        }
+        return child4
+      },
+      child5Func(child5) {
+        const list = []
+        if (child5 && child5.length > 1) {
+          list.push(child5[0])
+          return list
+        }
+        return child5
+      },
+      handleChange(val) {
+      },
+      handleChange1(val) {
+        if (val && val === '基础信息') {
+          this.activeState = true;
+        }
+      },
+      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');
+      },
+      // 将文本状态的id与name对应
+      setMap(data) {
+        data.forEach(item => {
+          this.$set(this.textStatusMap, item.value, item.label)
+          this.$set(this.standMap, item.value, item.label)
+        })
+      },
+      statusClick() {
+        let routeUrl = this.$router.resolve({
+          name: 'standInvolveProjectTwo',
+          query: {
+            resId: this.sarStandardsInfoEO.id
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      },
+      closeDrawer() {
+        this.modalStandItemflag = false
+      },
+      clearComparison() {
+        this.comparisonTitle = ''
+        this.getComparison()
+      },
+      // 验证条款号是否唯一
+      validCode(rule, value, callback) {
+        let find = 0
+        this.standItemList.map(item => {
+          if (item.itemsNum === value) {
+            find++
+          }
+        })
+        if (find > 1 && this.editAddType === 2) {
+          return callback(new Error('条款号已存在'))
+        } else if (find > 0 && this.editAddType === 1) {
+          return callback(new Error('条款号已存在'))
+        }
+        callback()
+      },
+      // 新增清单
+      submitDrawerForm(name) {
+        this.$refs[name].validate((valid) => {
+          if (valid) {
+            const formData = {
+              listName: this.listVO.name,
+              publicFlag: this.listVO.public ? '1' : '0' // 0: 不公开  1: 公开
+            }
+            this.$http.postData('lawss/sarStandCompareBase/saveSarStandCompareBase', formData,
+              {
+                _this: this,
+                loading: 'tableDataLoading'
+              }, res => {
+                if (res.ok) {
+                  this.AddcomparisonDrawer = false
+                  this.getComparison()
+                } else {
+                }
+              })
+          } else {
+          }
+        })
+      },
+      // 比对提交
+      comparisonSub() {
+        if (this.comparisonId === '') {
+          this.$message.error('请选择比对清单')
+        } else {
+          let standNum = ''
+          const item = this.sarStandardsInfoEO
+          if (item.standYear) {
+            standNum = `${item.standSortShow} ${item.standNumber}-${item.standYear}`
+          } else {
+            standNum = `${item.standSortShow} ${item.standNumber}`
+          }
           const formData = {
-            listName: this.listVO.name,
-            publicFlag: this.listVO.public ? '1' : '0' // 0: 不公开  1: 公开
+            compareBaseId: this.comparisonId,
+            list: [{
+              country: this.sarStandardsInfoEO.countryShow,
+              standNum: standNum,
+              standName: this.sarStandardsInfoEO.standName,
+              standId: this.sarStandardsInfoEO.id,
+              standType: this.$route.query.pageType
+            }]
           }
-          this.$http.postData('lawss/sarStandCompareBase/saveSarStandCompareBase', formData,
-            {
-              _this: this,
-              loading: 'tableDataLoading'
-            }, res => {
-              if (res.ok) {
-                this.AddcomparisonDrawer = false
-                this.getComparison()
-              } else {
-              }
-            })
-        } else {
-        }
-      })
-    },
-    // 比对提交
-    comparisonSub() {
-      if (this.comparisonId === '') {
-        this.$message.error('请选择比对清单')
-      } else {
-        let standNum = ''
-        const item = this.sarStandardsInfoEO
-        if (item.standYear) {
-          standNum = `${item.standSortShow} ${item.standNumber}-${item.standYear}`
-        } else {
-          standNum = `${item.standSortShow} ${item.standNumber}`
-        }
-        const formData = {
-          compareBaseId: this.comparisonId,
-          list: [{
-            country: this.sarStandardsInfoEO.countryShow,
-            standNum: standNum,
-            standName: this.sarStandardsInfoEO.standName,
-            standId: this.sarStandardsInfoEO.id,
-            standType: this.$route.query.pageType
-          }]
-        }
-        this.$http.postData('lawss/SarStandCompareList/save', formData, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            this.$router.push({
-              name: 'ViewStandardComparisonLibrary',
-              query: {
-                listId: this.comparisonId
-              }
-            })
-          }
-        })
-      }
-    },
-    // 比对关闭
-    comparisonClose() {
-      this.comparisonTitle = ''
-      this.comparisonId = ''
-      this.comparisonDialog = false
-    },
-    // 获取清单
-    getComparison() {
-      this.$http.get('lawss/sarStandCompareBase/page', {
-        listName: this.comparisonTitle,
-        page: '1',
-        pageSize: '99999',
-        publicFlag: 1
-      }, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          this.comparisonList = res.data.list
-        }
-      })
-    },
-    // 打开比对模态框
-    comparisonDialogOpen() {
-      this.comparisonDialog = true
-      this.getComparison()
-    },
-    // 比对新增
-    addComparison() {
-      this.AddcomparisonDrawer = true
-      this.listVO.name = ''
-      this.listVO.public = false
-    },
-    beforeUpload1(file) {
-      var filename = file.name
-      var index1 = filename.lastIndexOf('.')
-      var index2 = filename.length
-      var fileSuffix = filename.substring(index1, index2)
-      if (fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.PDF' || fileSuffix === '.ppt' || fileSuffix === '.pptx') {
-        return true
-      } else {
-        this.$message.error('文件' + file.name + '格式不正确，请上传doc、docx、ppt、pptx、pdf、或PDF文件')
-        return false
-      }
-      // 判断文件上传大小
-      if (file.size / 1024 / 1024 > 200) {// eslint-disable-line
-        this.$message.error('文件' + file.name + '大小不超过200M')
-        return false
-      }
-      return true
-    },
-    uploadSuccess1(res, file, fileList) {
-      if (res.ok) {
-        this.addForm.fileId += res.data.id + ','
-        this.$message({
-          message: '文件上传成功',
-          type: 'success'
-        })
-      } else {
-        this.importFailed = true
-        this.importForm.content = res.message
-      }
-    },
-    removeOneFile1(file, fileList) {
-      let ids = this.addForm.fileId.split(',')
-      if (file.response) {
-        let fileIds = file.response.data.id
-        let newIdList = this.removeAaary(ids, fileIds)
-        this.addForm.fileId = newIdList.join(',')
-      }
-    },
-    // 删除数组中的某个对象
-    removeAaary(_arr, _obj) {
-      var length = _arr.length
-      for (var i = 0; i < length; i++) {
-        if (_arr[i] === _obj) {
-          if (i === 0) {
-            _arr.shift() // 删除并返回数组的第一个元素
-            return _arr
-          } else if (i === length - 1) {
-            _arr.pop() // 删除并返回数组的最后一个元素
-            return _arr
-          } else {
-            _arr.splice(i, 1) // 删除下标为i的元素
-            return _arr
-          }
-        }
-      }
-    },
-    handleSelectionKnow(val) {
-      this.knowIdList = ''
-      val.map((item, index) => {
-        if (val.length === 1) {
-          this.knowIdList += item.id
-        } else if (index === val.length - 1) {
-          this.knowIdList += item.id
-        } else if (val.length > 1) {
-          this.knowIdList += item.id + ','
-        }
-      })
-    },
-    // 确定新增
-    AddKnowSub() {
-      this.$refs['addForm'].validate((valid) => {
-        if (valid) {
-          this.AddKnowSubLoading = true
-          if (this.knowType === 1) {
-            this.$http.postData('lawss/sarKnowledgeShare/addKnowShare', {
-              content: this.addForm.content,
-              title: this.addForm.title,
-              sarId: this.$route.query.id,
-              sarType: this.$route.query.pageType,
-              file: this.addForm.fileId
-            }, {
-              _this: this
-            }, res => {
-              if (res.ok) {
-                this.AddKnowClose()
-                this.getKnowList()
-                this.AddKnowSubLoading = false
-              } else {
-                this.AddKnowSubLoading = false
-              }
-            })
-          } else {
-            this.$http.putData('lawss/sarKnowledgeShare/updateKnowShare', {
-              content: this.addForm.content,
-              title: this.addForm.title,
-              sarId: this.$route.query.id,
-              sarType: this.$route.query.pageType,
-              file: this.addForm.fileId,
-              id: this.knowId
-            }, {
-              _this: this
-            }, res => {
-              if (res.ok) {
-                this.AddKnowClose()
-                this.getKnowList()
-                this.AddKnowSubLoading = false
-              } else {
-                this.AddKnowSubLoading = false
-              }
-            })
-          }
-        }
-      })
-    },
-    // 关闭知识点新增
-    AddKnowClose() {
-      this.defaultFileList = []
-      this.addForm.title = ''
-      this.addForm.content = ''
-      this.addForm.fileId = ''
-      this.knowId = ''
-      this.AddKnowledgDialog = false
-    },
-    //查看分解单分页
-    pageChange7(page) {
-      this.page7 = page
-      this.selectSarStandItems()
-    },
-    pageSizeChange7(pageSize) {
-      this.pageSize7 = pageSize
-      this.selectSarStandItems()
-    },
-    // 知识点分页
-    pageChange1(page) {
-      this.pageNo = page
-      this.getKnowList()
-    },
-    pageSizeChange1() {
-      this.getKnowList()
-    },
-    knowledgeSharing() {
-      this.knowledgeSharingDialog = true
-      this.getKnowList()
-    },
-    // 获取知识点列表数据
-    getKnowList() {
-      this.$http.get('lawss/sarKnowledgeShare/page', {
-        sarId: this.$route.query.id,
-        sarType: this.$route.query.pageType,
-        page: this.pageNo,
-        pageSize: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          this.knowList = res.data.list
-          this.total = res.data.count
-        }
-      })
-    },
-    handleCommand2(command) {
-      switch (command[1]) {
-        case '查看':
-          this.handleKnow(command[0])
-          break
-        case '编辑':
-          this.addknowledge(2, command[0])
-          break
-        case '删除':
-          this.deleteknowledge(1, command[0])
-          break
-      }
-    },
-    // 查看知识点
-    handleKnow(row) {
-      this.AddKnowledgDialogItem = true
-      this.knowSee = row
-    },
-    // 点击新增知识点
-    addknowledge(type, row) {
-      this.knowType = type
-      if (type === 1) {
-        this.KnowTitle = '新增知识点'
-        this.AddKnowledgDialog = true
-      } else {
-        this.KnowTitle = '编辑知识点'
-        this.AddKnowledgDialog = true
-        this.addForm.title = row.title
-        this.addForm.content = row.content
-        this.knowId = row.id
-        this.addForm.fileId = row.file
-        let fileList = row.fileList
-        if (fileList != null && fileList.length > 0) {
-          for (let i = 0; i < fileList.length; i++) {
-            let obj = {name: '', response: {}}
-            obj.name = fileList[i].oldFileName
-            obj.response.data = fileList[i]
-            this.defaultFileList.push(obj)
-          }
-        }
-      }
-    },
-    // 删除知识点
-    deleteknowledge(type, row) {
-      // type = 2为批量删除 1为单条删除
-      var ids = ''
-      if (type === 2) {
-        if (this.knowIdList.length === 0) {
-          this.$message.warning('请选择要删除的数据')
-          return
-        }
-        ids = this.knowIdList
-      } else {
-        ids = row.id
-      }
-      let title = ''
-      if (type === 2) {
-        title = '确定删除选中数据?'
-      } else {
-        title = '确定删除此数据？'
-      }
-      this.$confirm(title, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.$http.put('lawss/sarKnowledgeShare/deleteKnowShare', {ids: ids}, {
-          _this: this
-        }, res => {
-          if (res.ok) {
-            this.getKnowList()
-            this.$message({
-              type: 'success',
-              message: '删除成功!'
-            })
-          } else {
-            this.$message({
-              type: 'error',
-              message: '删除失败'
-            })
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
-      })
-    },
-    // 代替标准编号
-    showReplaceStandInfo(item) {
-      this.replaceStandInfoEO.standNumber = item
-      // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType
-      this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', this.replaceStandInfoEO, {
-        _this: this
-      }, res => {
-        if (res.data != null) {
-          let routeUrl = this.$router.resolve({
-            name: 'OtherStandardDetails',
-            params: {
-              id: res.data.id,
-              pageType: this.$route.query.pageType
+          this.$http.postData('lawss/SarStandCompareList/save', formData, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.$router.push({
+                name: 'ViewStandardComparisonLibrary',
+                query: {
+                  listId: this.comparisonId
+                }
+              })
             }
           })
-          window.open(routeUrl.href, '_blank')
-        } else {
-          this.$message.error('标准号已不存在!')
         }
-      }, e => {
-      })
-    },
-    clickButtonToUpload(current) {
-      this.currentFileList = current
-      this.currentFile = JSON.parse(JSON.stringify(current).replace('List', ''))
-      // this.importModalshowflagtemp = true
-      this.importModalshowflag = true
-      // this.$refs.importFileAboutStand.clearFiles()
-      this.defaultFileList = []
-      if (this.standItemEO[this.currentFile] === 'null' || this.standItemEO[this.currentFile] == null) {
-        this.standItemEO[this.currentFile] = ''
-      }
-      let fileList
-      if (this.standItemEO[this.currentFile] != null && this.standItemEO[this.currentFile] !== '') {
-        let paramefile = this.standItemEO[this.currentFile]
-        if (paramefile.charAt(paramefile.length - 1) === ',') {
-          paramefile = paramefile.substring(0, paramefile.length - 1)
-        }
-        this.$http.get('att/attFile/getMultiFileInfos', {
-          fileIds: paramefile
+      },
+      // 比对关闭
+      comparisonClose() {
+        this.comparisonTitle = ''
+        this.comparisonId = ''
+        this.comparisonDialog = false
+      },
+      // 获取清单
+      getComparison() {
+        this.$http.get('lawss/sarStandCompareBase/page', {
+          listName: this.comparisonTitle,
+          page: '1',
+          pageSize: '99999',
+          publicFlag: 1
         }, {
           _this: this
         }, res => {
-          fileList = res.data
+          if (res.ok) {
+            this.comparisonList = res.data.list
+          }
+        })
+      },
+      // 打开比对模态框
+      comparisonDialogOpen() {
+        this.comparisonDialog = true
+        this.getComparison()
+      },
+      // 比对新增
+      addComparison() {
+        this.AddcomparisonDrawer = true
+        this.listVO.name = ''
+        this.listVO.public = false
+      },
+      beforeUpload1(file) {
+        var filename = file.name
+        var index1 = filename.lastIndexOf('.')
+        var index2 = filename.length
+        var fileSuffix = filename.substring(index1, index2)
+        if (fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.PDF' || fileSuffix === '.ppt' || fileSuffix === '.pptx') {
+          return true
+        } else {
+          this.$message.error('文件' + file.name + '格式不正确，请上传doc、docx、ppt、pptx、pdf、或PDF文件')
+          return false
+        }
+        // 判断文件上传大小
+        if (file.size / 1024 / 1024 > 200) {// eslint-disable-line
+          this.$message.error('文件' + file.name + '大小不超过200M')
+          return false
+        }
+        return true
+      },
+      uploadSuccess1(res, file, fileList) {
+        if (res.ok) {
+          this.addForm.fileId += res.data.id + ','
+          this.$message({
+            message: '文件上传成功',
+            type: 'success'
+          })
+        } else {
+          this.importFailed = true
+          this.importForm.content = res.message
+        }
+      },
+      removeOneFile1(file, fileList) {
+        let ids = this.addForm.fileId.split(',')
+        if (file.response) {
+          let fileIds = file.response.data.id
+          let newIdList = this.removeAaary(ids, fileIds)
+          this.addForm.fileId = newIdList.join(',')
+        }
+      },
+      // 删除数组中的某个对象
+      removeAaary(_arr, _obj) {
+        var length = _arr.length
+        for (var i = 0; i < length; i++) {
+          if (_arr[i] === _obj) {
+            if (i === 0) {
+              _arr.shift() // 删除并返回数组的第一个元素
+              return _arr
+            } else if (i === length - 1) {
+              _arr.pop() // 删除并返回数组的最后一个元素
+              return _arr
+            } else {
+              _arr.splice(i, 1) // 删除下标为i的元素
+              return _arr
+            }
+          }
+        }
+      },
+      handleSelectionKnow(val) {
+        this.knowIdList = ''
+        val.map((item, index) => {
+          if (val.length === 1) {
+            this.knowIdList += item.id
+          } else if (index === val.length - 1) {
+            this.knowIdList += item.id
+          } else if (val.length > 1) {
+            this.knowIdList += item.id + ','
+          }
+        })
+      },
+      // 确定新增
+      AddKnowSub() {
+        this.$refs['addForm'].validate((valid) => {
+          if (valid) {
+            this.AddKnowSubLoading = true
+            if (this.knowType === 1) {
+              this.$http.postData('lawss/sarKnowledgeShare/addKnowShare', {
+                content: this.addForm.content,
+                title: this.addForm.title,
+                sarId: this.$route.query.id,
+                sarType: this.$route.query.pageType,
+                file: this.addForm.fileId
+              }, {
+                _this: this
+              }, res => {
+                if (res.ok) {
+                  this.AddKnowClose()
+                  this.getKnowList()
+                  this.AddKnowSubLoading = false
+                } else {
+                  this.AddKnowSubLoading = false
+                }
+              })
+            } else {
+              this.$http.putData('lawss/sarKnowledgeShare/updateKnowShare', {
+                content: this.addForm.content,
+                title: this.addForm.title,
+                sarId: this.$route.query.id,
+                sarType: this.$route.query.pageType,
+                file: this.addForm.fileId,
+                id: this.knowId
+              }, {
+                _this: this
+              }, res => {
+                if (res.ok) {
+                  this.AddKnowClose()
+                  this.getKnowList()
+                  this.AddKnowSubLoading = false
+                } else {
+                  this.AddKnowSubLoading = false
+                }
+              })
+            }
+          }
+        })
+      },
+      // 关闭知识点新增
+      AddKnowClose() {
+        this.defaultFileList = []
+        this.addForm.title = ''
+        this.addForm.content = ''
+        this.addForm.fileId = ''
+        this.knowId = ''
+        this.AddKnowledgDialog = false
+      },
+      //查看分解单分页
+      pageChange7(page) {
+        this.page7 = page
+        this.selectSarStandItems()
+      },
+      pageSizeChange7(pageSize) {
+        this.pageSize7 = pageSize
+        this.selectSarStandItems()
+      },
+      // 知识点分页
+      pageChange1(page) {
+        this.pageNo = page
+        this.getKnowList()
+      },
+      pageSizeChange1() {
+        this.getKnowList()
+      },
+      knowledgeSharing() {
+        this.knowledgeSharingDialog = true
+        this.getKnowList()
+      },
+      // 获取知识点列表数据
+      getKnowList() {
+        this.$http.get('lawss/sarKnowledgeShare/page', {
+          sarId: this.$route.query.id,
+          sarType: this.$route.query.pageType,
+          page: this.pageNo,
+          pageSize: this.$store.getters.userInfo.configContent
+        }, {
+          _this: this
+        }, res => {
+          if (res.ok) {
+            this.knowList = res.data.list
+            this.total = res.data.count
+          }
+        })
+      },
+      handleCommand2(command) {
+        switch (command[1]) {
+          case '查看':
+            this.handleKnow(command[0])
+            break
+          case '编辑':
+            this.addknowledge(2, command[0])
+            break
+          case '删除':
+            this.deleteknowledge(1, command[0])
+            break
+        }
+      },
+      // 查看知识点
+      handleKnow(row) {
+        this.AddKnowledgDialogItem = true
+        this.knowSee = row
+      },
+      // 点击新增知识点
+      addknowledge(type, row) {
+        this.knowType = type
+        if (type === 1) {
+          this.KnowTitle = '新增知识点'
+          this.AddKnowledgDialog = true
+        } else {
+          this.KnowTitle = '编辑知识点'
+          this.AddKnowledgDialog = true
+          this.addForm.title = row.title
+          this.addForm.content = row.content
+          this.knowId = row.id
+          this.addForm.fileId = row.file
+          let fileList = row.fileList
           if (fileList != null && fileList.length > 0) {
             for (let i = 0; i < fileList.length; i++) {
               let obj = {name: '', response: {}}
@@ -2330,418 +2151,566 @@ export default {
               this.defaultFileList.push(obj)
             }
           }
-        }, e => {
-        })
-      }
-    },
-    // 新增、编辑上传文件之前的钩子
-    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 === 'pdf' || fileSuffix === 'PDF' || fileSuffix === 'doc' || fileSuffix === 'docx' || fileSuffix === 'ppt' || fileSuffix === 'pptx') {
-      if (fileSuffix === '.xlsx') {
-        return true
-      } else {
-        // this.$message.error('文件' + file.name + '格式不正确,请上传pdf、PDF、doc、docx、ppt、pptx文件')
-        this.$message.error('文件' + file.name + '格式不正确,请上传xlsx文件')
-        return false
-      }
-      // 判断文件上传大小
-      if (file.size / 1024 / 1024 <= 200) {// eslint-disable-line
-        return true
-      } else {
-        this.$message.error('文件' + file.name + '大小不超过200M')
-        return false
-      }
-      return true
-    },
-    // 导入标准数据成功后执行
-    importFileSuccess(res, file, fileList) {
-      if (res.ok) {
-        // 使用字条款是否展示模态框判断导入的文件是标准，还是条款modalStandItemflag
-        // this.selectSarStandItems(this.standItemSearch.standId)
-        // this.showUploadlist = true
-        this.selectSarStandItems()
-        this.importModalshowflag = false
-        this.$message({
-          message: res.message,
-          type: 'success'
-        })
-      } else {
-        this.importFailed = true
-        this.importForm.content = res.message
-        this.showUploadlist = false
-      }
-    },
-    removeOneFile(file, fileList) {
-      // this.sarStandardsInfoEO[this.currentFileList] = this.removeAaary(this.sarStandardsInfoEO[this.currentFileList], file.response.data)
-      let ids = this.sarStandardsInfoEO[this.currentFile].split(',')
-      if (file.response) {
-        let fileIds = file.response.data.id
-        let newIdList = this.removeAaary(ids, fileIds)
-        let newStr = ''
-        if (newIdList != null && newIdList.length > 0) {
-          for (let i = 0; i < newIdList.length; i++) {
-            if (newIdList[i] !== '') {
-              newStr += newIdList[i] + ','
-            }
+        }
+      },
+      // 删除知识点
+      deleteknowledge(type, row) {
+        // type = 2为批量删除 1为单条删除
+        var ids = ''
+        if (type === 2) {
+          if (this.knowIdList.length === 0) {
+            this.$message.warning('请选择要删除的数据')
+            return
           }
-          this.sarStandardsInfoEO[this.currentFile] = newStr
+          ids = this.knowIdList
         } else {
-          this.sarStandardsInfoEO[this.currentFile] = ''
+          ids = row.id
         }
-      }
-    },
-    // 导入文件大小超出范围
-    handleSizeError(file) {
-      this.$message.error('文件' + file.name + '大小不超过200M')
-    },
-    // 导入标准文件格式错误执行
-    handleFormatError(file) {
-      this.$message.error('文件' + file.name + '格式不正确，请上传以.xlsx结尾的excel文件')
-    },
-    // 子条款部门名称改变后
-    itemOrgNameChange() {
-      if (this.standItemEO.orgName === '') {
-        this.standItemEO.responsibleUnit = ''
-      }
-      this.getOrgTreeSource()
-    },
-    treeDblClickEngin(treeId, treeNode) {
-      this.standItemEO.dutyEngineer = treeNode.id
-      this.standItemEO.dutyEngineerShow = treeNode.name
-      $('#enginBtnS').click()
-    },
-    treeDblClickFO(treeId, treeNode) {
-      this.standItemEO.fo = treeNode.id
-      this.standItemEO.foShow = treeNode.name
-      $('#foBtnS').click()
-    },
-    // 标准条款新增
-    saveOrUpdateStandItem() {
-      this.$refs['sarStandardsItemForm'].validate((valid) => {
-        if (valid) {
-          let nowstandItem = JSON.parse(JSON.stringify(this.standItemEO))
-          nowstandItem.applyArctic = nowstandItem.applyArctic.join(',')
-          nowstandItem.standId = this.standItemSearch.standId
-          nowstandItem.fileType = this.fileType
-          // 新增
-          if (this.itemAddOrUPdateFlag === 1) {
-            this.$http.postData('lawss/sarStandItems/addSarStandItemsList', nowstandItem, {
-              _this: this,
-              loading: 'isSubmit'
-            }, res => {
-              this.selectSarStandItems(this.standItemSearch.standId)
-              this.resetForm()
-            }, e => {
-            })
-          } else {
-            // 修改
-            this.$http.postData('lawss/sarStandItems/updateStandItem', nowstandItem, {
-              _this: this,
-              loading: 'isSubmit'
-            }, res => {
-              this.selectSarStandItems(this.standItemSearch.standId)
-              this.standItemEO.responsibleUnit = ''
-              this.selectedItemList = []
-              this.resetForm()
-            }, e => {
-            })
-          }
+        let title = ''
+        if (type === 2) {
+          title = '确定删除选中数据?'
         } else {
-          this.$message.error('请检查表单是否填写正确!')
+          title = '确定删除此数据？'
         }
-      })
-    },
-    // 表单清空
-    resetForm() {
-      this.$nextTick(() => {
-        // this.$refs['sarStandardsItemForm'].resetFields()
-        this.$refs['sarStandardsItemForm'].clearValidate()
-      })
-      this.modalItemaddShowflag = false
-    },
-    drawerCheckZRBM(data) {
-      let idList = ''
-      let nameList = ''
-      data.forEach(item => {
-        // if (item.hasChild === '0' && item.children === null) {
-        if (nameList.length > 0) {
-          nameList += ','
-          idList += ','
-        }
-        idList += item.id
-        nameList += item.name
-        // }
-      })
-      if (this.drawerTitle === '责任部门') {
-        this.sarStandardsInfoEO.ZRBMId = idList;
-        this.sarStandardsInfoEO['ZRBM'] = nameList;
-      } else if (this.drawerTitle === '查询责任部门') {
-        this.advanceSearchMapping['ZRBM'] = nameList
-      }
-    },
-    choiceZRRS(type, title, id) {
-      this.nodeList2 = []
-      if (id) {
-        let ids = id.split(',')
-        let idList = []
-        ids.forEach(item => {
-          let a, b
-          a = item.substring(item.indexOf('(') +1)
-          b = a.substring(0, a.lastIndexOf(')'))
-          idList.push(b)
-        })
-        idList = idList.join(',')
-        this.nodeList2.push(idList)
-      }
-      this.userType = type
-      this.drawerTitle = title
-      this.modalShowRoleFlag = true
-    },
-    checkedRole2(data) {
-      let idList = ''
-      let nameList = ''
-      data.forEach(item => {
-        if (nameList.length > 0) {
-          nameList += ','
-          idList += ','
-        }
-        idList += item.id
-        nameList += item.name
-      })
-      if (this.drawerTitle === '查询责任工程师') {
-        this.resolveListForm.dutyEngineer = nameList
-      }
-    },
-    // select(selection, row) {
-    //   // 清除 所有勾选项
-    //   this.$refs.multipleTable.clearSelection()
-    //   // 当表格数据都没有被勾选的时候 就返回
-    //   // 主要用于将当前勾选的表格状态清除
-    //   if (selection.length === 0) return
-    //   this.$refs.multipleTable.toggleRowSelection(row, true)
-    // },
-    selectAllStand(alldata) {
-      this.selectedItemList = alldata
-    },
-    editResolveList() {
-      if (this.selectedItemList.length < 1) {
-        this.$message.warning('请选择一条数据')
-      } else if (this.selectedItemList.length === 1) {
-        this.resolveListForm = JSON.parse(JSON.stringify(this.selectedItemList[0]))
-        this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : ''
-        // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
-        this.resolveListForm.xccssrq = this.resolveListForm.xccssrq ? this.resolveListForm.xccssrq.split(',') : ''
-        this.resolveListForm.zccssrq = this.resolveListForm.zccssrq ? this.resolveListForm.zccssrq.split(',') : ''
-        this.editResolveListShowflag = true
-      } else {
-        this.$message.warning('仅可选择一条数据')
-      }
-    },
-    saveEditInfo() {
-      if (typeof this.resolveListForm.xccssrq !== 'string') {
-        this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
-      }
-      if (typeof this.resolveListForm.zccssrq !== 'string') {
-        this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',')
-      }
-      if (typeof this.resolveListForm.applyArctic !== 'string') {
-        this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',')
-      }
-      this.$http.putData(
-        'SarStandItems/sar-stand-items/updateSarItemAndInterpretation',
-        this.resolveListForm,
-        {
-          _this: this,
-        },
-        (res) => {
-          if (res.ok) {
-            this.$message.success('修改成功')
-            this.resetEditResolveListForm()
-            this.showItemsModel()
-          }
-        }
-      )
-    },
-    resetEditResolveListForm() {
-      this.resolveListForm.applyArctic = ''
-      this.resolveListForm.dutyEngineer = ''
-      this.editResolveListShowflag = false
-    },
-    // 分页点击后方法
-    pageChange(page) {
-      this.standItemSearch.page = page
-      this.selectSarStandItems()
-    },
-    // 分页每页显示数改变后方法
-    pageSizeChange(pageSize) {
-      // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.standItemSearch.pageSize = pageSize;
-      this.selectSarStandItems()
-      // 此处需要调用接口，修改个人配置
-    },
-    selectStandMessage() {
-      return new Promise((resolve, reject) => {
-        this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
-          _this: this
-        }, res => {
-          this.sarStandardsInfoEO = res.data || {}
-          this.itemExistList = new Set(this.sarStandardsInfoEO.attrInfoMap.itemExistList)
-          if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
-            this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
-          }
-          if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
-            this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.split(' ')[0]
-          }
-          // 代替标准号
-          if (this.sarStandardsInfoEO.replaceStandNum) {
-            this.sarStandardsInfoEO.replaceStandNum = this.sarStandardsInfoEO.replaceStandNum.replace(/<br \/>/g, '\r\n')
-            this.sarStandardsInfoEO.replaceStandNum = this.sarStandardsInfoEO.replaceStandNum.replace(/<br \/>/g, '\n')
-          }
-          if (this.sarStandardsInfoEO.replaceStandNum != null && this.sarStandardsInfoEO.replaceStandNum !== '') {
-            this.replaceNumList = this.sarStandardsInfoEO.replaceStandNum.split(',')
-          }
-          // // 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]
+        this.$confirm(title, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$http.put('lawss/sarKnowledgeShare/deleteKnowShare', {ids: ids}, {
+            _this: this
+          }, res => {
+            if (res.ok) {
+              this.getKnowList()
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+              })
+            } else {
+              this.$message({
+                type: 'error',
+                message: '删除失败'
+              })
             }
           })
-          this.addPersonCookie()
-          resolve(res.data)
-        }, e => {
-          reject(e)
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
         })
-      })
-    },
-    // 新增浏览记录
-    addPersonCookie() {
-      this.personCookieEO.cookieType = this.$route.query.pageType
-      if (this.sarStandardsInfoEO.standYear != null && this.sarStandardsInfoEO.standYear !== '') {
-        this.personCookieEO.resTitle = this.sarStandardsInfoEO.standName + '(编号：' + this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + ')'
-      } else {
-        this.personCookieEO.resTitle = this.sarStandardsInfoEO.standName + '(编号：' + this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + ')'
-      }
-      this.personCookieEO.resId = this.$route.query.id
-      this.$http.postData('person/personCookies/create', this.personCookieEO, {
-        _this: this
-      }, res => {
-      }, e => {
-      })
-    },
-    // 获取组织机构数据
-    getOrgTreeSource() {
-      this.$http.get('sys/org/getTree', {}, {_this: this},
-        res => {
-          if (res.ok) {
-            let treeNode = []
-            res.data.map((item, index) => {
-              let treeItem = {}
-              for (let key in item) {
-                if (key === 'orgName') {
-                  treeItem.name = item[key]
-                } else {
-                  treeItem[key] = item[key]
-                }
+      },
+      // 代替标准编号
+      showReplaceStandInfo(item) {
+        this.replaceStandInfoEO.standNumber = item
+        // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType
+        this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', this.replaceStandInfoEO, {
+          _this: this
+        }, res => {
+          if (res.data != null) {
+            let routeUrl = this.$router.resolve({
+              name: 'OtherStandardDetails',
+              params: {
+                id: res.data.id,
+                pageType: this.$route.query.pageType
               }
-              treeNode[index] = treeItem
             })
-            this.zNodesSItem = treeNode
-            this.searchInlandNodes = treeNode
-          }
-        }, e => {
-        })
-    },
-    getUserTreeSource() {
-      this.$http.get('sys/org/getTree', {}, {_this: this},
-        res => {
-          if (res.ok) {
-            let treeNode = []
-            res.data.map((item, index) => {
-              let treeItem = {}
-              for (let key in item) {
-                if (key === 'orgName') {
-                  treeItem.name = item[key]
-                } else {
-                  treeItem[key] = item[key]
-                }
-              }
-              treeNode[index] = treeItem
-            })
-            this.zNodesSItemEngin = treeNode
-          }
-        }, e => {
-        })
-    },
-    // 查询相近标准
-    selectCloseStand(id) {
-      let obj = {}
-      obj.id = id
-      let url = ''
-      url = 'lawss/sarStandardsInfo/selectCloseStand'
-      this.$http.get(url, obj, {
-        _this: this
-      }, res => {
-        if (res.ok) {
-          this.recommendList = res.data
-        }
-      }, e => {
-      })
-    },
-    getBusStandFileByAttId(attId) {
-      return new Promise((resolve, reject) => {
-        getBusStandFileByAttId({
-          attId
-        }).then(res => {
-          if (res.ok) {
-            resolve(res.data)
+            window.open(routeUrl.href, '_blank')
           } else {
-            reject()
+            this.$message.error('标准号已不存在!')
           }
-        }).catch(e => {
-          reject(e)
+        }, e => {
         })
-      })
-    },
-    openFileInPdf(attId, oldFileName) {
-      // 判断是否是图片格式，图片格式不预览，直接下载
-      let index1 = oldFileName.lastIndexOf('.')
-      let index2 = oldFileName.length
-      let fileSuffix = oldFileName.substring(index1, index2)
-      //把后缀转大写
-      if (fileSuffix !== undefined && fileSuffix !== null) {
-        fileSuffix = fileSuffix.toUpperCase()
-      }
-      // 判断上传文件格式
-      if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
-        this.downloadFile(attId)
+      },
+      clickButtonToUpload(current) {
+        this.currentFileList = current
+        this.currentFile = JSON.parse(JSON.stringify(current).replace('List', ''))
+        // this.importModalshowflagtemp = true
+        this.importModalshowflag = true
+        // this.$refs.importFileAboutStand.clearFiles()
+        this.defaultFileList = []
+        if (this.standItemEO[this.currentFile] === 'null' || this.standItemEO[this.currentFile] == null) {
+          this.standItemEO[this.currentFile] = ''
+        }
+        let fileList
+        if (this.standItemEO[this.currentFile] != null && this.standItemEO[this.currentFile] !== '') {
+          let paramefile = this.standItemEO[this.currentFile]
+          if (paramefile.charAt(paramefile.length - 1) === ',') {
+            paramefile = paramefile.substring(0, paramefile.length - 1)
+          }
+          this.$http.get('att/attFile/getMultiFileInfos', {
+            fileIds: paramefile
+          }, {
+            _this: this
+          }, res => {
+            fileList = res.data
+            if (fileList != null && fileList.length > 0) {
+              for (let i = 0; i < fileList.length; i++) {
+                let obj = {name: '', response: {}}
+                obj.name = fileList[i].oldFileName
+                obj.response.data = fileList[i]
+                this.defaultFileList.push(obj)
+              }
+            }
+          }, e => {
+          })
+        }
+      },
+      // 新增、编辑上传文件之前的钩子
+      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 === 'pdf' || fileSuffix === 'PDF' || fileSuffix === 'doc' || fileSuffix === 'docx' || fileSuffix === 'ppt' || fileSuffix === 'pptx') {
+        if (fileSuffix === '.xlsx') {
+          return true
+        } else {
+          // this.$message.error('文件' + file.name + '格式不正确,请上传pdf、PDF、doc、docx、ppt、pptx文件')
+          this.$message.error('文件' + file.name + '格式不正确,请上传xlsx文件')
+          return false
+        }
+        // 判断文件上传大小
+        if (file.size / 1024 / 1024 <= 200) {// eslint-disable-line
+          return true
+        } else {
+          this.$message.error('文件' + file.name + '大小不超过200M')
+          return false
+        }
         return true
-      }
-      // 缺少文件
-      if (this.$route.query.pageType === 'INLAND_STAND') {
-        if (this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
-          if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
-            this.getBusStandFileByAttId(attId)
-              .then(res => {
-                if (res) {
-                  const editFileInfo = res
-                  if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
-                    window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
+      },
+      // 导入标准数据成功后执行
+      importFileSuccess(res, file, fileList) {
+        if (res.ok) {
+          // 使用字条款是否展示模态框判断导入的文件是标准，还是条款modalStandItemflag
+          // this.selectSarStandItems(this.standItemSearch.standId)
+          // this.showUploadlist = true
+          this.selectSarStandItems()
+          this.importModalshowflag = false
+          this.$message({
+            message: res.message,
+            type: 'success'
+          })
+        } else {
+          this.importFailed = true
+          this.importForm.content = res.message
+          this.showUploadlist = false
+        }
+      },
+      removeOneFile(file, fileList) {
+        // this.sarStandardsInfoEO[this.currentFileList] = this.removeAaary(this.sarStandardsInfoEO[this.currentFileList], file.response.data)
+        let ids = this.sarStandardsInfoEO[this.currentFile].split(',')
+        if (file.response) {
+          let fileIds = file.response.data.id
+          let newIdList = this.removeAaary(ids, fileIds)
+          let newStr = ''
+          if (newIdList != null && newIdList.length > 0) {
+            for (let i = 0; i < newIdList.length; i++) {
+              if (newIdList[i] !== '') {
+                newStr += newIdList[i] + ','
+              }
+            }
+            this.sarStandardsInfoEO[this.currentFile] = newStr
+          } else {
+            this.sarStandardsInfoEO[this.currentFile] = ''
+          }
+        }
+      },
+      // 导入文件大小超出范围
+      handleSizeError(file) {
+        this.$message.error('文件' + file.name + '大小不超过200M')
+      },
+      // 导入标准文件格式错误执行
+      handleFormatError(file) {
+        this.$message.error('文件' + file.name + '格式不正确，请上传以.xlsx结尾的excel文件')
+      },
+      // 子条款部门名称改变后
+      itemOrgNameChange() {
+        if (this.standItemEO.orgName === '') {
+          this.standItemEO.responsibleUnit = ''
+        }
+        this.getOrgTreeSource()
+      },
+      treeDblClickEngin(treeId, treeNode) {
+        this.standItemEO.dutyEngineer = treeNode.id
+        this.standItemEO.dutyEngineerShow = treeNode.name
+        $('#enginBtnS').click()
+      },
+      treeDblClickFO(treeId, treeNode) {
+        this.standItemEO.fo = treeNode.id
+        this.standItemEO.foShow = treeNode.name
+        $('#foBtnS').click()
+      },
+      // 标准条款新增
+      saveOrUpdateStandItem() {
+        this.$refs['sarStandardsItemForm'].validate((valid) => {
+          if (valid) {
+            let nowstandItem = JSON.parse(JSON.stringify(this.standItemEO))
+            nowstandItem.applyArctic = nowstandItem.applyArctic.join(',')
+            nowstandItem.standId = this.standItemSearch.standId
+            nowstandItem.fileType = this.fileType
+            // 新增
+            if (this.itemAddOrUPdateFlag === 1) {
+              this.$http.postData('lawss/sarStandItems/addSarStandItemsList', nowstandItem, {
+                _this: this,
+                loading: 'isSubmit'
+              }, res => {
+                this.selectSarStandItems(this.standItemSearch.standId)
+                this.resetForm()
+              }, e => {
+              })
+            } else {
+              // 修改
+              this.$http.postData('lawss/sarStandItems/updateStandItem', nowstandItem, {
+                _this: this,
+                loading: 'isSubmit'
+              }, res => {
+                this.selectSarStandItems(this.standItemSearch.standId)
+                this.standItemEO.responsibleUnit = ''
+                this.selectedItemList = []
+                this.resetForm()
+              }, e => {
+              })
+            }
+          } else {
+            this.$message.error('请检查表单是否填写正确!')
+          }
+        })
+      },
+      // 表单清空
+      resetForm() {
+        this.$nextTick(() => {
+          // this.$refs['sarStandardsItemForm'].resetFields()
+          this.$refs['sarStandardsItemForm'].clearValidate()
+        })
+        this.modalItemaddShowflag = false
+      },
+      drawerCheckZRBM(data) {
+        let idList = ''
+        let nameList = ''
+        data.forEach(item => {
+          // if (item.hasChild === '0' && item.children === null) {
+          if (nameList.length > 0) {
+            nameList += ','
+            idList += ','
+          }
+          idList += item.id
+          nameList += item.name
+          // }
+        })
+        if (this.drawerTitle === '责任部门') {
+          this.sarStandardsInfoEO.ZRBMId = idList;
+          this.sarStandardsInfoEO['ZRBM'] = nameList;
+        } else if (this.drawerTitle === '查询责任部门') {
+          this.advanceSearchMapping['ZRBM'] = nameList
+        }
+      },
+      choiceZRRS(type, title, id) {
+        this.nodeList2 = []
+        if (id) {
+          let ids = id.split(',')
+          let idList = []
+          ids.forEach(item => {
+            let a, b
+            a = item.substring(item.indexOf('(') +1)
+            b = a.substring(0, a.lastIndexOf(')'))
+            idList.push(b)
+          })
+          idList = idList.join(',')
+          this.nodeList2.push(idList)
+        }
+        this.userType = type
+        this.drawerTitle = title
+        this.modalShowRoleFlag = true
+      },
+      checkedRole2(data) {
+        let idList = ''
+        let nameList = ''
+        data.forEach(item => {
+          if (nameList.length > 0) {
+            nameList += ','
+            idList += ','
+          }
+          idList += item.id
+          nameList += item.name
+        })
+        if (this.drawerTitle === '查询责任工程师') {
+          this.resolveListForm.dutyEngineer = nameList
+        }
+      },
+      // select(selection, row) {
+      //   // 清除 所有勾选项
+      //   this.$refs.multipleTable.clearSelection()
+      //   // 当表格数据都没有被勾选的时候 就返回
+      //   // 主要用于将当前勾选的表格状态清除
+      //   if (selection.length === 0) return
+      //   this.$refs.multipleTable.toggleRowSelection(row, true)
+      // },
+      selectAllStand(alldata) {
+        this.selectedItemList = alldata
+      },
+      editResolveList() {
+        if (this.selectedItemList.length < 1) {
+          this.$message.warning('请选择一条数据')
+        } else if (this.selectedItemList.length === 1) {
+          this.resolveListForm = JSON.parse(JSON.stringify(this.selectedItemList[0]))
+          this.resolveListForm.termsConditions = this.resolveListForm.termsConditions ? this.resolveListForm.termsConditions.replace(/<.*?>/ig, ' ') : ''
+          // this.resolveListForm.readContent = this.readContent?this.readContent.replace(/<.*?>/ig, ' '):''
+          this.resolveListForm.xccssrq = this.resolveListForm.xccssrq ? this.resolveListForm.xccssrq.split(',') : ''
+          this.resolveListForm.zccssrq = this.resolveListForm.zccssrq ? this.resolveListForm.zccssrq.split(',') : ''
+          this.editResolveListShowflag = true
+        } else {
+          this.$message.warning('仅可选择一条数据')
+        }
+      },
+      saveEditInfo() {
+        if (typeof this.resolveListForm.xccssrq !== 'string') {
+          this.resolveListForm.xccssrq = this.resolveListForm.xccssrq.join(',')
+        }
+        if (typeof this.resolveListForm.zccssrq !== 'string') {
+          this.resolveListForm.zccssrq = this.resolveListForm.zccssrq.join(',')
+        }
+        if (typeof this.resolveListForm.applyArctic !== 'string') {
+          this.resolveListForm.applyArctic = this.resolveListForm.applyArctic.join(',')
+        }
+        this.$http.putData(
+          'SarStandItems/sar-stand-items/updateSarItemAndInterpretation',
+          this.resolveListForm,
+          {
+            _this: this,
+          },
+          (res) => {
+            if (res.ok) {
+              this.$message.success('修改成功')
+              this.resetEditResolveListForm()
+              this.showItemsModel()
+            }
+          }
+        )
+      },
+      resetEditResolveListForm() {
+        this.resolveListForm.applyArctic = ''
+        this.resolveListForm.dutyEngineer = ''
+        this.editResolveListShowflag = false
+      },
+      // 分页点击后方法
+      pageChange(page) {
+        this.standItemSearch.page = page
+        this.selectSarStandItems()
+      },
+      // 分页每页显示数改变后方法
+      pageSizeChange(pageSize) {
+        // this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent
+        this.standItemSearch.pageSize = pageSize;
+        this.selectSarStandItems()
+        // 此处需要调用接口，修改个人配置
+      },
+      selectStandMessage() {
+        return new Promise((resolve, reject) => {
+          this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, {
+            _this: this
+          }, res => {
+            this.sarStandardsInfoEO = res.data || {}
+            this.itemExistList = new Set(this.sarStandardsInfoEO.attrInfoMap.itemExistList)
+            if (this.sarStandardsInfoEO.issueTime != null && this.sarStandardsInfoEO.issueTime !== '') {
+              this.sarStandardsInfoEO.issueTime = this.sarStandardsInfoEO.issueTime.split(' ')[0]
+            }
+            if (this.sarStandardsInfoEO.putTime != null && this.sarStandardsInfoEO.putTime !== '') {
+              this.sarStandardsInfoEO.putTime = this.sarStandardsInfoEO.putTime.split(' ')[0]
+            }
+            // 代替标准号
+            if (this.sarStandardsInfoEO.replaceStandNum) {
+              this.sarStandardsInfoEO.replaceStandNum = this.sarStandardsInfoEO.replaceStandNum.replace(/<br \/>/g, '\r\n')
+              this.sarStandardsInfoEO.replaceStandNum = this.sarStandardsInfoEO.replaceStandNum.replace(/<br \/>/g, '\n')
+            }
+            if (this.sarStandardsInfoEO.replaceStandNum != null && this.sarStandardsInfoEO.replaceStandNum !== '') {
+              this.replaceNumList = this.sarStandardsInfoEO.replaceStandNum.split(',')
+            }
+            // // 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]
+              }
+            })
+            this.addPersonCookie()
+            resolve(res.data)
+          }, e => {
+            reject(e)
+          })
+        })
+      },
+      // 新增浏览记录
+      addPersonCookie() {
+        this.personCookieEO.cookieType = this.$route.query.pageType
+        if (this.sarStandardsInfoEO.standYear != null && this.sarStandardsInfoEO.standYear !== '') {
+          this.personCookieEO.resTitle = this.sarStandardsInfoEO.standName + '(编号：' + this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + ')'
+        } else {
+          this.personCookieEO.resTitle = this.sarStandardsInfoEO.standName + '(编号：' + this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + ')'
+        }
+        this.personCookieEO.resId = this.$route.query.id
+        this.$http.postData('person/personCookies/create', this.personCookieEO, {
+          _this: this
+        }, res => {
+        }, e => {
+        })
+      },
+      // 获取组织机构数据
+      getOrgTreeSource() {
+        this.$http.get('sys/org/getTree', {}, {_this: this},
+          res => {
+            if (res.ok) {
+              let treeNode = []
+              res.data.map((item, index) => {
+                let treeItem = {}
+                for (let key in item) {
+                  if (key === 'orgName') {
+                    treeItem.name = item[key]
                   } 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)
+                    treeItem[key] = item[key]
                   }
                 }
-              }).catch(e => {
-              console.log(e)
-              this.$message.warning('文件不存在,预览失败')
-            })
+                treeNode[index] = treeItem
+              })
+              this.zNodesSItem = treeNode
+              this.searchInlandNodes = treeNode
+            }
+          }, e => {
+          })
+      },
+      getUserTreeSource() {
+        this.$http.get('sys/org/getTree', {}, {_this: this},
+          res => {
+            if (res.ok) {
+              let treeNode = []
+              res.data.map((item, index) => {
+                let treeItem = {}
+                for (let key in item) {
+                  if (key === 'orgName') {
+                    treeItem.name = item[key]
+                  } else {
+                    treeItem[key] = item[key]
+                  }
+                }
+                treeNode[index] = treeItem
+              })
+              this.zNodesSItemEngin = treeNode
+            }
+          }, e => {
+          })
+      },
+      // 查询相近标准
+      selectCloseStand(id) {
+        let obj = {}
+        obj.id = id
+        let url = ''
+        url = 'lawss/sarStandardsInfo/selectCloseStand'
+        this.$http.get(url, obj, {
+          _this: this
+        }, res => {
+          if (res.ok) {
+            this.recommendList = res.data
+          }
+        }, e => {
+        })
+      },
+      getBusStandFileByAttId(attId) {
+        return new Promise((resolve, reject) => {
+          getBusStandFileByAttId({
+            attId
+          }).then(res => {
+            if (res.ok) {
+              resolve(res.data)
+            } else {
+              reject()
+            }
+          }).catch(e => {
+            reject(e)
+          })
+        })
+      },
+      openFileInPdf(attId, oldFileName) {
+        // 判断是否是图片格式，图片格式不预览，直接下载
+        let index1 = oldFileName.lastIndexOf('.')
+        let index2 = oldFileName.length
+        let fileSuffix = oldFileName.substring(index1, index2)
+        //把后缀转大写
+        if (fileSuffix !== undefined && fileSuffix !== null) {
+          fileSuffix = fileSuffix.toUpperCase()
+        }
+        // 判断上传文件格式
+        if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') {
+          this.downloadFile(attId)
+          return true
+        }
+        // 缺少文件
+        if (this.$route.query.pageType === 'INLAND_STAND') {
+          if (this.$hasPermission('2d6ab9d465ab73d415194e1ca4313793')) {
+            if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
+              this.getBusStandFileByAttId(attId)
+                .then(res => {
+                  if (res) {
+                    const editFileInfo = res
+                    if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
+                      window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
+                    } 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)
+                    }
+                  }
+                }).catch(e => {
+                console.log(e)
+                this.$message.warning('文件不存在,预览失败')
+              })
+            } else {
+              this.$http.get('lawss/sarStandFile/queryConvertAtt', {
+                attId: attId
+              }, {
+                _this: this
+              }, res => {
+                if (res.data) {
+                  let fileObj = {}
+                  fileObj.fileId = res.data.attId
+                  fileObj.fileName = oldFileName
+                  let fileList = []
+                  let repeatData = 0
+                  if (sessionStorage.getItem('fileInfo')) {
+                    fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
+                    if (fileList != null && fileList.length > 0) {
+                      for (let i = 0; i < fileList.length; i++) {
+                        if (fileList[i].fileId === res.data.attId) {
+                          repeatData = 1
+                          break
+                        }
+                      }
+                      if (repeatData === 0) {
+                        fileList.push(fileObj)
+                        fileList = JSON.stringify(fileList)
+                        sessionStorage.setItem('fileInfo', fileList)
+                      }
+                    }
+                  } else {
+                    fileList.push(fileObj)
+                    fileList = JSON.stringify(fileList)
+                    sessionStorage.setItem('fileInfo', fileList)
+                  }
+                  window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
+                } else {
+                  this.$message.error('文档未转换成功或本地读取不到该文档')
+                }
+              }, e => {
+                this.$message.error('文档未转换成功或本地读取不到该文档')
+              })
+            }
           } else {
+            this.$message.error('没有在线预览文档权限！')
+          }
+        } else {
+          // 国外在线预览权限
+          if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) {
+            // if (this.$hasPermission('02fd6eff0537c283dd071683de10689f')) {
+
             this.$http.get('lawss/sarStandFile/queryConvertAtt', {
               attId: attId
             }, {
@@ -2780,306 +2749,233 @@ export default {
             }, e => {
               this.$message.error('文档未转换成功或本地读取不到该文档')
             })
+          } else {
+            this.$message.error('没有在线预览文档权限！')
           }
-        } else {
-          this.$message.error('没有在线预览文档权限！')
         }
-      } else {
-        // 国外在线预览权限
-        if (this.$hasPermission('ee684b4a9975f5d8a6dfe898c0332f98')) {
-          // if (this.$hasPermission('02fd6eff0537c283dd071683de10689f')) {
-
-          this.$http.get('lawss/sarStandFile/queryConvertAtt', {
-            attId: attId
+        if(this.$route.query.pageType === 'INLAND_STAND'){
+          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+          this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{
+            standNumber: standNumber,
+            standName: this.sarStandardsInfoEO.standName
+          }, {
+            _this: this
+          }, res => {
+          })
+        }else{
+          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+          this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{
+            standNumber: standNumber,
+            standName: this.sarStandardsInfoEO.standEnName
           }, {
             _this: this
           }, res => {
-            if (res.data) {
-              let fileObj = {}
-              fileObj.fileId = res.data.attId
-              fileObj.fileName = oldFileName
-              let fileList = []
-              let repeatData = 0
-              if (sessionStorage.getItem('fileInfo')) {
-                fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                if (fileList != null && fileList.length > 0) {
-                  for (let i = 0; i < fileList.length; i++) {
-                    if (fileList[i].fileId === res.data.attId) {
-                      repeatData = 1
-                      break
-                    }
-                  }
-                  if (repeatData === 0) {
-                    fileList.push(fileObj)
-                    fileList = JSON.stringify(fileList)
-                    sessionStorage.setItem('fileInfo', fileList)
-                  }
-                }
-              } else {
-                fileList.push(fileObj)
-                fileList = JSON.stringify(fileList)
-                sessionStorage.setItem('fileInfo', fileList)
-              }
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
-            } else {
-              this.$message.error('文档未转换成功或本地读取不到该文档')
-            }
-          }, e => {
-            this.$message.error('文档未转换成功或本地读取不到该文档')
           })
-        } else {
-          this.$message.error('没有在线预览文档权限！')
         }
-      }
-      if(this.$route.query.pageType === 'INLAND_STAND'){
-        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-        this.$http.get('sarStandardsInfo/sar-standards-info/logInvalid',{
-          standNumber: standNumber,
-          standName: this.sarStandardsInfoEO.standName
-        }, {
-          _this: this
-        }, res => {
-        })
-      }else{
-        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-        this.$http.get('sarStandardsInfo/sar-standards-info/logForeign',{
-          standNumber: standNumber,
-          standName: this.sarStandardsInfoEO.standEnName
-        }, {
-          _this: this
-        }, res => {
-        })
-      }
-    },
-    showItemsModel(attField) {
-      if (attField) {
-        this.fileType = attField
-      }
-      this.getOrgTreeSource()
-      this.selectedItemList = []
-      this.selectSarStandItems()
-      this.modalStandItemflag = true
-      this.$nextTick(() => {
-        this.tableHeight = $('.content').height()
-        window.onresize = function () {
-          this.tableHeight = $('.content').height()
-        }.bind(this)
-      })
-    },
-    sort(column) {
-      this.order = column.order;
-      this.orderBy = column.prop;
-      this.selectSarStandItems();
-    },
-    // 分解单----查看标准条款相关
-    selectSarStandItems(id, flag) {
-      this.standItemSearch.standId = this.sarStandardsInfoEO.id
-      this.standItemSearch.fileType = this.fileType
-      this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
-        ...this.standItemSearch,
-        pageSize: this.pageSize7, page: this.page7, order: this.order, orderBy: this.orderBy
-      }, {}, res => {
+      },
+      showItemsModel(attField) {
+        if (attField) {
+          this.fileType = attField
+        }
+        this.getOrgTreeSource()
         this.selectedItemList = []
-        if (res.ok) {
-          res.data.list.forEach(item => {
-            let k = (item.applyArctic || "").split(',')
-            for (let i in this.applyArcticOptions.options) {
-              for (let m = 0; m < k.length; m++) {
-                if (this.applyArcticOptions.options[i].value === k[m]) {
-                  k[m] = this.applyArcticOptions.options[i].label
+        this.selectSarStandItems()
+        this.modalStandItemflag = true
+        this.$nextTick(() => {
+          this.tableHeight = $('.content').height()
+          window.onresize = function () {
+            this.tableHeight = $('.content').height()
+          }.bind(this)
+        })
+      },
+      sort(column) {
+        this.order = column.order;
+        this.orderBy = column.prop;
+        this.selectSarStandItems();
+      },
+      // 分解单----查看标准条款相关
+      selectSarStandItems(id, flag) {
+        this.standItemSearch.standId = this.sarStandardsInfoEO.id
+        this.standItemSearch.fileType = this.fileType
+        this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+          ...this.standItemSearch,
+          pageSize: this.pageSize7, page: this.page7, order: this.order, orderBy: this.orderBy
+        }, {}, res => {
+          this.selectedItemList = []
+          if (res.ok) {
+            res.data.list.forEach(item => {
+              let k = (item.applyArctic || "").split(',')
+              for (let i in this.applyArcticOptions.options) {
+                for (let m = 0; m < k.length; m++) {
+                  if (this.applyArcticOptions.options[i].value === k[m]) {
+                    k[m] = this.applyArcticOptions.options[i].label
+                  }
+                  item.applyArctic = k.join(',')
                 }
-                item.applyArctic = k.join(',')
               }
-            }
-            item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '')
-          })
-          this.standItemList = res.data.list;
-          this.total7 = res.data.count // 分页需要
-        }
-      }, e => {
-      })
-    },
-    downloadFile(attId) {
-      if (attId != null && attId !== '') {
-        window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
-      } else {
-        this.$message.error('请选择要下载的文件')
-      }
-      if(this.$route.query.pageType === 'INLAND_STAND'){
-        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-        this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload1',{
-          standNumber: standNumber,
-          standName: this.sarStandardsInfoEO.standName
-        }, {
-          _this: this
-        }, res => {
+              item.applyArctic = item.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '')
+            })
+            this.standItemList = res.data.list;
+            this.total7 = res.data.count // 分页需要
+          }
+        }, e => {
         })
-      }else{
-        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-        this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload1',{
-          standNumber: standNumber,
-          standName: this.sarStandardsInfoEO.standEnName
-        }, {
-          _this: this
-        }, res => {
-        })
-      }
-
-    },
-    downloadFileByWater(attId, fileSuffix) {
-      if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
-        this.$message.error('水印下载仅支持PDF,pdf格式文件')
-      } else {
+      },
+      downloadFile(attId) {
         if (attId != null && attId !== '') {
-          window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId
         } else {
           this.$message.error('请选择要下载的文件')
         }
-      }
-      if(this.$route.query.pageType === 'INLAND_STAND'){
-        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-        this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{
-          standNumber: standNumber,
-          standName: this.sarStandardsInfoEO.standName
-        }, {
-          _this: this
-        }, res => {
-        })
-      }else{
-        let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
-        this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{
-          standNumber: standNumber,
-          standName: this.sarStandardsInfoEO.standEnName
-        }, {
-          _this: this
-        }, res => {
-        })
-      }
-    },
-    /**
-     * @Description: 跳转流程
-     */
-    processCenterClick(item) {
-      let routeUrl = this.$router.resolve({
-        name: 'ProcessDetail',
-        query: {
-          prcNum: item
-        }
-      })
-      window.open(routeUrl.href, '_blank')
-    },
-    searchSarStandItems() {
-      this.page7 = 1
-      this.selectSarStandItems()
-    },
-    // 清空搜索框
-    clearAllSearch() {
-      // 标准条款搜索
-      this.page7 = 1
-      this.standItemSearch.responsibleUnit = ''
-      this.standItemSearch.orgName = ''
-      this.standItemSearch.parts = ''
-      this.standItemSearch.nameOrRequest = ''
-      this.standItemSearch.fileType = ''
-      this.standItemSearch.itemsName = ''
-      this.standItemSearch.ZCCSSRQ = ''
-      this.standItemSearch.XCXSSRQ = ''
-      this.selectSarStandItems()
-    },
-    inputChange() {
-      this.standItemSearch.responsibleUnit = ''
-      this.getOrgTreeSource()
-    },
-    searchInlandNodesClick(treeId, treeNode) {
-      this.standItemSearch.responsibleUnit = treeNode.id
-      this.standItemSearch.orgName = treeNode.name
-      $('#searchInlandDeptBtn').click()
-    },
-    // 点击条款表格上面的操作按钮新增
-    addItemModal() {
-      this.editAddType = 1
-      this.getOrgTreeSource()
-      this.itemModalTitle = '新增标准法规条款'
-      this.modalItemaddShowflag = true
-      this.standItemEO = {...this.standItemEODefault}
-      this.$nextTick(() => {
-        // this.$refs['sarStandardsItemForm'].resetFields()
-        this.$refs['sarStandardsItemForm'].clearValidate()
-      })
-      this.itemAddOrUPdateFlag = 1
-      this.itemFormdisableflag = false
-    },
-    // 模板下载
-    uploadImportModal(flag) {
-      window.open('/api/att/attFile/uploadModalFile?fileName=分解单导入模板.xlsx')
-    },
-    // 点击导入标准
-    addImportModal(flag) {
-      this.importModalshowflag = true
-      this.importExcelUrl = '/api/lawss/sarStandItems/importSarStandItemsList?standId=' + this.standItemSearch.standId + '&fileType=' + this.fileType
-      this.$nextTick(() => {
-        this.$refs.importFileAboutStand.clearFiles()
-      })
-    },
-    exportStandardItem() {
-      this.$confirm('您是否要导出数据?', '提示', {
-        confirmButtonText: '确定',
-        confirmButtonClass: 'common-button-primary',
-        cancelButtonText: '取消',
-        roundButton: false,
-        type: 'warning'
-      }).then(() => {
-        if (this.selectedItemList != null && this.selectedItemList.length > 0) {
-          window.open('/api/lawss/sarStandItems/exportStandardItemExcel?idList=' + this.selectedItemList.join(','))
-          this.$message.success('导出成功')
-        } else if (this.standItemList.length > 0) {
-          window.open('/api/lawss/sarStandItems/exportStandardItemExcel?standId=' + this.$route.query.id + '&fileType=' + this.fileType)
-        } else {
-          this.$message.warning('暂无可导出的数据')
-        }
-      }).catch(() => {
-      })
-    },
-    // 标准条款删除
-    deleteStandItem(item, flag) {
-      // flag==1 删除单条    flag==2 批量删除
-      let ids = []
-      if (flag === 1) {
-        //  item的id
-        ids.push(item.id)
-        // ids.push(this.standItemEO.id)
-        this.$confirm('确认删除该条数据?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-          confirmButtonClass: 'common-button-primary',
-          roundButton: false
-        }).then(() => {
-          this.$http.post('lawss/sarStandItems/deleteStandItem', {
-            id: ids,
-            standId: this.standItemSearch.standId
+        if(this.$route.query.pageType === 'INLAND_STAND'){
+          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+          this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload1',{
+            standNumber: standNumber,
+            standName: this.sarStandardsInfoEO.standName
           }, {
             _this: this
           }, res => {
-            if (res.ok) {
-              this.selectSarStandItems(this.standItemSearch.standId, 1)
-              this.selectedItemList = []
-            }
-          }, e => {
           })
-        }).catch(() => {
-          // 取消删除，清空选择
-          // this.$refs.selections.clearSelection()
-        })
-      } else {
-        if (this.selectedItemList.length === 0) {
-          this.$message.error('请先选择要删除的数据！')
+        }else{
+          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+          this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload1',{
+            standNumber: standNumber,
+            standName: this.sarStandardsInfoEO.standEnName
+          }, {
+            _this: this
+          }, res => {
+          })
+        }
+
+      },
+      downloadFileByWater(attId, fileSuffix) {
+        if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') {
+          this.$message.error('水印下载仅支持PDF,pdf格式文件')
         } else {
-          ids = this.selectedItemList
-          this.$confirm('确认删除选中数据?', '提示', {
+          if (attId != null && attId !== '') {
+            window.location.href = '/api/att/attFile/downloadFileForSarWaterMarkNew?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId
+          } else {
+            this.$message.error('请选择要下载的文件')
+          }
+        }
+        if(this.$route.query.pageType === 'INLAND_STAND'){
+          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+          this.$http.get('sarStandardsInfo/sar-standards-info/logInvalidDownload2',{
+            standNumber: standNumber,
+            standName: this.sarStandardsInfoEO.standName
+          }, {
+            _this: this
+          }, res => {
+          })
+        }else{
+          let standNumber = this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear || this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber
+          this.$http.get('sarStandardsInfo/sar-standards-info/logForeignDownload2',{
+            standNumber: standNumber,
+            standName: this.sarStandardsInfoEO.standEnName
+          }, {
+            _this: this
+          }, res => {
+          })
+        }
+      },
+      /**
+       * @Description: 跳转流程
+       */
+      processCenterClick(item) {
+        let routeUrl = this.$router.resolve({
+          name: 'ProcessDetail',
+          query: {
+            prcNum: item
+          }
+        })
+        window.open(routeUrl.href, '_blank')
+      },
+      searchSarStandItems() {
+        this.page7 = 1
+        this.selectSarStandItems()
+      },
+      // 清空搜索框
+      clearAllSearch() {
+        // 标准条款搜索
+        this.page7 = 1
+        this.standItemSearch.responsibleUnit = ''
+        this.standItemSearch.orgName = ''
+        this.standItemSearch.parts = ''
+        this.standItemSearch.nameOrRequest = ''
+        this.standItemSearch.fileType = ''
+        this.standItemSearch.itemsName = ''
+        this.standItemSearch.ZCCSSRQ = ''
+        this.standItemSearch.XCXSSRQ = ''
+        this.selectSarStandItems()
+      },
+      inputChange() {
+        this.standItemSearch.responsibleUnit = ''
+        this.getOrgTreeSource()
+      },
+      searchInlandNodesClick(treeId, treeNode) {
+        this.standItemSearch.responsibleUnit = treeNode.id
+        this.standItemSearch.orgName = treeNode.name
+        $('#searchInlandDeptBtn').click()
+      },
+      // 点击条款表格上面的操作按钮新增
+      addItemModal() {
+        this.editAddType = 1
+        this.getOrgTreeSource()
+        this.itemModalTitle = '新增标准法规条款'
+        this.modalItemaddShowflag = true
+        this.standItemEO = {...this.standItemEODefault}
+        this.$nextTick(() => {
+          // this.$refs['sarStandardsItemForm'].resetFields()
+          this.$refs['sarStandardsItemForm'].clearValidate()
+        })
+        this.itemAddOrUPdateFlag = 1
+        this.itemFormdisableflag = false
+      },
+      // 模板下载
+      uploadImportModal(flag) {
+        window.open('/api/att/attFile/uploadModalFile?fileName=分解单导入模板.xlsx')
+      },
+      // 点击导入标准
+      addImportModal(flag) {
+        this.importModalshowflag = true
+        this.importExcelUrl = '/api/lawss/sarStandItems/importSarStandItemsList?standId=' + this.standItemSearch.standId + '&fileType=' + this.fileType
+        this.$nextTick(() => {
+          this.$refs.importFileAboutStand.clearFiles()
+        })
+      },
+      exportStandardItem() {
+        this.$confirm('您是否要导出数据?', '提示', {
+          confirmButtonText: '确定',
+          confirmButtonClass: 'common-button-primary',
+          cancelButtonText: '取消',
+          roundButton: false,
+          type: 'warning'
+        }).then(() => {
+          if (this.selectedItemList != null && this.selectedItemList.length > 0) {
+            window.open('/api/lawss/sarStandItems/exportStandardItemExcel?idList=' + this.selectedItemList.join(','))
+            this.$message.success('导出成功')
+          } else if (this.standItemList.length > 0) {
+            window.open('/api/lawss/sarStandItems/exportStandardItemExcel?standId=' + this.$route.query.id + '&fileType=' + this.fileType)
+          } else {
+            this.$message.warning('暂无可导出的数据')
+          }
+        }).catch(() => {
+        })
+      },
+      // 标准条款删除
+      deleteStandItem(item, flag) {
+        // flag==1 删除单条    flag==2 批量删除
+        let ids = []
+        if (flag === 1) {
+          //  item的id
+          ids.push(item.id)
+          // ids.push(this.standItemEO.id)
+          this.$confirm('确认删除该条数据?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
-            type: 'warning'
+            type: 'warning',
+            confirmButtonClass: 'common-button-primary',
+            roundButton: false
           }).then(() => {
             this.$http.post('lawss/sarStandItems/deleteStandItem', {
               id: ids,
@@ -3087,1142 +2983,1168 @@ export default {
             }, {
               _this: this
             }, res => {
-              this.selectSarStandItems(this.standItemSearch.standId, 1)
-              this.selectedItemList = []
+              if (res.ok) {
+                this.selectSarStandItems(this.standItemSearch.standId, 1)
+                this.selectedItemList = []
+              }
             }, e => {
             })
           }).catch(() => {
             // 取消删除，清空选择
             // this.$refs.selections.clearSelection()
           })
+        } else {
+          if (this.selectedItemList.length === 0) {
+            this.$message.error('请先选择要删除的数据！')
+          } else {
+            ids = this.selectedItemList
+            this.$confirm('确认删除选中数据?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
+              this.$http.post('lawss/sarStandItems/deleteStandItem', {
+                id: ids,
+                standId: this.standItemSearch.standId
+              }, {
+                _this: this
+              }, res => {
+                this.selectSarStandItems(this.standItemSearch.standId, 1)
+                this.selectedItemList = []
+              }, e => {
+              })
+            }).catch(() => {
+              // 取消删除，清空选择
+              // this.$refs.selections.clearSelection()
+            })
+          }
         }
-      }
-    },
-    // 分解单-查看
-    handlePreview(item) {
-      this.standShowItemEO = item
-      this.showItemInfoModal = true
-      let fileList = []
-      item.defaultFileList = []
+      },
+      // 分解单-查看
+      handlePreview(item) {
+        this.standShowItemEO = item
+        this.showItemInfoModal = true
+        let fileList = []
+        item.defaultFileList = []
 
 
-      if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
-        this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
-      }
-      this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow
-      // 请求文件信息
-      if (item.relevanceFile != null && item.relevanceFile !== '') {
-        let paramefile = item.relevanceFile
-        if (paramefile.charAt(paramefile.length - 1) === ',') {
-          paramefile = paramefile.substring(0, paramefile.length - 1)
+        if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
+          this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
         }
-        this.$http.get('att/attFile/getMultiFileInfos', {
-          fileIds: paramefile
-        }, {
-          _this: this
-        }, res => {
-          fileList = res.data
-          if (fileList != null && fileList.length > 0) {
-            for (let i = 0; i < fileList.length; i++) {
-              let obj = {name: '', response: {}}
-              obj.name = fileList[i].oldFileName
-              obj.response.data = fileList[i]
-              item.defaultFileList.push(obj)
-            }
+        this.standShowItemEO.responsibleUnit = this.standShowItemEO.responsibleUnitShow
+        // 请求文件信息
+        if (item.relevanceFile != null && item.relevanceFile !== '') {
+          let paramefile = item.relevanceFile
+          if (paramefile.charAt(paramefile.length - 1) === ',') {
+            paramefile = paramefile.substring(0, paramefile.length - 1)
           }
-          this.standShowItemEO = JSON.parse(JSON.stringify(item))
-          if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
-            this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
-          }
-          // let selectNode = this.getTreeNameByid(this.standShowItemEO.responsibleUnit)
-          this.standShowItemEO.orgName = this.standShowItemEO.responsibleUnitShow
-        }, e => {
-        })
-      }
-    },
-    // 分解单-编辑
-    selectStandardPro(item) {
-      this.editAddType = 2
-      this.itemModalTitle = '编辑标准法规条款'
-      item.orgName = ''
-      this.standItemEO = JSON.parse(JSON.stringify(item))
-      this.standItemEO.standId = this.standItemSearch.standId
-      this.standItemEO.quoteStand = item.quoteStand
-      this.standItemEO.applyArctic = this.standItemEO.applyArctic ? this.standItemEO.applyArctic.split(',') : []
-      this.itemAddOrUPdateFlag = 2
-      this.itemFormdisableflag = false
-      if (this.standItemEO.tackTime != null && this.standItemEO.tackTime !== '') {
-        this.standItemEO.tackTime = new Date(this.standItemEO.tackTime)
-      }
-      this.standItemEO.orgName = this.standItemEO.responsibleUnitShow
-      this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
-      this.standItemEO.FO = this.standItemEO.fo
-      this.updateResidToAttid('relevanceFile')
-      this.modalItemaddShowflag = true
-      this.$nextTick(() => {
-        this.$refs['sarStandardsItemForm'].clearValidate()
-      })
-    },
-    // 修改过程中，将resId 修改成 attid
-    updateResidToAttid(filetype) {
-      if (this.sarStandardsInfoEO[filetype] !== null && this.sarStandardsInfoEO[filetype] !== '') {
-        this.$http.get('lawss/attFile/getMultiFileInfosByResid', {
-          fileIds: this.sarStandardsInfoEO[filetype], fileType: 'stand'
-        }, {
-          _this: this
-        }, res => {
-          this.sarStandardsInfoEO[filetype] = res.data
-        }, e => {
-        })
-      }
-    },
-    /**
-     * 展示位置
-     */
-    queryDisplayLocation() {
-      return new Promise((resolve, reject) => {
-        this.$http.get('lawssBase/utArea/getAreaList', {
-          sarType: 'INLAND_STAND'
-        }, {
-          _this: this
-        }, res => {
-          // this.showRegionOptions = res.data || []
-          resolve(res.data || [])
-        }, e => {
-          reject(e)
-        })
-      })
-    },
-    /**
-     * 获取新增弹框的表单
-     */
-    getAddFormFieldList(isEdit) {
-      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
-              this.formFieldListData = data[this.$route.query.pageType]
-              // this.resolveFormFieldList()
-              resolve(data[this.$route.query.pageType])
-            } else {
-              reject(res)
+          this.$http.get('att/attFile/getMultiFileInfos', {
+            fileIds: paramefile
+          }, {
+            _this: this
+          }, res => {
+            fileList = res.data
+            if (fileList != null && fileList.length > 0) {
+              for (let i = 0; i < fileList.length; i++) {
+                let obj = {name: '', response: {}}
+                obj.name = fileList[i].oldFileName
+                obj.response.data = fileList[i]
+                item.defaultFileList.push(obj)
+              }
             }
+            this.standShowItemEO = JSON.parse(JSON.stringify(item))
+            if (this.standShowItemEO.tackTime != null && this.standShowItemEO.tackTime !== '') {
+              this.standShowItemEO.tackTime = this.standShowItemEO.tackTime.split(' ')[0]
+            }
+            // let selectNode = this.getTreeNameByid(this.standShowItemEO.responsibleUnit)
+            this.standShowItemEO.orgName = this.standShowItemEO.responsibleUnitShow
+          }, e => {
+          })
+        }
+      },
+      // 分解单-编辑
+      selectStandardPro(item) {
+        this.editAddType = 2
+        this.itemModalTitle = '编辑标准法规条款'
+        item.orgName = ''
+        this.standItemEO = JSON.parse(JSON.stringify(item))
+        this.standItemEO.standId = this.standItemSearch.standId
+        this.standItemEO.quoteStand = item.quoteStand
+        this.standItemEO.applyArctic = this.standItemEO.applyArctic ? this.standItemEO.applyArctic.split(',') : []
+        this.itemAddOrUPdateFlag = 2
+        this.itemFormdisableflag = false
+        if (this.standItemEO.tackTime != null && this.standItemEO.tackTime !== '') {
+          this.standItemEO.tackTime = new Date(this.standItemEO.tackTime)
+        }
+        this.standItemEO.orgName = this.standItemEO.responsibleUnitShow
+        this.standItemEO.ZRBM = this.standItemEO.responsibleUnit
+        this.standItemEO.FO = this.standItemEO.fo
+        this.updateResidToAttid('relevanceFile')
+        this.modalItemaddShowflag = true
+        this.$nextTick(() => {
+          this.$refs['sarStandardsItemForm'].clearValidate()
+        })
+      },
+      // 修改过程中，将resId 修改成 attid
+      updateResidToAttid(filetype) {
+        if (this.sarStandardsInfoEO[filetype] !== null && this.sarStandardsInfoEO[filetype] !== '') {
+          this.$http.get('lawss/attFile/getMultiFileInfosByResid', {
+            fileIds: this.sarStandardsInfoEO[filetype], fileType: 'stand'
+          }, {
+            _this: this
+          }, res => {
+            this.sarStandardsInfoEO[filetype] = res.data
+          }, e => {
+          })
+        }
+      },
+      /**
+       * 展示位置
+       */
+      queryDisplayLocation() {
+        return new Promise((resolve, reject) => {
+          this.$http.get('lawssBase/utArea/getAreaList', {
+            sarType: 'INLAND_STAND'
+          }, {
+            _this: this
+          }, res => {
+            // this.showRegionOptions = res.data || []
+            resolve(res.data || [])
           }, e => {
             reject(e)
           })
-      })
-    },
-    // 点击更多按钮事件
-    moreClick() {
-      this.dynamicFormField.map(item => {
-        item.isShowImp = '0'
-        item.child.map(child => {
-          child.isShowImp = '0'
         })
-      })
-      this.isMoreAwayBtn = true
-    },
-    // 点击收起按钮事件
-    putAwayClick() {
-      this.dynamicFormField = JSON.parse(sessionStorage.getItem('displayLocation'))
-      this.isMoreAwayBtn = false
-    },
-    // 鼠标滚轮事件
-    handleScroll(e) {
-      // 该语句可以用来判断滚轮是向上滑动还是向下
-      const direction = e.deltaY > 0 ? 'down' : 'up'
-      if (direction === 'down') {
-        this.moreClick()
-      }
-    },
-    // ...
-    handleCommand(command) {
-      switch (command[1]) {
-        case '查看':
-          this.handlePreview(command[0])
-          break
-        case '编辑':
-          this.selectStandardPro(command[0], 'edit')
-          break
-        case '删除':
-          this.deleteStandItem(command[0], 1)
-          break
-      }
-    },
-    /**
-     * 点击 加收藏 按钮事件
-     * @param collectId  有值：取消收藏  无值：加收藏
-     */
-    collectClick(collectId) {
-      this.isSubmit = true
-      if (collectId) {
-        // 取消收藏
-        this.$http.put('person/personCollect/updateByUserId', {
-          id: collectId,
-          loading: ''
+      },
+      /**
+       * 获取新增弹框的表单
+       */
+      getAddFormFieldList(isEdit) {
+        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
+                this.formFieldListData = data[this.$route.query.pageType]
+                // this.resolveFormFieldList()
+                resolve(data[this.$route.query.pageType])
+              } else {
+                reject(res)
+              }
+            }, e => {
+              reject(e)
+            })
+        })
+      },
+      // 点击更多按钮事件
+      moreClick() {
+        this.dynamicFormField.map(item => {
+          item.isShowImp = '0'
+          item.child.map(child => {
+            child.isShowImp = '0'
+          })
+        })
+        this.isMoreAwayBtn = true
+      },
+      // 点击收起按钮事件
+      putAwayClick() {
+        this.dynamicFormField = JSON.parse(sessionStorage.getItem('displayLocation'))
+        this.isMoreAwayBtn = false
+      },
+      // 鼠标滚轮事件
+      handleScroll(e) {
+        // 该语句可以用来判断滚轮是向上滑动还是向下
+        const direction = e.deltaY > 0 ? 'down' : 'up'
+        if (direction === 'down') {
+          this.moreClick()
+        }
+      },
+      // ...
+      handleCommand(command) {
+        switch (command[1]) {
+          case '查看':
+            this.handlePreview(command[0])
+            break
+          case '编辑':
+            this.selectStandardPro(command[0], 'edit')
+            break
+          case '删除':
+            this.deleteStandItem(command[0], 1)
+            break
+        }
+      },
+      /**
+       * 点击 加收藏 按钮事件
+       * @param collectId  有值：取消收藏  无值：加收藏
+       */
+      collectClick(collectId) {
+        this.isSubmit = true
+        if (collectId) {
+          // 取消收藏
+          this.$http.put('person/personCollect/updateByUserId', {
+            id: collectId,
+            loading: ''
+          }, {
+            _this: this
+          }, res => {
+            this.isSubmit = false
+            this.sarStandardsInfoEO.collectId = ''
+          }, e => {
+            this.isSubmit = false
+          })
+        } else {
+          // 加收藏
+          let collectTitle
+          if (this.sarStandardsInfoEO.standYear != null && this.sarStandardsInfoEO.standYear !== '') {
+            collectTitle = this.sarStandardsInfoEO.standName + '  ( 编号:' + this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + ' )'
+          } else {
+            collectTitle = this.sarStandardsInfoEO.standName + '  ( 编号:' + this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + ' )'
+          }
+          let personCollect = {
+            collectResId: this.sarStandardsInfoEO.id,
+            collectTitle: collectTitle,
+            collectType: this.$route.query.pageType, // 国内收藏type
+            userId: this.$store.getters.userInfo.userId
+
+          }
+          this.$http.postData('person/personCollect', personCollect, {
+            _this: this
+          }, res => {
+            this.isSubmit = false
+            this.sarStandardsInfoEO.collectId = res.data.id
+          }, e => {
+            this.isSubmit = false
+          })
+        }
+      },
+      relateEvent1(list) {
+        this.relateDialog1 = true
+        this.relateNowList1 = list
+      },
+      // 更新LOG
+      relateEvent() {
+        this.$http.get('lawss/sarUpdLog/getLogList', {
+          sarId: this.$route.query.id,
+          sarType: this.$route.query.pageType
         }, {
           _this: this
         }, res => {
-          this.isSubmit = false
-          this.sarStandardsInfoEO.collectId = ''
-        }, e => {
-          this.isSubmit = false
-        })
-      } else {
-        // 加收藏
-        let collectTitle
-        if (this.sarStandardsInfoEO.standYear != null && this.sarStandardsInfoEO.standYear !== '') {
-          collectTitle = this.sarStandardsInfoEO.standName + '  ( 编号:' + this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + ' )'
-        } else {
-          collectTitle = this.sarStandardsInfoEO.standName + '  ( 编号:' + this.sarStandardsInfoEO.standSort + ' ' + this.sarStandardsInfoEO.standNumber + ' )'
-        }
-        let personCollect = {
-          collectResId: this.sarStandardsInfoEO.id,
-          collectTitle: collectTitle,
-          collectType: this.$route.query.pageType, // 国内收藏type
-          userId: this.$store.getters.userInfo.userId
-
-        }
-        this.$http.postData('person/personCollect', personCollect, {
-          _this: this
-        }, res => {
-          this.isSubmit = false
-          this.sarStandardsInfoEO.collectId = res.data.id
-        }, e => {
-          this.isSubmit = false
-        })
-      }
-    },
-    relateEvent1(list) {
-      this.relateDialog1 = true
-      this.relateNowList1 = list
-    },
-    // 更新LOG
-    relateEvent() {
-      this.$http.get('lawss/sarUpdLog/getLogList', {
-        sarId: this.$route.query.id,
-        sarType: this.$route.query.pageType
-      }, {
-        _this: this
-      }, res => {
-        if (res.data.length > 0) {
-          this.relateDialog = true
-          this.relateList = res.data
-          var i
-          for (i = 0; i < this.relateList.length; i++) {
-            let obj = {creationUserName: '', creationTime: '', content: ''}
-            obj.creationUserName = this.relateList[i].creationUserName
-            obj.creationTime = this.relateList[i].creationTime
-            obj.content = this.relateList[i].content
-            this.relateNowList.push(obj)
+          if (res.data.length > 0) {
+            this.relateDialog = true
+            this.relateList = res.data
+            var i
+            for (i = 0; i < this.relateList.length; i++) {
+              let obj = {creationUserName: '', creationTime: '', content: ''}
+              obj.creationUserName = this.relateList[i].creationUserName
+              obj.creationTime = this.relateList[i].creationTime
+              obj.content = this.relateList[i].content
+              this.relateNowList.push(obj)
+            }
+          } else {
+            this.$message({
+              message: '暂无数据',
+              type: 'warning'
+            })
           }
-        } else {
-          this.$message({
-            message: '暂无数据',
-            type: 'warning'
-          })
-        }
-      }, e => {
+        }, e => {
 
-      })
-    },
-    relateDialogClose() {
-      this.relateDialog = false
-      this.relateNowList = []
-    },
-    relateDialogClose1() {
-      this.relateDialog1 = false
-      this.relateNowList = []
-    },
-    halfClass(data, nextData, index) {
-      const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
-      let flag = false
-      if (halfType.includes(data.attrType)) { // 是 50% 显示的组件时
-        // 1. 判断下一个节点是否为50%显示的组件
-
-        if (nextData && halfType.includes(nextData.attrType)) { //
-          flag = true
-        } else if (index % 2 === 0) { // 下一个节点不是50%显示的组件  判断是否为奇数节点
-          flag = false
-        } else { // 下个组件不是50%显示的组件 并且刚好时偶数节点
-          flag = true
-        }
-      }
-      return flag ? '' : 'clear'
-    },
-
-    handleToggleShowAll(item) {
-      if (!item.showAll) {
-        item.showAll = true
-      } else {
-        item.showAll = false
-      }
-    },
-    // 根据企标覆盖关系value值获取名称
-    busStandCoverName(value) {
-      let busStandCoverName = ''
-      this.BZFGGXOUIUJ.map(item => {
-        if (item.value === value) {
-          busStandCoverName = item.label
-        }
-      })
-      return busStandCoverName
-    },
-    dateFormat(str) {
-      return dateFormat(str)
-    },
-    openRelatedTermsDrawer() {
-      // 打开关联条款弹框
-      this.relatedTermsDrawerVisible = true
-      this.btnLoading = false
-    },
-    handleRelatedTermsDrawerCancel() {
-      // this.relatedTermsDrawerVisible = false
-      this.$refs['relatedTermsSelect'].handleCancel()
-
-    },
-    //关联成功的提示
-    handleRelatedTermsDrawerSubmit() {
-      this.btnLoading = true
-      if(this.handleList.length){
-        this.$refs['relatedTermsSelect'].handleSubmit(() => {
-          this.selectSarStandItems()
-          this.btnLoading = false
-          this.$message({
-            message: '关联成功',
-            type: 'success'
-          });
         })
-      }else{
-        this.$message.warning('请至少勾选一条条款进行关联')
+      },
+      relateDialogClose() {
+        this.relateDialog = false
+        this.relateNowList = []
+      },
+      relateDialogClose1() {
+        this.relateDialog1 = false
+        this.relateNowList = []
+      },
+      halfClass(data, nextData, index) {
+        const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM']
+        let flag = false
+        if (halfType.includes(data.attrType)) { // 是 50% 显示的组件时
+          // 1. 判断下一个节点是否为50%显示的组件
+
+          if (nextData && halfType.includes(nextData.attrType)) { //
+            flag = true
+          } else if (index % 2 === 0) { // 下一个节点不是50%显示的组件  判断是否为奇数节点
+            flag = false
+          } else { // 下个组件不是50%显示的组件 并且刚好时偶数节点
+            flag = true
+          }
+        }
+        return flag ? '' : 'clear'
+      },
+
+      handleToggleShowAll(item) {
+        if (!item.showAll) {
+          item.showAll = true
+        } else {
+          item.showAll = false
+        }
+      },
+      // 根据企标覆盖关系value值获取名称
+      busStandCoverName(value) {
+        let busStandCoverName = ''
+        this.BZFGGXOUIUJ.map(item => {
+          if (item.value === value) {
+            busStandCoverName = item.label
+          }
+        })
+        return busStandCoverName
+      },
+      dateFormat(str) {
+        return dateFormat(str)
+      },
+      openRelatedTermsDrawer() {
+        // 打开关联条款弹框
+        this.relatedTermsDrawerVisible = true
         this.btnLoading = false
+      },
+      handleRelatedTermsDrawerCancel() {
+        // this.relatedTermsDrawerVisible = false
+        this.$refs['relatedTermsSelect'].handleCancel()
+
+      },
+      //关联成功的提示
+      handleRelatedTermsDrawerSubmit() {
+        this.btnLoading = true
+        if(this.handleList.length){
+          this.$refs['relatedTermsSelect'].handleSubmit(() => {
+            this.selectSarStandItems()
+            this.btnLoading = false
+            this.$message({
+              message: '关联成功',
+              type: 'success'
+            });
+          })
+        }else{
+          this.$message.warning('请至少勾选一条条款进行关联')
+          this.btnLoading = false
+        }
+      },
+      closeRelatedTermsDrawer() {
+        this.$refs['relatedTermsDrawer'].closeDrawer()
+      },
+      itemsTextDialog(itemsNum, text) {
+        this.itemsTextDialogs = true
+        this.itemsText = '<p>' + itemsNum + '</p>' + text.replace(/''/g, '\'')
       }
     },
-    closeRelatedTermsDrawer() {
-      this.$refs['relatedTermsDrawer'].closeDrawer()
-    },
-    itemsTextDialog(itemsNum, text) {
-      this.itemsTextDialogs = true
-      this.itemsText = '<p>' + itemsNum + '</p>' + text.replace(/''/g, '\'')
-    }
-  },
-  computed: {
-    titleShow() {
-      return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情'
-    },
-    titleHidden() {
-      return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情'
-    },
-    visibleBtn() {
-      return this.$route.name === 'DomesticStandardDetails'
-    },
-    sarType() {
-      return this.$route.query.pageType
-    },
-    standNum() {
-      const item = this.sarStandardsInfoEO
-      if (item.standYear) {
-        return `${item.standSort} ${item.standNumber}-${item.standYear}`
-      } else {
-        return `${item.standSort} ${item.standNumber}`
+    computed: {
+      titleShow() {
+        return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情'
+      },
+      titleHidden() {
+        return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情'
+      },
+      visibleBtn() {
+        return this.$route.name === 'DomesticStandardDetails'
+      },
+      sarType() {
+        return this.$route.query.pageType
+      },
+      standNum() {
+        const item = this.sarStandardsInfoEO
+        if (item.standYear) {
+          return `${item.standSort} ${item.standNumber}-${item.standYear}`
+        } else {
+          return `${item.standSort} ${item.standNumber}`
+        }
+      },
+      standId() {
+        const item = this.sarStandardsInfoEO
+        return item.id
       }
     },
-    standId() {
-      const item = this.sarStandardsInfoEO
-      return item.id
-    }
-  },
-  /*created() {
+    /*created() {
     dicTypeData().then(res => {
       // 能源类型数据字典
       this.CycxOptions = res.data.CLLX
     })
   },*/
-  async mounted() {
-    const that = this
-    window.onresize = () => {
-      return (() => {
-        window.screenWidth = document.body.offsetWidth
-        that.$store.commit('width', window.screenWidth)
-        that.screenWidth = window.screenWidth - 141
-        window.screenHeight = document.documentElement.clientHeight
-        that.$store.commit('height', window.screenHeight)
-        that.screenHeight = window.screenHeight
-        that.objs.bodyWidth = window.screenWidth
-      })()
-    }
-    let external = localStorage.getItem("external");
-    if(external !== undefined && external !== null){
-      this.externalStatus = external
-    }
-    this.sarStandardsInfoEO.id = this.$route.query.id
-    // await this.selectStandMessage()
-    this.standItemEO.standId = this.$route.query.id
-    // 从数据库中查询各下拉框数据
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.CycxOptions = res.data.CLLX
-      this.applyArcticOptions.options = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车辆类型”
-      this.emergyKindOptions = res.data.ENERGYTYPES
-      this.requestOptions = res.data.REQUESTTYPE
-      this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
-      this.setMap(res.data.WBZTCLASS) // 文本状态
-      this.setMap(res.data.SARPROPERTY) // 标准性质
-    }, e => {
-    })
-    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')) {
-        //   return
-        // }
-        displayLocation.forEach((location) => {
-          location.isShowImp = '0'
-          if (dynamicFormField && (this.externalStatus === 'external' ? field.attrField !== 'XGLC' : true)) {
-            let value = dynamicFormField[field.attrField]
-            if (field.attrField === 'SVPPS') {
-              let tips = dynamicFormField.SVPPSTips
-              field['tips'] = tips
-            }
-            if (value && typeof value === 'number') {
-              value = this.$dateFormat(value, 'yyyy-MM-dd')
-            }
-            field['value'] = value
-            if (field.showRegionId === location.value) {
-              if (!location.child) {
-                location['child'] = []
-              }
-              location['child'].push(field)
-              // if (field.isShowImp === '0') {
-              //   location.isShowImp = '0'
-              // }
-            }
-          }
-          if (location.label === '过程稿件') {
-            location.isShowImp = '0'
-          }
-        })
-      })
-      displayLocation.forEach(location => {
-        // 动态属性字段-FBGBJBD 单独添加至基础信息
-        const list = displayLocation.filter(item => item.label === '过程稿件');
-        if (location.label === '基础信息' && list && list.length > 0) {
-          //发布稿必读
-          if (!list[0].child) {
-            location['child1'] = []
-          } else {
-            const childList = list[0].child.filter(item => item.attrField === 'FBGBJBD');
-            location['child1'] = childList
-
-          }
-          //增补件必读
-          if (!list[0].child) {
-            location['child3'] = []
-          } else {
-            const childList = list[0].child.filter(item => item.attrField === 'ZBJBD');
-            location['child3'] = childList
-
-          }
-          //勘误件
-          if (!list[0].child) {
-            location['child4'] = []
-          } else {
-            const childList = list[0].child.filter(item => item.attrField === 'KWJ');
-            location['child4'] = childList
-
-          }
-          //修订本
-          if (!list[0].child) {
-            location['child5'] = []
-          } else {
-            const childList = list[0].child.filter(item => item.attrField === 'XDB');
-            location['child5'] = childList
-
-          }
-        }
-        // 动态属性字段-SYRZ 单独添加至基础信息
-        const list2 = displayLocation.filter(item => item.label === '适用范围');
-        if (location.label === '基础信息' && list2 && list2.length > 0) {
-          if (!list2[0].child) {
-            location['child2'] = []
-          } else {
-            const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
-            if(childList.length){
-              childList.forEach(item => {
-                if(item.value === "[]"){
-                  item.value = ''
-                }
-              })
-            }
-            location['child2'] = childList
-          }
-        }
-
-        for (let i = 0; i < displayLocation.length; i++) {
-          //  sss
-          if (displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件') {
-            const childList = displayLocation[i].child.filter(item => item.value !== null && item.value !== '');
-            if (childList.length === 0) {
-              displayLocation.splice(i, 1)
-            }
-          }
-        }
-        const child = location.child || []
-        const one = []
-        const half = []
-        child.map(field => {
-          if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
-            half.push(field)
-          } else {
-            if (field.attrField && field.attrField !== 'FBGBJBD' && field.attrField !== 'SYRZ') {
-              one.push(field)
-            }
-          }
-        })
-        const fieldsIsTextAreaOrFile = child.filter(field => {
-          return field.attrType === 'TEXTAREA' || field.attrType === 'FILE'
-        })
-        const fieldOthers = child.filter(field => {
-          return field.attrType !== 'TEXTAREA' && field.attrType !== 'FILE'
-        })
-        location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile]
-        location.one = one
-        location.half = half
-        location.showAll = false
-      })
-      this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
-        id: this.$route.query.id
-      }, {
+    async mounted() {
+      const that = this
+      window.onresize = () => {
+        return (() => {
+          window.screenWidth = document.body.offsetWidth
+          that.$store.commit('width', window.screenWidth)
+          that.screenWidth = window.screenWidth - 141
+          window.screenHeight = document.documentElement.clientHeight
+          that.$store.commit('height', window.screenHeight)
+          that.screenHeight = window.screenHeight
+          that.objs.bodyWidth = window.screenWidth
+        })()
+      }
+      let external = localStorage.getItem("external");
+      if(external !== undefined && external !== null){
+        this.externalStatus = external
+      }
+      this.sarStandardsInfoEO.id = this.$route.query.id
+      // await this.selectStandMessage()
+      this.standItemEO.standId = this.$route.query.id
+      // 从数据库中查询各下拉框数据
+      this.$http.get('sys/dictype/getDicTypeListCode', '', {
         _this: this
       }, res => {
-        displayLocation.map(item => {
-          if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
-            for (let key in res.data) {
-              item.one.push({
-                attrName: key,
-                value: res.data[key].join(','),
-                isShowImp: '0',
-                id: key
-              })
+        this.CycxOptions = res.data.CLLX
+        this.applyArcticOptions.options = res.data.ENERGYTYPES // 根据需求文档，产品类别对应标准属性中的“适用车辆类型”
+        this.emergyKindOptions = res.data.ENERGYTYPES
+        this.requestOptions = res.data.REQUESTTYPE
+        this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
+        this.setMap(res.data.WBZTCLASS) // 文本状态
+        this.setMap(res.data.SARPROPERTY) // 标准性质
+      }, e => {
+      })
+      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')) {
+          //   return
+          // }
+          displayLocation.forEach((location) => {
+            location.isShowImp = '0'
+            if (dynamicFormField && (this.externalStatus === 'external' ? field.attrField !== 'XGLC' : true)) {
+              let value = dynamicFormField[field.attrField]
+              if (field.attrField === 'SVPPS') {
+                let tips = dynamicFormField.SVPPSTips
+                field['tips'] = tips
+              }
+              if (value && typeof value === 'number') {
+                value = this.$dateFormat(value, 'yyyy-MM-dd')
+              }
+              field['value'] = value
+              if (field.showRegionId === location.value) {
+                if (!location.child) {
+                  location['child'] = []
+                }
+                location['child'].push(field)
+                // if (field.isShowImp === '0') {
+                //   location.isShowImp = '0'
+                // }
+              }
+            }
+            if (location.label === '过程稿件') {
+              location.isShowImp = '0'
+            }
+          })
+        })
+        displayLocation.forEach(location => {
+          // 动态属性字段-FBGBJBD 单独添加至基础信息
+          const list = displayLocation.filter(item => item.label === '过程稿件');
+          if (location.label === '基础信息' && list && list.length > 0) {
+            //发布稿必读
+            if (!list[0].child) {
+              location['child1'] = []
+            } else {
+              const childList = list[0].child.filter(item => item.attrField === 'FBGBJBD');
+              location['child1'] = childList
+
+            }
+            //增补件必读
+            if (!list[0].child) {
+              location['child3'] = []
+            } else {
+              const childList = list[0].child.filter(item => item.attrField === 'ZBJBD');
+              location['child3'] = childList
+
+            }
+            //勘误件
+            if (!list[0].child) {
+              location['child4'] = []
+            } else {
+              const childList = list[0].child.filter(item => item.attrField === 'KWJ');
+              location['child4'] = childList
+
+            }
+            //修订本
+            if (!list[0].child) {
+              location['child5'] = []
+            } else {
+              const childList = list[0].child.filter(item => item.attrField === 'XDB');
+              location['child5'] = childList
+
+            }
+          }
+          // 动态属性字段-SYRZ 单独添加至基础信息
+          const list2 = displayLocation.filter(item => item.label === '适用范围');
+          if (location.label === '基础信息' && list2 && list2.length > 0) {
+            if (!list2[0].child) {
+              location['child2'] = []
+            } else {
+              const childList = list2[0].child.filter(item => item.attrField === 'SYRZ');
+              if(childList.length){
+                childList.forEach(item => {
+                  if(item.value === "[]"){
+                    item.value = ''
+                  }
+                })
+              }
+              location['child2'] = childList
             }
           }
-        })
-        this.dynamicFormField = displayLocation
-      })
-      sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
-      this.loading = false
-    })
-    /**
-     * 自定义鼠标滚轮事件
-     * chrome and ie
-     */
-    window.addEventListener('mousewheel', this.handleScroll, false)
-    // firefox
-    window.addEventListener('DOMMouseScroll', this.handleScroll, false)
-  },
-  destroyed() {
-    window.removeEventListener('mousewheel', this.handleScroll, false)
-    window.removeEventListener('DOMMouseScroll', this.handleScroll, false)
-    sessionStorage.removeItem('displayLocation')
 
-    window.onresize = null
-    this.tableHeight = ''
+          for (let i = 0; i < displayLocation.length; i++) {
+            //  sss
+            if (displayLocation[i].label !== '基础信息' && displayLocation[i].label !== '过程稿件') {
+              const childList = displayLocation[i].child.filter(item => item.value !== null && item.value !== '');
+              if (childList.length === 0) {
+                displayLocation.splice(i, 1)
+              }
+            }
+          }
+          const child = location.child || []
+          const one = []
+          const half = []
+          child.map(field => {
+            if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) {
+              half.push(field)
+            } else {
+              if (field.attrField && field.attrField !== 'FBGBJBD' && field.attrField !== 'SYRZ') {
+                one.push(field)
+              }
+            }
+          })
+          const fieldsIsTextAreaOrFile = child.filter(field => {
+            return field.attrType === 'TEXTAREA' || field.attrType === 'FILE'
+          })
+          const fieldOthers = child.filter(field => {
+            return field.attrType !== 'TEXTAREA' && field.attrType !== 'FILE'
+          })
+          location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile]
+          location.one = one
+          location.half = half
+          location.showAll = false
+        })
+        this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list', {
+          id: this.$route.query.id
+        }, {
+          _this: this
+        }, res => {
+          displayLocation.map(item => {
+            if (item.value === '2URVBGR2Y4UG77KZ5YPL') {
+              for (let key in res.data) {
+                item.one.push({
+                  attrName: key,
+                  value: res.data[key].join(','),
+                  isShowImp: '0',
+                  id: key
+                })
+              }
+            }
+          })
+          this.dynamicFormField = displayLocation
+        })
+        sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation))
+        this.loading = false
+      })
+      /**
+       * 自定义鼠标滚轮事件
+       * chrome and ie
+       */
+      window.addEventListener('mousewheel', this.handleScroll, false)
+      // firefox
+      window.addEventListener('DOMMouseScroll', this.handleScroll, false)
+    },
+    destroyed() {
+      window.removeEventListener('mousewheel', this.handleScroll, false)
+      window.removeEventListener('DOMMouseScroll', this.handleScroll, false)
+      sessionStorage.removeItem('displayLocation')
+
+      window.onresize = null
+      this.tableHeight = ''
+    }
   }
-}
 </script>
 
 <style lang="less" scoped>
-@import '~@/assets/styles/mixins';
-@import '~@/assets/styles/style';
-.files-title {
-  display: flex;
-  align-items: center;
-  a {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: calc(~'100% - 40px');
-    white-space: nowrap;
-    display: block;
+  @import '~@/assets/styles/mixins';
+  @import '~@/assets/styles/style';
+  .files-title {
+    display: flex;
+    align-items: center;
+    a {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: calc(~'100% - 40px');
+      white-space: nowrap;
+      display: block;
+    }
   }
-}
-.files-titles {
-  a {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 780px;
-    white-space: nowrap;
-    display: block;
+  .files-titles {
+    a {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      max-width: 780px;
+      white-space: nowrap;
+      display: block;
+    }
   }
-}
-/deep/ .el-icon-circle-close:before {
-  margin-left: 250px;
-}
-
-/deep/ .el-tag.el-tag--info {
-  margin-left: 30px;
-}
-
-/deep/ .el-radio {
-  margin-left: 30px;
-}
-
-/deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner {
-  width: 600px;
-  margin-left: 20px;
-}
-
-/deep/ .label-input-form .add-form-item .el-form-item__label {
-  width: 150px;
-}
-
-/deep/ .el-collapse-item__header {
-  border-bottom: none !important;
-}
-
-/deep/ .decomposition-btn {
-  position: absolute;
-  top: 6px;
-  right: 0;
-  padding: 0 10px;
-  height: 30px;
-  line-height: 30px;
-  font-size: 14px;
-  color: #07C160;
-  border: 1px solid #07C160;
-  background: rgba(1, 193, 96, 0.1);
-
-  /deep/ .icon-separate {
-    display: inline-block;
-    margin-right: 3px;
-    width: 16px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    background-position: center center;
-    vertical-align: sub;
-    background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+  /deep/ .el-icon-circle-close:before {
+    margin-left: 250px;
   }
-}
-
-/deep/ .el-collapse {
-  border: none;
-}
-
-/deep/ .el-collapse-item__wrap {
-  border: none;
-}
-
-/deep/ .el-collapse-item__content {
-  padding-bottom: 0px;
-  font-size: 16px;
-  color: #303133;
-  line-height: 1.769230769230769;
-}
-
-/deep/ .btn1 #question {
-  padding: 0 10px;
-  margin-left: 10px;
-  height: 30px;
-  line-height: 30px;
-  font-size: 14px;
-  color: #409EFF;;
-  border: 1px solid #409EFF;
-  background: rgba(64, 158, 255, 0.1);
-
-  .icon-separate {
-    display: inline-block;
-    margin-right: 3px;
-    width: 16px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    background-position: center center;
-    vertical-align: sub;
-    background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+  
+  /deep/ .el-tag.el-tag--info {
+    margin-left: 30px;
   }
-}
-
-.other-standard-details {
-  padding: 15px 30px 0;
-  width: 100%;
-  margin: 0 auto;
-  overflow: auto;
-  height: 100%;
-  background: #FFFFFF;
-  overflow: auto;
-
-  .itemsTextBox {
-    min-height: 300px;
-    max-height: 500px;
+  
+  /deep/ .el-radio {
+    margin-left: 30px;
+  }
+  
+  /deep/ .label-input-form .add-form-item .el-form-item__content .el-input .el-input__inner {
+    width: 600px;
+    margin-left: 20px;
+  }
+  
+  /deep/ .label-input-form .add-form-item .el-form-item__label {
+    width: 150px;
+  }
+  
+  /deep/ .el-collapse-item__header {
+    border-bottom: none !important;
+  }
+  
+  /deep/ .decomposition-btn {
+    position: absolute;
+    top: 6px;
+    right: 0;
+    padding: 0 10px;
+    height: 30px;
+    line-height: 30px;
+    font-size: 14px;
+    color: #07C160;
+    border: 1px solid #07C160;
+    background: rgba(1, 193, 96, 0.1);
+    
+    /deep/ .icon-separate {
+      display: inline-block;
+      margin-right: 3px;
+      width: 16px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+    }
+  }
+  
+  /deep/ .el-collapse {
+    border: none;
+  }
+  
+  /deep/ .el-collapse-item__wrap {
+    border: none;
+  }
+  
+  /deep/ .el-collapse-item__content {
+    padding-bottom: 0px;
+    font-size: 16px;
+    color: #303133;
+    line-height: 1.769230769230769;
+  }
+  
+  /deep/ .btn1 #question {
+    padding: 0 10px;
+    margin-left: 10px;
+    height: 30px;
+    line-height: 30px;
+    font-size: 14px;
+    color: #409EFF;;
+    border: 1px solid #409EFF;
+    background: rgba(64, 158, 255, 0.1);
+    
+    .icon-separate {
+      display: inline-block;
+      margin-right: 3px;
+      width: 16px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+    }
+  }
+  
+  .other-standard-details {
+    padding: 15px 30px 0;
+    width: 100%;
+    margin: 0 auto;
     overflow: auto;
-    line-height: 20px;
-
-    /deep/ td {
-      border: 1px solid #606266;
-      text-align: center;
-    }
-  }
-
-  /deep/ .el-radio-group {
-    display: block;
-    margin-bottom: 10px;
-  }
-
-  /deep/ .icon-download {
-    display: inline-block;
-    margin-left: 3px;
-    width: 18px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    background-position: center center;
-    vertical-align: sub;
-    cursor: pointer;
-    background-image: url("~assets/images/shangqi/img/download.png");
-  }
-
-  /deep/ .icon-download2 {
-    display: inline-block;
-    margin-left: 3px;
-    width: 18px;
-    height: 16px;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    background-position: center center;
-    vertical-align: sub;
-    cursor: pointer;
-    background-image: url("~assets/images/shangqi/img/download2.png");
-  }
-
-  .action-bar {
-    border-top: 0px;
-  }
-
-  .fileCss {
-    margin-right: 10px;
-    cursor: pointer;
-  }
-
-  .fileCss:hover {
-    color: #0c91e5;
-  }
-
-  .myDialog1 {
-    /deep/ .el-dialog__body {
-      padding: 0px 20px 10px;
-    }
-
-    .myRadio {
-      min-height: 200px;
-      max-height: 400px;
+    height: 100%;
+    background: #FFFFFF;
+    overflow: auto;
+    
+    .itemsTextBox {
+      min-height: 300px;
+      max-height: 500px;
       overflow: auto;
-    }
-  }
-
-  .myDialog {
-    min-width: 700px;
-
-    .el-dialog {
-      min-width: 700px;
-      width: 70%;
-    }
-
-    /deep/ .el-dialog__body {
-      padding: 0px 20px 56px;
-
-      .basic-information-content {
-        color: #333333;
-        font-size: 16px;
-        /*font-weight: 400;*/
-
-        .standard-text {
-          height: 50px;
-          line-height: 50px;
-          border-bottom: 1px solid #E5E5E5;
-        }
-
-        & > p {
-          min-height: 55px;
-          line-height: 55px;
-          border-bottom: 1px solid #E5E5E5;
-        }
+      line-height: 20px;
+      
+      /deep/ td {
+        border: 1px solid #606266;
+        text-align: center;
       }
     }
-
-    .knowContent {
-      height: 500px;
+    
+    /deep/ .el-radio-group {
+      display: block;
+      margin-bottom: 10px;
     }
-  }
-
-  .details-header {
-    padding: 34px 0;
-    font-size: 0.3rem;
-    font-weight: bold;
-    color: #555555;
-    text-align: center;
-
-    & > span {
-      width: 100%;
+    
+    /deep/ .icon-download {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+      background-image: url("~assets/images/shangqi/img/download.png");
     }
-  }
-
-  /deep/ .details-content {
-    /*padding: 0 67px;*/
-
-    .details-content-modular {
-      .modular-header {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        width: 100%;
-        height: 50px;
-        border-bottom: 1px solid #E5E5E5;
-
-        .modular-header-title {
-          font-size: 0.25rem;
-          font-weight: bold;
-          color: #3B424C;
-
-          & > .icon-modular-title {
-            display: inline-block;
-            margin-left: -28px;
-            width: 18px;
-            height: 18px;
-            background-size: 100% 100%;
-            background-position: center center;
-            background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
-            position: relative;
-            top: 2px;;
+    
+    /deep/ .icon-download2 {
+      display: inline-block;
+      margin-left: 3px;
+      width: 18px;
+      height: 16px;
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      background-position: center center;
+      vertical-align: sub;
+      cursor: pointer;
+      background-image: url("~assets/images/shangqi/img/download2.png");
+    }
+    
+    .action-bar {
+      border-top: 0px;
+    }
+    
+    .fileCss {
+      margin-right: 10px;
+      cursor: pointer;
+    }
+    
+    .fileCss:hover {
+      color: #0c91e5;
+    }
+    
+    .myDialog1 {
+      /deep/ .el-dialog__body {
+        padding: 0px 20px 10px;
+      }
+      
+      .myRadio {
+        min-height: 200px;
+        max-height: 400px;
+        overflow: auto;
+      }
+    }
+    
+    .myDialog {
+      min-width: 700px;
+      
+      .el-dialog {
+        min-width: 700px;
+        width: 70%;
+      }
+      
+      /deep/ .el-dialog__body {
+        padding: 0px 20px 56px;
+        
+        .basic-information-content {
+          color: #333333;
+          font-size: 16px;
+          /*font-weight: 400;*/
+          
+          .standard-text {
+            height: 50px;
+            line-height: 50px;
+            border-bottom: 1px solid #E5E5E5;
           }
-
-          & > span {
-            padding-left: 10px;
+          
+          & > p {
+            min-height: 55px;
+            line-height: 55px;
+            border-bottom: 1px solid #E5E5E5;
           }
         }
-
-        .modular-header-btn {
-          & > button {
-            height: 30px;
-            line-height: 30px;
-            font-size: 14px;
-            padding: 0 10px;
-            font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
-
-            & > i {
+      }
+      
+      .knowContent {
+        height: 500px;
+      }
+    }
+    
+    .details-header {
+      padding: 34px 0;
+      font-size: 0.3rem;
+      font-weight: bold;
+      color: #555555;
+      text-align: center;
+      
+      & > span {
+        width: 100%;
+      }
+    }
+    
+    /deep/ .details-content {
+      /*padding: 0 67px;*/
+      
+      .details-content-modular {
+        .modular-header {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          width: 100%;
+          height: 50px;
+          border-bottom: 1px solid #E5E5E5;
+          
+          .modular-header-title {
+            font-size: 0.25rem;
+            font-weight: bold;
+            color: #3B424C;
+            
+            & > .icon-modular-title {
               display: inline-block;
-              margin-right: 3px;
+              margin-left: -28px;
               width: 18px;
               height: 18px;
-              background-repeat: no-repeat;
               background-size: 100% 100%;
               background-position: center center;
-              vertical-align: text-bottom;
+              background-image: url("~assets/images/shangqi/standardDetails/modular-title.png");
+              position: relative;
+              top: 2px;;
+            }
+            
+            & > span {
+              padding-left: 10px;
             }
           }
-
-          .collection-btn {
-            padding: 0;
-            border: none;
-
-            i {
-              color: #F2CB51;
-              font-size: 18px;
-              width: 18px;
-              height: 18px;
-            }
-
-            /*background: rgba(244, 162, 39, 0.1);*/
-
-            .icon-collection {
-              background-image: url("~assets/images/shangqi/standardDetails/collection.png");
-            }
-
-            &:hover {
-              background: transparent;
-            }
-          }
-
-          .relation-btn {
-            color: #409EFF;
-            border: 1px solid #409EFF;
-            background: rgba(64, 158, 255, 0.1);
-
-            .icon-relation {
-              background-image: url("~assets/images/shangqi/standardDetails/relation.png");
-            }
-          }
-        }
-      }
-
-      .basic-information-content {
-        color: #333333;
-        font-size: 0.2rem;
-        /*font-weight: 400;*/
-
-        .standard-text {
-          height: 50px;
-          line-height: 50px;
-          border-bottom: 1px solid #E5E5E5;
-        }
-      }
-
-      .modular-content {
-        .modular-item-more {
-          padding: 5px 0;
-          width: 100%;
-          float: left;
-          text-align: center;
-          line-height: 30px;
-          display: flex;
-          justify-content: center;
-          align-items: center;
-
-          .wrap {
-            cursor: pointer;
-
-            span {
-              color: #409EFF;
-            }
-
-            img {
-              height: 10px;
-              margin-left: 5px;
-              transition: all .2s linear;
-
-              &.is-show-all {
-                transform: rotate(180deg);
-              }
-            }
-          }
-        }
-
-        & > div:not(.modular-item-more) {
-          position: relative;
-          //英文名称变粗
-          border-bottom: 1px solid #E5E5E5;
-          min-height: 43px;
-          line-height: 43px;
-
-          .modular-content-p-name {
-            display: inline-block;
-            width: 213px;
-            height: 43px;
-            line-height: 43px;
-            font-size: 0.2rem;
-            color: #333333;
-            vertical-align: top;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-
-          .modular-content-p-val {
-            line-height: 32px;
-            display: inline-block;
-            width: calc(~'100% - 225px');
-            font-size: 0.2rem;
-            //min-height: 50px;
-            //line-height: 50px;
-            //font-size: 16px;
-            //color: #999999;
-            word-break: break-all;
-            //overflow: hidden;
-            //white-space: nowrap;
-            //text-overflow: ellipsis;
-          }
-
-          .modular-content-p-flies {
-            font-size: 0.2rem;
-            line-height: 32px;
-            //position: relative;
-            display: inline-block;
-            width: calc(~'100% - 225px');
-
-            & > .files-title {
-              width: calc(~'100% - 120px');
-              //报批稿撑开
-              //min-height: 50px;
-              //line-height: 50px;
-              //font-size: 16px;
-              color: #409EFF;
-
-              & > a {
-                cursor: pointer;
-              }
-
-              & > i {
-                display: inline-block;
-                margin-left: 3px;
-                width: 18px;
-                height: 16px;
-                background-repeat: no-repeat;
-                background-size: 100% 100%;
-                background-position: center center;
-                vertical-align: sub;
-                cursor: pointer;
-              }
-
-              .icon-download {
-                background-image: url("~assets/images/shangqi/img/download.png");
-              }
-
-              .icon-download2 {
-                background-image: url("~assets/images/shangqi/img/download2.png");
-              }
-            }
-
-            .decomposition-btn {
-              position: absolute;
-              //报批稿撑开
-              //top: 10px;
-              right: 0;
-              margin-right: 10px;
-              padding: 0 10px;
+          
+          .modular-header-btn {
+            & > button {
               height: 30px;
               line-height: 30px;
               font-size: 14px;
-              color: #07C160;
-              border: 1px solid #07C160;
-              background: rgba(1, 193, 96, 0.1);
-
-              .icon-separate {
+              padding: 0 10px;
+              font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
+              
+              & > i {
                 display: inline-block;
                 margin-right: 3px;
-                width: 16px;
-                height: 16px;
+                width: 18px;
+                height: 18px;
                 background-repeat: no-repeat;
                 background-size: 100% 100%;
                 background-position: center center;
-                vertical-align: sub;
-                background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+                vertical-align: text-bottom;
+              }
+            }
+            
+            .collection-btn {
+              padding: 0;
+              border: none;
+              
+              i {
+                color: #F2CB51;
+                font-size: 18px;
+                width: 18px;
+                height: 18px;
+              }
+              
+              /*background: rgba(244, 162, 39, 0.1);*/
+              
+              .icon-collection {
+                background-image: url("~assets/images/shangqi/standardDetails/collection.png");
+              }
+              
+              &:hover {
+                background: transparent;
+              }
+            }
+            
+            .relation-btn {
+              color: #409EFF;
+              border: 1px solid #409EFF;
+              background: rgba(64, 158, 255, 0.1);
+              
+              .icon-relation {
+                background-image: url("~assets/images/shangqi/standardDetails/relation.png");
+              }
+            }
+          }
+        }
+        
+        .basic-information-content {
+          color: #333333;
+          font-size: 0.2rem;
+          /*font-weight: 400;*/
+          
+          .standard-text {
+            height: 50px;
+            line-height: 50px;
+            border-bottom: 1px solid #E5E5E5;
+          }
+        }
+        
+        .modular-content {
+          .modular-item-more {
+            padding: 5px 0;
+            width: 100%;
+            float: left;
+            text-align: center;
+            line-height: 30px;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            
+            .wrap {
+              cursor: pointer;
+              
+              span {
+                color: #409EFF;
+              }
+              
+              img {
+                height: 10px;
+                margin-left: 5px;
+                transition: all .2s linear;
+                
+                &.is-show-all {
+                  transform: rotate(180deg);
+                }
+              }
+            }
+          }
+          
+          & > div:not(.modular-item-more) {
+            position: relative;
+            //英文名称变粗
+            border-bottom: 1px solid #E5E5E5;
+            min-height: 43px;
+            line-height: 43px;
+            
+            .modular-content-p-name {
+              display: inline-block;
+              width: 213px;
+              height: 43px;
+              line-height: 43px;
+              font-size: 0.2rem;
+              color: #333333;
+              vertical-align: top;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+            }
+            
+            .modular-content-p-val {
+              line-height: 32px;
+              display: inline-block;
+              width: calc(~'100% - 225px');
+              font-size: 0.2rem;
+              //min-height: 50px;
+              //line-height: 50px;
+              //font-size: 16px;
+              //color: #999999;
+              word-break: break-all;
+              //overflow: hidden;
+              //white-space: nowrap;
+              //text-overflow: ellipsis;
+            }
+            
+            .modular-content-p-flies {
+              font-size: 0.2rem;
+              line-height: 32px;
+              //position: relative;
+              display: inline-block;
+              width: calc(~'100% - 225px');
+              
+              & > .files-title {
+                width: calc(~'100% - 120px');
+                //报批稿撑开
+                //min-height: 50px;
+                //line-height: 50px;
+                //font-size: 16px;
+                color: #409EFF;
+                
+                & > a {
+                  cursor: pointer;
+                }
+                
+                & > i {
+                  display: inline-block;
+                  margin-left: 3px;
+                  width: 18px;
+                  height: 16px;
+                  background-repeat: no-repeat;
+                  background-size: 100% 100%;
+                  background-position: center center;
+                  vertical-align: sub;
+                  cursor: pointer;
+                }
+                
+                .icon-download {
+                  background-image: url("~assets/images/shangqi/img/download.png");
+                }
+                
+                .icon-download2 {
+                  background-image: url("~assets/images/shangqi/img/download2.png");
+                }
+              }
+              
+              .decomposition-btn {
+                position: absolute;
+                //报批稿撑开
+                //top: 10px;
+                right: 0;
+                margin-right: 10px;
+                padding: 0 10px;
+                height: 30px;
+                line-height: 30px;
+                font-size: 14px;
+                color: #07C160;
+                border: 1px solid #07C160;
+                background: rgba(1, 193, 96, 0.1);
+                
+                .icon-separate {
+                  display: inline-block;
+                  margin-right: 3px;
+                  width: 16px;
+                  height: 16px;
+                  background-repeat: no-repeat;
+                  background-size: 100% 100%;
+                  background-position: center center;
+                  vertical-align: sub;
+                  background-image: url("~assets/images/shangqi/standardDetails/separate.png");
+                }
               }
             }
           }
         }
       }
-    }
-
-    .basic-information {
-      border-top: 2px dashed #D1D1D1;
-
-      .modular-header {
-        height: 60px;
-        border-bottom: none;
-      }
-
-      .basic-information-content {
-        & > p {
-          min-height: 43px;
-          line-height: 43px;
-          border-bottom: 1px solid #E5E5E5;
+      
+      .basic-information {
+        border-top: 2px dashed #D1D1D1;
+        
+        .modular-header {
+          height: 60px;
+          border-bottom: none;
+        }
+        
+        .basic-information-content {
+          & > p {
+            min-height: 43px;
+            line-height: 43px;
+            border-bottom: 1px solid #E5E5E5;
+          }
         }
       }
     }
-  }
-
-  .more, .put-away {
-    position: fixed;
-    bottom: 0;
-    width: 1200px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    //margin-bottom: 20px;
-    color: #409EFF;
-    font-size: 16px;
-    cursor: pointer;
-    background-image: linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 70%);
-    padding-bottom: 34px;
-    padding-top: 34px;
-
-    & > img {
-      margin-left: 5px;
-      width: 14px;
-      height: 14px;
+    
+    .more, .put-away {
+      position: fixed;
+      bottom: 0;
+      width: 1200px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      //margin-bottom: 20px;
+      color: #409EFF;
+      font-size: 16px;
+      cursor: pointer;
+      background-image: linear-gradient(-180deg, rgba(255, 255, 255, 0) 0%, #fff 70%);
+      padding-bottom: 34px;
+      padding-top: 34px;
+      
+      & > img {
+        margin-left: 5px;
+        width: 14px;
+        height: 14px;
+      }
+    }
+    
+    .put-away {
+      & > img {
+        transform: rotate(180deg);
+      }
+    }
+    
+    .not-footer-drawer {
+      .search-area {
+        margin-bottom: 0;
+        border-bottom: 5px solid #f6f6f6;
+      }
+      
+      .content {
+        padding: 0 10px;
+        flex: auto;
+        //height: calc(~'100% - 105px - 56px');
+      }
+      
+      .pagination {
+        position: static;
+      }
     }
   }
-
-  .put-away {
-    & > img {
-      transform: rotate(180deg);
+  
+  .half {
+    width: 100%;
+    float: left;
+  }
+  
+  .hidden {
+    overflow: hidden;
+  }
+  
+  .clearfix {
+    &:after {
+      clear: both;
+    }
+    
+    &:after, &:before {
+      display: table;
+      content: "";
     }
   }
-
-  .not-footer-drawer {
-    .search-area {
-      margin-bottom: 0;
-      border-bottom: 5px solid #f6f6f6;
-    }
-
-    .content {
-      padding: 0 10px;
-      flex: auto;
-      //height: calc(~'100% - 105px - 56px');
-    }
-
-    .pagination {
-      position: static;
+  
+  .details-container .el-divider {
+    height: 1px;
+    background-color: #d5d8da;
+  }
+  
+  .span-line:hover {
+    text-decoration: underline;
+  }
+  
+  .relateClass {
+    .el-dialog__body {
+      max-height: 460px;
+      overflow-y: auto;
     }
   }
-}
-
-.half {
-  width: 100%;
-  float: left;
-}
-
-.hidden {
-  overflow: hidden;
-}
-
-.clearfix {
-  &:after {
-    clear: both;
+  
+  .over {
+    word-break: break-all;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
   }
-
-  &:after, &:before {
-    display: table;
-    content: "";
+  
+  ::v-deep .el-drawer__header {
+    & > span:first-child {
+      outline: none !important;
+    }
   }
-}
-
-.details-container .el-divider {
-  height: 1px;
-  background-color: #d5d8da;
-}
-
-.span-line:hover {
-  text-decoration: underline;
-}
-
-.relateClass {
-  .el-dialog__body {
-    max-height: 460px;
-    overflow-y: auto;
-  }
-}
-
-.over {
-  word-break: break-all;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-
-::v-deep .el-drawer__header {
-  & > span:first-child {
+  
+  ::v-deep .el-drawer {
     outline: none !important;
   }
-}
-
-::v-deep .el-drawer {
-  outline: none !important;
-}
 </style>

From f842d812995bb769e535b07592e06f972df2b97e Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Mon, 20 Jun 2022 17:25:30 +0800
Subject: [PATCH 47/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055839=20=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=BD=92=E6=A1=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0tips?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=BD=92=E6=A1=A3=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/personal/pages/my-questions/components/answerItem.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue
index 767375cb6..d4edacaed 100644
--- a/src/pages/personal/pages/my-questions/components/answerItem.vue
+++ b/src/pages/personal/pages/my-questions/components/answerItem.vue
@@ -192,6 +192,7 @@ export default {
         }, res => {
           if(res.respCode === '200'){
             this.$emit('emitInsState',true)
+            this.$message.success('归档成功')
           }
         }, e => {
         })

From 5467c4ce7cfc9a7d19742196ddfc1405ccb5ac9f Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 20 Jun 2022 18:05:40 +0800
Subject: [PATCH 48/51] feat: There is no way the, bug #55865

---
 .../my-questions/components/answerItem.vue    |  2 +-
 .../components/questionItemInfo.vue           | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue
index d4edacaed..a207a4e53 100644
--- a/src/pages/personal/pages/my-questions/components/answerItem.vue
+++ b/src/pages/personal/pages/my-questions/components/answerItem.vue
@@ -136,7 +136,7 @@ export default {
         this.$message.warning(res.message)
         fileList.pop()
       }
-      this.importModalshowflagtemp = false
+      // this.importModalshowflagtemp = false
     },
     //文件上传前
     beforeUpload(file){
diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
index 7d622fa11..a4c09dc06 100644
--- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
@@ -12,7 +12,9 @@
       <div class="row">
         <div class="item" @click="clickButtonTo">
           <div style="cursor: pointer;">附件：
-            <span style="color: #409EFF">{{answer.appendixName}}</span>
+            <div v-if="fileList.length > 0" v-for="(item,index) in fileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 40px;" class="fileClass">
+              <span style="" @click="clickButtonTo(item.id)" :title="item.name"> {{ item.name  }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -42,16 +44,30 @@ export default {
       checked: '',
       answererNowUserId: this.$store.getters.userInfo.userId,
       answererNowUserName: this.$store.getters.userInfo.userName,
+      fileList:[],
     }
   },
   methods:{
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     //点击预览
-    clickButtonTo() {
-      const attId = this.answer.appendixId
+    clickButtonTo(attId) {
       this.$preview(attId)
     },
     answerChang(){}
   },
+  mounted () {
+    this.fileList = this.assemble(this.answer.appendixId,this.answer.appendixName)
+  },
   watch:{
     answer: {
       immediate: true,
@@ -65,6 +81,9 @@ export default {
 </script>
 
 <style lang="less" scoped>
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 #answer-item{
   width: 100%;
   min-width: 130px;

From d0a48b3e4032e7764e69d9824d76c28974fd7a8e Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Mon, 20 Jun 2022 18:13:06 +0800
Subject: [PATCH 49/51] feat: There is no way the, bug #55865

---
 .../pages/my-questions/components/questionItemInfo.vue       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
index a4c09dc06..1026e8895 100644
--- a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
+++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue
@@ -61,7 +61,10 @@ export default {
     },
     //点击预览
     clickButtonTo(attId) {
-      this.$preview(attId)
+      // 过滤
+      if(attId.indexOf("ATT_FILE") !== -1){
+        this.$preview(attId)
+      }
     },
     answerChang(){}
   },

From b3d7a8f44e25b60b6b9776b562a723a5181fc778 Mon Sep 17 00:00:00 2001
From: "396572590@qq.com" <liuchao>
Date: Tue, 21 Jun 2022 09:36:49 +0800
Subject: [PATCH 50/51] feat: conf dev

---
 src/sysConfig/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index d974d60c7..a6096515a 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -8,8 +8,8 @@
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.1.42'
 // const devInterfacePORT = '9999'
-const devIp = '192.168.0.109'
-const devInterfacePORT = '9999'
+const devIp = '39.98.140.126'
+const devInterfacePORT = '4201'
 // const devIp = '62.234.136.153'
 // const devInterfacePORT = '8033'
 // 配置 idm 认证

From 4efe89449f7f6f24b0ab701a549f8ae224a4c4fe Mon Sep 17 00:00:00 2001
From: hanshaozhuang <hanshaozhuang>
Date: Tue, 21 Jun 2022 10:27:52 +0800
Subject: [PATCH 51/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055837=20=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=8F=B7=E3=80=81=E5=85=B3=E9=94=AE=E5=AD=97=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E5=A4=B1=E8=B4=A5=EF=BC=8C?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=90=8E=E6=A3=80=E7=B4=A2=20=E6=9A=82?=
 =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=20=E5=85=B6=E5=AE=9E=E6=98=AF?=
 =?UTF-8?q?=E6=9C=89=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/regulatoryRepository/standQA/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue
index 354b897b5..0979a3a4b 100644
--- a/src/pages/regulatoryRepository/standQA/index.vue
+++ b/src/pages/regulatoryRepository/standQA/index.vue
@@ -1087,6 +1087,7 @@ export default {
        this.$http.get('lawss/AskQuestions/getAskQuestionsNew',{
          standardId: this.activestand,
          classification: this.activeName,
+         problemDescription: this.questionSerach.problemDescription
        },{
          _this: this
        }, res => {