员工 部门

api/pages/common/common.js

@@ -27,6 +27,14 @@ module.exports = {
         getStaff: 'get_staff', //员工
         getOrg: 'get_org', //业务部门
         getGoodsCategoryNoPage: 'get_goods_category_no_page', //商品种类不带分页 
-        
+        getSupplierAndCustomerData: 'get_supplier_and_customer_by_page',
+
     },
+    routeUrl: {
+        common: {
+            staffadd: { key: 'staffadd', url: '/package-basic-data/pages/staff/add/add' },
+            orgadd: { key: 'orgadd', url: '/package-basic-data/pages/org/org' },
+        }
+    }
+
 };

package-base-select/pages/select-choose-org/select-choose-org.js

@@ -1,133 +1,72 @@
 /*******************************************************************************
 * Copyright(c) 2022 dongke All rights reserved. / Confidential
 * 类的信息：
-*		1.程序名称：
+*		1.程序名称：部门
 * 编辑履历：
 *		作者				日期					版本				修改内容
-*		王英杰		 2024-1-24			1.00		    计量单位
-*******************************************************************************/ 
-const util = require('@/utils/util.js')
+*		王英杰		 2024-1-24			1.00		     
+*******************************************************************************/
 const mixins = require('@/mixins/index.js')
 const app = getApp()
 Page({
   mixins: [mixins],
-    /**
-     * 页面的初始数据 
-     */
-    data: {
-      dataItem:{},
-      tableData: [],
-      formDataName: mixins.$t('unit'),
-      popContent:
-      [
-        { code: 'unitCode', type: 'str', title: mixins.$t('unitCode'), required: false, readonly: true, },
-        { code: 'unitName', type: 'str', title: mixins.$t('unitName'), required: true },
-        { code: 'decimalPlaces', type: 'number', title: mixins.$t('decimalPlaces'), required: true },
-        { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
-      ],
-      commonService: app.globalData['commonService'],
-      unitService: app.globalData['unitService'],
-       // 路由
-      routeObjName: 'inbound',
-    },
-       /**
-     * @desc   : 点击变色
-     * @author : 王英杰
-     * @date   : 2024/1/26 11:46
-     */
-    toChecked(e) {
-      console.log(e)
-      let index = e.currentTarget.dataset.index
-      let item = e.currentTarget.dataset.item
-      let tableData = this.data.tableData
-      tableData.forEach(res => {
-        res.checked = false
-      })
-      tableData[index].checked = true
-      this.setData({
-        tableData: tableData
-      })
-      const eventChannel = this.getOpenerEventChannel(); 
-      eventChannel.emit('bindData', { data: {id:item.orgId,name:item.orgName} })
-      wx.navigateBack({
-        delta: 1
-      }) 
-    },
-    /**
-   * @desc : 打开新建弹窗
-   * @author : 王英杰
-   * @date : 2024/1/23 9:16
-   */ 
- toAddStaff() {
-  let _this = this
-  wx.navigateTo({
-    url: this.data.route.staffadd.url,
-    events: {
-      // 回调后，在这里给页面赋值
-      bandData: function (e) {
-        console.log("toAdd", e);
-        _this.getData()
-      }
-    },
-    success: function (res) {
-      // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-      res.eventChannel.emit('params', {})
-    }
-  })
-},
- 
-    /**
-  * @desc : 查询数据
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
- getData(params) {
-  return this.excute(this.data.commonService, this.data.commonService.getOrg, params);
-},
-
-  
- 
- /**
-   * @desc   : 新建编辑事件
-   * @author : 王英杰
-   * @date   : 2024/1/26 11:46
+  /**
+   * 页面的初始数据 
    */
-  editItems(e) {
-    let data = e.detail.form
-    this.setData({
-      formData: JSON.stringify(data)
-    })
-    //执行保存编辑操作
-    this.save({})
+  data: {
+    dataItem: {},
+    tableData: [],
+    // 路由
+    routeObjName: 'common',
+    // 列表区（内容）
+    contentList: [
+      { name: 'orgCode', title: '部门编码' },
+    ],
   },
-
   /**
-   * @desc : 保存编辑
-   * @author : 王英杰
-   * @date : 2022/5/26 20:16
-   */
-  saveData(params) { 
-      return this.excute(this.data.unitService, this.data.unitService.insert, params); 
+ * @desc   : 返回数据
+ * @author : 王英杰
+ * @date   : 2024/1/26 11:46
+ */
+  toDetail(e) {
+    let item = e.detail.item
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.emit('bindData', { data: { id: item.orgId, name: item.orgName } })
+    wx.navigateBack({
+      delta: 1
+    })
   },
-  
-     /**
-   * @desc :保存接口的 后续处理方法
-   * @date : 2024/2/1 15:49
-   * @author : 王英杰
-   */ 
-  handleData(data) { 
-    this.setData({
-      showPop: false, 
+  /**
+ * @desc : 打开新建弹窗
+ * @author : 王英杰
+ * @date : 2024/1/23 9:16
+ */
+  toAddOrg() {
+    let _this = this
+    wx.navigateTo({
+      url: '/package-basic-data/pages/org/org',
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          console.log("toAdd", e);
+          _this.getData()
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {})
+      }
     })
-  this.searchData()
   },
+
   /**
-   * @desc :生命周期
-   * @date : 2024/2/1 15:49
-   * @author : 王英杰
-   */ 
-  onshow(){
-    this.searchData()
-  },  
- 
+* @desc : 查询数据
+* @date : 2024/2/1 15:49
+* @author : 王英杰
+*/
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.getOrg, params);
+  },
+
+
 })

package-base-select/pages/select-choose-org/select-choose-org.json

@@ -1,4 +1,4 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "新建部门档案"
+    "navigationBarTitleText": "部门档案"
 }

package-base-select/pages/select-choose-org/select-choose-org.wxml

@@ -2,78 +2,21 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <!-- 顶部信息 -->
 <van-sticky scroll-top="0">
-   <!-- 查询条件 -->
-   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['unit','remarks'])}}">
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orgName'])}}">
   </dk-dropdown-menu>
-  </van-sticky>
+</van-sticky>
+<!-- 暂无数据 -->
+<van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 
+<!-- 列表区 -->
+<dk-list list="{{tableData}}" title="orgName" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail"></dk-list>
 
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 
-<!-- 内容列表 -->
-<view style="width: 100%;">
-  <view wx:for="{{tableData}}" wx:key="index" class="main-class">
-    <van-swipe-cell right-width="{{ 65 }}">
-      <view bind:tap="toChecked" data-index="{{index}}"data-item="{{item}}" class="{{item.checked ? 'main-foot-1' : 'main-foot'}}" style="border-radius:15rpx;">
-        <view class="table-content">
-          <view class="table-content-row">
-            <view style="display: flex;">
-        
-
-              <view style="font-size: 14px;font-weight: 600;width: 70%;margin-left: 20rpx;">
-                {{item.orgName}}
-              </view>
-              <view style="font-size: 14px;font-weight: 600;width: 20%;margin-left: 20rpx;">
-                {{item.orgName}}
-              </view>
-            </view>
-
-          </view>
-          <!-- <view wx:if="{{item.list && item.list.length > 0}}">
-            <view class="table-content-row" wx:for="{{item.list}}" wx:for-index="index_" wx:for-item="item_">
-              <view style="display: flex;">
-                <view style="width: 8%;">
-                  <van-checkbox value="{{item_.checked}}" data-index="{{index_}}" checked-color="#1989FA" />
-                </view>
-
-
-                <view style="font-size: 14px;font-weight: 600;width: 70%;margin-left: 20rpx;">
-                  {{item_.name}}
-                </view>
-                <view style="font-size: 14px;font-weight: 600;width: 20%;margin-left: 20rpx;">
-                  {{'小数：' +item_.decimal}}
-                </view>
-              </view>
-            </view>
-          </view> -->
-
-
-
-
-
-        </view>
-      </view>
-      <view data-index="{{index}}" bind:tap="onCloseDel" slot="right">{{item.flagValue ? '停用' : '启用'}}</view>
-    </van-swipe-cell>
-
-  </view>
-  <!-- 保留高度 -->
-  <view style="height: 220rpx;"></view>
-</view>
-
- 
-
- 
 <!-- 底部加号 -->
 <view style="position: fixed;bottom: 230rpx;right: 30rpx;">
-  <view bind:tap="toAddStaff" style="background: #CAA977;border-radius: 50%;display: flex;justify-content: center;align-items: center;padding:20rpx;box-shadow: 0px 17px 22px 0px #1B365D33;">
+  <view bind:tap="toAddOrg" style="background: #CAA977;border-radius: 50%;display: flex;justify-content: center;align-items: center;padding:20rpx;box-shadow: 0px 17px 22px 0px #1B365D33;">
     <van-icon name="plus" color="#FFFFFF" size="60rpx" />
   </view>
-</view>
-
-
-
-
-
-
-<!-- 底部信息 -->
-<!-- <dk-save-bottom flagTypeName="product-file-add-select" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="toAdd" /> -->
+</view>

package-base-select/pages/select-choose-org/select-choose-org.wxss

@@ -1 +0,0 @@
-/* package-base-select/pages/select-choose-org/select-choose-org.wxss */

package-base-select/pages/select-choose-staff/select-choose-staff.js

@@ -5,126 +5,69 @@
 * 编辑履历：
 *		作者				日期					版本				修改内容
 *		王英杰		 2024-1-24			1.00		    计量单位
-*******************************************************************************/ 
+*******************************************************************************/
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
 const app = getApp()
 Page({
   mixins: [mixins],
-    /**
-     * 页面的初始数据 
-     */
-    data: {
-      dataItem:{},
-      tableData: [],
-      formDataName: mixins.$t('unit'),
-      popContent:
-      [
-        { code: 'unitCode', type: 'str', title: mixins.$t('unitCode'), required: false, readonly: true, },
-        { code: 'unitName', type: 'str', title: mixins.$t('unitName'), required: true },
-        { code: 'decimalPlaces', type: 'number', title: mixins.$t('decimalPlaces'), required: true },
-        { code: 'remarks', type: 'str', title: mixins.$t('remarks'), required: false }
-      ],
-      commonService: app.globalData['commonService'],
-      unitService: app.globalData['unitService'],
-       // 路由
-      routeObjName: 'inbound',
-    },
-       /**
-     * @desc   : 点击变色
-     * @author : 王英杰
-     * @date   : 2024/1/26 11:46
-     */
-    toChecked(e) {
-      console.log(e)
-      let index = e.currentTarget.dataset.index
-      let item = e.currentTarget.dataset.item
-      let tableData = this.data.tableData
-      tableData.forEach(res => {
-        res.checked = false
-      })
-      tableData[index].checked = true
-      this.setData({
-        tableData: tableData
-      })
-      const eventChannel = this.getOpenerEventChannel(); 
-      eventChannel.emit('bindData', { data: {id:item.staffId,name:item.staffName} })
-      wx.navigateBack({
-        delta: 1
-      }) 
-    },
-    /**
-   * @desc : 打开新建弹窗
-   * @author : 王英杰
-   * @date : 2024/1/23 9:16
-   */ 
- toAddStaff() {
-  let _this = this
-  wx.navigateTo({
-    url: this.data.route.staffadd.url,
-    events: {
-      // 回调后，在这里给页面赋值
-      bandData: function (e) {
-        console.log("toAdd", e);
-        _this.getData()
-      }
-    },
-    success: function (res) {
-      // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-      res.eventChannel.emit('params', {})
-    }
-  })
-},
- 
-    /**
-  * @desc : 查询数据
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
- getData(params) {
-  return this.excute(this.data.commonService, this.data.commonService.getStaff, params);
-},
- /**
-   * @desc   : 新建编辑事件
-   * @author : 王英杰
-   * @date   : 2024/1/26 11:46
+  /**
+   * 页面的初始数据 
    */
-  editItems(e) {
-    let data = e.detail.form
-    this.setData({
-      formData: JSON.stringify(data)
-    })
-    //执行保存编辑操作
-    this.save({})
+  data: {
+    dataItem: {},
+    tableData: [],
+    // 路由
+    routeObjName: 'common',
+    // 列表区（内容）
+    contentList: [
+      { name: 'staffCode', title: '员工编码' },
+      { name: 'orgName', title: '部门' },
+    ],
   },
-
   /**
-   * @desc : 保存编辑
-   * @author : 王英杰
-   * @date : 2022/5/26 20:16
-   */
-  saveData(params) { 
-      return this.excute(this.data.unitService, this.data.unitService.insert, params); 
+ * @desc   : 返回数据
+ * @author : 王英杰
+ * @date   : 2024/1/26 11:46
+ */
+  toDetail(e) {
+    let item = e.detail.item
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.emit('bindData', { data: { id: item.staffId, name: item.staffName } })
+    wx.navigateBack({
+      delta: 1
+    })
   },
-  
-     /**
-   * @desc :保存接口的 后续处理方法
-   * @date : 2024/2/1 15:49
-   * @author : 王英杰
-   */ 
-  handleData(data) { 
-    this.setData({
-      showPop: false, 
+  /**
+  * @desc : 打开新建弹窗
+  * @author : 王英杰
+  * @date : 2024/1/23 9:16
+  */
+  toAddStaff() {
+    let _this = this
+    wx.navigateTo({
+      url: '/package-basic-data/pages/staff/add/add',
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          console.log("toAdd", e);
+          _this.getData()
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {})
+      }
     })
-  this.searchData()
   },
+
   /**
-   * @desc :生命周期
-   * @date : 2024/2/1 15:49
-   * @author : 王英杰
-   */ 
-  onshow(){
-    this.searchData()
-  },  
- 
+  * @desc : 查询数据
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
+  getData(params) {
+    return this.excute(this.data.service, this.data.service.getStaff, params);
+  },
+
 })

package-base-select/pages/select-choose-staff/select-choose-staff.json

@@ -1,4 +1,4 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "新建员工"
+    "navigationBarTitleText": "员工"
 }

package-base-select/pages/select-choose-staff/select-choose-staff.wxml

@@ -2,78 +2,22 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <!-- 顶部信息 -->
 <van-sticky scroll-top="0">
-   <!-- 查询条件 -->
-   <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['unit','remarks'])}}">
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['unit','remarks'])}}">
   </dk-dropdown-menu>
-  </van-sticky>
+</van-sticky>
 
+<!-- 暂无数据 -->
+<van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}" />
 
+<!-- 列表区 -->
+<dk-list list="{{tableData}}" title="orgName" flgPoint="{{false}}" titleImageFlag="{{false}}" content="{{contentList}}" footerInfo="{{footerInfo}}" bind:toDetail="toDetail"></dk-list>
 
-<!-- 内容列表 -->
-<view style="width: 100%;">
-  <view wx:for="{{tableData}}" wx:key="index" class="main-class">
-    <van-swipe-cell right-width="{{ 65 }}">
-      <view bind:tap="toChecked" data-index="{{index}}"data-item="{{item}}" class="{{item.checked ? 'main-foot-1' : 'main-foot'}}" style="border-radius:15rpx;">
-        <view class="table-content">
-          <view class="table-content-row">
-            <view style="display: flex;">
-        
+<van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 
-              <view style="font-size: 14px;font-weight: 600;width: 70%;margin-left: 20rpx;">
-                {{item.staffName}}
-              </view>
-              <view style="font-size: 14px;font-weight: 600;width: 20%;margin-left: 20rpx;">
-                {{item.orgName}}
-              </view>
-            </view>
-
-          </view>
-          <!-- <view wx:if="{{item.list && item.list.length > 0}}">
-            <view class="table-content-row" wx:for="{{item.list}}" wx:for-index="index_" wx:for-item="item_">
-              <view style="display: flex;">
-                <view style="width: 8%;">
-                  <van-checkbox value="{{item_.checked}}" data-index="{{index_}}" checked-color="#1989FA" />
-                </view>
-
-
-                <view style="font-size: 14px;font-weight: 600;width: 70%;margin-left: 20rpx;">
-                  {{item_.name}}
-                </view>
-                <view style="font-size: 14px;font-weight: 600;width: 20%;margin-left: 20rpx;">
-                  {{'小数：' +item_.decimal}}
-                </view>
-              </view>
-            </view>
-          </view> -->
-
-
-
-
-
-        </view>
-      </view>
-      <view data-index="{{index}}" bind:tap="onCloseDel" slot="right">{{item.flagValue ? '停用' : '启用'}}</view>
-    </van-swipe-cell>
-
-  </view>
-  <!-- 保留高度 -->
-  <view style="height: 220rpx;"></view>
-</view>
-
- 
-
- 
 <!-- 底部加号 -->
 <view style="position: fixed;bottom: 230rpx;right: 30rpx;">
   <view bind:tap="toAddStaff" style="background: #CAA977;border-radius: 50%;display: flex;justify-content: center;align-items: center;padding:20rpx;box-shadow: 0px 17px 22px 0px #1B365D33;">
     <van-icon name="plus" color="#FFFFFF" size="60rpx" />
   </view>
-</view>
-
-
-
-
-
-
-<!-- 底部信息 -->
-<!-- <dk-save-bottom flagTypeName="product-file-add-select" bottomClass="{{true}}" bind:submit="toClose" bind:allClean="toAdd" /> -->
+</view>

package-base-select/pages/select-storage-object/select-storage-object.js

@@ -20,192 +20,45 @@ Page({
       },
 
     ],
-     // 路由
-     routeObjName: 'common',
-     // 列表区（内容）
-     contentList: [
-       { name: 'objCode', title: '对象编码' },
-       { name: 'objTypeName', title: '对象' },
-       { name: 'addressFull', title: '地址' },
-     ],
-  },
-  /**
-   * @desc : 单据状态点击事件
-   * @author : 于继渤
-   * @date : 2022/5/24 12:16
-   */
-  dropdowncommit(e) {
-    this.selectComponent("#statusItem").toggle(false) //取消选中样式
-    console.log("dropdowncommit", e)
-
-    let dataList = e.detail.dataList
-    let type = e.currentTarget.dataset.type
-    let statusItem = this.data.statusItem
-    statusItem.text = dataList.join(", "); // 使用逗号和空格作为分隔符
-    this.setData({
-      objectType: e.detail.values,
-      statusItem
-    })
-
-
-    this.doSearch()
-
-  },
+    // 路由
+    routeObjName: 'common',
+    // 列表区（内容）
+    contentList: [
+      { name: 'objCode', title: '对象编码' },
+      { name: 'objTypeName', title: '对象' },
+      { name: 'addressFull', title: '地址' },
+    ],
+  }, 
 
   /**
-   * @desc : 确定事件
-   * @author : 于继渤
-   * @date : 2022/6/02 09:16
+   * @desc : 点击事件-返回数据
+   * @author : 姜永辉
+   * @date : 2022/5/23 15:16
    */
-  submit() {
-
-    let list = this.data.list
-
-
-    var pages = getCurrentPages();
-    var prevPage = pages[pages.length - 2]; //上一个页面
-    let objItem = {}
-    list.forEach(element => {
-      if (element.checked) {
-        objItem = element
-        delete objItem.cpId
-        delete objItem.ascpId
-        delete objItem.sale1Id
-        delete objItem.sale2Id
-        delete objItem.orgCode
-        delete objItem.orgId
-        delete objItem.orgName
-        delete objItem.whId
-        delete objItem.whName
-        delete objItem.remarks
+  toDetail(e) {
+    let item = e.detail.item
+    const eventChannel = this.getOpenerEventChannel();
+    eventChannel.emit('bindData', {
+      data: {
+        id: item.objId,
+        name: item.objName,
+        objType: item.objType
       }
-    });
-
-
-    prevPage.setData({
-      objItem
     })
     wx.navigateBack({
       delta: 1
     })
   },
 
-  /**
-   * @desc : checkbox点击事件
-   * @author : 于继渤
-   * @date : 2022/5/23 15:16
-   */
-  catchtapCheck(e) {
-    let item = e.currentTarget.dataset.item
-    let list = this.data.list
-    list.forEach(res => {
-      if (res.objId === item.objId) {
-        res.checked = true
-      } else {
-        res.checked = false
-      }
-    })
-    this.setData({
-      list: list
-    })
-  },
-
-  /**
-   * @desc : 小程序销售订单选客户分页查询
-   * @author : 于继渤
-   * @date : 2022/5/23 15:16
-   */
-  getData(e) {
-    console.log(this.data.param,this.data.formData);
-    this.setData({
-      loading: true
-    })
-    let param = {}
-    param.searchText = this.data.searchText ? this.data.searchText : '' //查询条件    
-    param.pageSize = this.data.pageInfo.pageSize
-    param.currentPage = this.data.pageInfo.currentPage
+  /** 
+ * @desc : 查询 入库单
+ * @date : 2024年3月8日
+ * @author : 姜永辉
+ */
+  getData(params) { 
     // 供应商1 客户2 所有 传空
-    param.objType = ""
-    api.request(Constants.BASIC_COMMON_API + 'get_supplier_and_customer_by_page', 'POST', param).then(res => {
-      this.setData({
-        loading: false
-      })
-
-      if (res.data.code === 200) {
-        let tList = this.data.list;
-        let list = res.data.data.list; //后台返回数据
-        if (!list || list.length == 0) {
-          // 如果不是翻页，需要清空
-          if (e != 'more') {
-            this.setData({
-              list: [],
-              noMore: false
-            })
-          } else {
-            this.setData({
-              noMore: true
-            })
-          }
-          return
-        }
-        if (list.length < this.data.pageInfo.pageSize) {
-          this.setData({
-            noMore: false
-          })
-        }
-        tList = tList.concat(list)
-        this.setData({
-          list: tList
-        })
-      }
-    })
-  },
-
-  /**
-   * @desc : 查询
-   * @author : 于继渤
-   * @date : 2022/5/24 08:49
-   */
-  doSearch() {
-    let pageInfo = this.data.pageInfo;
-    pageInfo.pageSize = 6;
-    pageInfo.currentPage = 1;
-    this.setData({
-      show: false,
-      noMore: false,
-      pageInfo: pageInfo,
-      list: []
-    })
-    this.getData()
-  },
-
-  /**
-   * @desc : 页面上拉触底事件的处理函数
-   * @author : 于继渤
-   * @date : 2022/5/24 08:49
-   */
-  onReachBottom: function () {
-    if (this.data.loading || this.data.noMore) {
-      return;
-    }
-    this.setData({
-      pageInfo: {
-        pageSize: this.data.pageInfo.pageSize,
-        currentPage: this.data.pageInfo.currentPage + 1
-      }
-    })
-    this.getData('more')
-  },
-
-
-
-  /**
-   * @desc : 生命周期函数--监听页面加载
-   * @author : 于继渤
-   * @date : 2022/6/02 09:16
-   */
-  onLoad: function (options) {
-   
+    params.objType = ""
+    return this.excute(this.data.service, this.data.service.getSupplierAndCustomerData, params);
   },
 
 })

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

@@ -36,7 +36,7 @@ Page({
         {
             code: 'whId',
             name: 'whName',
-            title:  mixins.$t('warehouseId'),
+            title: mixins.$t('warehouseId'),
             type: 'drop',
             dropType: 'warehouse'
         },
@@ -125,7 +125,7 @@ Page({
                 type: 'uploader',
                 title: mixins.$t('uploader')
             }]
-        },
+        }, 
         // 路由
         routeObjName: 'inboundOther',
         inboundProcessingService: app.globalData['inboundProcessingService'],
@@ -156,10 +156,15 @@ Page({
             formData.orgId = data.id
             formData.orgName = data.name
         }
-        if (code == "intoReason") { //员工
+        if (code == "intoReason") { //入库原因
             formData.intoReason = data.id
             formData.intoReasonName = data.name
         }
+        if (code == "intoObject") { //入库对象
+            formData.intoObject = data.id
+            formData.intoObjectName = data.name
+            formData.objType = data.objType
+        }
         this.setData({
             purIdArray: purIdArray_,
             cardList: cardList_,
@@ -169,10 +174,10 @@ Page({
 
 
     /**
- * @desc : 保存的參數設置
- * @date : 2024/2/1 15:49
- * @author : 姜永辉
- */
+     * @desc : 保存的參數設置
+     * @date : 2024/2/1 15:49
+     * @author : 姜永辉
+     */
     setParams(params) {
         let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
 

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

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}" ></loading>
 
-<dk-form-bill type="pur" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="批发价：">
+<dk-form-bill type="pur"  id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="itemQty" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  >
 </dk-form-bill>