优化

pages/contract/contract.js

@@ -129,11 +129,29 @@ Page({
     })
   },
   delete(e){
-    this.setData({
-      'itemId':e.currentTarget.dataset.id,
-      'itemIndex':e.currentTarget.dataset.index,
-      "showPopupDel":true
-    });
+    wx.showModal({
+      title: '提示',
+      content: '是否删除',
+      success (res) {
+        if (res.confirm) {
+          UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+e.currentTarget.dataset.id , {method:'GET'}, {
+            success: (res) => {
+              if(res.code==200){
+                let new_list = this.data.list
+                new_list.splice(e.currentTarget.dataset.index,1)
+                this.setData({'list':new_list})
+                UTIL.showToastNoneIcon('删除成功！');
+              }else{
+                UTIL.showToastNoneIcon('删除失败！');
+              }
+            }
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+    
   },
   cancelTemDel:function(e){
     this.setData({
@@ -146,18 +164,7 @@ Page({
     this.setData({
       "showPopupDel":false
     });
-    UTIL.httpRequest(API.URL_GET_CONTRACTDELETE+this.data.itemId , {method:'GET'}, {
-      success: (res) => {
-        if(res.code==200){
-          let new_list = this.data.list
-          new_list.splice(this.data.itemIndex,1)
-          this.setData({'list':new_list})
-          UTIL.showToastNoneIcon('删除成功！');
-        }else{
-          UTIL.showToastNoneIcon('删除失败！');
-        }
-      }
-    })
+    
   },
   relevanceBack(){
     let params = {
@@ -173,32 +180,53 @@ Page({
     })
   },
   terminate(e){
-    UTIL.httpRequest(API.URL_GET_TERMINATEINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
-      success: (res) => {
-        if(res.code==200){
-          let list = this.data.list
-          list[e.currentTarget.dataset.index].contractionStatus = '3'
-          this.setData({'list':list})
-          UTIL.showToastNoneIcon('终止成功！');
-        }else{
-          UTIL.showToastNoneIcon('终止失败！: '+res.msg);
+    wx.showModal({
+      title: '提示',
+      content: '是否终止',
+      success (res) {
+        if (res.confirm) {
+          UTIL.httpRequest(API.URL_GET_TERMINATEINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
+            success: (res) => {
+              if(res.code==200){
+                let list = this.data.list
+                list[e.currentTarget.dataset.index].contractionStatus = '3'
+                this.setData({'list':list})
+                UTIL.showToastNoneIcon('终止成功！');
+              }else{
+                UTIL.showToastNoneIcon('终止失败！: '+res.msg);
+              }
+            }
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
         }
       }
     })
+    
 },
   cancel(e){
-    UTIL.httpRequest(API.URL_GET_CANCELINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
-    success: (res) => {
-      if(res.code==200){
-        let list = this.data.list
-        list[e.currentTarget.dataset.index].contractionStatus = '2'
-        this.setData({'list':list})
-        UTIL.showToastNoneIcon('撤销成功！');
-      }else{
-        UTIL.showToastNoneIcon('撤销失败！: '+res.msg);
+    wx.showModal({
+      title: '提示',
+      content: '是否撤销',
+      success (res) {
+        if (res.confirm) {
+          UTIL.httpRequest(API.URL_GET_CANCELINFO+ e.currentTarget.dataset.id, {method:'GET'}, {
+            success: (res) => {
+              if(res.code==200){
+                let list = this.data.list
+                list[e.currentTarget.dataset.index].contractionStatus = '2'
+                this.setData({'list':list})
+                UTIL.showToastNoneIcon('撤销成功！');
+              }else{
+                UTIL.showToastNoneIcon('撤销失败！: '+res.msg);
+              }
+            }
+          })
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
       }
-    }
-  })
+    })
 },
   relevanceDelete(e){
       UTIL.httpRequest(API.URL_GET_ASSETREMOVE+ e.currentTarget.dataset.id, {method:'GET'}, {

pages/contract/contract.wxml

@@ -16,7 +16,7 @@
   <view class="add_btn" bindtap="goAdd"><text>填报</text></view>
 </view>
 <scroll-view scroll-y refresher-threshold="0" style="height:{{scrollHeight}}px" bindscrolltolower="paging" lower-threshold="100">
-<van-swipe-cell left-width="{{ 100 }}" right-width="{{ 150 }}" class="workflow" wx:for="{{list}}" wx:key="index" wx:for-item="item" >
+<van-swipe-cell right-width="{{ 225 }}" class="workflow" wx:for="{{list}}" wx:key="index" wx:for-item="item" >
   <view class="li" bindtap="goUpdate" data-id="{{item.id}}">
       <view class="tit_box">
         <image src="/image/icon/contract_icon.png" style="width: 15px;height: 15px;margin-right: 10px;"  referrer="no-referrer|origin|unsafe-url"></image>
@@ -78,8 +78,6 @@
         <text style="color: #ffa601;">资产</text>
       </view>
     </view>
-  </view>
-  <view slot="left" class="moreBox">
     <view style="flex: 1;height: 100%;display: flex;align-items: center;flex-direction: column;justify-content: center;background-color: rgb(255,0,0,0.2);" data-id="{{item.id}}" data-index="{{index}}" bindtap="terminate">
       <view>
         <image src="../../image/icon/terminate_icon.png" style="width: 25px;height: 25px;margin: 0 auto;display: block;" ></image>

pages/contract/contract.wxss

@@ -64,7 +64,7 @@ text{display: block;}
   color: #31936c;
 }
 .deleteBox{
-  width: 150px;
+  width: 225px;
   text-align: center;
   height: 100%;
   background: #F6F6F6;

pages/drawee/drawee.js

@@ -457,6 +457,7 @@ Page({
   edit(e){ 
     var that = this ;
     var zz = /^(?=.*\d)(?=.*[a-zA-Z])(?=.*[~!@#$%^&*])[\da-zA-Z~!@#$%^&*]{6,}$/;
+    console.log(zz.test(that.data.password));
     if(!(zz.test(that.data.password))){
       wx.showToast({
         title: '请根据提示修改',

pages/drawee/drawee.wxml

@@ -102,7 +102,7 @@
             <image src="../../image/apply/icon_GWK.png" style="width: 25px"  mode="widthFix"></image>
             <text>公务卡</text>
           </view>
-          <view style="margin-bottom: 2vh;">{{item.payeeAccount}}<text>卡号</text></view> 
+          <view style="margin-top: 2vh;">{{item.payeeAccount}}<text>卡号</text></view> 
           <view>{{item.bankDeposit}}</view>
           <!-- <view>可用余额</view> 
           <view style="font-weight: bold;font-size: 22px;margin-top: 2vh;">10,288.83</view>  -->

pages/finance/index.js

@@ -35,20 +35,26 @@ Page({
    */
   onShow() {
     var that = this;
+    that.setData({
+      imgUrl:wx.getStorageSync('dressCode')
+    })
     UTIL.httpRequest(API.URL_GET_GETOPENLIST, {method:'GET'},{
       success: (res) => {
         if(res.code == 200){
           for (let i = 0; i < res.rows.length; i++) {
             const element = res.rows[i];
-            element.openPic = wx.getStorageSync('dressCode')+element.openPic;
-            element.openFile = wx.getStorageSync('dressCode')+element.openFile;
+            element.openPic = element.openPic.split(',');
+            element.openFile = element.openFile.split(',');
           }
+          // wx.getStorageSync('dressCode')+
           if (res.rows.length>0) {
             that.setData({
               bookId:res.rows[0].bookId,
               deptId:res.rows[0].deptId,
             })
           }
+          
+          console.log(res.rows);
           that.setData({
             list:res.rows
           })

pages/finance/index.wxml

@@ -8,7 +8,7 @@
     value="{{ value }}"
     shape="round"
     background="transparent"
-    placeholder="请输入对方账户名搜索"
+    placeholder="请输入名称搜索"
     clearable
     bind:change="goSearch"
   />
@@ -16,38 +16,33 @@
 
 <scroll-view scroll-y refresher-threshold="0" style="height:100%" bindscrolltolower="paging" lower-threshold="100">
     <!-- wx:for="{{list}}" wx:key="index" wx:for-item="item" right-width="{{ 50 }}" -->
-  <van-swipe-cell class="workflow" wx:for="{{list}}" wx:key="index" >
-    <view class="li" data-date="{{item.openNy}}" data-bookId="{{item.bookId}}" data-deptId="{{item.deptId}}" bindtap="goFinace" >
+  <van-swipe-cell right-width="{{ 65 }}" class="workflow" wx:for="{{list}}" wx:key="index" >
+    <view class="li" >
       <view style="width:70%;flex:7;">
         <view class="tit_box">
           <view>
             <text class="tit">{{item.openName}}</text>
           </view>
-        </view>
-        <view style="display: flex;align-items: flex-end;margin-top: 10px;">
-          <image src="/image/icon/clock_icon.png" style="width: 15px;height: 15px;border-radius:5px;margin-right: 5px;display: block;"></image>
-          <text style="color: #878787;line-height: 15px;">{{item.openNy}}</text>
-          <view style="margin-left: auto;display: flex;">
-            <image src="{{item.openPic}}" style="width: 30px;height: 30px;display: block;" data-url="{{item.openPic}}" bindtap="openPreview"></image>
-            <image src="/image/icon/icon_word.png" style="width: 30px;height: 30px;margin-left: 10px;display: block;" data-url="{{item.openFile}}" bindtap="previewFile"></image>
+          <view style="display: flex;align-items: flex-start;">
+            <image src="/image/icon/clock_icon.png" style="width: 15px;height: 15px;border-radius:5px;margin-right: 5px;display: block;flex-shrink: 0;"></image>
+            <text style="color: #878787;line-height: 15px;flex-shrink: 0;">{{item.openNy}}</text>
           </view>
         </view>
+        <view style="margin-left: auto;display: flex;flex-wrap: wrap;margin-top: 15px;">
+            <image src="{{imgUrl+childItem}}" wx:for="{{item.openPic}}" wx:for-item="childItem" wx:for-index="childIndex" style="width: 30px;height: 30px;display: block;margin-left: {{childIndex == 0 ? '0px' : '10px'}};" data-url="{{imgUrl+childItem}}" bindtap="openPreview" wx:key="childIndex"></image>
+            <image src="/image/icon/icon_word.png" wx:for="{{item.openFile}}" wx:for-item="childItem" wx:for-index="childIndex" style="width: 30px;height: 30px;margin-left: 10px;display: block;" data-url="{{imgUrl+childItem}}" bindtap="previewFile" wx:key="childIndex"></image>
+          </view>
       </view>
     </view>
-    <!-- <view slot="right" class="cell_right">
+    <view slot="right" class="cell_right">
       <view class="button_box" 
-        data-url="{{item.alternateField2}}" 
-        data-field1="{{item.alternateField1}}" 
-        data-field4="{{item.alternateField4}}" 
-        data-field9="{{item.alternateField9}}" 
-        data-id="{{item.id}}"
-        bindtap="goHD"
+      data-date="{{item.openNy}}" data-bookId="{{item.bookId}}" data-deptId="{{item.deptId}}" bindtap="goFinace"
       >
         <view>
           <image src="/image/icon/icon_hd.png" style="width: 15px;height: 17px;"></image>
           <text>明细</text>
         </view>
       </view>
-    </view> -->
+    </view>
   </van-swipe-cell>
 </scroll-view>

pages/finance/index.wxss

@@ -123,6 +123,7 @@ text{display: block;}
 .tit_box{
   display: flex;
   align-items: center;
+  justify-content: space-between;
   margin-bottom: 10px;
 }
 .detail_box{

pages/payee/add/add.js

@@ -97,7 +97,46 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow() {
-    
+    //6217002190007972186庞东旭,,,,, 山东省威海市文登区XXXXXX
+    var that = this;
+    wx.getClipboardData({
+      success (res){
+        console.log(res.data)
+        var str = res.data;
+        var numArr = str.match(/\d+/g)
+        var nameArr = str.match(/[\u4e00-\u9fa5]/g).join("")
+        //直接输出
+        console.log("直接输出："+numArr)
+        console.log("直接输出："+nameArr)
+        if (numArr) {
+          numArr.map(rr=>{
+            if (rr.length>16) {
+              console.log(rr);
+              console.log(UTIL.isBankCard(rr));
+              const carId = UTIL.isBankCard(rr);
+              if (carId) {
+                wx.showModal({
+                  title: '提示',
+                  content: '检测到粘贴板中可能包含收款方及收款账号，是否自动填充？',
+                  success (res2) {
+                    if (res2.confirm) {
+                      that.setData({
+                        ["form.payee"]:nameArr,
+                        ["form.payeeAccount"]:rr
+                      })
+                      console.log('用户点击确定')
+                    } else if (res2.cancel) {
+                      console.log('用户点击取消')
+                    }
+                  }
+                })
+              }
+            }
+          })
+        }
+        
+      }
+    })
     
   },
   back:function(){

pages/payee/add/add.wxss

@@ -56,4 +56,5 @@
   padding: 8px 0px;
   background-image: linear-gradient(to right, #2C8E68, #5CAE77);
   color: #fff;
-}
+}
+

pages/statistics/statistics.js

@@ -14,9 +14,9 @@ function setOption(chart, rowRows1, rowRows2) {
         textStyle: { // 主标题样式
           color: '#5CAE77',
           fontWeight: '400',
-          fontSize: 18
+          fontSize: 14
         },
-        left: '25%', // 定位到适合的位置
+        left: '27%', // 定位到适合的位置
         top: '45%', // 定位到适合的位置
         textAlign: 'center' // 主、副标题水平居中显示
       },
@@ -25,9 +25,9 @@ function setOption(chart, rowRows1, rowRows2) {
         textStyle: {
           color: '#E90000',
           fontWeight: '400',
-          fontSize: 18
+          fontSize: 14
         },
-        left: '74%',
+        left: '76%',
         top: '45%',
         textAlign: 'center'
       }
@@ -39,7 +39,7 @@ function setOption(chart, rowRows1, rowRows2) {
       { // 第一个圆环
         type: 'pie',
         radius: ['30%', '50%'],
-        center: ['26%', '50%'],
+        center: ['28%', '50%'],
         avoidLabelOverlap: false,
         label: {
           show: true,
@@ -55,7 +55,7 @@ function setOption(chart, rowRows1, rowRows2) {
       { // 第二个圆环
         type: 'pie',
         radius: ['30%', '50%'],
-        center: ['75%', '50%'],
+        center: ['77%', '50%'],
         avoidLabelOverlap: false,
         itemStyle: {
         },
@@ -296,14 +296,14 @@ Page({
             console.log('aaa');
             rowRows1.push({
               value: rr.percentage,
-              name: UTIL.getTransform(rr.incomeType,that.data.incomeTypeOptions)+' '+rr.percentage+'%'
+              name: UTIL.getTransform(rr.incomeType,that.data.incomeTypeOptions).substr(0,2)+'\n'+rr.percentage+'%'
             })
             rr.jieAmount = Number(rr.jieAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "");
           })
           res.data[2].forEach(rrr=>{
             rowRows2.push({
               value: rrr.percentage,
-              name: UTIL.getTransform(rrr.expenditureType,that.data.expenditureTypeOptions)+' '+rrr.percentage+'%'
+              name: UTIL.getTransform(rrr.expenditureType,that.data.expenditureTypeOptions).substr(0,2)+'\n'+rrr.percentage+'%'
             })
             rrr.daiAmount = Number(rrr.daiAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => { return $1 + ","; }).replace(/\.$/, "");
           })

pages/statistics/statistics.wxml

@@ -74,7 +74,7 @@
 <view class="main-box">
   <view style="display: flex;align-items: center;justify-content: space-between;">
     <view style="display: flex;align-items: center;">
-      <image src="/image/icon/icon_tjzb.png" style="width: 12.71px;height: 12.71px;margin-right: 5px;"></image>
+      <image src="/image/icon/icon_tjzb.png" style="width: 14px;height: 14px;margin-right: 5px;"></image>
       <text>统计占比</text>
     </view>
     <view class="tab" wx:if="{{showList}}">
@@ -105,7 +105,7 @@
       <image src="/image/icon/icon_tz.png" style="width: 34px;height: 34px;margin-right: 10px;" wx:if="{{item.incomeType == 5}}"></image>
       <view style="flex: 1;">
         <view style="display:flex;justify-content: space-between;">
-          <text style="margin-bottom: 5px;display: block;">{{item.incomeType == 1 ? '经营' : item.incomeType == 2 ? '发包 ' : item.incomeType == 3 ? '补助' : item.incomeType == 4 ? '其他' : item.incomeType == 5 ? '投资' : ''}}</text>
+          <text style="margin-bottom: 5px;display: block;">{{item.incomeType == 1 ? '经营收入' : item.incomeType == 2 ? '发包收入' : item.incomeType == 3 ? '补助收入' : item.incomeType == 4 ? '其他收入' : item.incomeType == 5 ? '投资收益' : ''}}</text>
           <text style="font-size: 18px;display: block;"><text style="font-size: 14px;">￥</text>{{item.jieAmount}}</text>
         </view>
         <van-progress percentage="{{item.percentage}}" stroke-width="10" color="{{item.incomeType == 1 ? '#FC9A55' : item.incomeType == 2 ? '#B3DB62 ' : item.incomeType == 3 ? '#5CAE77' : item.incomeType == 4 ? '#1F78B4' : item.incomeType == 5 ? '#F67474' : ''}}" show-pivot="{{false}}" />
@@ -134,11 +134,11 @@
     <image src="/image/icon/icon_cBtn.png" style="width: 22px;height: 22px;margin: 0 auto;" wx:if="{{!showList}}" bindtap="showList"></image>
     <image src="/image/icon/icon_cTop.png" style="width: 22px;height: 22px;margin: 0 auto;" wx:if="{{showList}}" bindtap="CloseList"></image>
   </view>
-</view>
+</view> 
 
 <view class="main-box">
   <view style="display: flex;align-items: center;">
-    <image src="/image/icon/icon_zs.png" style="width: 12.71px;height: 12.71px;margin-right: 5px;"></image>
+    <image src="/image/icon/icon_zs.png" style="width: 14px;height: 14px;margin-right: 5px;"></image>
     <text>收/支走势</text>
     <text style="background:#F1F1F1;color:#878787;font-size:12px;padding:2px 10px;border-radius:15px;margin-left: auto;">单位：元</text>
   </view>

pages/statistics/statistics.wxss

@@ -28,7 +28,7 @@ ec-canvas {
 }
 .main-box{
   background: #ffffff;
-  padding: 20px;
+  padding: 20px 10px;
   width: 94%;
   margin: 20px auto;
   border-radius: 10px;

pages/transferAccounts/transferAccounts.wxml

@@ -27,7 +27,7 @@
 </view>
 <scroll-view scroll-y refresher-threshold="0" style="height:100%" bindscrolltolower="paging" lower-threshold="100">
   <!-- wx:for="{{list}}" wx:key="index" wx:for-item="item" right-width="{{ 50 }}" -->
-<van-swipe-cell right-width="{{ 195 }}" class="workflow" wx:for="{{list}}" wx:key="index" >
+<van-swipe-cell right-width="{{ item.checkStatus != 1 ? 195 : 130 }}" class="workflow" wx:for="{{list}}" wx:key="index" >
   <view class="li" data-id="{{item.approvalItemTemplateId}}" data-ids="{{item.transferId}}" bindtap="toPayDetail"  >
     <view style="width:70%;flex:7;">
       <view class="tit_box">
@@ -68,7 +68,7 @@
         <text>明细</text>
       </view>
     </view>
-    <view class="button_box" bindtap="goRegular">
+    <view class="button_box" bindtap="goRegular" wx:if="{{item.checkStatus != 1}}">
       <view data-id="{{item.id}}" bindtap="openDZ">
         <image src="/image/icon/icon_dz.png" style="width: 15px;height: 17px;"></image>
         <text>对账</text>

utils/util.js

@@ -480,6 +480,80 @@ const hideLoadingWithErrorTips = (err = '加载失败...') => {
     duration: 2000
   })
 }
+
+/**
+ * @author Rui.Zhang
+ * @description 判断是否为银行卡号
+ * @param {String} str_cardNo 待校验的数据
+ * @returns {Boolean}, true:是银行卡号
+ **/
+function isBankCard (str_cardNo) {
+  str_cardNo = str_cardNo || String(this);
+    if ("" == str_cardNo.trim() || undefined == str_cardNo) {
+        return false;
+    }
+    var lastNum = str_cardNo.substr(str_cardNo.length - 1, 1);//取出最后一位（与luhm进行比较）
+
+    var first15Num = str_cardNo.substr(0, str_cardNo.length - 1);//前15或18位
+    var newArr=new Array();
+    for(var i=first15Num.length-1;i>-1;i--){    //前15或18位倒序存进数组
+        newArr.push(first15Num.substr(i,1));
+    }
+    var arrJiShu=new Array();  //奇数位*2的积 <9
+    var arrJiShu2=new Array(); //奇数位*2的积 >9
+
+    var arrOuShu=new Array();  //偶数位数组
+    for(var j=0;j<newArr.length;j++){
+        if((j+1)%2==1){//奇数位
+            if(parseInt(newArr[j])*2<9)
+                arrJiShu.push(parseInt(newArr[j])*2);
+            else
+                arrJiShu2.push(parseInt(newArr[j])*2);
+        }
+        else //偶数位
+            arrOuShu.push(newArr[j]);
+    }
+
+    var jishu_child1=new Array();//奇数位*2 >9 的分割之后的数组个位数
+    var jishu_child2=new Array();//奇数位*2 >9 的分割之后的数组十位数
+    for(var h=0;h<arrJiShu2.length;h++){
+        jishu_child1.push(parseInt(arrJiShu2[h])%10);
+        jishu_child2.push(parseInt(arrJiShu2[h])/10);
+    }
+
+    var sumJiShu=0; //奇数位*2 < 9 的数组之和
+    var sumOuShu=0; //偶数位数组之和
+    var sumJiShuChild1=0; //奇数位*2 >9 的分割之后的数组个位数之和
+    var sumJiShuChild2=0; //奇数位*2 >9 的分割之后的数组十位数之和
+    var sumTotal=0;
+    for(var m=0;m<arrJiShu.length;m++){
+        sumJiShu=sumJiShu+parseInt(arrJiShu[m]);
+    }
+
+    for(var n=0;n<arrOuShu.length;n++){
+        sumOuShu=sumOuShu+parseInt(arrOuShu[n]);
+    }
+
+    for(var p=0;p<jishu_child1.length;p++){
+        sumJiShuChild1=sumJiShuChild1+parseInt(jishu_child1[p]);
+        sumJiShuChild2=sumJiShuChild2+parseInt(jishu_child2[p]);
+    }
+    //计算总和
+    sumTotal=parseInt(sumJiShu)+parseInt(sumOuShu)+parseInt(sumJiShuChild1)+parseInt(sumJiShuChild2);
+
+    //计算Luhm值
+    var k= parseInt(sumTotal)%10==0?10:parseInt(sumTotal)%10;
+    var luhm= 10-k;
+
+    if(lastNum==luhm){
+        return true;
+    }
+    else{
+        return false;
+    }
+}
+
+
 export {
 	getCurrentPageUrl,
 	getCurrentPageUrlWithArgs,
@@ -503,5 +577,6 @@ export {
   ToChinese,
   showLoading,
   hideLoadings,
-  hideLoadingWithErrorTips
+  hideLoadingWithErrorTips,
+  isBankCard
 }