Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

package.json

@@ -21,6 +21,7 @@
     "js-cookie": "^2.2.1",
     "jsencrypt": "^3.2.1",
     "lib-flexible": "^0.3.2",
+    "moment": "^2.29.4",
     "node-sass": "^5.0.0",
     "nprogress": "^0.2.0",
     "postcss-px2rem-exclude": "0.0.6",

src/api/sunVillage_info/fixedAssets.js

@@ -959,6 +959,16 @@ export function batchEqbContractSigning(data){
     data: data
   })
 }
+
+//e签宝-批量归档
+export function batchContractCompleted() {
+  return request({
+    url:'/service/cbf/batchContractCompleted',
+    method: 'post',
+  })
+
+}
+
 //e签宝-合同网签
 export function eqbCbfhtwq(data){
   return request({

src/views/sunVillage_info/list_contract_signature.vue

@@ -92,10 +92,10 @@
                 <img src="../../assets/images/sunVillage_info/list_contract_signature_icon_08.png" style="width:12PX;height:12PX;"/>
               </div>
               <p>签字完成</p>
-              <p style="background-color: #0CF708;color: #30bf2c;">{{form.signCompletedRatio}}</p>
+              <p style="background-color: #d2f1d1;color: #30bf2c;">{{form.signCompletedRatio}}</p>
             </div>
             <p class="list_main_block_num"><span>{{form.signCompletedCount}}</span>份</p>
-            <p class="list_main_block_btn" v-if="form.signCompletedCount > 0" @click="">批量归档 ></p>
+            <p class="list_main_block_btn" v-if="form.signCompletedCount > 0" @click="batchContractCompleted">批量归档 ></p>
           </div>
 
           <div class="list_main_block">
@@ -117,7 +117,7 @@
 
 <script>
   import { cbfDataStatistics} from "@/api/sunVillage_info/sysCbf";
-  import { batchEqbContractSigning,batchEqbContractSignProcess} from "@/api/sunVillage_info/fixedAssets";
+  import { batchEqbContractSigning,batchEqbContractSignProcess,batchContractCompleted} from "@/api/sunVillage_info/fixedAssets";
   import $ from "jquery";
   import Cookies from "js-cookie";
   export default {
@@ -166,6 +166,26 @@
           },3000)
         });
       },
+
+      //批量归档
+      batchContractCompleted(){
+        this.$toast.loading({
+          message: "数据处理中",
+          forbidClick: true,
+          duration: 10000000000,
+        });
+        batchContractCompleted().then(response =>{
+          this.$toast.clear();
+          this.$toast.success(response.data);
+          let _this = this;
+          setTimeout(function(){
+            _this.getData();
+          },3000)
+        })
+
+      }
+
+
     },
   }
 </script>

src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue

@@ -325,6 +325,7 @@
   import request from '@/utils/request'
   import {attachmentList, commonAttach,systemAttachment} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import Dialog from "vant/lib/dialog";
+  import moment from "moment";
   export default {
     name: "approvalAdd",
     data() {
@@ -495,9 +496,9 @@
       getNowDate(){
         var _this = this;
         let yy = new Date().getFullYear();
-        let mm = new Date().getMonth()+1;
+        let mm = new Date().getMonth();
         let dd = new Date().getDate();
-        _this.nowDate = yy+'-'+mm+'-'+dd
+        _this.nowDate = moment(new Date()).format("YYYY-MM-DD");
       },
       initProjectInfo(){
         let _this = this