From 48c72c2657ffa3f905260e6c0c58df1b8ff0e47f Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Wed, 1 Jun 2022 08:33:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/paymentTemplate/add/add.js | 226 ++++++++++++-------------
 pages/bankDraft/add/add.js             |   2 -
 pages/bankDraft/add/add.wxml           |   4 +-
 project.private.config.json            |   2 +-
 4 files changed, 116 insertions(+), 118 deletions(-)

diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index 3a81420..6dd7a33 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -311,124 +311,124 @@ Page({
           
           let fileForm = [];
 
-          UTIL.httpRequest(
-            API.URL_GET_FINDLIST, 
-            {
-              method:'GET',
-              tableName:'t_yinnong_transfer',
-              tableId:list.applyData.transfers[i].id,
-              fileType:1
-            }, 
-            {
-            success: (res) => {
+          // UTIL.httpRequest(
+          //   API.URL_GET_FINDLIST, 
+          //   {
+          //     method:'GET',
+          //     tableName:'t_yinnong_transfer',
+          //     tableId:list.applyData.transfers[i].id,
+          //     fileType:1
+          //   }, 
+          //   {
+          //   success: (res) => {
               
-              let list2 = [];
-              res.data.forEach((item2,index2)=>{
-                wx.downloadFile({
-                  url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                  success (response) {
-                    if (response.statusCode === 200) {
-                      fileForm.push({
-                        file: response.tempFilePath,
-                        fileType:'1',
-                        bizPath:'transfer',
-                        tableName:'t_yinnong_transfer',
-                        tableId:''
-                      })
-                      console.log("--------------fileForm2 start----------------");
-                      console.log(fileForm);
-                      console.log("--------------fileForm2 end----------------");
-                      list2.push({
-                        tempFilePath:response.tempFilePath,
-                        id:item2.id
-                      })
-                      list.applyData.transfers[i].SJimage =  list2;
-                    }
-                  }
-                })
-              })
+          //     let list2 = [];
+          //     res.data.forEach((item2,index2)=>{
+          //       wx.downloadFile({
+          //         url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+          //         success (response) {
+          //           if (response.statusCode === 200) {
+          //             fileForm.push({
+          //               file: response.tempFilePath,
+          //               fileType:'1',
+          //               bizPath:'transfer',
+          //               tableName:'t_yinnong_transfer',
+          //               tableId:''
+          //             })
+          //             console.log("--------------fileForm2 start----------------");
+          //             console.log(fileForm);
+          //             console.log("--------------fileForm2 end----------------");
+          //             list2.push({
+          //               tempFilePath:response.tempFilePath,
+          //               id:item2.id
+          //             })
+          //             list.applyData.transfers[i].SJimage =  list2;
+          //           }
+          //         }
+          //       })
+          //     })
               
-            }
-          })
-          //发票
-          UTIL.httpRequest(
-            API.URL_GET_FINDLIST, 
-            {
-              method:'GET',
-              tableName:'t_yinnong_transfer',
-              tableId:list.applyData.transfers[i].id,
-              fileType:2
-            }, 
-            {
-            success: (res) => {
-              let list2 = [];
-              res.data.forEach((item2,index2)=>{
+          //   }
+          // })
+          // //发票
+          // UTIL.httpRequest(
+          //   API.URL_GET_FINDLIST, 
+          //   {
+          //     method:'GET',
+          //     tableName:'t_yinnong_transfer',
+          //     tableId:list.applyData.transfers[i].id,
+          //     fileType:2
+          //   }, 
+          //   {
+          //   success: (res) => {
+          //     let list2 = [];
+          //     res.data.forEach((item2,index2)=>{
                 
-                wx.downloadFile({
-                  url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                  success (response) {
-                    if (response.statusCode === 200) {
-                      fileForm.push({
-                        file: response.tempFilePath,
-                        fileType:'2',
-                        bizPath:'transfer',
-                        tableName:'t_yinnong_transfer',
-                        tableId:''
-                      })
-                      console.log("--------------fileForm2 start----------------");
-                      console.log(fileForm);
-                      console.log("--------------fileForm2 end----------------");
-                      list2.push({
-                        tempFilePath:response.tempFilePath,
-                        id:item2.id
-                      })
-                      list.applyData.transfers[i].FPimage =  list2;
-                    }
-                  }
-                })
-              })
-            }
-          })
-          //其他
-          UTIL.httpRequest(
-            API.URL_GET_FINDLIST, 
-            {
-              method:'GET',
-              tableName:'t_yinnong_transfer',
-              tableId:list.applyData.transfers[i].id,
-              fileType:3
-            }, 
-            {
-            success: (res) => {
-              let list2 = [];
-              res.data.forEach((item2,index2)=>{
+          //       wx.downloadFile({
+          //         url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+          //         success (response) {
+          //           if (response.statusCode === 200) {
+          //             fileForm.push({
+          //               file: response.tempFilePath,
+          //               fileType:'2',
+          //               bizPath:'transfer',
+          //               tableName:'t_yinnong_transfer',
+          //               tableId:''
+          //             })
+          //             console.log("--------------fileForm2 start----------------");
+          //             console.log(fileForm);
+          //             console.log("--------------fileForm2 end----------------");
+          //             list2.push({
+          //               tempFilePath:response.tempFilePath,
+          //               id:item2.id
+          //             })
+          //             list.applyData.transfers[i].FPimage =  list2;
+          //           }
+          //         }
+          //       })
+          //     })
+          //   }
+          // })
+          // //其他
+          // UTIL.httpRequest(
+          //   API.URL_GET_FINDLIST, 
+          //   {
+          //     method:'GET',
+          //     tableName:'t_yinnong_transfer',
+          //     tableId:list.applyData.transfers[i].id,
+          //     fileType:3
+          //   }, 
+          //   {
+          //   success: (res) => {
+          //     let list2 = [];
+          //     res.data.forEach((item2,index2)=>{
                 
-                wx.downloadFile({
-                  url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
-                  success (response) {
-                    if (response.statusCode === 200) {
-                      fileForm.push({
-                        file: response.tempFilePath,
-                        fileType:'3',
-                        bizPath:'transfer',
-                        tableName:'t_yinnong_transfer',
-                        tableId:''
-                      })
-                      console.log("--------------fileForm2 start----------------");
-                      console.log(fileForm);
-                      console.log("--------------fileForm2 end----------------");
-                      list2.push({
-                        tempFilePath:response.tempFilePath,
-                        id:item2.id
-                      })
-                      list.applyData.transfers[i].QTimage =  list2;
+          //       wx.downloadFile({
+          //         url: URL_PREFIX+item2.fileUrl, //仅为示例，并非真实的资源
+          //         success (response) {
+          //           if (response.statusCode === 200) {
+          //             fileForm.push({
+          //               file: response.tempFilePath,
+          //               fileType:'3',
+          //               bizPath:'transfer',
+          //               tableName:'t_yinnong_transfer',
+          //               tableId:''
+          //             })
+          //             console.log("--------------fileForm2 start----------------");
+          //             console.log(fileForm);
+          //             console.log("--------------fileForm2 end----------------");
+          //             list2.push({
+          //               tempFilePath:response.tempFilePath,
+          //               id:item2.id
+          //             })
+          //             list.applyData.transfers[i].QTimage =  list2;
                       
-                    }
-                  }
-                })
-              })
-            }
-          })
+          //           }
+          //         }
+          //       })
+          //     })
+          //   }
+          // })
           list.applyData.transfers[i].id = "";
           list.applyData.transfers[i].fileForm = fileForm;
         }
diff --git a/pages/bankDraft/add/add.js b/pages/bankDraft/add/add.js
index fbefc24..a44e6e3 100644
--- a/pages/bankDraft/add/add.js
+++ b/pages/bankDraft/add/add.js
@@ -22,8 +22,6 @@ Page({
       orderStatus: "", //汇票状态 必填  1在库 2转付中 3转付 4承兑
       remark: "",
     },
-    minDate: new Date(2008, 5, 1).getTime(),
-    maxDate: new Date(2040, 0, 31).getTime(),
     orderStatusOptions:[],
     orderTypeOptions:[],
     showBtn:true
diff --git a/pages/bankDraft/add/add.wxml b/pages/bankDraft/add/add.wxml
index 11299ff..b50d0b4 100644
--- a/pages/bankDraft/add/add.wxml
+++ b/pages/bankDraft/add/add.wxml
@@ -27,10 +27,10 @@
 
 
     <van-field readonly label="开票日期" value="{{ form.startTime }}"   placeholder="开票日期" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.startTime" bindtap="openBox" data-name="showStartTime"/>
-    <van-calendar show="{{ showStartTime }}"  min-date="{{minDate}}" max-date="{{maxDate}}" bind:close="closeBox"  data-name="showStartTime" bind:confirm="onConfirmTime" data-value="form.startTime" show-confirm="{{ false }}" />
+    <van-calendar show="{{ showStartTime }}"  bind:close="closeBox"  data-name="showStartTime" bind:confirm="onConfirmTime" data-value="form.startTime" show-confirm="{{ false }}" />
 
     <van-field readonly label="到期日期" value="{{ form.endTime }}" placeholder="到期日期" border="{{ false }}" bind:change="onChange" input-align="right" required data-value="form.endTime" bindtap="openBox" data-name="showEndTime"/>
-    <van-calendar show="{{ showEndTime }}"  min-date="{{minDate}}" max-date="{{maxDate}}" bind:close="closeBox"  data-name="showEndTime" bind:confirm="onConfirmTime" data-value="form.endTime" show-confirm="{{ false }}" />
+    <van-calendar show="{{ showEndTime }}" bind:close="closeBox"  data-name="showEndTime" bind:confirm="onConfirmTime" data-value="form.endTime" show-confirm="{{ false }}" />
 
     <van-popup show="{{showOrderStatus}}" round position="bottom"  bind:close="closeBox" data-name="showOrderStatus">
       <van-picker
diff --git a/project.private.config.json b/project.private.config.json
index e03d95a..3eadc8d 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -149,5 +149,5 @@
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "projectname": "WXMB",
-  "libVersion": "2.21.4"
+  "libVersion": "2.11.2"
 }
\ No newline at end of file

From f2c8226003dffe0e5af49f7718d48ad7128d3db1 Mon Sep 17 00:00:00 2001
From: pangdongxu <850374051@qq.com>
Date: Wed, 1 Jun 2022 09:54:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/apply/paymentTemplate/add/add.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/apply/paymentTemplate/add/add.js b/pages/apply/paymentTemplate/add/add.js
index 6dd7a33..7ee77d3 100644
--- a/pages/apply/paymentTemplate/add/add.js
+++ b/pages/apply/paymentTemplate/add/add.js
@@ -251,6 +251,8 @@ Page({
 
           list.applyData.transfers[i].expenditureAmount = '';
 
+          list.applyData.transfers[i].fileNum = 0;
+
           list.applyData.transfers[i].cashierType = list.applyData.transfers[i].cashierId != '' && list.applyData.transfers[i].cashierId != null && list.applyData.transfers[i].cashierId != null ? 'edit':'add' ;
 
           
@@ -280,6 +282,7 @@ Page({
           if(list.applyData.transfers[i].capitalExpenditureType == 4){
             let prames = {
               transferId:list.applyData.transfers[i].id,
+              
             }
             // 关联合同查询
             UTIL.httpRequest(API.URL_GET_GETSELECTINFOBYOUTID , prames, {