库存

i18n/zh-CN.js

@@ -201,7 +201,7 @@ const home = {
 const basicData = {
   name:'名称',
   code:'编码',
-  staffCode: '员工编码',
+  staffCode: '员工工号',
   staffPhone: '员工电话',
   staffName: '员工姓名',
   orgId: '业务部门',

package-base-select/pages/select-data/select-data.js

@@ -411,7 +411,7 @@ Page({
           title: 'staffName',
           contentList: [{
             name: 'staffCode',
-            title: '员工编码'
+            title: '员工工号'
           },
           {
             name: 'orgName',

package-inventory/pages/ivt-detail-report/ivt-detail-report.js

@@ -1,13 +1,12 @@
 /*******************************************************************************
  * Copyright(c) 2022 dongke All rights reserved. / Confidential
  * 类的信息：
- *		1.程序名称：选品
+ *		1.程序名称：库存查询
  * 编辑履历：
  *		作者				日期					版本				修改内容
  *		姜永辉		 2024-1-23			1.00		    选品
  *******************************************************************************/
-const Constants = require('@/utils/Constants.js');
-const util = require('@/utils/util.js')
+const Constants = require('@/utils/Constants.js'); 
 const mixins = require('@/mixins/index.js')
 const app = getApp()
 Page({
@@ -19,11 +18,11 @@ Page({
     firstFlag: true,
     orderBy: [
       {
-        "text": "可售量升序",
+        "text": mixins.$t('SellableQuantityAsc'),
         "value": 1
       },
       {
-        "text": "可售量降序",
+        "text": mixins.$t('SellableQuantityDesc'),
         "value": 2
       }
     ],
@@ -40,13 +39,10 @@ Page({
     ],
     catId: null,
     active: 0,
-
-    popupTopObj: [{ leftTitle: '库存量', leftCode: 'usableQty', rightTitle: '可售量', rightCode: 'invQty' }],
-    // 确定按钮
-    buttonList: [{
-      name: 'confirm',
-      title: '确定'
-    }],
+    
+    popupTopObj: [{ leftTitle: mixins.$t('storageNum'), leftCode: 'usableQty',
+     rightTitle: mixins.$t('sellableQuantity'), rightCode: 'invQty' }],
+ 
     contentList: [],
     item: Constants.billType.out,
     form: {
@@ -54,16 +50,7 @@ Page({
       whName: app.globalData.user.defaultWhName
     }
   },
-  selectedProduct(e) {
-    this.setData({
-      active: e.currentTarget.dataset.active
-    })
-  },
-  onClickLeft() {
-    wx.navigateBack({
-      data: 1
-    })
-  },
+ 
   /**
    * @desc : 加载数据
    * @date : 2024/2/1 15:49
@@ -104,6 +91,14 @@ Page({
     params.desc = this.data.orderByValue
     return params
   },
+   /**
+   * @desc : 查询
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
+  doSearch() {
+    this.searchData()
+  },
   /**
    * @desc : 查询
    * @date : 2024/2/1 15:49

package-inventory/pages/ivt-detail-report/ivt-detail-report.wxml

@@ -30,15 +30,15 @@
 
 <view style="height:100%;background: #F8F9FD ;">
   <!--出库商品 列表 走库存-->
-  <view style="height:calc({{windowHeight+'px'}} - 295rpx);overflow: scroll;">
-    <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100'>
+  <view style="height:calc({{windowHeight+'px'}} - 05rpx);overflow: scroll;">
+    <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100' >
       <view wx:for="{{tableData}}" wx:key="index" catch:tap="openAddItemInfo" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
         <view class="main-foot" style="border-radius:15rpx;">
           <view>
             <view class="table-content-row">
               <view style="display:flex;width:100%;">
                 <view data-item="{{item}}" style="display:flex;font-size: 15px;">
-                  <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuName}}"></dk-text>
+                  <dk-text style="font-size:30rpx;" fontWeight="nomal" value="{{item.skuCode}}"></dk-text>
                 </view>
               </view>
             </view>
@@ -48,7 +48,7 @@
               <view class="table-content-row">
                 <view style="display: flex;">
                   <view class="table-content-row-font">
-                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="商品编码" copyValue="{{item.skuCode}}"></dk-text>
+                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="商品名称" copyValue="{{item.skuCode}}"></dk-text>
                   </view>
                   <view class="table-content-class">
                     {{item.skuName?item.skuName:''}}
@@ -135,15 +135,14 @@
             </view>
           </view>
         </view>
-      </view>
-
+      </view> 
     </scroll-view>
 
   </view>
 </view>
 
 <van-sidebar activeKey="{{sideKey}}" bindchange="changeSidebar" custom-class="{{active == 0 ? 'left-class' : 'right-class'}}">
-  <view wx:if="{{active != 1}}" class="{{controlFlags.choosewhFlag?'addsidebar':''}}" style=" height:calc({{windowHeight+'px'}} - {{active == 1 ? '270rpx' :'270rpx' }});overflow: scroll;">
+  <view wx:if="{{active != 1}}" class="{{controlFlags.choosewhFlag?'addsidebar':''}}" style=" height:calc({{windowHeight+'px'}} - {{active == 1 ? '299rpx' :'299rpx' }});overflow: scroll;">
     <van-sidebar-item wx:key="index" custom-class="{{sideKey - 1 == index? 'sidebar-item-before': (sideKey + 1 == index?'sidebar-item-next':'sidebar-item')}}" title="{{item.catName}}" data-id="{{item.catId}}" wx:for="{{typeList}}" />
   </view>
 </van-sidebar>

pages/login/login.js

@@ -220,6 +220,7 @@ Page({
               events: {
                 // 回调后
                 bindData: function (data) {
+                  
                 }
               },
               success: function (res) {
@@ -234,8 +235,12 @@ Page({
             url: '/package-basic-data/pages/register/company-register/company-register',
             events: {
               // 回调后
-              bindData: function (data) {
-                console.log("company-register",data);
+              refresh: function (data) {
+                console.log("company-register--okkkk", data);
+                // 调转主页
+                wx.reLaunch({
+                  url: '../../pages/welcome/welcome',
+                })
               }
             },
             success: function (res) {