Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/components/webDiskData/treeList.vue

@@ -146,6 +146,7 @@ const del = (data) => {
         type: "success",
       });
       getTreeList();
+      emit("treeDelete");
     });
   });
 };

src/main.js

@@ -44,7 +44,7 @@ import {
   selectDictLabels
 } from '@/utils/ruoyi'
 
-import { dictDataEcho, moneyFormat } from '@/utils/util'
+import { dictDataEcho, moneyFormat, calculationWeek } from '@/utils/util'
 
 // 分页组件
 import Pagination from '@/components/Pagination'
@@ -77,6 +77,7 @@ app.config.globalProperties.selectDictLabels = selectDictLabels
 //字典回显
 app.config.globalProperties.dictDataEcho = dictDataEcho
 app.config.globalProperties.moneyFormat = moneyFormat
+app.config.globalProperties.calculationWeek = calculationWeek
 
 
 

src/utils/util.js

@@ -1,3 +1,5 @@
+import moment from "moment";
+
 //根据value值回显字典label值
 export function dictDataEcho(value, arr) {
   if (value && arr) {
@@ -37,3 +39,11 @@ export function moneyFormat(s, n) {
     return "0.00";
   }
 }
+
+// 计算该日期是星期几
+export function calculationWeek(val, format) {
+  let weekArrayList = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"];
+  let index = new Date(moment(val, format).format("yyyy-MM-DD")).getDay();
+  let week = weekArrayList[index];
+  return week;
+}

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

@@ -26,7 +26,7 @@
               <el-table-column label="币种">
                 <template #default="{ row, $index }">
                   <el-form-item :prop="'accountRemainderList.' + $index + '.currency'" :rules="rules.currency" :inline-message="true">
-                    <el-select v-model="row.currency" placeholder="请选择币种" style="width: 100%">
+                    <el-select v-model="row.currency" placeholder="请选择币种" style="width: 100%" :disabled="row.id">
                       <el-option v-for="item in accountCurrency" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
                     </el-select>
                   </el-form-item>
@@ -35,13 +35,20 @@
               <el-table-column label="余额">
                 <template #default="{ row, $index }">
                   <el-form-item :prop="'accountRemainderList.' + $index + '.remainder'" :rules="rules.remainder" :inline-message="true">
-                    <el-input-number v-model="row.remainder" placeholder="请输入余额" style="width: 100%" :precision="2" :controls="false" :min="0" />
+                    <el-input-number
+                      v-model="row.remainder"
+                      placeholder="请输入余额"
+                      style="width: 100%"
+                      :precision="2"
+                      :controls="false"
+                      :min="0"
+                      :disabled="row.id" />
                   </el-form-item>
                 </template>
               </el-table-column>
               <el-table-column label="操作" width="80">
-                <template #default="{ $index }">
-                  <el-button type="primary" link @click="handleRemove($index)">删除</el-button>
+                <template #default="{ row, $index }">
+                  <el-button type="primary" link @click="handleRemove($index)" v-if="!row.id">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -318,6 +325,7 @@ const update = (row) => {
   proxy.post("/accountManagement/detail", { id: row.id }).then((res) => {
     res.accountRemainderList = res.accountRemainderList.map((item) => {
       return {
+        id: item.id,
         currency: item.currency,
         remainder: item.remainder,
       };

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

@@ -39,7 +39,7 @@
             <el-row :gutter="10">
               <el-col :span="6">
                 <el-form-item prop="status">
-                  <el-select v-model="formData.data.status" placeholder="请选择收支类型" style="width: 100%">
+                  <el-select v-model="formData.data.status" placeholder="请选择收支类型" style="width: 100%" @change="changeStatus()">
                     <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value" />
                   </el-select>
                 </el-form-item>
@@ -59,6 +59,15 @@
             </el-row>
           </div>
         </template>
+        <template #received>
+          <div>
+            <el-form-item prop="received">
+              <el-radio-group v-model="formData.data.received">
+                <el-radio v-for="item in received" :key="item.value" :label="item.value" border>{{ item.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </div>
+        </template>
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
@@ -88,6 +97,16 @@ const status = ref([
     value: "20",
   },
 ]);
+const received = ref([
+  {
+    label: "是",
+    value: "10",
+  },
+  {
+    label: "否",
+    value: "20",
+  },
+]);
 const sourceList = ref({
   data: [],
   pagination: {
@@ -273,6 +292,9 @@ const formOption = reactive({
   itemWidth: 100,
   rules: [],
 });
+const formData = reactive({
+  data: {},
+});
 const formConfig = computed(() => {
   return [
     {
@@ -299,6 +321,14 @@ const formConfig = computed(() => {
       slotName: "amount",
       label: "交易金额",
     },
+    formData.data.status == "10"
+      ? {
+          type: "slot",
+          prop: "received",
+          slotName: "received",
+          label: "合同到账",
+        }
+      : {},
     {
       label: "对方信息",
     },
@@ -336,20 +366,21 @@ const rules = ref({
   transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
   status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
+  received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   name: [{ required: true, message: "请输入账户名称", trigger: "blur" }],
   openingBank: [{ required: true, message: "请输入开户银行", trigger: "blur" }],
   accountOpening: [{ required: true, message: "请输入银行账号", trigger: "blur" }],
 });
-const formData = reactive({
-  data: {},
-});
 const openModal = (val) => {
   modalType.value = val;
   formData.data = {};
   loadingDialog.value = false;
   dialogVisible.value = true;
 };
+const changeStatus = () => {
+  formData.data.received = "";
+};
 const submitForm = () => {
   submit.value.handleSubmit(() => {
     loadingDialog.value = true;

src/views/oa/companyDisk/webDiskData/index.vue

@@ -7,7 +7,8 @@
         :data="treeListData"
         v-model="sourceList.pagination.productClassifyId"
         @change="treeChange"
-        @changeTreeList="getTreeList">
+        @changeTreeList="getTreeList"
+        @treeDelete="getList">
       </treeList>
     </div>
     <div class="content">

src/views/oa/work/dailyPaper/index.vue

@@ -236,7 +236,7 @@ const sourceList = ref({
   total: 0,
   pagination: {
     pageNum: 1,
-    pageSize: 10,
+    pageSize: 20,
     keyword: "",
     senderId: "",
     date: "",