Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

components/dkbase/dk-list/dk-list.wxml

@@ -166,7 +166,6 @@
       <!--按钮-->
       <van-grid-item use-slot catchtap="clickButton" wx:for="{{buttonList}}" data-item="{{item}}" wx:key="index">
         <view>
-
           <van-image custom-class="function-pop-image" fit="fill" src="{{imageUrl + routeUrl[routeObjName][item.name].image}}"></van-image>
         </view>
         <view style="margin-top: -18rpx;">

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

@@ -445,7 +445,42 @@ Component({
           loadDataFlag: false
         })
       }
-
+    //盘点状态
+    if (typeName === 'coilingState') {
+      dataSourceCode = 'coilingState'
+      name = '盘点状态'
+      let stowList = [{
+        name: '暂存',
+        id: 0,
+        infotype: 'default'
+      },
+      {
+        name: '完成',
+        id: 1,
+        infotype: 'default'
+      },
+      {
+        name: '出库中',
+        id: 2,
+        infotype: 'default'
+      },
+      {
+        name: '待入库',
+        id: 3,
+        infotype: 'default'
+      },
+      {
+        name: '已入库',
+        id: 4,
+        infotype: 'default'
+      }
+      ];
+      this.setData({
+        moreList: stowList,
+        moreFlag: false,
+        loadDataFlag: false
+      })
+    }
       this.setData({
         dataSourceCode: dataSourceCode,
         name: name

i18n/zh-CN.js

@@ -238,7 +238,7 @@ const basicData = {
   catCode: '种类编码',
   catName: '种类名称',
   catName: '种类名称',
-  goodsBatch: '商品批次',
+  goodsBatch: '非标号',
   //基础资料
 
   warehouse: '仓库档案',
@@ -479,13 +479,13 @@ const goodsSku = {
   skuCode: '商品编码',
   skuModel: '商品型号',
   skuName: '商品名称',
-  colorNumber: '色号',
+  colorNumber: '非标号',
   subUnitId: '辅助单位',
   sukSpec: '商品规格',
   goodSpec: '规格',
   openingInventoryQty: '期初数量',
   openingInventory: '期初库存',
-  iinventoryBatchNumber: '库存批号',
+  iinventoryBatchNumber: '非标号',
   iinitialCostPrice: '期初成本价',
   purchasePrice: '采购价',
   retailPrice: '零售价',

mixins/index.js

@@ -826,6 +826,7 @@ module.exports = {
    * @date : 2024/1/22
    */
   handleMoreDataIsValid(service, item, primaryKey) {
+    console.log('fff',item,item[primaryKey]);
     if (service && item && item[primaryKey]) {
       let method = item.flgValid ? service.disable : service.enable;
       return this.excute(service, method, item[primaryKey]).then(res => {

package-basic-data/pages/org/choose-org/choose-org.js

@@ -31,11 +31,13 @@ Page({
    * @author : 王英杰
    */
   setSearchParams(params) {
-    console.log('tttt',this.data.item);
     params.pageSize = null
     params.currentPage = null
-    params.orgId = this.data.item.editFlag ? (this.data.item.orgId_social || null) : null
-    params.parentId = this.data.item.editFlag ? (this.data.item.parentId_social || null) : null
+    let item = this.data.item;
+    if(item){
+      params.orgId = item.editFlag ? (item.orgId_social || null) : null
+      params.parentId = item.editFlag ? (item.parentId_social || null) : null
+    }
     return params
   },
 
@@ -66,7 +68,6 @@ Page({
       })
     }
     let tableTopData = data.filter(it => it.levelNo == 1);
-    console.log('etableData', tableData);
     this.setData({
       tableData: tableData,
       tableTopData: tableTopData

package-basic-data/pages/org/org.js

@@ -87,9 +87,11 @@ Page({
      * @author : 周兴
      */
   deactivateEnable(e) {
-    let item = e.currentTarget.dataset.item
-    //执行接口
-    this.handleMoreDataIsValid(this.data.service, item, 'orgId')
+    if (e.detail == 'right') {
+      let item = e.currentTarget.dataset.item
+      //执行接口
+      this.handleMoreDataIsValid(this.data.service, item, 'orgId')
+    }
   },
   /**
     * @desc : 按钮点击事件回调
@@ -148,7 +150,11 @@ Page({
       form.parentId = topOrg.orgId
       form.parentName = topOrg.orgName
     }
+    let popContent = this.data.popContent
+    // 新建时过滤掉部门
+    popContent = popContent.filter(it => it.code != 'orgCode')
     this.setData({
+      popContent: popContent,
       showPop: true,
       editFlag: false,
       popTitle: this.$t('newDepartment'),
@@ -460,7 +466,22 @@ Page({
         }
         let form_ = { ...form }
         form_.editFlag = false
+        let popContent = this.data.popContent
+        let filters = popContent.filter(it => it.code == 'orgCode');
+        // 说明部门编码被过滤掉了，需要加回来
+        if (!filters || filters.length == 0) {
+          popContent.unshift(
+            {
+              code: 'orgCode',
+              type: 'str',
+              name: 'orgCode',
+              required: false,
+              readonly: true
+            })
+        }
+
         this.setData({
+          popContent:popContent,
           form: JSON.stringify(form_),
           popTitle: this.$t('org'),
           showPop: true,

package-basic-data/pages/org/org.wxml

@@ -22,30 +22,36 @@
 <view wx:if="{{showFlag}}" wx:for="{{tableData}}" class="Outer-frame">
     <!-- 列表上半部分 -->
     <view style="display: flex;padding:3vw;   border-radius: 15rpx 15rpx 0 0 " class="tile-class" data-open="{{item.open}}" data-item="{{item}}" data-index="{{index}}" bindtap="onchange">
-        <view style="display: flex;flex: 1;">
-            <van-image round width="39rpx" height="39rpx" fit="fill" src="/static/image/ghxk.png" />
-            <view style="margin-left:5vw;font-size: 16px;font-weight: 500;align-items: center;display: flex;" data-item="{{item}}" bindtap="clickName">{{item.orgName}}
-                <van-image wx:if="{{item.flgBusiness}}" style="padding-left: 10rpx;align-items: center;display: flex;" src="{{imageUrl + 'business.png'}}" width="30rpx" height="30rpx" fit="fill" />
+        <van-swipe-cell right-width="{{ 65 }}" data-index="{{index}}" data-item="{{item}}" bind:click="deactivateEnable" disabled="{{!item.levelLeaf}}">
+            <view style="width: calc(100vw - 90rpx);display:flex">
+                <view style="display: flex;flex: 1;">
+                    <van-image round width="39rpx" height="39rpx" fit="fill" src="/static/image/ghxk.png" />
+                    <view style="margin-left:5vw;font-size: 16px;font-weight: 500;align-items: center;display: flex;" data-item="{{item}}" bindtap="clickName">{{item.orgName}}
+                        <van-image wx:if="{{item.flgBusiness}}" style="padding-left: 10rpx;align-items: center;display: flex;" src="{{imageUrl + 'business.png'}}" width="30rpx" height="30rpx" fit="fill" />
+                    </view>
+                </view>
+                <view style=" text-align: right;" wx:if="{{!item.levelLeaf }}">
+                    <van-icon wx:if="{{ item.open }}" color="#bdb7b7" name="arrow-down" style="font-size: 16px;" />
+                    <van-icon wx:else color="#bdb7b7" name="arrow" style="font-size: 16px;" />
+                </view>
             </view>
-        </view>
-        <view style=" text-align: right;" wx:if="{{!item.levelLeaf }}">
-            <van-icon wx:if="{{ item.open }}" color="#bdb7b7" name="arrow-down" style="font-size: 16px;" />
-            <van-icon wx:else color="#bdb7b7" name="arrow" style="font-size: 16px;" />
-        </view>
+            <!-- 侧拉 -->
+            <view style="font-size: 14px;" data-index="{{index}}" data-item="{{item}}" slot="right">{{item['flgValid'] ? $t['disable'] : $t['enable'] }}</view>
+        </van-swipe-cell>
     </view>
     <!-- 列表下半部分 -->
     <view wx:if="{{ !item.open}}" wx:for="{{item.children}}" wx:for-item="item_" wx:for-index="index_" class="list-below-item">
-        <van-swipe-cell right-width="{{ 65 }}" data-index="{{index_}}" data-item="{{item_}}" bind:click="handleDataIsValid">
+        <van-swipe-cell right-width="{{ 65 }}" data-index="{{index_}}" data-item="{{item_}}" bind:click="deactivateEnable" disabled="{{!item_.levelLeaf}}">
             <view style="width: calc(100vw - 130rpx); display:flex;align-items:center; font-size:36rpx;margin-top: 5px;">
                 <view>
                     <van-image src="{{imageUrl + 'tree.png'}}" width="25rpx" height="25rpx" fit="heightFix" />
                 </view>
                 <view style="margin-left: 5vw;font-size: 14px;align-items: center;display: flex;" data-item="{{item_}}" data-type="sub" data-open="{{item.open}}" bindtap="clickName">
                     {{item_.orgName}}
-                    <van-image wx:if="{{item_.flgBusiness}}" style="padding-left: 10rpx;align-items: center;display: flex;" src="{{imageUrl + 'business.png'}}" width="30rpx" height="30rpx" fit="fill" catchtap="showBusinessTip" />
                 </view>
                 <view style="width: 100%;flex:1;text-align: right;" bindtap="toSubOrg" data-item="{{item}}" data-item_="{{item_}}">
                     <van-icon wx:if="{{!item_.levelLeaf }}" color="#bdb7b7" name="arrow" style="font-size: 14px;" />
+                    <van-image wx:else src="{{imageUrl + 'business.png'}}" width="30rpx" height="30rpx" fit="fill" catchtap="showBusinessTip" />
                 </view>
             </view>
             <!-- 侧拉 -->

package-basic-data/pages/org/sub-org-choose/sub-org-choose.js

@@ -77,11 +77,23 @@ Page({
 
   },
   /**
+    * @desc :   启用停用
+    * @date : 2024/5/7 15:49
+    * @author : 周兴
+    */
+  deactivateEnable(e) {
+    if (e.detail == 'right') {
+      let item = e.currentTarget.dataset.item
+      //执行接口
+      this.handleMoreDataIsValid(this.data.service, item, 'orgId')
+    }
+  },
+  /**
    * @desc :暂时提示信息
    * @date : 2024/5/7 15:49
    * @author : 周兴
    */
-  showBusinessTip(e){
+  showBusinessTip(e) {
     util.showToast('业务部门');
   },
   /**
@@ -124,12 +136,21 @@ Page({
    * @author : 王英杰
    */
   setSearchParams(params) {
+    let btnFormData = JSON.parse(this.data.btnFormData)
     params.pageSize = 100000
     params.currentPage = 1
     params.parentId = this.data.item.parentId
+    params.flgValid = btnFormData.flag
     return params
   },
-
+  /**
+ * @desc :底部按钮 过滤停用启用
+ * @date : 2024/2/1 15:49
+ * @author : 王英杰
+ */
+  onEnableChange() {
+    this.searchData()
+  },
   /**
    * @desc :关闭新建框（弹出的popup）
    * @date : 2024/2/1 15:49
@@ -318,7 +339,7 @@ Page({
         res.eventChannel.emit('params', {
           item: {
             parentId: dataset.item.orgId,
-            parentName:dataset.item.orgName,
+            parentName: dataset.item.orgName,
             chooseOrgSort: chooseOrgSort
           }
         })

package-basic-data/pages/org/sub-org-choose/sub-org-choose.wxml

@@ -21,22 +21,26 @@
 <!-- 列表 -->
 <view class="Outer-frame">
     <view wx:for="{{tableData}}" class="list-below-item">
-        <view style="width: 100vw; display:flex;align-items:center; font-size:36rpx;margin-top: 5px;">
-            <view>
-                <van-image src="{{imageUrl + 'tree.png'}}" width="25rpx" height="25rpx" fit="heightFix" />
+        <van-swipe-cell right-width="{{ 65 }}" data-index="{{index}}" data-item="{{item}}" bind:click="deactivateEnable" disabled="{{!item.levelLeaf}}">
+            <view style="width: calc(100vw - 130rpx); display:flex;align-items:center; font-size:36rpx;margin-top: 5px;">
+                <view>
+                    <van-image src="{{imageUrl + 'tree.png'}}" width="25rpx" height="25rpx" fit="heightFix" />
+                </view>
+                <view style="margin-left: 5vw;font-size: 14px;align-items: center;display: flex;" data-item="{{item}}" bindtap="clickName">
+                    {{item.orgName}}
+                </view>
+                <view wx:if="{{item.itemDataLength>0}}" style="width: 100%;flex:1;text-align: right;" bindtap="toSubOrg" data-item="{{item}}">
+                    <van-icon wx:if="{{!item.levelLeaf }}" color="#bdb7b7" name="arrow" style="font-size: 14px;" />
+                    <van-image wx:else src="{{imageUrl + 'business.png'}}" width="30rpx" height="30rpx" fit="fill" catchtap="showBusinessTip" />
+                </view>
             </view>
-            <view style="margin-left: 5vw;font-size: 14px;align-items: center;display: flex;" data-item="{{item}}" bindtap="clickName">
-                {{item.orgName}}
-                <van-image wx:if="{{item.flgBusiness}}" style="padding-left: 10rpx;align-items: center;display: flex;" src="{{imageUrl + 'business.png'}}" width="30rpx" height="30rpx" fit="fill" catchtap="showBusinessTip" />
-            </view>
-            <view wx:if="{{item.itemDataLength>0}}" style="width: 100%;flex:1;text-align: right;" bindtap="toSubOrg" data-item="{{item}}">
-                <van-icon color="#bdb7b7" name="arrow" />
-            </view>
-        </view>
+            <!-- 侧拉 -->
+            <view style="font-size: 14px;" data-index="{{index}}" data-item="{{item}}" slot="right">{{item['flgValid'] ? $t['disable'] : $t['enable'] }}</view>
+        </van-swipe-cell>
     </view>
 </view>
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}</van-divider>
-<view style="height: 135rpx;"></view>
+<view style="height: 200rpx;"></view>
 
 <!-- 新建按钮 -->
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{false}}" btnRightFlag="{{true}}" buttonList="{{buttonList}}" contentList="{{contentList}}" bind:change="onEnableChange" bind:open="open"></dk-save-button>

package-basic-data/pages/product-file/add/add.js

@@ -8,6 +8,7 @@
  *******************************************************************************/
 const mixins = require('@/mixins/index.js')
 const app = getApp()
+const util = require('@/utils/util.js')
 const Constants = require('@/utils/Constants')
 Page({
   mixins: [mixins],
@@ -94,19 +95,19 @@ Page({
           urlKey: 'openingInventory',
         },
         { //库存批号
-          code: 'iinventoryBatchNumber',
+          code: 'nonStdCode',
           type: 'textarea',
           title: mixins.$t("iinventoryBatchNumber"),
         },
         { //期初数量
-          code: 'openingInventoryQty',
+          code: 'intoQty',
           type: 'number',
           sign:"",
           digits:0,
           title: mixins.$t("openingInventoryQty"),
         },
         { //期初成本价
-          code: 'iinitialCostPrice',
+          code: 'intoAmt',
           type: 'textarea',
           title: mixins.$t("iinitialCostPrice"),
         },
@@ -181,6 +182,34 @@ Page({
       formData: JSON.stringify(formData)
     })
   },
+   /**
+   * @desc : 保存数据服务--校验
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  validData() {
+    let formData = JSON.parse(this.data.formData)
+    if(formData.whId||formData.nonStdCode||formData.intoQty||formData.intoAmt){
+      //只要上面有一个有值 剩下三个也要必输
+      if(!formData.whId){
+        util.showToast('请选择仓库');
+        return false
+      }
+      if(!formData.nonStdCode){
+        util.showToast('请输入非标号');
+        return false
+      }
+      if(!formData.intoQty){
+        util.showToast('请输入期初数量');
+        return false
+      }
+      if(!formData.intoAmt){
+        util.showToast('请输入期初成本价');
+        return false
+      }
+    }
+    return true
+  },
   // 设置保存参数
   setParams(params) {
     let saveData = JSON.parse(this.data.formData)
@@ -230,6 +259,7 @@ Page({
   setValuesByEdit(data) {
    // data.serviceCategories = (data.serviceCategories && data.serviceCategories.length > 0) ? data.serviceCategories.join(',') : undefined
    data.annexPaths = data.skuImages
+   data.onlyCode = data.skuCode
     this.setData({
       formData: JSON.stringify(data)
     }) 

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

@@ -164,7 +164,7 @@ Page({
    * @date   : 2024年3月12日
    */
   chooseData(e) {
-    let formData = JSON.parse(this.data.formData)
+    let formData = this.data.formData?JSON.parse(this.data.formData):{}
     let code = e.detail.code
     let data = e.detail.data.data
     if (code == "transferType") { //调整类型
@@ -426,6 +426,11 @@ Page({
       item.nonStdCode = element.nonStdCode || ''
       item.skuId = element.skuId || ''
       item.oInvId = element.invId || ''
+      if(formData.transferType=="调整类型-仓库调整"){
+        item.oNonStdCode = item.nonStdCode
+      }else{
+        item.oWhId = item.whId
+      }
       // item.priceInto = element.priceInto||''   
       // item.intoingAmt = element.intoingAmt||''   
       itemList.push(item)

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

@@ -1,66 +1,539 @@
-// package-inventory/pages/inventory-adjustment/detail/detail.js
+// package-basic-data/pages/test/add/add.js
+const mixins = require('@/mixins/index.js')
+const utils = require('@/utils/util');
+const app = getApp() 
+const config = require('@/config/config.js')
+const Constants = require('@/utils/Constants');
 Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    controlFlags: { choosewhFlag: true, chooseWhByUserDefault: true, choosewhReadonly: false, paramsByWhId: true, sourcePage: 'inventory-adjustment' },
+    draftFlag: false,
+    purIdArray: '', //来源单id 
+    // 弹出按钮
+    buttonList: [],
+    goodsListDownContent: [{
+      code: 'whId',
+      name: 'whName',
+      title: '备注',
+      type: 'str',
+    }],
+    btnFormData: null,
+    popupTopObj: [{
+      leftTitle: mixins.$t('storageNum'), //库存量',
+      leftCode: 'usableQty',
+      rightTitle: mixins.$t('sellableQuantity'), //'可售量',
+      rightCode: 'invQty'
+    }],
+    popContent: [{
+      code: 'itemQty',
+      type: 'step',
+      title: mixins.$t('countedQuantity'), //'数量', 
+      required: true
+    },
 
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
+    {
+      code: 'oWhId',
+      name: 'oWhName',
+      title: '源库区', //'盘亏原因',
+      type: 'choose',
+      urlKey: 'selectInventorySku'
+    },
+    {
+      code: 'whId',
+      name: 'whName',
+      title: '目标库区', //'盘亏原因',
+      type: 'choose',
+      urlKey: 'chooseWh'
+    },
+    {
+      code: 'nonStdCode',
+      title: mixins.$t("goodsBatch"), //'商品批次',
+      type: 'str',
+      readonly: true,
+    },
+    {
+      code: 'oNonStdCode',
+      name: 'oNonStdName',
+      title: '源批号', // '仓库',
+      type: 'str',
+    },
+    {
+      code: 'nonStdCode',
+      name: 'nonStdName',
+      title: '目标批号', //'盘亏原因',
+      type: 'str',
+      urlKey: 'openingReason'
     },
 
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
+    ],
 
+    cardList: [{
+      name: 'main',
+      title: mixins.$t("inventoryInformation"), //'盘点信息 
     },
+    {
+      name: 'items',
+      title: mixins.$t("goodsDetail"), //'商品明细', 
+      color: '#E4002B',
+      displayNum: 2
+    }, {
+      name: 'other',
+      title: mixins.$t("otherInfo"), // '其他信息'
+    }
+    ],
+    contentObj: {
+      main: [{
+        code: 'transferType',
+        name: 'transferTypeName',
+        title: "调整类型", //mixins.$t("inventoryEmployees"),  
+        type: 'choose',
+        required: true,
+        clearItemFlag:true,
+        urlKey: 'chooseAdjustmentType',
+      }, {
+        code: 'staffId',
+        name: 'staffName',
+        title: '责任人', //'盘点员工', 
+        type: 'choose',
+        required: true,
+        urlKey: 'chooseStaff'
+      }, {
+        code: 'orgId',
+        name: 'orgName',
+        title: '部门', //'盘点部门',  
+        type: 'choose',
+        required: true,
+        urlKey: 'chooseOrg'
+      },
+      {
+        code: 'whId',
+        name: 'whName',
+        type: 'choose',
+        title: "目标仓库", //'盘点仓库' 
+        urlKey: 'chooseWh'
+      },
+      {
+        code: 'nonStdCode',
+        name: 'nonStdName',
+        type: 'str',
+        title: "目标批号", //'盘点仓库'  
+      }
+      ],
+      items: [],
+      other: [{
+        code: 'remarks',
+        type: 'textarea',
+        title: mixins.$t("remarks"), //'备注',
+        readonly: true
+      }, {
+        code: 'file',
+        type: 'uploader',
+        title: mixins.$t("uploader"), //'附件'
+        readonly: true
+      }]
+    },
+    // 路由
+    routeObjName: 'inventoryAdjustment',
+    // inboundProcessingService: app.globalData['inboundProcessingService'],
+  },
+  /*
+   * @desc   : 监听dk-from-bill str类型的数据变化
+   * @author : 王英杰
+   * @date   : 2024年3月12日
+   */
+  changeField(e) {
+    let code = e.detail.code
+    let formData = JSON.parse(this.data.formData)
+    if (code == "nonStdCode") { //当输入总单的目标批号的时候  把已选商品的目标批号刷成一样的
+      if (formData.goodsList) {
+        formData.goodsList.forEach(element => {
+          element.nonStdCode = formData.nonStdCode
+        });
+        this.setData({
+          formData: JSON.stringify(formData)
+        })
+      }
+    }
+  },
+  /*
+   * @desc   : 绑定数据
+   * @author : 王英杰
+   * @date   : 2024年3月12日
+   */
+  chooseData(e) {
+    let formData = JSON.parse(this.data.formData)
+    let code = e.detail.code
+    let data = e.detail.data.data
+    if (code == "transferType") { //调整类型
+      formData.transferType = data.id
+      formData.transferTypeName = data.name
+      this.switchTransferType(formData.transferType)
+    }
+    if (code == "staffId") { //员工
+      formData.staffId = data.id
+      formData.staffName = data.name
+    }
+    if (code == "orgId") { //员工
+      formData.orgId = data.id
+      formData.orgName = data.name
+    }
+    if (code == "whId") { //目标仓库
+      formData.whId = data.id
+      formData.whName = data.name
+
+      if (formData.goodsList) {
+        formData.goodsList.forEach(element => { //总单的目标仓库 作为一个总开关 直接改变 所以品的仓库
+          element.whId = data.id
+          element.whName = data.name
+        });
+      }
+    }
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+  },
+  /**
+   * @desc : 切换调整类型 对应处理 
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  switchTransferType(transferType) {
 
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
+    if (transferType == Constants.inventoryAdjustment.warehouse) { //调整类型-仓库调整
+      this.setData({
+        contentObj: {
+          main: [{
+            code: 'transferType',
+            name: 'transferTypeName',
+            title: "调整类型", //mixins.$t("inventoryEmployees"),  
+            type: 'choose',
+            required: true,
+            clearItemFlag:true,
+            urlKey: 'chooseAdjustmentType',
+          }, {
+            code: 'staffId',
+            name: 'staffName',
+            title: '责任人', //'盘点员工', 
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseStaff'
+          }, {
+            code: 'orgId',
+            name: 'orgName',
+            title: '部门', //'盘点部门',  
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseOrg'
+          },
+          {
+            code: 'whId',
+            name: 'whName',
+            type: 'choose',
+            title: "目标仓库", //'盘点仓库' 
+            urlKey: 'chooseWh'
+          },
+          ],
+          items: [],
+          other: [{
+            code: 'remarks',
+            type: 'textarea',
+            title: mixins.$t("remarks"), //'备注',
+            readonly: false
+          }, {
+            code: 'file',
+            type: 'uploader',
+            title: mixins.$t("uploader"), //'附件'
+          }]
+        },
+        popContent: [{
+          code: 'itemQty',
+          type: 'step',
+          title: mixins.$t('countedQuantity'), //'数量', 
+          required: true
+        },
 
-    },
+        {
+          code: 'oWhId',
+          name: 'oWhName',
+          title: '源库区', //'盘亏原因',
+          type: 'choose',
+          urlKey: 'selectInventorySku'
+        },
+        {
+          code: 'whId',
+          name: 'whName',
+          title: '目标库区', //'盘亏原因',
+          type: 'choose',
+          urlKey: 'chooseWh'
+        },
+        {
+          code: 'nonStdCode',
+          title: mixins.$t("goodsBatch"), //'商品批次',
+          type: 'str',
+          readonly: true,
+        },
 
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
 
-    },
+        ],
+      })
+    } else { //盘点状态-非标号调整
+      this.setData({
+        contentObj: {
+          main: [{
+            code: 'transferType',
+            name: 'transferTypeName',
+            title: "调整类型", //mixins.$t("inventoryEmployees"),  
+            type: 'choose',
+            required: true,
+            clearItemFlag:true,
+            urlKey: 'chooseAdjustmentType',
+          }, {
+            code: 'staffId',
+            name: 'staffName',
+            title: '责任人', //'盘点员工', 
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseStaff'
+          }, {
+            code: 'orgId',
+            name: 'orgName',
+            title: '部门', //'盘点部门',  
+            type: 'choose',
+            required: true,
+            urlKey: 'chooseOrg'
+          },
+          {
+            code: 'nonStdCode',
+            name: 'nonStdName',
+            type: 'str',
+            title: "目标批号", //'盘点仓库'  
+          }
+          ],
+          items: [],
+          other: [{
+            code: 'remarks',
+            type: 'textarea',
+            title: mixins.$t("remarks"), //'备注',
+            readonly: false
+          }, {
+            code: 'file',
+            type: 'uploader',
+            title: mixins.$t("uploader"), //'附件'
+          }]
+        },
+        popContent: [{
+          code: 'itemQty',
+          type: 'step',
+          title: mixins.$t('countedQuantity'), //'数量', 
+          required: true
+        },
 
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
+        {
+          code: 'oNonStdCode',
+          name: 'oNonStdName',
+          title: '源批号', // '仓库',
+          type: 'str',
+        },
+        {
+          code: 'nonStdCode',
+          name: 'nonStdName',
+          title: '目标批号', //'盘亏原因',
+          type: 'str',
+          urlKey: 'openingReason'
+        },
 
-    },
+        ],
+      })
+    }
+  },
+  /**
+   * @desc : 外露设置产品方法 
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setGoods(e) {
+    let formData = JSON.parse(this.data.formData)
+    formData.goodsList.forEach(element => {
+      element.balanceQty = element.itemQty - element.invQty
+      if (element.skuImages && element.skuImages.length > 0) {
+        element.skuImages.forEach(item => {
+          item.url = config.image_url + item.path
+        });
+        element.imagesUrl =   element.skuImages[0].url
+      } 
+    });
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+  },
+  /**
+   * @desc : 保存数据服务--校验
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  validData() {
+    if (this.data.draftFlag) {
+      return true;
+    }
+    let formData = JSON.parse(this.data.formData)
+    let that = this
 
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
+    // if (formData.goodsList == null || formData.goodsList.length == 0) {
+    //   utils.showToast(mixins.$t("chooseGoodsInfo"));
+    //   return false
+    // }
 
-    },
+    // for (let i = 0; i < formData.goodsList.length; i++) {
+    //   if (formData.goodsList[i].balanceQty < 0) { //盘亏需要盘亏原因
+    //     if (!formData.goodsList[i].lossReason) {
+    //       utils.showToast(mixins.$t("chooseLnventoryLossReasons"));
+    //       return false
+    //     }
+    //   }
+    // }
 
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
 
-    },
+    return true
+  },
+  /**
+   * @desc : 保存的參數設置
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setParams(params) {
+    let formData = JSON.parse(this.data.formData)
+    params.staffId = formData.staffId
+    params.orgId = formData.orgId
+    params.transferType = formData.transferType
+    params.makeStaff = app.globalData.user.staffId
+    params.remarks = formData.remarks
+    params.oWhId = formData.oWhId || ''
+    params.whId = formData.whId
+    params.oNonStdCode = formData.oNonStdCode || ''
+    params.nonStdCode = formData.nonStdCode
 
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
+    let itemList = []
+    formData.goodsList.forEach((element, index) => {
+      let item = {}
+      item.itemIndex = index
+      item.transferQty = element.itemQty
+      item.oWhId = element.oWhId || ''
+      item.whId = element.whId || ''
+      item.oNonStdCode = element.oNonStdCode || ''
+      item.nonStdCode = element.nonStdCode || ''
+      item.skuId = element.skuId || ''
+      item.oInvId = element.invId || ''
+      // item.priceInto = element.priceInto||''   
+      // item.intoingAmt = element.intoingAmt||''   
+      itemList.push(item)
+    });
 
-    },
+    params.itemList = itemList
+    return params;
+  },
+
+  /**
+   * @desc : 保存数据服务
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  saveData() {
+    let formData = JSON.parse(this.data.formData)
+    if (this.data.formMode == "edit") { //编辑
+      return this.excute(this.data.service, this.data.service.update, this.data.params)
+    } else { //新建 或者暂存
+      return this.excute(this.data.service, this.data.service.insert, this.data.params)
+    }
+
+  },
+  /**
+   * @desc : 给表单赋值
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  setValuesByEdit(data) {
+    let formData = JSON.parse(this.data.formData)
+    let readonly = this.data.readonly || false
+    let buttonList = this.data.buttonList
+    formData = data.data  
+    formData.transferTypeName =  formData.transferStatusName
+ 
+    //明细数据
+    formData.goodsList = data.dataItem
+    formData.goodsList.forEach(element => {
+      element.itemQty = element.transferQty
+      element.pricePurchase = element.priceInto
+    });
+
+    wx.setNavigationBarTitle({
+      title: '库存调整明细', // mixins.$t('supplierAdd')
+    })
+    buttonList = [ ]
+    readonly = true
+    this.setData({
+      formData: JSON.stringify(formData),
+      buttonList: buttonList,
+      readonly: readonly
+    })
+    // 刷新商品明细 显示 查看更多
+    let card = this.data.cardList.filter(it => it.name == 'items');
+    this.selectComponent('#' + this.data.formName).handleContentObj(card[0])
+  },
+  /**
+   * @desc : 初始化数据
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  loadInit() {
+    //设置保存按钮
+    let that = this
+    let buttonList = [{
+      code: 'save',
+      name: 'merge',
+      title: mixins.$t("save"), //'保存'
+    }]
+    that.setData({
+      buttonList: buttonList,
+    })
+    //设置 调整类型初始值 已经对应的逻辑处理
+    let formData = this.data.formData ? JSON.parse(this.data.formData) : {}
+    formData.transferType = Constants.inventoryAdjustment.warehouse
+    formData.transferTypeName = '仓库调整'
+    console.log("app.globalData.user",app.globalData.user);
+    formData.orgId = app.globalData.user.orgId
+    formData.orgName = app.globalData.user.orgName 
+    formData.staffId = app.globalData.user.staffId
+    formData.staffName = app.globalData.user.staffName 
+    this.switchTransferType(formData.transferType)
+    this.setData({
+      formData: JSON.stringify(formData)
+    })
+  },
+  /**
+   * @desc : 按钮点击事件回调
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  open(e) {
 
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
+    console.log('ee', e);
+    let that = this
+    let code = e.detail.name
 
+    let draftFlag = false;
+    if (code == 'draft') { //暂存
+      draftFlag = true;
+      this.setData({
+        validFlag: false
+      })
     }
+    this.setData({
+      draftFlag: draftFlag
+    })
+    this.save({});
+  },
 })

package-inventory/pages/inventory-adjustment/detail/detail.json

@@ -1,3 +1,4 @@
 {
-    "usingComponents": {}
-}
+  "usingComponents": {},
+  "navigationBarTitleText": "新建库存调库"
+} 

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

@@ -1,2 +1,21 @@
-<!--package-inventory/pages/inventory-adjustment/detail/detail.wxml-->
-<text>package-inventory/pages/inventory-adjustment/detail/detail.wxml</text>
+<!-- 前台导入wxmlUtil.wxs -->
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+<!-- 添加模版 -->
+<import src="/utils/template.wxml" />
+<template is="myTemplate" />
+<loading wx:if="{{loading}}" ></loading>
+
+<!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
+</dk-form> -->
+
+<dk-form-bill sumAmountColFlag="{{false}}" type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel"   descCol="skuName"   quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale"  bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"  iconCol="imagesUrl" 
+bind:delItem="setGoods" bind:setGoods="setGoods" bind:changeField="changeField" controlFlags ="{{controlFlags}}">
+</dk-form-bill>
+
+
+<!-- 空高度  -->
+<view style="width: 100%;height: 200px;"></view>
+ 
+ 
+<!-- 新建按钮 -->
+<dk-save-button   btnAutoWidthFlag="{{true}}"  buttonList="{{buttonList}}"   bind:open="open"></dk-save-button>

package-inventory/pages/inventory-adjustment/detail/detail.wxss

@@ -1 +1,31 @@
-/* package-inventory/pages/inventory-adjustment/detail/detail.wxss */
+/* package-basic-data/pages/test/add/add.wxss */
+/**底部的样式*/
+.bottom-class{
+  position: fixed;
+  bottom: 20rpx;
+  width: 100%;
+  align-items: center;
+  justify-content: center;
+  border-top: 2rpx solid #efefef;
+  z-index: 2;
+  display: flex;
+}
+.btn-add-class {
+  background: #8091A9;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 20rpx;
+  box-shadow: 0px 17px 22px 0px #1B365D33;
+}
+ 
+/**底部保存按钮的样式*/
+.save-button-class{
+  width: 640rpx;
+  background: #1B365D !important;
+  border-radius: 15rpx !important;
+  color:#fff !important;
+  font-size: 16px !important;
+  font-weight: 500 !important;
+}

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

@@ -53,83 +53,52 @@ Page({
     // 列表区（脚部金额）
     footerAmount: {  },
     // 列表区（脚部信息）
-    footerInfo: [{
-      name: 'tsumQuantity',
-      title: '品类'
-    },{
+    footerInfo: [ {
       name: 'categoryQuantity',
       title: '共计'
     }, {
       name: 'tsumQuantity',
       title: '件'
     }],
-    // 列表区（内容）
-    contentList: [ {
-      name: 'orderNo',
-      title: '盘点单号'
-    } ,  {
-      name: [{
-        name: 'orgName',
-        title: ''
-      }, {
-        name: 'staffName',
-        title: ''
-      }],
-      title: '责任员工'
-    }, {
-      name: 'data',
-      title: '盘点日期'
-    }, {
-      name: '',
-      title: '备注'
-    }],
+   
 
     contentObj: {
-      '已出库': [{
-        name: 'orderNo',
-        title: '调整单号'
-      } , {
-        name: 'addressFull',
+      '仓库调整': [  {
+        name: 'oWhName',
         title: '源仓库'
       }, {
-        name: 'addressFulls',
+        name: 'whName',
         title: '目标仓库'
       }, {
         name: [{
-          name: 'orgName',
+          name: 'transferOrg',
           title: ''
         }, {
-          name: 'staffName',
+          name: 'transferStaff',
           title: '业务员'
         }],
         title: '责任信息'
       }, {
-        name: 'data',
+        name: 'transferDate',
         title: '调整日期'
       }],
-      '待出库': [{
-        name: 'orderNo',
-        title: '调整单号'
-      } ,{
-        name: 'addressFull',
+      '批次调整': [ {
+        name: 'ononStdCode',
         title: '源批号'
       },{
-        name: 'addressFullss',
+        name: 'nonStdCode',
         title: '目标批号'
-      }, {
-        name: 'addressFull',
-        title: '客户地址'
-      }, {
+      },  {
         name: [{
-          name: 'orgName',
+          name: 'transferOrg',
           title: ''
         }, {
-          name: 'staffName',
+          name: 'transferStaff',
           title: '业务员'
         }],
         title: '责任信息'
       },{
-        name: 'data',
+        name: 'transferDate',
         title: '调整日期'
       }]
     },
@@ -153,6 +122,8 @@ Page({
     totallength: 0, //视图下方提醒数量 
     // 路由
     routeObjName: 'inventoryAdjustment', 
+       // 主键Id
+       primaryKey: 'transferId',
   },
   
   /**

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

@@ -12,8 +12,8 @@
 <!-- 暂无数据 -->
 <van-empty wx:if="{{dataList.length<=0}}" description="{{$t['nodata']}}" />
 
-<!-- 列表区 -->
-<dk-list  list="{{tableData}}" contentCol="displayStatus"  titleCorner="salesChannelName" title="customerName"collectCol="collectAmount"  status="displayStatus"  content="{{contentList}}" contentObj="{{contentObj}}"  footerAmount="{{footerAmount}}"            footerInfo  ="{{footerInfo}}" bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{pupbuttonList}}" bind:open="open"></dk-list>
+<!-- 列表区   footerInfo  ="{{footerInfo}}"-->
+<dk-list  list="{{tableData}}" contentCol="displayStatus"  title="transferNo"   status="transferStatusName"contentCol="transferStatusName"  contentObj="{{contentObj}}"    bind:toDetail="toDetail" bind:toTitle="toTitle" bind:toStatus="toStatus" bind:toPoint="toPoint" routeObjName="{{routeObjName}}" buttonList="{{pupbuttonList}}" bind:open="open"></dk-list>
 
 <van-divider wx:if="{{noMore}}" contentPosition="center" borderColor="#DCDCDC">{{$t['noMore']}}~</van-divider>
 <view style="height: 135rpx;"></view>

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

@@ -2,6 +2,7 @@
 const mixins = require('@/mixins/index.js')
 const app = getApp()
 const Constants = require('@/utils/Constants');
+const config = require('@/config/config.js')
 Page({
     mixins: [mixins],
     /**
@@ -122,6 +123,12 @@ Page({
         formData.goodsList = data.dataItem
         formData.goodsList.forEach(element => {
             element.itemQty = element.checkQty
+            if (element.skuImages && element.skuImages.length > 0) {
+              element.skuImages.forEach(item => {
+                item.url = config.image_url + item.path
+              });
+              element.imagesUrl = element.skuImages[0].url
+            }
         });
         this.setData({
             formData: JSON.stringify(formData)

package-inventory/pages/inventory-check/detail/detail.wxml

@@ -6,8 +6,8 @@
 <!-- <dk-form id="{{formName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}" bind:chooseData="chooseData">
 </dk-form> -->
 
-<dk-form-bill type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel"   quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"
-bind:delItem="setGoods" bind:setGoods="setGoods">
+<dk-form-bill type="out" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel" descCol="skuName"   quantityCol="itemQty"   contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" priceTitle="{{$t['wholesalePrice']}}：" bind:editItems="setGoods" bind:clear = "clear" readonly = "{{readonly}}"chooseVisible="{{!chooseVisible}}" popupTopObj="{{popupTopObj}}"
+bind:delItem="setGoods" bind:setGoods="setGoods"  iconCol="imagesUrl" >
 </dk-form-bill>
 
 

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

@@ -18,7 +18,7 @@ Page({
   data: {
     // 查询条件
     searchContent: [{
-      code: 'maketime',
+      code: 'makeTime',
       title: mixins.$t('pastThirthtyDays'),//近30天',
       defaultValue: 5,
       searchType: Constants.searchType.date
@@ -30,29 +30,17 @@ Page({
 
     // 查询条件-筛选
     pullMenuList: [{
-      code: 'outStatus',
+      code: 'coilingState',
       pullType: 'mSelect',
-      typeName: 'outStatus'
+      typeName: 'coilingState'
     }, {
-      code: 'receiveStatus',
-      pullType: 'mSelect',
-      typeName: 'receiveStatus'
-    }, {
-      code: 'designStatus',
-      pullType: 'mSelect',
-      typeName: 'designStatus'
+      code: 'staffName', 
     }, {
-      code: 'customerFrom',
-      pullType: 'mSelect',
-      typeName: 'customerFrom'
+      code: 'orgName', 
     }, {
-      code: 'keyType',
-      pullType: 'mSelect',
-      typeName: 'keyType'
-    }, {
-      code: 'delivery_Time',
-      dataType: 'date'
-    }],
+      code: 'checkNo', 
+      title:'盘点单号'
+    }, ],
 
  
       // 列表区（脚部信息）

package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order.js

@@ -1,6 +1,7 @@
 const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
+const config = require('@/config/config.js');
 Page({
   mixins: [mixins],
   /**
@@ -51,7 +52,18 @@ Page({
   handleSearchData(tableData) {
     let chooseList = this.data.chooseList || []
     tableData.forEach(element => {
-      element.purchaseItemResponseList = JSON.parse(element.purchaseItemResponseList.value)
+      if (element.purchaseItemResponseList) {
+        element.purchaseItemResponseList = JSON.parse(element.purchaseItemResponseList.value)
+        element.purchaseItemResponseList.forEach(element => {
+          if (element.skuImages && element.skuImages.length > 0) {
+            element.skuImages.forEach(item => {
+              item.url = config.image_url + item.path
+            });
+            element.imagesUrl = element.skuImages[0].url
+          }
+        });
+      }
+
     })
     if (chooseList.length > 0) {
       let tableData = this.data.tableData || []
@@ -74,9 +86,12 @@ Page({
       this.calculateTotal()
     }
     tableData.forEach(element => { //canIntoingQty：可入库数量
-      element.purchaseItemResponseList.forEach(item => {
-        item.canIntoingQty = Number(item.itemQty - item.intoQty)
-      });
+      if(element.purchaseItemResponseList){
+        element.purchaseItemResponseList.forEach(item => {
+          item.canIntoingQty = Number(item.itemQty - item.intoQty)
+        });
+      }
+   
     });
     this.setData({
       tableData: tableData,

package-purchase/pages/purchase-receipt/choose-purchase-order/choose-purchase-order.wxml

@@ -37,11 +37,11 @@
           <view class="border-solid" style="{{index_ === 0 ? (item.purchaseItemResponseList.length  == 1 ? 'margin-top:30rpx;margin-bottom:30rpx;' : 'margin-top:30rpx;') : index_ ===(item.purchaseItemResponseList.length -1) ? 'margin-bottom:30rpx;': ''}}"></view>
           <view style="display: flex;width: 100%;">
             <view style="padding:20rpx;">
-              <van-image radius="5px" width="80" height="80" src="{{item_.skuImages? item_.skuImages.path : ''}}" />
+              <van-image radius="5px" width="80" height="80" src="{{item_.imagesUrl? item_.imagesUrl : ''}}" />
             </view>
             <view style="width: 100%;padding:20rpx;padding-left: 10rpx;">
               <view>
-                <dk-title titleTag="{{'HEGII'}}" title="{{item_.skuCode}}"></dk-title>
+                <dk-title titleTag="{{item_.shortName}}" title="{{item_.skuModel}}"></dk-title>
               </view>
               <view>
                 <view style="width: 100%;margin-top: 10rpx;" class="font">{{item_.skuName}}</view>