Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

src/components/process/Contract.vue

@@ -1267,7 +1267,6 @@ watch(
       }
       getDecisionAids();
     }
-    console.log("111");
   },
   {
     deep: true,

src/components/process/SendFunds.vue

@@ -182,6 +182,11 @@
             <el-input v-model="formData.data.accountOpening" placeholder="请输入" />
           </el-form-item>
         </el-col>
+        <el-col :span="3">
+          <el-form-item label="  ">
+            <el-button type="primary" @click="clickSelect" text>选择</el-button>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="6">
@@ -413,6 +418,23 @@
         <el-button type="primary" @click="clickDownload()" size="large">下载PDF</el-button>
       </template>
     </el-dialog>
+
+    <el-dialog title="选择付款信息" v-if="openSelect" v-model="openSelect" width="800">
+      <el-table :data="bankList" style="width: 100%">
+        <el-table-column prop="name" label="户名" />
+        <el-table-column prop="accountOpening" label="银行账号" />
+        <el-table-column prop="openingBank" label="开户银行" width="140" />
+        <el-table-column prop="interbankNumber" label="联行号 / SWIFT Code" />
+        <el-table-column align="center" label="操作" width="80">
+          <template #default="{ row }">
+            <el-button type="primary" link @click="handleSelect(row)">选择</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <el-button @click="openSelect = false" size="large">取 消</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -572,6 +594,7 @@ const fundsPaymentMethod = ref([]);
 const currencyType = ref([]);
 const advanceList = ref([]);
 const contractList = ref([]);
+const bankList = ref([]);
 const getDictData = () => {
   // 获取归属公司数据
   proxy.post("/corporation/page", { pageNum: 1, pageSize: 9999 }).then((res) => {
@@ -654,6 +677,10 @@ const getDictData = () => {
     })
     .then((res) => {
       currencyType.value = res.rows;
+      let list = res.rows.filter((item) => item.dictKey === "CNY");
+      if (!(list && list.length > 0) && formData.data.currency === "CNY") {
+        formData.data.currency = "";
+      }
     });
   proxy
     .get("/tenantUser/list", {
@@ -672,6 +699,9 @@ const getDictData = () => {
         });
       }
     });
+  proxy.get("/accountRequestFunds/getPayHistoricalInfo", {}).then((res) => {
+    bankList.value = res.data;
+  });
 };
 getDictData();
 const recursive = (data) => {
@@ -853,7 +883,6 @@ const computeMoney = (label) => {
   }
   return amount;
 };
-
 const computeBalance = () => {
   let balance = 0;
   let advanceAmount = computeMoney("advanceAmount");
@@ -866,6 +895,17 @@ const computeBalance = () => {
   }
   return balance;
 };
+const openSelect = ref(false);
+const clickSelect = () => {
+  openSelect.value = true;
+};
+const handleSelect = (item) => {
+  formData.data.name = item.name;
+  formData.data.accountOpening = item.accountOpening;
+  formData.data.openingBank = item.openingBank;
+  formData.data.interbankNumber = item.interbankNumber;
+  openSelect.value = false;
+};
 </script>
 
 <style lang="scss" scoped>

src/views/index.vue

@@ -10,7 +10,7 @@
 						<i class="icon iconfont icon-iconm_waixht"></i>
 					</div>
 				</li>
-				<li class="theme2" @click="toUrl('DealWith',1)">
+				<li class="theme2" @click="toUrl('DealWith',2)">
 					<div class="num">{{haveInitiatedData.total}}</div>
 					<div class="label">我的发起（未结束）</div>
 					<div class="icon-box">
@@ -285,6 +285,7 @@ onMounted(() => {})
 				color: #333333;
 				position: relative;
 				border-radius: 10px;
+				cursor: pointer;
 				.label {
 					font-size: 14px;
 					margin-top: 10px;

src/views/process/dealWith/index.vue

@@ -348,7 +348,7 @@ const changeStatus = (row) => {
 }
 onMounted(() => {
 	const route = useRoute();
-	sourceList.value.pagination.status = route.query.type
+	sourceList.value.pagination.status = route.query.type ? route.query.type : 1
 	getList()
 })