Ver código fonte

Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

wangyingjie 2 anos atrás
pai
commit
15f042460d

+ 1 - 1
api/pages/ivt/inbound.js

@@ -20,7 +20,7 @@ module.exports = {
   routeUrl: {
     inbound: {
       addReturn:{
-        key:'addReturn',url:'/package-purchase/pages/purchase-return/add/add'
+        key:'addReturn',url:'/package-purchase/pages/purchase-return/add/add',formMode:'add'
       },
       detailInProcessing: { key: 'detailInProcessing', url: '/package-inventory/pages/warehousing-processing/detail/detail' , },
       detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail'  },

+ 2 - 1
api/pages/ivt/intoReturn.js

@@ -11,7 +11,8 @@ module.exports = {
   intoReturnService: {
       // 前缀
       prefix: 'mdm-server/ivt/intoReturn/',
-      cancel:'cancel'//作废
+      cancel:'cancel',//作废
+      selectByUpdate:'select_by_update'//编辑查询
   },
 
   routeUrl: {

+ 3 - 1
api/pages/ivt/intoReturnItem.js

@@ -15,7 +15,9 @@ module.exports = {
 
   routeUrl: {
     intoReturnItem: {
- 
+      edit:{
+        key:'edit',url:'/package-purchase/pages/purchase-return/add/add'
+      },
     }
   }
 };

+ 0 - 1
app.json

@@ -307,7 +307,6 @@
         "dk-number-phone-input": "components/dkbase/dk-number-phone-input/dk-number-phone-input",
         "dk-panel": "components/dkbase/dk-panel/dk-panel",
         "dk-progress": "components/dkbase/dk-progress/dk-progress",
-        "dk-save-bottom": "components/dkbase/dk-save-bottom/dk-save-bottom",
         "dk-save-button": "components/dkbase/dk-save-button/dk-save-button",
         "dk-search": "components/dkbase/dk-search/dk-search",
         "dk-side-pull-menu": "components/dkbase/dk-side-pull-menu/dk-side-pull-menu",

+ 4 - 2
components/dkbase/dk-form-bill/dk-form-bill.js

@@ -246,7 +246,8 @@ Component({
             // 商品明细
             if (it.displayNum && items && items.length > it.displayNum) {
               for (let i = it.displayNum; i < items.length; i++) {
-                // 如果折叠就把超过的部分隐藏
+                // 如果折叠就把超过的部分隐藏//todo
+                // console.log('it',it.showMore,items[i]);
                 if (it.showMore) {
                   items[i].show = true;
                 } else {
@@ -258,7 +259,8 @@ Component({
         })
         this.setData({
           contentObj: contentObj,
-          form: form
+          form: form,
+          value: JSON.stringify(form)
         })
       }
     },

+ 0 - 145
components/dkbase/dk-save-bottom/dk-save-bottom.js

@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright(c) 2022 dongke All rights reserved. / Confidential
- * 类的信息:
- *		1.程序名称:
- * 编辑履历:
- *		作者				日期					版本				修改内容
- *		于继渤		  	2022-5-05			1.00		 底部工具栏-保存
-  *		作者				日期					版本			修改内容
- *		姜永辉     2022-05-05	  1.01		   	  底部工具栏-保存
- *******************************************************************************/
-
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    item: { //参数
-      type: Object,
-      default: {
-        label_one: '合计金额',
-        label_two: '定金金额',
-        label_three: '定金比率',
-        submit: '保存'
-      }
-    },
-    checked: {  // 自动入库办理
-      type: Boolean,
-      value: true,
-    },
-    showcheckbox: {  // 是否显示出库办理
-      type: Boolean,
-      value: true,
-    },
-    rightButtonFlag:{
-        type: Boolean,
-        value: true,
-    },
-    leftButtonFlag:{
-        type: Boolean,
-        value: true,
-    },
-    submitFlag: {  //按钮显示隐藏
-      type: Boolean,
-      value: true,
-    },
-    allCleanFlag: {//按钮显示隐藏
-      type: Boolean,
-      value: true,
-    },
-    buyingSignalFlag: {
-      type: Boolean,
-      value: false,
-    },
-    purchasePriceFlag:{ //敏感信息隐藏
-      type: Boolean,
-      value: true,
-    },
-    bottomClass:{ //敏感信息隐藏
-      type: Boolean,
-      value: false,
-    },
-    totallength: { //合计数量
-      type: String,
-      default: '0.00'
-    },
-    selectlength: { // 已选 或  共件
-      type: String,
-      default: '0.00'
-    },
-    selectTotallength: { //   共件
-      type: String,
-      default: '0.00'
-    },
-    flagTypeName: { //属性
-      type: String,
-      default: 'order-save'
-    },
-    disabledFlag:{
-      type: Boolean,
-      value: false,
-    },
-    allCleanName: { //左侧按钮文本属性
-      type: String,
-      default: ''
-    },
-    allSubmitName: { //右侧侧按钮文本属性
-      type: String,
-      default: ''
-    },
-    
-  },
-
-  options: {
-    multipleSlots: true,//插槽
-
-    styleIsolation: 'shared',
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    allCheck: true,
-    checked: true,
-  },
-
-  /**
-    * 组件生命周期
-    */
-  lifetimes: {
-    attached: function () {
-    },
-    detached: function () {
-      // 在组件实例被从页面节点树移除时执行
-    },
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    onCheckboxChange(event) {
-      this.setData({
-        checked: event.detail
-      });
-      this.triggerEvent('onCheckboxChange', {
-        checked: event.detail
-      })
-    },
-    /**
-     * 确定
-     */
-    submit() {
-      this.triggerEvent('submit')
-    },
-    
-    /**
-     * 批量清理
-     */
-    allClean() {
-      this.triggerEvent('allClean')
-    },
-
-  }
-})

+ 0 - 4
components/dkbase/dk-save-bottom/dk-save-bottom.json

@@ -1,4 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {}
-}

+ 0 - 1324
components/dkbase/dk-save-bottom/dk-save-bottom.wxml

@@ -1,1324 +0,0 @@
-<!--  底部工具栏-保存 -->
-<view class="{{flagTypeName=='order-choose-goods'?'bottom-class-2':'bottom-class-1'}}">
-  <!-- 订单开单保存 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='order-save'}}">
-
-    <view style="width:50%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        需收款:
-        <!-- <view style="color: #CAA977;font-size: 32rpx;line-height: 40rpx;display: flex;align-items: center;">
-          <view style="font-size: 22rpx;line-height: 25rpx;width: 25rpx;">¥</view>{{totallength}}
-        </view> -->
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">保存
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <!-- 审批拒绝 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='order-save-apvResul'}}">
-
-    <view style="width:50%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        需收款:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button wx:if="{{allCleanFlag}}" round size="large" color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">收款
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">保存
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view class="save-bottom" wx:if="{{flagTypeName ==='order-save-amount'}}" style="display: flex; padding-top: 6vw;">
-    <view style="width:50%;height:55rpx;padding-top: 5px;padding-left: 22px;">
-      <view style="font-size:4vw;height:16px;line-height:16px;" class="red-text">
-        <view style="margin-bottom: 1vw;">需收款:</view>
-        <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-      </view>
-
-    </view>
-
-
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;">
-      <van-button size="large" round disabled="{{disabledFlag}}" loading="{{disabledFlag}}" color="#CAA977" custom-style="height:88rpx;" bind:click="submit" type="info">收款
-      </van-button>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='order-save-offer'}}">
-
-    <view style="width:50%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        需收款:
-        <!-- <view style="color: #CAA977;font-size: 32rpx;line-height: 40rpx;display: flex;align-items: center;">
-          <view style="font-size: 22rpx;line-height: 25rpx;width: 25rpx;">¥</view>{{totallength}}
-        </view> -->
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" round size="large" color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">成交
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">报价
-        </van-button>
-      </view>
-
-
-
-    </view>
-
-
-  </view>
-
-
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='purchase-orders-offer'}}">
-
-    <view style="width:50%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-      <view wx:if="{{!rightButtonFlag}}" style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="border-radius: 15rpx;width: 50%; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" plain round size="large" color="" custom-style="height:88rpx;background:#ffffff;border-radius: 15rpx;color:#1B365D;border: solid 2rpx #1B365D;font-size: 16px; font-weight: bold;" bind:click="submit" type="info">暂存
-        </van-button>
-      </view>
-      <view wx:if="{{leftButtonFlag && rightButtonFlag}}" style="width: 10%;"></view>
-
-      <view wx:if="{{rightButtonFlag}}" style="border-radius: 15rpx;width: 50%; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button wx:if="{{leftButtonFlag}}" disabled="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">提交
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='order-save-deal'}}">
-    <view style="width:45%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        需收款:
-        <view style="color: #CAA977;font-size: 32rpx;line-height: 40rpx;display: flex;align-items: center;">
-          <dk-cell style="margin-top: -2vw;" left="32px" center="center" fontSize="16" contentFontSize="16" contentColor="#CAA977" spaceWidth="0" contentFontWeight="bold" content="{{totallength}}"></dk-cell>
-        </view>
-
-      </view>
-
-    </view>
-
-
-    <!-- 保存确定区域 -->
-    <view style="width: 55%;display: flex;">
-
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button size="large" round color="#506483" plain custom-style="height:88rpx;" wx:if="{{allCleanFlag}}" bind:click="allClean" type="info" disabled="{{disabledFlag}}" loading="{{disabledFlag}}">收款成交
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button round size="large" color="#CAA977" custom-style="height:88rpx;" loading="{{disabledFlag}}" disabled="{{disabledFlag}}" bind:click="submit" type="info">未收款成交
-        </van-button>
-      </view>
-
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='order-save-deal-return'}}">
-    <view style="width:45%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;" wx:if="{{purchasePriceFlag}}">
-        货物金额:
-        <view style="color: #CAA977;font-size: 32rpx;line-height: 40rpx;display: flex;align-items: center;">
-          <dk-cell style="margin-top: -2vw;" left="32px" center="center" fontSize="16" contentFontSize="16" contentColor="#CAA977" spaceWidth="0" contentFontWeight="bold" content="{{totallength}}"></dk-cell>
-        </view>
-
-      </view>
-
-    </view>
-
-
-    <!-- 保存确定区域 -->
-    <view style="width: 55%;display: flex;">
-
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 392rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;" loading="{{disabledFlag}}" disabled="{{disabledFlag}}" bind:click="submit" type="info">确定
-        </van-button>
-      </view>
-
-    </view>
-  </view>
-
-  <!-- 成交详情 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='buying-signal'}}">
-    <view style="width:50%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        需收款:
-        <view style="color: #CAA977;font-size: 32rpx;line-height: 40rpx;display: flex;align-items: center;">
-          <view style="font-size: 22rpx;line-height: 25rpx;width: 25rpx;">¥</view>{{totallength}}
-        </view>
-
-      </view>
-
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-
-
-      <view style="border-radius: 15rpx;width: {{submitFlag ? '196rpx' :'392rpx'}}; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <!-- <van-button plain round size="large" color="#506483" custom-style="height:88rpx;" bind:click="submit" type="default">分享
-        </van-button> -->
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view wx:if="{{submitFlag}}" style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button round size="large" color="#CAA977" custom-style="height:88rpx;" disabled="{{!allCleanFlag}}" bind:click="allClean" type="info">收款
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='buying-signal-copy'}}">
-    <view style="width:50%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        需收款:
-        <view style="color: #CAA977;font-size: 32rpx;line-height: 40rpx;display: flex;align-items: center;">
-          <view style="font-size: 22rpx;line-height: 25rpx;width: 25rpx;">¥</view>{{totallength}}
-        </view>
-
-      </view>
-
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;text-align: right;">
-
-
-      <view style="width: 100rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button plain round size="large" color="#506483" custom-style="height:88rpx;" disabled="{{!allCleanFlag}}" bind:click="submit" type="default">分享
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-  <!-- 订单开单选商品 -->
-  <view class="order-choose-goods-class" wx:if="{{flagTypeName ==='order-choose-goods'}}">
-    <view class="order-choose-goods-total-class">
-      <!-- 合计金额:¥{{totallength}} -->
-      <dk-cell wx:if="{{purchasePriceFlag}}" height="46rpx" spaceWidth="1rpx" left="0" fontSize="15" contentColor="#CAA977" fontWeight="600" title="合计金额:" content="{{totallength}}"></dk-cell>
-    </view>
-    <view style="{{!purchasePriceFlag ? 'padding-left: 40rpx;padding-top:20rpx' : 'padding-left: 40rpx;'}}">
-      <dk-text fontWeight="" fontSize="11px" color="#fff" value="已选:{{selectlength}} 品类  数量:{{selectTotallength}} 件"></dk-text>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <van-button wx:if="{{submitFlag}}" custom-class="order-choose-goods-button-class" bind:click="submit" type="default">结算
-    </van-button>
-  </view>
-
-  <view class="save-bottom" wx:if="{{flagTypeName ==='order-choose-goods-repacement'}}">
-    <view style="width:65%;height:85rpx;padding:15rpx 0 15rpx 0">
-
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view class="save-bottom-button">
-      <van-button custom-style="height:60rpx;width:75%;word-break:keep-all" bind:click="submit" type="info">确定
-      </van-button>
-    </view>
-  </view>
-
-  <view wx:if="{{flagTypeName ==='supplier-list'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;justify-content: center;align-items: center;">
-    <view style="width:48%;height:85rpx;">
-      <view style="display: flex;justify-content: left;align-items: center;">
-        <van-checkbox value="{{checked}}" data-index="{{index}}" checked-color="#1989FA" bind:change="onCheckboxChange" />
-        <view style="color: #1B365D;font-size: 13px;margin-left: 20rpx;">启用</view>
-      </view>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:48%;height:85rpx;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-      </van-button>
-    </view>
-  </view>
-
-  <view wx:if="{{flagTypeName ==='select-product-attribute-suppliers'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:48%">
-      <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">新建
-      </van-button>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:48%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
-      </van-button>
-    </view>
-  </view>
-
-
-  <!-- 订单开单列表-->
-  <view wx:if="{{flagTypeName ==='order-add'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-    <view style="width:  calc(100% - 239rpx);height:85rpx;">
-      <view>
-        <dk-cell height="60rpx" left="2rpx" fontSize="16" fontWeight="600" contentFontWeight="600" contentColor="#CAA977" titleColor="#CAA977;" contentFontWeight="bold" title="合计金额:" content="{{totallength}}"></dk-cell>
-      </view>
-      <view style="line-height: 40rpx;font-size: 23rpx;color:#95A8CB;height: 40rpx; ">
-        <text decode>共:{{selectlength}}&nbsp;单&emsp;数量:{{selectTotallength}}&nbsp;</text>
-      </view>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;" wx:if="{{submitFlag}}">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">新建
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 采购入库列表 2024年3月8日-->
-  <view wx:if="{{flagTypeName ==='purchase-receipt'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-<view style="width:  calc(100% - 239rpx);height:85rpx;">
-  <view>
-    <dk-cell height="60rpx" left="2rpx" fontSize="16" fontWeight="600" contentFontWeight="600" contentColor="#CAA977" titleColor="#CAA977;" contentFontWeight="bold" title="合计金额:" content="{{totallength}}"></dk-cell>
-  </view>
-  <view style="line-height: 40rpx;font-size: 23rpx;color:#95A8CB;height: 40rpx; ">
-    <text decode>共:{{selectlength}}&nbsp;单&emsp;数量:{{selectTotallength}}&nbsp;</text>
-  </view>
-</view>
-
-<!-- 保存确定区域 -->
-<view style="width:239rpx;" wx:if="{{submitFlag}}">
-  <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">新建
-  </van-button>
-</view>
-</view>
-
-
-
-  <view wx:if="{{flagTypeName ==='purchase-return-add'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-    <view style="width:100%;height:85rpx;padding-left: 20rpx;padding-right: 20rpx;">
-      <view>
-        <dk-cell height="60rpx" left="2rpx" fontSize="16" fontWeight="600" contentFontWeight="600" contentColor="#CAA977" titleColor="#CAA977;" contentFontWeight="bold" title="合计金额:" content="{{totallength}}"></dk-cell>
-      </view>
-      <view style="line-height: 40rpx;font-size: 23rpx;color:#95A8CB;height: 40rpx; ">
-        <text decode>共:{{selectlength}}&nbsp;单&emsp;</text>
-      </view>
-    </view>
-
-
-  </view>
-
-  <!-- 购物车开单保存 -->
-  <view class="save-bottom" wx:if="{{flagTypeName ==='shopping-save'}}">
-    <view style="width:50%;height:85rpx;padding:15rpx 0 15rpx 0">
-      <view style="font-size:4vw;height:30rpx;line-height:30rpx;">合计金额:<span class="red-text">¥{{totallength}}</span>
-      </view>
-      <view style="width:100%;height:5rpx;background:#fff;"></view>
-      <view style="font-size:3.2vw;color:#030303;height:50rpx;line-height:40rpx;">
-        <text decode>已选:{{selectlength}}&nbsp;品类&emsp;共:{{selectTotallength}}&nbsp;件</text>
-      </view>
-
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view class="save-bottom-button" style="width: 45%;">
-      <view style="display:flex;">
-        <van-button custom-style="height:60rpx;word-break:keep-all" bind:click="allClean" type="default">批量清理
-        </van-button>
-        <view style="width: 3px;"></view>
-        <van-button custom-style="height:60rpx;word-break:keep-all" bind:click="submit" type="info">开单
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-
-  <view class="save-bottom" wx:if="{{flagTypeName ==='pending-save'}}">
-    <view style="width:50%;height:85rpx;padding:15rpx 0 15rpx 0"></view>
-    <view class="save-bottom-button" style="width: 45%;">
-      <view style="display:flex;text-align: right;padding-left: 90rpx;">
-        <van-button custom-style="height:60rpx;word-break:keep-all" bind:click="allClean" type="default">拒绝
-        </van-button>
-        <view style="width: 3px;"></view>
-        <van-button custom-style="height:60rpx;word-break:keep-all" bind:click="submit" type="info">同意
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-
-
-  <view class="save-bottom" style="width: 100%;align-items: center;" wx:if="{{flagTypeName ==='receive-customers'}}">
-    <view style="height:85rpx;margin-top: 45rpx;color:#1B365D;font-style: normal;font-weight: 400;font-size: 15px;line-height: 40px;">
-      共 {{totallength}} 条接待信息
-      <!-- <view class="save-bottom" wx:if="{{flagTypeName ==='receive-customers'}}">
-    <view style="width:65%;height:85rpx;padding:15rpx 0 15rpx 0; margin-top: 15rpx;">
-      共 {{totallength}} 条数据 -->
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view class="save-bottom-button" style="width: 358rpx;margin-top: 45rpx;">
-      <van-button custom-style="width:358rpx;height:88rpx;font-size:16px;border-radius: 15rpx;" color="#1B365D" block bind:click="submit" type="info">新建
-      </van-button>
-    </view>
-  </view>
-
-  <!--客户列表一览-->
-  <view class="save-bottom" wx:if="{{flagTypeName ==='customers'}}">
-    <!-- <view style="width:65%;height:85rpx;padding:15rpx 0 15rpx 0; margin-top: 15rpx;">
-      共 {{totallength}}位客户
-    </view> -->
-
-    <!-- 保存确定区域 -->
-    <!-- <view class="save-bottom-button">
-      <van-button custom-style="height:60rpx;width:75%;word-break:keep-all"   bind:click="submit" type="info">新建
-      </van-button>
-    </view> -->
-
-    <view class="customer-save-bottom">
-      <view style="line-height: 88rpx">
-        <dk-text fontSize="15px" fontWeight="nomal" value="{{ '共' + totallength + '位客户'}}"></dk-text>
-      </view>
-      <!-- 保存确定区域 -->
-      <view style="width: 358rpx;" wx:if="{{submitFlag}}">
-        <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">新建
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-
-
-  <view class="save-bottom" style="width: 100%;align-items: center;" wx:if="{{flagTypeName ==='customer-collection'}}">
-    <view style="height:85rpx;margin-top: 45rpx;color:#1B365D;font-style: normal;font-weight: 400;font-size: 15px;line-height: 40px;">
-      共 {{totallength}} 条收款记录
-      <!-- <view class="save-bottom" wx:if="{{flagTypeName ==='receive-customers'}}">
-    <view style="width:65%;height:85rpx;padding:15rpx 0 15rpx 0; margin-top: 15rpx;">
-      共 {{totallength}} 条数据 -->
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view class="save-bottom-button" style="width: 358rpx;margin-top: 45rpx;">
-      <van-button custom-style="width:358rpx;height:88rpx;font-size:16px;border-radius: 15rpx;" color="#1B365D" block bind:click="submit" type="info">新建
-      </van-button>
-    </view>
-  </view>
-
-
-  <!-- 定制设计 -->
-  <view style="padding:35rpx 60rpx 59rpx 72rpx; display: flex;" wx:if="{{flagTypeName ==='order-design'}}">
-
-
-    <!-- 保存确定区域 -->
-    <view style="width: 100%; display: flex;">
-      <view style="border-radius: 15rpx;width: 295rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button plain round size="large" color="#506483" custom-style="height:88rpx;" bind:click="submit" type="default">客户分享
-        </van-button>
-      </view>
-      <view style="width: 28rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 295rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="info">方案确定
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-  <view style="padding:35rpx 60rpx 59rpx 72rpx; display: flex;" wx:if="{{flagTypeName ==='approval-center'}}">
-
-
-    <!-- 保存确定区域 -->
-    <view style="width: 100%; display: flex;">
-      <view style="border-radius: 15rpx;width: 295rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button plain round size="large" color="#506483" custom-style="height:88rpx;" bind:click="submit" type="default">拒绝
-        </van-button>
-      </view>
-      <view style="width: 28rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 295rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="info">同意
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-
-  <!-- 样品检查 -->
-  <view wx:if="{{flagTypeName ==='sample-check-add'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:  calc(100% - 239rpx);height:85rpx;">
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;" wx:if="{{submitFlag}}">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">保存
-      </van-button>
-    </view>
-  </view>
-
-
-  <!-- 采购订单 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='purchase-order'}}">
-    <view style="width:50%;height:88rpx">
-      <view wx:if="{{purchasePriceFlag}}" style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell wx:if="{{purchasePriceFlag}}" contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; text-align: right;justify-content: center;">
-      <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;width:239rpx" bind:click="submit" type="info">关闭
-      </van-button>
-    </view>
-  </view>
-
-
-  <!-- 采购入库详情 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='purchase-detail'}}">
-    <view style="width:50%;height:88rpx">
-      <view   style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell  contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; text-align: right;justify-content: center;">
-      <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;width:239rpx" bind:click="submit" type="info">{{allSubmitName}}
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 选订单 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='purchase-orders-sale-order'}}">
-
-    <view style="width:50%;height:88rpx">
-
-      <view>
-        <van-checkbox size="26rpx" value="{{ checked }}" data-index="{{index}}" data-index_="{{index_}}" bind:change="onListItemChange">
-          <view style="color:#95A8CB;font-size: 26rpx;">全选</view>
-        </van-checkbox>
-      </view>
-      <view style="line-height: 44rpx;font-size: 23rpx;color:#95A8CB;padding-top: 10rpx;">
-        <text decode>共:{{selectlength}}&nbsp;单&emsp;数量:{{selectTotallength}}&nbsp;</text>
-      </view>
-
-    </view>
-
-
-    <view style="width: 50%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">取消
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">确定
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-  <!-- 采购待入库 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='purchase-inventory-offer'}}">
-
-    <view style="width:40%;height:88rpx">
-      <!-- <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell> -->
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">{{allCleanName}}
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">{{allSubmitName}}
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <!-- 已入库单-->
-  <view wx:if="{{flagTypeName ==='received-order'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">入库回退
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">关闭
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <!-- 入库办理列表-->
-  <view wx:if="{{flagTypeName ==='other-warehousing'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-    <view style="width:  calc(100% - 239rpx);height:85rpx;">
-      <view>
-        <dk-cell height="60rpx" left="2rpx" fontSize="16" fontWeight="600" contentFontWeight="600" contentColor="#CAA977" titleColor="#CAA977;" contentFontWeight="bold" title="" content=""></dk-cell>
-      </view>
-      <view style="line-height: 40rpx;font-size: 23rpx;color:#95A8CB;height: 40rpx; ">
-        <text decode>共:{{selectlength}}&nbsp;单&emsp;数量:{{selectTotallength}}&nbsp;</text>
-      </view>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;" wx:if="{{submitFlag}}">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">其他入库
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 新建其他入库-->
-  <view wx:if="{{flagTypeName ==='add-other-warehousing'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width: calc(100% - 65%); height: 85rpx; display: flex; justify-content: center; align-items: center;">
-      <van-checkbox shape="round" value="{{ checked }}" bind:change="onCheckboxChange">自动入库办理</van-checkbox>
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width:65%;justify-content: center;display:flex;">
-      <van-button style="width:40%;margin-right: 5%;background: #ffffff;color:#1B365D;border: solid 2rpx #1B365D;font-size:16px;font-weight: bold;border-radius: 15rpx" plain round size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">取消
-      </van-button>
-      <van-button style="width: 40%;" size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">保存
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 出库办理列表-->
-  <view wx:if="{{flagTypeName ==='other-outbound-list'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-    <view style="width:  calc(100% - 239rpx);height:85rpx;">
-      <view>
-        <dk-cell height="60rpx" left="2rpx" fontSize="16" fontWeight="600" contentFontWeight="600" contentColor="#CAA977" titleColor="#CAA977;" contentFontWeight="bold" title="" content=""></dk-cell>
-      </view>
-      <view style="line-height: 40rpx;font-size: 23rpx;color:#95A8CB;height: 40rpx; ">
-        <text decode>共:{{selectlength}}&nbsp;单&emsp;数量:{{selectTotallength}}&nbsp;</text>
-      </view>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;" wx:if="{{submitFlag}}">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">其他出库
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 新建其他出库-->
-  <view wx:if="{{flagTypeName ==='add-other-outbound'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width: calc(100% - 65%); height: 85rpx; display: flex; justify-content: center; align-items: center;">
-      <van-checkbox shape="round" value="{{ checked }}" bind:change="onCheckboxChange">自动出库办理</van-checkbox>
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width:65%;justify-content: center;display:flex;">
-      <van-button style="width:40%;margin-right: 5%;background:#ffffff;border-radius: 15rpx;color:#1B365D;border: solid 2rpx #1B365D;font-size: 16px; font-weight: bold;" plain round size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">取消
-      </van-button>
-      <van-button style="width: 40%;" size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">保存
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 销售出库-->
-  <view wx:if="{{flagTypeName ==='sales-outbound'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:  calc(100% - 239rpx);height:85rpx;">
-      <view>
-        <dk-cell height="60rpx" left="2rpx" fontSize="16" fontWeight="600" contentFontWeight="600" contentColor="#CAA977" titleColor="#CAA977;" contentFontWeight="bold" title="" content=""></dk-cell>
-      </view>
-      <view style="line-height: 40rpx;font-size: 23rpx;color:#95A8CB;height: 40rpx; ">
-        <text decode>共:{{selectlength}}&nbsp;单&emsp;数量:{{selectTotallength}}&nbsp;</text>
-      </view>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;" wx:if="{{submitFlag}}">
-      <!-- <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">其他出库
-      </van-button> -->
-    </view>
-  </view>
-
-  <!-- 其他出库-出库回退 详情页 -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='outbound-rollback-save'}}">
-
-    <view style="width:40%;height:88rpx">
-      <!-- <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-    合计金额:
-  </view>
-  <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell> -->
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">{{allCleanName}}
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">{{allSubmitName}}
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <!-- 新建销售出库-->
-  <view wx:if="{{flagTypeName ==='add-sales-outbound'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width: calc(100% - 65%); height: 85rpx; display: flex; justify-content: center; align-items: center;">
-      <view>
-        <van-checkbox wx:if="{{showcheckbox}}" shape="round" value="{{ checked }}" bind:change="onCheckboxChange" style="font-size: 12px;">自动出库办理</van-checkbox>
-        <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-          合计金额:
-        </view>
-        <dk-cell contentFontSize="15" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-      </view>
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width:65%;justify-content: center;display:flex;">
-      <van-button style="width:40%;margin-right: 5%;" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">关闭
-      </van-button>
-      <van-button style="width: 40%;" size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">销售出库
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 编辑销售出库-->
-  <view wx:if="{{flagTypeName ==='edit-sales-outbound'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width: calc(100% - 65%); height: 85rpx; display: flex; justify-content: center; align-items: center;">
-      <view>
-        <van-checkbox shape="round" value="{{ checked }}" bind:change="onCheckboxChange" style="font-size: 12px;">自动出库办理</van-checkbox>
-        <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-          合计金额:
-        </view>
-        <dk-cell contentFontSize="15" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-      </view>
-    </view>
-    <!-- 保存确定区域 -->
-    <view style="width:65%;justify-content: center;display:flex;">
-      <van-button style="width:40%;margin-right: 5%;" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">关闭
-      </van-button>
-      <van-button style="width: 40%;" size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">销售出库
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 销售出库 - 已出库 - 详情(出库回退) -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='Sales-outbound-rollback'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" plain round custom-class="save-button-class-canl" size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">{{allCleanName}}
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">保存
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <!-- 销售回库 - 已出库 - 详情(出库回退) -->
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='sales-return-details'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" plain round size="large" color="" custom-style="height:88rpx;" bind:click="allClean" type="default">{{allCleanName}}
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">{{allSubmitName}}
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='purchase-orders-offer'}}">
-
-    <view style="width:50%;height:88rpx">
-      <view wx:if="{{purchasePriceFlag}}" style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell wx:if="{{purchasePriceFlag}}" contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-      <view wx:if="{{!rightButtonFlag}}" style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="border-radius: 15rpx;width: 50%; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" plain round size="large" color="" custom-style="height:88rpx;background:#ffffff;border-radius: 15rpx;color:#1B365D;border: solid 2rpx #1B365D;font-size: 16px; font-weight: bold;" bind:click="submit" type="info">暂存
-        </van-button>
-      </view>
-      <view wx:if="{{leftButtonFlag && rightButtonFlag}}" style="width: 10%;"></view>
-
-      <view wx:if="{{rightButtonFlag}}" style="border-radius: 15rpx;width: 50%; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button wx:if="{{leftButtonFlag}}" disabled="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">提交
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='purchase-orders-edit1'}}">
-
-    <view style="width:50%;height:88rpx">
-      <view wx:if="{{purchasePriceFlag}}" style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell wx:if="{{purchasePriceFlag}}" contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-      <view wx:if="{{!rightButtonFlag}}" style="border-radius: 15rpx;width: 196rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="border-radius: 15rpx;width:50%; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" plain round size="large" color="" custom-style="height:88rpx;background:#ffffff;border-radius: 15rpx;color:#1B365D;border: solid 2rpx #1B365D;font-size: 16px; font-weight: bold;" bind:click="submit" type="info">暂存
-        </van-button>
-      </view>
-      <view wx:if="{{leftButtonFlag && rightButtonFlag}}" style="width: 10%;"></view>
-
-      <view wx:if="{{rightButtonFlag}}" style="border-radius: 15rpx;width: 50%; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button wx:if="{{leftButtonFlag}}" disabled="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">提交
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='receipt-add'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#CAA977" custom-style="height:88rpx;" bind:click="submit" type="info">收款
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='receipt-detail'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        合计金额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">关闭
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='other-expenditure-orders-detail'}}">
-
-    <view style="width:50%;height:88rpx">
-      <view style="display: flex;">
-        <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-          应付合计:
-        </view>
-        <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-
-      </view>
-      <view style="display: flex;">
-        <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-          已付金额:
-        </view>
-        <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-
-      </view>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 50%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">关闭
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='payment-order-detail'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        付款核销总额:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">关闭
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-
-
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='other-expenditure-orders-add'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        应付合计:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" plain round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">付款成交
-        </van-button>
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 226rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#CAA977" custom-style="height:88rpx;" bind:click="submit" type="info">付收款成交
-        </van-button>
-      </view>
-    </view>
-  </view>
-  <view wx:if="{{flagTypeName ==='payment-order'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;justify-content: left;align-items: center;">
-
-    <view style="width:  calc(100% - 239rpx);height:85rpx;">
-      <view>
-        <dk-cell height="60rpx" left="2rpx" fontSize="16" fontWeight="600" contentFontWeight="600" contentColor="#CAA977" titleColor="#CAA977;" contentFontWeight="bold" title="收款总额:" content="{{totallength}}"></dk-cell>
-      </view>
-
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;" wx:if="{{submitFlag}}">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">新建
-      </van-button>
-    </view>
-  </view>
-
-  <view wx:if="{{flagTypeName ==='funds-transfer'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;justify-content: left;align-items: center;">
-
-    <view style="width:  calc(100% - 239rpx);height:85rpx;">
-      <view>
-
-      </view>
-
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width:239rpx;" wx:if="{{submitFlag}}">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">新建
-      </van-button>
-    </view>
-  </view>
-
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='funds-transfer-add'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        转账合计:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">确定
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='funds-transfer-detail'}}">
-
-    <view style="width:40%;height:88rpx">
-      <view style="color: #CAA977;font-size: 30rpx;line-height: 40rpx;">
-        转账合计:
-      </view>
-      <dk-cell contentFontSize="16" height="44rpx" fontWeight="600" left="0rpx" contentColor="#CAA977" title="" content="{{ totallength}}"></dk-cell>
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">关闭
-        </van-button>
-      </view>
-    </view>
-  </view>
-  <view style="padding:52rpx 34rpx 61rpx 43rpx; display: flex;" wx:if="{{flagTypeName ==='accounting-verification'}}">
-
-    <view style="width:40%;height:88rpx">
-
-    </view>
-
-    <!-- 保存确定区域 -->
-    <view style="width: 60%; display: flex;">
-
-      <view style="border-radius: 15rpx;width: 26rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-
-      </view>
-      <view style="width: 19rpx;"></view>
-
-      <view style="border-radius: 15rpx;width: 426rpx; height: 88rpx;font-size: 32rpx;line-height: 40rpx;">
-        <van-button disabled="{{disabledFlag}}" loading="{{disabledFlag}}" round size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="info">新建
-        </van-button>
-      </view>
-    </view>
-  </view>
-
-</view>
-
-
-<!-- 自定义按钮 -->
-<view wx:if="{{bottomClass}}" class="bottom-class-1">
-  <!-- 基础资料 -->
-  <view wx:if="{{flagTypeName ==='basic-data'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-    <!-- <view style="width:48%">
-      <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">排序
-      </van-button>
-    </view>
-    <view style="width: 4%;"></view> -->
-    <view style="width:100%;">
-      <van-button size="large" round color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-      </van-button>
-    </view>
-
-    <!-- <view style="width:100%;">
-      <van-button size="large" round color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-      </van-button>
-    </view> -->
-  </view>
-
-  <view wx:if="{{flagTypeName ==='basic-data-add'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-<view style="width:48%">
-  <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">排序
-  </van-button>
-</view>
-<view style="width: 4%;"></view>
-<view style="width:100%;">
-  <van-button size="large" round color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-  </van-button>
-</view>
-
-<!-- <view style="width:100%;">
-  <van-button size="large" round color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-  </van-button>
-</view> -->
-</view>
-  <view wx:if="{{flagTypeName ==='Product-file'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-
-    <view style="width:100%;">
-      <van-button size="large" round color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-      </van-button>
-    </view>
-
-    <!-- <view style="width:100%;">
-  <van-button size="large" round color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-  </van-button>
-</view> -->
-  </view>
-  <view wx:if="{{flagTypeName ==='basic-data-sort'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-
-    <view style="width:100%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
-      </van-button>
-    </view>
-
-    <!-- <view style="width:100%;">
-  <van-button size="large" round color="#CAA977" custom-style="height:88rpx;" bind:click="allClean" type="default">新建
-  </van-button>
-</view> -->
-  </view>
-
-
-  <!-- 商品档案新建 -->
-  <view wx:if="{{flagTypeName ==='product-file-add'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:48%">
-      <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">关闭
-      </van-button>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:48%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
-      </van-button>
-    </view>
-  </view>
-
-  <!-- 商品档案新建选择页面 -->
-  <view wx:if="{{flagTypeName ==='product-file-add-select'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:48%">
-      <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">关闭
-      </van-button>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:48%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">确定
-      </van-button>
-    </view>
-  </view>
-
-
-
-
-
-
-  <view wx:if="{{flagTypeName ==='purchase-order-detail'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;justify-content: center;align-items: center;">
-    <view style="width:61%">
-      <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="15" contentColor="#CAA977" fontWeight="600" title="合计金额:" content="{{totallength}}"></dk-cell>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:35%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">关闭
-      </van-button>
-    </view>
-  </view>
-
-  <view wx:if="{{flagTypeName ==='purchase-order-detail'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;justify-content: center;align-items: center;">
-    <view style="width:61%">
-      <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="15" contentColor="#CAA977" fontWeight="600" title="合计金额:" content="{{totallength}}"></dk-cell>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:35%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">关闭
-      </van-button>
-    </view>
-  </view>
-
-
-  <view wx:if="{{flagTypeName ==='selecting-customers'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:48%">
-      <!-- <van-button size="large" plain round color="#1B365D" custom-style="height:88rpx;" bind:click="submit" type="default">关闭
-      </van-button> -->
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:48%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">确定
-      </van-button>
-    </view>
-  </view>
-
-  <view wx:if="{{flagTypeName ==='select-functional-permissions'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-
-    <view style="width:100%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
-      </van-button>
-    </view>
-  </view>
-
-  <view wx:if="{{flagTypeName ==='customer-add'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-
-
-    <view style="width:100%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">保存
-      </van-button>
-    </view>
-  </view>
-
-
-  <view wx:if="{{flagTypeName ==='select-source-purchase-order'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:55%;display: flex;justify-content: left;align-items: center;">
-      <van-checkbox size="26rpx" checked-color="#95A8CB" value="{{ checked }}" bind:change="onCheckboxChange">
-        <view style="color:#95A8CB;font-size: 26rpx;">全退</view>
-      </van-checkbox>
-      <view style="margin-left: 50rpx;">
-        <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="15" contentColor="#CAA977" fontWeight="600" title="退货总额:" ></dk-cell>
-        <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="15" contentColor="#CAA977" fontWeight="600"  content="{{totallength}}"></dk-cell>
-      </view>
-
-    </view>
-    <view style="width:10%;"></view>
-    <view style="width:35%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">确定
-      </van-button>
-    </view>
-  </view>
-
-
-
-
-  <view wx:if="{{flagTypeName ==='role-add'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:38%">
-
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:58%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">新建角色
-      </van-button>
-    </view>
-  </view>
-
-  <view wx:if="{{flagTypeName ==='document-list'}}" style="display: flex; padding:35rpx 34rpx 62rpx 34rpx;">
-    <view style="width:48%">
-
-      <view>
-        <van-checkbox size="26rpx" value="{{ checked }}" data-index="{{index}}" data-index_="{{index_}}" bind:change="onListItemChange">
-          <view style="color:#95A8CB;font-size: 26rpx;">全选</view>
-        </van-checkbox>
-      </view>
-      <view style="line-height: 44rpx;font-size: 23rpx;color:#95A8CB;padding-top: 10rpx;">
-        <text decode>共:{{selectlength}}&nbsp;单&emsp;数量:{{selectTotallength}}&nbsp;</text>
-      </view>
-    </view>
-    <view style="width: 4%;"></view>
-    <view style="width:48%;">
-      <van-button size="large" round color="#1B365D" custom-style="height:88rpx;" bind:click="allClean" type="default">确定
-      </van-button>
-    </view>
-  </view>
-</view>

+ 0 - 89
components/dkbase/dk-save-bottom/dk-save-bottom.wxss

@@ -1,89 +0,0 @@
-.bottom-class-1{
-  background:#fff;
-  position:fixed;
-  bottom:0;
-  width:100%;
-  height: 182rpx; 
-  border-top:1px solid #efefef;
-  z-index: 7;
-  box-shadow: 0px -8rpx 24rpx rgba(0, 16, 39, 0.1);
-  border-radius: 30rpx 30rpx 0rpx 0rpx;
-}
-.bottom-class-2{
-  position:fixed;
-  bottom:40rpx;
-  width:90%;
-  height: 135rpx; 
-  border-top:1px solid #efefef;
-  z-index: 7;
-  margin-left: 5%;
-  background: #1B365D;
-  box-shadow: 0px 17rpx 22rpx rgba(27, 54, 93, 0.2);
-  border-radius: 15rpx;
-}
-.save-bottom{
-    display:flex;
-    justify-content: space-around;
-    width:100%;
-}
-.save-bottom-left{
-    width:50%;
-    height:85rpx;
-    padding:15rpx 0 15rpx 0
-}
-.save-bottom-button{
-    width:25%;
-    height:85rpx;
-    padding:15rpx 0 15rpx 0;
-    text-align: center;
-}
-.red-text{
-    color:#CAA977;
-    font-size:4vw;
-    line-height:30rpx;
-}
-.van-button--round {
-    border-radius: 15rpx !important;
-}
-
-.order-choose-goods-total-class{
-  padding: 20rpx 0 0 40rpx;
-  font-size: 15px;
-  color:#CAA977;
-}
-
-.order-choose-goods-button-class{
-  position:absolute !important;
-  top: 24rpx;
-  right: 20rpx;
-  width:183rpx;
-  height:88rpx;
-  padding:15rpx 0 15rpx 0;
-  text-align: center;
-  word-break:keep-all;
-  background: #CAA977 !important;
-  color:#fff !important;
-  font-weight: bold;
-  border-radius: 15rpx !important;
-  font-size: 16px !important;
-  border: none !important;
-}
-
-.customer-save-bottom{
-  width:  93%;
-  height: 85rpx;
-  display: flex;
-  height: 85rpx;
-  display: flex;
-  justify-content: space-between;
-  padding-top: 40rpx;
-}
-.save-button-class-canl{
-  width: 320rpx;
-  background: #ffffff !important;
-  /* border-radius: 15rpx !important; */
-  color:#1B365D !important;
-  border: solid 2rpx #1B365D !important;
-  font-size: 16px !important;
-  font-weight: bold !important;
-}

+ 1 - 1
package-base-select/pages/select-source-purchase-order/select-source-purchase-order.js

@@ -149,7 +149,7 @@ Page({
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的,实际中,需要从route中读取
         res.eventChannel.emit('params', {
-
+          formMode:'add',
           choooseInboundItemList: choooseInboundItemList,
           goodsRejectedAmount: that.data.returnTotalAmount,
           item: JSON.stringify(item)

+ 96 - 32
package-purchase/pages/purchase-return/add/add.js

@@ -9,22 +9,25 @@ Page({
   data: {
     routeObjName: 'intoReturn',
     tableData: [],
-    btnFormData: JSON.stringify({flag:true}) ,
+    btnFormData: JSON.stringify({ flag: true }),
+    pageFlag: false,
     pageFlag: false,
     flgAutoIvt: false,
+    showPopFlag: true,
+    stepperFlag: true,
     cardList: [{
       name: 'items',
       title: '商品明细',
       chooseGoodsFlag: '',
-      sumAmount:0,
+      sumAmount: 0,
       displayNum: 2
     }, {
       name: 'other',
       title: '其他信息'
     }],
 
-    cardContentList:[
-      { code: 'whId',name: 'whName',  title: '库区', type: 'choose',urlKey: 'openingInventory'}
+    cardContentList: [
+      { code: 'whId', name: 'whName', title: '库区', type: 'choose', urlKey: 'openingInventory' }
     ],
 
     contentObj: {
@@ -41,21 +44,21 @@ Page({
     },
     buttonList: [{
       name: 'merge',
-      title:  mixins.$t("save"),//'保存'
-  }],
+      title: mixins.$t("save"),//'保存'
+    }],
     contentList: [{
       code: 'flag',
-      title:  mixins.$t("antoHandle"),//'自动入库办理',
+      title: mixins.$t("antoHandle"),//'自动入库办理',
       type: 'checkbox'
-  }, {
+    }, {
       code: 'need',
       title: '退货总额',//'合计金额',
       type: 'str'
-  }, {
+    }, {
       code: 'sumAmount',
       content: 0,
       type: 'number'
-  }],
+    }],
   },
 
   /**
@@ -64,8 +67,8 @@ Page({
 * @author : 于继渤
 */
   setParams(params) {
-    params.purId = this.data.item.purId
-    params.purNo = this.data.item.purNo
+    params.purId = this.data.item.purId ? this.data.item.purId : params.purId
+    params.purNo = this.data.item.purNo ? this.data.item.purNo : params.purNo
     let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
     params.automaticFlg = btnFormData ? btnFormData.flag : false //自动出入库标识 
     params.intoReturnItemVOList = params.goodsList
@@ -80,13 +83,31 @@ Page({
 * @author : 于继渤
 */
   saveData() {
-    return this.excute(this.data.service, this.data.service.insert, this.data.params);
+    if (this.data.formMode == Constants.formMode.edit) {
+      let params = this.data.params
+      return this.excute(this.data.service, this.data.service.update, {
+        returnId:params.returnId,
+        remarks:params.remarks ? params.remarks : '',
+        returnId:params.returnId,
+      });
+    } else {
+      return this.excute(this.data.service, this.data.service.insert, this.data.params);
+    }
   },
 
-  chooseData(e){
-    console.log('chooseData',e)
+    /**
+  * @desc :处理保存后续
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
+  handleData(){
+    wx.navigateBack({
+      data: 1
+    })
   },
 
+
+
   //展开
   collapseFlagChange(e) {
     this.setData({
@@ -119,23 +140,26 @@ Page({
     let formData = JSON.parse(this.data.formData)
     let sumAmount = Number(0) //合计金额
     let sumQuantity = Number(0) //合计金额
-    let goodsRejectedAmount =this.data.goodsRejectedAmount
+    let goodsRejectedAmount = this.data.goodsRejectedAmount
     console.log('formData1', formData)
     formData.goodsList.forEach(res => {
       res.itemAmt = Number(res.itemQty * res.priceReturn * -1)
       sumAmount += res.itemAmt
       sumQuantity += res.itemQty
     })
-    formData.sumAmount =  sumAmount
+    formData.sumAmount = sumAmount
     formData.sumQuantity = sumQuantity
     console.log('formData', formData)
     let cardList = this.data.cardList
     let contentList = this.data.contentList
+    
     cardList[0].sumAmount = sumAmount.toFixed(2)
-    contentList[2].content = sumAmount.toFixed(2)
+    if(contentList.length > 0){
+      contentList[2].content = sumAmount.toFixed(2)
+    }
     this.setData({
-      cardList:cardList,
-      contentList:contentList,
+      cardList: cardList,
+      contentList: contentList,
       formData: JSON.stringify(formData),
       sumAmount: sumAmount.toFixed(2),
       afterGoodsRejectedAmount: Number(goodsRejectedAmount + formData.sumAmount).toFixed(2),
@@ -144,6 +168,36 @@ Page({
   },
 
   /**
+   * @desc :   加载数据源
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  selectByUpdate(data) {
+    return this.excute(this.data.service, this.data.service.selectByUpdate + '/' + data.item.returnId, {}).then(res => {
+      if (res.data.code == 200) {
+        let formData = JSON.parse(this.data.formData)
+        let data = res.data.data.data
+        formData = data
+        if (res.data.data.dataItem && res.data.data.dataItem.length > 0) {
+          res.data.data.dataItem.forEach(item => {
+            //处理负数
+            item.itemQty = Number(item.rejectQty * -1)
+            item.itemQtyMax = Number(item.rejectQty * -1)
+            item.priceReturn = Number(item.priceReturn * -1)
+          })
+        }
+        formData['goodsList'] = res.data.data.dataItem
+        this.setData({
+          formData: JSON.stringify(formData)
+        })
+        this.calculateTotal()
+      }
+    })
+  },
+
+
+
+  /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
@@ -151,24 +205,34 @@ Page({
     let that = this
     const eventChannel = this.getOpenerEventChannel()
     eventChannel.on('params', function (data) {
-      let formData = that.data.formData
+
       // data.choooseInboundItemList.forEach(res=>{
       //   res['usableQtyInsufficientFlag'] = true  //可售量不足
       //   res['usableQty'] = 0  //可售量
       // })
 
-      
-      formData = {
-        goodsList: data.choooseInboundItemList
+ 
+      if (that.data.formMode == Constants.formMode.edit) {
+        that.setData({
+          contentList:[],
+          showPopFlag: false,
+          stepperFlag: false
+        })
+        that.selectByUpdate(data)
+      } else {
+        let formData = that.data.formData
+        formData = {
+          goodsList: data.choooseInboundItemList
+        }
+        that.setData({
+          formData: JSON.stringify(formData),
+          goodsRejectedAmount: Number(data.goodsRejectedAmount),
+          tableData: data.choooseInboundItemList,
+          item: JSON.parse(data.item)
+        })
+        that.calculateTotal()
       }
-      console.log('data',data)
-      that.setData({
-        formData: JSON.stringify(formData),
-        goodsRejectedAmount:  Number(data.goodsRejectedAmount),
-        tableData: data.choooseInboundItemList,
-        item: JSON.parse(data.item)
-      })
-      that.calculateTotal()
+
     })
   },
 

+ 2 - 2
package-purchase/pages/purchase-return/add/add.wxml

@@ -68,14 +68,14 @@
 
 
 <dk-form-bill id="dk-form-bill"  routeObjName="{{routeObjName}}"  
-cardList="{{cardList}}"  titleTagCol ="shortName"  titleCol ="skuCode"   showPopFlag="{{true}}"
+cardList="{{cardList}}"  titleTagCol ="shortName"  titleCol ="skuCode"   showPopFlag="{{showPopFlag}}"
 descCol = "skuModel" priceCol ="priceReturn" quantityCol ="itemQty"   sumAmountCol ="sumAmount"
 contentObj="{{contentObj}}" model:value="{{formData}}"
 popType = "sale" 
 
 bind:onStepper="onChangeStepper"
 quantityMax="itemQtyMax" 
-stepperFlag="{{true}}"
+stepperFlag="{{stepperFlag}}"
 
 
 

+ 1 - 0
package-purchase/pages/purchase-return/detail/detail.js

@@ -1,6 +1,7 @@
 const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
+const app = getApp()
 Page({
   mixins: [mixins],
   /**

+ 6 - 0
package-purchase/pages/purchase-return/detail/detail.wxml

@@ -19,6 +19,10 @@
         <view style="padding-left: 14rpx;padding-top: 19rpx;font-size: 26rpx;line-height: 36rpx;color: #FFFFFF;">
           {{item.supName}}
         </view>
+
+        <view data-item="{{item}}" bind:tap="toDetail">
+          <van-image custom-class="image-class" src="/static/img/edit.png" />
+        </view>
       </view>
       <!-- 收货人 -->
       <view style="display: flex;padding-right: 32rpx;">
@@ -42,6 +46,8 @@
           {{ wxmlUtil.addressToIndexOf(item.returnAddress)}}
         </view>
       </view>
+
+      
     </view>
   </view>
 </view>

+ 7 - 1
package-purchase/pages/purchase-return/detail/detail.wxss

@@ -9,7 +9,13 @@
   white-space: nowrap;
   text-align: center;
 }
-
+/*图标显示*/
+.image-class {
+  width: 36rpx;
+  height: 36rpx;
+  left: 16rpx;
+  top: calc((100% - 36rpx)/2);
+}
 .return-style {
   /* width: 96.5%; */
   background-color: white;

+ 15 - 1
package-purchase/pages/purchase-return/purchase-return.js

@@ -56,6 +56,11 @@ Page({
       }
     })
   },
+
+  
+
+
+
   /**
    * @desc : 设置查询参数
    * @date : 2024/2/1 15:49
@@ -116,7 +121,16 @@ Page({
   cancel(returnId){
     return this.excute(this.data.service, this.data.service.cancel, {
       returnId:returnId
-    });
+    }).then(res=>{
+      if(res.data.code == 200){
+        wx.showToast({
+          title: '作废成功',
+          image: '/static/image/success.png',
+          duration: 1000
+        })
+        this.searchData()
+      }
+    })
   },
   /**
    * 生命周期函数--监听页面加载