组件修改

src/components/byForm/index.vue

@@ -9,11 +9,13 @@
       ref="byForm"
       :disabled="formOption.disabled || false">
       <template v-for="i in formConfig" :key="i.model">
-        
+        <div v-if="i.type == 'title'" class="form-title">
+          {{ i.title }}
+        </div>
         <el-form-item
           :label="i.label"
           :prop="i.prop"
-          v-if="i.isShow || i.isShow == undefined"
+          v-if="i.isShow || i.isShow == undefined && i.type != 'title'"
           :style="
             i.type == 'title'
               ? 'width:100%'
@@ -128,6 +130,7 @@
           <el-radio-group
             v-else-if="i.type == 'radio'"
             v-model="formData[i.prop]"
+            @change="(e) => commonsEmit(e, i)"
             :readonly="i.readonly ? i.readonly : false"
             :disabled="i.disabled ? i.disabled : false">
             <el-radio :border="i.border ? i.border : false" v-for="j in i.data" :key="j.id || j.value" :label="j.id || j.value" name="type">
@@ -307,6 +310,7 @@ const commonsEmitChange = (prop, item) => {
     formData.value[item.prop] = prop.trim();
   }
   if (item.fn) {
+    console.log(proxy.formConfig)
     item.fn(prop);
   }
   emit("update:modelValue", formData.value);
@@ -462,7 +466,7 @@ loadInit();
 .form-title {
   font-size: 14px;
   font-weight: bold;
-  margin-top: 22px;
+  margin: 15px 0;
   color: #333333;
 }
 .by-form .el-form--inline .el-form-item {

src/views/finance/fundManage/accountStatement/index.vue

@@ -683,6 +683,48 @@ const formConfig = computed(() => {
           label: "合同到账",
         }
       : {},
+      {
+      type: "radio",
+      prop: "isTransaction",
+      label: "是否往来",
+      data: [
+        {
+          label: "是",
+          value: "1",
+        },
+        {
+          label: "否",
+          value: "0",
+        },
+      ],
+      fn: (val) => {
+        formData.data.transactionDeptId = ''
+        formConfig.value[7].data = transactionDepartmentData.value
+      },
+    },
+    {
+      type: "select",
+      prop: "transactionDeptId",
+      label: "往来单位",
+      data: [],
+      isShow: formData.data.isTransaction == "1",
+      isLoad: {
+        //链接
+        url: "transactionDepartment/list?pageNum=1&pageSize=999",
+        method: "get",
+        //返回数据的路径默认返回data
+        resUrl: "data",
+        //参数
+        req: {},
+        //返回数据的key
+        labelKey: "name",
+        //返回数据的value
+        labelVal: "id",
+      },
+      fn: (val) => {
+        console.log(formConfig.value)
+      },
+    },
     {
       type: "title",
       title: "对方信息",
@@ -717,6 +759,20 @@ const formConfig = computed(() => {
     },
   ];
 });
+const transactionDepartmentData = ref([])
+const getTransactionDepartment = () => {
+  return proxy
+    .get("transactionDepartment/list?pageNum=1&pageSize=999", {})
+    .then((res) => {
+      transactionDepartmentData.value = res.data.map((item) => {
+        return {
+          label: item.name,
+          value: item.id,
+        };
+      });
+    });
+};
+getTransactionDepartment()
 const formConfigOne = computed(() => {
   return [
     {
@@ -811,6 +867,10 @@ const rules = ref({
     { required: true, message: "请选择合同是否到账", trigger: "change" },
   ],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
+  inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
+  inAmount: [{ required: true, message: "请输入金额", trigger: "blur" }],
+  isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
+  transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
   // name: [{ required: true, message: "请输入账户名称", trigger: "blur" }],
   // openingBank: [{ required: true, message: "请输入开户银行", trigger: "blur" }],
   // accountOpening: [{ required: true, message: "请输入银行账号", trigger: "blur" }],
@@ -831,6 +891,7 @@ const rulesOne = ref({
 const openModal = (val) => {
   modalType.value = val;
   formData.data = {
+    isTransaction:'1',
     transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
   };
   loadingDialog.value = false;

src/views/finance/fundManage/flow/index.vue

@@ -420,7 +420,9 @@ const formOption = reactive({
   rules: [],
 });
 const formData = reactive({
-  data: {},
+  data: {
+    isTransaction:'1',
+  },
 });
 const formData2 = reactive({
   data: {},
@@ -529,9 +531,76 @@ const formConfig = computed(() => {
           label: "合同到账",
         }
       : {},
+      // sysUserMenu/list
+    //单选框
+    {
+      type: "radio",
+      prop: "isTransaction",
+      label: "是否往来",
+      data: [
+        {
+          label: "是",
+          value: 1,
+        },
+        {
+          label: "否",
+          value: 0,
+        },
+      ],
+      fn: (val) => {
+        formData.data.transactionDeptId = ''
+        formConfig.value[7].data = transactionDepartmentData.value
+      },
+    },
+    {
+      type: "select",
+      prop: "transactionDeptId",
+      label: "往来单位",
+      data: [],
+      isShow: formData.data.isTransaction == 1,
+      
+    },
+    {
+      type: "input",
+      prop: "name",
+      label: "账户名称",
+      itemType: "text",
+    },
+    {
+      type: "input",
+      prop: "openingBank",
+      label: "开户银行",
+      itemType: "text",
+    },
+    {
+      type: "input",
+      prop: "accountOpening",
+      label: "银行账号",
+      itemType: "text",
+    },
     {
       label: "对方信息",
     },
+    
+    {
+      type: "select",
+      prop: "otherId",
+      label: "对方名称",
+      data: [
+        {
+          label: "客户",
+          value: "10",
+        },
+        {
+          label: "供应商",
+          value: "20",
+        },
+        {
+          label: "其他",
+          value: "30",
+        },
+      ],
+    },
     {
       type: "input",
       prop: "name",
@@ -570,19 +639,36 @@ const rules = ref({
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
   inAmount: [{ required: true, message: "请输入金额", trigger: "blur" }],
-  
+  isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
+  transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
   // name: [{ required: true, message: "请输入账户名称", trigger: "blur" }],
   // openingBank: [{ required: true, message: "请输入开户银行", trigger: "blur" }],
   // accountOpening: [{ required: true, message: "请输入银行账号", trigger: "blur" }],
 });
 const openModal = (val) => {
   modalType.value = val;
+  
   formData.data = {
     transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
   };
+  console.log(formConfig.value);
   loadingDialog.value = false;
   dialogVisible.value = true;
 };
+const transactionDepartmentData = ref([])
+const getTransactionDepartment = () => {
+  return proxy
+    .get("transactionDepartment/list?pageNum=1&pageSize=999", {})
+    .then((res) => {
+      transactionDepartmentData.value = res.data.map((item) => {
+        return {
+          label: item.name,
+          value: item.id,
+        };
+      });
+    });
+};
+getTransactionDepartment()
 const changeStatus = () => {
   formData.data.received = "";
 };

src/views/system/addressConfig/index.vue

@@ -83,8 +83,6 @@
             }
         })
     )
-    
-     
    })
  };