Merge branch 'master' into stage

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

@@ -59,12 +59,28 @@
         </template>
       </byTable>
     </div>
-    <el-dialog title="内部转账" v-if="transferMoneyModal" v-model="transferMoneyModal" width="600" v-loading="loadingDialog">
-      <byForm :formConfig="transferMoneyConfig" :formOption="formOption" v-model="formData2.data" :rules="rules2" ref="transferMoneySubmit">
+    <el-dialog
+      title="内部转账"
+      v-if="transferMoneyModal"
+      v-model="transferMoneyModal"
+      width="600"
+      v-loading="loadingDialog"
+    >
+      <byForm
+        :formConfig="transferMoneyConfig"
+        :formOption="formOption"
+        v-model="formData2.data"
+        :rules="rules2"
+        ref="transferMoneySubmit"
+      >
       </byForm>
       <template #footer>
-        <el-button @click="transferMoneyModal = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm2()" size="large">确 定</el-button>
+        <el-button @click="transferMoneyModal = false" size="large"
+          >取 消</el-button
+        >
+        <el-button type="primary" @click="submitForm2()" size="large"
+          >确 定</el-button
+        >
       </template>
     </el-dialog>
     <el-dialog
@@ -491,40 +507,39 @@ const transferMoneyConfig = computed(() => {
       data: accountList.value,
     },
     {
-			type: 'selectInput',
-			label: '转出金额',
+      type: "selectInput",
+      label: "转出金额",
       prop: "amount",
-			itemWidth: 60,
-			data: accountCurrency.value,
-			placeholder: '请输入',
-			selectPlaceholder: '币种',
-			selectProp: 'currency',
+      itemWidth: 60,
+      data: accountCurrency.value,
+      placeholder: "请输入",
+      selectPlaceholder: "币种",
+      selectProp: "currency",
       fn: (value) => {
         //判断value的类型
-        if(isNaN(value)){
-          
-          formData2.data.inCurrency = formData2.data.currency
-          formData2.data.commissionCurrency = formData2.data.currency
-        }else{
-          if (value != '') {
-            if (value.indexOf('.') > -1) {
-                formData2.data.amount = value.slice(0, value.indexOf('.') + 3)
-            } else { 
-              formData2.data.amount = value
+        if (isNaN(value)) {
+          formData2.data.inCurrency = formData2.data.currency;
+          formData2.data.commissionCurrency = formData2.data.currency;
+        } else {
+          if (value != "") {
+            if (value.indexOf(".") > -1) {
+              formData2.data.amount = value.slice(0, value.indexOf(".") + 3);
+            } else {
+              formData2.data.amount = value;
             }
           }
-          formData2.data.inAmount = formData2.data.amount
+          formData2.data.inAmount = formData2.data.amount;
         }
       },
-		},
-    
-    { 
+    },
+
+    {
       type: "date",
       prop: "transactionTime",
       label: "转出时间",
       itemType: "datetime",
     },
-    
+
     {
       label: "转入信息",
     },
@@ -535,29 +550,29 @@ const transferMoneyConfig = computed(() => {
       data: accountList.value,
     },
     {
-			type: 'selectInput',
-			label: '转入金额',
+      type: "selectInput",
+      label: "转入金额",
       prop: "inAmount",
-			itemWidth: 60,
-			data: accountCurrency.value,
-			placeholder: '请输入',
-			selectPlaceholder: '币种',
-			selectProp: 'inCurrency',
-		},
+      itemWidth: 60,
+      data: accountCurrency.value,
+      placeholder: "请输入",
+      selectPlaceholder: "币种",
+      selectProp: "inCurrency",
+    },
     {
       label: "其他信息",
     },
     {
-			type: 'selectInput',
-			label: '手续费',
+      type: "selectInput",
+      label: "手续费",
       prop: "commissionAmount",
-			itemWidth: 60,
-			data: accountCurrency.value,
-			placeholder: '请输入',
-			selectPlaceholder: '币种',
-			selectProp: 'commissionCurrency',
-		},
-    
+      itemWidth: 60,
+      data: accountCurrency.value,
+      placeholder: "请输入",
+      selectPlaceholder: "币种",
+      selectProp: "commissionCurrency",
+    },
+
     {
       type: "input",
       prop: "remarks",
@@ -569,7 +584,6 @@ const transferMoneyConfig = computed(() => {
 const transferMoneySubmit = ref(null);
 const submitForm2 = () => {
   transferMoneySubmit.value.handleSubmit(() => {
-    
     loadingDialog.value = true;
     proxy.post("/accountRunningWater/internalTransfer", formData2.data).then(
       () => {
@@ -710,24 +724,23 @@ const formConfig = computed(() => {
       data: [
         {
           label: "是",
-          value: 1,
+          value: "1",
         },
         {
           label: "否",
-          value: 0,
+          value: "0",
         },
       ],
       fn: (val) => {
-        formData.data.transactionDeptId = ''
-        formConfig.value[7].data = transactionDepartmentData.value
+        formData.data.transactionDeptId = "";
       },
     },
     {
       type: "select",
       prop: "transactionDeptId",
       label: "往来单位",
-      data: [],
-      isShow: formData.data.isTransaction == 1,
+      data: transactionDepartmentData.value,
+      isShow: formData.data.isTransaction == "1",
     },
     {
       type: "title",
@@ -763,7 +776,7 @@ const formConfig = computed(() => {
     },
   ];
 });
-const transactionDepartmentData = ref([])
+const transactionDepartmentData = ref([]);
 const getTransactionDepartment = () => {
   return proxy
     .get("transactionDepartment/list?pageNum=1&pageSize=999", {})
@@ -774,11 +787,9 @@ const getTransactionDepartment = () => {
           value: item.id,
         };
       });
-      formConfig.value[7].data = transactionDepartmentData.value
-      console.log(formConfig.value[7])
     });
 };
-getTransactionDepartment()
+getTransactionDepartment();
 const formConfigOne = computed(() => {
   return [
     {
@@ -887,30 +898,55 @@ 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" }, { required: true, validator: validatePass2, trigger: "blur" }],
-  isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
-  transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
+  inAccountManagementId: [
+    { required: true, message: "请选择账户", trigger: "change" },
+  ],
+  inAmount: [
+    { required: true, message: "请输入金额和选择币种", trigger: "blur" },
+    { required: true, validator: validatePass2, 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 rules2 = ref({
-  accountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
-  transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
+  accountManagementId: [
+    { required: true, message: "请选择账户", trigger: "change" },
+  ],
+  transactionTime: [
+    { required: true, message: "请选择交易时间", trigger: "change" },
+  ],
   status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
-  received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
-  inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
-  inAmount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass2, trigger: "blur" }],
-  isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
-  transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
-  amount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass, trigger: "blur" }]
+  received: [
+    { required: true, message: "请选择合同是否到账", trigger: "change" },
+  ],
+  inAccountManagementId: [
+    { required: true, message: "请选择账户", trigger: "change" },
+  ],
+  inAmount: [
+    { required: true, message: "请输入金额和选择币种", trigger: "blur" },
+    { required: true, validator: validatePass2, trigger: "blur" },
+  ],
+  isTransaction: [
+    { required: true, message: "请选择是否往来", trigger: "change" },
+  ],
+  transactionDeptId: [
+    { required: true, message: "请选择往来单位", trigger: "change" },
+  ],
+  amount: [
+    { required: true, message: "请输入金额和选择币种", trigger: "blur" },
+    { required: true, validator: validatePass, trigger: "blur" },
+  ],
 });
 
-
 const rulesOne = ref({
   accountManagementId: [
     { required: true, message: "请选择账户", trigger: "change" },
@@ -927,7 +963,7 @@ const rulesOne = ref({
 const openModal = (val) => {
   modalType.value = val;
   formData.data = {
-    isTransaction:'1',
+    isTransaction: "0",
     transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
   };
   loadingDialog.value = false;
@@ -1032,7 +1068,7 @@ const update = (row) => {
   proxy.post("/accountRunningWater/detail", { id: row.id }).then((res) => {
     formData.data = res;
     loadingDialog.value = false;
-    getTransactionDepartment()
+    getTransactionDepartment();
   });
   dialogVisible.value = true;
 };