冻结

api/pages/ivt/freeze.js

@@ -11,7 +11,7 @@ module.exports = {
   freezeService: {
       // 前缀
       prefix: 'mdm-server/ivt/freeze/', 
-     
+      getFreezeForUpdate:'get_freeze_for_update'
 
   },
 
@@ -20,6 +20,9 @@ module.exports = {
       add:{
         key:'add',url:'/package-inventory/pages/inventory-freeze/add/add'
       },
+      edit:{
+        key:'edit',url:'/package-inventory/pages/inventory-freeze/add/add'
+      },
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  },
       chooseOrg: { key: 'chooseOrg',url: '/package-base-select/pages/select-data/select-data',type:'org' }, 
       selectCustomers: { key: 'selectCustomers', url: '/package-base-select/pages/select-customers/select-customers' },

components/dkbase/dk-form-bill/dk-form-bill.js

@@ -88,6 +88,10 @@ Component({
       type: String,
       value: 'sumAmount'
     },
+    sumAmountColFlag:{
+      type: Boolean,
+      value: true
+    },
     // 可用收款列
     canUseCollectCol: {
       type: String,

components/dkbase/dk-form-bill/dk-form-bill.wxml

@@ -127,7 +127,7 @@
           <!--条数-->
           <dk-cell titleColor="#95A8CB;" title="{{$t['together'] + (form[itemName]?form[itemName].length:0) + $t['bill']}}" amount="{{false}}"></dk-cell>
           <!--标价折扣-->
-          <dk-cell fontSize="16" fontWeight="bold" contentColor="#CAA977" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
+          <dk-cell wx:if="{{sumAmountColFlag}}" fontSize="16" fontWeight="bold" contentColor="#CAA977" titleColor="#1B365D;" title="合计金额" content="{{card[sumAmountCol]?card[sumAmountCol]:0}}"></dk-cell>
         </view>
 
         <view class="amount-item-class" wx:if="{{type === 'sale'}}">

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

@@ -12,14 +12,11 @@ Page({
     routeObjName: 'freeze',
     cardList: [
       { name: 'main', title: '冻结信息' },
-      { name: 'relation' },
       { name: 'items', title: mixins.$t("goodsDetail"), chooseGoodsFlag: true, itemAmt: '', displayNum: 2 },
       { name: 'other', title: mixins.$t("otherInfo") },
-
     ],
     contentObj: {
       main: [
-
         { code: 'cusId', name: 'cusName', title: '申请对象', type: 'choose', required: true, urlKey: 'selectCustomers' },
         {
           code: 'staffId', name: 'staffName',
@@ -36,7 +33,6 @@ Page({
           required: true,
           urlKey: 'chooseOrg'
         },
-
       ],
       items: [],
       other: [
@@ -47,6 +43,39 @@ Page({
 
     buttonSaveList: [{ code: 'save', title: '冻结' }],
   },
+
+  /**
+     * @desc   : 设置只读
+     * @author : 于继渤
+     * @date   : 2024年3月12日
+     */
+  setColumn() {
+    let formData = JSON.parse(this.data.formData)
+    let cardList = this.data.cardList
+    let contentObj = this.data.contentObj
+    let buttonSaveList = this.data.buttonSaveList
+    cardList[1].info = '(' + formData.freezeStatusName + ')'
+    cardList[1].color = '#E4002B'
+    cardList[1].chooseGoodsFlag = false
+    contentObj.main = [
+      { code: 'cusName', title: '申请对象', type: 'str', readonly: true },
+      { code: 'staffName', title: '申请员工', type: 'str', readonly: true },
+      { code: 'orgName', title: '申请部门', type: 'str', readonly: true },
+    ]
+    if (formData.freezeStatus == '冻结状态-部分解冻' || formData.freezeStatus == '冻结状态-全部解冻' ){
+      buttonSaveList =  [{ code: 'close', title: '关闭' }]
+    }else{
+      buttonSaveList =  [{ code: 'save', title: '解冻' }]
+    }
+    
+    this.setData({
+      cardList:cardList,
+      contentObj:contentObj,
+      buttonSaveList:buttonSaveList,
+    })
+  },
+
+
   /**
      * @desc   : 绑定数据-选择页面返回的逻辑处理
      * @author : 姜永辉
@@ -81,21 +110,21 @@ Page({
       formData: JSON.stringify(formData)
     })
   },
-    /**
-    * @desc : 设置保存参数
-    * @date : 2024/2/1 15:49
-    * @author : 于继渤
-    */
+  /**
+  * @desc : 设置保存参数
+  * @date : 2024/2/1 15:49
+  * @author : 于继渤
+  */
   setParams(params) {
     let itemIndex = 0
     let sumQuantity = Number(0)
-    console.log('app.globalData.user',app.globalData.user)
-    params.goodsList.forEach(res=>{
+    console.log('app.globalData.user', app.globalData.user)
+    params.goodsList.forEach(res => {
       res.itemIndex = itemIndex++
-      res.freezeQty = res.itemQty
+
       res.surplusQty = res.itemQty
       res.unfreezeQty = 0
-      sumQuantity+= res.itemQty
+      sumQuantity += res.freezeQty
       delete res['priceLimited']
       delete res['pricePurchase']
       delete res['priceStandard']
@@ -104,8 +133,8 @@ Page({
       delete res['costAmt']
       delete res['outingQty']
     })
-    params.itemList = params.goodsList 
-    params.sumQuantity =sumQuantity
+    params.itemList = params.goodsList
+    params.sumQuantity = sumQuantity
     params.makeStaff = app.globalData.user.userId
     delete params['goodsList']
     return params
@@ -118,4 +147,68 @@ Page({
   saveData() {
     return this.excute(this.data.service, this.data.service.insert, this.data.params);
   },
+
+  /**
+    * @desc : 查询商品明细
+    * @date : 2024/2/1 15:49
+    * @author : 于继渤
+    */
+  getItemDetal(id) {
+    return this.excute(this.data.service, this.data.service.getFreezeForUpdate + '/' + id, {}).then(res => {
+      if (res.data.code == 200) {
+        let formData = JSON.parse(this.data.formData)
+       
+        formData = res.data.data.data
+        formData.goodsList = res.data.data.dataItem
+     
+        this.setData({
+          formData: JSON.stringify(formData)
+        })
+
+      }
+    });
+  },
+  /**
+     * @desc :   编辑
+     * @date : 2024/2/1 15:49
+     * @author : 于继渤
+     */
+    toEdit() {
+      let this_ = this
+      wx.navigateTo({
+        url: this_.data.route.add.url,
+        events: {
+          // 保存成功后刷新页面
+          refresh: function (data) {
+          }
+        },
+        success: function (res) {
+          res.eventChannel.emit('params', {
+            formMode: 'detailEdit', id: this_.data.id
+          });
+        }
+      })
+    },
+  /**
+ * 生命周期函数--监听页面加载
+ */
+  loadInit() {
+    let formData = JSON.parse(this.data.formData)
+    if (this.data.formMode == Constants.formMode.detail) { //详情
+      //详情办理
+      wx.setNavigationBarTitle({
+        title: '库存冻结详情'
+      })
+     
+      this.getItemDetal(this.data.id)
+      this.setColumn()
+    }else if (this.data.formMode == Constants.formMode.detailEdit) {
+      //编辑
+      wx.setNavigationBarTitle({
+        title: '编辑库存冻结'
+      })
+      this.getItemDetal(this.data.id)
+
+    }
+  }
 })

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

@@ -1,10 +1,18 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
-<dk-form-bill type="out" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode"  subCol="skuCode" descCol="skuModel"  quantityCol="itemQty"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
-bind:editItems="editItems"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"
+<dk-form-bill type="out" id="dk-form-bill" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode"  subCol="skuCode" descCol="skuModel"  quantityCol="freezeQty"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
+bind:editItems="editItems" sumAmountColFlag="{{false}}"  bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"
  popType="out" priceTitle="标价：" 
 >
 </dk-form-bill>
+<view style="height: 200rpx;"></view>
+
+<!-- 底部加号 -->
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;" wx:if="{{formMode =='detail'}}">
+  <view bind:tap="toEdit" class="btn-add-class">
+    <van-icon name="edit" color="#FFFFFF" size="60rpx" />
+  </view>
+</view>
 
 <!-- 新建按钮 -->
 <dk-save-button model:value="{{btnFormData}}" btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" contentList="{{contentSaveList}}" bind:open="save"></dk-save-button>

package-inventory/pages/inventory-freeze/add/add.wxss

@@ -514,4 +514,12 @@ page {
 	display: inline-block;
 	margin-left: 5px;
   }
-  
+  .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;
+  }

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

@@ -10,6 +10,7 @@
 const Constants = require('@/utils/Constants.js');
 const util = require('@/utils/util.js')
 const mixins = require('@/mixins/index.js')
+const app = getApp();
 Page({
   mixins: [mixins],
   /**
@@ -145,7 +146,7 @@ Page({
    * @author : 王英杰
    */
   handleSearchData(tableData) {
-
+    console.log(app.globalData.user)
     tableData.forEach(element => {
       if (element.freezeStatus == '冻结状态-全部冻结') {
         element.backgroundColor = "red"
@@ -155,4 +156,19 @@ Page({
       tableData: tableData,
     })
   },
+  /**
+   * @desc :   跳转明细
+   * @date : 2024年3月8日
+   * @author : 王英杰
+   */
+  toDetail(e){
+    let freezeId = e.detail.item.freezeId
+    wx.navigateTo({
+      url: this.data.route.edit.url,
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', { id: freezeId, formMode: Constants.formMode.detail})
+      }
+    })
+  }
 })