zly/electricity_bill_calc_wx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整发票编辑和详情错误

Browse Source
This commit is contained in:
qiaomu 2024-05-06 15:48:44 +08:00
parent 5885281810
commit 3d13c3003a
9 changed files with 151 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pages/electricQuery/index.js
View File

@ -122,7 +122,6 @@ Page({
onOk(e) { onOk(e) {
const { type, value = {} } = e.detail; const { type, value = {} } = e.detail;
const { id, code } = e; const { id, code } = e;
console.log('e', e)
const { year } = this.data; const { year } = this.data;
// const currentYear = years[Number(e)] // const currentYear = years[Number(e)]
this.setData({ this.setData({

2
pages/home/index.js
View File

@ -306,6 +306,8 @@ Page({
updateDatas.all = data; updateDatas.all = data;
this.setData({ this.setData({
...updateDatas ...updateDatas
}, () => {
this.getMeters({ id: updateDatas.tenement.id })
}) })
}, },
jumpToRecord() { jumpToRecord() {

1
pages/invoiceList/components/already/index.js
View File

@ -20,7 +20,6 @@ Component({
list: [] list: []
}, },
onRefresh() { onRefresh() {
console.log('--------------')
this.getList(); this.getList();
}, },
lifetimes: { lifetimes: {

4
pages/invoiceList/components/info/index.js
View File

@ -107,6 +107,10 @@ Component({
} }
} }
const { code, message } = await updateInvoiceInfo(formData) const { code, message } = await updateInvoiceInfo(formData)
if (code !== OK) {
alertInfo(message)
return;
}
alertSuccess("编辑成功") alertSuccess("编辑成功")
this.getDetail() this.getDetail()
} }

213
pages/invoiceList/components/info/index.wxml
View File

@ -60,31 +60,45 @@
</view> </view>
</van-field> </van-field>
<van-field <van-field
wx:if="{{editType === 'detail'}}"
value="{{detail.name || '--'}}"
label="发票抬头"
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{true}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ false }}"
/>
<van-field
wx:else
value="{{formData.name}}" value="{{formData.name}}"
label="发票抬头" label="发票抬头"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" disabled="{{formData.headerType !== 1}}"
disabled="{{editType === 'edit' && formData.headerType !== 1}}"
autosize="{{true}}" autosize="{{true}}"
type="textarea" type="textarea"
title-width="132rpx" title-width="132rpx"
bind:change="onChangeText" bind:change="onChangeText"
data-name="name" data-name="name"
bind:change="onChangeText" bind:change="onChangeText"
border="{{ editType === 'detail' ? false : true }}" border="{{ true }}"
> />
<view
wx:if="{{editType === 'detail'}}"
slot="input"
>
<view wx:if="{{!!detail.name}}" style="margin-top: -10rpx;"> {{detail.name}} </view>
<view wx:else style="margin-top: -10rpx;">--</view>
</view>
</van-field>
<van-field <van-field
value="{{formData.tin}}" value="{{detail.tin|| '--'}}"
label="发票税号" label="发票税号"
wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}" wx:if="{{editType === 'detail' && detail.headerType === 0}}"
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
/>
<van-field
value="{{formData.tin }}"
label="发票税号"
wx:if="{{editType === 'edit' && formData.headerType === 0}}"
placeholder="{{editType === 'edit' ? '请输入发票税号' : ''}}" placeholder="{{editType === 'edit' ? '请输入发票税号' : ''}}"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" readonly="{{editType === 'detail'}}"
@ -94,41 +108,35 @@
bind:change="onChangeText" bind:change="onChangeText"
data-name="tin" data-name="tin"
border="{{ editType === 'detail' ? false : true }}" border="{{ editType === 'detail' ? false : true }}"
> />
<view <van-field
wx:if="{{editType === 'detail'}}" value="{{detail.bank || '--'}}"
slot="input" label="开户行"
> wx:if="{{editType === 'detail' && detail.headerType === 0}}"
<view wx:if="{{!!detail.tin}}" style="margin-top: -10rpx;">{{detail.tin}}</view> custom-style="padding-left: 0; padding-right: 0;"
<view wx:else style="margin-top: -10rpx;">-</view> readonly="{{editType === 'detail'}}"
</view> autosize="{{true}}"
</van-field> type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
/>
<van-field <van-field
value="{{formData.bank}}" value="{{formData.bank}}"
label="开户行" label="开户行"
wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}" wx:if="{{editType === 'edit' && formData.headerType === 0}}"
placeholder="{{editType === 'edit' ? '请输入开户行' : ''}}" placeholder="{{'请输入开户行'}}"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" autosize="{{true}}"
autosize="{{bank}}"
type="textarea" type="textarea"
title-width="132rpx" title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}" border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText" bind:change="onChangeText"
data-name="bank" data-name="bank"
> />
<view
wx:if="{{editType === 'detail'}}"
slot="input"
>
<view wx:if="{{!!detail.bank}}" style="margin-top: -10rpx;">{{detail.bank}}</view>
<view wx:else style="margin-top: -10rpx;">-</view>
</view>
</van-field>
<van-field <van-field
value="{{formData.account}}" value="{{detail.account || '--'}}"
label="银行账号" label="银行账号"
wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}" wx:if="{{(editType === 'detail' && detail.headerType === 0)}}"
placeholder="{{editType === 'edit' ? '请输入银行账号' : ''}}" placeholder="{{editType === 'edit' ? '请输入银行账号' : ''}}"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" readonly="{{editType === 'detail'}}"
@ -138,19 +146,25 @@
border="{{ editType === 'detail' ? false : true }}" border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText" bind:change="onChangeText"
data-name="account" data-name="account"
> />
<view
wx:if="{{editType === 'detail' && !detail.account}}"
slot="input"
>
<view wx:if="{{!!detail.account}}">{{detail.account}}</view>
<view>-</view>
</view>
</van-field>
<van-field <van-field
value="{{detail.address}}" value="{{formData.account}}"
label="银行账号"
wx:if="{{(editType === 'edit' && formData.headerType === 0) }}"
placeholder="{{editType === 'edit' ? '请输入银行账号' : ''}}"
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="account"
/>
<van-field
value="{{detail.address || '--'}}"
label="地址" label="地址"
wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}" wx:if="{{(editType === 'detail' && detail.headerType === 0)}}"
placeholder="{{editType === 'edit' ? '请输入地址' : ''}}" placeholder="{{editType === 'edit' ? '请输入地址' : ''}}"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" readonly="{{editType === 'detail'}}"
@ -160,19 +174,25 @@
border="{{ editType === 'detail' ? false : true }}" border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText" bind:change="onChangeText"
data-name="address" data-name="address"
> />
<view
wx:if="{{editType === 'detail'}}"
slot="input"
>
<view wx:if="{{!!detail.address}}">{{detail.address}}</view>
<view>-</view>
</view>
</van-field>
<van-field <van-field
value="{{detail.phone}}" value="{{formData.address}}"
label="地址"
wx:if="{{(editType === 'edit' && formData.headerType === 0)}}"
placeholder="{{editType === 'edit' ? '请输入地址' : ''}}"
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="address"
/>
<van-field
value="{{detail.phone || '--'}}"
label="电话" label="电话"
wx:if="{{(editType === 'edit' && formData.headerType === 0) || (editType === 'detail' && detail.headerType === 0)}}" wx:if="{{(editType === 'detail' && detail.headerType === 0)}}"
placeholder="{{editType === 'edit' ? '请输入电话' : ''}}" placeholder="{{editType === 'edit' ? '请输入电话' : ''}}"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" readonly="{{editType === 'detail'}}"
@ -182,17 +202,38 @@
border="{{ editType === 'detail' ? false : true }}" border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText" bind:change="onChangeText"
data-name="phone" data-name="phone"
> />
<view
wx:if="{{editType === 'detail' && !detail.phone}}"
slot="input"
>
<view>-</view>
</view>
</van-field>
<van-field <van-field
value="{{detail.remark}}" value="{{formData.phone }}"
label="电话"
wx:if="{{(editType === 'edit' && formData.headerType === 0) }}"
placeholder="{{editType === 'edit' ? '请输入电话' : ''}}"
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="phone"
/>
<van-field
value="{{detail.remark || '--'}}"
label="备注" label="备注"
wx:if="{{editType === 'detail' }}"
custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}"
autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="remark"
/>
<van-field
value="{{formData.remark}}"
label="备注"
wx:else
placeholder="{{editType === 'edit' ? '请输入备注' : ''}}" placeholder="{{editType === 'edit' ? '请输入备注' : ''}}"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" readonly="{{editType === 'detail'}}"
@ -202,14 +243,7 @@
border="{{ editType === 'detail' ? false : true }}" border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText" bind:change="onChangeText"
data-name="remark" data-name="remark"
> />
<view
wx:if="{{editType === 'detail' && !detail.remark}}"
slot="input"
>
<view>-</view>
</view>
</van-field>
</view> </view>
</card> </card>
</view> </view>
@ -217,7 +251,8 @@
<card title="接收信息"> <card title="接收信息">
<view slot="content"> <view slot="content">
<van-field <van-field
value="{{detail.email}}" value="{{detail.email || '--'}}"
wx:if="{{editType === 'detail'}}"
label="电子邮箱" label="电子邮箱"
custom-style="padding-left: 0; padding-right: 0;" custom-style="padding-left: 0; padding-right: 0;"
readonly="{{editType === 'detail'}}" readonly="{{editType === 'detail'}}"
@ -227,14 +262,20 @@
border="{{ editType === 'detail' ? false : true }}" border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText" bind:change="onChangeText"
data-name="email" data-name="email"
> />
<view <van-field
wx:if="{{editType === 'detail' && !detail.email}}" value="{{formData.email}}"
slot="input" wx:else
> label="电子邮箱"
<view>-</view> custom-style="padding-left: 0; padding-right: 0;"
</view> readonly="{{editType === 'detail'}}"
</van-field> autosize="{{true}}"
type="textarea"
title-width="132rpx"
border="{{ editType === 'detail' ? false : true }}"
bind:change="onChangeText"
data-name="email"
/>
</view> </view>
</card> </card>
</view> </view>

1
pages/invoicing/index.js
View File

@ -23,7 +23,6 @@ Page({
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad(options) { onLoad(options) {
console.log('options', options)
const { money = 0, tenement, ids = '', count = 0, tenementName } = options; const { money = 0, tenement, ids = '', count = 0, tenementName } = options;
this.setData({ money, tenement, ids: ids.split(","), count, tenementName }) this.setData({ money, tenement, ids: ids.split(","), count, tenementName })
this.getDetail(); this.getDetail();

6
pages/my/index.json
View File

@ -4,7 +4,9 @@
"van-cell-group": "@vant/weapp/cell-group/index", "van-cell-group": "@vant/weapp/cell-group/index",
"cell": "/components/cell/index", "cell": "/components/cell/index",
"van-dialog": "@vant/weapp/dialog/index", "van-dialog": "@vant/weapp/dialog/index",
"dot": "/components/dot/index" "dot": "/components/dot/index",
"navigator": "/components/navigator/index"
}, },
"navigationBarTitleText": "我的" "navigationBarTitleText": "我的",
"navigationStyle": "custom"
} }

26
pages/my/index.wxml
View File

@ -4,20 +4,20 @@
<cell title="常见问题" bind:click="jumpToQuestions" /> --> <cell title="常见问题" bind:click="jumpToQuestions" /> -->
<!-- <van-cell-group title=" "> --> <!-- <van-cell-group title=" "> -->
<navigator title="我的" />
<van-cell title="联系客服" value="" is-link bind:tap="connect" /> <van-cell title="联系客服" value="" is-link bind:tap="connect" />
<van-cell wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" /> <van-cell wx:if="{{!!user.isAdmin}}" title="二维码" value="" is-link bind:click="jumpToQrCode" />
<van-cell wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember"> <van-cell wx:if="{{!!user.isAdmin}}" is-link bind:click="jumpToMember">
<view slot="title"> <view slot="title">
<view class="cellWrapper"> <view class="cellWrapper">
<view class="text"> 成员管理 </view> <view class="text"> 成员管理 </view>
<dot wx:if="{{dot > 0}}" number="{{dot}}" /> <dot wx:if="{{dot > 0}}" number="{{dot}}" />
</view>
</view> </view>
</van-cell> </view>
<van-cell title="发票抬头" value="" is-link bind:tap="jumpToUpdateInvoice" /> </van-cell>
<van-cell title="绑定企业" value="" is-link bind:tap="bindTenement" /> <van-cell title="发票抬头" value="" is-link bind:tap="jumpToUpdateInvoice" />
<van-cell title="退出登录" value="" is-link bind:tap="logout" /> <van-cell title="绑定企业" value="" is-link bind:tap="bindTenement" />
<van-cell title="退出登录" value="" is-link bind:tap="logout" />
<!-- </van-cell-group> --> <!-- </van-cell-group> -->
<!-- <van-cell-group title=" "> <!-- <van-cell-group title=" ">
<van-cell title="单元格" value="内容" is-link /> <van-cell title="单元格" value="内容" is-link />

2
pages/rechargeRecord/index.js
View File

@ -35,7 +35,7 @@ Page({
clickMeter() { clickMeter() {
this.setData({ this.setData({
type: "meter", type: "meter",
columns: this.data.meterList.map(item => ({ id: item.id, name: `${item.code}-${item.address}`, code: item.code })), columns: [{id: "", name: "全部", address: "", code: ""}, ...this.data.meterList.map(item => ({ id: item.id, name: `${item.code}-${item.address}`, code: item.code }))],
show: true, show: true,
title: "表计" title: "表计"
}) })