Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/components/DynamicFormsteo/index.vue

@@ -137,9 +137,6 @@
       }else{
         this.ieug = 24 / (this.formConfig.tableColumnuy -0)
       }
-
-
-      // console.log(this.formConfig.tableColumnuy -0)
       this.init()
       if (this.formConfig.extendedAttributes) {
         let extend = JSON.parse(this.formConfig.extendedAttributes)
@@ -170,7 +167,6 @@
     methods: {
       iChange(val){
         if(this.formConfig.isUseExtend){
-          console.log(this.formConfig.columnName)
           this.$emit('iChange',this.formConfig.columnName,val)
         }
       },

ruoyi-ui/src/utils/currencyFn.js

@@ -40,7 +40,7 @@ function evals(code) {
 }
 // 时间戳转成天
 function setTime(val) {
-  return Number(val) / (1000 * 3600 * 24)
+  return Math.round(Number(val) / (1000 * 3600 * 24))
 }
 // 转化成时间戳
 function getTime(val) {

ruoyi-ui/src/views/system/editing/index.vue

@@ -37,7 +37,7 @@
             <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index"
               class="eitde">
               <el-row>
-                  <dynamic-formsteo @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs="changeFn" :formConfig="items"
+                  <dynamic-formsteo @iChange="iChange" :queryData="queryData" @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs="changeFn" :formConfig="items"
                     v-for="(items,indexs) in item.hrChildren" :key='indexs' />
               </el-row>
             </el-collapse-item>

ruoyi-ui/src/views/system/form/index.vue

@@ -19,7 +19,7 @@
            <el-form :model="queryParams"  :rules="queryData.rules" ref="queryForm" :inline="true" :label-width="this.queryData.table_column == 6 ? '70px' :'120px'">
            <el-collapse-item :title="item.columnComment" :name="index" v-for="(item,index) in queryData.showData" :key="index" class="eitde">
                <el-row :gutter="0">
-                     <dynamic-formsteo @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren" :key='indexs' />
+                     <dynamic-formsteo @iChange="iChange" :queryData="queryData" @modelFn="modelFn" :ref="items.columnName" :config="queryParams" @inputs = "changeFn" :formConfig="items" v-for="(items,indexs) in item.hrChildren" :key='indexs' />
                </el-row>
            </el-collapse-item>
            </el-form>