Просмотр исходного кода

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

王英杰 1 год назад
Родитель
Сommit
039e57b8ec

+ 1 - 0
api/pages/report/report.js

@@ -40,6 +40,7 @@ module.exports = {
     report: {
       edit: { key: 'edit', url: '/package-purchase/pages/pur-track-report/detail/detail' },
       editIvtSum: { key: 'editIvtSum', url: '/package-inventory/pages/ivt-sum-report/detail/detail' },
+      editIvt: { key: 'editIvt', url: '/package-inventory/pages/ivt-detail-report/detail/detail' },
     }
   }
 };

+ 1 - 0
app.json

@@ -95,6 +95,7 @@
             "name": "package-inventory",
             "pages": [
                 "pages/ivt-detail-report/ivt-detail-report",
+                "pages/ivt-detail-report/detail/detail",
                 "pages/ivt-sum-report/ivt-sum-report",
                 "pages/ivt-sum-report/detail/detail",
                 "pages/choose-product/choose-product",

+ 3 - 15
components/dkbase/dk-form-bill/dk-form-bill.wxss

@@ -32,14 +32,7 @@
   background: radial-gradient(66.18% 65.3% at 6.12% 18.49%, #FFF9EC 0%, #FFFFFF 100%);
   padding: 20rpx;
 }
-
-.dk-obj-label-class {
-  /* color: #1B365D;
-  font-size: 14px;
-  font-weight: 600;
-  text-align: left;
-  margin-left: 40rpx; */
-}
+ 
 
 .dk-obj-amount-class {
   /* color: #1B365D;
@@ -119,14 +112,9 @@
 }
 
 .corner-view {
-  position: absolute;
- 
-
-}
-
-.corner-view-text {
-  
+  position: absolute; 
 }
+ 
 
 .sign-class {
   padding-left: 10rpx;

+ 190 - 179
i18n/zh-CN.js

@@ -19,18 +19,20 @@ const button = {
   all: '全部',
   resignation: '在职',
   leaveOffice: '离职',
+  flgCanWxLogin: '手机登录',
+  flgCanPcLogin: '电脑登录',
   flgCanLogin: '登录标识',
   parent: '父级',
   default: '默认',
   longPressDrag: '长按拖动',
   informationBasicDataSort: '将按照以下顺序展示基础资料',
   allValidInvalid: '有效值',
-  flgValid:'包含作废单据',
+  flgValid: '包含作废单据',
   valid: '有效',
   invalid: '无效',
   collapse: '收起',
   expand: '展开',
-  returnCancel:'撤销',
+  returnCancel: '撤销',
   invaidOrder: '作废',
   ticketPirnt: '票据打印',
   totalAmount: '合计金额',
@@ -38,7 +40,7 @@ const button = {
   otherInfo: '其他信息',
   responsiblePerson: '责任人',
   invalidSuccessfully: '作废成功',
-  tipPop:'用户区分商品色号、非标号使用',
+  tipPop: '用户区分商品色号、非标号使用',
 }
 
 // 资金
@@ -54,43 +56,43 @@ const mac = {
   paymentReturnOrderEdit: '编辑退付款单',
   receiptReturnOrderEdit: '编辑退收款单',
 
-  receiptDetail:'收款详情',
-  refundDetail:'退款详情',
-  
+  receiptDetail: '收款详情',
+  refundDetail: '退款详情',
+
   accDate: '账务日期',
   receiptDate: '收款日期',
   paymentDate: '付款日期',
   receiptInfo: '收款信息',
   paymentInfo: '付款信息',
-  rpNo:'单号',
+  rpNo: '单号',
   paymentOrderNo: '付款单号',
   receiptOrderNo: '收款单号',
-  sumAmtReceivableHandle:'核销应收',
-  sumAmtPayableHandle:'核销应付',
-  thisRefund:'本次退款',
-  refund:'退款',
-  receivableSelect:'选应收',
-  paymentSelect:'选应付',
-  receivableAmount:'应收金额',
-  payAmount:'应付金额',
-  advancePaymentAmount:'预收金额',
-  advancePrepaidAmount:'预付金额',
-   
-  refundAmount:'退款总额',
-  collectAmount:'收款总额',
-  toAdvancePaymentAmount:'转预收总额', 
-  toAdvancePrepaidAmount:'转预付总额',
-  tobeverifiedAmount:'待核销金额',
-  curentVerifiedAmount:'本次核销',
-  sumWaiveAmt:'优惠金额',
-  paymentDeduction:'预收抵扣',
-  prepaidDeduction:'预付抵扣',
-  thisReturnPayment : "本次退款",
-  returnAdvancePaymentAmount:'退预收金额', 
-  returnAdvancePrepaidAmount:'退预付金额', 
-  returnAmount:'退款',
-  biznisNo:'业务单号',
-  settlement:'结算方式',
+  sumAmtReceivableHandle: '核销应收',
+  sumAmtPayableHandle: '核销应付',
+  thisRefund: '本次退款',
+  refund: '退款',
+  receivableSelect: '选应收',
+  paymentSelect: '选应付',
+  receivableAmount: '应收金额',
+  payAmount: '应付金额',
+  advancePaymentAmount: '预收金额',
+  advancePrepaidAmount: '预付金额',
+
+  refundAmount: '退款总额',
+  collectAmount: '收款总额',
+  toAdvancePaymentAmount: '转预收总额',
+  toAdvancePrepaidAmount: '转预付总额',
+  tobeverifiedAmount: '待核销金额',
+  curentVerifiedAmount: '本次核销',
+  sumWaiveAmt: '优惠金额',
+  paymentDeduction: '预收抵扣',
+  prepaidDeduction: '预付抵扣',
+  thisReturnPayment: "本次退款",
+  returnAdvancePaymentAmount: '退预收金额',
+  returnAdvancePrepaidAmount: '退预付金额',
+  returnAmount: '退款',
+  biznisNo: '业务单号',
+  settlement: '结算方式',
 }
 
 const ivt = {
@@ -98,10 +100,10 @@ const ivt = {
   outBoundOrder: '出库单据',
   warehousingProcessing: '待入库',
   outboundProcessing: '待出库',
-  addOtherInWh:'新建其他入库',
-  editOtherInWh:'编辑其他入库',
-  addOtherOutWh:'新建其他出库',
-  editOtherOutWh:'编辑其他出库',
+  addOtherInWh: '新建其他入库',
+  editOtherInWh: '编辑其他入库',
+  addOtherOutWh: '新建其他出库',
+  editOtherOutWh: '编辑其他出库',
   checkined: '已入库',
   checkouted: '已出库',
   intoDate: '入库日期',
@@ -119,7 +121,7 @@ const ivt = {
   otherOutWh: '其他出库',
   purInBound: '采购入库',
   saleOutBound: '销售出库',
-  saleReturnInBound: '销退回库', 
+  saleReturnInBound: '销退回库',
   purchaseReturnOutBound: '采退出库',
   purReturnOutBound: '采购退货',
   inBoundInfo: '入库信息',
@@ -142,46 +144,48 @@ const ivt = {
   inBoundingIntoStatus: '入库状态-入库中',
   inBoundingIntoStatusName: '入库中',
   unInBoundIntoStatus: '入库状态-待入库',
-  maxCount:'数量超过最大值',
-  chooseWh:'请选择仓库',
-  inputNonStdCode:'请输入色号',
-  inputInvQty:'请输入期初数量',
-  inputCostAmt:'请输入期初成本价',
-  returnInfo:'退货信息',
-  outOrderNo:'出库单号',
-  inOrderNo:'入库单号',
-  chooseGoodsInfo:'请选择商品明细',
-  serviceInfo:'服务信息',
-  serviceType:'服务类型',
-  deliverMan:'配送员',
-  installMan:'安装员',
-  checkNo:'盘点单号',
-  employees:'责任员工',
-  checkDate:'盘点日期',
-  storageNum:'库存量',
-  sellableQuantity:'可售量',
-  countedQuantity:'盘点数量',
-  profitAndLossQuantity:'盈亏数量',
-  inventoryLossReasons:'盘亏原因',
-  inventoryInformation:'盘点信息',
-  inventoryEmployees:'盘点员工',
-  inventoryOrg:'盘点部门',
-  inventoryWh:'盘点仓库',
-  chooseLnventoryLossReasons:'请输入盘亏原因',
-  inboundTotalAmount:'入库总额',
-  inboundPrice:'入库价格',
-  editGoodsSuk:'编辑商品档案',
-  addGoodsSuk:'新建商品档案',
-  adjustmentOrderNumber:'调整单号',
-  owhid:'源仓库',
-  whid:'目标仓库',
-  oNonStdCode:'源批号',
-  nonStdCode:'目标批号',
-  adjustDate:'调整日期',
-  warehouseAdjustment:'仓库调整',
-  responsibilityInformation:'责任信息',
-  batchAdjustment:'批次调整',
-  adjustmentType:'调整类型',
+  maxCount: '数量超过最大值',
+  chooseWh: '请选择仓库',
+  inputNonStdCode: '请输入色号',
+  inputInvQty: '请输入期初数量',
+  inputCostAmt: '请输入期初成本价',
+  returnInfo: '退货信息',
+  outOrderNo: '出库单号',
+  inOrderNo: '入库单号',
+  chooseGoodsInfo: '请选择商品明细',
+  serviceInfo: '服务信息',
+  serviceType: '服务类型',
+  deliverMan: '配送员',
+  installMan: '安装员',
+  checkNo: '盘点单号',
+  employees: '责任员工',
+  checkDate: '盘点日期',
+  storageNum: '库存量',
+  sellableQuantity: '可售量',
+  freezeQty:'冻结量',
+  countedQuantity: '盘点数量',
+  profitAndLossQuantity: '盈亏数量',
+  inventoryLossReasons: '盘亏原因',
+  inventoryInformation: '盘点信息',
+  inventoryEmployees: '盘点员工',
+  inventoryOrg: '盘点部门',
+  inventoryWh: '盘点仓库',
+  chooseLnventoryLossReasons: '请输入盘亏原因',
+  inboundTotalAmount: '入库总额',
+  inboundPrice: '入库价格',
+  editGoodsSuk: '编辑商品档案',
+  addGoodsSuk: '新建商品档案',
+  adjustmentOrderNumber: '调整单号',
+  owhid: '源仓库',
+  whid: '目标仓库',
+  oNonStdCode: '源批号',
+  nonStdCode: '目标批号',
+  adjustDate: '调整日期',
+  warehouseAdjustment: '仓库调整',
+  responsibilityInformation: '责任信息',
+  batchAdjustment: '批次调整',
+  adjustmentType: '调整类型',
+
 
 }
 
@@ -224,8 +228,13 @@ const home = {
 
 //  基础数据
 const basicData = {
-  name:'名称',
-  code:'编码',
+  reservoirArea: '库区',
+  brandAllName: '全部品牌',
+  brand: '品牌',
+  category: '种类',
+  series: '系列',
+  name: '名称',
+  code: '编码',
   staffCode: '员工工号',
   staffPhone: '员工电话',
   staffName: '员工姓名',
@@ -264,8 +273,8 @@ const basicData = {
   catName: '种类名称',
   catName: '种类名称',
   goodsBatch: '色号',
-  attributeName:'属性名称',
-  attributeCode:'属性编码',
+  attributeName: '属性名称',
+  attributeCode: '属性编码',
   //基础资料
 
   warehouse: '仓库档案',
@@ -352,9 +361,9 @@ const columns = {
   dateAsc: '日期升序'
 }
 //销售订单
-const saleOrder = { 
-  order:'订单开单',
-  order_out:'销售出库',
+const saleOrder = {
+  order: '订单开单',
+  order_out: '销售出库',
   delivery_Time: '送货日期',
   deliveryDate: '送货日期',
   viewVoidedDocuments: '查看作废单据',
@@ -376,9 +385,9 @@ const saleOrder = {
   handleWithdrawal: '办理撤回',
   handleWarehousing: '入库撤回',
   saleOutBoundInfo: '取消自动出库办理,需要在“出库办理”功能进行手工出货办理。',
-  goodsBox:'箱',
-  goodsPiece:'片',
-  usePlace:'使用位置'
+  goodsBox: '箱',
+  goodsPiece: '片',
+  usePlace: '使用位置'
 }
 //资金管理
 const accountsManage = {
@@ -395,8 +404,8 @@ const accountsManage = {
   ufreezeAll: '冻结状态-全部冻结',
   freezeNo: '冻结单号',
   applyThawing: '申请解冻',
-  applyStaff: '申请员工', 
-  applyOrg: '申请部门', 
+  applyStaff: '申请员工',
+  applyOrg: '申请部门',
   thawing: '解冻',
   freeze: '冻结',
   freezeInfo: '冻结信息',
@@ -461,7 +470,7 @@ const customer = {
   spaceName: '空间名称',
   uploadDrawings: '上传图纸',
   addDrawings: '添加空间图纸',
-  defaultInfo:'已存在默认,是否替换默认',
+  defaultInfo: '已存在默认,是否替换默认',
 }
 // 提示信息
 const messages = {
@@ -482,11 +491,11 @@ const others = {
   bill: '单',
   piece: '件',
   count: '数量',
-  operateGuide:'操作手册',
-  companyInfo:'未加入企业或企业已到期',
-  companyAlertInfo:'企业即将到期,到期日期为',
-  cpEndDate:'到期日期',
-  dueText:'即将到期',
+  operateGuide: '操作手册',
+  companyInfo: '未加入企业或企业已到期',
+  companyAlertInfo: '企业即将到期,到期日期为',
+  cpEndDate: '到期日期',
+  dueText: '即将到期',
 }
 // 组织机构
 const org = {
@@ -497,7 +506,7 @@ const org = {
   editDepartment: '编辑部门',
   newSubOrg: '新建子部门',
   newStaff: '新建员工',
-  org:'部门详情',
+  org: '部门详情',
 }
 // 供应商
 const supplier = {
@@ -510,7 +519,7 @@ const supplier = {
   contactPhone: '联系电话',
   contactName: '联系人',
   procureStaff: '采购人员',
-  pricePur:'采购价格',
+  pricePur: '采购价格',
   ServiceCategories: '服务类别',
   supplierAdd: "新建供应商",
   supplierEdit: "编辑供应商",
@@ -524,7 +533,7 @@ const supplier = {
   returnDate: '退货日期',
   serviceCategories: '服务类别',
   pleaseChoose: '请至少选择一件商品',
-  package:'包装',
+  package: '包装',
 }
 // 商品档案
 const goodsSku = {
@@ -551,23 +560,24 @@ const goodsSku = {
   flagV: '有效值',
   SellableQuantityAsc: '可售量升序',
   SellableQuantityDesc: '可售量降序',
-  purchasePricetip:'采购订单、采购入库价格参考使用',
-  retailPricetip:'销售订单、销售出库零售渠道价格参考使用',
-  wholesalePricetip:'销售订单、销售出库分销渠道价格参考使用',
-  SaleSPriceLimittip:'销售订单、销售出库“自建渠道”价格参考使用',
-  otherPriceLimittip:'销售订单、销售出库商品最低价格',
-  flgNegativetip:'允许账户余额为负数',
-  noflgNegativetip:'不允许账户余额为负数',
-  calculationFormula:'计算公式',
-  packageBox:'包装数量',
-  packageUnit:'包装单位',
-  flgOpeningInv:'期初库存标识',
-  openingInv:'期初库存',
-  flgPrice:'价格体系',
+  purchasePricetip: '采购订单、采购入库价格参考使用',
+  retailPricetip: '销售订单、销售出库零售渠道价格参考使用',
+  wholesalePricetip: '销售订单、销售出库分销渠道价格参考使用',
+  SaleSPriceLimittip: '销售订单、销售出库“自建渠道”价格参考使用',
+  otherPriceLimittip: '销售订单、销售出库商品最低价格',
+  flgNegativetip: '允许账户余额为负数',
+  noflgNegativetip: '不允许账户余额为负数',
+  calculationFormula: '计算公式',
+  packageBox: '包装数量',
+  packageUnit: '包装单位',
+  flgOpeningInv: '期初库存标识',
+  openingInv: '期初库存',
+  flgPrice: '价格体系',
+  packageIvtBox: '可售包装',
 }
 const fund = {
   openingBalance: "期初余额",
-  realTimeBalance: "实时余额", 
+  realTimeBalance: "实时余额",
   commodityPicture: "商品图片",
   defaultAccount: "默认账户",
   balanceDate: "余额日期",
@@ -575,78 +585,79 @@ const fund = {
   editFundAccount: "编辑资金账户",
   negativeBalance: "余额负数",
   trfOutMacName: "转出账户",
-  trfInMacName: "转入账户", 
+  trfInMacName: "转入账户",
   notsingletrfOutMacName: "转出账户和转入账户不能选择一个",
 }
 const pur = {
-  purInfo : "采购信息",     
-  inStorage : "入库中",
-  received : "已入库",
-  saleOrderNo : "订单编号",
-  purInfo : "采购信息",
-  eiWhName : "预计入库仓库",
-  erDate : "预计入库日期",
-  enterWhName : "入库仓库",
-  enterWhDate : "入库日期",
-  sourceOrder : "关联源单",
-  amountCollected : "收款金额",
-  amount : "金额",
-  antoHandle : "自动入库办理",
-  antoOutHandle : "自动出库办理",
-  procureOrg : "采购部门", 
-  expectedDelivery : "预计送货", 
-  allChoose : "全选",
-  transferToWarehouse : "转入库",
-  printTickets : "打印票据",
-  purchaseReturnReversal : "采购退货冲正",
-  reverseAndReopen : "冲正重开",
-  purchaseCancellation : "采购作废",
-  staging : "暂存",
-  deal : "成交",
-  sumTotalAmount : "共计金额",
-  receivingDate : "收货日期",
-  orderQty : "订单数量",
-  inventoryQty : "入库数量",
-  returnQty : "退货数量",
-  returnAndOutbound : "退货出库",
-  editPurOrder : "编辑采购订单",
-  addPurOrder : "新建采购订单",
-  editPurInbound : "编辑采购入库",
-  addPurInbound : "新建采购入库",
-  noGoodsList:'无可退货商品,请入库后再进行退货操作',
-  createTime:'创建日期',
+  purInfo: "采购信息",
+  inStorage: "入库中",
+  received: "已入库",
+  saleOrderNo: "订单编号",
+  purInfo: "采购信息",
+  eiWhName: "预计入库仓库",
+  erDate: "预计入库日期",
+  enterWhName: "入库仓库",
+  enterWhDate: "入库日期",
+  sourceOrder: "关联源单",
+  amountCollected: "收款金额",
+  amount: "金额",
+  antoHandle: "自动入库办理",
+  antoOutHandle: "自动出库办理",
+  procureOrg: "采购部门",
+  expectedDelivery: "预计送货",
+  allChoose: "全选",
+  transferToWarehouse: "转入库",
+  printTickets: "打印票据",
+  purchaseReturnReversal: "采购退货冲正",
+  reverseAndReopen: "冲正重开",
+  purchaseCancellation: "采购作废",
+  staging: "暂存",
+  deal: "成交",
+  sumTotalAmount: "共计金额",
+  receivingDate: "收货日期",
+  orderQty: "订单数量",
+  inventoryQty: "入库数量",
+  returnQty: "退货数量",
+  returnAndOutbound: "退货出库",
+  editPurOrder: "编辑采购订单",
+  addPurOrder: "新建采购订单",
+  editPurInbound: "编辑采购入库",
+  addPurInbound: "新建采购入库",
+  noGoodsList: '无可退货商品,请入库后再进行退货操作',
+  createTime: '创建日期',
 }
 const otherAccounts = {
-  amountReceivable : "应收金额", 
-  receivable : "应收", 
-  selectCategory : "选类别", 
-  payee : "收款人", 
-  thisPayment : "本次收款", 
-  incomeAmount : "收入金额", 
-  totalAccountsReceivable : "合计应收", 
-  verificationAmount : "核销金额", 
-  otherPaymentReceiptsAdd : "新建其他收入单", 
-  otherPaymentReceiptsEdit : "编辑其他收入单", 
-  payer : "付款人", 
-  thisPaymentgo : "本次付款", 
-  paymentAmount : "付款金额", 
-  totalPayable : "合计应付", 
-  otherExpenditureOrdersAdd : "新建其他支出单", 
-  otherExpenditureOrdersEdit : "编辑其他支出单", 
-  fundstransferAdd : "新建资金转账", 
-  fundstransferEdit : "编辑资金转账", 
+  amountReceivable: "应收金额",
+  receivable: "应收",
+  selectCategory: "选类别",
+  payee: "收款人",
+  thisPayment: "本次收款",
+  incomeAmount: "收入金额",
+  totalAccountsReceivable: "合计应收",
+  verificationAmount: "核销金额",
+  otherPaymentReceiptsAdd: "新建其他收入单",
+  otherPaymentReceiptsEdit: "编辑其他收入单",
+  payer: "付款人",
+  thisPaymentgo: "本次付款",
+  paymentAmount: "付款金额",
+  totalPayable: "合计应付",
+  otherExpenditureOrdersAdd: "新建其他支出单",
+  otherExpenditureOrdersEdit: "编辑其他支出单",
+  fundstransferAdd: "新建资金转账",
+  fundstransferEdit: "编辑资金转账",
 }
 const guideTips = {
-  chooseCustomer:'选择客户',
-  chooseSup:'选择供应商',
-  chooseItems:'1、选商品:商品编码开单;\r\n2、选库存:选择库存商品开单;\r\n3、选外协:选择外协商品开单',
-  saveAndReceiptButton:'1、收款:可以对单据进行收款;\r\n2、保存:单据保存',
-  saveButton:'单据保存',
-  sumAmtRecText:'输入本次收款金额',
-  sumAmtPayText:'输入本次付款金额',
-  verificationButton:'本次核销的金额',
-  receiptButton:'收款:选择账户进行收款保存',
-  payButton:'付款:选择账户进行付款保存',
+  chooseCustomer: '选择客户',
+  chooseSup: '选择供应商',
+  chooseItems: '1、选商品:商品编码开单;\r\n2、选库存:选择库存商品开单;\r\n3、选外协:选择外协商品开单',
+  saveAndReceiptButton: '1、收款:可以对单据进行收款;\r\n2、保存:单据保存',
+  saveButton: '单据保存',
+  sumAmtRecText: '输入本次收款金额',
+  sumAmtPayText: '输入本次付款金额',
+  verificationButton: '本次核销的金额',
+  receiptButton: '收款:选择账户进行收款保存',
+  payButton: '付款:选择账户进行付款保存',
 }
 module.exports = {
-  items: Object.assign({},pur, fund, home, ivt,mac, basicData, columns, saleOrder, button, messages, others, accountsManage, org, supplier, goodsSku, customer,otherAccounts,guideTips)}
+  items: Object.assign({}, pur, fund, home, ivt, mac, basicData, columns, saleOrder, button, messages, others, accountsManage, org, supplier, goodsSku, customer, otherAccounts, guideTips)
+}

+ 2 - 2
package-base-select/pages/select-goods/select-goods.wxml

@@ -227,10 +227,10 @@
               <view style="display: flex;margin-top:20rpx;" wx:if="{{billType == 'pur'||billType == 'purInto'}}">
                 <!-- 标准价/标价-->
                 <view style="width: 85%;">
-                  <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="13" contentColor="#CAA977" fontWeight="bold" title=" " content="{{item.pricePurchase?item.pricePurchase:0}}"></dk-cell>
+                  <dk-cell height="46rpx" spaceWidth="1rpx" left="0" fontSize="13" contentColor="#CAA977" fontWeight="bold" title=" " content="{{item.priceInto?item.priceInto:0}}"></dk-cell>
                 </view>
                 <view style="text-align: right;width: 5%;">
-                  <van-icon name="arrow" style="font-size:3.5vw;" />
+                  <!-- <van-icon name="arrow" style="font-size:3.5vw;" /> -->
                 </view>
               </view>
               <view style="display: flex;" wx:if="{{billType == 'sale'}}">

+ 34 - 19
package-basic-data/pages/staff/add/add.js

@@ -16,22 +16,28 @@ Page({
    * 页面的初始数据
    */
   data: {
-    cardList: ['main'],
+    cardList: ['main', 'oauth', 'remarks'],
     // 底部保存按钮
     buttonFootList: [{
       name: 'save',
       title: mixins.$t('save')
     }],
     contentObj: {
-      main: [
-        { code: 'staffCode', type: 'str', required: true, title: mixins.$t('staffCode') },
-        { code: 'staffName', type: 'str', required: true, title: mixins.$t('staffName') },
-        { 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: 'switch', title: mixins.$t('flgCanLogin') },
-        { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
-      ]
+      main:
+        [
+          { code: 'staffCode', type: 'str', required: true, title: mixins.$t('staffCode') },
+          { code: 'staffName', type: 'str', required: true, title: mixins.$t('staffName') },
+          { 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' },
+
+        ],
+      oauth:
+        [ ],
+      remarks:
+        [
+          { code: 'remarks', type: 'textarea', title: mixins.$t('remarks') }
+        ]
     },
     // 路由
     routeObjName: 'staff',
@@ -116,29 +122,38 @@ Page({
    * @author : 姜永辉
    */
   loadInit() {
+    let contentObj_ = this.data.contentObj
     if (this.data.formMode == Constants.formMode.edit) {
       wx.setNavigationBarTitle({
         title: mixins.$t('staffEdit'),
       })
-      let contentObj_ = this.data.contentObj
       contentObj_['main'].forEach(it => {
         if (it.code === 'staffCode') {
           it.readonly = true
         }
       })
-      this.setData({
-        contentObj: contentObj_
-      })
+      
     } else {
       wx.setNavigationBarTitle({
         title: mixins.$t('staffAdd'),
       })
-      if (this.data.gradeCode == Constants.gradeCode.PRO) {
-        this.setData({
-          formData: JSON.stringify({ flgCanLogin: true })
-        })
-      }
 
     }
+    // 专业版
+    if (this.data.gradeCode == Constants.gradeCode.PRO) {
+      contentObj_['oauth'] = 
+      [
+        { code: 'flgCanPcLogin', type: 'switch', title: mixins.$t('flgCanPcLogin') },
+        { code: 'flgCanWxLogin', type: 'switch', title: mixins.$t('flgCanWxLogin') },
+      ]
+    } else {
+      contentObj_['oauth'] = 
+      [ 
+        { code: 'flgCanLogin', type: 'switch', title: mixins.$t('flgCanLogin') },
+      ]
+    }
+    this.setData({
+      contentObj: contentObj_
+    })
   },
 })

+ 57 - 0
package-inventory/pages/ivt-detail-report/detail/detail.js

@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright(c) 2022 dongke All rights reserved. / Confidential
+ * 类的信息:
+ *		1.程序名称:库存查询-明细
+ * 编辑履历:
+ *		作者				日期					版本				修改内容
+ *		姜永辉		 2024-1-23			1.00		    选品
+ *******************************************************************************/
+const mixins = require('@/mixins/index.js')
+const Constants = require('@/utils/Constants.js');
+const app = getApp()
+Page({
+  mixins: [mixins],
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    // 路由
+    routeObjName: 'report',
+    cardList: ['main'],
+    contentObj: {
+      main: [
+        { code: 'whName', type: 'str', readonly: true, title: mixins.$t('reservoirArea') },
+        { code: 'brandName', type: 'str', readonly: true, title: mixins.$t('brand') },
+        { code: 'catName', title: '', type: 'str', readonly: true, title: mixins.$t('category') },
+        { code: 'seriesName', type: 'str', readonly: true, title: mixins.$t('series') },
+        { code: 'skuSpec', type: 'str', readonly: true, title: mixins.$t('goodSpec') },
+        { code: 'nonStdCode', type: 'str', readonly: true, title: mixins.$t('colorNumber') },
+
+      ]
+    },
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  loadInit() {
+    console.log(this.data.item, "loadInit");
+    let item = this.data.item
+    this.setData({
+      formData: JSON.stringify(item)
+
+    })
+    // 可售包装 
+    if (item.flgSubUnit) {
+      item['freezeBox'] = parseInt(item.freezeQty / item.packBox)
+      item['freezePiece'] = Number(item.freezeQty % item.packBox)
+      item.packageBoxFreeze = item['freezeBox'] + item.subUnitName + item['freezePiece'] + item.unitName
+
+      item['usableBox'] = parseInt(item.usableQty / item.packBox)
+      item['usablePiece'] = Number(item.usableQty % item.packBox)
+      item.packageBoxUsable = item['usableBox'] + item.subUnitName + item['usablePiece'] + item.unitName
+    }
+
+  },
+
+})

+ 4 - 0
package-inventory/pages/ivt-detail-report/detail/detail.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "库存查询明细"
+}

+ 54 - 0
package-inventory/pages/ivt-detail-report/detail/detail.wxml

@@ -0,0 +1,54 @@
+<wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
+
+<!-- 期初 入库 出库 期末 -->
+<view style="display: flex;padding:10rpx;  margin: 10px 22rpx 10px 22rpx;margin-top: 10px;border-radius: 15rpx;">
+  <view style="background-color:#F4F9FF;width:33%;padding:10rpx;border-radius: 16rpx;">
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{$t['storageNum']}}</view>
+    <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.invQty}}"></dk-cell>
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{item.packageBox?item.packageBox:''}}</view>
+  </view>
+  <view style="background-color:#F4F9FF;width: 33%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{$t['freezeQty']}}</view>
+    <dk-cell left="0rpx" center="center" fontSize="15" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.freezeQty}}"></dk-cell>
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{item.packageBox?item.packageBox:''}}</view>
+  </view>
+
+  <view style="background-color:#F4F9FF;width:33%;padding:10rpx;border-radius: 16rpx;margin-left: 20rpx;">
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{$t['sellableQuantity']}}</view>
+    <dk-cell left="0rpx" center="center" fontSize="13" contentFontSize="18" contentColor="#1B365D" spaceWidth="0" contentFontWeight="700" amount="{{false}}" content="{{item.usableQty}}"></dk-cell>
+    <view style="font-size:13px;text-align: center;margin-top: 10rpx;">{{item.packageBox?item.packageBox:''}}</view>
+  </view>
+
+</view>
+
+<view style="display: flex;">
+  <!-- 商品信息 -->
+  <view style="width: 100%;">
+    <van-card>
+      <view slot="thumb">
+        <van-image radius="5px" width="80" height="80" src="{{item.imagesUrl }}" />
+      </view>
+      <view slot="title" style="display: flex;">
+        <!-- 标题 -->
+        <view style="display: flex;">
+          <dk-title  title="{{item.skuModel}}"></dk-title>
+        </view>
+      </view>
+      <!-- 描述 -->
+      <view slot="desc">
+        <view style="display:flex;width: 100%;">
+          <dk-text fontWeight="nomal" value="{{item.skuName}}"></dk-text>
+        </view>
+      </view>
+      <view slot="price">
+        <view style="display: flex;width: 100%;flex-direction: row; ">
+          <view style="width: 100%;text-align: right;font-size:24rpx;color: #95A8CB;line-height: 34rpx;">x {{ item.invQty  }} </view>
+        </view>
+      </view>
+    </van-card>
+  </view>
+</view>
+
+<!-- 列表区 -->
+<dk-form id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" contentObj="{{contentObj}}" model:value="{{formData}}"   bind:chooseData="chooseData">
+</dk-form>

+ 84 - 0
package-inventory/pages/ivt-detail-report/detail/detail.wxss

@@ -0,0 +1,84 @@
+page {
+	background: #FFFFFF;
+  }
+  .detail-top {
+	position: relative;
+	border: 1px solid #F3FBFF;
+	margin: 10px 32rpx 10px 32rpx;
+	background-color: #FFFF;
+	background: radial-gradient(61.26% 65.52% at 6.12% 18.49%, #CDD8FF 0%, #F3FAFF 100%);
+	padding: 20rpx;
+	border-radius: 16rpx;
+  }
+  
+  .dk-card-outer-class-1 {
+	margin: 10px 32rpx 10px 32rpx;
+	margin-top: 10px;
+	border-radius: 15rpx;
+	/* box-shadow: 2px 2px 5px #e5e5e6; */
+  }
+  
+  .detail-top-sup {
+	color: #002340;
+	font-weight: bold;
+	font-size: 28rpx;
+	padding: 10rpx;
+  }
+  
+  .detail-top-color {
+	font-weight: bold;
+	color: #002340;
+	font-size: 14px;
+	padding: 10rpx;
+  }
+  .scan-image-icon {
+	width: 40rpx;
+	height: 40rpx;
+  }
+  
+  .scan-image-icon-3{
+	width: 96rpx;
+	height: 96rpx;
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	border-radius: 0px 0px 16rpx 0px;
+  }
+  .scan-image {
+	width: 200rpx;
+	height: 200rpx;
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	border-radius: 0px 0px 16rpx 0px;
+  }
+  .edit-image{
+	width: 50rpx;
+	height: 50rpx;
+	position: absolute;
+	right: 30rpx;
+	top: 20rpx;
+	border-radius: 0px 0px 16rpx 0px;
+  }
+  
+  .tags-class{
+	margin: 20rpx;
+	/* text-align: center; */
+	display: flex;
+	justify-content: center;
+  }
+  .dk-card-outer-class-1 {
+	margin: 10px 32rpx 10px 32rpx;
+	margin-top: 10px;
+	border-radius: 15rpx;
+	/* box-shadow: 2px 2px 5px #e5e5e6; */
+  }
+  .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;
+  }

+ 84 - 19
package-inventory/pages/ivt-detail-report/ivt-detail-report.js

@@ -8,6 +8,7 @@
  *******************************************************************************/
 const Constants = require('@/utils/Constants.js');
 const mixins = require('@/mixins/index.js')
+const config = require('@/config/config.js')
 const app = getApp()
 Page({
   mixins: [mixins],
@@ -27,7 +28,7 @@ Page({
       }
     ],
     orderByValue: null,
-    routeObjName : 'report',
+    routeObjName: 'report',
     // routeObjName: 'goodsSku',
     dataItem: null,
     choosedGoodsList: [],
@@ -35,7 +36,7 @@ Page({
     inventoryService: app.globalData['inventoryService'],
     typeList: [
       {
-        brandName: '全部品牌'
+        brandName: mixins.$t('brandAllName')
       }
     ],
     brandId: null,
@@ -62,13 +63,13 @@ Page({
   loadInit() {
     this.setData({
       billType: this.data.item,
-      title:'库存明细表',
-      objectCode:Constants.menuCode.ivtDetailReport,
-      method : 'getIvtDetailReport',
-      exportCols : {
+      title: '库存明细表',
+      objectCode: Constants.menuCode.ivtDetailReport,
+      method: 'getIvtDetailReport',
+      exportCols: {
         "skuCode": "商品编号",
         "skuName": "商品名称",
-        "skuModel": "商品型号",   
+        "skuModel": "商品型号",
         "nonStdCode": "色号",
         "brandName": "商品品牌",
         "categoryName": "种类名称",
@@ -76,8 +77,8 @@ Page({
         "skuSpec": "商品规格",
         "whName": "仓库名称",
         "ivtQty": "库存数量",
-        "outingQty": "出库中数量",    
-        "freezeQty": "冻结数量", 
+        "outingQty": "出库中数量",
+        "freezeQty": "冻结数量",
         "usableQty": "可用数量",
         "remarks": "备注",
       },
@@ -99,6 +100,28 @@ Page({
     this.searchData()
   },
 
+  /**
+   * @desc : 跳转明细
+   * @author : 周兴
+   * @date : 2024/1/22
+   */
+  toDetail(e) {
+    console.log("toDetail", e);
+    if (e) {
+      let item = e.currentTarget.dataset.item;
+      e.detail.item = item
+      if (item) {
+        let button = {
+          formMode: Constants.formMode.edit
+        }
+        e.detail.item.button = button
+      }
+      // 如果name不传递,默认为edit
+      e.detail.name = 'editIvt'
+    }
+    this.open(e);
+  },
+
 
   /**
    * @desc : 设置查询参数
@@ -131,7 +154,7 @@ Page({
       return this.excute(this.data.commonService, this.data.commonService.getGoodsForOrderByPage, params);
     } else if (this.data.item == Constants.billType.out || this.data.item == Constants.billType.purReturn) {
       return this.excute(this.data.inventoryService, this.data.inventoryService.selectByCond, params);
-    }   else {
+    } else {
       return this.excute(this.data.service, this.data.service.selectByCond, params);
     }
   },
@@ -142,6 +165,57 @@ Page({
      * @author : 姜永辉
      */
   handleSearchData(tableData) {
+    tableData.forEach(item => {
+      let list = []
+      // 商品名称
+      list.push({
+        title: mixins.$t('skuName'),
+        value: item.skuName ? item.skuName : '',
+        copyValue: item.skuName ? item.skuName : '',
+      })
+      // 库区
+      list.push({
+        title:  mixins.$t('reservoirArea'),
+        value: item.whName ? item.whName : '',
+        copyValue: item.whName ? item.whName : '',
+      })
+      // 规格
+      list.push({
+        title: mixins.$t('goodSpec'),
+        value: item.skuSpec ? item.skuSpec : '',
+        copyValue: item.skuSpec ? item.skuSpec : '',
+      })
+      // 色号
+      list.push({
+        title: mixins.$t('colorNumber'),
+        value: item.nonStdCode ? item.nonStdCode : '',
+        copyValue: item.nonStdCode ? item.nonStdCode : '',
+      })
+      // 可售量
+      list.push({
+        title: mixins.$t('storageNum'), 
+        value: item.usableQty ? item.usableQty : '0',
+        copyValue: item.usableQty ? item.usableQty : '0',
+      })
+      // 可售包装 
+      if (item.flgSubUnit) {
+        item['box'] = parseInt(item.invQty / item.packBox)
+        item['piece'] = Number(item.invQty % item.packBox)
+        item.packageBox = item['box'] + item.subUnitName + item['piece'] + item.unitName
+        list.push({
+          title: mixins.$t('packageIvtBox'),
+          value: item.packageBox,
+          copyValue: item.packageBox,
+        })
+      }
+      item.list = list
+      if (item.skuImages && item.skuImages.length > 0) {
+        item.skuImages.forEach(it => {
+          it.url = config.image_url + it.path
+        });
+        item.imagesUrl = item.skuImages[0].url
+      }
+    })
     this.setData({
       tableData: tableData
     })
@@ -159,15 +233,6 @@ Page({
       })
     })
   },
-  /**
-* @desc : 打开商品
-* @date : 2024/2/1 15:49
-* @author : 姜永辉
-*/
-  openAddItemInfo(e) {
-    console.log('openAddItemInfo', e)
-
-  },
 
   /**
     * @desc : 查询库存

+ 13 - 89
package-inventory/pages/ivt-detail-report/ivt-detail-report.wxml

@@ -31,9 +31,9 @@
 <view style="height:100%;background: #F8F9FD ;">
   <!--出库商品 列表 走库存-->
   <view style="height:calc({{windowHeight+'px'}} - 05rpx);overflow: scroll;">
-    <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100' >
-      <view wx:for="{{tableData}}" wx:key="index" catch:tap="openAddItemInfo" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
-        <view class="main-foot" style="border-radius:15rpx;">
+    <scroll-view scroll-y='{{true}}' bindscrolltolower='scrollToLower' lower-threshold='100'>
+      <view wx:for="{{tableData}}" wx:key="index" data-item="{{item}}" class="main-class" style="width: 75%;margin-left: 166rpx;">
+        <view class="main-foot" style="border-radius:15rpx;" data-item="{{item}}" catch:tap="toDetail">
           <view>
             <view class="table-content-row">
               <view style="display:flex;width:100%;">
@@ -43,99 +43,23 @@
               </view>
             </view>
 
-            <!-- 商品名称 -->
-            <view class="table-row">
+            <!-- 商品名称 及以下列 -->
+            <view class="table-row" wx:for="{{item.list}}" wx:for-item="item_" wx:for-index="index_" >
               <view class="table-content-row">
                 <view style="display: flex;">
                   <view class="table-content-row-font">
-                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" value="商品名称" copyValue="{{item.skuCode}}"></dk-text>
+                    <dk-text fontSize="14px" color="#95A8CB" fontWeight="nomal" copyValue="{{item.copyValue}}" value="{{item_.title}}"></dk-text>
                   </view>
                   <view class="table-content-class">
-                    {{item.skuName?item.skuName:''}}
+                    {{item_.value}}
                   </view>
                 </view>
               </view>
-            </view>
-
-            <!-- 库区 -->
-            <view class="table-content-row">
-              <view style="display: flex;">
-                <view class="table-content-row-font">
-                  <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="库区" copyValue="{{item.whName}}"></dk-text>
-                </view>
-                <view class="table-content-class">
-                  {{item.whName?item.whName:''}}
-                </view>
-              </view>
-            </view>
-
-            <!-- 库区色号 -->
-            <view class="table-content-row">
-              <view style="display: flex; justify-content:space-between;">
-
-
-                <view style="display: flex;">
-                  <view class="table-content-row-font">
-                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="色号" copyValue="{{item.nonStdCode}}"></dk-text>
-                  </view>
-                  <view class="table-content-class">
-                    {{item.nonStdCode?item.nonStdCode:''}}
-                  </view>
-                </view>
-
-                 
-              </view>
-            </view>
-            <!-- 分割线 -->
-            <dk-divider marginTop="20rpx"></dk-divider>
-            <!-- 下半部分 -->
-            <view class="table-content-row">
-              <view style="display: flex;justify-content:space-between">
-                <view style="display: flex;">
-                  <view class="table-content-row-font">
-                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="库存量"></dk-text>
-                  </view>
-                  <view style="font-size: 13px;color: #CAA977;">
-                    {{item.invQty}}
-                  </view>
-                </view>
-
-                <view style="display: flex;">
-                  <view class="table-content-row-font">
-                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="可售量"></dk-text>
-                  </view>
-                  <view style="font-size: 13px;color: #CAA977;">
-                    {{item.usableQty }}
-                  </view>
-                </view>
-              </view>
-              
-            </view>
-            <view class="table-content-row">
-              <view style="display: flex;justify-content:space-between">
-                <view style="display: flex;">
-                  <view class="table-content-row-font">
-                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="占库量"></dk-text>
-                  </view>
-                  <view style="font-size: 13px;color: #CAA977;">
-                    {{item.outingQty}}
-                  </view>
-                </view>
-
-                <view style="display: flex;">
-                  <view class="table-content-row-font">
-                    <dk-text layoutFlag="{{true}}" fontSize="14px" color="#95A8CB" fontWeight="nomal" value="冻结量"></dk-text>
-                  </view>
-                  <view style="font-size: 13px;color: #CAA977;">
-                    {{item.freezeQty }}
-                  </view>
-                </view>
-              </view>
-              
-            </view>
+            </view> 
+           
           </view>
         </view>
-      </view> 
+      </view>
     </scroll-view>
 
   </view>
@@ -146,11 +70,11 @@
     <van-sidebar-item wx:key="index" custom-class="{{sideKey - 1 == index? 'sidebar-item-before': (sideKey + 1 == index?'sidebar-item-next':'sidebar-item')}}" title="{{item.brandName}}" data-id="{{item.brandId}}" wx:for="{{typeList}}" />
   </view>
 </van-sidebar>
-  
-<!-- 仓库 --> 
+
+<!-- 仓库 -->
 <dk-muti-dropdown-item show="{{whFlag}}" content="{{form.whName}}" id='warehouse' typeName='warehouse' bind:commit='mutiSearchAll' bind:muticlose='mutiCloseAll'></dk-muti-dropdown-item>
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;" >
+<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
   <view bind:tap="export" class="btn-add-class">
     <van-icon name="share" color="#FFFFFF" size="60rpx" />
   </view>

+ 1 - 1
package-inventory/pages/other-outbound/other-outbound.wxml

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}" ></loading>
 
-<dk-form-bill type="out" id="{{formName}}"routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods"  table="{{table}}"
+<dk-form-bill type="out" id="{{formName}}"routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuCode" descCol="skuModel" priceCol="pricePur" quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}"  contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods"  table="{{table}}"
 bind:delItem="setGoods" bind:setGoods="setGoods"
 cardContentList="{{cardContentList}}"
 quantityRedTitle="可售量:"

+ 11 - 5
package-inventory/pages/other-warehousing/other-warehousing.js

@@ -72,7 +72,7 @@ Page({
             color: '#E4002B',
             itemAmt: 0,
             content: 2,
-            displayNum: 1
+            displayNum: 2
         }, {
             name: 'other',
             title: mixins.$t('otherInfo')
@@ -306,9 +306,9 @@ Page({
             }
         })
 
-        // 刷新商品明细 显示 查看更多
-        let card = this.data.cardList.filter(it => it.name == 'items');
-        this.selectComponent('#' + this.data.formName).handleContentObj(card[0])
+        // // 刷新商品明细 显示 查看更多
+        // let card = this.data.cardList.filter(it => it.name == 'items');
+        // this.selectComponent('#' + this.data.formName).handleContentObj(card[0])
 
         // 系统参数开启自动办理   --编辑的时候都不显示出来 240513 后台不依赖这个参数         
         this.setData({
@@ -418,7 +418,13 @@ Page({
             if (card.name === 'items') {
                 //合计金额
                 card.itemAmt = totalAmout
-                card.itemQty = totalQuantity
+                card.content = totalQuantity
+                 //  入库状态-已入库
+                 if (formData.intoStatus == Constants.intoStatus.inBounded) {
+                    card.intoQty = totalQuantity
+                } else {
+                    card.intoingQty = totalQuantity
+                }
             }
         })
         this.setData({

+ 1 - 1
package-inventory/pages/other-warehousing/other-warehousing.wxml

@@ -3,7 +3,7 @@
 
 <loading wx:if="{{loading}}"></loading>
 
-<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuModel" descCol="skuName"   priceCol="priceInto" pupPriceCol="pricePurchase" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}"
+<dk-form-bill type="pur" id="{{formName}}" routeObjName="{{routeObjName}}" cardList="{{cardList}}"   titleCol="skuModel" descCol="skuName"   priceCol="priceInto" pupPriceCol="pricePurchase" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumQuantityCol="{{sumQuantityCol}}" sumAmountCol="itemAmt" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}"
 bind:delItem="setGoods" bind:setGoods="setGoods">
 </dk-form-bill>
 <view style="height: 200rpx;"></view>

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

@@ -2,7 +2,7 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}"></loading> 
 
-<dk-form-bill id="{{formName}}" type="out" 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 id="{{formName}}" type="out" routeObjName="{{routeObjName}}" readonly="{{item.outStatus == $t['outBoundedOutStatus']}}" cardList="{{cardList}}"  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>

+ 1 - 1
package-inventory/pages/warehousing-processing/detail/detail.wxml

@@ -49,7 +49,7 @@
   </view>
 </view>
 
-<dk-form-bill id="{{formName}}" routeObjName="{{routeObjName}}" readonly="{{item.intoStatus == $t['inBoundedIntoStatus']}}" cardList="{{cardList}}" titleTagCol="shortName" titleCol="skuCode" descCol="skuModel" priceCol="priceInto" pupPriceCol="pricePurchase" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:delItem="setGoods" bind:setGoods="setGoods" priceTitle="{{$t['wholesalePrice']}}:">
+<dk-form-bill id="{{formName}}" routeObjName="{{routeObjName}}" readonly="{{item.intoStatus == $t['inBoundedIntoStatus']}}" cardList="{{cardList}}"   titleCol="skuCode" descCol="skuModel" priceCol="priceInto" pupPriceCol="pricePurchase" iconCol="imagesUrl"  quantityCol="{{quantityCol}}" sumAmountCol="itemAmt" sumQuantityCol="{{sumQuantityCol}}" contentObj="{{contentObj}}" model:value="{{formData}}" popContent="{{popContent}}" bind:chooseData="chooseData" popType="sale" bind:editItems="setGoods" table="{{table}}" bind:delItem="setGoods" bind:setGoods="setGoods" priceTitle="{{$t['wholesalePrice']}}:">
 </dk-form-bill>
 
 <view style="height: 200rpx;"></view>