库存

components/dkbusiness/dk-label-multiple-select/dk-label-multiple-select.js

@@ -451,29 +451,37 @@ Component({
       name = '盘点状态'
       let stowList = [{
         name: '暂存',
-        id: 0,
+        id: '盘点状态-暂存',
         infotype: 'default'
       },
       {
         name: '完成',
-        id: 1,
+        id: '盘点状态-完成',
         infotype: 'default'
       },
-      {
-        name: '出库中',
-        id: 2,
+     
+      ];
+      this.setData({
+        moreList: stowList,
+        moreFlag: false,
+        loadDataFlag: false
+      })
+    }
+     //调整类型
+     if (typeName === 'transferType') {
+      dataSourceCode = 'transferType'
+      name = '调整类型'
+      let stowList = [{
+        name: '仓库调整',
+        id: '调整类型-仓库调整',
         infotype: 'default'
       },
       {
-        name: '待入库',
-        id: 3,
+        name: '批次调整',
+        id: '调整类型-批次调整',
         infotype: 'default'
       },
-      {
-        name: '已入库',
-        id: 4,
-        infotype: 'default'
-      }
+     
       ];
       this.setData({
         moreList: stowList,
@@ -481,6 +489,28 @@ Component({
         loadDataFlag: false
       })
     }
+      //冻结状态
+      if (typeName === 'freezeStatus') {
+        dataSourceCode = 'freezeStatus'
+        name = '冻结状态'
+        let stowList = [{
+          name: '全部冻结',
+          id: '冻结状态-全部冻结',
+          infotype: 'default'
+        },
+        {
+          name: '全部解冻',
+          id: '冻结状态-全部解冻',
+          infotype: 'default'
+        },
+       
+        ];
+        this.setData({
+          moreList: stowList,
+          moreFlag: false,
+          loadDataFlag: false
+        })
+      }
       this.setData({
         dataSourceCode: dataSourceCode,
         name: name

package-inventory/pages/inventory-adjustment/inventory-adjustment.js

@@ -18,7 +18,7 @@ Page({
   data: { 
      // 查询条件
      searchContent: [{
-      code: 'createtime',
+      code: 'makeTime',
       title: '近30天',
       defaultValue: 5,
       searchType: Constants.searchType.date
@@ -28,27 +28,47 @@ Page({
       searchType: Constants.searchType.pick
     }],
 
-    // 查询条件-筛选
-    pullMenuList: [{
-      code: 'outStatus',
-      pullType: 'mSelect',
-      typeName: 'outStatus'
-    },  {
-      code: 'designStatus',
-      pullType: 'mSelect',
-      typeName: 'designStatus'
-    }, {
-      code: 'customerFrom',
-      pullType: 'mSelect',
-      typeName: 'customerFrom'
-    }, {
-      code: 'keyType',
-      pullType: 'mSelect',
-      typeName: 'keyType'
-    }, {
-      code: 'delivery_Time',
-      dataType: 'date'
-    }], 
+   // 查询条件-筛选
+   pullMenuList: [{
+    code: 'transferType',
+    pullType: 'mSelect',
+    typeName: 'transferType'
+  }, {
+    code: 'staffName', 
+  }, {
+    code: 'orgName', 
+  }, {
+    code: 'transferNo', 
+    title:'调整单号'
+  },
+  {
+    code: 'oWhName', 
+    title:'源仓库'
+  },
+  {
+    code: 'whName', 
+    title:'目标仓库'
+  },
+  {
+    code: 'oNonStdCode', 
+    title:'源批号'
+  },
+  {
+    code: 'nonStdCode', 
+    title:'目标批号'
+  },
+  {
+    code: 'transferDateW',
+    title:'调整日期',
+    dataType: 'date'
+  },
+  
+  {
+    code: 'remarks', 
+    title:'备注'
+  },
+],
+
 
     // 列表区（脚部金额）
     footerAmount: {  },

package-inventory/pages/inventory-adjustment/inventory-adjustment.wxml

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
+  <dk-dropdown-menu  model:value="{{searchForm}}"menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo'])}}">
   </dk-dropdown-menu>
  
   

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

@@ -43,14 +43,7 @@ Page({
     }, ],
 
  
-      // 列表区（脚部信息）
-      // footerInfo: [{
-      //   prefix: mixins.$t('together'), //'共计',
-      //   name: 'sumQuantity',
-      //   title: mixins.$t('piece'), //'件'
-      // }],
-    // 列表区（内容）
-    contentList: [{
+      contentList: [{
       name: 'checkNo',
       title: mixins.$t('checkNo'),//盘点单号'
     }, {

package-inventory/pages/inventory-freeze/inventory-freeze.js

@@ -17,43 +17,52 @@ Page({
    * 页面的初始数据 
    */
   data: {
-    // 查询条件
-    searchContent: [{
-      code: 'createtime',
-      title: '近30天',
-      defaultValue: 5,
-      searchType: Constants.searchType.date
-    }, {
-      code: 'choose',
-      title: '筛选',
-      searchType: Constants.searchType.pick
-    }],
-
-    // 查询条件-筛选
-    pullMenuList: [{
-      code: 'outStatus',
-      pullType: 'mSelect',
-      typeName: 'outStatus'
-    }, {
-      code: 'receiveStatus',
-      pullType: 'mSelect',
-      typeName: 'receiveStatus'
-    }, {
-      code: 'designStatus',
-      pullType: 'mSelect',
-      typeName: 'designStatus'
-    }, {
-      code: 'customerFrom',
-      pullType: 'mSelect',
-      typeName: 'customerFrom'
-    }, {
-      code: 'keyType',
-      pullType: 'mSelect',
-      typeName: 'keyType'
-    }, {
-      code: 'delivery_Time',
-      dataType: 'date'
-    }],
+        // 查询条件
+        searchContent: [{
+          code: 'makeTime',
+          title: '近30天',
+          defaultValue: 5,
+          searchType: Constants.searchType.date
+        } , {
+          code: 'choose',
+          title: '筛选',
+          searchType: Constants.searchType.pick
+        }],
+    
+       // 查询条件-筛选
+       pullMenuList: [{
+        code: 'freezeStatus',
+        pullType: 'mSelect',
+        typeName: 'freezeStatus'
+      }, {
+        code: 'staffName', 
+        title:'申请人'
+      }, {
+        code: 'orgName', 
+        title:'申请部门'
+      }, {
+        code: 'cusName', 
+        title:'申请对象'
+      },
+      {
+        code: 'cusPhone', 
+        title:'申请电话'
+      },
+      {
+        code: 'freezeDateS',
+        title:'冻结日期',
+        dataType: 'date'
+      },
+      {
+        code: 'autoUnfreezeDateS',
+        title:'解冻日期',
+        dataType: 'date'
+      }, 
+      {
+        code: 'remarks', 
+        title:'备注'
+      },
+    ],
   
     // 列表区（脚部信息）
     footerInfo: [

package-inventory/pages/inventory-freeze/inventory-freeze.wxml

@@ -3,7 +3,7 @@
 <loading wx:if="{{loading}}"></loading>
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
-  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo'])}}">
   </dk-dropdown-menu>