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

api/pages/ivt/check.js

@@ -10,15 +10,14 @@
 module.exports = {
   checkService: {
       // 前缀
-      prefix: 'mdm-server/ivt/check/', 
-     
+      prefix: 'mdm-server/ivt/check/',   
 
   },
 
   routeUrl: {
     check: {
       editInventoryCheck: { key: 'editInventoryCheck', method: 'editInventoryCheck', primaryKey: 'checkId', image: 'btn-edit.png'}, //编辑
-      invaidOrder: { key: 'invaidOrder', method: 'invaidOrder',image: 'btn-void.png',question:true  },//作废
+ 
       ticketPirnt: { key: 'ticketPirnt', method: 'ticketPirnt', primaryKey: 'rpId', image:'btn-printing.png' },//打印
 
       docName:{key:'check' ,title:'盘点单'},

api/pages/ivt/inventoryAdjustment.js

@@ -10,11 +10,15 @@
 module.exports = {
   inventoryAdjustmentService: {
       // 前缀
-      prefix: 'mdm-server/ivt/transfer/',   
+      prefix: 'mdm-server/ivt/transfer/', 
+      invalid :'invalid/'  
   },
 
   routeUrl: {
     inventoryAdjustment: { 
+      editInventoryAdjustment: { key: 'editInventoryAdjustment', method: 'editInventoryAdjustment', primaryKey: 'transferId', image: 'btn-edit.png'}, //编辑
+      invaidOrder: { key: 'invaidOrder', method: 'invaidOrder',image: 'btn-void.png',question:true  },//作废
+      printedBill: { key: 'printedBill', method: 'printedBill', primaryKey: 'rpId', image:'btn-printing.png' },//打印
       edit: { key: 'edit', url: '/package-inventory/pages/inventory-adjustment/detail/detail'  },
       add: { key: 'add', url: '/package-inventory/pages/inventory-adjustment/add/add'  }, 
       chooseStaff: { key: 'chooseStaff', url: '/package-base-select/pages/select-data/select-data',type:'staff'  }, 

i18n/zh-CN.js

@@ -135,6 +135,9 @@ const ivt = {
   unInBoundIntoStatus: '入库状态-待入库',
   maxCount:'数量超过最大值',
   chooseWh:'请选择仓库',
+  inputNonStdCode:'请输入非标号',
+  inputInvQty:'请输入期初数量',
+  inputCostAmt:'请输入期初成本价',
   returnInfo:'退货信息',
   outOrderNo:'出库单号',
   inOrderNo:'入库单号',
@@ -158,6 +161,19 @@ const ivt = {
   chooseLnventoryLossReasons:'请输入盘亏原因',
   inboundTotalAmount:'入库总额',
   inboundPrice:'入库价格',
+  editGoodsSuk:'编辑商品档案',
+  addGoodsSuk:'新建商品档案',
+  adjustmentOrderNumber:'调整单号',
+  owhid:'源仓库',
+  whid:'目标仓库',
+  oNonStdCode:'源批号',
+  nonStdCode:'目标批号',
+  adjustDate:'调整日期',
+  warehouseAdjustment:'仓库调整',
+  responsibilityInformation:'责任信息',
+  batchAdjustment:'批次调整',
+  adjustmentType:'调整类型',
+
 }
 
 //  首页

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

@@ -23,12 +23,7 @@ Page({
     table: Constants.tables.goodsSku,
     cardList: ['main', 'goods', "warehouse", 'price', 'other'],
     contentObj: {
-      main: [{ //唯一编码
-          code: 'onlyCode',
-          type: 'textarea',
-          title: mixins.$t("onlyCode"),
-          readonly: true
-        }, { //商品型号
+      main: [ { //商品型号
           code: 'skuModel',
           type: 'textarea',
           title: mixins.$t("skuModel"),
@@ -194,19 +189,19 @@ Page({
     if(formData.whId||formData.nonStdCode||formData.intoQty||formData.intoAmt){
       //只要上面有一个有值 剩下三个也要必输
       if(!formData.whId){
-        util.showToast('请选择仓库');
+        util.showToast(mixins.$t("chooseWh"));
         return false
       }
       if(!formData.nonStdCode){
-        util.showToast('请输入非标号');
+        util.showToast(mixins.$t("inputNonStdCode"));
         return false
       }
       if(!formData.intoQty){
-        util.showToast('请输入期初数量');
+        util.showToast(mixins.$t("inputInvQty"));
         return false
       }
       if(!formData.intoAmt){
-        util.showToast('请输入期初成本价');
+        util.showToast(mixins.$t("inputCostAmt"));
         return false
       }
     }
@@ -219,6 +214,7 @@ Page({
     params = Object.assign({}, params, saveData);
     params.serviceCategories = (params.serviceCategories && params.serviceCategories.length > 0) ? params.serviceCategories.split(',') : []
     params.skuImages = params.annexPaths
+    params.orgId = app.globalData.user.orgId
     return params
   },
 
@@ -245,11 +241,11 @@ Page({
   loadInit() {
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
-        title: mixins.$t('编辑商品档案'),
+        title: mixins.$t('editGoodsSuk'),
       })
     } else {
       wx.setNavigationBarTitle({
-        title: mixins.$t('新建商品档案'),
+        title: mixins.$t('addGoodsSuk'),
       })
     }
   },
@@ -262,7 +258,19 @@ Page({
    // data.serviceCategories = (data.serviceCategories && data.serviceCategories.length > 0) ? data.serviceCategories.join(',') : undefined
    data.annexPaths = data.skuImages
    data.onlyCode = data.skuCode
+    // 我们要添加的新对象是  编码  新建的时候没有 编辑的时候添加
+    let newObject = { //唯一编码
+      code: 'onlyCode',
+      type: 'textarea',
+      title: mixins.$t("onlyCode"),
+      readonly: true
+    }
+    let contentObj = this.data.contentObj
+    // 创建一个新的数组，首先添加新对象，然后是原始数组的其他元素（从索引0开始）
+    let newMainArray = [newObject, ...contentObj.main.slice(0)];  
+    contentObj.main = newMainArray
     this.setData({
+      contentObj:contentObj,
       formData: JSON.stringify(data)
     }) 
 

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

@@ -51,8 +51,8 @@ Page({
     },],
     sidebarList: [], //左边系列名字
     contentList: [{ //内容
-      name: 'skuModel',
-      title: mixins.$t('skuModel')
+      name: 'skuName',
+      title: mixins.$t('skuName')
     },
     {
       name: 'brandName',

package-basic-data/pages/product-file/product-file.wxml

@@ -15,9 +15,7 @@
   </van-sidebar>
   <view style="margin-left: 140rpx;width: 100%;">
     <!-- 列表 -->
-    <dk-list list="{{tableData}}" titleImageFlag="{{false}}" swipeDisabled="{{false}}" bind:swipe="deactivateEnable"switchFlag="{{false}}" statusFlag="{{false}}" flgPoint="{{false}}"   title="skuName" content="{{contentList}}" bind:toDetail="toDetail" routeObjName="{{routeObjName}}"></dk-list>
-
-
+    <dk-list list="{{tableData}}" titleImageFlag="{{false}}" swipeDisabled="{{false}}" bind:swipe="deactivateEnable"switchFlag="{{false}}" statusFlag="{{false}}" flgPoint="{{false}}"   title="skuModel" content="{{contentList}}" bind:toDetail="toDetail" routeObjName="{{routeObjName}}"></dk-list> 
     <!-- 保留高度 -->
     <view style="height: 220rpx;"></view>
   </view>

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

@@ -18,7 +18,7 @@ Page({
     goodsListDownContent: [{
       code: 'whId',
       name: 'whName',
-      title: '备注',
+      title: mixins.$t('remarks'),//'备注'
       type: 'str',
     }],
     btnFormData: null,
@@ -38,14 +38,14 @@ Page({
     {
       code: 'oWhId',
       name: 'oWhName',
-      title: '源库区', //'盘亏原因',
+      title: mixins.$t('owhid'),//'源仓库' 
       type: 'choose',
       urlKey: 'selectInventorySku'
     },
     {
       code: 'whId',
       name: 'whName',
-      title: '目标库区', //'盘亏原因',
+      title: mixins.$t('whid'),//'目标仓库'
       type: 'choose',
       urlKey: 'chooseWh'
     },
@@ -58,13 +58,13 @@ Page({
     {
       code: 'oNonStdCode',
       name: 'oNonStdName',
-      title: '源批号', // '仓库',
+      title:  mixins.$t('oNonStdCode'),//'源批号'
       type: 'str',
     },
     {
       code: 'nonStdCode',
       name: 'nonStdName',
-      title: '目标批号', //'盘亏原因',
+      title: mixins.$t('nonStdCode'),//'目标批号'
       type: 'str',
       urlKey: 'openingReason'
     },
@@ -89,7 +89,7 @@ Page({
       main: [{
         code: 'transferType',
         name: 'transferTypeName',
-        title: "调整类型", //mixins.$t("inventoryEmployees"),  
+        title: mixins.$t("adjustmentType"),  //"调整类型",  
         type: 'choose',
         required: true,
         clearItemFlag:true,
@@ -97,14 +97,14 @@ Page({
       }, {
         code: 'staffId',
         name: 'staffName',
-        title: '责任人', //'盘点员工', 
+        title: mixins.$t("responsiblePerson"),  //'责任人', , 
         type: 'choose',
         required: true,
         urlKey: 'chooseStaff'
       }, {
         code: 'orgId',
         name: 'orgName',
-        title: '部门', //'盘点部门',  
+        title: mixins.$t("orgId"),  //'部门',  ',  
         type: 'choose',
         required: true,
         urlKey: 'chooseOrg'
@@ -113,14 +113,14 @@ Page({
         code: 'whId',
         name: 'whName',
         type: 'choose',
-        title: "目标仓库", //'盘点仓库' 
+        title: mixins.$t('whid'),//'目标仓库'
         urlKey: 'chooseWh'
       },
       {
         code: 'nonStdCode',
         name: 'nonStdName',
         type: 'str',
-        title: "目标批号", //'盘点仓库'  
+        title:  mixins.$t('nonStdCode'),//'目标批号'  
       }
       ],
       items: [],

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

@@ -19,12 +19,12 @@ Page({
      // 查询条件
      searchContent: [{
       code: 'makeTime',
-      title: '近30天',
+      title: mixins.$t('pastThirthtyDays'),//近30天',
       defaultValue: 5,
       searchType: Constants.searchType.date
     } , {
       code: 'choose',
-      title: '筛选',
+      title: mixins.$t('choose'),//'筛选',
       searchType: Constants.searchType.pick
     }],
 
@@ -39,87 +39,87 @@ Page({
     code: 'orgName', 
   }, {
     code: 'transferNo', 
-    title:'调整单号'
+    title:mixins.$t('adjustmentOrderNumber'),//'调整单号'
   },
   {
     code: 'oWhName', 
-    title:'源仓库'
+    title: mixins.$t('owhid'),//'源仓库'
   },
   {
     code: 'whName', 
-    title:'目标仓库'
+    title:  mixins.$t('whid'),//'目标仓库'
   },
   {
     code: 'oNonStdCode', 
-    title:'源批号'
+    title: mixins.$t('oNonStdCode'),//'源批号'
   },
   {
     code: 'nonStdCode', 
-    title:'目标批号'
+    title: mixins.$t('nonStdCode'),//'目标批号'
   },
   {
     code: 'transferDateW',
-    title:'调整日期',
+    title:  mixins.$t('adjustDate'),//'调整日期',
     dataType: 'date'
   },
   
   {
     code: 'remarks', 
-    title:'备注'
+    title:  mixins.$t('remarks'),//'备注'
   },
 ],
 
 
-    // 列表区（脚部金额）
-    footerAmount: {  },
-    // 列表区（脚部信息）
-    footerInfo: [ {
-      name: 'categoryQuantity',
-      title: '共计'
-    }, {
-      name: 'tsumQuantity',
-      title: '件'
-    }],
+    // // 列表区（脚部金额）
+    // footerAmount: {  },
+    // // 列表区（脚部信息）
+    // footerInfo: [ {
+    //   name: 'categoryQuantity',
+    //   title: '共计'
+    // }, {
+    //   name: 'tsumQuantity',
+    //   title: '件'
+    // }],
    
 
     contentObj: {
-      '仓库调整': [  {
+     [ mixins.$t('warehouseAdjustment')]: [  {//仓库调整
         name: 'oWhName',
-        title: '源仓库'
+        title: mixins.$t('owhid'),//'源仓库'
       }, {
         name: 'whName',
-        title: '目标仓库'
+        title:  mixins.$t('whid'),//'目标仓库'
       }, {
         name: [{
           name: 'transferOrg',
           title: ''
         }, {
           name: 'transferStaff',
-          title: '业务员'
+          title: mixins.$t('staffId'),//'业务员'
         }],
-        title: '责任信息'
+        title:  mixins.$t('responsibilityInformation'),//'责任信息'
       }, {
         name: 'transferDate',
-        title: '调整日期'
+        title:  mixins.$t('adjustDate'),//'调整日期',
       }],
-      '批次调整': [ {
+      [mixins.$t('batchAdjustment')]: [ {//'批次调整'
         name: 'ononStdCode',
-        title: '源批号'
+        title: mixins.$t('oNonStdCode'),//'源批号'
       },{
         name: 'nonStdCode',
-        title: '目标批号'
+        title: mixins.$t('nonStdCode'),//'目标批号'
       },  {
         name: [{
           name: 'transferOrg',
           title: ''
         }, {
           name: 'transferStaff',
-          title: '业务员'
+          title: mixins.$t('staffId'),//'业务员'
         }],
-        title: '责任信息'
+        title:  mixins.$t('responsibilityInformation'),//'责任信息'
       },{
         name: 'transferDate',
-        title: '调整日期'
+        title:  mixins.$t('adjustDate'),//'调整日期',
       }]
     },
     buttonList: [{
@@ -128,14 +128,14 @@ Page({
   }],
     // 弹出按钮
     pupbuttonList: [{
-      name: 'customerRefund',
-      title: '入库办理'
+      name: 'editInventoryAdjustment',
+      title: mixins.$t('edit'),//'编辑'
       }, {
-        name: 'customerRefundList',
-        title: '作废'
+        name: 'invaidOrder',
+        title: mixins.$t('invaidOrder'),//'作废'
       } , {
-        name: 'customerRefundList',
-        title: '打印票据'
+        name: 'printedBill',
+        title: mixins.$t('printedBill'),//'打印票据'
       } 
      
     ], 
@@ -145,7 +145,45 @@ Page({
        // 主键Id
        primaryKey: 'transferId',
   },
-  
+  /**
+   * @desc : （编辑）
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  editInventoryAdjustment(e) {
+    let item = e
+    let id = item.transferId
+    // 采购入库 
+    wx.navigateTo({
+      url: this.data.route.add.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {}
+      },
+      success: function (res) {
+        res.eventChannel.emit('params', {
+          id: id,
+          formMode: Constants.formMode.edit
+        })
+      }
+    })
+  },
+ /**
+    * @desc : 作废
+    * @date : 2024/2/1 15:49
+    * @author : 王英杰
+    */
+   invaidOrder(e) {
+    let item = e
+    let id = item.transferId
+    this.excute(this.data.service, this.data.service.invalid + id, null).then(res => {
+      if (res.data.code == Constants.SUCESS_CODE) {
+        // 重新查询
+        this.searchData()
+      }
+    })
+
+  },
   /**
    * @desc : 查询
    * @date : 2024/2/1 15:49

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

@@ -1,6 +1,7 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" loadingName="{{$t['loading']}}" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
+<van-dialog id="van-dialog" />
 <van-sticky scroll-top="0">
   <!-- 查询条件 -->
   <dk-dropdown-menu  model:value="{{searchForm}}"menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['orderNo'])}}">

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

@@ -39,7 +39,7 @@ Page({
       code: 'orgName', 
     }, {
       code: 'checkNo', 
-      title:'盘点单号'
+      title:mixins.$t('checkNo')//'盘点单号'
     }, ],
 
  
@@ -68,10 +68,7 @@ Page({
       {
         name: 'editInventoryCheck',
         title: mixins.$t('edit'),//编辑
-      }, {
-      name: 'invaidOrder',
-      title: mixins.$t('invaidOrder'),//作废
-    },{
+      } ,{
       name: 'ticketPirnt',
       title: mixins.$t('ticketPirnt') //打印票据
     }

package-purchase/pages/supplier-list/add/add.js

@@ -156,7 +156,7 @@ Page({
       title: mixins.$t("supplierCode"),
       readonly:true 
     }
-    // 创建一个新的数组，首先添加新对象，然后是原始数组的其他元素（从索引1开始）
+    // 创建一个新的数组，首先添加新对象，然后是原始数组的其他元素（从索引0开始）
     let newMainArray = [newObject, ...contentObj.main.slice(0)];  
     contentObj.main = newMainArray
     data.brandName = data.brandNames