修改bug

i18n/zh-CN.js

@@ -215,6 +215,7 @@ const ivt = {
   lastQty: '期末数量',
   last: '期末',
   purReturnPrice: '退货单价',
+  staffInfo: '员工信息',
 }
 
 //  首页
@@ -370,6 +371,7 @@ const basicData = {
 
   sourceCode: '来源编码',
   sourceName: '来源名称',
+  expenseOrderNumber : '支出单号',
 
 }
 
@@ -457,7 +459,7 @@ const accountsManage = {
   applicationObject: '申请对象',
   objectPhone: '申请电话',
   freezeDate: '冻结日期',
-  thawingDate: '解冻日期',
+  unfreezeDate: '解冻日期',
   freezeAll: '冻结状态-全部解冻',
   ufreezeAll: '冻结状态-全部冻结',
   freezeNo: '冻结单号',
@@ -719,6 +721,7 @@ const pur = {
   invoiceContent:'发票内容',
   invoicingParty:'开票方',
   totalInvoiceAmount:'发票总额',
+  autoUnfreezeDate:'自动解冻日期',
 }
 const otherAccounts = {
   amountReceivable: "应收金额",

package-accounts-manage/pages/other-expenditure-orders/other-expenditure-orders.js

@@ -32,7 +32,7 @@ Page({
     pullMenuList: [       
       {
         code: 'payableNo', 
-        title: mixins.$t('paymentOrderNo'),
+        title: mixins.$t('expenseOrderNumber'),
       },
       {
         code: 'supName',
@@ -43,12 +43,12 @@ Page({
         dataType: 'date'
       },
 
-      {
-        code: 'staffName',
-      },
-      {
-        code: 'orgName',
-      },
+      // {
+      //   code: 'staffName',
+      // },
+      // {
+      //   code: 'orgName',
+      // },
       { 
         code: 'flgValid',
         title: mixins.$t('flgValid'),

package-basic-data/pages/historical-purchase-history/detail/detail.js

@@ -130,4 +130,25 @@ Page({
             okkey: true
         })
     },
+    /**
+   * @desc : 跳转到微信聊天界面
+   * @author : 周兴
+   * @date : 2024/4/9
+   */
+  handleWxService(e) {
+    // let url= Constants.WX_SERVICE
+    // wx.navigateTo({
+    //   url: '/pages/product/product',
+    //   success: function (res) {
+    //     res.eventChannel.emit('url', Constants.WX_SERVICE);
+    //   }
+    // })
+    wx.openCustomerServiceChat({
+      extInfo: {
+        url: Constants.WX_SERVICE
+      },
+      corpId: Constants.WX_CPID,
+      success(res) { }
+    })
+  },
 })

package-basic-data/pages/historical-purchase-history/detail/detail.wxml

@@ -12,6 +12,6 @@
 		</dk-form>
 
 		<!-- 新建按钮 -->
-		<dk-save-button btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" bind:open="saveButton"></dk-save-button>
+		<dk-save-button btnAutoWidthFlag="{{true}}" btnRightFlag="{{true}}" buttonList="{{buttonSaveList}}" catchtap="handleWxService" ></dk-save-button>
 	</view>
 </view>

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

@@ -13,41 +13,66 @@ Page({
     routeObjName: 'freeze',
     //弹出pop
     popContent: [{
-      code: 'itemQty',
-      type: 'step',
-      title: mixins.$t('count'),
-      required: true
-    },
-    { code: 'packageBox', type: 'packageBox', title: mixins.$t("packageBox"), },
-    {
-      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',
-      tip: mixins.$t('tipPop'),
-    },
+        code: 'itemQty',
+        type: 'step',
+        title: mixins.$t('count'),
+        required: true
+      },
+      {
+        code: 'packageBox',
+        type: 'packageBox',
+        title: mixins.$t("packageBox"),
+      },
+      {
+        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',
+        tip: mixins.$t('tipPop'),
+      },
     ],
 
-    cardList: [
+    cardList: [{
+        name: 'main',
+        title: mixins.$t('freezeInfo'), //'冻结信息'
+      },
+      {
+        name: 'items',
+        title: mixins.$t("goodsDetail"),
+        chooseGoodsFlag: true,
+        itemAmt: '',
+        displayNum: 2
+      },
       {
-        name: 'main', title: mixins.$t('freezeInfo'),//'冻结信息'
+        name: 'other',
+        title: mixins.$t("otherInfo")
       },
-      { name: 'items', title: mixins.$t("goodsDetail"), chooseGoodsFlag: true, itemAmt: '', displayNum: 2 },
-      { name: 'other', title: mixins.$t("otherInfo") },
     ],
     contentObj: {
-      main: [
-        { code: 'cusId', name: 'cusName', title: mixins.$t("applicationObject"), type: 'choose', required: true, urlKey: 'selectCustomers' },
+      main: [{
+          code: 'cusId',
+          name: 'cusName',
+          title: mixins.$t("applicationObject"),
+          type: 'choose',
+          required: true,
+          urlKey: 'selectCustomers'
+        },
         {
-          code: 'staffId', name: 'staffName',
-          title: mixins.$t("applyStaff"),//'申请员工',
+          code: 'staffId',
+          name: 'staffName',
+          title: mixins.$t("applyStaff"), //'申请员工',
           type: 'choose',
           required: true,
           urlKey: 'chooseStaff'
@@ -55,21 +80,37 @@ Page({
         {
           code: 'orgId',
           name: 'orgName',
-          title: mixins.$t("applyOrg"),//'申请部门',
+          title: mixins.$t("applyOrg"), //'申请部门',
           type: 'choose',
           required: true,
           urlKey: 'chooseOrg'
         },
+        {
+          code: 'autoUnfreezeDate',
+          type: 'date',
+          title: mixins.$t("autoUnfreezeDate"),
+          // required: true
+        },
       ],
       items: [],
-      other: [
-        { code: 'remarks', type: 'textarea', title: mixins.$t("remarks"), readonly: false },
-        { code: 'file', type: 'uploader', title: mixins.$t("uploader") }
+      other: [{
+
+          code: 'remarks',
+          type: 'textarea',
+          title: mixins.$t("remarks"),
+          readonly: false
+        },
+        {
+          code: 'file',
+          type: 'uploader',
+          title: mixins.$t("uploader")
+        }
       ]
     },
-
+    minDate: new Date().getTime(),
     buttonSaveList: [{
-      code: 'save', title: mixins.$t("freeze")//'冻结' 
+      code: 'save',
+      title: mixins.$t("freeze") //'冻结' 
     }],
   },
   /**
@@ -93,10 +134,10 @@ Page({
 
   },
   /**
-     * @desc   : 设置只读
-     * @author : 于继渤
-     * @date   : 2024年3月12日
-     */
+   * @desc   : 设置只读
+   * @author : 于继渤
+   * @date   : 2024年3月12日
+   */
   setColumn() {
     let formData = JSON.parse(this.data.formData)
     let cardList = this.data.cardList
@@ -104,15 +145,35 @@ Page({
     let buttonSaveList = this.data.buttonSaveList
     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 },
+    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: '关闭' }]
+      buttonSaveList = [{
+        code: 'close',
+        title: '关闭'
+      }]
     } else {
-      buttonSaveList = [{ code: 'save', title: '解冻' }]
+      buttonSaveList = [{
+        code: 'save',
+        title: '解冻'
+      }]
     }
 
     this.setData({
@@ -123,10 +184,10 @@ Page({
   },
 
   /**
-     * @desc   : 绑定数据-选择页面返回的逻辑处理
-     * @author : 姜永辉
-     * @date   : 2024年3月12日
-     */
+   * @desc   : 绑定数据-选择页面返回的逻辑处理
+   * @author : 姜永辉
+   * @date   : 2024年3月12日
+   */
   chooseData(e) {
     let formData = JSON.parse(this.data.formData)
     let code = e.detail.code
@@ -156,10 +217,10 @@ Page({
     })
   },
   /**
-  * @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)
@@ -186,10 +247,10 @@ Page({
     return params
   },
   /**
-    * @desc : 保存数据服务
-    * @date : 2024/2/1 15:49
-    * @author : 于继渤
-    */
+   * @desc : 保存数据服务
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   saveData() {
     return this.excute(this.data.service, this.data.service.insert, this.data.params).then(res => {
       if (res.data.code == 200) {
@@ -207,10 +268,10 @@ Page({
   },
 
   /**
-    * @desc : 查询商品明细
-    * @date : 2024/2/1 15:49
-    * @author : 于继渤
-    */
+   * @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) {
@@ -233,43 +294,45 @@ Page({
             element.packageBox = element['box'] + element.subUnitName + element['piece'] + element.unitName
           }
         });
-         if(formData.freezeStatus == "冻结状态-全部冻结"){
-           this.setData({
-            noShowEdit:true
-           }) 
-         }
+        if (formData.freezeStatus == "冻结状态-全部冻结") {
+          this.setData({
+            noShowEdit: true
+          })
+        }
         this.setData({
           formData: JSON.stringify(formData)
         })
-
+        if (this.data.formMode == Constants.formMode.detail) { //详情
+          this.setColumn()
+        }
 
       }
     });
   },
   /**
-     * @desc :   编辑
-     * @date : 2024/2/1 15:49
-     * @author : 于继渤
-     */
+   * @desc :   编辑
+   * @date : 2024/2/1 15:49
+   * @author : 于继渤
+   */
   toEdit() {
     let this_ = this
     wx.navigateTo({
       url: this_.data.route.add.url,
       events: {
         // 保存成功后刷新页面
-        refresh: function (data) {
-        }
+        refresh: function (data) {}
       },
       success: function (res) {
         res.eventChannel.emit('params', {
-          formMode: Constants.formMode.detailEdit, id: this_.data.id
+          formMode: Constants.formMode.detailEdit,
+          id: this_.data.id
         });
       }
     })
   },
   /**
- * 生命周期函数--监听页面加载
- */
+   * 生命周期函数--监听页面加载
+   */
   loadInit() {
     let formData = JSON.parse(this.data.formData)
     if (this.data.formMode == Constants.formMode.detail) { //详情
@@ -281,7 +344,6 @@ Page({
         noShowEdit: true
       })
       this.getItemDetal(this.data.id)
-      this.setColumn()
     } else if (this.data.formMode == Constants.formMode.detailEdit) {
       //编辑
       wx.setNavigationBarTitle({
@@ -296,8 +358,14 @@ Page({
       formData.orgId = app.globalData.user.orgId
       formData.staffName = app.globalData.user.staffName
       formData.orgName = app.globalData.user.orgName
+      // 设置送货日期 当前日期 加一天
+      // var currentDate = new Date();
+      // currentDate.setDate(currentDate.getDate() + 7);
+      // formData.autoUnfreezeDate = util.formatDayTime(currentDate)
+      // let dataTime = this.convertDateToMillisecondsTimestamp(formData.deliveryDate)
       this.setData({
         formData: JSON.stringify(formData),
+        // dataTime:dataTime
       })
     }
   }

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

@@ -1,7 +1,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading>
 <dk-form-bill type="out" popType ="sale" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"  titleCol="skuModel"  subCol="calculationFormula"  descCol="skuName"  quantityCol="itemQty"  contentObj="{{contentObj}}" titleTagCol="brandName" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" bind:setGoods="setGoods"   table="{{table}}"
-bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"detailTipFlag="{{true}}"bindtap="handleTap"
+bind:editItems="editItems" sumAmountColFlag="{{false}}"  iconCol="imagesUrl" bind:openChoosedItemInfo="openChoosedItemInfo" deleteName="deleteItemList"detailTipFlag="{{true}}"bindtap="handleTap"dataTime="{{dataTime}}" minDate="{{minDate}}"
 >
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

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

@@ -57,7 +57,7 @@ Page({
       },
       {
         code: 'autoUnfreezeDateS',
-        title: mixins.$t('thawingDate'),//'解冻日期',
+        title: mixins.$t('unfreezeDate'),//'解冻日期',
         dataType: 'date'
       }, 
       {
@@ -80,14 +80,14 @@ Page({
     contentObj: {
       [mixins.$t('freezeAll')]: [
         { name: 'freezeNo', title: mixins.$t('freezeNo') },
-        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('applyThawing') },
-        { name: 'freezeDate', title: mixins.$t('thawingDate') },
+        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('staffInfo') },
+        { name: 'unfreezeDate', title: mixins.$t('unfreezeDate') },
         { name: 'remarks', title: mixins.$t('remarks') }
       ], 
       [mixins.$t('ufreezeAll')]: [
         { name: 'freezeNo', title: mixins.$t('freezeNo') },
-        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('applyThawing') },
-        { name: 'freezeDate', title: mixins.$t('thawingDate') },
+        { name: [{ name: 'orgName', title: '' }, { name: 'staffName', title: mixins.$t("staffId") }], title: mixins.$t('staffInfo') },
+        { name: 'freezeDate', title: mixins.$t('freezeDate') },
         { name: 'remarks', title: mixins.$t('remarks') }
       ],
     },