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

components/dkbase/dk-list/dk-list.wxml

@@ -132,7 +132,7 @@
                   <view style="display: flex;align-items: center;">
                     {{col.right.title}}
                   </view>
-                  <dk-number-input inputWidthFlag="{{true}}" fontSize="19" center="right" data-key="{{col.right.name}}" inputColor="#FF7B1A" fontWeight="600" inputValue="{{item[col.right.name]?item[col.right.name]:0}}" data-index="{{index}}" bind:triggerBindValue="changeAmount">
+                  <dk-number-input inputWidthFlag="{{true}}" fontSize="19" center="right" data-key="{{col.right.name}}" inputColor="#FF7B1A" fontWeight="600"  inputValue="{{item[col.right.name]?item[col.right.name]:0}}" data-index="{{fIndex}}" bind:triggerBindValue="changeNumberInput">
                   </dk-number-input>
                 </view>
                 <view wx:if="{{col.right.type !== 'price'}}" style="display: flex;">

components/dkbase/dk-multi-owner/dk-multi-owner.wxml

@@ -44,6 +44,6 @@
 
 <view class="bottom-class-1">
   <view style="position:fixed;bottom:0;z-index: 10;text-align: center;width: 100%; margin-bottom: 42rpx;">
-    <van-button color="#1B365D;" type="info" custom-style="width: 640rpx;height: 88rpx;" block round bindtap="btnOK">确定</van-button>
+    <van-button color="#3E69F6;" type="info" custom-style="width: 640rpx;height: 88rpx;" block round bindtap="btnOK">确定</van-button>
   </view>
 </view>

package-base-select/pages/select-source-sale-out-order/select-source-sale-out-order.wxss

@@ -80,12 +80,13 @@
   width: 100%;
   border-radius: 15rpx 15rpx 0px 0px;
   background-repeat: no-repeat;
-  background-size: 100% 46px;
+  background-size: 100% 95rpx;
 }
 
 .main-class-source {
-  margin: 10px 32rpx 10px 32rpx;
-  margin-top: 10px;
+  margin: 20rpx 32rpx;
+  margin-top: 20rpx;
   border-radius: 15rpx;
-  box-shadow: 0px 10px 20px 0px #0000000D;
+  box-shadow: 0px 20rpx 40rpx 0px #0000000D;
+
 }

package-inventory/pages/cost-check/add/add.js

@@ -45,6 +45,7 @@ Page({
   * @author : 于继渤
   */
   changeAmount(e) {
+    console.log('changeAmount1',e)
     let index = e.detail.index
     let key = e.detail.key
     let value = e.detail.value

package-inventory/pages/cost-check/add/add.wxml

@@ -1,5 +1,5 @@
 <!-- 列表区 -->
-<dk-list list="{{tableData}}" detailReportFlag="{{true}}" titleImageFlag="{{false}}" flgPoint="{{false}}" chooseFlag="{{false}}" bind:choose="listChoose" title="intoNo" subTitle="intoDate" status="intoStatusName" buttonList="{{popbuttonList}}" content="{{content}}" bind:changeAmount="changeAmount" contentCol="{{contentCol}}" contentObj="{{contentObj}}"></dk-list>
+<dk-list list="{{tableData}}" detailReportFlag="{{true}}" titleImageFlag="{{false}}" flgPoint="{{false}}" chooseFlag="{{false}}" bind:choose="listChoose" title="intoNo" subTitle="intoDate" status="intoStatusName" buttonList="{{popbuttonList}}" content="{{content}}" contentCol="{{contentCol}}" bind:changeNumberInput="changeAmount" contentObj="{{contentObj}}"></dk-list>
 
 <!--  保存 -->
-<dk-save-button btnAutoWidthFlag="{{true}}" contentLineFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="save"></dk-save-button>
+<dk-save-button btnAutoWidthFlag="{{true}}"  btnRightFlag="{{false}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="save"></dk-save-button>

package-inventory/pages/cost-check/cost-check.js

@@ -22,6 +22,7 @@ Page({
       type: 'checkbox'
     },],
     cardList: ['main'],
+    refreshByAdd:true,
     contentObj: {
       main: [
         { code: 'intoType', name: 'intoType', type: 'chooseAndStr', required: true, title: mixins.$t('intType'), urlKey: 'chooseIntType' },
@@ -40,6 +41,16 @@ Page({
       searchType: Constants.searchType.date
     },
     {
+      code: 'staff',
+      title: mixins.$t("staffId"),
+      dropType: 'staff'
+    },
+    {
+      code: 'org',
+      title: mixins.$t("orgId"),
+      dropType: 'org'
+    },
+    {
       code: 'choose',
       title: mixins.$t('choose'),//'筛选',
       searchType: Constants.searchType.pick
@@ -184,8 +195,16 @@ Page({
       util.showToast('请选择一条数据');
       return
     }
+    let this_ = this
     wx.navigateTo({
       url: this.data.route.add.url,
+      events: {
+        // 回调后
+        bindData: function (data) {
+      
+ 
+        }
+      },
       success: function (res) {
         // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
         res.eventChannel.emit('params', {
@@ -194,6 +213,9 @@ Page({
       }
     })
   },
+  onShow(){
+    this.searchData()
+  },
   /**
   * @desc : 选择数据源
   * @date : 2024/2/1 15:49

package-inventory/pages/cost-check/cost-check.wxml

@@ -25,7 +25,7 @@
 
 
 <!--  保存 -->
-<dk-save-button wx:if="{{!showSearch}}" model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" contentLineFlag="{{true}}" btnRightFlag="{{true}}" bind:change="allChoose" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="toAdd"></dk-save-button>
+<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>
 
 <view wx:if="{{ showSearch }}" overlay="{{false}}" style="border: 1px solid #000000;border-radius: 16rpx;box-shadow: 0px 10px 20px 0px #E1E5EE99;background: #95A8CB1A;margin:20rpx;margin-top:35%;">
   <view style="padding:10rpx;">

package-inventory/pages/other-outbound/other-outbound.js

@@ -126,13 +126,13 @@ Page({
                 name: 'collectName',
                 type: 'drop',
                 dropType: 'collect'
-            }, 
-            // {
-            //     code: 'collectAmount',
-            //     type: 'number',
-            //     title: mixins.$t('totalAmount'),
-            // }
-        ],
+            },
+                // {
+                //     code: 'collectAmount',
+                //     type: 'number',
+                //     title: mixins.$t('totalAmount'),
+                // }
+            ],
 
             other: [{
                 code: 'remarks',
@@ -204,7 +204,7 @@ Page({
                             code: 'flag',
                             title: mixins.$t('antoHandle'),
                             type: 'checkbox'
-                        }, 
+                        },
                         // {
                         //     code: 'need',
                         //     title: mixins.$t('totalAmount'),
@@ -405,7 +405,8 @@ Page({
             if (formData.outStatus == Constants.outStatus.outBounded) {
 
                 element.outQty = element.itemQty
-                element.priceOut = element.priceOut ? element.priceOut : element.priceStandard
+                element.priceOut = element.priceOut != null ? element.priceOut : element.priceStandard
+                console.log();
                 element.outAmt = element.priceOut * element.itemQty
                 element.outingAmt = 0     //  已出库金额
                 element.outingQty = 0     //  已出库数量
@@ -415,7 +416,7 @@ Page({
                 totalQuantity += Number(element.itemQty)
             } else {
                 element.outingQty = element.itemQty
-                element.priceOut = element.priceOut ? element.priceOut : element.priceStandard
+                element.priceOut = element.priceOut != null ? element.priceOut : element.priceStandard
                 element.outingAmt = element.priceOut * element.itemQty
                 element.outAmt = 0     //  已出库金额
                 element.outQty = 0     //  已出库数量
@@ -439,8 +440,8 @@ Page({
                 //合计金额
                 card.itemAmt = totalAmout
                 // card.itemQty = totalQuantity
-                 //  出库状态-已出库
-                 if (formData.outStatus == Constants.outStatus.outBounded) {
+                //  出库状态-已出库
+                if (formData.outStatus == Constants.outStatus.outBounded) {
                     card.itemQty = totalQuantity
                 } else {
                     card.outingQty = totalQuantity
@@ -565,4 +566,16 @@ Page({
             return this.excute(this.data.service, this.data.service.otheroutBoundInsert, this.data.params)
         }
     },
+    /**
+      * @desc : 处理保存后续事件
+      * @date : 2024/2/1 15:49
+      * @author : 姜永辉
+      */
+    handleSaveData() {
+        var pages = getCurrentPages();
+        var prevPage = pages[pages.length - 2]; //上一个页面
+        prevPage.setData({
+            refreshByAdd: true
+        })
+    }
 })

package-inventory/pages/other-warehousing/other-warehousing.js

@@ -158,7 +158,7 @@ Page({
     */
     loadInit() {
         // 专业版要能看到入库对象
-        if(this.data.gradeCode == Constants.gradeCode.PRO){
+        if (this.data.gradeCode == Constants.gradeCode.PRO) {
             let contentObj = this.data.contentObj
             contentObj.main.push(
                 {
@@ -170,7 +170,7 @@ Page({
                 },
             )
             this.setData({
-                contentObj:contentObj
+                contentObj: contentObj
             })
         }
 
@@ -577,13 +577,14 @@ Page({
       * @author : 姜永辉
       */
     handleSaveData() {
+        var pages = getCurrentPages();
+        var prevPage = pages[pages.length - 2]; //上一个页面
+        prevPage.setData({
+            refreshByAdd: true
+        })
+
         //购物车跳转来的
         if (this.data.formType == Constants.formType.shopping) {
-            var pages = getCurrentPages();
-            var prevPage = pages[pages.length - 2]; //上一个页面
-            prevPage.setData({
-                refreshByAdd: true
-            })
 
             setTimeout(() => {
                 wx.navigateBack({

package-sales/pages/order-return/add/add.js

@@ -1110,6 +1110,7 @@ Page({
       if (this.data.gradeCode == Constants.gradeCode.STD) { //标准 
         //处理默认值  业务员业务部门
         let buttonSaveList = this.data.buttonSaveList
+        let contentObj = this.data.contentObj
         //按钮
         buttonSaveList = [{
           code: 'refund',
@@ -1121,8 +1122,56 @@ Page({
           title: mixins.$t("save")
         }
         ],
+ 
+        contentObj.main = [{
+          code: 'cusName',
+          type: 'selectIcon',
+          urlKey: 'selectCustomers',
+          required: true,
+          readonly: false,
+          title: mixins.$t('customerName')
+        },
+        {
+          code: 'cusPhone',
+          type: 'phone',
+          title: mixins.$t('cusPhone'),
+          required: true
+        },
+        {
+          code: 'addressFull',
+          type: 'address',
+          title: mixins.$t('addressFull'),
+          required: true
+        },
+        {
+          code: 'addressNo',
+          type: 'str',
+          required: true,
+          title: mixins.$t('addressNo')
+        },
+        {
+          code: 'channelId',
+          name: 'channelName',
+          type: 'drop',
+          required: true,
+          dropType: 'saleChannel',
+          title: mixins.$t('saleChannel')
+        },
+        // {
+        //   code: 'cusFrom',
+        //   name: 'cusFromName',
+        //   type: 'drop',
+        //   required: false,
+        //   dropType: 'customerFrom',
+        //   title: mixins.$t('customerSource')
+        // },
+        ],
+    
+
+
           this.setData({
-            buttonSaveList: buttonSaveList
+            buttonSaveList: buttonSaveList,
+            contentObj: contentObj
           })
       }