修改禅道已知bug

jero-web/src/common/lang/en-us.js

@@ -1255,4 +1255,5 @@ module.exports = {
   deleteNode:'If any file information exists, it will be deleted',
   HaveReleased:'Have released',
   forward:'Forward',
+  areResponsibilityAreaInformationBatch:'Are you sure you want to modify the responsibility area information in batch',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1358,4 +1358,5 @@ module.exports = {
   deleteNode:'若有文件信息将同步删除',
   HaveReleased:'已发布',
   forward:'转发',
+  areResponsibilityAreaInformationBatch:'确实是否批量修改责任领域信息',
 }

jero-web/src/views/documentTools/virtualList/components/batSetting.vue

@@ -35,11 +35,11 @@
                                   :placeholder="$t('PleaseSelect')+$t('certificationType')"
                                   :type="'select'"
                                   :triggerChange="false" :dictCode="'attestation_type'"/>
-<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
-<!--                                 @input="handleInput('attestationType')"-->
-<!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
-<!--                                 :type="'select'"-->
-<!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationType"-->
+              <!--                                 @input="handleInput('attestationType')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationType')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" dictCode="attestation_type"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -55,11 +55,11 @@
                                   :placeholder="$t('PleaseSelect')+$t('certificationLevel')"
                                   :type="'select'"
                                   :triggerChange="false" :dictCode="'attestation_rank'"/>
-<!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
-<!--                                 @input="handleInput('attestationRank')"-->
-<!--                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
-<!--                                 :type="'select'"-->
-<!--                                 :triggerChange="false" dictCode="attestation_rank"/>-->
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.attestationRank"-->
+              <!--                                 @input="handleInput('attestationRank')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('certificationLevel')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" dictCode="attestation_rank"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -73,11 +73,11 @@
                                   :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                   :type="'select'"
                                   :triggerChange="false" :dictCode="'duty_territory'"/>
-<!--              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
-<!--                                 @input="handleInput('dutyTerritory')"-->
-<!--                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
-<!--                                 :type="'select'"-->
-<!--                                 :triggerChange="false" dictCode="duty_territory"/>-->
+              <!--              <j-dict-select-tag class="box-input" v-model="formInline.dutyTerritory"-->
+              <!--                                 @input="handleInput('dutyTerritory')"-->
+              <!--                                 :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"-->
+              <!--                                 :type="'select'"-->
+              <!--                                 :triggerChange="false" dictCode="duty_territory"/>-->
             </a-form-model-item>
           </div>
         </a-col>
@@ -216,6 +216,13 @@
         })
       },
       handleOk() {
+        if (this.formInline.dutyTerritory) {
+          this.handleOnTwo()
+        } else {
+          this.handleOkOne()
+        }
+      },
+      handleOkOne() {
         let ids = JSON.parse(JSON.stringify(this.ids))
         let formInline = JSON.parse(JSON.stringify(this.formInline))
         Object.keys(formInline).forEach(res => {
@@ -240,6 +247,37 @@
           }
         })
       },
+      handleOnTwo() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('areResponsibilityAreaInformationBatch'),
+          onOk() {
+            let ids = JSON.parse(JSON.stringify(_this.ids))
+            let formInline = JSON.parse(JSON.stringify(_this.formInline))
+            Object.keys(formInline).forEach(res => {
+              if (formInline[res] instanceof Array) {
+                formInline[res] = formInline[res].join(',')
+              }
+            })
+            let query = {
+              ids: ids.join(','),
+              ...formInline
+            }
+            _this.confirmLoading = true
+            postAction(_this.url.setBatch, query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.visible = false
+                _this.confirmLoading = false
+                _this.$emit('batSettingList')
+              } else {
+                _this.$message.warning(res.message)
+                _this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
       handleCancel() {
         this.formInline = {}
         this.visible = false

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -143,7 +143,7 @@
               class="ant-table tableList"
               :loading="loading"
               :pagination="false"
-              :scroll="{x: '100%',y:'calc(100vh - 170px)'}"
+              :scroll="{x: '100%',y:'calc(100vh - 186px)'}"
               rowKey="id"
               :data-source="dataSource"
               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -202,6 +202,9 @@
            <span v-else>--</span>
         </span>
             </a-table>
+            <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+              {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+            </div>
           </div>
         </a-card>
       </div>
@@ -796,7 +799,7 @@
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
         if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
         } else if (fileSuffix == '.docx') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
@@ -813,7 +816,7 @@
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
         if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id+'&userName='+this.userInfo().username))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + id + '&userName=' + this.userInfo().username))
         } else if (fileSuffix == '.docx') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + id + fileSuffix)
           window.open(url, '_blank')
@@ -825,7 +828,7 @@
         }
       },
       download(item) {
-        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id ,userName:this.userInfo().username})
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
       },
       clickButtonToUpload(item) {
         this.loading = true
@@ -1004,6 +1007,14 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+  .buttom-box {
+    width: 100%;
+    text-align: right;
+    font-size: 16px;
+    font-weight: 500;
+    color: #000F16;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {

jero-web/src/views/projectManagement/components/batSetting.vue

@@ -215,6 +215,13 @@
         })
       },
       handleOk() {
+        if (this.formInline.dutyTerritory) {
+          this.handleOkTwo()
+        } else {
+          this.handleOkOne()
+        }
+      },
+      handleOkOne() {
         let ids = JSON.parse(JSON.stringify(this.ids))
         let query = {
           ids: ids.join(','),
@@ -233,6 +240,31 @@
           }
         })
       },
+      handleOkTwo() {
+        let _this = this
+        this.$confirm({
+          content: _this.$t('areResponsibilityAreaInformationBatch'),
+          onOk() {
+            let ids = JSON.parse(JSON.stringify(_this.ids))
+            let query = {
+              ids: ids.join(','),
+              ..._this.formInline
+            }
+            _this.confirmLoading = true
+            postAction(_this.url.setBatch, query).then((res) => {
+              if (res.success) {
+                _this.$message.success(_this.$t('OperationSuccessful'))
+                _this.visible = false
+                _this.confirmLoading = false
+                _this.$emit('batSettingList')
+              } else {
+                _this.$message.warning(_this.$t('operationFailed'))
+                _this.confirmLoading = false
+              }
+            })
+          }
+        })
+      },
       handleCancel() {
         this.formInline = {}
         this.visible = false

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -200,7 +200,7 @@
         class="tableList"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 170px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 186px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -273,6 +273,9 @@
            <span v-else>--</span>
         </span>
       </a-table>
+      <div class="buttom-box" v-if="dataSource && dataSource.length > 0">
+        {{$t('total')+' '+this.dataSource.length+' '+ $t('strip')}}
+      </div>
     </div>
     <listAddModel :url="url" @addModelList="addModelList" ref="addModelRef"/>
     <listEditModel :url="url" @editModelList="addModelList" ref="editModelRef"/>
@@ -2257,6 +2260,14 @@
     text-justify: inter-ideograph;
     word-break: break-all
   }
+
+  .buttom-box {
+    width: 100%;
+    text-align: right;
+    font-size: 16px;
+    font-weight: 500;
+    color: #000F16;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {