任务 #5860

oem/gstj/config/appconfig.json

@@ -3,7 +3,7 @@
   "appName": "甘肃碳交",
   "version": "1.0.28",
   "versionCode": "100028",
-  "apiUrl": "http://192.168.31.167:8080/cfg?key=test_167",
+  "apiUrl": "http://192.168.31.205:8080/cfg?key=test_205",
   "tradeChannel": "ws",
   "modules": [
     "register",

src/business/bank/index.ts

@@ -502,7 +502,8 @@ export function useDoYJFGetWithholdSignInSMSVCode() {
         Yckfxe: '500000.00',
         Kkzqnkfxe: '0.00', 
         Kkzqnxzbs: '0',
-        Kksjbc: '99'
+        Kksjbc: '99',
+        Kksjdw: '1'
     })
 
     /// 判断是否有签约信息

src/packages/gstj/views/holdbank/holdsign/Index.vue

@@ -11,8 +11,8 @@
                 <Cell title="协议签署日期" :value="handleNoneValue(signinfo?.xyqsrq)" />
                 <Cell title="协议生效日期" :value="handleNoneValue(signinfo?.xysxrq)" />
                 <Cell title="协议到期日期" :value="handleNoneValue(signinfo?.xydqrq)" />
-                <Cell title="扣款单位时间" :value="getGt_kksjdwName(signinfo?.kksjdw)" />
-                <Cell title="扣款时间步长" :value="handleNoneValue(signinfo?.kksjbc)" />
+                <!-- <Cell title="扣款单位时间" :value="getGt_kksjdwName(signinfo?.kksjdw)" />
+                <Cell title="扣款时间步长" :value="handleNoneValue(signinfo?.kksjbc)" /> -->
                 <!-- <Cell title="扣款周期内扣费限额" :value="handleNoneValue(signinfo?.kkzqnkfxe)" />
                 <Cell title="扣费周期内限制笔数" :value="handleNoneValue(signinfo?.kkzqnxzbs)" /> -->
             </CellGroup>
@@ -39,7 +39,7 @@ import { CellGroup, Cell, Button, Empty, showFailToast } from 'vant'
 import { useComponent } from '@/hooks/component'
 import { queryGetGtwithholdsigninfo } from '@/services/api/bank'
 import { useRequest } from '@/hooks/request'
-import { getSignStatusName, SignStatus, getGt_kksjdwName } from '@/constants/bank'
+import { getSignStatusName, SignStatus } from '@/constants/bank'
 import { fullloading, dialog } from '@/utils/vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { useDoYJF_WithholdSignOut } from '@/business/bank'

src/packages/gstj/views/holdbank/holdsign/components/apply/Index.vue

@@ -13,11 +13,6 @@
                         placeholder="请选择协议到期日" :rules="formRules.Xydqrq" is-link @click="showCalendar = true" />
                     <Field type="number" name="Lxdh" label="手机号码" maxlength="30" v-model.trim="formData.Lxdh"
                         placeholder="请输入手机号码" :rules="formRules.Lxdh" />
-                    <Field name="Kksjdw" label="扣款单位" maxlength="30" :rules="formRules.Kksjdw" is-link>
-                        <template #input>
-                            <app-select v-model="Kksjdw" placeholder="请选择扣款单位" :options="getGt_kksjdwList()" />
-                        </template>
-                    </Field>
                     <Field name="Addr" label="联系地址" type="textarea" autosize maxlength="128" v-model.trim="formData.Addr" placeholder="请输入联系地址"/>
                     <Field name="Remark" type="textarea" autosize label="备注" maxlength="128" v-model.trim="formData.Remark" placeholder="备注"/>
                 </CellGroup>
@@ -37,14 +32,12 @@
 import { shallowRef, ref, defineAsyncComponent } from 'vue'
 import { CellGroup, Field, Button, showFailToast, FormInstance, Form, FieldRule, Calendar } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
-import { getGt_kksjdwList } from "@/constants/bank"
 import { useDoYJFGetWithholdSignInSMSVCode } from '@/business/bank'
 import { validateRules } from '@/constants/regex'
 import { formatDate } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import moment from 'moment'
 import AppModal from '@/components/base/modal/index.vue'
-import AppSelect from '@mobile/components/base/select/index.vue'
 
 // 是否显示日期选择器
 const showCalendar = shallowRef(false) 
@@ -54,7 +47,6 @@ const refresh = shallowRef(false) // 是否刷新父组件数据
 const { formData, onSubmit, bankaccountno } = useDoYJFGetWithholdSignInSMSVCode()
 // 日期范围
 const dateRange = ref<string[]>([]) 
-const Kksjdw = ref('')
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     closed(true)
@@ -78,12 +70,6 @@ const formRules: { [key in keyof Proto.YJF_GetWithholdSignInSMSVCodeReq]?: Field
             return !!formData.Xydqrq
         }
     }],
-    Kksjdw: [{
-        message: '请选择扣款单位',
-        validator: () => {
-            return !!Kksjdw.value
-        }
-    }],
     Lxdh: [{
         required: true,
         message: '请输入手机号码',
@@ -113,8 +99,6 @@ const formSubmit = () => {
     }).then(() => {
         formRef.value?.validate('Lxdh').then(() => {
             fullloading((hideLoading) => {
-                /// 数据单独处理
-                formData.Kksjdw = Kksjdw.value.toString()
                 onSubmit().then(() => {
                     hideLoading()
                     openComponent('SMSCode')

src/packages/pc/views/account/holdsign/components/sign/index.vue

@@ -18,20 +18,6 @@
                 :default-value="new Date()" value-format="YYYY-MM-DD" :editable="false" :clearable="false" 
                 @visible-change="visibleChange" @calendar-change="calendarChange" :rules="formRules.Xydqrq" />
             </el-form-item>
-            <!-- <el-form-item label="一次扣费限额" prop="Yckfxe">
-                <el-input-number :precision="2" :step="0.01" name="Yckfxe" placeholder="请输入一次扣费限额" v-model="Yckfxe" :rules="formRules.Yckfxe" />
-            </el-form-item>
-            <el-form-item label="扣费周期内扣款限额" prop="Kkzqnkfxe">
-                <el-input-number :precision="2" :step="0.01" name="Kkzqnkfxe" placeholder="请输入扣费周期内扣款限额" v-model="Kkzqnkfxe" :rules="formRules.Kkzqnkfxe" />
-            </el-form-item> 
-            <el-form-item label="扣费周期内限制笔数" prop="Kkzqnxzbs">
-                <el-input-number :precision="0" :step="1" name="Kkzqnxzbs" placeholder="请输入扣费周期内限制笔数" v-model="Kkzqnxzbs" :rules="formRules.Kkzqnxzbs" />
-            </el-form-item>  -->
-            <el-form-item class="el-form-item--row" label="扣款单位" prop="Kksjdw">
-                <el-select effect="dark" v-model="Kksjdw" :rules="formRules.Kksjdw" >
-                    <el-option :label="item.label" :value="item.value" v-for="(item, index) in getGt_kksjdwList()" :key="index" />
-                </el-select>
-            </el-form-item>
             <el-form-item class="el-form-item--row" label="地址" prop="Addr">
                 <el-input name="Addr" v-model="formData.Addr" maxlength="128" placeholder="请输入联系地址" />
             </el-form-item>
@@ -49,7 +35,6 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import { ElMessage, FormInstance, FormRules, ElMessageBox } from 'element-plus'
-import { getGt_kksjdwList } from "@/constants/bank"
 import { useDoYJFGetWithholdSignInSMSVCode, useDoYJF_WithholdSignInSMS } from '@/business/bank'
 import { validateRules } from '@/constants/regex'
 import { useDateRange } from '@/hooks/date-picker'
@@ -62,18 +47,8 @@ const { visibleChange, calendarChange } = useDateRange()
 const show = ref(true)
 const refresh = ref(false)
 const formRef = ref<FormInstance>()
-const Kksjdw = ref('')
-// const Kkzqnkfxe = ref(0.00)
-// const Yckfxe = ref(0.00)
-// const Kkzqnxzbs = ref(0)
 
 const formRules: FormRules = {
-    // Yckfxe: [{
-    //     message: '请输入一次扣费限额',
-    //     validator: () => {
-    //         return !!Yckfxe.value
-    //     }
-    // }],
     Xysxrq: [{
         message: '请选择协议生效期',
         validator: () => {
@@ -86,24 +61,6 @@ const formRules: FormRules = {
             return !!formData.Xydqrq
         }
     }],
-    Kksjdw: [{
-        message: '请选择扣款单位',
-        validator: () => {
-            return !!Kksjdw.value
-        }
-    }],
-    // Kkzqnkfxe: [{
-    //     message: '请输入扣费周期内扣款限额',
-    //     validator: () => {
-    //         return !!Kkzqnkfxe.value
-    //     }
-    // }],
-    // Kkzqnxzbs: [{
-    //     message: '请输入扣费周期内限制笔数',
-    //     validator: () => {
-    //         return !!Kkzqnxzbs.value
-    //     }
-    // }],
     Lxdh: [{
         message: '请输入手机号码',
         validator: (rule, value, callback) => {
@@ -136,10 +93,6 @@ const signSubmit = () => {
 const formSubmit = () => {
     formRef.value?.validate((formValid) => {
         if (formValid) {
-
-            /// 数据单独处理
-            formData.Kksjdw = Kksjdw.value.toString()
-
             onSubmit().then(() => {
                 ElMessageBox.prompt('请输入验证码', '验证码', {
                             confirmButtonText: '提交',

src/packages/pc/views/account/holdsign/index.vue

@@ -11,10 +11,6 @@
         <template #accountsignstatus="{ value }">
             {{ getSignStatusName(value) }}
         </template>
-        <!-- 扣款时间单位 -->
-        <template #kksjdw="{ value }">
-            {{  getGt_kksjdwName(value) }}
-        </template>
         <!-- 展开行 -->
         <template #expand="{ row }">
             <div class="buttonbar">
@@ -33,7 +29,7 @@ import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
 import { useRequest } from '@/hooks/request'
 import { queryGetGtwithholdsigninfo, queryBankAccountSign } from '@/services/api/bank'
-import { getGt_kksjdwName, getSignStatusName, SignStatus } from '@/constants/bank'
+import { getSignStatusName, SignStatus } from '@/constants/bank'
 import { ElMessage } from 'element-plus'
 import AppTable from '@pc/components/base/table/index.vue'
 
@@ -84,7 +80,6 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'xyqsrq', label: '协议签署日期' },
     { field: 'xysxrq', label: '协议生效日期' },
     { field: 'xydqrq', label: '协议到期日期' },
-    { field: 'kksjdw', label: '扣款单位时间' },
     { field: 'kksjbc', label: '扣款时间步长' },
 ])