Procházet zdrojové kódy

Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

liuyao před 1 rokem
rodič
revize
a1623c5d65
28 změnil soubory, kde provedl 548 přidání a 189 odebrání
  1. 4 4
      app.json
  2. 0 24
      components/dkbase/dk-cropper/dk-cropper.js
  3. 0 2
      components/dkbase/dk-cropper/dk-cropper.wxml
  4. 0 1
      components/dkbase/dk-cropper/dk-cropper.wxss
  5. 111 41
      components/dkbase/dk-form-bill/dk-form-bill.js
  6. 1 1
      components/dkbase/dk-form-bill/dk-form-bill.wxml
  7. 107 40
      components/dkbase/dk-form-more-items/dk-form-more-items.js
  8. 1 1
      components/dkbase/dk-form-more-items/dk-form-more-items.wxml
  9. 124 56
      components/dkbase/dk-form/dk-form.js
  10. 1 1
      components/dkbase/dk-form/dk-form.wxml
  11. 12 0
      mixins/index.js
  12. 100 0
      package-base-select/pages/cropper/cropper.js
  13. 0 1
      package-base-select/pages/cropper/cropper.json
  14. 16 0
      package-base-select/pages/cropper/cropper.wxml
  15. 31 0
      package-base-select/pages/cropper/cropper.wxss
  16. 1 1
      package-basic-data/pages/customer-list/add/add.wxml
  17. 1 1
      package-basic-data/pages/product-file/add/add.wxml
  18. 5 1
      package-business-analysis/pages/detail-report/detail-report.wxml
  19. 5 2
      package-inventory/pages/cost-check/cost-check-list/cost-check-list.wxml
  20. 1 1
      package-inventory/pages/other-outbound/other-outbound.wxml
  21. 1 1
      package-inventory/pages/other-warehousing/other-warehousing.wxml
  22. 1 1
      package-purchase/pages/pur-receipt/add/add.wxml
  23. 1 1
      package-purchase/pages/pur-refund/add/add.wxml
  24. 1 1
      package-sales/pages/customer-collection/add/add.wxml
  25. 1 1
      package-sales/pages/customer-collection/refund/refund.wxml
  26. 1 1
      package-sales/pages/order-billing/add/add.wxml
  27. 1 1
      package-sales/pages/sales-outbound/add/add.wxml
  28. 20 4
      pages/mine/mine.js

+ 4 - 4
app.json

@@ -10,7 +10,7 @@
         "pages/add-company/add-company",
         "pages/product/product",
         "components/dkbase/dk-customer-detail/dk-customer-detail",
-        "components/dkbase/dk-step/dk-step", 
+        "components/dkbase/dk-step/dk-step",
         "components/dkbase/dk-goos-list-step/dk-goos-list-step"
     ],
     "subPackages": [
@@ -247,7 +247,8 @@
                 "pages/select-source-sale-out-order/select-source-sale-out-order",
                 "pages/select-master-slave/select-master-slave",
                 "pages/web-view-select/web-view-select",
-                "pages/select-choose-coordination/select-choose-coordination"
+                "pages/select-choose-coordination/select-choose-coordination",
+                "pages/cropper/cropper"
             ]
         }
     ],
@@ -384,8 +385,7 @@
         "dk-navbar": "components/dkbase/dk-navbar/dk-navbar",
         "dk-swiper": "components/dkbase/dk-swiper/dk-swiper",
         "dk-select-field": "components/dkbase/dk-select-field/dk-select-field",
-        "dk-timeclock-calendar":"components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar",
-        "dk-cropper":"components/dkbase/dk-cropper/dk-cropper"
+        "dk-timeclock-calendar": "components/dkbase/dk-timeclock-calendar/dk-timeclock-calendar"
     },
     "tabBar": {
         "color": "#95A8CB",

+ 0 - 24
components/dkbase/dk-cropper/dk-cropper.js

@@ -1,24 +0,0 @@
-// components/dkbase/dk-cropper/dk-cropper.js
-Component({
-
-    /**
-     * 组件的属性列表
-     */
-    properties: {
-
-    },
-
-    /**
-     * 组件的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 组件的方法列表
-     */
-    methods: {
-
-    }
-})

+ 0 - 2
components/dkbase/dk-cropper/dk-cropper.wxml

@@ -1,2 +0,0 @@
-<!--components/dkbase/dk-cropper/dk-cropper.wxml-->
-<text>components/dkbase/dk-cropper/dk-cropper.wxml</text>

+ 0 - 1
components/dkbase/dk-cropper/dk-cropper.wxss

@@ -1 +0,0 @@
-/* components/dkbase/dk-cropper/dk-cropper.wxss */

+ 111 - 41
components/dkbase/dk-form-bill/dk-form-bill.js

@@ -111,7 +111,10 @@ Component({
       type: String,
       value: 'priceTailCol'
     },
-
+    isCroppingFlag: { //是否开启裁剪功能
+      type: Boolean,
+      value: true
+    },
     // 价格列
     priceCol: {
       type: String,
@@ -2581,8 +2584,7 @@ Component({
      * @author : 于继渤
      * @date : 2024/1/19
      */
-    setReturnGoodsAmount(data) {
-      console.log('设置商品明细采购退货',data)
+    setReturnGoodsAmount(data) { 
       let form = this.data.form
       if (form.goodsList && form.goodsList.length > 0) {
         form.goodsList.forEach(item => {
@@ -2685,6 +2687,14 @@ Component({
       this.triggerEvent("clickAttach", {})
     },
     /**
+     * @desc : 点击预览附件
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    clickPreview(e){
+      this.triggerEvent("clickPreview", {})
+    },
+    /**
      * @desc : 点击上传附件(取消)
      * @author : 周兴
      * @date : 2024/6/24
@@ -2692,52 +2702,112 @@ Component({
     uploadError(e) {
       this.triggerEvent("uploadError", {})
     },
-    /**
-     * @desc : 上传附件—(上传完成)
+   /**
+     * @desc : 上传附件
      * @author : 周兴
      * @date : 2024/3/27 16:16
      */
-    afterRead(e) { 
+    afterRead(e) {
       const _this = this;
-      const {
-        file
-      } = e.detail;
-      // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
-      let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
-      let url = config.upload_url;
-      url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
-      file.forEach((res, index) => {
-        // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
-        wx.uploadFile({
-          url: url,
-          filePath: res.path,
-          name: 'file',
-          formData: {
-            'folder': folder
-          },
-          header: {
-            'Authorization': 'Bearer ' + app.globalData.token
-          },
-          success(res) {
-            let data = JSON.parse(res.data)
-            if (data.code === 200) {
-              let form = _this.data.form
-              let annexPaths = form['annexPaths'] || []
-              data.data.url = config.image_url + data.data.path
-              annexPaths.push(data.data)
-              form.annexPaths = annexPaths;
-              _this.setData({
-                form: form,
-                value: JSON.stringify(form)
+      if (this.data.isCroppingFlag) { //开启裁剪功能 
+        //  获取裁剪图片资源后,给data添加src属性及其值
+        wx.navigateTo({
+          url: '/package-base-select/pages/cropper/cropper',
+          events: {
+            // 回调后
+            bindData: function (data) { 
+              const {
+                file
+              } = {file:[{path:data}]};
+              // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
+              let folder = app.globalData.company.cpCode + '/' + _this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
+              let url = config.upload_url;
+              url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
+              file.forEach((res, index) => {
+                // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+                wx.uploadFile({
+                  url: url,
+                  filePath: res.path,
+                  name: 'file',
+                  formData: {
+                    'folder': folder
+                  },
+                  header: {
+                    'Authorization': 'Bearer ' + app.globalData.token
+                  },
+                  success(res) {
+                    let data = JSON.parse(res.data)
+                    if (data.code === 200) {
+                      let form = _this.data.form
+                      let annexPaths = form['annexPaths'] || []
+                      data.data.url = config.image_url + data.data.path
+                      annexPaths.push(data.data)
+                      form.annexPaths = annexPaths;
+                      _this.setData({
+                        form: form,
+                        value: JSON.stringify(form)
+                      })
+                      // 如果是最后一条
+                      if (index == file.length - 1) {
+                        _this.triggerEvent("uploadSucess", {})
+                      }
+                    }
+                  },
+                })
               })
-              // 如果是最后一条
-              if (index == file.length - 1) {
-                _this.triggerEvent("uploadSucess", {})
-              }
             }
           },
+          success: function (res) {
+            // 通过eventChannel向被打开页面传送数据
+            res.eventChannel.emit('params', {
+              src: e.detail.file[0].path, 
+            })
+          }
         })
-      })
+      } else { 
+        const {
+          file
+        } = e.detail;
+        // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
+        let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
+        let url = config.upload_url;
+        url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
+        file.forEach((res, index) => {
+          // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+          wx.uploadFile({
+            url: url,
+            filePath: res.path,
+            name: 'file',
+            formData: {
+              'folder': folder
+            },
+            header: {
+              'Authorization': 'Bearer ' + app.globalData.token
+            },
+            success(res) {
+              let data = JSON.parse(res.data)
+              if (data.code === 200) {
+                let form = _this.data.form
+                let annexPaths = form['annexPaths'] || []
+                data.data.url = config.image_url + data.data.path
+                annexPaths.push(data.data)
+                form.annexPaths = annexPaths;
+                _this.setData({
+                  form: form,
+                  value: JSON.stringify(form)
+                })
+                // 如果是最后一条
+                if (index == file.length - 1) {
+                  _this.triggerEvent("uploadSucess", {})
+                }
+              }
+            },
+          })
+        })
+      }
+  
+
+
     },
     customersChoose() {
       this.triggerEvent("customersChoose", {})

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

@@ -266,7 +266,7 @@
             <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
               <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 14px;padding-left: 27rpx;">附件</view>
               <view style="width: calc(100% - 168rpx);text-align: left;">
-                <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg" bind:error="uploadError" bind:after-read="afterRead" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" catchtap="clickAttach" bind:oversize="overSize" upload-text="添加照片" />
+                <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg" bind:error="uploadError" bind:after-read="afterRead" bind:click-preview="clickPreview" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" catchtap="clickAttach" bind:oversize="overSize" upload-text="添加照片" />
                 <!-- <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
                 图片最多上传5张
               </view> -->

+ 107 - 40
components/dkbase/dk-form-more-items/dk-form-more-items.js

@@ -124,6 +124,10 @@ Component({
       type: String,
       value: 'arrow-right.png'
     },
+    isCroppingFlag: { //是否开启裁剪功能
+      type: Boolean,
+      value: true
+    },
     // 结果集
     value: {
       type: String,
@@ -785,6 +789,14 @@ Component({
       })
     },
     /**
+     * @desc : 点击预览附件
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    clickPreview(e){
+      this.triggerEvent("clickPreview", {})
+    },
+    /**
      * @desc : 点击上传附件(取消)
      * @author : 周兴
      * @date : 2024/6/24
@@ -799,51 +811,106 @@ Component({
      * @date : 2024/3/27 16:16
      */
     afterRead(e) {
-      // this.setData({
-      //     uploadFileFlag:true
-      // })
-      // 只读    
       const _this = this;
-      const {
-        file
-      } = e.detail;
-      // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
-      let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
-      let url = config.upload_url;
-      url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
-      file.forEach((res,index) => {
-        // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
-        wx.uploadFile({
-          url: url,
-          filePath: res.path,
-          name: 'file',
-          formData: {
-            'folder': folder
-          },
-          header: {
-            'Authorization': 'Bearer ' + app.globalData.token
-          },
-          success(res) {
-            let data = JSON.parse(res.data)
-            if (data.code === 200) {
-              let form = _this.data.form
-              let annexPaths = form['annexPaths'] || []
-              data.data.url = config.image_url + data.data.path
-              annexPaths.push(data.data)
-              form.annexPaths = annexPaths;
-              _this.setData({
-                form: form,
-                value: JSON.stringify(form)
-              })
-              // 如果是最后一条
-              if (index == file.length - 1) {
-                _this.triggerEvent("uploadSucess", {
+      if (this.data.isCroppingFlag) { //开启裁剪功能 
+        //  获取裁剪图片资源后,给data添加src属性及其值
+        wx.navigateTo({
+          url: '/package-base-select/pages/cropper/cropper',
+          events: {
+            // 回调后
+            bindData: function (data) { 
+              const {
+                file
+              } = {file:[{path:data}]};
+              // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
+              let folder = app.globalData.company.cpCode + '/' + _this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
+              let url = config.upload_url;
+              url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
+              file.forEach((res, index) => {
+                // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+                wx.uploadFile({
+                  url: url,
+                  filePath: res.path,
+                  name: 'file',
+                  formData: {
+                    'folder': folder
+                  },
+                  header: {
+                    'Authorization': 'Bearer ' + app.globalData.token
+                  },
+                  success(res) {
+                    let data = JSON.parse(res.data)
+                    if (data.code === 200) {
+                      let form = _this.data.form
+                      let annexPaths = form['annexPaths'] || []
+                      data.data.url = config.image_url + data.data.path
+                      annexPaths.push(data.data)
+                      form.annexPaths = annexPaths;
+                      _this.setData({
+                        form: form,
+                        value: JSON.stringify(form)
+                      })
+                      // 如果是最后一条
+                      if (index == file.length - 1) {
+                        _this.triggerEvent("uploadSucess", {})
+                      }
+                    }
+                  },
                 })
-              }
+              })
             }
           },
+          success: function (res) {
+            // 通过eventChannel向被打开页面传送数据
+            res.eventChannel.emit('params', {
+              src: e.detail.file[0].path, 
+            })
+          }
         })
-      })
+      } else { 
+        const {
+          file
+        } = e.detail;
+        // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
+        let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
+        let url = config.upload_url;
+        url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
+        file.forEach((res, index) => {
+          // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+          wx.uploadFile({
+            url: url,
+            filePath: res.path,
+            name: 'file',
+            formData: {
+              'folder': folder
+            },
+            header: {
+              'Authorization': 'Bearer ' + app.globalData.token
+            },
+            success(res) {
+              let data = JSON.parse(res.data)
+              if (data.code === 200) {
+                let form = _this.data.form
+                let annexPaths = form['annexPaths'] || []
+                data.data.url = config.image_url + data.data.path
+                annexPaths.push(data.data)
+                form.annexPaths = annexPaths;
+                _this.setData({
+                  form: form,
+                  value: JSON.stringify(form)
+                })
+                // 如果是最后一条
+                if (index == file.length - 1) {
+                  _this.triggerEvent("uploadSucess", {})
+                }
+              }
+            },
+          })
+        })
+      }
+  
+
+
     },
     /**
      * @desc   : 修改输入框的值

+ 1 - 1
components/dkbase/dk-form-more-items/dk-form-more-items.wxml

@@ -155,7 +155,7 @@
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
         <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 28rpx;padding-left: 27rpx;">附件</view>
         <view style="width: calc(100% - 168rpx);text-align: left;">
-          <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths']  }}" data-readonly="{{!!item.readonly}}" bind:delete="deleteImg" bind:after-read="afterRead" bind:error="uploadError" catchtap="clickAttach"  multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" upload-text="添加照片" />
+          <van-uploader max-count="5" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths']  }}" data-readonly="{{!!item.readonly}}" bind:delete="deleteImg" bind:after-read="afterRead" bind:error="uploadError" catchtap="clickAttach" bind:click-preview="clickPreview"   multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" upload-text="添加照片" />
           <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
             图片最多上传5张
           </view>

+ 124 - 56
components/dkbase/dk-form/dk-form.js

@@ -29,6 +29,10 @@ Component({
       type: Boolean,
       value: false
     },
+    isCroppingFlag: { //是否开启裁剪功能
+      type: Boolean,
+      value: true
+    },
     uploaderMAX: {
       type: Number,
       value: 5
@@ -88,7 +92,7 @@ Component({
     checked: false
   },
   lifetimes: {
-    attached: function () { },
+    attached: function () {},
     detached: function () {
       // 在组件实例被从页面节点树移除时执行
       // 清空地址信息
@@ -174,7 +178,7 @@ Component({
         // 检查它是否真的是一个数组  
         if (Array.isArray(array)) {
           array.forEach(item => {
-            if (item.tip&&this.selectComponent('#' + item.code)) {
+            if (item.tip && this.selectComponent('#' + item.code)) {
               this.selectComponent('#' + item.code).setShowTipFlag(false)
             }
           });
@@ -784,8 +788,7 @@ Component({
       // 获取微信基础配置
       wx.getSetting({
         withSubscriptions: true,
-        success(res) {
-          console.log('getSetting', res);
+        success(res) { 
           let bol = false
           // 适配存在多个订阅消息模板的情况
           if (res.subscriptionsSetting.itemSettings) {
@@ -798,20 +801,20 @@ Component({
           } else {
             bol = true
           }
-          if(bol){
-              // 如果配置中用户未订阅消息 则弹窗
-              wx.requestSubscribeMessage({
-                tmplIds: tmplIds,
-                success(res) {
-                  that.openDatePopTime(e)
-                },
-                fail(res) {
-                  that.openDatePopTime(e)
-                }
-              })
-            } else {
-              that.openDatePopTime(e)
-            }
+          if (bol) {
+            // 如果配置中用户未订阅消息 则弹窗
+            wx.requestSubscribeMessage({
+              tmplIds: tmplIds,
+              success(res) {
+                that.openDatePopTime(e)
+              },
+              fail(res) {
+                that.openDatePopTime(e)
+              }
+            })
+          } else {
+            that.openDatePopTime(e)
+          }
         },
         fail(res) {
           that.openDatePopTime(e)
@@ -911,6 +914,14 @@ Component({
       this.triggerEvent("clickAttach", {})
     },
     /**
+     * @desc : 点击预览附件
+     * @author : 周兴
+     * @date : 2024/6/24
+     */
+    clickPreview(e){
+      this.triggerEvent("clickPreview", {})
+    },
+    /**
      * @desc : 点击上传附件(取消)
      * @author : 周兴
      * @date : 2024/6/24
@@ -924,49 +935,106 @@ Component({
      * @date : 2024/3/27 16:16
      */
     afterRead(e) {
-      // this.setData({
-      //     uploadFileFlag:true
-      // })
       const _this = this;
-      const {
-        file
-      } = e.detail;
-      // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
-      let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
-      let url = config.upload_url;
-      url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
-      file.forEach((res, index) => {
-        // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
-        wx.uploadFile({
-          url: url,
-          filePath: res.path,
-          name: 'file',
-          formData: {
-            'folder': folder
-          },
-          header: {
-            'Authorization': 'Bearer ' + app.globalData.token
-          },
-          success(res) {
-            let data = JSON.parse(res.data)
-            if (data.code === 200) {
-              let form = _this.data.form
-              let annexPaths = form['annexPaths'] || []
-              data.data.url = config.image_url + data.data.path
-              annexPaths.push(data.data)
-              form.annexPaths = annexPaths;
-              _this.setData({
-                form: form,
-                value: JSON.stringify(form)
+      if (this.data.isCroppingFlag) { //开启裁剪功能 
+        //  获取裁剪图片资源后,给data添加src属性及其值
+        wx.navigateTo({
+          url: '/package-base-select/pages/cropper/cropper',
+          events: {
+            // 回调后
+            bindData: function (data) { 
+              const {
+                file
+              } = {file:[{path:data}]};
+              // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
+              let folder = app.globalData.company.cpCode + '/' + _this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
+              let url = config.upload_url;
+              url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
+              file.forEach((res, index) => {
+                // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+                wx.uploadFile({
+                  url: url,
+                  filePath: res.path,
+                  name: 'file',
+                  formData: {
+                    'folder': folder
+                  },
+                  header: {
+                    'Authorization': 'Bearer ' + app.globalData.token
+                  },
+                  success(res) {
+                    let data = JSON.parse(res.data)
+                    if (data.code === 200) {
+                      let form = _this.data.form
+                      let annexPaths = form['annexPaths'] || []
+                      data.data.url = config.image_url + data.data.path
+                      annexPaths.push(data.data)
+                      form.annexPaths = annexPaths;
+                      _this.setData({
+                        form: form,
+                        value: JSON.stringify(form)
+                      })
+                      // 如果是最后一条
+                      if (index == file.length - 1) {
+                        _this.triggerEvent("uploadSucess", {})
+                      }
+                    }
+                  },
+                })
               })
-              // 如果是最后一条
-              if (index == file.length - 1) {
-                _this.triggerEvent("uploadSucess", {})
-              }
             }
           },
+          success: function (res) {
+            // 通过eventChannel向被打开页面传送数据
+            res.eventChannel.emit('params', {
+              src: e.detail.file[0].path, 
+            })
+          }
         })
-      })
+      } else { 
+        const {
+          file
+        } = e.detail;
+        // 配置存放的文件夹 公司code - 表名 - 年月 -- 日
+        let folder = app.globalData.company.cpCode + '/' + this.data.table + '/' + new Date().toYearMonth2() + '/' + new Date().toDay()
+        let url = config.upload_url;
+        url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
+        file.forEach((res, index) => {
+          // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+          wx.uploadFile({
+            url: url,
+            filePath: res.path,
+            name: 'file',
+            formData: {
+              'folder': folder
+            },
+            header: {
+              'Authorization': 'Bearer ' + app.globalData.token
+            },
+            success(res) {
+              let data = JSON.parse(res.data)
+              if (data.code === 200) {
+                let form = _this.data.form
+                let annexPaths = form['annexPaths'] || []
+                data.data.url = config.image_url + data.data.path
+                annexPaths.push(data.data)
+                form.annexPaths = annexPaths;
+                _this.setData({
+                  form: form,
+                  value: JSON.stringify(form)
+                })
+                // 如果是最后一条
+                if (index == file.length - 1) {
+                  _this.triggerEvent("uploadSucess", {})
+                }
+              }
+            },
+          })
+        })
+      }
+  
+
+
     },
     /**
      * @desc : 获取语言的方法

+ 1 - 1
components/dkbase/dk-form/dk-form.wxml

@@ -102,7 +102,7 @@
       <view style="display:flex;width:100%;margin: 1vw; padding-top: 20rpx;" wx:if="{{item.type=='uploader'}}">
         <view style="width: 168rpx; flex:1;color: #95A8CB;font-size: 14px;padding-left: 20rpx;">{{item.name?item.name:'附件'}}</view>
         <view style="width: calc(100% - 168rpx);text-align: left;">
-          <van-uploader max-count="{{uploaderMAX}}" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg" bind:after-read="afterRead" bind:error="uploadError" catchtap="clickAttach" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" />
+          <van-uploader max-count="{{uploaderMAX}}" disabled="{{!!item.readonly}}" accept="image" style="margin-left: 4%;border-radius: 15rpx;" preview-size="160rpx;" file-list="{{ form['annexPaths'] }}" bind:delete="deleteImg" bind:after-read="afterRead" bind:error="uploadError" catchtap="clickAttach"  bind:click-preview="clickPreview" multiple="true" imageFit="aspectFit" max-size="{{maxSize}}" bind:oversize="overSize" />
           <view style="margin-left: 27rpx;color: #C8C9CC;font-size: 12px;">
             图片最多上传{{uploaderMAX}}张
           </view>

+ 12 - 0
mixins/index.js

@@ -122,6 +122,18 @@ module.exports = {
     })
   },
   /**
+   * @desc : 点击预览附件
+   * @author : 周兴
+   * @date : 2024/6/24
+   */
+  clickPreview(e){
+    setTimeout(()=>{
+      this.setData({
+        loading: false,
+      })
+    },500)
+  },
+  /**
    * @desc : 上传附件成功
    * @author : 周兴
    * @date : 2024/6/24

+ 100 - 0
package-base-select/pages/cropper/cropper.js

@@ -0,0 +1,100 @@
+const WeCropper = require('@/utils/weCropper/we-cropper.js');
+
+const app = getApp()
+const device = wx.getSystemInfoSync()
+const width = device.windowWidth
+const height = device.windowHeight - 80
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    cropperOpt: {
+      id: 'cropper',
+      targetId: 'targetCropper',
+      pixelRatio: device.pixelRatio,
+      width,
+      height,
+      scale: 2.5,
+      zoom: 8,
+      cut: {
+        x: (width - 260) / 2,
+        y: (height - 260) / 2,
+        width: 260,
+        height: 260
+      },
+      boundStyle: {
+        color: "green",
+        mask: 'rgba(0,0,0,0.8)',
+        lineWidth: 1
+      }
+    }
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(option) {
+    let that = this
+    const eventChannel = this.getOpenerEventChannel()
+    eventChannel.on('params', function (data) {
+      const {
+        cropperOpt
+      } = that.data
+      cropperOpt.src = data.src
+      cropperOpt.boundStyle.color = "green"
+
+      that.setData({
+        cropperOpt
+      })
+
+      that.cropper = new WeCropper(cropperOpt)
+        .on('ready', (ctx) => {})
+        .on('beforeImageLoad', (ctx) => {
+          wx.showToast({
+            title: '上传中',
+            icon: 'loading',
+            duration: 20000
+          })
+        })
+        .on('imageLoad', (ctx) => {
+          wx.hideToast()
+        })
+    })
+
+  },
+
+  touchStart(e) {
+    this.cropper.touchStart(e)
+  },
+  touchMove(e) {
+    this.cropper.touchMove(e)
+  },
+  touchEnd(e) {
+    this.cropper.touchEnd(e)
+  },
+  // 点击取消,返回上一页
+  cancel() {
+    wx.navigateBack({
+      delta: 1
+    })
+  },
+  getCropperImage() {
+    this.cropper.getCropperImage()
+      .then((src) => {
+          // 给父页面传递数据
+          const eventChannel = this.getOpenerEventChannel();
+          eventChannel.emit('bindData', src) 
+          wx.navigateBack({
+            delta: 1
+          })
+      })
+      .catch((err) => {
+        wx.showModal({
+          title: '温馨提示',
+          content: err.message
+        })
+      })
+  },
+})

+ 0 - 1
components/dkbase/dk-cropper/dk-cropper.json → package-base-select/pages/cropper/cropper.json

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

+ 16 - 0
package-base-select/pages/cropper/cropper.wxml

@@ -0,0 +1,16 @@
+<import src="/utils/weCropper/we-cropper"></import> 
+<view class="cropper-wrapper">
+  <template is="we-cropper" data="{{...cropperOpt}}"></template>
+  <cover-view class="cropper-buttons" style="color: {{cropperOpt.boundStyle.color}}">
+    <cover-view
+      class="upload btn"
+      bindtap="cancel">
+      取消
+    </cover-view>
+    <cover-view
+      class="upload btn"
+      bindtap="getCropperImage">
+      裁剪
+    </cover-view>
+  </cover-view>
+</view>

+ 31 - 0
package-base-select/pages/cropper/cropper.wxss

@@ -0,0 +1,31 @@
+/* pages/user/clipHeadImg/index.wxss */
+ 
+.cropper{
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.cropper-buttons{
+  background-color: rgba(0, 0, 0, 0.95);
+}
+
+.btn{
+  color: #ffffff;
+}
+
+.cropper-buttons{
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 80px;
+  padding: 0 20rpx;
+  box-sizing: border-box;
+  line-height: 80px;
+  z-index: 9999999 !important;
+}

+ 1 - 1
package-basic-data/pages/customer-list/add/add.wxml

@@ -1,7 +1,7 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
-<dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" bind:chooseData="chooseData">
+<dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" bind:clickPreview="clickPreview" bind:chooseData="chooseData">
 </dk-form>
 <view style="height: 200rpx;"></view>
 <!--  保存 -->

+ 1 - 1
package-basic-data/pages/product-file/add/add.wxml

@@ -4,7 +4,7 @@
 <loading wx:if="{{loading}}" ></loading>
  
 <dk-form id="{{formName}}" routeObjName="{{routeObjName}}"uploaderMAX="1"  cardList="{{cardList}}" contentObj="{{contentObj}}"  table="{{table}}" bind:onSwitchChange = "onSwitchChange"  bind:triggerBindBlur ="triggerBindBlur" bind:openStr= "openStr"
-model:value="{{formData}}" bind:chooseData="chooseData" bindtap="handleTap"  >
+model:value="{{formData}}" bind:chooseData="chooseData" bindtap="handleTap" isCroppingFlag="{{true}}" >
 </dk-form>
  
 <view style="height: 200rpx;"></view>

+ 5 - 1
package-business-analysis/pages/detail-report/detail-report.wxml

@@ -17,8 +17,12 @@
 <!-- 显示没用更多 -->
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;">
 	<view bind:tap="export" class="btn-add-class">
 		<van-icon name="share" color="#FFFFFF" size="60rpx" />
 	</view>
+</view> -->
+
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="export">
+  <image src="{{imageUrl + 'excel.png'}} " class="edit-class" />
 </view>

+ 5 - 2
package-inventory/pages/cost-check/cost-check-list/cost-check-list.wxml

@@ -17,12 +17,15 @@
 <!-- 显示没用更多 -->
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height:220rpx;"></view>
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
+<!-- <view style="position: fixed;bottom: 230rpx;right: 30rpx;">
   <view bind:tap="export" class="btn-add-class">
     <van-icon name="share" color="#FFFFFF" size="60rpx" />
   </view>
-</view>
+</view> -->
 
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="export">
+  <image src="{{imageUrl + 'excel.png'}} " class="edit-class" />
+</view>
 
 <!--  保存 -->
 <dk-save-button wx:if="{{!showSearch}}" model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" contentLineFlag="{{true}}" btnRightFlag="{{false}}" bind:change="allChoose" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="toAdd"></dk-save-button>

+ 1 - 1
package-inventory/pages/other-outbound/other-outbound.wxml

@@ -4,7 +4,7 @@
 <loading wx:if="{{loading}}" ></loading>
 
 <dk-form-bill type="out" id="{{formName}}"routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName"   titleCol="skuModel" descCol="skuName"   quantityCol="{{quantityCol}}"   sumQuantityCol="{{sumQuantityCol}}"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods"  table="{{table}}" iconCol="imagesUrl"
-bind:delItem="setGoods" bind:setGoods="setGoods" bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" deleteName="deleteItemList" 
+bind:delItem="setGoods" bind:setGoods="setGoods" bind:clickAttach="clickAttach" bind:clickPreview="clickPreview"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" deleteName="deleteItemList" 
 cardContentList="{{cardContentList}}"
 quantityRedTitle="可售量:"
 quantityRedCol="usableQty"

+ 1 - 1
package-inventory/pages/other-warehousing/other-warehousing.wxml

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"   priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"deleteName="deleteItemList" 
+<dk-form-bill type="purInto" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"   priceCol="priceInto" pupPriceCol="sumPrice" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:clickAttach="clickAttach"  bind:clickPreview="clickPreview" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"deleteName="deleteItemList" 
 bind:delItem="setGoods" bind:setGoods="setGoods"validFlag="{{true}}" detailTipFlag="{{true}}"bindtap="handleTap">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

+ 1 - 1
package-purchase/pages/pur-receipt/add/add.wxml

@@ -4,7 +4,7 @@
 <!-- <import src="/utils/template.wxml" />
 <template is="myTemplate" /> -->
 <dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"  amountTitle="欠款金额" amountCol="arrearsResidue"
-objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"
+objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" bind:clickAttach="clickAttach" bind:clickPreview="clickPreview" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"
 saleStaffAndOrgFlag="{{false}}" 
 >
 </dk-form-bill>

+ 1 - 1
package-purchase/pages/pur-refund/add/add.wxml

@@ -4,7 +4,7 @@
 <!-- <import src="/utils/template.wxml" />
 <template is="myTemplate" /> -->
 <dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount"  amountTitle="欠款金额" amountCol="arrearsResidue"
-objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"
+objIdCol="supId" objTitle="supName"   objCol="supId" objLabel="{{$t['supName']}}" objType="supplier" cardList="{{cardList}}" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:chooseObjTypeData="chooseObjTypeData" bind:clickAttach="clickAttach" bind:clickPreview="clickPreview" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"
 saleStaffAndOrgFlag="{{false}}" 
 >
 </dk-form-bill>

+ 1 - 1
package-sales/pages/customer-collection/add/add.wxml

@@ -3,7 +3,7 @@
 <!-- 添加模版 -->
 <!-- <import src="/utils/template.wxml" />
 <template is="myTemplate" /> -->
-<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" bind:setGoods="setGoods" bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError"bind:changePhoneblur="changePhoneblur" 
+<dk-form-bill type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleCol="skuCode" descCol="skuModel" priceCol="priceStandard" quantityCol="itemQty" sumAmountCol="sumAmount" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" saleStaffAndOrgFlag="{{false}}" bind:chooseData="chooseData" bind:setGoods="setGoods" bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:customersChoose="customersChoose" popType="sale" staff="staff" org="org" bind:changeNumberBlur="changeNumberBlur" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:clickPreview="clickPreview" bind:uploadError="uploadError"bind:changePhoneblur="changePhoneblur" 
 saleStaffAndOrgFlag="{{false}}" 
 >
 </dk-form-bill>

+ 1 - 1
package-sales/pages/customer-collection/refund/refund.wxml

@@ -1,6 +1,6 @@
 <van-dialog id="van-dialog" />
 <loading wx:if="{{loading}}"></loading>
 <dk-form-bill type="sale" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" saleStaffAndOrgFlag="{{false}}" objCol="customerId" objLabel="客户名称" amountTitle="客户欠款" chooseText="{{item.button && item.button.pointFlag? '': '选客户'}}"
-pointLink="{{item.button && item.button.pointFlag}}" objType="customer" amountCol="cusDebt" sumAmountCol="sumAmount" customerReadonly="{{customerReadonly}}" bind:chooseData="chooseData" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" bind:customersChoose="customersChoose" bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumberBlur="changeNumberBlur">
+pointLink="{{item.button && item.button.pointFlag}}" objType="customer" amountCol="cusDebt" sumAmountCol="sumAmount" customerReadonly="{{customerReadonly}}" bind:chooseData="chooseData" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" bind:customersChoose="customersChoose" bind:clickAttach="clickAttach" bind:clickPreview="clickPreview" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" bind:chooseObjTypeData="chooseObjTypeData" bind:changeNumberBlur="changeNumberBlur">
 </dk-form-bill>
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="open"></dk-save-button>

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

@@ -4,7 +4,7 @@
 
 <!-- 除了编辑显示的 -->
 <dk-form-bill    type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName"  titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="calculationFormula" pupPriceCol="factAmt" priceCol="factPrice"  quantityCol="itemQty" sumAmountCol="sumAmount" sumQuantityCol="sumQuantity" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" swipeDisabled ="cannotModifyFlag" bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose"  bind:changePhoneblur="changePhoneblur" satffAndOrgReadonly="{{satffAndOrgReadonly}}" validFlag="{{true}}" 
-bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" popType="sale" priceTitle="" staff="staff" org="org"  wholeOrderDiscountCol="discount" discountAmountCol="discAmt" dataTime="{{dataTime}}" minDate="{{minDate}}" detailTipFlag="{{true}}"bindtap="handleTap"></dk-form-bill>
+bind:clickAttach="clickAttach" bind:clickPreview="clickPreview"  bind:clickPreview="clickPreview" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" popType="sale" priceTitle="" staff="staff" org="org"  wholeOrderDiscountCol="discount" discountAmountCol="discAmt" dataTime="{{dataTime}}" minDate="{{minDate}}" detailTipFlag="{{true}}"bindtap="handleTap"></dk-form-bill>
 <!-- 编辑时候显示的 -->
 <!-- <dk-form-bill wx:else  type="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="brandName"  titleCol="skuModel" iconCol="imagesUrl" descCol="skuName"  subCol="calculationFormula" pupPriceCol="factAmt" priceCol="factPrice"  quantityCol="itemQtyShowEdit" sumAmountCol="sumAmountShowEdit" sumQuantityCol="sumQuantityShowEdit" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods" table="{{table}}" swipeDisabled ="cannotModifyFlag" bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList" bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose"  bind:changePhoneblur="changePhoneblur" 
 bind:clickAttach="clickAttach"  bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" popType="sale" priceTitle="" staff="staff" org="org"    dataTime="{{dataTime}}" minDate="{{minDate}}" ></dk-form-bill> -->

+ 1 - 1
package-sales/pages/sales-outbound/add/add.wxml

@@ -5,7 +5,7 @@
 
  
 <dk-form-bill type="saleOut" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel" subCol="calculationFormula" descCol="skuName"     priceCol="factPrice" quantityCol="outingQty" sumAmountCol="sumAmount" iconCol="imagesUrl" discountStandardCol="saleDiscount" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}" pupPriceCol="factAmt"  bind:editItems="editItems" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"  bind:onCloseDel="deleteItemList" bind:customersChoose="customersChoose" popType="sale"   staff="staff" org="org" popupTopObj="{{popupTopObj}}" cardContentList="{{cardContentList}}" quantityRedTitle="可售量:" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag" goodsTagText="{{goodsTagText}}" goodsTagColor="{{goodsTagColor}}" titpsFlag="{{titpsFlag}}" titpsItemColorFlagKey="titpsItemColorFlagKey" titpsLabel="titpsLabel" readonly="{{isDetailFlag}}" isDetailFlag="{{isDetailFlag}}"dataTime="{{dataTime}}"minDate="{{dataTime}}"titleTagCol="brandName" bind:openReverseCalculationPop="openReverseCalculationPop1" reverseCalculationFlag="{{false}}"wholeOrderDiscountCol="discount"discountAmountCol="discAmt" sumAmountColTitle="折后金额"
-bind:clickAttach="clickAttach" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" bind:changePhoneblur="changePhoneblur"
+bind:clickAttach="clickAttach" bind:clickPreview="clickPreview" bind:uploadSucess="uploadSucess" bind:uploadError="uploadError" bind:changePhoneblur="changePhoneblur"
 detailTipFlag="{{true}}"bindtap="handleTap">
  
 </dk-form-bill>

+ 20 - 4
pages/mine/mine.js

@@ -122,13 +122,29 @@ Page({
    * @date : 2024/4/1
    */
   onChooseAvatar(e) {
+     let  that = this
     const {
       avatarUrl
-    } = e.detail
-    this.setData({
-      avatarUrl,
+    } = e.detail 
+    wx.navigateTo({
+      url: '/package-base-select/pages/cropper/cropper',
+      events: {
+        // 回调后
+        bindData: function (data) {  
+          that.setData({
+            avatarUrl:data,
+          })
+          that.afterRead(data) 
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据
+        res.eventChannel.emit('params', {
+          src: avatarUrl, 
+        })
+      }
     })
-    this.afterRead(avatarUrl)
+   
   },
   /**
    * @desc : 上传附件—(上传完成)