diff --git a/app.wxss b/app.wxss index 06c6fc9..67dfa6a 100644 --- a/app.wxss +++ b/app.wxss @@ -8,3 +8,60 @@ padding: 200rpx 0; box-sizing: border-box; } + +.imageView { + height: 80px; + width: 100%; + margin-top: 20rpx; + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} + +.imageViewNoMargin{ + height: 80px; + width: 100%; + margin-top: -10rpx; + position: relative; + align-items: center; + justify-content: center; + box-sizing: content-box; +} + +.currentImage { + width: 100%; + height: 100%; +} + +.bottomGroupView{ + margin-top: -10rpx; + width: 100%; + height: 80px; + display: flex; + flex-direction: row; +} + +.btnTextView { + position: absolute; + width: 100%; + top:0; + line-height: 65px; + text-align: center; +} + +.btnText { + color: white; + font-size: 20px; +} + +.goodsNameImageToTopFar{ + height: calc(100% - 180px); + background:#EAF1F8; +} + +.blueAddText{ + color: #2689f8; + font-size: 20px; +} + diff --git a/pages/guarantee/detail/detail.js b/pages/guarantee/detail/detail.js index 9d5c010..7e17760 100644 --- a/pages/guarantee/detail/detail.js +++ b/pages/guarantee/detail/detail.js @@ -12,6 +12,15 @@ function load(that, ID) { if (DepartmentWorkFlow_Detail_Name == "初始") { istrue = true; } + // 部门工作流的判断 + var DepartmentWorkFlow_ID = res.result.DepartmentWorkFlow_ID; + var DepartmentWorkFlow_Detail_ID = res.result.DepartmentWorkFlow_Detail_ID; + if (DepartmentWorkFlow_ID && !DepartmentWorkFlow_Detail_ID) { + // if (!DepartmentWorkFlow_ID && !DepartmentWorkFlow_Detail_ID) { + that.setData({ + showForwardBtn: true + }) + } if (res.result.Customer_Name != null) { var accountcustomerNew = [{ @@ -181,6 +190,8 @@ Page({ array: [], showView: false, winHeight: app.globalData.winHeight, + // 是否显示部门工作流提交按钮 + showForwardBtn: false, }, /** @@ -301,6 +312,24 @@ Page({ guaranteeMoney: billMoney + this.data.requestMoney }) }, + + // 点击提交按钮 + forwardBtnClick: function () { + let params = [orderID]; + var businessGuaranteeForward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/BusinessGuaranteeRpc/Forward'; + network.transfer_request(businessGuaranteeForward, params, function (res) { + wx.showToast({ + title: '提交工作审批流成功', + success: function () { + wx.navigateBack({ + delta: 1, + }) + } + }) + }) + }, + + // 点击保存按钮 submitForm: function(e) { let accountCustomerId = this.data.accountcustomer[this.data.accountcustomerIndex].ID; let accountUnitId = this.data.accountUnit[this.data.accountUnitIndex].ID; diff --git a/pages/guarantee/detail/detail.wxml b/pages/guarantee/detail/detail.wxml index 771230b..8a0f88c 100644 --- a/pages/guarantee/detail/detail.wxml +++ b/pages/guarantee/detail/detail.wxml @@ -1,5 +1,5 @@ - + 结账客户 {{accountcustomer[accountcustomerIndex].Name}} @@ -50,7 +50,7 @@ {{item.Customer_Name}} 日期:{{item.Date}} - + + + + + 添加担保明细 + + + + + + + + + 提交 + + + + + + + 保存 + + + + + + + + + 保存 + + + diff --git a/pages/order/detail/detail.js b/pages/order/detail/detail.js index 663ed6e..1ac568d 100644 --- a/pages/order/detail/detail.js +++ b/pages/order/detail/detail.js @@ -3,8 +3,8 @@ var app = getApp() var network = require("../../../utils/net.js") var dateTimePicker = require('../../../utils/dateTimePicker.js'); var utilll = require('../../../utils/util.js'); -var timechage = require("../../../utils/dateTimeUtil.js") - +var timechage = require("../../../utils/dateTimeUtil.js"); +var orderID; var getAccountingUnit = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetAccountingUnit"; var getCustomer = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetCustomer"; var getDept = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetDepartment"; @@ -18,6 +18,7 @@ var getCustomerInfo = "/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Get var load = "/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Load"; let update = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Update'; +var saleOrderForward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Forward'; function setTime(that) { // 获取完整的年月日 时分秒,以及默认显示的数组 @@ -101,6 +102,8 @@ Page({ dateTimeArray1: null, dateTime1: null, backPage:'', + // 是否显示部门工作流提交按钮 + showForwardBtn: false, }, onLoad: function(options) { @@ -111,18 +114,22 @@ Page({ if (app.globalData.shareInParameter.id) { var detailItemID = parseInt(app.globalData.shareInParameter.id); - // wx.showModal({ - // title: '看下ID值', - // content: '+++' + detailItemID + '+++', - // }) - // detailItemType = app.globalData.shareInParameter.detailItemType; } else { var detailItemID = parseInt(options.ID); } var that = this; network.transfer_request(load, [detailItemID], function(res) { + orderID =res.result.ID; app.globalData.shareInParameter = {}; + var DepartmentWorkFlow_ID = res.result.DepartmentWorkFlow_ID; + var DepartmentWorkFlow_Detail_ID = res.result.DepartmentWorkFlow_Detail_ID; + if (DepartmentWorkFlow_ID && !DepartmentWorkFlow_Detail_ID) { + // if (!DepartmentWorkFlow_ID && !DepartmentWorkFlow_Detail_ID) { + that.setData({ + showForwardBtn: true + }) + } res.result.LoadTime = timechage.formatTimeTwo(res.result.LoadTime.substring(6, 19), 'Y-M-D h:m'); console.log(res.result); that.setData({ @@ -450,6 +457,21 @@ Page({ }) }, + // 点击提交按钮 + forwardBtnClick: function () { + let params = [orderID]; + network.transfer_request(saleOrderForward, params, function (res) { + wx.showToast({ + title: '提交工作审批流成功', + success: function () { + wx.navigateBack({ + delta: 1, + }) + } + }) + }) + }, + // 存货明细页面更多按钮 moreBtnClick: function (e) { var that = this; diff --git a/pages/order/detail/detail.wxml b/pages/order/detail/detail.wxml index 45d48db..a4f1b7f 100644 --- a/pages/order/detail/detail.wxml +++ b/pages/order/detail/detail.wxml @@ -150,13 +150,20 @@ - - + + + + + + 提交 + + @@ -167,6 +174,14 @@ + + + + 保存 + + + + diff --git a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js index 0efc6a4..f1034ff 100644 --- a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js +++ b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.js @@ -4,12 +4,12 @@ var network = require("../../../utils/net.js"); const app = getApp(); var dateTimePicker = require('../../../utils/dateTimePicker.js'); var timechage = require("../../../utils/dateTimeUtil.js") - +var orderID; var getDept = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetDepartment"; var getSaleKind = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetSaleKind" var getPrice = "/MainSystem/B3MiniProgramRpc/Rpcs/BaseInfoRpc/GetGoodsPirce"; var insert = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/MarketingActivityRpc/Insert'; - +var specialOrderApplyForward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/MarketingActivityRpc/Forward'; function GetSaleKind(that, v) { let method = getSaleKind; let params = [{ @@ -99,6 +99,8 @@ Page({ department: [], //销售部门 name: "", remark: '', + // 是否显示部门工作流提交按钮 + showForwardBtn: false, }, // 添加名称 @@ -260,6 +262,22 @@ Page({ }) }, + + // 点击提交按钮 + forwardBtnClick: function (){ + let params = [orderID]; + network.transfer_request(specialOrderApplyForward, params, function (res) { + wx.showToast({ + title: '提交工作审批流成功', + success: function () { + wx.navigateBack({ + delta: 1, + }) + } + }) + }) + }, + /** * 存货明细保存按钮 点击新建单据 内部做逻辑判断 存储值是否都已经加载 */ @@ -407,11 +425,6 @@ Page({ if (app.globalData.shareInParameter.id) { var detailItemID = parseInt(app.globalData.shareInParameter.id); - // wx.showModal({ - // title: '看下ID值', - // content: '+++' + detailItemID + '+++', - // }) - // detailItemType = app.globalData.shareInParameter.detailItemType; } else { var detailItemID = parseInt(options.ID); } @@ -419,7 +432,19 @@ Page({ var method ='/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/MarketingActivityRpc/Load'; let params = [detailItemID]; network.transfer_request(method, params, function (res) { + orderID =res.result.ID; app.globalData.shareInParameter = {}; + // 部门工作流 + // res.result.DepartmentWorkFlow_ID + // res.result.DepartmentWorkFlow_Detail_ID + var DepartmentWorkFlow_ID = res.result.DepartmentWorkFlow_ID; + var DepartmentWorkFlow_Detail_ID = res.result.DepartmentWorkFlow_Detail_ID; + if (DepartmentWorkFlow_ID && !DepartmentWorkFlow_Detail_ID){ + // if (!DepartmentWorkFlow_ID && !DepartmentWorkFlow_Detail_ID) { + that.setData({ + showForwardBtn:true + }) + } // 获取数据加载页面 let goodsDetailsArray = []; var goodsNameArray = res.result.GoodsDetails; diff --git a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml index 8a5c5c6..cef0ac4 100644 --- a/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml +++ b/pages/specialOrderApplication/specialOrderApplyDetail/specialOrderApplyDetail.wxml @@ -118,7 +118,31 @@ - + + + + + + 提交 + + + + + + + 保存 + + + + + + 保存