update 国内海外

src/views/standardRegulationLibrary/commonPage/StandardDetailPage.vue

@@ -32,21 +32,25 @@
               }}
             </span>
             <div class="file-box" v-else>
-              <div class="detail-page-process-manuscript-file" v-for="file in detailData[formItem.dbFieldName + 'List']" :key="file.id">
-                <div class="detail-page-process-manuscript-file-info">
-                  <a-icon type="link" />
-                  <div class="detail-page-process-manuscript-file-name" @click="handlePreview(file)">{{ file.fileName }}</div>
+              <template v-if="detailData[formItem.dbFieldName + 'List'] && detailData[formItem.dbFieldName + 'List'].length > 0">
+                <div class="detail-page-process-manuscript-file" v-for="file in detailData[formItem.dbFieldName + 'List']" :key="file.id">
+                  <div class="detail-page-process-manuscript-file-info">
+                    <a-icon type="link" />
+                    <div class="detail-page-process-manuscript-file-name" @click="handlePreview(file)">{{ file.fileName }}</div>
+                  </div>
+                  <!--                下载-->
+                  <a-button type="link" icon="download" v-has="btnPermission.download" class="file-btn" @click="handleDownload(file)">
+                    {{ $t('download')
+                    }}
+                  </a-button>
+                  <!--                无水印下载-->
+                  <!--<a-button type="link" v-has="btnPermission.unwatermarkedDownload" class="file-btn">-->
+                  <!--  <i class="iconfont icon-water-drop-slash"></i>-->
+                  <!--  {{ $t('unwatermarkedDownload') }}-->
+                  <!--</a-button>-->
                 </div>
-                <!--                下载-->
-                <a-button type="link" icon="download" v-has="btnPermission.download" class="file-btn" @click="handleDownload(file)">{{ $t('download')
-                  }}
-                </a-button>
-                <!--                无水印下载-->
-                <!--<a-button type="link" v-has="btnPermission.unwatermarkedDownload" class="file-btn">-->
-                <!--  <i class="iconfont icon-water-drop-slash"></i>-->
-                <!--  {{ $t('unwatermarkedDownload') }}-->
-                <!--</a-button>-->
-              </div>
+              </template>
+              <span v-else>{{ global.emptyLine }}</span>
             </div>
           </div>
         </div>
@@ -72,9 +76,10 @@
               </div>
               <div class="detail-page-process-manuscript-file-operate">
                 <!--                下载-->
-                <a-button type="link" icon="download" v-has="btnPermission.download" @click="handleDownload(file)">{{ $t('download') }}</a-button>
+                <a-button type="link" icon="download" v-has="btnPermission.download" @click="handleWatermarkedDownload(file)">{{ $t('download') }}
+                </a-button>
                 <!--                无水印下载-->
-                <a-button type="link" v-has="btnPermission.unwatermarkedDownload">
+                <a-button type="link" v-has="btnPermission.unwatermarkedDownload" @click="handleDownload(file)">
                   <i class="iconfont icon-water-drop-slash"></i>
                   {{ $t('unwatermarkedDownload') }}
                 </a-button>
@@ -387,6 +392,9 @@ export default {
     handleDownload (file) {
       // 下载文件
       downloadFile(`/sys/common/download/${file.id}`, file.fileName)
+    },
+    handleWatermarkedDownload (file) {
+      downloadFile(`/laws/standard/common/downloadWithWaterMark/${file.id}`, file.fileName)
     }
   }
 }

src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue

@@ -454,7 +454,7 @@ export default {
       configDomesticStandard(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.modalFormOk()
+          this.loadData()
         } else {
           this.$message.warn(res.message)
         }
@@ -484,7 +484,11 @@ export default {
       removeDomesticStandard(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.modalFormOk()
+          // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
+          if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) {
+            this.ipagination.current -= 1
+          }
+          this.loadData()
         } else {
           this.$message.warn(res.message)
         }

src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue

@@ -455,7 +455,7 @@ export default {
       configOverseasStandard(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.modalFormOk()
+          this.loadData()
         } else {
           this.$message.warn(res.message)
         }
@@ -485,7 +485,11 @@ export default {
       removeOverseasStandard(params).then(res => {
         if (res.success) {
           this.$message.success(res.message)
-          this.modalFormOk()
+          // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
+          if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) {
+            this.ipagination.current -= 1
+          }
+          this.loadData()
         } else {
           this.$message.warn(res.message)
         }