Merge remote-tracking branch 'origin/master'

src/components/base/dk-message/index.vue

@@ -61,10 +61,27 @@ export default {
           })
         }
 
+        // 查询子模块是否开着
+        let currentModal = null
+        let modalName = ''
+        for (let it of Object.keys(self.$refs)) {
+          // 如果没有放大镜的查询，那么就看这个界面的查询
+          if (it.startsWith('modal_') && self.$refs[it] && self.$refs[it].showModal) {
+            currentModal = self.$refs[it]
+            modalName = it
+            break
+          }
+        }
         // Q：code = 81 查询
         btList.forEach(forIt => {
-          if (code === 18 && forIt.hotKey.toLowerCase() === e.key.toLowerCase()) {
-            e.returnValue = false
+          if (code != 18 || forIt.hotKey.toLowerCase() != e.key.toLowerCase()) return
+          e.returnValue = false
+          // 如果模块开着，在前面加上模块的ref名
+          if (currentModal != null) {
+            if (self.$refs[modalName].$refs[forIt.name]) {
+              self.$refs[modalName].$refs[forIt.name].$el.click()
+            }
+          } else {
             if (self.$refs[forIt.name]) {
               self.$refs[forIt.name].$el.click()
             }
@@ -105,19 +122,12 @@ export default {
       if (!n) {
         //回复快捷键
         document.onkeydown = this.documentKeyDownContent;
+      }else{
+        this.addKeyBoardEvent() // 增加快捷键
       }
     }
   },
-  mounted() {
-  },
   created() {
-    this.$nextTick(() => {
-      this.addKeyBoardEvent()   // 增加快捷键
-      //光标移动到确定按钮上
-      // setTimeout(() => {
-      //   this.$refs.confirm.$el.focus();
-      // }, 100)
-    })
   }
 }
 </script>
@@ -137,7 +147,7 @@ export default {
 }
 
 .content-div {
-  height: 130px;
+  height: 105px;
   align-items: center;
   justify-content: center;
   display: flex;

src/components/base/dk-modal/dk-modal.vue

@@ -44,7 +44,7 @@
         <DkButton :loading="loading" v-if="okVisibleFlag" type="primary" @click="modalOk" name="confirm"
                   :ref="saveFlag?'save':'confirm'">{{ saveFlag ? '保存(S)' : '确定(O)' }}
         </DkButton>
-        <DkButton v-if="cancelVisibleFlag" @click="modalCancel" name="close" ref="close">{{ saveFlag ? '关闭(X)' : '取消(T)' }}</DkButton>
+        <DkButton v-if="cancelVisibleFlag" @click="modalCancel" name="close" :ref="saveFlag?'close':'cancel'">{{ saveFlag ? '关闭(X)' : '取消(Y)' }}</DkButton>
       </div>
     </Modal>
   </div>
@@ -205,6 +205,10 @@ export default {
       this.$emit('input', n)
       if(n){
         this.displayFlag = true;
+        this.addKeyBoardEvent();
+      }else{
+        //恢复快捷键
+        document.onkeydown = this.documentKeyDownContent;
       }
     }
   },
@@ -234,6 +238,7 @@ export default {
       let self = this
       this.documentKeyDownContent = document.onkeydown
       document.onkeydown = function (e) {
+        console.log('334',self.showModal)
         const evn = e || event
         const key = evn.keyCode || evn.which || evn.charCode
         // alt：code = 18
@@ -251,13 +256,33 @@ export default {
           })
         }
         //只有modal弹出才能可见
-        if (self.$refs.modal.visible) {
+        if (self.showModal) {
+          // 查询子模块是否开着
+          let currentModal = null
+          let modalName = ''
+          console.log('rrr3',self.$refs)
+          for (let it of Object.keys(self.$refs)) {
+            // 如果没有放大镜的查询，那么就看这个界面的查询
+            if (it.startsWith('modal_') && self.$refs[it] ) {
+              currentModal = self.$refs[it]
+              modalName = it
+              break
+            }
+          }
           // Q：code = 81 查询
           btList.forEach(forIt => {
             if (code === 18 && forIt.hotKey.toLowerCase() === e.key.toLowerCase()) {
               e.returnValue = false
-              if (self.$refs[forIt.name]) {
-                self.$refs[forIt.name].$el.click()
+              // 如果模块开着，在前面加上模块的ref名
+              if (currentModal != null) {
+                console.log('333',currentModal)
+                if (self.$refs[modalName].$refs[forIt.name]) {
+                  self.$refs[modalName].$refs[forIt.name].$el.click()
+                }
+              } else {
+                if (self.$refs[forIt.name]) {
+                  self.$refs[forIt.name].$el.click()
+                }
               }
             }
           })

src/mixins/index.js

@@ -186,6 +186,7 @@ export const indexMixin = {
               if (name === 'save') {
                 chooseRows = null
               }
+              console.log('rr1',routeUrl.method)
               // 执行方法
               this[routeUrl.method](chooseRows);
             }
@@ -623,6 +624,7 @@ export const indexMixin = {
         btList.forEach(forIt => {
           if (code != 18 || forIt.hotKey.toLowerCase() != e.key.toLowerCase()) return
           e.returnValue = false
+          // console.log('rrr',currentModal,self.$refs)
           // 如果模块开着，在前面加上模块的ref名
           if (currentModal != null) {
             if (self.$refs[modalName + '_' + forIt.name]) {

src/view/core/system-setting/index.vue

@@ -297,6 +297,7 @@ export default {
      * @date   : 2023/1/30 17:21
      */
     saveData() {
+      this.loading = true;
       let params = []
       // 值发生变化的保存 valueChangeFlg为true值发生变化
       let list = this.tableRightData.filter(it => it.valueChangeFlg == true)
@@ -317,7 +318,6 @@ export default {
               ftyId: this.$store.state.user.ftyId,
             })
           } else {
-
             params.push({
               settingCode: it.settingCode,   //参数代码
               settingValue: it.settingValue, //参数值
@@ -329,7 +329,7 @@ export default {
       if (params && params.length > 0) {
         this.$refs.save.$el.focus()
         this.excute(this.$service.systemService, this.$service.systemService.updateSettingValues, params).then(res => {
-          if (res.code === 200) {
+          if (res.code === this.$config.SUCCESS_CODE) {
             this.$Message.success(this.$t('I_001', {'param': this.$v('save')}))
             let nowRow = this.$refs['leftTable'].getCurrentRow()
             if (nowRow != null) {
@@ -337,7 +337,10 @@ export default {
               this.getSettingData(nowRow.classCode)
             }
           }
+          this.loading = false;
         })
+      }else{
+        this.loading = false;
       }
     },
     /**

src/view/mst/custom-report/form.vue

@@ -1294,6 +1294,16 @@ export default {
               })
             }
           })
+        }else{
+          conditionData.forEach(t => {
+            // 日期范围
+            if (t.kind === this.$config.reportKind.dateRange) {
+              sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + 'Start' + '}', null)
+              sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + 'End' + '}', null)
+            } else {
+              sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + '}', null)
+            }
+          })
         }
       })
       // let filters = this.sqlTabsOptions.filter(it => it.changeTabName == sqlItem.name)