Browse Source

Bug 修改

Handy_Cao 1 year ago
parent
commit
1ecde87a8e

+ 1 - 1
public/config/appconfig.json

@@ -2,7 +2,7 @@
   "appId": "com.muchinfo.app",
   "version": "1.0.5",
   "versionCode": "10005",
-  "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
+  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
   "modules": [
     "register",
     "delivery"

+ 9 - 5
src/packages/gstj/views/holdbank/holddeposit/Index.vue

@@ -92,11 +92,15 @@ const onConfirm = ([start, end]: Date[]) => {
 }
 
 const onRefresh = () => {
-    const [begindate, enddate] = dateRange.value
-    run({
-        begindate: formatDate(begindate, 'YYYYMMDD'),
-        enddate: formatDate(enddate, 'YYYYMMDD')
-    })
+    if (dateRange.value.length != 0) {
+        const [begindate, enddate] = dateRange.value
+        run({
+            begindate: formatDate(begindate, 'YYYYMMDD'),
+            enddate: formatDate(enddate, 'YYYYMMDD')
+        })
+    } else {
+        run()
+    }
 }
 </script>
 

+ 7 - 1
src/packages/gstj/views/holdbank/holddeposit/components/apply/Index.vue

@@ -67,7 +67,13 @@ defineExpose({
 const formRules: { [key: string]: FieldRule[] } = {
     BillAmount: [{
         required: true,
-        message: '请填写入金金额',
+        message: '请输入代扣金额',
+        validator: (val) => {
+            if (val > 500000) {
+                return '代扣金额不能超过50 万'
+            }
+            return true
+        }
     }]
 }
 

+ 11 - 1
src/packages/pc/views/account/holddeposit/components/deposit/index.vue

@@ -39,7 +39,17 @@ const billAmount = ref(0.0)
 /// 备注
 const Remark = ref('')
 const formRules: FormRules = {
-    BillAmount: [{ required: true, message: '请输入入金金额' }],
+    BillAmount: [{ 
+        required: true, 
+        message: '请输入代扣金额',
+            validator: (rule, value, callback) => {
+                if (value > 500000) {
+                    callback(new Error('代扣金额不能超过 50 万'))
+                } else {
+                    callback()
+                }
+            } 
+    }],
 }
 
 const onCancel = () => {

+ 0 - 1
src/packages/pc/views/account/holddeposit/index.vue

@@ -87,7 +87,6 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    // { prop: 'billingsnum', label: '流水号' },
     { prop: 'dgjfhm', label: '扣费账号' },
     { prop: 'deductionbnum', label: '扣费批次号' },
     { prop: 'billamount', label: '入金代扣金额' },