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

api/pages/ivt/inboundOther.js

@@ -16,6 +16,7 @@ module.exports = {
     inBoundHandle: 'inbound_handle',
     inboundRepeal: 'repeal/',
     selectInbound:'select_inbound',
+    inBoundCancel: 'inbound_cancel',
   },
 
   routeUrl: {

api/pages/ivt/inboundProcessing.js

@@ -15,19 +15,23 @@ module.exports = {
     inboundInsert: 'inbound_insert',
     inboundUpdate: 'inbound_update',
     inboundRepeal: 'repeal/',
+    inBoundCancel: 'inbound_cancel',
   },
 
   routeUrl: {
     inboundProcessing: {
+      returnCancel: { key: 'returnCancel', method: 'returnCancel' },
       invaidOrder: { key: 'invaidOrder', method: 'invaidOrder' },
       editOrder: { key: 'editOrder', method: 'editOrder', primaryKey: 'intoId' },
       addReturn: {
-        key: 'addReturn', url: '/package-purchase/pages/purchase-return/add/add', formMode: 'edit'
+        key: 'addReturn', url: '/package-sales/pages/order-return/add/add'
       },
       detailInProcessing: { key: 'detailInProcessing', url: '/package-inventory/pages/warehousing-processing/detail/detail', },
       detail: { key: 'detail', url: '/package-purchase/pages/purchase-receipt/detail/detail' },
       add: { key: 'add', url: '/package-purchase/pages/purchase-receipt/add/add' },
       edit: { key: 'edit', url: '/package-inventory/pages/warehousing-processing/detail/detail' },
+      // 销售退货的办理详细
+      editReturn: { key: 'editReturn', url: '/package-inventory/pages/outbound-processing/detail/detail' },
       addOther: { key: 'addOther', url: '/package-inventory/pages/other-warehousing/other-warehousing' },
       chooseSupplier: { key: 'chooseSupplier', url: '/package-base-select/pages/select-data/select-data', type: 'supplier' },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data', type: 'staff' },

api/pages/mst/org.js

@@ -21,6 +21,7 @@ module.exports = {
           // 客户跟进
           chooseOrg: { key: 'chooseOrg', url: '/package-basic-data/pages/org/choose-org/choose-org'  },
           staffAdd: {key: 'add', url: '../staff/add/add'},
-        }
+          subOrgChoose: {key: 'subOrgChoose', url: '/package-basic-data/pages/org/sub-org-choose/sub-org-choose'},
+        } 
     }
 };

app.json

@@ -52,7 +52,8 @@
                 "pages/customer-follow-up/follow-up-tasks/follow-up-tasks",
                 "pages/role/role",
                 "pages/role/add/add",
-                "pages/org/choose-org/choose-org"
+                "pages/org/choose-org/choose-org",
+                "pages/org/sub-org-choose/sub-org-choose"
             ]
         },
         {
@@ -88,11 +89,10 @@
             "name": "package-inventory",
             "pages": [
                 "pages/choose-product/choose-product",
-                "pages/warehousing-processing/warehousing-processing", 
-                "pages/warehousing-processing/detail/detail",               
+                "pages/warehousing-processing/warehousing-processing",
+                "pages/warehousing-processing/detail/detail",
                 "pages/other-warehousing/other-warehousing",
-                "pages/outbound-processing/outbound-processing",              
-              
+                "pages/outbound-processing/outbound-processing",
                 "pages/outbound-processing/detail/detail",
                 "pages/other-outbound/other-outbound",
                 "pages/inventory-adjustment/inventory-adjustment",
@@ -157,7 +157,7 @@
                 "pages/fund-journal/fund-journal",
                 "pages/supplier-transaction-table/supplier-transaction-table",
                 "pages/fund-account/fund-account",
-                "pages/fund-account/add/add" 
+                "pages/fund-account/add/add"
             ]
         },
         {
@@ -199,7 +199,7 @@
                 "pages/select-source-purchase-order/select-source-purchase-order",
                 "pages/select-source-purchase-order-reversal/select-source-purchase-order-reversal",
                 "pages/select-fund-account/select-fund-account",
-                "pages/select-source-sale-order/select-source-sale-order" 
+                "pages/select-source-sale-order/select-source-sale-order"
             ]
         }
     ],
@@ -326,7 +326,7 @@
         "dk-drag-to-sort": "components/dkbase/dk-drag-to-sort/dk-drag-to-sort",
         "dk-multi-owner": "components/dkbase/dk-multi-owner/dk-multi-owner",
         "dk-collapse-item-more": "components/dkbase/dk-collapse-item-more/dk-collapse-item-more",
-        "dk-drag":"components/dkbase/dk-drag/index"
+        "dk-drag": "components/dkbase/dk-drag/index"
     },
     "tabBar": {
         "color": "#95A8CB",

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

@@ -73,7 +73,7 @@
               </view>
             </van-field>
             <!--数字类-->
-            <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{itemt[item.code + '_errMsg']}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{itemt[item.code]}}" readonly="{{!!readonly || !!item.readonly || !form[objIdCol] || (item.control && !itemt[item.control])}}" bind:triggerBindValue="changeItemNumberField"></dk-number-input>
+            <dk-number-input wx:if="{{item.type=='number'}}" sign="{{(item.sign || item.sign == '')?item.sign:'¥'}}" digits="{{(item.digits || item.digits == 0)?item.digits:2}}" fontSize="14" left="30rpx" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" center="left" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" errorMessage="{{itemt[item.code + '_errMsg']}}" titleValue="{{item.title?item.title:$t[item.code]}}" inputColor="#CAA977" titleFontWeight="{{item.required?'bold':'normal'}}" titleColor="{{item.required?'#E4002B':'#95A8CB'}}" inputValue="{{itemt[item.code]}}" readonly="{{!!readonly || !!item.readonly || (objIdCol && !form[objIdCol]) || (item.control && !itemt[item.control])}}" bind:triggerBindValue="changeItemNumberField"></dk-number-input>
             <!--备注-->
             <van-field wx:if="{{item.type=='textarea'}}" type="textarea" label-class="{{item.required?'red-label':'nomal-label' }}" data-key="{{item.code}}" data-item="{{item}}" data-index="{{indext}}" data-card="{{card.name}}" value="{{ itemt[item.code]}}" input-align="left" label="{{item.title?item.title:$t[item.code]}}" placeholder="{{wxmlUtil.setPlaceholder($t,item.title?item.title:item.code)}}" clearable autosize border="{{ false }}" readonly="{{!!readonly || !!item.readonly|| !form[objIdCol]}}" input-class="dk-cell-value-class" maxlength="{{item.maxlength?item.maxlength:500}}" right-icon="{{item.rightIcon}}" bind:change="changeItemField" bind:clear="clearItemField" errorMessage="{{itemt[item.code + '_errMsg']}}">
             </van-field>

components/dkbase/dk-tree-form/dk-tree-form.wxml

@@ -13,8 +13,7 @@
            
         </view>
     </view>
-    <!-- 列表下半部分 -->
-
+    <!-- 列表下半部分 --> 
     <view class="{{!item[parentIdKey]?'list-below-item':''}}">
         <block>
 

i18n/zh-CN.js

@@ -29,6 +29,7 @@ const button = {
   invalid: '无效',
   collapse: '收起',
   expand: '展开',
+  returnCancel:'撤销',
   invaidOrder: '作废',
   ticketPirnt: '票据打印',
   totalAmount: '合计金额',

package-accounts-manage/pages/fund-account/add/add.js

@@ -9,6 +9,7 @@
  *******************************************************************************/
 const mixins = require('@/mixins/index.js')
 const Constants = require('@/utils/Constants')
+const app = getApp()
 Page({
     mixins: [mixins],
     /**
@@ -54,7 +55,7 @@ Page({
                     type: 'number',
                     title: mixins.$t('openingBalance')
                   },
-                  { code: 'deliveryDate', type: 'date', title: mixins.$t('balanceDate') }
+                  { code: 'accDate', type: 'date', title: mixins.$t('balanceDate') }
             ],
             other: [ //备注
                 { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
@@ -65,7 +66,7 @@ Page({
     },
     /**
      * @desc   : 处理数据-保存和查询后的逻辑
-     * @author : 姜永辉
+     * @author : 王英杰
      * @date   : 2024/1/26 11:46
      */
     handleData() {
@@ -95,11 +96,17 @@ Page({
     /**
      * @desc : 保存的參數設置
      * @date : 2024/2/1 15:49
-     * @author : 姜永辉
+     * @author : 王英杰
      */
     setParams(params) {
-        params.roleIds = (params.roleIds && params.roleIds.length > 0) ? params.roleIds.split(',') : []
-        params.accDate=new Date().toDateStr()  
+        let formData = JSON.parse(this.data.formData)
+        params =  formData
+        params.balance = params.balance||0
+        params.initBalance = params.balance
+        params.makeStaff = app.globalData.user.staffId
+        params.orgId = app.globalData.user.orgId
+        params.staffId = app.globalData.user.staffId 
+       params.accDate=  params.accDate || new Date().toDateStr()  
         return params
     },
 
@@ -119,7 +126,7 @@ Page({
     /**
      * @desc : 给表单赋值
      * @date : 2024/2/1 15:49
-     * @author : 姜永辉
+     * @author : 王英杰
      */
     setValuesByEdit(data) {
         data.roleIds = (data.roleIds && data.roleIds.length > 0) ? data.roleIds.join(',') : undefined

package-accounts-manage/pages/fund-account/fund-account.js

@@ -19,7 +19,7 @@ Page({
    */
   data: {
     pageFlag:false,
-    btnFormData:null,
+    btnFormData:'{\"flag\":true}',
     buttonList: [{
       name: 'merge',
       title: mixins.$t("add"), //'保存'
@@ -29,7 +29,7 @@ Page({
       title: mixins.$t("enable"), 
       type: 'checkbox'
   },  ],
-  checked:false, //停用 启用 标识
+  checked:true, //停用 启用 标识
     // 路由
     routeObjName: 'moneyAccount',
   },

package-accounts-manage/pages/funds-transfer/add/add.js

@@ -1,24 +1,26 @@
 const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants.js');
 Page({
   mixins: [mixins],
   /**
    * 页面的初始数据
    */
   data: {
- // 弹出按钮
- buttonList: [{
-  name: 'merge',
-  title: mixins.$t('collection')
-}],
-contentList: [{
-  code: 'need',
-  title: mixins.$t('totalAmount'),
-  type: 'str'
-}, {
-  code: 'amount',
-  content: 0,
-  type: 'number'
-}],
+    table: Constants.tables.macTransfer,
+    // 弹出按钮
+    buttonList: [{
+      name: 'merge',
+      title: mixins.$t('collection')
+    }],
+    contentList: [{
+      code: 'need',
+      title: mixins.$t('totalAmount'),
+      type: 'str'
+    }, {
+      code: 'amount',
+      content: 0,
+      type: 'number'
+    }],
     cardList: [{
       name: 'main'
     }, {
@@ -29,40 +31,41 @@ contentList: [{
     }],
     contentObj: {
       main: [{
-        code: 'staffId',
-        name: 'staffName',
-        title: '经手人', //'经手人',mixins.$t("procureStaff")
-        type: 'choose',
-        urlKey: 'chooseStaff'
-      },
-      {
-        code: 'orgId',
-        name: 'orgName',
-        title: '经手部门',
-        type: 'choose',
-        urlKey: 'chooseOrg'
-      },
+          code: 'staffId',
+          name: 'staffName',
+          title: '经手人', //'经手人',mixins.$t("procureStaff")
+          type: 'choose',
+          urlKey: 'chooseStaff'
+        },
+        {
+          code: 'orgId',
+          name: 'orgName',
+          title: '经手部门',
+          type: 'choose',
+          urlKey: 'chooseOrg'
+        },
 
       ],
       items: [{
-        code: 'accountOut',
-        name: 'accountOutName',
-        title: '转出账户',
-        type: 'choose',
-        urlKey: 'chooseMoneyAccount'
-      },
-      {
-        code: 'accountInto',
-        name: 'accountIntoName',
-        title: '转入账户',
-        type: 'choose',
-        urlKey: 'chooseMoneyAccount'
-      }, {
-        code: 'collectAmount',
-        type: 'number',
-        title: '转出金额',
-        required: true
-      }
+          code: 'accountOut',
+          name: 'accountOutName',
+          title: '转出账户',
+          type: 'choose',
+          urlKey: 'chooseMoneyAccount'
+        },
+        {
+          code: 'accountInto',
+          name: 'accountIntoName',
+          title: '转入账户',
+          type: 'choose',
+          urlKey: 'chooseMoneyAccount'
+        }, {
+          code: 'collectAmount',
+          type: 'number',
+          title: '转出金额',
+          required: true,
+          control:'accountOut'
+        }
       ],
       file: [{
         code: 'remarks',
@@ -77,18 +80,18 @@ contentList: [{
     // 路由
     routeObjName: 'transfer',
   },
- 
 
- 
 
- 
-   /**
-     * @desc   : 表单选择回调
-     * @author : 王英杰
-     * @date   : 2024/1/26 11:46
-     */
-  chooseData(e){
-    console.log("t",e,this.data.formData);
+
+
+
+  /**
+   * @desc   : 表单选择回调
+   * @author : 王英杰
+   * @date   : 2024/1/26 11:46
+   */
+  chooseData(e) {
+    console.log("t", e, this.data.formData);
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
     let data = e.detail.data.data
@@ -100,10 +103,49 @@ contentList: [{
       formData.orgId = data.id
       formData.orgName = data.name
     }
-  
+
     this.setData({
       formData: JSON.stringify(formData)
     })
   },
+  /**
+   * @desc : 保存的參數設置
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setParams(params) {
+    let formData = JSON.parse(this.data.formData)
+    //收付款类型-收款的查询参数
+    params.objectType = '对象类型-供应商'
+    params.objectId = formData.objInfo.cusId
+    params.orgId = formData.orgId //组织部门
+    params.staffId = formData.staffId // 员工
+    params.accDate = formData.accDate
+    params.annexPaths = formData.annexPaths || [] //附件 
+    params.remarks = formData.remarks // 备注
+    params.makeStaff = app.globalData.user.staffId // 制单人 
+    let itemList = []
+    let itemNumber = 0
+    formData.itemList.forEach(element => {
+      if (!isNaN(element.amtPayable)) { //是数字才能加减
+        itemNumber = Number(itemNumber) + Number(element.amtPayable)
+      }
+      let item = {}
+      item.payableType = element.dataId //收入类别
+      item.amtPayable = element.amtPayable //收入金额  
+      itemList.push(item)
+    });
+    params.itemList = itemList //商品明细 
+    params.sumAmtPayable = itemNumber
+    return params
+  },
 
+  /**
+   * @desc : 保存数据服务
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  saveData() { 
+      return this.excute(this.data.service, this.data.service.insert, this.data.params) 
+  },
 })

package-accounts-manage/pages/funds-transfer/add/add.wxml

@@ -4,7 +4,7 @@
 
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 
-<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" dateCol="accountDate" dateLabel="付款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+<dk-form-more-items id="{{formName}}" routeObjName="{{routeObjName}}" dateCol="accountDate" dateLabel="付款日期"   cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" objIdCol="" bind:chooseData="chooseData"  table="{{table}}">
 </dk-form-more-items>
 
 <view style="height: 220rpx;"></view>

package-basic-data/pages/org/org.js

@@ -17,93 +17,93 @@ Page({
    * 页面的初始数据
    */
   data: {
-       // 查询条件
-   searchContent: [],
-    form: null,    //新建的数据form
+    // 查询条件
+    searchContent: [],
+    form: null, //新建的数据form
     // 路由
-    routeObjName: 'org',  // 路由
-    popContent: [{    //新建的 各个控件信息
+    routeObjName: 'org', // 路由
+    popContent: [{ //新建的 各个控件信息
       code: 'orgCode',
-      type: 'str', 
+      type: 'str',
       name: 'orgCode',
       required: false
-    },{ //父级
+    }, { //父级
       code: 'parentId',
       name: 'parentName',
       title: 'parentName',
-      type: 'choose', 
+      type: 'choose',
       urlKey: 'chooseOrg',
       required: true
-    },{ //部门名称
+    }, { //部门名称
       code: 'orgName',
       type: 'str',
       name: 'orgName',
       required: true
-    }, {//备注
+    }, { //备注
       code: 'Remarks',
       type: 'str',
       title: mixins.$t("remarks"),
       required: false
-    } ],
+    }],
 
   },
 
- 
-     
-     /**
+
+
+  /**
    * @desc :设置查询参数
    * @date : 2024/2/1 15:49
    * @author : 王英杰
-   */ 
-  setSearchParams(params){
+   */
+  setSearchParams(params) {
     params.pageSize = 100000
-    params.currentPage = 1 
+    params.currentPage = 1
     return params
   },
-   
-     /**
+
+  /**
    * @desc :打开新建
    * @date : 2024/2/1 15:49
    * @author : 王英杰
-   */ 
+   */
   toadd() {
     this.setData({
       showPop: true
     })
-  }, 
-  
-   /**
+  },
+
+  /**
    * @desc :关闭新建框（弹出的popup）
    * @date : 2024/2/1 15:49
    * @author : 王英杰
-   */ 
+   */
   onClosePopup() {
     this.setData({
       showPop: false
     })
   },
-    /**
-     * @desc   : 关闭Pop后修改数据
-     * @author : 王英杰
-     * @date   : 2024/1/26 11:46
-     */
-    editItems(data) {
-      console.log('data', data);
-      
-      let params = {
-        ...this.data.params,
-        ...data.detail.form
-      };
-      params.cpId = 1
-      return this.excute(this.data.service, this.data.service.insert, params);
-    },
- 
- 
-     /**
+  /**
+   * @desc   : 关闭Pop后修改数据
+   * @author : 王英杰
+   * @date   : 2024/1/26 11:46
+   */
+  editItems(data) {
+    console.log('data', data);
+
+    let params = {
+      ...this.data.params,
+      ...data.detail.form
+    };
+    params.cpId = 1
+    return this.excute(this.data.service, this.data.service.insert, params);
+  },
+
+
+  /**
    * @desc :打开选择客户
    * @date : 2024/2/1 15:49
    * @author : 王英杰
-   */ 
+   */
   openChooseOrg() {
     let that = this
     let addForm = that.data.addForm
@@ -129,26 +129,26 @@ Page({
   },
 
   /**
-  * @desc : 跳转员工新建
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
- toAddStaff() {
-  let _this = this
-  wx.navigateTo({
-    url: this.data.route.staffAdd.url,
-    events: {
-      // 回调后，在这里给页面赋值
-      bandData: function (e) {
-        _this.getData()
+   * @desc : 跳转员工新建
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  toAddStaff() {
+    let _this = this
+    wx.navigateTo({
+      url: this.data.route.staffAdd.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          _this.getData()
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {})
       }
-    },
-    success: function (res) {
-      // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-      res.eventChannel.emit('params', {})
-    }
-  })
-},
+    })
+  },
   /**
    * @desc : 查询
    * @date : 2024/2/1 15:49
@@ -162,28 +162,71 @@ Page({
    * @date : 2024/2/1 15:49
    * @author : 王英杰
    */
-  handleSearchData(data) {
-   
+  handleSearchData(data) { 
     this.setData({
-      tableData: util.convertToChildren(data, "parentId", "orgId", null) ,
- 
+      tableData: util.convertToChildren(data, "parentId", "orgId", null), 
     })
     const myComponent = this.selectComponent('#treeSelect');
     myComponent.setDataFromPage(this.data.tableData);
   },
-   /**
+  /**
    * @desc :保存接口的 后续处理方法
    * @date : 2024/2/1 15:49
    * @author : 王英杰
-   */ 
-  handleData(data) {
-   
+   */
+  handleData(data) { 
     this.setData({
-      showPop: false,
- 
+      showPop: false, 
+    })
+    this.searchData()
+  },
+  /**
+   * @desc :初始化
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  loadInit() {
+    this.setData({
+      orgName: app.globalData.user.orgName
+    })
+  },
+  /**
+   * @desc :列表收起 打开 下拉
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  onchange(e) {
+    let index = e.currentTarget.dataset.index;
+    let open = e.currentTarget.dataset.open;
+    let tableData = this.data.tableData
+    tableData[index].open = !open
+    this.setData({
+      tableData: tableData,
+    })
+  },
+    /**
+   * @desc : 跳转跳转三级部门
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  toSubOrg(e) {
+    let _this = this
+    let dataset = e.currentTarget.dataset;
+    let chooseOrgSort = this.data.orgName+"->"+dataset.item.orgName+"->"+dataset.item_.orgName
+    wx.navigateTo({
+      url: this.data.route.subOrgChoose.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          // _this.getData()
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {
+          item: {parentId:dataset.item_.orgId,chooseOrgSort:chooseOrgSort}
+        })
+      }
     })
-  this.searchData()
   },
-
- 
 })

package-basic-data/pages/org/org.wxml

@@ -4,14 +4,14 @@
 <loading wx:if="{{loading}}"></loading>
 <!-- 粘性布局的查询条件 -->
 <van-sticky scroll-top="0">
-   <!-- 查询条件 -->
-   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orgId'])}}">
-  </dk-dropdown-menu>
+    <!-- 查询条件 -->
+    <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orgId'])}}">
+    </dk-dropdown-menu>
     <view style="display: flex; padding: 4vw; background: white;">
         <view class="image-frame">
             <van-image round width="20rpx" height="24rpx" src="/static/image/Vector.png" />
         </view>
-        <view>todo: 沈阳蒙娜丽莎红星美凯龙专营店</view>
+        <view>{{orgName}}</view>
     </view>
 </van-sticky>
 
@@ -19,9 +19,37 @@
 <van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 
 <!-- 列表 -->
- 
-<dk-tree-form treeList="{{tableData}}" idKey="orgId" nameKey="orgName" parentIdKey="parentId" itemListKey="children" id="treeSelect" bind:onclick="treeClick"></dk-tree-form>
+<view wx:for="{{tableData}}" class="Outer-frame">
+    <!-- 列表上半部分 -->
+    <view style="display: flex;padding:3vw;background: linear-gradient(to right,#A8D0EF, #DAEFFF);border-radius: 15rpx 15rpx 0 0 "data-open="{{item.open}}"data-item = "{{item}}"data-index = "{{index}}" bindtap="onchange">
+        <view style="display: flex;flex: 1;" >
+            <van-image round width="35rpx" height="35rpx" src="/static/image/summarize.png" />
+            <view style="margin-left:5vw;font-size: 16px;">{{item.orgName}}</view>
+        </view>
+        <view style=" text-align: right;" >
+            <van-icon wx:if="{{ item.open }}" color="#bdb7b7" name="arrow-down" />
+            <van-icon wx:else color="#bdb7b7" name="arrow" />
 
+        </view>
+    </view>
+    <!-- 列表下半部分 -->
+    <view wx:if="{{ !item.open}}" wx:for="{{item.children}}"wx:for-item="item_" wx:for-index="index_" class="list-below-item">
+        <view style="width: 100vw; display:flex;align-items:center; font-size:36rpx;margin-top: 5px;">
+            <view class="tree_left">
+                <van-image round width="40rpx" height="40rpx" src="/static/image/tree.png" />
+            </view>
+            <view style="margin-left: 5vw;font-size: 14px;" data-item="{{item}}" data-type="sub" data-open="{{item.open}}" bindtap="clickName">
+                {{item_.orgName}}
+            </view>
+            <view style="width: 100%;flex:1;text-align: right;" bindtap="toSubOrg" data-item = "{{item}}"data-item_ = "{{item_}}">
+                <van-icon color="#bdb7b7" name="arrow" />
+            </view>
+        </view>
+        
+    </view>
+
+
+</view>
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
 <view style="height: 135rpx;"></view>
 
@@ -29,13 +57,13 @@
 <view class="bottom-class-org">
     <view style="padding:10rpx 34rpx 61rpx 43rpx; display: flex;">
         <view style="width: 50%;padding: 4vw;">
-            <van-button round plain size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="toAddStaff"  type="info">
-              {{$t['newStaff']}}
+            <van-button round plain size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="toAddStaff" type="info">
+                {{$t['newStaff']}}
             </van-button>
         </view>
         <view style="width: 50%;padding: 4vw;">
-            <van-button round size="large" color="#20365E" custom-style="height:88rpx;" bind:click="toadd"   type="default">
-              {{$t['newSubOrg']}}
+            <van-button round size="large" color="#20365E" custom-style="height:88rpx;" bind:click="toadd" type="default">
+                {{$t['newSubOrg']}}
             </van-button>
 
         </view>
@@ -43,10 +71,7 @@
 </view>
 
 
- 
+
 <!-- 新建 框 -->
-<dk-popup routeObjName="{{routeObjName}}" type="basic"  
- priceCol="pricePromotion" subCol="desc"  
- title="{{$t['newDepartment']}}" defaultFlagTitle="默认" value="{{form}}" show="{{showPop}}" 
- contentObj="{{popContent}}" bind:commit="editItems" validFlag ="{{true}}">
+<dk-popup routeObjName="{{routeObjName}}" type="basic" priceCol="pricePromotion" subCol="desc" title="{{$t['newDepartment']}}" defaultFlagTitle="默认" value="{{form}}" show="{{showPop}}" contentObj="{{popContent}}" bind:commit="editItems" validFlag="{{true}}">
 </dk-popup>

package-basic-data/pages/org/org.wxss

@@ -27,4 +27,10 @@
      background: #20365E;
      
   } */
- 
+  .Outer-frame{
+    background: white;margin:3vw;border-radius: 15rpx;
+}
+.list-below-item{
+    padding-right: 3vw;
+    padding-bottom: 3vw;
+}

package-basic-data/pages/org/sub-org-choose/sub-org-choose.js

@@ -0,0 +1,189 @@
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息：
+ *		1.程序名称：
+ *		2.组织机构列表
+ * 编辑履历：
+ *		作者				日期					版本				修改内容
+ *		王英杰		   2024-2-12	    1.00		   	    
+ *******************************************************************************/
+const Constants = require('@/utils/Constants.js');
+const mixins = require('@/mixins/index.js')
+const util = require('@/utils/util.js')
+const app = getApp()
+Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 查询条件
+    searchContent: [],
+    form: null, //新建的数据form
+    // 路由
+    routeObjName: 'org', // 路由
+    popContent: [{ //新建的 各个控件信息
+      code: 'orgCode',
+      type: 'str',
+      name: 'orgCode',
+      required: false
+    }, { //父级
+      code: 'parentId',
+      name: 'parentName',
+      title: 'parentName',
+      type: 'choose',
+      urlKey: 'chooseOrg',
+      required: true
+    }, { //部门名称
+      code: 'orgName',
+      type: 'str',
+      name: 'orgName',
+      required: true
+    }, { //备注
+      code: 'Remarks',
+      type: 'str',
+      title: mixins.$t("remarks"),
+      required: false
+    }],
+
+  },
+
+
+
+  /**
+   * @desc :设置查询参数
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setSearchParams(params) {
+    params.pageSize = 100000
+    params.currentPage = 1
+    params.parentId = this.data.item.parentId
+    return params
+  },
+
+  /**
+   * @desc :打开新建
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  toadd() {
+    this.setData({
+      showPop: true
+    })
+  },
+
+  /**
+   * @desc :关闭新建框（弹出的popup）
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  onClosePopup() {
+    this.setData({
+      showPop: false
+    })
+  },
+  /**
+   * @desc   : 关闭Pop后修改数据
+   * @author : 王英杰
+   * @date   : 2024/1/26 11:46
+   */
+  editItems(data) {
+    console.log('data', data);
+
+    let params = {
+      ...this.data.params,
+      ...data.detail.form
+    };
+    params.cpId = 1
+    return this.excute(this.data.service, this.data.service.insert, params);
+  },
+
+
+  /**
+   * @desc :打开选择客户
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  openChooseOrg() {
+    let that = this
+    let addForm = that.data.addForm
+    wx.navigateTo({
+      // url: "./add/add",
+      url: this.data.route.toAdd.url,
+      events: {
+        bindData: function (e) {
+          console.log('e', e);
+          addForm.parentOrgName = e.data.name
+          addForm.parentId = e.data.id
+          that.setData({
+            addForm
+          })
+        }
+      },
+      success: function (res) {
+        res.eventChannel.emit('params-org', {
+          url: ''
+        })
+      }
+    })
+  },
+
+ 
+  /**
+   * @desc : 查询
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.selectByCond, params);
+  },
+  /**
+   * @desc : 查询 后续处理
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  handleSearchData(data) { 
+    // this.setData({
+    //   tableData: util.convertToChildren(data, "parentId", "orgId", null), 
+    // }) 
+  },
+  /**
+   * @desc :保存接口的 后续处理方法
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  handleData(data) { 
+    this.setData({
+      showPop: false, 
+    })
+    this.searchData()
+  },
+ 
+  
+    /**
+   * @desc : 跳转跳转三级部门
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  toSubOrg(e) {
+    let _this = this
+    let dataset = e.currentTarget.dataset;
+    let chooseOrgSort = this.data.item.chooseOrgSort+"->"+dataset.item.orgName 
+    wx.navigateTo({
+      url: this.data.route.subOrgChoose.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          // _this.getData()
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {
+            item: {parentId:dataset.item.orgId,chooseOrgSort:chooseOrgSort}
+        })
+      }
+    })
+  },
+})

package-basic-data/pages/org/sub-org-choose/sub-org-choose.json

@@ -0,0 +1,6 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "部门档案",
+    "enablePullDownRefresh": true,
+    "backgroundTextStyle": "light"
+  }

package-basic-data/pages/org/sub-org-choose/sub-org-choose.wxml

@@ -0,0 +1,49 @@
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<!-- 加载图层 -->
+<loading wx:if="{{loading}}"></loading>
+<!-- 粘性布局的查询条件 -->
+<van-sticky scroll-top="0">
+    <!-- 查询条件 -->
+    <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orgId'])}}">
+    </dk-dropdown-menu>
+    <view style="display: flex; padding: 4vw; background: white;">
+        <view class="image-frame">
+            <van-image round width="20rpx" height="24rpx" src="/static/image/Vector.png" />
+        </view>
+        <view>{{item.chooseOrgSort}}</view>
+    </view>
+</van-sticky>
+
+<!-- 暂无数据 -->
+<van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
+
+<!-- 列表 -->
+<view wx:for="{{tableData}}" class="Outer-frame"> 
+    <view    class="list-below-item">
+        <view style="width: 100vw; display:flex;align-items:center; font-size:36rpx;margin-top: 5px;">
+            <view class="tree_left">
+                <van-image round width="40rpx" height="40rpx" src="/static/image/tree.png" />
+            </view>
+            <view style="margin-left: 5vw;font-size: 14px;" data-item="{{item}}"   bindtap="clickName">
+                {{item.orgName}}
+            </view>
+            <view style="width: 100%;flex:1;text-align: right;" bindtap="toSubOrg" data-item = "{{item}}" >
+                <van-icon color="#bdb7b7" name="arrow" />
+            </view>
+        </view>
+        
+    </view>
+
+
+</view>
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
+<view style="height: 135rpx;"></view>
+
+ 
+
+
+
+<!-- 新建 框 -->
+<dk-popup routeObjName="{{routeObjName}}" type="basic" priceCol="pricePromotion" subCol="desc" title="{{$t['newDepartment']}}" defaultFlagTitle="默认" value="{{form}}" show="{{showPop}}" contentObj="{{popContent}}" bind:commit="editItems" validFlag="{{true}}">
+</dk-popup>

package-basic-data/pages/org/sub-org-choose/sub-org-choose.wxss

@@ -0,0 +1,36 @@
+.image-frame {
+    width: 39rpx;
+    height: 39rpx;
+    background-color: #95A8CB;
+    border-radius: 50%;
+    margin-top: 5rpx;
+    margin-right: 3vw;
+}
+
+.list-below-item {
+    padding: 3vw 5vw 3vw 8vw;
+    display: flex;
+
+}
+.bottom-class-org{
+    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;
+  }
+  /* .v-button{
+     background: #20365E;
+     
+  } */
+  .Outer-frame{
+    background: white;margin:3vw;border-radius: 15rpx;
+}
+.list-below-item{
+    padding-right: 3vw;
+    padding-bottom: 3vw;
+}

package-inventory/pages/warehousing-processing/detail/detail.js

@@ -110,8 +110,12 @@ Page({
     setValuesByEdit(data) {
         let cardList_ = this.data.cardList
         let contentList_ = this.data.contentList
-        let sumitemAmt = 0
-        let formType = this.data.formType
+        let sumitemAmt = 0 
+        // 入库对象
+        if (data.intoType == Constants.intoType.other) {
+            data.intoObject = (data.supId!=null)?data.supId:data.cusId
+            data.intoObjectName = (data.supplierName!=null)?data.supplierName:data.cusName
+        }       
         //  入库状态-已入库
         if (data.intoStatus == Constants.intoStatus.inBounded) {
             //查询采购订单表 未入库的 详细 
@@ -133,7 +137,7 @@ Page({
         sumitemAmt =   Number(data.intoingAmt)
         cardList_.forEach(card => {
             if (card.name === 'items') {
-                if (formType == 1) {
+                if (data.intoStatus == Constants.intoStatus.inBounding) {
                     card.info = "（" + mixins.$t("warehousingProcessing") + "）"
                     card.color = "#E4002B"
                 } else {
@@ -471,7 +475,7 @@ Page({
                 cardList,
             })
         } else {
-            // 采购退货
+            // 销售退货
             cardList = [{
                 name: 'warehouse'
             }, {
@@ -562,7 +566,7 @@ Page({
                     })
                 }
             })
-            // 采购退货
+            // 销售退货
         } else {
             wx.navigateTo({
                 url: this.data.route.addReturn.url,
@@ -573,7 +577,8 @@ Page({
                 success: function (res) {
                     res.eventChannel.emit('params', {
                         id: id,
-                        formMode: Constants.formMode.edit
+                        formMode: Constants.formMode.other,
+                        formType: Constants.formType.edit,
                     })
                 }
             })

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

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright(c) 2022 dongke All rights reserved. / Confidential
  * 类的信息：
- *		1.程序名称：  入库办理列表
+ *		1.程序名称：  入库办理列表-采购入库 其它入库 销售退货出库的数据240408
  * 编辑履历：
  *		作者				日期					版本				修改内容
  *		姜永辉      2024-03-12   1.00		   	    
@@ -179,7 +179,7 @@ Page({
     // 路由
     routeObjName: 'inboundProcessing',
     inboundOtherService: app.globalData['inboundOtherService'],
-    inboundReturnService: app.globalData['inboundReturnService'],
+    outboundSaleReturnService: app.globalData['outboundSaleReturnService'],
     // active
     active: 0,
     // 主键Id
@@ -196,6 +196,20 @@ Page({
     this.setData({
       active: index,
     })
+    let buttonList = this.data.buttonList
+    buttonList = buttonList.filter(item => item.name !== 'returnCancel')
+    console.log();
+    if (index == 1 && buttonList.length == 3) {
+      buttonList.push(
+        {
+          name: 'returnCancel',
+          title: mixins.$t('returnCancel'),
+        }
+      )
+    }
+    this.setData({
+      buttonList,
+    })
     this.searchData()
   },
 
@@ -213,6 +227,39 @@ Page({
       }
     })
   },
+
+  /**
+   * @desc : 跳转明细
+   * @author : 周兴
+   * @date : 2024/1/22
+   */
+  toDetail(e) {
+    console.log(e, "toDetail");
+    if (e) {
+      let item = null;
+      if (e.currentTarget.dataset.item) {
+        item = e.currentTarget.dataset.item
+      }
+      if (!e.detail) {
+        e.detail = {
+        }
+      }
+      if (item) {
+        e.detail.item = item;
+      }
+      if (e.detail.item) {
+        let button = {
+          formMode: Constants.formMode.edit
+        }
+        e.detail.item.button = button
+      }
+      // 如果name不传递，默认为edit
+
+      e.detail.name = 'edit'
+    }
+    this.open(e);
+  },
+
   /**
    * @desc : 设置查询参数
    * @date : 2024年3月8日
@@ -224,7 +271,7 @@ Page({
       params.intoStatus = Constants.intoStatus.inBounding
       params.outStatus = Constants.outStatus.outBounding
     }
-    if (this.data.active == 1) {       
+    if (this.data.active == 1) {
       //已入库的查询参数 
       params.intoStatus = Constants.intoStatus.inBounded
       params.outStatus = Constants.outStatus.outBounded
@@ -299,12 +346,47 @@ Page({
       contentnFootList,
     })
   },
-
   /**
-    * @desc : （编辑）
+    * @desc : （撤销）
     * @date : 2024/2/1 15:49
     * @author : 姜永辉
     */
+  returnCancel(e) {
+    let item = e
+    let id = item.intoId
+    // 采购入库
+    if (item.intoType == Constants.intoType.pur) {
+      this.excute(this.data.service, this.data.service.inBoundCancel, item).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
+          // 重新查询
+          this.searchData()
+        }
+      })
+    }
+    // 其他入库
+    else if (item.intoType == Constants.intoType.other) {
+      this.excute(this.data.inboundOtherService, this.data.inboundOtherService.inBoundCancel, item).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
+          // 重新查询
+          this.searchData()
+        }
+      })
+      // 销售退货
+    } else {
+      this.excute(this.data.outboundSaleReturnService, this.data.outboundSaleReturnService.cancel, { outId: id }).then(res => {
+        if (res.data.code == Constants.SUCESS_CODE) {
+          // 重新查询
+          this.searchData()
+        }
+      })
+    }
+  },
+
+  /**
+  * @desc : （编辑）
+  * @date : 2024/2/1 15:49
+  * @author : 姜永辉
+  */
   editOrder(e) {
     let item = e
     let id = item.intoId
@@ -339,7 +421,7 @@ Page({
           })
         }
       })
-      // 采购退货
+      // 销售退货
     } else {
       wx.navigateTo({
         url: this.data.route.addReturn.url,
@@ -350,7 +432,8 @@ Page({
         success: function (res) {
           res.eventChannel.emit('params', {
             id: id,
-            formMode: Constants.formMode.edit
+            formMode: Constants.formMode.other,
+            formType: Constants.formType.edit,
           })
         }
       })
@@ -383,9 +466,9 @@ Page({
           this.searchData()
         }
       })
-      // 采购退货
+      // 销售退货
     } else {
-      this.excute(this.data.inboundReturnService, this.data.inboundReturnService.cancel, { intoId: id }).then(res => {
+      this.excute(this.data.outboundSaleReturnService, this.data.outboundSaleReturnService.outboundRepeal + id, null).then(res => {
         if (res.data.code == Constants.SUCESS_CODE) {
           // 重新查询
           this.searchData()