Commit 1f9090b0b85200ebdb1316d3848b2b1198a65b9c
1 parent
ba0d880c
Exists in
charge
fix:修改问题
Showing
5 changed files
with
30 additions
and
22 deletions
Show diff stats
manifest.json
@@ -83,7 +83,7 @@ | @@ -83,7 +83,7 @@ | ||
83 | "disableHostCheck" : true, | 83 | "disableHostCheck" : true, |
84 | "proxy" : { | 84 | "proxy" : { |
85 | "/api" : { | 85 | "/api" : { |
86 | - "target" : "http://dz64qt.natappfree.cc", | 86 | + "target" : "http://192.168.0.8:8001", |
87 | "changeOrigin" : true, | 87 | "changeOrigin" : true, |
88 | "secure" : true, | 88 | "secure" : true, |
89 | "pathRewrite" : { | 89 | "pathRewrite" : { |
pages/charge/visitsAndFees/createaVisit.vue
@@ -11,8 +11,8 @@ | @@ -11,8 +11,8 @@ | ||
11 | <view class="" v-for="(item,index) in basisData" :key="index"> | 11 | <view class="" v-for="(item,index) in basisData" :key="index"> |
12 | <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom | 12 | <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom |
13 | v-if="item.type === 'date'" :prop="item.key"> | 13 | v-if="item.type === 'date'" :prop="item.key"> |
14 | - <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" disabled | ||
15 | - border="none" :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'"></u-input> | 14 | + <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" border="none" |
15 | + :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'"></u-input> | ||
16 | <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon> | 16 | <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon> |
17 | <!-- <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon> --> | 17 | <!-- <u-icon slot="right" name="calendar" size="20" @click="handleDateTime(item)"></u-icon> --> |
18 | </u-form-item> | 18 | </u-form-item> |
@@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
20 | <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom | 20 | <u-form-item :required="item.required" :label="item.label" labelWidth="100" borderBottom |
21 | v-if="item.type === 'input'" :prop="item.key"> | 21 | v-if="item.type === 'input'" :prop="item.key"> |
22 | <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" | 22 | <u-input v-model="model[item.key]" inputAlign="right" :placeholder="item.placeholder" |
23 | - :disabled="operationStatus ==='YD'" :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'" | ||
24 | - border="none"></u-input> | 23 | + :disabled="operationStatus ==='YD' || item.key === 'billingPersonName'" |
24 | + :disabledColor="operationStatus==='YD'?'#F5F7FA':'#fff'" border="none"></u-input> | ||
25 | <view class="" style="width: 40rpx;height: 40rpx;"></view> | 25 | <view class="" style="width: 40rpx;height: 40rpx;"></view> |
26 | </u-form-item> | 26 | </u-form-item> |
27 | <!-- 选择类型 --> | 27 | <!-- 选择类型 --> |
@@ -75,7 +75,7 @@ | @@ -75,7 +75,7 @@ | ||
75 | <!-- 文件 --> | 75 | <!-- 文件 --> |
76 | <u-form-item :required="item.required" :label="item.label" labelWidth="75%" borderBottom | 76 | <u-form-item :required="item.required" :label="item.label" labelWidth="75%" borderBottom |
77 | v-if="item.type === 'file' && item.show" :prop="item.key"> | 77 | v-if="item.type === 'file' && item.show" :prop="item.key"> |
78 | - <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="10" | 78 | + <u-upload :fileList="fileList" @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1" |
79 | :disabled="operationStatus ==='YD'" width="100rpx" height="100rpx"></u-upload> | 79 | :disabled="operationStatus ==='YD'" width="100rpx" height="100rpx"></u-upload> |
80 | </u-form-item> | 80 | </u-form-item> |
81 | </view> | 81 | </view> |
@@ -194,7 +194,7 @@ | @@ -194,7 +194,7 @@ | ||
194 | @close="gsShow = false" keyName="label" @confirm="gsConfirm" @change="changeHandler"></u-picker> | 194 | @close="gsShow = false" keyName="label" @confirm="gsConfirm" @change="changeHandler"></u-picker> |
195 | 195 | ||
196 | <u-datetime-picker :show="datetimeShow" v-model="dataTimeValue" closeOnClickOverlay @confirm="dateConfirm" | 196 | <u-datetime-picker :show="datetimeShow" v-model="dataTimeValue" closeOnClickOverlay @confirm="dateConfirm" |
197 | - @cancel="datetimeShow = false" @close="datetimeShow = false" mode="datetime"></u-datetime-picker> | 197 | + @cancel="datetimeShow = false" @close="datetimeShow = false" mode="date"></u-datetime-picker> |
198 | </view> | 198 | </view> |
199 | </template> | 199 | </template> |
200 | 200 | ||
@@ -410,7 +410,7 @@ | @@ -410,7 +410,7 @@ | ||
410 | placeholder: "请输入", | 410 | placeholder: "请输入", |
411 | type: "input", | 411 | type: "input", |
412 | required: true, | 412 | required: true, |
413 | - key: "billingPersonName" | 413 | + key: "billingPersonName", |
414 | }, { | 414 | }, { |
415 | label: '兼职/全职', | 415 | label: '兼职/全职', |
416 | placeholder: "请选择", | 416 | placeholder: "请选择", |
@@ -470,11 +470,12 @@ | @@ -470,11 +470,12 @@ | ||
470 | show: true, | 470 | show: true, |
471 | }, { | 471 | }, { |
472 | label: '是否有意向', | 472 | label: '是否有意向', |
473 | - // placeholder: "请选择", | 473 | + placeholder: "请选择", |
474 | required: true, | 474 | required: true, |
475 | - type: "radio", | 475 | + type: "select", |
476 | key: "isIntent", | 476 | key: "isIntent", |
477 | show: true, | 477 | show: true, |
478 | + dict: 'sys_cn_yn' | ||
478 | }, { | 479 | }, { |
479 | label: '房屋情况', | 480 | label: '房屋情况', |
480 | placeholder: "请选择", | 481 | placeholder: "请选择", |
@@ -659,6 +660,7 @@ | @@ -659,6 +660,7 @@ | ||
659 | 660 | ||
660 | }, | 661 | }, |
661 | onLoad(data) { | 662 | onLoad(data) { |
663 | + this.init(); | ||
662 | console.log(data); | 664 | console.log(data); |
663 | if (data.objData) { | 665 | if (data.objData) { |
664 | let obj = JSON.parse(data.objData); | 666 | let obj = JSON.parse(data.objData); |
@@ -680,7 +682,6 @@ | @@ -680,7 +682,6 @@ | ||
680 | this.operationStatus = "TJ" //添加 | 682 | this.operationStatus = "TJ" //添加 |
681 | } | 683 | } |
682 | } | 684 | } |
683 | - this.init() | ||
684 | }, | 685 | }, |
685 | methods: { | 686 | methods: { |
686 | // 编辑或异动需要填充数据 | 687 | // 编辑或异动需要填充数据 |
@@ -724,10 +725,15 @@ | @@ -724,10 +725,15 @@ | ||
724 | }, | 725 | }, |
725 | async init() { | 726 | async init() { |
726 | console.log(this.$store); | 727 | console.log(this.$store); |
728 | + // 默认选是 | ||
729 | + this.model.isCharged = '是'; | ||
730 | + this.model.isVisited = '是'; | ||
731 | + this.model.hasDm = '是'; | ||
727 | // 查询财年 | 732 | // 查询财年 |
728 | await this.getCurrentFiscalYear() | 733 | await this.getCurrentFiscalYear() |
729 | await this.getCompanyCascader() | 734 | await this.getCompanyCascader() |
730 | let nickName = uni.getStorageSync("nickName"); | 735 | let nickName = uni.getStorageSync("nickName"); |
736 | + | ||
731 | this.$set(this.model, 'billingPersonName', nickName) | 737 | this.$set(this.model, 'billingPersonName', nickName) |
732 | // console.log(this.model.billingPersonName); | 738 | // console.log(this.model.billingPersonName); |
733 | }, | 739 | }, |
@@ -919,7 +925,7 @@ | @@ -919,7 +925,7 @@ | ||
919 | }, | 925 | }, |
920 | // 时间弹出层确认 | 926 | // 时间弹出层确认 |
921 | dateConfirm(e) { | 927 | dateConfirm(e) { |
922 | - let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss'); | 928 | + let time = this.$u.timeFormat(e.value, 'yyyy-mm-dd'); |
923 | console.log("选择时间", time); | 929 | console.log("选择时间", time); |
924 | this.model[this.currentName] = time; | 930 | this.model[this.currentName] = time; |
925 | this.datetimeShow = false; | 931 | this.datetimeShow = false; |
pages/charge/visitsAndFees/index.vue
@@ -63,8 +63,8 @@ | @@ -63,8 +63,8 @@ | ||
63 | <text class="text-grey margin-right-xs">用户:</text>{{item.userName|| "--"}} | 63 | <text class="text-grey margin-right-xs">用户:</text>{{item.userName|| "--"}} |
64 | </view> | 64 | </view> |
65 | </view> | 65 | </view> |
66 | - <view class="flex justify-end margin-top"> | ||
67 | - <view class="margin-left-sm"> | 66 | + <view class="flex justify-between margin-top"> |
67 | + <view class="margin-right-xs"> | ||
68 | <zb-popover placement="bottom-start" theme="dark" ref="Popover1" class="item-popover"> | 68 | <zb-popover placement="bottom-start" theme="dark" ref="Popover1" class="item-popover"> |
69 | <view slot="content" class="popoverCss"> | 69 | <view slot="content" class="popoverCss"> |
70 | <view class="" v-if="publishChangePermission(item)"> | 70 | <view class="" v-if="publishChangePermission(item)"> |
@@ -87,25 +87,25 @@ | @@ -87,25 +87,25 @@ | ||
87 | <u-button shape="circle">更多操作</u-button> | 87 | <u-button shape="circle">更多操作</u-button> |
88 | </zb-popover> | 88 | </zb-popover> |
89 | </view> | 89 | </view> |
90 | - <view class="margin-left-sm" @click="handleEdit(item)" v-if="editPermission(item)"> | ||
91 | - <u-button shape="circle" type="primary">修改</u-button> | 90 | + <view class="margin-right-xs" @click="handleEdit(item)" v-if="editPermission(item)"> |
91 | + <u-button shape="circle" color="#CF000D">修改</u-button> | ||
92 | </view> | 92 | </view> |
93 | - <view class="margin-left-sm" @click="handleDetail(item)" > | 93 | + <view class="margin-right-xs" @click="handleDetail(item)" > |
94 | <u-button shape="circle">查看详情</u-button> | 94 | <u-button shape="circle">查看详情</u-button> |
95 | </view> | 95 | </view> |
96 | - <view class="margin-left-sm" @click="handleRefuse(item)" v-if="auditPermission(item)"> | 96 | + <view class="margin-right-xs" @click="handleRefuse(item)" v-if="auditPermission(item)"> |
97 | <u-button shape="circle">拒绝</u-button> | 97 | <u-button shape="circle">拒绝</u-button> |
98 | </view> | 98 | </view> |
99 | - <view class="margin-left-sm" @click="handleAgree(item)" v-if="auditPermission(item)"> | 99 | + <view class="" @click="handleAgree(item)" v-if="auditPermission(item)"> |
100 | <u-button shape="circle" color="#CF000D">同意</u-button> | 100 | <u-button shape="circle" color="#CF000D">同意</u-button> |
101 | </view> | 101 | </view> |
102 | </view> | 102 | </view> |
103 | - <view class="nodeCss" v-if="item.statusCode === 'APPROVE'"> | 103 | + <view class="nodeCss" v-if="item.statusCode === 'APPROVE' || item.statusCode === 'EDITING'"> |
104 | {{item.statusNodeName}} | 104 | {{item.statusNodeName}} |
105 | </view> | 105 | </view> |
106 | </view> | 106 | </view> |
107 | <u-loadmore :status="status" v-if="list.length > 0" /> | 107 | <u-loadmore :status="status" v-if="list.length > 0" /> |
108 | - <u-empty text="暂无资讯" icon="/static/images/icon/nodata.png" v-else></u-empty> | 108 | + <u-empty text="暂无拜访/收费数据" icon="/static/images/icon/nodata.png" v-else></u-empty> |
109 | 109 | ||
110 | <view v-if="$checkPermi(['schsf:mcVisit:add'])" class="fixBtnCss" @click="createaVisit"> | 110 | <view v-if="$checkPermi(['schsf:mcVisit:add'])" class="fixBtnCss" @click="createaVisit"> |
111 | <u-icon name="plus" color="#fff" size="30"></u-icon> | 111 | <u-icon name="plus" color="#fff" size="30"></u-icon> |
@@ -311,6 +311,7 @@ | @@ -311,6 +311,7 @@ | ||
311 | console.log('item', JSON.parse(JSON.stringify(item))); | 311 | console.log('item', JSON.parse(JSON.stringify(item))); |
312 | }, | 312 | }, |
313 | onSearch(e) { | 313 | onSearch(e) { |
314 | + this.params.pageNum = 1; | ||
314 | this.params.userName = this.keyword; | 315 | this.params.userName = this.keyword; |
315 | this.initData() | 316 | this.initData() |
316 | console.log("搜索", e); | 317 | console.log("搜索", e); |
utils/dict.js
@@ -7,6 +7,8 @@ import store from '@/store' | @@ -7,6 +7,8 @@ import store from '@/store' | ||
7 | 7 | ||
8 | export const DICT_TYPE = { | 8 | export const DICT_TYPE = { |
9 | // ========== APP模块 ========== | 9 | // ========== APP模块 ========== |
10 | + SYS_YES_NO: 'sys_yes_no', //系统是否 | ||
11 | + SYS_CN_YN: 'sys_cn_yn', //系统是否 | ||
10 | SYS_PLATE_NAME: 'sys_plate_name', // 板块名称 | 12 | SYS_PLATE_NAME: 'sys_plate_name', // 板块名称 |
11 | SYS_HOUSEHOLD_AGE: 'sys_household_age', // 户主年龄 | 13 | SYS_HOUSEHOLD_AGE: 'sys_household_age', // 户主年龄 |
12 | SYS_LIVE_NO: 'sys_live_no', //居住人口 | 14 | SYS_LIVE_NO: 'sys_live_no', //居住人口 |
utils/permission.js
@@ -10,7 +10,6 @@ export function checkPermi(value) { | @@ -10,7 +10,6 @@ export function checkPermi(value) { | ||
10 | const permissions = store.getters && store.getters.permissions | 10 | const permissions = store.getters && store.getters.permissions |
11 | const permissionDatas = value | 11 | const permissionDatas = value |
12 | const all_permission = "*:*:*" | 12 | const all_permission = "*:*:*" |
13 | - | ||
14 | const hasPermission = permissions.some(permission => { | 13 | const hasPermission = permissions.some(permission => { |
15 | return all_permission === permission || permissionDatas.includes(permission) | 14 | return all_permission === permission || permissionDatas.includes(permission) |
16 | }) | 15 | }) |