采购退货相关

i18n/zh-CN.js

@@ -140,6 +140,7 @@ const ivt = {
   saleReturnInBound: '销退回库',
   purchaseReturnOutBound: '采退出库',
   purReturnOutBound: '采购退货',
+  outPurNo: '退货单号',
   inBoundInfo: '入库信息',
   outBoundInfo: '出库信息',
   outObject: '出库对象',

package-purchase/pages/purchase-return/detail/detail.js

@@ -146,7 +146,7 @@ Page({
       }
     });
     this.setData({
-      beforeSumAmount: formData.returnAmt,
+      beforeSumAmount: formData.intoAmt,
       formData: JSON.stringify(formData)
     })
     this.calculateTotal()

package-purchase/pages/purchase-return/purchase-return.js

@@ -15,15 +15,45 @@ Page({
     flgHandleSetting: app.globalData.setting[Constants.settingCode.IVT001] == "true" ? true : false,
     tagList: [{ title: mixins.$t("all"), code: '' }, { title: mixins.$t("inBoundingIntoStatusName"), code: mixins.$t("inBoundingIntoStatus") }, { title: mixins.$t("inBoundedIntoStatusName"), code: mixins.$t("inBoundedIntoStatus") }],
     // 查询条件
-    searchContent: [{ code: 'createtime', title: mixins.$t("pastThirthtyDays"), defaultValue: 5, searchType: Constants.searchType.date }, { code: 'choose', title: mixins.$t("choose"), searchType: Constants.searchType.pick }],
+    // 查询条件
+    searchContent: [{
+      code: 'makeTime',
+      title: mixins.$t('pastThirthtyDays'),
+      defaultValue: 5,
+      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
+    }],
     // 查询条件-筛选
-    pullMenuList: [
-
-      { code: 'purchaseStatus', pullType: 'mSelect', typeName: 'purchaseStatus' },
-      { code: 'contactName', dataType: '' },
-      { code: 'deliveryPhone', dataType: '' },
-      { code: 'addressFull', dataType: '' },
-      { code: 'makingTime', dataType: 'date' }, { code: 'deliveryTime', dataType: 'date' }],
+    pullMenuList: [{
+      code: 'intoNo',
+      title: mixins.$t('outPurNo')
+    }, {
+      code: 'supName',
+    }, {
+      code: 'contactPhone',
+    }, {
+      code: 'returnAddress',
+      title: mixins.$t('address')
+    },
+    // 筛选新增作废选项 刘尧 2024.5.30
+    {
+      code: 'viewVoidedDocuments',
+      dataType: 'checkbox'
+    },],
     // 列表区（脚部金额）
     footerAmount: { name: 'intoAmt', title: mixins.$t("totalAmount") },
     // 列表区（脚部信息）
@@ -31,7 +61,7 @@ Page({
     intoStatus: null,
     // 列表区（内容）
     contentList: [
-      { name: 'intoNo', title: mixins.$t("saleOrderNo") },
+      { name: 'intoNo', title: mixins.$t("outPurNo") },
       {
         name: [{ name: 'contactName', title: '' },
         { name: 'contactPhone', title: '' }], title: mixins.$t("returnInfo")
@@ -92,7 +122,7 @@ Page({
       buttonList = [{
         name: 'printedBill',
         title: mixins.$t("printedBill"),
-        image:'btn-printing.png'
+        image: 'btn-printing.png'
       },] //打印
     } else {
       // 弹出按钮
@@ -102,7 +132,7 @@ Page({
       }, { name: 'invalid', title: mixins.$t("invaidOrder") }, {
         name: 'printedBill',
         title: mixins.$t("printedBill"),
-        image:'btn-printing.png'
+        image: 'btn-printing.png'
       },]
     }
     this.setData({
@@ -156,15 +186,8 @@ Page({
    * @author : 于继渤
    */
   setSearchParams(params) {
-    let tabsActive = this.data.tabsActive
     params.intoType = '入库类型-采退出库'
-    // if (tabsActive == 0) { //出库状态
-    //   params.intoStatus = ''
-    // } else if (tabsActive == 1) {
-    //   params.intoStatus = mixins.$t("inBoundingIntoStatus")
-    // } else if (tabsActive == 2) {
-    //   params.intoStatus = mixins.$t("inBoundedIntoStatus")
-    // }
+    params.viewVoidedDocuments = params.viewVoidedDocuments ? true : false
     params.intoStatus = this.data.intoStatus == 'all' ? '' : this.data.intoStatus
     if (this.data.flgHandleSetting) {
       params.intoStatus = mixins.$t("inBoundedIntoStatus")

package-purchase/pages/purchase-return/purchase-return.wxml

@@ -3,7 +3,8 @@
 <loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['rpNo','skuName','skuCode','onlyCode'])}}">
+  <!-- 查询条件 -->
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" navBarHeight="{{navBarHeight}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['rpNo','supName','contactPhone','returnAddress'])}}">
   </dk-dropdown-menu>
 
   <dk-tabs wx:if="{{!flgHandleSetting}}" active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs"> </dk-tabs>