Преглед на файлове

1、修改客户详情的问题

zhoux преди 1 година
родител
ревизия
7aa967f0ac

+ 3 - 3
components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -49,17 +49,17 @@
   <view wx:for="{{cardList}}" wx:for-item="card" data-item="{{card}}" wx:for-index="cardIndex">
 
     <view style="display: flex;justify-content: center;align-items: center;" id="{{card.name}}">
-      <view wx:if="{{card.name == 'items' && !readonly && chooseVisible && card.chooseGoodsItemFlag}}" style="width: 33%;margin:10rpx 10rpx;text-align: center;">
+      <view wx:if="{{card.name == 'items' && !readonly && chooseVisible && card.chooseGoodsItemFlag}}" style="margin:10rpx 15rpx;text-align: center;">
         <van-button icon="{{imageUrl + 'choose_goods_sale.png'}}" size="normal" color="#3E69F6" custom-style="border-radius:15rpx ;" catchtap="openChooseItems" data-item="{{card}}" custom-style="height:70rpx;border-radius:8px;width:191rpx;" data-index="{{cardIndex}}" type="info">选商品
         </van-button>
 
       </view>
-      <view wx:if="{{card.name == 'items' && !readonly && chooseVisible &&  card.chooseInventoryFlag}}" style="width: 33%;margin:10rpx 10rpx;text-align: center;">
+      <view wx:if="{{card.name == 'items' && !readonly && chooseVisible &&  card.chooseInventoryFlag}}" style="margin:10rpx 15rpx;text-align: center;">
         <van-button icon="{{imageUrl + 'choose_inventory_sale.png '}}" size="normal" custom-style="height:70rpx;border-radius:8px;width:191rpx;" data-type="inventory" color="#9A36FC" catchtap="openChooseItems" data-item="{{card}}" data-index="{{cardIndex}}" type="info">选库存
         </van-button>
 
       </view>
-      <view wx:if="{{card.name == 'items' && !readonly && chooseVisible &&  card.chooseCoordinationFlag}}" style="width: 33%;margin:10rpx 10rpx;text-align: center;">
+      <view wx:if="{{card.name == 'items' && !readonly && chooseVisible &&  card.chooseCoordinationFlag}}" style="margin:10rpx 15rpx;text-align: center;">
         <van-button icon="{{imageUrl + 'choose_coordination_sale.png'}}" size="normal" custom-style="height:70rpx;border-radius:8px;width:191rpx;" color="#FF7B1A" catchtap="openChooseCoordinationItems" data-item="{{card}}" data-index="{{cardIndex}}" type="info">选外协
         </van-button>
 

+ 2 - 2
components/dkbase/dk-save-button/dk-save-button.wxml

@@ -10,7 +10,7 @@
           {{item.title}}
         </view>
         <!--数字-->
-        <dk-cell wx:if="{{item.type=='number'}}" fontSize="{{item.fontSize?item.fontSize:16}}" contentFontSize="{{item.fontSize?item.fontSize:16}}" height="{{item.height?item.height:'44rpx'}}" fontWeight="{{item.fontWeight?item.fontWeight:600}}" left="0rpx" contentColor="{{item.color?item.color:'#FF7B1A'}}" titleColor="{{'#002340'}}" title="{{item.title}}" content="{{ item.content}}" amount="{{true}}"></dk-cell>
+        <dk-cell wx:if="{{item.type=='number'}}" fontSize="{{item.fontSize?item.fontSize:16}}" contentFontSize="{{item.fontSize?item.fontSize:16}}" height="{{item.height?item.height:'44rpx'}}" spaceWidth="10rpx" fontWeight="{{item.fontWeight?item.fontWeight:600}}" left="0rpx" contentColor="{{item.color?item.color:'#FF7B1A'}}" titleColor="{{'#002340'}}" title="{{item.title}}" content="{{ item.content}}" amount="{{true}}"></dk-cell>
         <!--选择框-->
         <view wx:if="{{item.type=='checkbox'}}" style="display: flex;margin-top: 10rpx; margin-bottom: 10rpx;">
           <van-checkbox disabled="{{item.disabled}}" value="{{ form[item.code] }}" icon-size="{{item.iconSize?item.iconSize:'16px'}}" data-code="{{item.code}}" bind:change="change"></van-checkbox>
@@ -27,7 +27,7 @@
     <!-- 保存确定区域 -->
     <!-- <view style="display: flex;width: {{contentList && contentList.length > 0?'50%':'100%'}};justify-content: {{btnRightFlag?'flex-end':'left'}};"> -->
       <view style="display: flex;width: {{contentList && contentList.length > 0?'auto':'100%'}};justify-content: {{btnRightFlag?'flex-end':'left'}};min-width:236rpx;">
-      <view class="btn-class" style="margin-right: {{(btnAutoWidthFlag && index != buttonList.length - 1)?'20rpx':''}};  width:{{btnAutoWidthFlag?(100/buttonList.length + '%'): (item.width?item.width:'196rpx')}};" wx:for="{{buttonList}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
+      <view class="btn-class" style="margin-right: {{(btnAutoWidthFlag && index != buttonList.length - 1)?'20rpx':''}};  width:{{btnAutoWidthFlag?(100/buttonList.length + '%'): (item.width?item.width:'156rpx')}};" wx:for="{{buttonList}}" wx:for-item="item" data-item="{{item}}" wx:key="index">
         <van-button size="large" plain="{{item.plain}}" data-item="{{item}}" color="{{item.color?item.color:'#3E69F6'}}" custom-style="height:88rpx;border-radius:15rpx ;" bind:click="submit" type="info">{{item.title}}
         </van-button>
       </view>

+ 38 - 5
package-basic-data/pages/customer-list/detail/detail.js

@@ -35,14 +35,38 @@ Page({
     activeCard: null,
     // 主键Id
     primaryKey: 'cusId',
-    gradeCode: app.globalData.company.gradeCode,
+  },
+  /**
+   * @desc : 展开明细
+   * @date : 2024/5/24 15:49
+   * @author : 周兴
+   */
+  handleExpandItem(e){
+    let type = e.currentTarget.dataset.type
+    let index = e.currentTarget.dataset.index
+    console.log('type',type);
+    // 销售退货
+    if(type == 'order-return'){
+      let orderOutReturnList = this.data.orderOutReturnList;
+      orderOutReturnList[index].showReturnDetailFlag = !orderOutReturnList[index].showReturnDetailFlag
+      this.setData({
+        orderOutReturnList:orderOutReturnList
+      })
+    } else if(type == 'order-out'){
+      // 销售出库
+      let orderOutList = this.data.orderOutList;
+      orderOutList[index].showDetailFlag = !orderOutList[index].showDetailFlag
+      this.setData({
+        orderOutList:orderOutList
+      })
+    }
   },
   /**
    * @desc : 收款单保存后重新刷新数据
    * @date : 2024/5/24 15:49
    * @author : 周兴
    */
-  getData(){
+  getData() {
     this._detail(this.data.item.cusId);
   },
   /**
@@ -244,8 +268,18 @@ Page({
 
                 it['imagesUrl'] = it.skuImages.value.length > 0 ? it.skuImages.value[0].url : null
               }
+              // 根据状态显示不同的字段
+              if (it.outStatus == Constants.outStatus.outBounding) {
+                it.outAmt = it.outingAmt
+                it.outQty = it.outingQty
+              }
             })
           }
+          // 根据状态显示不同的字段
+          if (item.outStatus == Constants.outStatus.outBounding) {
+            item.outAmt = item.outingAmt
+            item.outQty = item.outingQty
+          }
         })
         let list = res.data.data.list
         if (orderType == Constants.outType.sale) {
@@ -257,7 +291,6 @@ Page({
             orderOutReturnList: list
           })
         }
-
       }
     })
   },
@@ -303,11 +336,11 @@ Page({
       events: {
         // 保存成功后刷新页面
         refresh: function (data) {
-          console.log('dfdfd',data);
+          console.log('dfdfd', data);
         }
       },
       success: function (res) {
-        res.eventChannel.emit('params', { id: that.data.item.cusId, item: that.data.item, formType: Constants.formMode.add, formMode:  Constants.formMode.add });
+        res.eventChannel.emit('params', { id: that.data.item.cusId, item: that.data.item, formType: Constants.formMode.add, formMode: Constants.formMode.add });
       }
     })
   },

+ 62 - 212
package-basic-data/pages/customer-list/detail/detail.wxml

@@ -492,125 +492,47 @@
                 </van-grid>
 
                 <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
-                <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
-                  <van-collapse-item name="{{index+1}}" value="展开">
-                    <view slot="title">
-                      <view style="display: flex;">
-                        <view>商品明细</view>
-                        <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
-                      </view>
-                    </view>
-
-                    <view wx:for="{{item.goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
-
-                      <van-card data-item="{{item}}" data-index="{{index}}">
-
-                        <view slot="thumb">
-                          <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
-                        </view>
-                        <view slot="title" style="display: flex;">
-
-                          <view style="display: flex;">
-
-                            <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
-                          </view>
+                <view style="display: flex; justify-content: space-between;margin: 10rpx 25rpx;font-size: 12px;" catchtap="handleExpandItem" data-type="order-out" data-item="{{item}}" data-index="{{index}}">
+                  <view>商品明细</view>
+                  <view style="display: flex; align-items: center;">{{!item.showDetailFlag?'展开':'收缩'}}
+                    <van-icon style="margin-left: 8rpx;" name="{{!item.showDetailFlag?'arrow-down':'arrow-up'}}" />
+                  </view>
+                </view>
 
+                <view wx:if="{{item.showDetailFlag}}" wx:for="{{item.goodsList}}" data-item="{{cItem}}" wx:for-item="cItem" wx:key="childindex" wx:for-index="childindex" border="{{ true }}">
 
-                        </view>
+                  <van-card data-item="{{cItem}}" data-index="{{childindex}}">
 
-                        <view slot="desc">
-                          <view style="display:flex;width: 100%;">
-                            <view style="width: 80%;">
-                              <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
+                    <view slot="thumb">
+                      <van-image radius="5px" width="80" height="80" src="{{cItem.imagesUrl }}" />
+                    </view>
+                    <view slot="title" style="display: flex;">
 
-                            </view>
+                      <view style="display: flex;">
 
-                          </view>
-                        </view>
-                        <view slot="price">
-                          <view style="display: flex;width: 100%;flex-direction: row;">
-                            <view style="color: red;font-size: 4vw;width: 100%;">
-                              <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.priceOut}}"></dk-cell>
-                            </view>
-                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.outQty}}</span></view>
-                          </view>
+                        <dk-title titleTag="{{cItem.brandName}}" title="{{cItem.skuModel}}"></dk-title>
+                      </view>
+                    </view>
+                    <view slot="desc">
+                      <view style="display:flex;width: 100%;">
+                        <view style="width: 80%;">
+                          <dk-text fontWeight="nomal" value="{{cItem.skuName}}"></dk-text>
                         </view>
-
-
-
-
-                        <view slot="footer">
-                          <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
-                            <view style="width: 100%;display: flex;">
-                              <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
-                                明细
-                              </view>
-                              <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
-                                {{item.packageDetailsFlag ? '收起' :'展开'}}
-                                <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
-                              </view>
-                            </view>
-
-                            <view wx:if="{{item.packageDetailsFlag}}">
-
-                              <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
-                                <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
-                                  <view style="display: flex;">
-                                    <view>
-                                      <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
-                                    </view>
-                                    <view style="margin-left:5px;width: 66vw;">
-
-                                      <view style="display: flex;">
-
-
-                                        <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
-                                      </view>
-
-                                      <view style="display: flex;font-size:3.2vw; ">
-                                        <text decode>{{item2.skuName}}</text>
-                                      </view>
-
-                                      <view style="display: flex;font-size:3.2vw; ">
-                                        <text decode>{{' '}}</text>
-                                      </view>
-                                      <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
-                                        <view style="display: flex;width: 100%;flex-direction: row;">
-                                          <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
-                                            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
-                                          </view>
-                                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
-                                        </view>
-                                      </view>
-                                    </view>
-                                  </view>
-                                </view>
-                              </view>
-
-                            </view>
-                          </view>
-                          <view class="hr"></view>
-                          <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
-                            <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
-                              备注:<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
-                            </view>
-
-                          </view>
-
+                      </view>
+                    </view>
+                    <view slot="price">
+                      <view style="display: flex;width: 100%;flex-direction: row;">
+                        <view style="color: red;font-size: 4vw;width: 100%;">
+                          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.priceOut}}"></dk-cell>
                         </view>
-
-                      </van-card>
-
-                      <van-divider />
+                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.outQty}}</span></view>
+                      </view>
                     </view>
-
-                  </van-collapse-item>
-                </van-collapse>
-
+                  </van-card>
+                  <van-divider />
+                </view>
               </view>
             </view>
-
-
           </view>
 
           <van-empty wx:if="{{orderOutList.length==0}}" description="暂无数据" />
@@ -666,121 +588,49 @@
                 </van-grid>
 
                 <view style="height: 1px;background:#E9F0FE;width:90%;margin-left:5vw;" />
-                <van-collapse value="{{ activeNames_goods }}" bind:change="onChange_goods">
-                  <van-collapse-item name="{{index+1}}" value="展开">
-                    <view slot="title">
-                      <view style="display: flex;">
-                        <view>商品明细</view>
-                        <view style="color:#b9b9b9;font-size:10px;flex:1;text-align-last: right;"></view>
-                      </view>
-                    </view>
-
-                    <view wx:for="{{item.goodsList}}" data-item="{{item}}" wx:for-item="item" wx:key="index" wx:for-index="childindex" border="{{ true }}">
-
-                      <van-card data-item="{{item}}" data-index="{{index}}">
-
-                        <view slot="thumb">
-                          <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
-                        </view>
-                        <view slot="title" style="display: flex;">
+                <view style="display: flex; justify-content: space-between;margin: 10rpx 25rpx;font-size: 12px;" catchtap="handleExpandItem" data-type="order-return" data-item="{{item}}" data-index="{{index}}">
+                  <view>商品明细</view>
+                  <view style="display: flex; align-items: center;">{{!item.showReturnDetailFlag?'展开':'收缩'}}
+                    <van-icon style="margin-left: 8rpx;" name="{{!item.showReturnDetailFlag?'arrow-down':'arrow-up'}}" />
+                  </view>
+                </view>
+                <view wx:if="{{item.showReturnDetailFlag}}" wx:for="{{item.goodsList}}" data-item="{{cItem}}" wx:for-item="cItem" wx:key="index" wx:for-index="childindex" border="{{ true }}">
 
-                          <view style="display: flex;">
+                  <van-card data-item="{{cItem}}" data-index="{{index}}">
 
-                            <dk-title titleTag="{{item.brandName}}" title="{{item.skuModel}}"></dk-title>
-                          </view>
+                    <view slot="thumb">
+                      <van-image radius="5px" width="80" height="80" src="{{cItem.imagesUrl }}" />
+                    </view>
+                    <view slot="title" style="display: flex;">
 
+                      <view style="display: flex;">
 
-                        </view>
+                        <dk-title titleTag="{{cItem.brandName}}" title="{{cItem.skuModel}}"></dk-title>
+                      </view>
 
-                        <view slot="desc">
-                          <view style="display:flex;width: 100%;">
-                            <view style="width: 80%;">
-                              <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
+                    </view>
 
-                            </view>
+                    <view slot="desc">
+                      <view style="display:flex;width: 100%;">
+                        <view style="width: 80%;">
+                          <dk-text fontWeight="nomal" value="{{cItem.skuName}}"></dk-text>
 
-                          </view>
-                        </view>
-                        <view slot="price">
-                          <view style="display: flex;width: 100%;flex-direction: row;">
-                            <view style="color: red;font-size: 4vw;width: 100%;">
-                              <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{item.priceOut}}"></dk-cell>
-                            </view>
-                            <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item.outQty}}</span></view>
-                          </view>
                         </view>
 
-
-
-
-                        <view slot="footer">
-                          <view style="margin-top: 15rpx;" wx:if="{{item.bomItems.length > 0}}">
-                            <view style="width: 100%;display: flex;">
-                              <view style="font-size: 14px;width: 50%;text-align: left;color: #95A8CB;">
-                                明细
-                              </view>
-                              <view style="font-size: 14px;width: 50%;text-align: right;color: #95A8CB;" data-item="{{item}}" data-big="{{index}}" data-index="{{childindex}}" catchtap="onPriceOpenGoodsList">
-                                {{item.packageDetailsFlag ? '收起' :'展开'}}
-                                <van-icon name="{{item.packageDetailsFlag ? 'arrow-up' :'arrow-down' }}" />
-                              </view>
-                            </view>
-
-                            <view wx:if="{{item.packageDetailsFlag}}">
-
-                              <view wx:for="{{item.bomItems}}" data-item="{{item2}}" wx:for-item="item2" wx:key="index2">
-                                <view style="text-align: left;width: 100%; padding-left: 15rpx;padding-top:15rpx;">
-                                  <view style="display: flex;">
-                                    <view>
-                                      <van-image radius="5px" width="65" height="65" src="{{item2.iconThumPath }}" />
-                                    </view>
-                                    <view style="margin-left:5px;width: 66vw;">
-
-                                      <view style="display: flex;">
-
-
-                                        <dk-title titleTag="{{item2.titleTag}}" title="{{item2.skuModel}}"></dk-title>
-                                      </view>
-
-                                      <view style="display: flex;font-size:3.2vw; ">
-                                        <text decode>{{item2.skuName}}</text>
-                                      </view>
-
-                                      <view style="display: flex;font-size:3.2vw; ">
-                                        <text decode>{{' '}}</text>
-                                      </view>
-                                      <view slot="footer" style="width:100%;justify-content: flex-end;margin-top:20rpx;text-align:right;align-self: flex-end;">
-                                        <view style="display: flex;width: 100%;flex-direction: row;">
-                                          <view style="color: red;font-size: 4vw;width: 100%;text-align: left;">
-                                            <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{numberFormat.toThousandCents(item2.priceSale)}}"></dk-cell>
-                                          </view>
-                                          <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{item2.itemQuantity }}</span></view>
-                                        </view>
-                                      </view>
-                                    </view>
-                                  </view>
-                                </view>
-                              </view>
-
-                            </view>
-                          </view>
-                          <view class="hr"></view>
-                          <view style="display: flex;width: 100%;margin-top:5px;" data-index="{{index}}">
-                            <view style="width: 70%;text-align: left;font-size: 3.5vw;color: #95A8CB;">
-                              备注:<span style="line-height:56rpx;">{{item.remarks ? item.remarks : ''}}</span>
-                            </view>
-
-                          </view>
-
+                      </view>
+                    </view>
+                    <view slot="price">
+                      <view style="display: flex;width: 100%;flex-direction: row;">
+                        <view style="color: red;font-size: 4vw;width: 100%;">
+                          <dk-cell center="center" height="46rpx" spaceWidth="1rpx" left="0" fontSize="16" contentColor="#FF7B1A" fontWeight="600" title="" content="{{cItem.priceOut}}"></dk-cell>
                         </view>
-
-                      </van-card>
-
-                      <van-divider />
+                        <view style="width: 100%;text-align: right;font-size: 3.5vw;color: #95A8CB;">x <span style="line-height:56rpx;">{{cItem.outQty}}</span></view>
+                      </view>
                     </view>
+                  </van-card>
 
-                  </van-collapse-item>
-                </van-collapse>
-
+                  <van-divider />
+                </view>
               </view>
             </view>
 

+ 15 - 19
package-sales/pages/order-return/add/add.js

@@ -149,14 +149,10 @@ Page({
         type: 'checkbox'
       },
       {
-        code: 'need',
-        title: mixins.$t("saleCollection"),
-        type: 'str'
-      },
-      {
         code: 'receivable',
         content: 0,
-        type: 'number'
+        type: 'number',
+        title: mixins.$t("saleCollection")
       }
     ],
     popContent: [{
@@ -256,7 +252,7 @@ Page({
         }
       })
       //组件显示 需收款
-      contentSaveList[2]['content'] = Number(formData.sumAmount)
+      contentSaveList[1]['content'] = Number(formData.sumAmount)
       this.setData({
         formData: JSON.stringify(formData),
         contentSaveList: contentSaveList
@@ -804,15 +800,12 @@ Page({
         code: 'save',
         title: mixins.$t("outProcessing")
       }]
-      contentSaveList = [{
-          code: 'need',
-          title: mixins.$t("saleCollection"),
-          type: 'str'
-        },
+      contentSaveList = [
         {
           code: 'receivable',
           content: 0,
-          type: 'number'
+          type: 'number',
+          title: mixins.$t("saleCollection"),
         }
       ]
       popContent = [{
@@ -899,15 +892,18 @@ Page({
     formData.outingAmt = sumAmount
     let cardList = this.data.cardList
     let contentSaveList = this.data.contentSaveList
-    cardList[2].sumAmount = formData.sumAmount
-    cardList[2].sumStandard = formData.sumStandard
-    cardList[2].sumQuantity = formData.sumQuantity
-    cardList[2].saleDiscount = formData.saleDiscount
+    let filters = cardList.filter(it=>it.name=='items');
+    if(filters && filters.length > 0){
+      filters[0].sumAmount = formData.sumAmount
+      filters[0].sumStandard = formData.sumStandard
+      filters[0].sumQuantity = formData.sumQuantity
+      filters[0].saleDiscount = formData.saleDiscount
+    }
     //详情 办理
     if (this.data.formMode == Constants.formMode.detail) {
-      contentSaveList[1].content = formData.sumAmount
+      contentSaveList[0].content = formData.sumAmount
     } else {
-      contentSaveList[2].content = formData.sumAmount
+      contentSaveList[1].content = formData.sumAmount
     }
     this.setData({
       cardList: cardList,

+ 1 - 1
package-sales/pages/order-return/add/add.wxml

@@ -33,7 +33,7 @@ titpsLabel="titpsLabel"
 
 
 <!--  保存 -->
-<dk-save-button id="saveButton" model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="saveButton" bind:change="saveChange"></dk-save-button>
+<dk-save-button id="saveButton" model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="saveButton" bind:change="saveChange"></dk-save-button>
 
 <!--  新手引导 -->
 <dk-guide step="{{step}}"></dk-guide>