From 567cb4905ed9a844476491e258c82ad77cbf43aa Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Wed, 28 Jul 2021 10:28:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=9B=BD=E5=A4=96=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E5=BA=93=20=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 96 ++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index c00a70b96..affcc92df 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -199,9 +199,103 @@
             </div>
 
           </template>
+            <template
+                    v-for="(child, childIndex) in item.one"
+                    v-if="child.isShowImp === '0' && (item.label !== '关联信息' && (item.label !== '实施日期' && child.attrField !== 'SSRQGJ' && child.attrField !== 'ZCCSSRQGJ' && child.attrField !== 'XCXSSRQGJ' || (childIndex < 6 || item.showAll)) || item.label === '适用范围')"
+            >
+                <div
+                        :key="child.id"
+                        class="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">{{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'"
+                    >
+                        <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">{{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">{{ file.oldFileName }}</a>
+                                <i
+                                        title="下载"
+                                        @click="downloadFile(file.id)"
+                                        class="icon-download"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i
+                                        title="下载带水印"
+                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                        class="icon-download2"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
+                            </template>
+                            <template v-else>
+                                <a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
+                                <i
+                                        title="下载"
+                                        @click="downloadFile(file.id)"
+                                        class="icon-download"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
+                                />
+                                <i
+                                        title="下载带水印"
+                                        @click="downloadFileByWater(file.id, file.fileSuffix)"
+                                        class="icon-download2"
+                                        v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
+                                />
+                                <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
+                            </template>
+                        </p>
+                        <!--                <el-button-->
+                        <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+                        <!--                  @click="showItemsModel(child.attrField)"-->
+                        <!--                  class="decomposition-btn"-->
+                        <!--                  icon="icon-separate"-->
+                        <!--                >标准分解单</el-button>-->
+                    </div>
+                </div>
+
+            </template>
           <template
             v-for="(child, childIndex) in item.child"
-            v-if="child.isShowImp === '0' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
+            v-if="child.isShowImp === '0' && item.label !== '实施日期' && item.label !== '适用范围'"
           >
             <div
               :key="child.id"

From 68f79d8883a79c28b9375b4439764a9e8cb15f8d Mon Sep 17 00:00:00 2001
From: shen_yan_pu <1975145892@qq.com>
Date: Wed, 28 Jul 2021 10:54:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8,=E6=9C=AA=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E9=A1=B9=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/wfhxzg/step1.vue       | 35 ++++++++-----------
 .../pages/addEdit.vue                         |  6 ++--
 .../pages/otherAddEit.vue                     |  2 +-
 .../pages/projectAddEit.vue                   |  2 +-
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
index a04520354..58f1a1b86 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
@@ -288,18 +288,7 @@ export default {
     ProcessFooter,
     ProcessTitle
   },
-  mounted () {
-    this.getJsonData()
-  },
   methods: {
-    getJsonData() {
-      const params = {
-        type: '8'
-      }
-      startProcess(params).then(res => {
-        this.taskID = res.data
-      })
-    },
     //点击新增事件
     addList() {
       standUnqualified(this.queryUnqualidiedData).then(res => {
@@ -383,15 +372,21 @@ export default {
         } else {
           this.$refs['roleForm'].validate((valid) => {
             if (valid) {
-              const params = new FormData();
-              params.set('json', JSON.stringify(json))
-              params.set('userId', this.$store.getters.userInfo.userId)
-              params.set('taskIds', this.taskID)
-              completeTask(params).then(res => {
-                if(res.success === true) {
-                  this.$message.success('提交成功')
-                  this.$router.push("/processCenter");
-                }
+              const paramsInfo = {
+                type: '8'
+              }
+              startProcess(paramsInfo).then(res => {
+                this.taskID = res.data
+                const params = new FormData();
+                params.set('json', JSON.stringify(json))
+                params.set('userId', this.$store.getters.userInfo.userId)
+                params.set('taskIds', this.taskID)
+                completeTask(params).then(res => {
+                  if(res.success === true) {
+                    this.$message.success('提交成功')
+                    this.$router.push("/processCenter");
+                  }
+                })
               })
             }
           })
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 8d81c22bc..853fa1c92 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -973,8 +973,8 @@ export default {
         return false
       }
       // 判断文件上传大小
-      if (file.size / 1024 / 1024 > 300) {
-        this.$message.warning('文件' + file.name + '大小不能超过300M')
+      if (file.size / 1024 / 1024 > 200) {
+        this.$message.warning('文件' + file.name + '大小不能超过200M')
         return false
       }
       return true
@@ -1403,7 +1403,7 @@ export default {
             this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
           }
         })
-        this.drawerTotal = res.data.list.length
+        this.drawerTotal = res.data.count
       }, e => {
       })
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
index df8f46aec..52da71b0b 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
@@ -1369,7 +1369,7 @@ export default {
             this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
           }
         })
-        this.drawerTotal = res.data.list.length
+        this.drawerTotal = res.data.count
       }, e => {
       })
     },
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
index fc4bc99ef..4dfcc1846 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
@@ -1368,7 +1368,7 @@ export default {
             this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
           }
         })
-        this.drawerTotal = res.data.list.length
+        this.drawerTotal = res.data.count
       }, e => {
       })
     },

From 27ee2370399d5a8449fc3277efa55930c0d30154 Mon Sep 17 00:00:00 2001
From: liuhuaizhi <liuhuaizhi@91isoft.com>
Date: Wed, 28 Jul 2021 11:26:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../localProductsOrProjectLibrary/pages/details.vue          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index da1ae7721..f15f0a7f3 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -59,7 +59,7 @@
               align="center">
           </el-table-column>
           <el-table-column
-              prop="standId"
+              prop="standNumber"
               label="项目编号"
               fixed="left"
               width="260px"
@@ -555,7 +555,7 @@ export default {
             this.active = -1
           }
         }
-        // 考虑如果没有当前时间，颜色怎么设置
+        // 考虑如果没有当前时间， 颜色怎么设置
       })
       this.selectTableDataList()
     },
@@ -586,6 +586,7 @@ export default {
           }
           const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
               'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
+          console.log(exportURL)
           window.open(exportURL)
           this.$message.success('导出信息成功')
         }