特价申请单详情

pages/waitForApproval/approvalDetail/approvalDetail.js

@@ -4,29 +4,24 @@ var network = require("../../../utils/net.js");
 var timechage = require("../../../utils/dateTimeUtil.js");
 
 // 销售 - 销售订单 
-var saleOrderMethod = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/OrderRpc/Load';
-// 销售 - 销售预报
-var saleForecastMethod = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/SaleForecastRpc/Load';
+var saleOrderMethod = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Load';
 // 销售 - 业务担保
-var businessGuaranteeMethod = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/BusinessGuaranteeRpc/Load';
-// 屠宰分割-生产通知单
-var productNoticeMethod = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/ProductNoticeRpc/Load';
+var businessGuaranteeMethod = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/BusinessGuaranteeRpc/Load';
+// 销售 - 特价申请
+var specialOrderApplyMethod = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/MarketingActivityRpc/Load';
 
 /**
  * 确定按钮点击进行审核的方法
  */
 // 销售 - 销售订单 
-var saleOrderForward = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/OrderRpc/Forward';
-var saleOrderBackward = "/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/OrderRpc/Backward"
-// 销售 - 销售预报
-var saleForecastForward = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/SaleForecastRpc/Forward';
-var saleForecastBackward = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/SaleForecastRpc/Backward';
+var saleOrderForward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Forward';
+var saleOrderBackward = "/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/OrderRpc/Backward"
 // 销售 - 业务担保
-var businessGuaranteeForward = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/BusinessGuaranteeRpc/Forward';
-var businessGuaranteeBackward = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/BusinessGuaranteeRpc/Backward';
-// 屠宰分割-生产通知单
-var productNoticeForward = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/ProductNoticeRpc/Forward';
-var productNoticeBackward = '/MainSystem/B3MiniProgramRpc/Rpcs/ManagerRpc/ProductNoticeRpc/Backward';
+var businessGuaranteeForward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/BusinessGuaranteeRpc/Forward';
+var businessGuaranteeBackward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/BusinessGuaranteeRpc/Backward';
+// 销售 - 特价申请
+var specialOrderApplyForward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/MarketingActivityRpc/Forward';
+var specialOrderApplyBackward = '/MainSystem/B3MiniProgramRpc/XuRpcs/Employee/MarketingActivityRpc/Backward';
 
 //将要获取的表头模版名称
 var formTitleTemplate = "";
@@ -42,10 +37,12 @@ Page({
    */
   data: {
     dataArr: [],
+    // 特价申请客户明细的数组
+    customer_arr: [],
     titleObj: {},
     templateName: "",
     titleTemplateName: "",
-    showBottomView: true,
+    showBottomView: false,
   },
 
   /**
@@ -61,6 +58,9 @@ Page({
     if (app.globalData.shareInParameter.id) {
       var detailItemID = parseInt(app.globalData.shareInParameter.id);
       detailItemType = app.globalData.shareInParameter.detailItemType;
+      that.setData({
+        showBottomView: true,
+      });
     } else {
       var detailItemID = parseInt(options.id);
       detailItemType = options.detailItemType;
@@ -100,14 +100,11 @@ Page({
       case "销售-销售订单":
         method = saleOrderMethod;
         break;
-      case "销售-销售预报":
-        method = saleForecastMethod;
-        break;
       case "销售-业务担保":
         method = businessGuaranteeMethod;
         break;
-      case "屠宰分割-生产通知单":
-        method = productNoticeMethod;
+      case "销售-特价申请":
+        method = specialOrderApplyMethod;
         break;
     }
     let params = [detailItemID];
@@ -141,23 +138,16 @@ Page({
           that.saleOrder(array, detailInfoTemplate, formTitleTemplate);
           break;
 
-        case "销售-销售预报":
-          formTitleTemplate = "commonFormTitleTemplate";
-          detailInfoTemplate = "saleOrderTemplate";
-          // that.saleForecast(array, detailInfoTemplate, formTitleTemplate)
-          that.saleOrder(array, detailInfoTemplate, formTitleTemplate);
-          break;
-
         case "销售-业务担保":
           formTitleTemplate = "guaranteeFormTitleTemplate";
           detailInfoTemplate = "businessGuaranteeTemplate";
           that.businessGuarantee(array, detailInfoTemplate, formTitleTemplate);
           break;
 
-        case "屠宰分割-生产通知单":
-          formTitleTemplate = "commonFormTitleTemplate";
-          detailInfoTemplate = "productNoticeTemplate";
-          that.productNotice(array, detailInfoTemplate, formTitleTemplate);
+        case "销售-特价申请":
+          formTitleTemplate = "specialOrderApplyTitleTemplate";
+          detailInfoTemplate = "specialOrderApplyTemplate";
+          that.specialOrderApply(array, detailInfoTemplate, formTitleTemplate);
           break;
       }
     })
@@ -207,6 +197,8 @@ Page({
       templateName: infoTemplate,
       // 详情数组
       dataArr: arrayLast,
+      // 置空客户数组
+      customer_arr: [],
       // 表头明细
       titleObj: formTitle,
     })
@@ -259,55 +251,82 @@ Page({
       templateName: infoTemplate,
       // 详情数组
       dataArr: arrayLast,
+      // 置空客户数组
+      customer_arr:[],
       // 表头明细
       titleObj: formTitle,
     })
   },
 
 
-  // 生产通知单数据解析
-  productNotice: function(result, infoTemplate, titleTemplate) {
+  // 特价申请数据解析
+  specialOrderApply: function(result, infoTemplate, titleTemplate) {
+
     var formTitle = {
+
       //返回的订单ID
-      // 生产通知订单ID在表头内取不到，包含在详情数组内      
-      // orderID: result.ID,
-      orderID: result.Details[0].ProductNotice_ID,
-      // 购货客户
-      Customer_Name: result.Customer_Name,
+      orderID: result.ID,
+      // 名称
+      name: result.Name,
+      // 摘要
+      remark: result.Remark,
       // 会计单位
       AccountingUnit_Name: result.AccountingUnit_Name,
       // 部门
       Department_Name: result.Department_Name,
       // 日期
-      CreateTime: timechage.formatTimeTwo(result.Date.substring(6, 19), 'Y/M/D'),
+      CreateTime: timechage.formatTimeTwo(result.MarketingActivityDate.substring(6, 19), 'Y/M/D'),
     }
-    let arrayLast = [];
-    var detailArr = result.Details;
-    for (var i = 0; i < detailArr.length; i++) {
+
+    let goodsDetailInfoArr = [];
+    var goodsNameArray = result.GoodsDetails;
+    for (var i = 0; i < goodsNameArray.length; i++) {
+      let beginTime = timechage.formatTimeTwo(goodsNameArray[i].BeginTime.substring(6, 19), 'Y-M-D')
+      let endTime = timechage.formatTimeTwo(goodsNameArray[i].EndTime.substring(6, 19), 'Y-M-D')
       var dmo = {
+        // 存货明细单号
         listNumber: i + 1,
-        // 存活名称
-        Goods_Name: detailArr[i].Goods_Name,
-        // 主数量
-        Number: detailArr[i].Number,
-        // 辅数量
-        SecondNumber: detailArr[i].SecondNumber,
-        // 生产日期
-        ProduceDate: timechage.formatTimeTwo(detailArr[i].ProduceDate.substring(6, 19), 'Y/M/D'),
-        // 交货日期
-        DeliveryDate: timechage.formatTimeTwo(detailArr[i].DeliveryDate.substring(6, 19), 'Y/M/D'),
-        // 加工要求
-        ProduceRequest: detailArr[i].ProduceRequest,
+        SaleGoods_ID: goodsNameArray[i].SaleGoods_ID,
+        // 存货名称
+        Goods_Name: goodsNameArray[i].Goods_Name,
+        // 原单价
+        Price: goodsNameArray[i].LastPrice,
+        // 特价
+        applicationPrice: goodsNameArray[i].Price,
+        // 开始时间
+        applicationStartTime: beginTime,
+        // 结束时间
+        applicationEndTime: endTime,
+        // 申请数量
+        applicationNum: goodsNameArray[i].Number,
+        // 单位（没用到）
+        applicationUnit: goodsNameArray[i].Unit,
       }
-      arrayLast.push(dmo);
+      goodsDetailInfoArr.push(dmo);
     }
+
+    let customerDetailsArray = [];
+    var customerArray = result.CustomerDetails;
+    for (var i = 0; i < customerArray.length; i++) {
+      var dmo = {
+        // 存货明细单号
+        listNumber: i + 1,
+        ID: customerArray[i].Customer_ID,
+        CustomerCatalog_Name: customerArray[i].CustomerCatalog_Name,
+        Name: customerArray[i].Customer_Name,
+      }
+      customerDetailsArray.push(dmo)
+    }
+
     this.setData({
       // 表头模版
       titleTemplateName: titleTemplate,
       // 详情模版名称
       templateName: infoTemplate,
-      // 详情数组
-      dataArr: arrayLast,
+      // 存货详情数组
+      dataArr: goodsDetailInfoArr,
+      // 客户详情数组
+      customer_arr: customerDetailsArray,
       // 表头明细
       titleObj: formTitle,
     })
@@ -324,14 +343,11 @@ Page({
       case "销售-销售订单":
         method = saleOrderForward;
         break;
-      case "销售-销售预报":
-        method = saleForecastForward;
-        break;
       case "销售-业务担保":
         method = businessGuaranteeForward;
         break;
-      case "屠宰分割-生产通知单":
-        method = productNoticeForward;
+      case "销售-特价申请":
+        method = specialOrderApplyForward;
         break;
     }
     let params = [id];
@@ -358,14 +374,11 @@ Page({
       case "销售-销售订单":
         method = saleOrderBackward;
         break;
-      case "销售-销售预报":
-        method = saleForecastBackward;
-        break;
       case "销售-业务担保":
         method = businessGuaranteeBackward;
         break;
-      case "屠宰分割-生产通知单":
-        method = productNoticeBackward;
+      case "销售-特价申请":
+        method = specialOrderApplyBackward;
         break;
     }
     let params = [id];

pages/waitForApproval/approvalDetail/approvalDetail.wxml

@@ -4,6 +4,12 @@
     <template is="{{titleTemplateName}}" data="{{titleObj}}" />  
 </view>
 
+<view class='detaileListContainer'>
+  <block wx:for="{{customer_arr}}" wx:for-item="item" wx:key="item">
+    <template is="specialOrderApplyCustomerTemplate" data="{{item}}" />
+  </block>
+</view>
+
 <view class='detaileListContainer'>
   <block wx:for="{{dataArr}}" wx:for-item="item">
     <template is="{{templateName}}" data="{{item}}" />
@@ -20,7 +26,7 @@
   </view>
 </view>
 
-<!-- 销售预报 + 销售订单 + 生产通知  表头-->
+<!-- 销售订单  表头-->
 <template name="commonFormTitleTemplate">
 <view class='listItem'><text class='lightGray'>购货客户：</text>{{titleObj.Customer_Name}}</view>
   <view class='listItem'><text class='lightGray'>会计单位：</text>{{titleObj.AccountingUnit_Name}}</view>
@@ -38,6 +44,15 @@
   <view class='listItem'><text class='lightGray'>担保金额：</text>{{titleObj.GuaranteeMoney}}</view>
 </template>
 
+<!-- 特价申请  表头 -->
+<template name="specialOrderApplyTitleTemplate">
+<view class='listItem'><text class='lightGray'>名称：</text>{{titleObj.name}}</view>
+<view class='listItem'><text class='lightGray'>日期：</text>{{titleObj.CreateTime}}</view>
+  <view class='listItem'><text class='lightGray'>会计单位：</text>{{titleObj.AccountingUnit_Name}}</view>
+  <view class='listItem'><text class='lightGray'>销售部门：</text>{{titleObj.Department_Name}}</view>
+  <view class='listItem'><text class='lightGray'>摘要：</text>{{titleObj.remark}}</view>
+</template>
+
 <!-- 销售预报 + 销售订单 明细详情-->
 <template name="saleOrderTemplate">
   <view class='listNumberView'><text class='lightGray'>明细清单：</text>{{item.listNumber}}</view>
@@ -48,15 +63,22 @@
   <view class='listItem'><text class='lightGray'>政策单价：</text>{{item.PolicyPrice}}</view>
 </template>
 
-<!-- 生产通知单 明细详情-->
-<template name="productNoticeTemplate">
-  <view class='listNumberView'><text class='lightGray'>明细清单：</text>{{item.listNumber}}</view>
+<!-- 特价申请 客户明细详情-->
+<template name="specialOrderApplyCustomerTemplate">
+  <view class='listNumberView'><text class='lightGray'>客户明细：</text>{{item.listNumber}}</view>
+  <view class='listItem'><text class='lightGray'>客户名称：</text>{{item.Name}}</view>
+  <view class='listItem'><text class='lightGray'>客户类型：</text>{{item.CustomerCatalog_Name}}</view>
+</template>
+
+<!-- 特价申请 存货明细详情-->
+<template name="specialOrderApplyTemplate">
+  <view class='listNumberView'><text class='lightGray'>存货明细清单：</text>{{item.listNumber}}</view>
   <view class='listItem'><text class='lightGray'>存货名称：</text>{{item.Goods_Name}}</view>
-  <view class='listItem'><text class='lightGray'>主数量：</text>{{item.Number}}</view>
-  <view class='listItem'><text class='lightGray'>辅数量：</text>{{item.SecondNumber}}</view>
-  <view class='listItem'><text class='lightGray'>生产日期：</text>{{item.ProduceDate}}</view>
-  <view class='listItem'><text class='lightGray'>交货日期：</text>{{item.DeliveryDate}}</view>
-  <view class='listItem'><text class='lightGray'>加工要求：</text>{{item.ProduceRequest}}</view>
+  <view class='listItem'><text class='lightGray'>原单价：</text>{{item.Price}}</view>
+  <view class='listItem'><text class='lightGray'>特价：</text>{{item.applicationPrice}}</view>
+  <view class='listItem'><text class='lightGray'>开始时间：</text>{{item.applicationStartTime}}</view>
+  <view class='listItem'><text class='lightGray'>结束时间：</text>{{item.applicationEndTime}}</view>
+  <view class='listItem'><text class='lightGray'>申请数量：</text>{{item.applicationNum}}</view>
 </template>
 
 <!-- 业务担保 明细详情-->

pages/waitForApproval/approvalDetail/approvalDetail.wxss

@@ -9,7 +9,7 @@
 }
 
 .listItem {
-  padding: 20rpx 20rpx 20rpx 20rpx;
+  padding: 20rpx 20rpx;
   border-bottom: 0.1px solid #dbdbdb;
   font-size: 16px;
   color: black;
@@ -27,7 +27,7 @@
 
 .listNumberView {
   background-color: #f0eff5;
-  padding: 10rpx 10rpx 10rpx 10rpx;
+  padding: 10rpx 10rpx;
   font-size: 16px;
   color: #666;
 }