出入库

i18n/zh-CN.js

@@ -38,6 +38,7 @@ const button = {
   otherInfo: '其他信息',
   responsiblePerson: '责任人',
   invalidSuccessfully: '作废成功',
+  tipPop:'用户区分商品色号、非标号使用',
 }
 
 // 资金

package-basic-data/pages/staff/add/add.js

@@ -9,6 +9,7 @@
  *******************************************************************************/
 const mixins = require('@/mixins/index.js')
 const Constants = require('@/utils/Constants')
+const app = getApp()
 Page({
   mixins: [mixins],
   /**
@@ -28,12 +29,13 @@ Page({
         { code: 'staffPhone', type: 'phone', title: mixins.$t('staffPhone'), required: true },
         { code: 'orgId', name: 'orgName', type: 'choose', required: true, urlKey: 'chooseOrg' },
         { code: 'roleId', name: 'roleName', type: 'choose', required: false, urlKey: 'chooseRole' },
-        // { code: 'flgCanLogin', type: 'checkbox', title: mixins.$t('flgCanLogin') },
+        { code: 'flgCanLogin', type: 'checkbox', title: mixins.$t('flgCanLogin') },
         { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
       ]
     },
     // 路由
     routeObjName: 'staff',
+    gradeCode: app.globalData.company.gradeCode,
   },
 
   /**

package-inventory/pages/other-warehousing/other-warehousing.js

@@ -56,8 +56,8 @@ Page({
                 code: 'whId',
                 name: 'whName',
                 title: mixins.$t('warehouseId'),
-                type: 'choose', 
-                urlKey: 'openingInventory' 
+                type: 'choose',
+                urlKey: 'openingInventory'
             },
             {
                 code: 'skuSpec',
@@ -68,6 +68,7 @@ Page({
             {
                 code: 'nonStdCode',
                 title: mixins.$t('goodsBatch'),
+                tip: mixins.$t('tipPop'),
                 type: 'str',
             },
         ],
@@ -176,9 +177,9 @@ Page({
                 title: mixins.$t('addOtherInWh'),
             })
             // 新增
-            if (this.data.formData == '{}') { 
+            if (this.data.formData == '{}') {
                 this.setData({
-                    formData: JSON.stringify({ 
+                    formData: JSON.stringify({
                         intoDate: new Date().toDateStr(),
                         staffId: app.globalData.user.staffId,
                         orgId: app.globalData.user.orgId,
@@ -247,7 +248,7 @@ Page({
         })
 
         // 系统参数开启自动办理        
-        contentList_[contentList_.length-1].content = sumitemAmt
+        contentList_[contentList_.length - 1].content = sumitemAmt
         // 明细的最大入库办理的量
         data.goodsList.forEach(element => {
             if (data.intoType == Constants.intoType.saleReturn) {
@@ -279,7 +280,7 @@ Page({
      * @date   : 2024年3月12日
      */
     chooseData(e) {
-        console.log("chooseData",e);
+        console.log("chooseData", e);
         let formData = JSON.parse(this.data.formData)
         let code = e.detail.code
         let data = e.detail.data.data

package-inventory/pages/outbound-processing/detail/detail.js

@@ -35,33 +35,34 @@ Page({
     // 动态的
     cardList: [],
     contentObj: {},
-    popContent: [{
-      code: 'outingQty',
-      type: 'step',
-      title: mixins.$t('count'),
-    },
-    {
-      code: 'whId',
-      name: 'whName',
-      title: mixins.$t('warehouseId'),
-      type: 'choose',
-      urlKey: 'openingInventory'
-    },
-    {
-      code: 'skuSpec',
-      title: mixins.$t('goodSpec'),
-      type: 'str',
-      readonly: true
-    },
-    {
-      code: 'nonStdCode',
-      title: mixins.$t('goodsBatch'),
-      type: 'str',
-    },
+    popContent: [
+      {
+        code: 'outingQty',
+        type: 'step',
+        title: mixins.$t('count'),
+      },
+      {
+        code: 'whId',
+        name: 'whName',
+        title: mixins.$t('warehouseId'),
+        type: 'choose',
+        urlKey: 'openingInventory'
+      },
+      {
+        code: 'skuSpec',
+        title: mixins.$t('goodSpec'),
+        type: 'str',
+        readonly: true
+      },
+      {
+        code: 'nonStdCode',
+        title: mixins.$t('goodsBatch'),
+        type: 'str',
+      },
     ],
-
-    cardContentList: [
-      { code: 'whId', name: 'whName', title: '库区', type: 'choose', }],
+    titpsFlag: true,
+    cardContentList: [{ code: 'whId', name: 'whName', title: mixins.$t('warehouseId'), type: 'choose', }],
+    popupTopObj: [{ leftTitle: '库存量', leftCode: 'usableQty', rightTitle: '可售量', rightCode: 'invQty' }],
 
     // 路由
     routeObjName: 'outbound',
@@ -126,13 +127,13 @@ Page({
       data.outObject = (data.supId != null) ? data.supId : data.cusId
       data.outObjectName = (data.supplierName != null) ? data.supplierName : data.cusName
     }
-    //  出库状态-已出库
-    if (data.outStatus == Constants.outStatus.outBounded) {
+    //  出库状态-待出库
+    if (data.outStatus == Constants.outStatus.outBounding) {
       //查询采购订单表 未出库的 详细 
       this.setData({
         buttonList: [{
           name: 'merge',
-          title: mixins.$t("close")
+          title: mixins.$t("outProcessing")
         }],
       })
       sumitemAmt = Number(data.outingAmt)
@@ -141,7 +142,7 @@ Page({
       this.setData({
         buttonList: [{
           name: 'merge',
-          title: mixins.$t("outProcessing")
+          title: mixins.$t("close")
         }],
       })
       sumitemAmt = Number(data.outAmt)
@@ -157,7 +158,7 @@ Page({
           card.info = "（" + mixins.$t("checkouted") + "）"
           card.color = "#1B365D"
         }
-        card.itemAmt = sumitemAmt 
+        card.itemAmt = sumitemAmt
         //  出库状态-已出库
         if (data.outStatus == Constants.outStatus.outBounded) {
           card.outQty = sumitemquantity
@@ -352,7 +353,6 @@ Page({
         flgEdit: true
       })
     }
-
     let contentObj = {}
     let cardList = []
     // 销售出库
@@ -360,43 +360,39 @@ Page({
       wx.setNavigationBarTitle({
         title: mixins.$t('saleOutBound'),
       })
-      cardList = [{
-        name: 'main',
-        title: mixins.$t('serviceInfo'),
-      }, {
-        name: 'items',
-        title: mixins.$t('goodsDetail'),
-        chooseGoodsFlag: '',
-        itemAmt: '',
-        displayNum: 2
-      }, {
-        name: 'other',
-        title: mixins.$t('otherInfo')
-      }]
+      cardList = [
+        {
+          name: 'main',
+          title: mixins.$t('customerInformation'),
+        },
+        { name: 'relation' },
+        {
+          name: 'items',
+          title: mixins.$t('goodsDetail'),
+          chooseGoodsFlag: '',
+          itemAmt: '',
+          displayNum: 2
+        },
+        {
+          name: 'other',
+          title: mixins.$t('otherInfo')
+        }]
       contentObj = {
         main: [
-          {
-            code: 'serviceType',
-            name: 'serviceTypeName',
-            title: mixins.$t('serviceType'),
-            type: 'choose',
-            urlKey: 'chooseStaff'
-          },
-          {
-            code: 'deliverId',
-            name: 'deliverName',
-            title: mixins.$t('deliverMan'),
-            type: 'choose',
-            urlKey: 'chooseStaff'
-          }, {
-            code: 'installId',
-            name: 'installName',
-            title: mixins.$t('installMan'),
-            type: 'choose',
-            urlKey: 'chooseStaff'
-          },
+          { code: 'cusName', type: 'str', readonly: true, required: false, title: mixins.$t('customerName') },
+          { code: 'cusPhone', type: 'str', readonly: true, required: false, title: mixins.$t('cusPhone') },
+          { code: 'addressFull', type: 'str', readonly: true, required: false, title: mixins.$t('addressFull') },
+          { code: 'addressNo', type: 'str', readonly: true, required: false, title: mixins.$t('addressNo') },
+          { code: 'channelName', type: 'str', readonly: true, required: false, title: mixins.$t('saleChannel') },
+          { code: 'cusFromName', type: 'str', readonly: true, required: false, title: mixins.$t('customerSource') },
 
         ],
+        relation: [{
+          code: 'fromNo',
+          type: 'str',
+          title: mixins.$t("sourceOrder"),//'关联源单'
+          readonly: true,
+        }],
         items: [{
           code: 'sumQuantity',
           name: 'collectName',
@@ -408,16 +404,12 @@ Page({
           type: 'number',
           title: mixins.$t('totalAmount'),
         }],
-
-        other: [{
-          code: 'remarks',
-          type: 'textarea',
-          title: mixins.$t('remarks'),
-        }, {
-          code: 'file',
-          type: 'uploader',
-          title: mixins.$t('uploader')
-        }]
+        other: [
+          { code: 'contractNo', type: 'textarea', title: mixins.$t("contractNumber"), readonly: false },
+          { code: 'deliveryDate', type: 'date', required: false, title: mixins.$t("delivery_Time"), required: true },
+          { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
+          { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
+        ]
       }
       this.setData({
         contentObj,
@@ -581,15 +573,15 @@ Page({
 
     if (this.data.item.outStatus == Constants.outStatus.outBounding) {
       this.setData({
-          quantityCol: 'outingQty',
-          sumQuantityCol: 'outingQty',
+        quantityCol: 'outingQty',
+        sumQuantityCol: 'outingQty',
       })
-  } else {
+    } else {
       this.setData({
-          quantityCol: 'outQty',
-          sumQuantityCol: 'outQty',
+        quantityCol: 'outQty',
+        sumQuantityCol: 'outQty',
       })
-  }
+    }
   },
 
   /**

package-inventory/pages/outbound-processing/detail/detail.wxml

@@ -1,51 +1,8 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
-<loading wx:if="{{loading}}"></loading>
-<!-- 蓝色信息相关 -->
-<view wx:if="{{item.outType != $t['otherOutType']}}">
-  <view class="detail-top" data-item="{{item}}">
-    <image class="scan-image" fit="fill" src="{{imageUrl+'/detail_sale_order.png'}}"></image>
+<loading wx:if="{{loading}}"></loading> 
 
-    <!-- <image catchtap="open" data-name="editOrder" data-item="{{item}}" class="edit-image" fit="fill" src="{{imageUrl+'/order_billing_detail_02.png'}}"></image> -->
-    <view class="detail-top-sup" style="display: flex;">
-      <view style="width: 10%;">
-        <image class="scan-image-icon" fit="fill" src="{{imageUrl+'/order_billing_detail_01.png'}}"></image>
-      </view>
-
-      <view>
-        <view style="display: flex;">
-          <view>
-            {{item.cusName?item.cusName:''}}
-          </view>
-          <view style="padding-left: 20rpx;">
-            {{itemData.cusPhone?itemData.cusPhone:''}}
-          </view>
-        </view>
-
-        <view style="z-index: 2;padding-top: 20rpx;">
-          <view style="display: flex;">
-            <view>
-              {{item.addressFull?item.addressFull:''}}
-            </view>
-
-          </view>
-        </view>
-        <!-- 日期 -->
-        <view style="display: flex; width: 100%; padding-top: 16rpx;padding-bottom: 15rpx;padding-right: 15rpx; justify-content: space-between; font-size: 24rpx;">
-          <view style="display: flex;  line-height: 36rpx;">
-            仓库配送>
-          </view>
-          <view style="display: flex;  line-height: 36rpx;" catchtap="openData">
-            {{$t['deliveryTime']}}：{{ itemData.deliveryTime?itemData.deliveryTime:'' }}
-          </view>
-        </view>
-
-      </view>
-    </view>
-  </view>
-</view>
-
-<dk-form-bill id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{item.outStatus == $t['outBoundedOutStatus']}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="outingAmt" quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" table="{{table}}" bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag">
+<dk-form-bill id="{{formName}}" type="saleOut" routeObjName="{{routeObjName}}" readonly="{{item.outStatus == $t['outBoundedOutStatus']}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode"  subCol="skuCode" descCol="skuName" priceCol="priceOut" quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" iconCol="imagesUrl" discountStandardCol="saleDiscount"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" table="{{table}}" bind:editItems="setGoods" bind:delItem="setGoods" bind:setGoods="setGoods" cardContentList="{{cardContentList}}" quantityRedTitle="可售量：" quantityRedCol="usableQty" quantityRedColFlagKey="usableQtyInsufficientFlag"  popType="sale" popupTopObj = "{{popupTopObj}}" titpsFlag="{{titpsFlag}}">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>

package-inventory/pages/outbound-processing/outbound-processing.js

@@ -87,7 +87,6 @@ Page({
     contentList: [],
     // 列表的显示字段
     contentObj: {
-
       '销售出库': [{
         name: 'outNo',
         title: mixins.$t('outOrderNo')