往来管理功能升级

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

@@ -46,7 +46,7 @@
         </template>
         <template #transactionDeptId>
           <div style="width: 100%">
-            <el-select v-model="formData.data.transactionDeptId" placeholder="请选择往来单位" style="width: 100%" clearable>
+            <el-select v-model="formData.data.transactionDeptId" placeholder="请选择往来单位" style="width: 100%" clearable @change="changeTransactionDept">
               <el-option v-for="item in departmentList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </div>
@@ -913,6 +913,19 @@ const printObj = ref({
 });
 const changeIsTransaction = () => {
   formData.data.transactionDeptId = "";
+  formData.data.deptType = "";
+};
+const changeTransactionDept = (val) => {
+  if (val) {
+    let list = departmentList.value.filter((item) => item.id === val);
+    if (list && list.length > 0) {
+      formData.data.deptType = list[0].deptType;
+    } else {
+      formData.data.deptType = "";
+    }
+  } else {
+    formData.data.deptType = "";
+  }
 };
 </script>
 

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

@@ -473,6 +473,7 @@ let transferMoneyModal = ref(false);
 const openTransferMoney = () => {
   formData2.data = {
     transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
+    isTransaction: '0'
   };
   transferMoneyModal.value = true;
 };
@@ -548,6 +549,21 @@ const transferMoneyConfig = computed(() => {
       label: "其他信息",
     },
     {
+      type: "radio",
+      prop: "isTransaction",
+      label: "是否往来",
+      data: [
+        {
+          label: "是",
+          value: '1',
+        },
+        {
+          label: "否",
+          value: '0',
+        },
+      ],
+    },
+    {
 			type: 'selectInput',
 			label: '手续费',
       prop: "commissionAmount",
@@ -719,6 +735,7 @@ const formConfig = computed(() => {
       ],
       fn: (val) => {
         formData.data.transactionDeptId = ''
+        formData.data.deptType = "";
         formConfig.value[7].data = transactionDepartmentData.value
       },
     },
@@ -728,6 +745,18 @@ const formConfig = computed(() => {
       label: "往来单位",
       data: [],
       isShow: formData.data.isTransaction == 1,
+      fn: (val) => {
+        if (val) {
+          let list = transactionDepartmentData.value.filter((item) => item.id === val);
+          if (list && list.length > 0) {
+            formData.data.deptType = list[0].deptType;
+          } else {
+            formData.data.deptType = "";
+          }
+        } else {
+          formData.data.deptType = "";
+        }
+      },
     },
     {
       type: "title",

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

@@ -35,8 +35,8 @@
           <el-table-column label="备注" prop="remark" />
           <el-table-column label="操作" align="center" width="120" fixed="right">
             <template #default="{ row }">
-              <el-button type="primary" link @click="handleUpdate(row)">修改</el-button>
-              <el-button type="primary" link @click="handleDelete(row)">删除</el-button>
+              <el-button type="primary" v-if="row.deptType !== 1" link @click="handleUpdate(row)">修改</el-button>
+              <el-button type="primary" v-if="row.deptType !== 1" link @click="handleDelete(row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -194,6 +194,13 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "归属公司",
+        prop: "corporationName",
+        width: 140,
+      },
+    },
+    {
+      attrs: {
         label: "备注",
         prop: "remark",
         "min-width": 240,

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

@@ -409,6 +409,7 @@ let transferMoneyModal = ref(false);
 const openTransferMoney = () => {
   formData2.data = {
     transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
+    isTransaction: '0'
   };
   transferMoneyModal.value = true;
 };
@@ -499,6 +500,21 @@ const transferMoneyConfig = computed(() => {
       label: "其他信息",
     },
     {
+      type: "radio",
+      prop: "isTransaction",
+      label: "是否往来",
+      data: [
+        {
+          label: "是",
+          value: '1',
+        },
+        {
+          label: "否",
+          value: '0',
+        },
+      ],
+    },
+    {
 			type: 'selectInput',
 			label: '手续费',
       prop: "commissionAmount",
@@ -569,6 +585,7 @@ const formConfig = computed(() => {
       ],
       fn: (val) => {
         formData.data.transactionDeptId = ''
+        formData.data.deptType = "";
         formConfig.value[7].data = transactionDepartmentData.value
       },
     },
@@ -578,7 +595,18 @@ const formConfig = computed(() => {
       label: "往来单位",
       data: [],
       isShow: formData.data.isTransaction == 1,
-      
+      fn: (val) => {
+        if (val) {
+          let list = transactionDepartmentData.value.filter((item) => item.id === val);
+          if (list && list.length > 0) {
+            formData.data.deptType = list[0].deptType;
+          } else {
+            formData.data.deptType = "";
+          }
+        } else {
+          formData.data.deptType = "";
+        }
+      },
     },
     {
       type: "input",