sr 4 سال پیش
والد
کامیت
e599850c7d

+ 8 - 3
ruoyi-ui/src/views/system/editing/index.vue

@@ -280,7 +280,7 @@
                    console.log(34)
                    // || route.mask.slice(3,4) == '0'
                    route.hrChildren.filter(routers =>{
-                     
+
                      routers.isonliy = true
                    })
                    // route.routers = true
@@ -413,9 +413,14 @@
               if(this.$refs[item.hrChildren[i].columnName][0].config.length){
                 this.queryParams[item.hrChildren[i].columnName] = JSON.stringify(this.$refs[item.hrChildren[i].columnName][0].config)
               }
+            } else if (item.hrChildren[i].htmlType == 'datetime') {
+              if (this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]) {
+                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
+              }else{
+                this.queryParams[item.hrChildren[i].columnName] = null
+              }
             } else {
-              this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[
-                item.hrChildren[i].columnName]
+              this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
             }
           }
         }

+ 7 - 1
ruoyi-ui/src/views/system/form/index.vue

@@ -401,7 +401,13 @@
                if(this.$refs[item.hrChildren[i].columnName][0].config.length){
                  this.queryParams[item.hrChildren[i].columnName] = JSON.stringify(this.$refs[item.hrChildren[i].columnName][0].config)
                }
-             } else{
+             } else if (item.hrChildren[i].htmlType == 'datetime') {
+              if (this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]) {
+                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
+              }else{
+                this.queryParams[item.hrChildren[i].columnName] = null
+              }
+            } else{
                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
              }
            }

+ 8 - 2
ruoyi-ui/src/views/system/table/index.vue

@@ -11,7 +11,7 @@
       <div class="table_headerBtun table_headerBtuntwo" v-if="queryData.buttonList">
         <el-button type="primary" size="mini" plain v-for="(item,index) in jeigneutwo" :key="index" @click="handleQuery(item)">{{item}}</el-button>
       </div>
-    </div>    
+    </div>
     <!-- 内容 -->
     <div class="table_nav headertable_nav" >
       <el-collapse v-model="activeNames" @change="handleChange">
@@ -150,6 +150,12 @@
               if (this.$refs[item.hrChildren[i].columnName][0].config.length) {
                 this.queryParams[item.hrChildren[i].columnName] = JSON.stringify(this.$refs[item.hrChildren[i].columnName][0].config)
               }
+            } else if (item.hrChildren[i].htmlType == 'datetime') {
+              if (this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]) {
+                this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[item.hrChildren[i].columnName]
+              }else{
+                this.queryParams[item.hrChildren[i].columnName] = null
+              }
             } else {
               this.queryParams[item.hrChildren[i].columnName] = this.$refs[item.hrChildren[i].columnName][0].config[
                 item.hrChildren[i].columnName]
@@ -331,7 +337,7 @@
       /** 新增 修改提交按钮 */
       submitForm: function() {
         this.$refs["queryForm"].validate(valid => {
-          if (valid) {
+          if (valid) {
             addbjectSave(this.forme).then(response => {
               this.msgSuccess("保存成功");
               this.open = false;