vue2server7 7.0.28 → 7.0.30

package/frontEnd/src/components/DateRange.vue

@@ -102,8 +102,8 @@ const props = withDefaults(defineProps<{
   endPlaceholder: '结束日期',
   separator: '至',
   pickerType: 'date',
-  valueFormat: 'YYYY-MM-DD',
-  displayFormat: undefined,
+  valueFormat: 'YYYYMMDD',
+  displayFormat: 'YYYY-MM-DD',
   disabled: false,
   linkage: true,
   maxSpanDays: undefined,
@@ -127,8 +127,16 @@ const startFocused = ref(false)
 const endFocused = ref(false)
 const hasBlurred = ref(false)
 
+/** 解析绑定值：支持 YYYYMMDD（与默认 valueFormat 一致）及 ISO 等可被 Date 解析的字符串 */
 function toDate(val: string | null | undefined): Date | null {
   if (!val) return null
+  if (/^\d{8}$/.test(val)) {
+    const y = Number(val.slice(0, 4))
+    const m = Number(val.slice(4, 6)) - 1
+    const day = Number(val.slice(6, 8))
+    const d = new Date(y, m, day)
+    return Number.isNaN(d.getTime()) ? null : d
+  }
   const d = new Date(val)
   return Number.isNaN(d.getTime()) ? null : d
 }

package/frontEnd/src/pages/DateRangePage.vue

@@ -76,7 +76,7 @@ const startField = ref<string | null>(null)
 const endField = ref<string | null>(null)
 const rangeMaxSpan = ref<DateRangeValue>([null, null])
 const rangeDatetime = ref<DateRangeValue>([null, null])
-const rangeDisabled = ref<DateRangeValue>(['2026-01-01', '2026-01-31'])
+const rangeDisabled = ref<DateRangeValue>(['20260101', '20260131'])
 </script>
 
 <style scoped>

package/frontEnd/src/pages/PositionReportPage.vue

@@ -17,12 +17,17 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="头寸报备编号" prop="id">
-            <el-input v-model="form.id" placeholder="" clearable />
+            <el-input v-model="form.id" placeholder="" clearable :disabled="isReadonlyField('id')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="业务类型" prop="forecastType">
-            <el-select v-model="form.forecastType" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.forecastType"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('forecastType')"
+            >
               <el-option
                 v-for="o in forecastTypeOptions"
                 :key="o.value"
@@ -42,7 +47,12 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="证件类型" prop="priIdCardType">
-            <el-select v-model="form.priIdCardType" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.priIdCardType"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('priIdCardType')"
+            >
               <el-option
                 v-for="o in priIdCardTypeOptions"
                 :key="o.value"
@@ -54,7 +64,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="对公组织机构代码" prop="pubOrgCode">
-            <el-input v-model="form.pubOrgCode" clearable />
+            <el-input v-model="form.pubOrgCode" clearable :disabled="isReadonlyField('pubOrgCode')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -68,13 +78,23 @@
         <el-col :span="8">
           <el-form-item label="拟付款币种/金额" prop="currency">
             <div class="currency-amt">
-              <el-select v-model="form.currency" placeholder="币种" class="currency-amt__cur">
+              <el-select
+                v-model="form.currency"
+                placeholder="币种"
+                class="currency-amt__cur"
+                :disabled="isReadonlyField('currency')"
+              >
                 <el-option label="CNY - 人民币" value="CNY" />
                 <el-option label="USD - 美元" value="USD" />
                 <el-option label="EUR - 欧元" value="EUR" />
                 <el-option label="HKD - 港币" value="HKD" />
               </el-select>
-              <el-input v-model="form.forecastAmt" class="currency-amt__amt" clearable />
+              <el-input
+                v-model="form.forecastAmt"
+                class="currency-amt__amt"
+                clearable
+                :disabled="isReadonlyField('forecastAmt')"
+              />
             </div>
           </el-form-item>
         </el-col>
@@ -87,6 +107,7 @@
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
               style="width: 100%"
+              :disabled="isReadonlyField('valueDate')"
             />
           </el-form-item>
         </el-col>
@@ -105,6 +126,7 @@
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
               style="width: 100%"
+              :disabled="isReadonlyField('planDate')"
             />
           </el-form-item>
         </el-col>
@@ -117,12 +139,18 @@
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD"
               style="width: 100%"
+              :disabled="isReadonlyField('bigForDate')"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="报备时间" prop="bigForTime">
-            <el-input v-model="form.bigForTime" placeholder="HHmmss" clearable />
+            <el-input
+              v-model="form.bigForTime"
+              placeholder="HHmmss"
+              clearable
+              :disabled="isReadonlyField('bigForTime')"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -130,7 +158,12 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="是否退汇" prop="rtnFlag">
-            <el-select v-model="form.rtnFlag" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.rtnFlag"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('rtnFlag')"
+            >
               <el-option label="否" value="01" />
               <el-option label="是" value="02" />
             </el-select>
@@ -144,12 +177,13 @@
               show-word-limit
               placeholder="退汇为「是」时必填，16 位"
               clearable
+              :disabled="isReadonlyField('oriInnerRefNo')"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="账户行" prop="nostro">
-            <el-input v-model="form.nostro" clearable />
+            <el-input v-model="form.nostro" clearable :disabled="isReadonlyField('nostro')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -157,17 +191,26 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="收款银行" prop="swiftCode">
-            <el-input v-model="form.swiftCode" placeholder="最终收款行 SWIFT" clearable />
+            <el-input
+              v-model="form.swiftCode"
+              placeholder="最终收款行 SWIFT"
+              clearable
+              :disabled="isReadonlyField('swiftCode')"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="收款银行开户行" prop="pyeAcctBicSCode">
-            <el-input v-model="form.pyeAcctBicSCode" clearable />
+            <el-input
+              v-model="form.pyeAcctBicSCode"
+              clearable
+              :disabled="isReadonlyField('pyeAcctBicSCode')"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="收款银行开户行名称" prop="pyeAcctBicName">
-            <el-input v-model="form.pyeAcctBicName" disabled />
+            <el-input v-model="form.pyeAcctBicName" :disabled="isReadonlyField('pyeAcctBicName')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -175,7 +218,12 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="邮件通知服务产品" prop="mailFlag">
-            <el-select v-model="form.mailFlag" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.mailFlag"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('mailFlag')"
+            >
               <el-option label="否" value="0" />
               <el-option label="是" value="1" />
             </el-select>
@@ -183,7 +231,12 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="多币种汇款产品" prop="mulCurFlag">
-            <el-select v-model="form.mulCurFlag" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.mulCurFlag"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('mulCurFlag')"
+            >
               <el-option label="否" value="0" />
               <el-option label="是" value="1" />
             </el-select>
@@ -191,7 +244,12 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="自贸区标识" prop="ftzFlag">
-            <el-select v-model="form.ftzFlag" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.ftzFlag"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('ftzFlag')"
+            >
               <el-option label="否" value="0" />
               <el-option label="是" value="1" />
             </el-select>
@@ -202,12 +260,12 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="报备人" prop="linkMan">
-            <el-input v-model="form.linkMan" clearable />
+            <el-input v-model="form.linkMan" clearable :disabled="isReadonlyField('linkMan')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="联系电话" prop="linkWay">
-            <el-input v-model="form.linkWay" clearable />
+            <el-input v-model="form.linkWay" clearable :disabled="isReadonlyField('linkWay')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -219,6 +277,7 @@
               default-first-option
               placeholder="请选择或输入"
               style="width: 100%"
+              :disabled="isReadonlyField('orgId')"
             >
               <el-option label="00301-和平里支行营业部" value="00301" />
             </el-select>
@@ -229,7 +288,13 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="报备说明" prop="remark">
-            <el-input v-model="form.remark" type="textarea" :rows="2" placeholder="" />
+            <el-input
+              v-model="form.remark"
+              type="textarea"
+              :rows="2"
+              placeholder=""
+              :disabled="isReadonlyField('remark')"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8" class="form-col--spacer">
@@ -237,7 +302,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="备注(拒绝原因)" prop="rejectRemark">
-            <el-input v-model="form.rejectRemark" clearable />
+            <el-input v-model="form.rejectRemark" clearable :disabled="isReadonlyField('rejectRemark')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -245,7 +310,12 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="使用状态" prop="isUsedFlg">
-            <el-select v-model="form.isUsedFlg" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.isUsedFlg"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('isUsedFlg')"
+            >
               <el-option label="未使用" value="0" />
               <el-option label="已使用" value="1" />
             </el-select>
@@ -253,7 +323,12 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="当前队列" prop="forecastStatus">
-            <el-select v-model="form.forecastStatus" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.forecastStatus"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('forecastStatus')"
+            >
               <el-option
                 v-for="o in forecastStatusOptions"
                 :key="o.value"
@@ -265,7 +340,7 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="业务渠道" prop="businessChannel">
-            <el-input v-model="form.businessChannel" disabled />
+            <el-input v-model="form.businessChannel" :disabled="isReadonlyField('businessChannel')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -275,17 +350,27 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="授权人" prop="author">
-            <el-input v-model="form.author" clearable />
+            <el-input v-model="form.author" clearable :disabled="isReadonlyField('author')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="授权日期" prop="authorDate">
-            <el-input v-model="form.authorDate" placeholder="YYYY-MM-DD" clearable />
+            <el-input
+              v-model="form.authorDate"
+              placeholder="YYYY-MM-DD"
+              clearable
+              :disabled="isReadonlyField('authorDate')"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="授权时间" prop="authorTime">
-            <el-input v-model="form.authorTime" placeholder="HHmmss" clearable />
+            <el-input
+              v-model="form.authorTime"
+              placeholder="HHmmss"
+              clearable
+              :disabled="isReadonlyField('authorTime')"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -293,17 +378,27 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="复核人" prop="supervisor">
-            <el-input v-model="form.supervisor" clearable />
+            <el-input v-model="form.supervisor" clearable :disabled="isReadonlyField('supervisor')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="复核日期" prop="checkDate">
-            <el-input v-model="form.checkDate" placeholder="YYYY-MM-DD" clearable />
+            <el-input
+              v-model="form.checkDate"
+              placeholder="YYYY-MM-DD"
+              clearable
+              :disabled="isReadonlyField('checkDate')"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="复核时间" prop="checkTime">
-            <el-input v-model="form.checkTime" placeholder="HHmmss" clearable />
+            <el-input
+              v-model="form.checkTime"
+              placeholder="HHmmss"
+              clearable
+              :disabled="isReadonlyField('checkTime')"
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -311,17 +406,17 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="大额授权码" prop="posForecastNo">
-            <el-input v-model="form.posForecastNo" clearable />
+            <el-input v-model="form.posForecastNo" clearable :disabled="isReadonlyField('posForecastNo')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="中间行 SWIFT" prop="interBk">
-            <el-input v-model="form.interBk" clearable />
+            <el-input v-model="form.interBk" clearable :disabled="isReadonlyField('interBk')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="收款人名称" prop="pyeName">
-            <el-input v-model="form.pyeName" clearable />
+            <el-input v-model="form.pyeName" clearable :disabled="isReadonlyField('pyeName')" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -329,12 +424,17 @@
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="实际付款金额" prop="usedAmt">
-            <el-input v-model="form.usedAmt" clearable />
+            <el-input v-model="form.usedAmt" clearable :disabled="isReadonlyField('usedAmt')" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="可操作标志" prop="isOperateFlag">
-            <el-select v-model="form.isOperateFlag" placeholder="请选择" style="width: 100%">
+            <el-select
+              v-model="form.isOperateFlag"
+              placeholder="请选择"
+              style="width: 100%"
+              :disabled="isReadonlyField('isOperateFlag')"
+            >
               <el-option label="不可操作" value="0" />
               <el-option label="可以操作" value="1" />
             </el-select>
@@ -358,7 +458,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import type { FormInstance, FormRules } from 'element-plus'
@@ -445,7 +545,7 @@ const clientTypeLabels: Record<string, string> = {
   '03': '对私非居民'
 }
 
-const form = reactive<PositionForecastForm>({
+const form = ref<PositionForecastForm>({
   id: '',
   author: '',
   authorDate: '',
@@ -488,7 +588,21 @@ const form = reactive<PositionForecastForm>({
   businessChannel: '柜面系统'
 })
 
-const clientTypeLabel = computed(() => clientTypeLabels[form.clientType] ?? form.clientType)
+const clientTypeLabel = computed(
+  () => clientTypeLabels[form.value.clientType] ?? form.value.clientType
+)
+
+/** 仅以下字段可编辑，其余只读 */
+const EDITABLE_FORM_KEYS = new Set([
+  'valueDate',
+  'nostro',
+  'rejectRemark',
+  'pyeAcctBicName'
+])
+
+function isReadonlyField(prop: string): boolean {
+  return !EDITABLE_FORM_KEYS.has(prop)
+}
 
 const rules: FormRules<PositionForecastForm> = {
   valueDate: [{ required: true, message: '起息日不能为空', trigger: 'change' }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2server7",
-  "version": "7.0.28",
+  "version": "7.0.30",
   "description": "",
   "scripts": {
     "dev": "nodemon --watch src --ext ts --exec \"ts-node src/app.ts\"",