liuyao vor 1 Jahr
Ursprung
Commit
41845877c6

+ 1 - 1
i18n/zh-CN.js

@@ -76,7 +76,7 @@ const mac = {
   paymentInfo: '付款信息',
   rpNo: '单号',
   paymentOrderNo: '付款单号',
-  receiptOrderNo: '收单号',
+  receiptOrderNo: '收单号',
   sumAmtReceivableHandle: '核销应收',
   sumAmtPayableHandle: '核销应付',
   thisRefund: '本次金额',

+ 11 - 1
package-basic-data/pages/share-power/share-power.js

@@ -108,7 +108,17 @@ Page({
     wx.navigateTo({
       url: toUrl,
     })
-
+  },
+  /**
+  * @desc : 跳转Welcome
+  * @author : 刘尧
+  * @date : 2024/8/5 09:26
+  */
+  wantToApp(){
+    let toUrl = '/pages/welcome/welcome'
+    wx.navigateTo({
+      url: toUrl,
+    })
   },
   /**
 * @desc : 获取微信派发的 openid

+ 1 - 1
package-basic-data/pages/share-power/share-power.wxml

@@ -46,7 +46,7 @@
       <view class="button-view">
         <van-button size="normal" wx:if="{{helpFlag}}" color="#FF7B1A" custom-style="width:100%;margin-top:30rpx;border-radio:50rpx;" bind:tap="helpMe">帮我点一下
         </van-button>
-        <van-button size="normal" wx:else color="#FF7B1A" custom-style="width:100%;margin-top:30rpx;border-radio:50rpx;">我也想使用软件
+        <van-button size="normal" wx:else color="#FF7B1A" custom-style="width:100%;margin-top:30rpx;border-radio:50rpx;" bind:tap="wantToApp">我也想使用软件
         </van-button>
         <van-button size="normal" color="#FF7B1A1A;"
           custom-style="width:100%;margin-top:30rpx;margin-bottom:50rpx;border-radio:50rpx;" bind:tap="toUnderstand">了解软件</van-button>

+ 7 - 0
package-inventory/pages/inventory-adjustment/add/add.js

@@ -59,6 +59,7 @@ Page({
         code: 'whId',
         name: 'whName',
         title: mixins.$t('whid'), //'目标仓库'
+        required: true,
         type: 'choose',
         urlKey: 'chooseWh'
       }, 
@@ -73,6 +74,7 @@ Page({
         code: 'nonStdCode',
         name: 'nonStdName',
         title: mixins.$t('nonStdCode'), //'目标批号'  
+        required: true,
         type: 'str',
         urlKey: 'openingReason',
         tip: mixins.$t('tipPop'),
@@ -123,12 +125,14 @@ Page({
           name: 'whName',
           type: 'choose',
           title: mixins.$t('whid'), //'目标仓库'
+          required: true,
           urlKey: 'chooseWh'
         },
         {
           code: 'nonStdCode',
           name: 'nonStdName',
           type: 'str',
+          required: true,
           title: mixins.$t('nonStdCode'), //'目标批号'  
         }
       ],
@@ -211,6 +215,7 @@ Page({
    * @author : 王英杰
    */
   switchTransferType(transferType) {
+    console.log(666);
     if (transferType == Constants.inventoryAdjustment.warehouse) { //调整类型-仓库调整
       this.setData({
         contentObj: {
@@ -242,6 +247,7 @@ Page({
               name: 'whName',
               type: 'choose',
               title: mixins.$t('whid'), //'目标仓库'
+              required: true,
               urlKey: 'chooseWh'
             },
           ],
@@ -280,6 +286,7 @@ Page({
             name: 'whName',
             title: mixins.$t('whid'), //'目标仓库'
             type: 'choose',
+            required: true,
             urlKey: 'chooseWh'
           },
           

+ 0 - 12
package-inventory/pages/inventory-adjustment/inventory-adjustment.js

@@ -86,12 +86,6 @@ Page({
 
     contentObj: {
      [ mixins.$t('warehouseAdjustment')]: [  {//仓库调整
-        name: 'oWhName',
-        title: mixins.$t('owhid'),//'源仓库'
-      }, {
-        name: 'whName',
-        title:  mixins.$t('whid'),//'目标仓库'
-      }, {
         name: [{
           name: 'transferOrg',
           title: ''
@@ -105,12 +99,6 @@ Page({
         title:  mixins.$t('adjustDate'),//'调整日期',
       }],
       [mixins.$t('batchAdjustment')]: [ {//'批次调整'
-        name: 'ononStdCode',
-        title: mixins.$t('oNonStdCode'),//'源批号'
-      },{
-        name: 'nonStdCode',
-        title: mixins.$t('nonStdCode'),//'目标批号'
-      },  {
         name: [{
           name: 'transferOrg',
           title: ''