调整发票编辑和详情错误

pages/invoiceList/components/already/index.js

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

pages/invoiceList/components/info/index.js

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

pages/invoiceList/components/info/index.wxml

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