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

api/pages/ivt/saleOutBound.js

@@ -15,7 +15,8 @@ module.exports = {
     outboundUpdate: 'outbound_update',
     handleOutbound: 'handle_outbound',
     getOutboundForUpdate:'get_outbound_for_update',
-    repeal:'repeal'
+    repeal:'repeal',
+    selectByCondDetail:'select_by_cond_detail' //总单带明细
   },
 
   routeUrl: {

api/pages/mst/saleReport.js

@@ -15,7 +15,6 @@ module.exports = {
     getSalesTrackingReport: 'sales_tracking_report',
     //销售跟踪明细
     getSalesTrackingReportDetail: 'sale_tracking_report_detail',
-    getSalesItemReport: 'sales_item_report',
   },
   routeUrl: {
     saleReport: {

api/pages/report/report.js

@@ -12,22 +12,23 @@ module.exports = {
     // 前缀
     prefix: 'mdm-server/mst/report/',
     //销售跟踪列表
-    getSalesTrackingReport: 'sales_tracking_report',
+    getSalesTrackingReport: 'get_sales_tracking_report',
     //销售跟踪明细
-    getSalesTrackingReportDetail: 'sale_tracking_report_detail',
+    getSalesTrackingReportDetail: 'get_sale_tracking_report_detail',
     // 销售明细表
-    getSalesItemReport: 'sales_item_report',
+    getSalesItemReport: 'get_sales_item_report',
     //采购跟踪列表
-    getPurTrackingReport: 'pur_tracking_report',
+    getPurTrackingReport: 'get_pur_tracking_report',
     //采购跟踪明细
-    getPurTrackingReportDetail: 'pur_tracking_report_detail',
+    getPurTrackingReportDetail: 'get_pur_tracking_report_detail',
     // 入库明细表
-    inboundDetailReport: 'inbound_detail_report',
+    getInboundDetailReport: 'get_inbound_detail_report',
     // 出库明细表
-    outboundDetailReport: 'outbound_detail_report',
+    getOutboundDetailReport: 'get_outbound_detail_report',
     // 采购明细表
-    purDetailReport: 'pur_detail_report',
-
+    getPurDetailReport: 'get_pur_detail_report',
+    // 销售明细表
+    getSalesItemReport: 'get_sales_item_report',
   },
   routeUrl: {
     report: {

api/pages/sale/order.js

@@ -32,9 +32,9 @@ module.exports = {
       selectCustomers: { key: 'add', url: '/package-base-select/pages/select-customers/select-customers' },
       edit: { key: 'edit', url: '/package-sales/pages/order-billing/detail/detail', formMode: 'other', idKey: 'orderId' },
       openingInventory: { key: 'openingInventory', url: '/package-base-select/pages/select-data/select-data', type: 'warehouse' },
-      saleOutBound: { key: 'saleOutBound', url: '/package-sales/pages/sales-outbound/add/add' , image:'btn-sales-outbound.png' },
+      saleOutBound: { key: 'saleOutBound', url: '/package-sales/pages/sales-outbound/add/add' , tipMethod: 'isAllowedSaleOutBound', image:'btn-sales-outbound.png' },
       chooseSaleOrder: { key: 'chooseSaleOrder', url: '/package-base-select/pages/select-source-sale-order/select-source-sale-order' },
-      saleOrderReturn: { key: 'saleOrderReturn', url: '/package-sales/pages/order-return/add/add' , image:'btn-sales-returns.png'},
+      saleOrderReturn: { key: 'saleOrderReturn', url: '/package-sales/pages/order-return/add/add' , image:'btn-sales-returns.png', tipMethod: 'isAllowedSaleOrderReturn'},
       selectCollectionConfirm: { key: 'selectCollectionConfirm', url: '/package-base-select/pages/select-collection_confirm/select-collection_confirm' },
       chooseChannel: { key: 'chooseChannel', url: '/package-base-select/pages/select-data/select-data', type: 'saleChannel' },
       choosecusFrom: { key: 'choosecusFrom', url: '/package-base-select/pages/select-data/select-data', type: 'customerFrom' },

components/dkbase/dk-save-button/dk-save-button.wxml

@@ -18,8 +18,8 @@
         </view>
         <!--单数和件数-->
         <view wx:if="{{item.type == 'count'}}" style="display: flex ;margin-top: 10rpx;color: {{item.color?item.color:'#2B2B2B'}};font-size: {{item.fontSize?item.fontSize:'12px'}}">
-          <view wx:if="{{item.bill || item.bill == 0}}">共：{{item.bill}}{{item.tail?item.tail:'单'}}</view>
-          <view wx:show="{{item.quantity >= 0}}" style="padding-left: {{(item.bill || item.bill == 0)?'20rpx':''}} ">数量：{{item.quantity}}件 </view>
+          <view wx:if="{{item.bill || item.bill == 0}}">共：{{item.bill}}{{item.tail?item.tail:'单'}}</view> 
+          <view wx:if="{{item.quantity!=null}}" style="padding-left: {{(item.bill || item.bill == 0)?'20rpx':''}} ">数量：{{item.quantity}}件 </view>
         </view>
       </view>
     </view>

mixins/index.js

@@ -70,7 +70,7 @@ module.exports = {
     // 是否进行校验
     validFlag: true,
     // 导出excel
-    exportCols:null,
+    exportCols: null,
   },
   /**
    * @desc : 获取路由信息，供data中的对象使用
@@ -285,7 +285,20 @@ module.exports = {
         if (e.detail.customUrl) {
           url = e.detail.customUrl
         }
-
+        //阻止并提示信息
+        if (routeUrl.tipMethod) {
+          let result = this[routeUrl.tipMethod](item)
+          if(result){
+             // 是否弹出询问框
+             Dialog.confirm({
+              message: result,
+            }).then(() => {
+            }).catch(() => {
+            })
+            return
+          }
+          
+        }
         let _this = this;
         wx.navigateTo({
           url: url,
@@ -487,7 +500,7 @@ module.exports = {
               formData: null
             })
             // 清空页面金额
-            if(this.clearAmount){
+            if (this.clearAmount) {
               this.clearAmount();
             }
             var pages = getCurrentPages();
@@ -560,7 +573,7 @@ module.exports = {
         const component = this.selectComponent('#' + this.data.formName);
         if (component && component.validData) {
           let valid = component.validData();
-          console.log('valid',valid);
+          console.log('valid', valid);
           if (!valid) {
             resolve(false);
           }
@@ -636,15 +649,15 @@ module.exports = {
     });
 
   },
-    /**
-   * @desc : 导出excel
-   * @author : 周兴
-   * @date : 2024/4/23
-   */
+  /**
+ * @desc : 导出excel
+ * @author : 周兴
+ * @date : 2024/4/23
+ */
   export() {
-    console.log('eee',this.data.exportCols);
     let exportCols = this.data.exportCols;
-    if(!exportCols){
+    console.log('eee', exportCols);
+    if (!exportCols) {
       return;
     }
     let params = {}
@@ -657,6 +670,10 @@ module.exports = {
       params = Object.assign(params, otherSearchParams);
     }
     params.name = this.data.objectCode;
+    if(params.flgViewItem){
+      params.name = params.name + '-item'
+    }
+   
     params.title = this.data.title;
     params.currentPage = 1;
     params.pageSize = Constants.MAX_PAGE_SIZE;
@@ -666,47 +683,49 @@ module.exports = {
       params.condition = Object.assign({ 'seq': '序号' }, exportCols);
     }
     let service = app.globalData['exportService']
-    let url = config.image_url.replace('file','') + 'api/'
+    let url = config.image_url.replace('file', '') + 'api/'
+    // let url = 'http://192.168.0.57:7001/'
     url = url + service.prefix + service.export
     if (app.globalData.company && app.globalData.company.svcCode) {
       url = url.replace('mdm-server', 'mdm-server' + '-' + app.globalData.company.svcCode.replace('_', '-'))
     }
     this.setData({
-      loading:true
+      loading: true
     })
-    console.log('rrrr',params,url);
+    console.log('url', url);
     let _this = this;
     wx.request({
       url: url,
       header: {
         'content-type': 'application/json',
-        'Authorization': 'Bearer ' + app.globalData.token
+        'Authorization': 'Bearer ' + app.globalData.token,
+        'i18n': Constants.lan
       },
       data: params,
       method: 'POST',
       success: function (res) {
-        if(res.data.code == Constants.SUCESS_CODE){
-          if(res.data){
-            let url = config.image_url.replace('file','excel')
+        if (res.data.code == Constants.SUCESS_CODE) {
+          if (res.data) {
+            let url = config.image_url.replace('file', 'excel')
             _this.downloadFile(url + '/' + res.data.data);
           }
         }
         _this.setData({
-          loading:false
+          loading: false
         })
       },
       fail: function (err) {
         // reject(err);
         _this.setData({
-          loading:false
+          loading: false
         })
       }
     })
   },
-    /**
-   * 下载文件资源到本地 打开文档 
-   * @param {*} url 
-   */
+  /**
+ * 下载文件资源到本地 打开文档 
+ * @param {*} url 
+ */
   downloadFile(url) {
     let that = this
     wx.downloadFile({
@@ -967,7 +986,7 @@ module.exports = {
             menuUuid: data.menuUuid,
           })
         }
-        console.log('bbbb',_this.data.formMode);
+        console.log('bbbb', _this.data.formMode);
         //菜单编码
         if (data.functionCode) {
           _this.setData({

package-accounts-manage/pages/payment-order/payment-order.js

@@ -101,8 +101,7 @@ Page({
         type: 'number'
       }, {
         type: 'count',
-        code: 'count',
-        quantity: -1,
+        code: 'count', 
         bill: 1,
       }
     ],

package-accounts-manage/pages/receipt/receipt.js

@@ -103,8 +103,7 @@ Page({
         type: 'number'
       }, {
         type: 'count',
-        code: 'count',
-        quantity: 0,
+        code: 'count', 
         bill: 1,
       }
     ],

package-base-select/pages/select-source-sale-order/select-source-sale-order.js

@@ -24,7 +24,7 @@ Page({
    * @author : 于继渤
    */
   getData(params) {
-    return this.excute(this.data.orderService, this.data.orderService.selectTotalSingleTapeDetailPage, params);
+    return this.excute(this.data.service, this.data.service.selectByCondDetail, params);
   },
   /**
  * @desc : 设置查询参数
@@ -33,7 +33,8 @@ Page({
  */
 setSearchParams(params) {
   //销售状态
-  params.outStatusList = [Constants.outStatus.outBounded]
+  params.outStatus = Constants.outStatus.outBounded
+  params.outType = Constants.outType.sale
   return params
 },
   
@@ -47,14 +48,14 @@ setSearchParams(params) {
     let index = e.currentTarget.dataset.index
     tableData.forEach(res=>{
       res.checked =  false
-      res.orderItemResponseList.forEach(item=>{
+      res.goodsList.forEach(item=>{
         item.checked = false
       })
     })
     tableData[index].checked = !tableData[index].checked
-    let orderItemResponseList = tableData[index].orderItemResponseList
-    if (orderItemResponseList && orderItemResponseList.length > 0) {
-      orderItemResponseList.forEach(res => {
+    let goodsList = tableData[index].goodsList
+    if (goodsList && goodsList.length > 0) {
+      goodsList.forEach(res => {
         res.checked = tableData[index].checked
       })
     }
@@ -76,11 +77,11 @@ setSearchParams(params) {
     console.log(index, index_)
     tableData.forEach(res=>{
       res.checked =  false
-      // res.orderItemResponseList.forEach(item=>{
+      // res.goodsList.forEach(item=>{
       //   item.checked = false
       // })
     })
-    tableData[index].orderItemResponseList[index_].checked = !tableData[index].orderItemResponseList[index_].checked
+    tableData[index].goodsList[index_].checked = !tableData[index].goodsList[index_].checked
 
     this.setData({
       tableData: tableData
@@ -100,8 +101,8 @@ setSearchParams(params) {
     let tableData = this.data.tableData
     tableData.forEach(res => {
       res.checked = checked
-      if (res.orderItemResponseList && res.orderItemResponseList.length > 0) {
-        res.orderItemResponseList.forEach(item => {
+      if (res.goodsList && res.goodsList.length > 0) {
+        res.goodsList.forEach(item => {
           item.checked = checked
         })
       }
@@ -124,12 +125,12 @@ setSearchParams(params) {
     let returnTotalAmount = Number(0)
     //过滤出已选数据
     tableData.forEach(res => {
-      if (res.orderItemResponseList && res.orderItemResponseList.length > 0) {
-        res.orderItemResponseList.forEach(item => {
+      if (res.goodsList && res.goodsList.length > 0) {
+        res.goodsList.forEach(item => {
           if (item.checked) {
-            item.priceOut = item.priceStandard
-            item.outQty = item.itemQty 
-            item.outAmt = item.priceOut * item.itemQty
+            // item.priceOut = item.priceStandard
+            item.outQty = item.outQty 
+            item.outAmt = item.priceOut * item.outQty
             delete item['priceLimited']
             delete item['pricePurchase']
             delete item['priceWholesale']
@@ -140,7 +141,7 @@ setSearchParams(params) {
     })
     if (choooseInboundItemList && choooseInboundItemList.length > 0) {
       choooseInboundItemList.forEach(res => {
-        returnTotalAmount += Number(res.itemQty * res.priceSale)
+        returnTotalAmount += Number(res.outQty * res.priceOut)
       })
     }
 
@@ -159,7 +160,7 @@ setSearchParams(params) {
   toAdd() {
     let itemList = this.data.choooseInboundItemList
     const eventChannel = this.getOpenerEventChannel();
-    eventChannel.emit('bindData', { itemList: itemList,fromNo: itemList[0].orderNo})
+    eventChannel.emit('bindData', { itemList: itemList,fromNo: itemList[0].outNo})
     wx.navigateBack({
       data: 1
     })

package-base-select/pages/select-source-sale-order/select-source-sale-order.wxml

@@ -19,13 +19,13 @@
             <van-checkbox checked-color="#E4002B" value="{{ item.checked }}" data-index="{{index}}" data-index_="{{index_}}" bind:change="onListItemChange"></van-checkbox> <view style="color:#95A8CB;font-size:13px;padding-left: 6px;">全出</view>
           </view>
           <view style="width: 60%;">
-            <view style="font-size: 26rpx;color:#1B365D">{{item.orderNo}}</view>
+            <view style="font-size: 26rpx;color:#1B365D">{{item.outNo}}</view>
             <view style="font-size: 24rpx;color:#95A8CB;padding-top:10rpx"> {{item.makeTime ? wxmlUtil.format(item.makeTime) : ''}}</view>
           </view>
-          <view style="width: 20%;text-align: right;font-size: 26rpx;color:#1B365D">销售订单</view>
+          <view style="width: 20%;text-align: right;font-size: 26rpx;color:#1B365D">销售出库</view>
         </view>
       </view>
-      <view wx:for="{{item.orderItemResponseList}}" wx:for-item="item_" wx:for-index="index_">
+      <view wx:for="{{item.goodsList}}" wx:for-item="item_" wx:for-index="index_">
         <view style="display: flex;" data-index="{{index}}" data-index_="{{index_}}">
           <view style="place-self: center;padding-left: 15rpx;padding-right: 15rpx;">
             <view style="display: flex;padding-left: 10rpx;">
@@ -33,7 +33,7 @@
               <view class="red-checkbox" style="{{item_.checked ? 'color:#E4002B;' : ''}}">出</view>
             </view>
           </view>
-          <view class="border-solid" style="{{index_ === 0 ? (item.orderItemResponseList.length  == 1 ? 'margin-top:30rpx;margin-bottom:30rpx;' : 'margin-top:30rpx;') : index_ ===(item.orderItemResponseList.length -1) ? 'margin-bottom:30rpx;': ''}}"></view>
+          <view class="border-solid" style="{{index_ === 0 ? (item.goodsList.length  == 1 ? 'margin-top:30rpx;margin-bottom:30rpx;' : 'margin-top:30rpx;') : index_ ===(item.goodsList.length -1) ? 'margin-bottom:30rpx;': ''}}"></view>
           <view style="display: flex;width: 100%;">
             <view style="padding:20rpx;">
               <van-image radius="5px" width="80" height="80" src="{{item_.skuImages? item_.skuImages.path : ''}}" />
@@ -47,14 +47,14 @@
               </view>
               <view style="display: flex;width: 100%;margin-top: 20rpx;">
                 <view style="width: 50%;">
-                  <dk-cell contentFontSize="15" height="25rpx" fontWeight="bold" left="0rpx" contentColor="#FF7B1A" title="" content="{{ item_.priceSale ? item_.priceSale : 0}}"></dk-cell>
+                  <dk-cell contentFontSize="15" height="25rpx" fontWeight="bold" left="0rpx" contentColor="#FF7B1A" title="" content="{{ item_.priceOut ? item_.priceOut : 0}}"></dk-cell>
                 </view>
-                <view style="width: 50%;font-size:24rpx;color: #1B365D;line-height: 34rpx;font-weight: bold;text-align: right;">{{ ' x ' + (item_.itemQty ? item_.itemQty : 0)}}</view>
+                <view style="width: 50%;font-size:24rpx;color: #1B365D;line-height: 34rpx;font-weight: bold;text-align: right;">{{ ' x ' + (item_.outQty ? item_.outQty : 0)}}</view>
               </view>
             </view>
           </view>
         </view>
-        <view wx:if="{{index_ !== (item.orderItemResponseList.length -1)  && item.orderItemResponseList.length > 1}}" style="text-align: center;margin-left: 30rpx;margin-right: 30rpx;">
+        <view wx:if="{{index_ !== (item.goodsList.length -1)  && item.goodsList.length > 1}}" style="text-align: center;margin-left: 30rpx;margin-right: 30rpx;">
           <view style="border: solid 1rpx #A0A2A7;"></view>
         </view>
       </view>
@@ -62,7 +62,7 @@
   </view>
 </view>
 
-<van-empty wx:if="{{!tableData[0].orderItemResponseList || tableData[0].orderItemResponseList.length ==0}}" description="暂无出库单" />
+<van-empty wx:if="{{!tableData[0].goodsList || tableData[0].goodsList.length ==0}}" description="暂无出库单" />
 
 <view style="height: 200rpx;"></view>
 

package-business-analysis/pages/detail-report/detail-report.js

@@ -25,6 +25,8 @@ Page({
     title: null,
     // 方法
     method: '',
+    // 导出的方法（可能会跟查询方法不一致）（对应mapper中的方法）
+    exportMethod:'',
     // 查询条件
     searchContent: [],
     // 查询条件-筛选
@@ -65,18 +67,6 @@ Page({
       // 把其他查询条件拼到查询实体上去
       params = Object.assign(params, otherSearchParams);
     }
-   
-    switch (this.data.objectCode) {
-      case Constants.menuCode.outboundDetailReport :
-      case Constants.menuCode.inboundDetailReport : 
-        params.flgViewItem = true
-        break
-      case Constants.menuCode.purDetailReport :
-          params.flgViewItem = false
-          break
-      default:
-        break
-    } 
     return params;
   },
   /** 
@@ -147,11 +137,12 @@ Page({
       // 出库明细表
       case Constants.menuCode.outboundDetailReport:
         routeObjName = 'report'
-        method = 'outboundDetailReport'
+        method = 'getOutboundDetailReport'
         placeholder = ['orderNo', 'customerName', 'telephone']
         listTitle = 'outNo'
         listStatus = 'outStatusName'
         listSubTitle = 'outDate'
+        otherSearchParams = {flgViewItem:true}
         pullMenuList = [{
           code: 'outStatus',
           pullType: 'mSelect',
@@ -183,9 +174,6 @@ Page({
             left: { tag: 'skuModel', title: 'skuName', type: 'title' },
           },
           {
-            left: { name: 'orgName' },
-          },
-          {
             left: { name: 'outAmt', type: 'price' },
             right: { name: 'outQty', type: 'qty' }
           },
@@ -193,11 +181,46 @@ Page({
             left: { name: 'outDate', title: '日期：' },
             right: { name: 'whName' },
           }]
+          exportCols = {
+            "outNo": "出库单号",
+            "fromNo": "来源单号",
+            "outTypeName": "出库类型",
+            "outStatusName": "出库状态",
+            "supplierName": "供应商",
+            "cusName": "客户名称",
+            "cusPhone": "客户电话",
+            "cusFrom": "客户来源",
+            "outDate": "出库日期",
+            "orgName": "部门名称",
+            "staffName": "员工姓名",
+            "makeStaffName": "制单员",
+            "outingQtySum": "出库中总量",
+            "outingAmtSum": "出库中总金额",
+            "outQtySum": "已出库总量",
+            "outAmtSum": "已出库总金额",
+            "returnOutQtySum": "已出库退货总量",
+            "returnOutAmtSum": "已出库退货总金额",
+            "remarks": "备注",
+            "skuName": "商品名称",
+            "skuModel": "商品型号",
+            "nonStdCode": "非标号",
+            "shortName": "商品品牌",
+            "catName": "种类名称",
+            "seriesName": "系列名称",
+            "whName": "仓库名称",
+            "outingQty": "出库中数量",
+            "outingAmt": "出库中金额",
+            "outQty": "已出库数量",
+            "outAmt": "已出库金额",
+            "returnQty": "已出库退货数量",
+            "returnAmt": "已出库退货金额"
+          }
         break;
        // 入库明细表
        case Constants.menuCode.inboundDetailReport:
         routeObjName = 'report'
-        method = 'inboundDetailReport'
+        method = 'getInboundDetailReport'
+        otherSearchParams = {flgViewItem:true}
         placeholder = ['orderNo', 'supplierName', 'telephone']
         listTitle = 'intoNo'
         listStatus = 'intoStatusName'
@@ -233,9 +256,6 @@ Page({
             left: { tag: 'skuModel', title: 'skuName', type: 'title' },
           },
           {
-            left: { name: 'orgName' },
-          },
-          {
             left: { name: 'intoAmt', type: 'price' },
             right: { name: 'intoQty', type: 'qty' }
           },
@@ -243,10 +263,44 @@ Page({
             left: { name: 'intoDate', title: '日期：' },
             right: { name: 'whName' },
           }]
+          exportCols = {
+            "intoNo": "入库单号",
+            "fromNo": "来源单号",
+            "intoTypeName": "入库类型",
+            "intoStatusName": "入库状态",
+            "supplierName": "供应商",
+            "cusName": "客户名称",
+            "cusPhone": "客户电话",
+            "cusFrom": "客户来源",
+            "intoDate": "入库日期",
+            "orgName": "部门名称",
+            "staffName": "员工姓名",
+            "makeStaffName": "制单员",
+            "intoingQtySum": "入库中总量",
+            "intoingAmtSum": "入库中总金额",
+            "intoQtySum": "已入库总量",
+            "intoAmtSum": "已入库总金额",
+            "returnInQtySum": "已入库退货总量",
+            "returnInAmtSum": "已入库退货总金额",
+            "remarks": "备注",
+            "skuName": "商品名称",
+            "skuModel": "商品型号",
+            "nonStdCode": "非标号",
+            "shortName": "商品品牌",
+            "catName": "种类名称",
+            "seriesName": "系列名称",
+            "whName": "仓库名称",
+            "intoingQty": "入库中数量",
+            "intoingAmt": "入库中金额",
+            "intoQty": "已入库数量",
+            "intoAmt": "已入库金额",
+            "returnQty": "已出库退货数量",
+            "returnAmt": "已出库退货金额"
+          }
         break; 
         // 销售明细表
       case Constants.menuCode.orderDetailReport:
-        routeObjName = 'saleReport'
+        routeObjName = 'report'
         method = 'getSalesItemReport'
         placeholder = ['orderNo', 'customerName', 'telephone']
         listTitle = 'orderNo'
@@ -283,9 +337,6 @@ Page({
             left: { tag: 'brandName', title: 'skuName', type: 'title' },
           },
           {
-            left: { name: 'orgName' },
-          },
-          {
             left: { name: 'priceSale', type: 'price' },
             right: { name: 'itemQty', type: 'qty' }
           },
@@ -293,11 +344,53 @@ Page({
             left: { name: 'pickupDate', title: '日期：' },
             right: { name: 'whName' },
           }]
+        exportCols = {
+          "orderNo": "订单单号",
+          "cusName": "客户名称",
+          "cusPhone": "客户电话",
+          "contactName": "联系人",
+          "contactPhone": "联系电话",
+          "orderStatusName": "订单状态",
+          "addressFull": "详细地址",
+          "deliveryDate": "送货日期",
+          "orgName": "部门名称",
+          "staffName": "员工姓名",
+          "channelName": "销售渠道",
+          "cusFromName": "客户来源",
+          "makeStaffName": "制单员",
+          "makeTime": "制单时间",
+          "sumQuantity": "商品总数量",
+          "sumStandard": "标价合计",
+          "sumAmount": "合计金额",
+          "saleDiscount": "销售折扣",
+          "amtReceivable": "应收金额",
+          "amtHandle": "已核销金额",
+          "amtResidue": "剩余金额",
+          "remarks": "备注",
+          "skuName": "商品名称",
+          "skuModel": "商品型号",
+          "nonStdCode": "非标号",
+          "shortName": "商品品牌",
+          "catName": "种类名称",
+          "seriesName": "系列名称",
+          "outNo": "出库单号",
+          "outStatusName": "出库状态",
+          "whName": "仓库名称",
+          "itemQty": "商品数量",
+          "priceStd": "标价",
+          "amtStd": "标价金额",
+          "priceSale": "售价",
+          "itemAmt": "售价金额",
+          "priceDiscount": "折扣",
+          "outQty": "已出库数量",
+          "outAmt": "已出库金额"
+        }
         break;
       // 采购明细表
       case Constants.menuCode.purDetailReport:
         routeObjName = 'report'
-        method = 'purDetailReport'
+        method = 'getPurDetailReport'
+        otherSearchParams = {flgViewItem:true}
         placeholder = ['purNo', 'supName', 'telephone']
         listTitle = 'purNo'
         listStatus = 'intoStatus'
@@ -333,9 +426,6 @@ Page({
             left: { tag: 'shortName', title: 'skuModel', type: 'title' },
           },
           {
-            left: { name: 'staffName' },
-          },
-          {
             left: { name: 'pricePur', type: 'price' },
             right: { name: 'itemQty', type: 'qty' }
           },
@@ -343,27 +433,31 @@ Page({
             left: { name: 'nonStdCode', title: '批次号：' },
        
           }]
-        exportCols = {
-          amtPayable: "应付金额",
-          amtResidue: "剩余金额",
-          contactName: "联系人",
-          contactPhone: "联系电话",
-          intoAmtSum: "已入库总金额",
-          intoQtySum: "已入库总量",
-          intoingAmtSum: "入库中总金额",
-          intoingQtySum: "入库中总量",
-          makeStaffName: "制单员",
-          orgName: "部门名称",
-          pickupDate: "取货日期",
-          purNo: "采购订单号",
-          purStatusName: "订单状态",
-          purTypeName: "采购单据类型",
-          remarks: "备注",
-          returnInAmtSum: "已入库退货总金额",
-          returnInQtySum: "已入库退货总量",
-          staffName: "员工姓名",
-          supplierName: "供应商",
-        }
+          exportCols = {
+            purNo: "采购订单号"	,
+            pickupDate: "取货日期"	,
+            purStatusName: "订单状态"	,
+            purTypeName: "采购单据类型"	,
+            orgName: "部门名称"	,
+            staffName: "员工姓名"	,
+            supplierName: "供应商"	,
+            contactName: "联系人"	,
+            contactPhone: "联系电话"	,
+            amtPayable: "应付金额"	,
+            amtResidue: "剩余金额"	,
+            makeStaffName: "制单员"	,
+            skuModel: "商品型号"	,
+            skuName: "商品名称"	,
+            catName: "种类名称"	,
+            itemQty: "商品数量"	,
+            pricePur: "采购价"	,
+            intoAmt: "已入库金额"	,
+            intoQty: "已入库数量"	,
+            seriesName: "系列名称"	,
+            shortName: "商品品牌"	,
+            nonStdCode: "非标号"	,
+            remarks: "备注"	
+          }
         break;
       // 客户收款明细表
       case Constants.menuCode.cusReceiptDetailReport:

package-sales/pages/order-billing/order-billing.js

@@ -153,6 +153,35 @@ Page({
     })
   },
 
+  /**
+    * @desc :   销售出库方法提示校验
+    * @date : 2024年3月8日
+    * @author : 于继渤
+    */
+  isAllowedSaleOutBound(e) {
+    let result = ''
+    //判断出库量是否小于订单量
+    if (e.outQty == e.sumQuantity) {
+      result = '可出库量不足'
+    }
+    return result
+  },
+  /**
+    * @desc :   销售出库退货方法提示校验
+    * @date : 2024年3月8日
+    * @author : 于继渤
+    */
+  isAllowedSaleOrderReturn(e) {
+    console.log(e)
+    let result = ''
+    //判断退货量是否小于订单量
+    if (e.outQty == 0) {
+      result = '可退货量不足'
+    }
+    return result
+  },
+
+
 
   /**
  * @desc : 切换

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

@@ -135,7 +135,7 @@ Page({
  */
 setSearchParams(params) {
   //销售状态
-  params.outStatusList = [Constants.outStatus.intoReturn]
+  params.outTypeList = [Constants.outType.intoReturn]
   return params
 },