更新

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

@@ -4,7 +4,7 @@
     <el-input v-if="formConfig.htmlType == 'input'" @change="iChange" v-model="config[formConfig.columnName]" :placeholder="'请输入'+formConfig.columnComment"
       clearable @keyup.enter.native="handleQuery" :disabled="formConfig.disabshow" />
     <!-- 多行输入框 -->
-    <el-input v-if="formConfig.htmlType == 'textarea'" type="textarea" v-model="config[formConfig.columnName]"
+    <el-input v-if="formConfig.htmlType == 'textarea'" @change="iChange" type="textarea" v-model="config[formConfig.columnName]"
       :placeholder="'请输入'+formConfig.columnComment" clearable @keyup.enter.native="handleQuery" :disabled="formConfig.disabshow" />
     <!-- 下拉框 -->
     <el-select v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'select'&&(!formConfig.fkInfo)"
@@ -32,7 +32,7 @@
       <el-radio v-for="itemChild in formConfig.sysDictData" :key="itemChild.dictValue" :label="itemChild.dictValue">{{itemChild.dictLabel}}</el-radio>
     </el-radio-group>
     <!-- 时间控件 -->
-    <el-date-picker :disabled="formConfig.disabshow" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'datetime'"
+    <el-date-picker :disabled="formConfig.disabshow" @change="iChange" v-model="config[formConfig.columnName]" v-if="formConfig.htmlType == 'datetime'"
       type="date" :placeholder="'请输入'+formConfig.columnComment">
     </el-date-picker>
     <!-- 上传图片 -->
@@ -155,7 +155,10 @@
     mounted() {},
     methods: {
       iChange(val){
-        this.$emit('iChange',this.formConfig.columnName,val)
+        console.log(val,this.formConfig.columnName)
+        if(this.formConfig.isUseExtend){
+          this.$emit('iChange',this.formConfig.columnName,val)
+        }
       },
       extFn(col, comp) {
         let str = this.getDyn(col, this.queryData.showData,comp)

ruoyi-ui/src/utils/currencyFn.js

@@ -0,0 +1,34 @@
+export function getDyn(col,arr,comp) {
+  let str = comp
+  let is = true
+  for(let item of arr){
+    for(let itemChild of item.hrChildren){
+      for(let colItem of col){
+        if(itemChild.columnValue){
+          is = false
+        }
+        if(colItem == itemChild.columnName){
+          str = str.replace(itemChild.columnName,itemChild.columnValue)
+        }
+      }
+    }
+  }
+  if(is){
+    return
+  }
+  console.log(str,888)
+  return str
+}
+export function setDyn(col,arr,comp) {
+  let str = comp
+  for(let item of arr){
+    for(let itemChild of item.hrChildren){
+      for(let colItem of col){
+        if(colItem == itemChild.columnName){
+          str = str.replace(itemChild.columnName,itemChild.columnValue)
+        }
+      }
+    }
+  }
+  return str
+}

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

@@ -117,7 +117,7 @@
         for(let item of this.queryData.showData){
           for(let itemChild of item.hrChildren){
             if(itemChild.columnName == name){
-              itemChild.columnValue = (val-0)
+              itemChild.columnValue = val
             }
           }
         }