优化

src/views/sunVillage_info/index.vue

@@ -52,7 +52,7 @@
                 <router-link :to="{name:'sunVillageInfoListRegister'}" class="nav_item n_6">零工登记</router-link>
                 <router-link :to="{name:'sunVillageInfoFixedAssets'}" class="nav_item n_4">资产登记</router-link>
                 <router-link :to="{name:'sunVillageInfoInformation'}" class="nav_item n_5">合同登记</router-link>
-                <router-link :to="{name:'sunVillageInfoListBalanceRanking'}" class="nav_item n_7">科目余额</router-link>
+                <router-link :to="{name:'sunVillageInfoListBalanceRanking'}" class="nav_item n_7">科目余额表</router-link>
             </div>
         </div>
         <div class="footer">

src/views/sunVillage_info/list_balance_ranking.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="home_wrapper">
       <div class="header_main">
-          科目余额
+          科目余额表
           <div class="return_btn" @click="onClickLeft"></div>
 <!--            <div class="add_btn" v-show="showBtn" @click="goAdd"></div>-->
       </div>
@@ -26,15 +26,14 @@
         </van-popup>
         <div class="search_block">
           <i class="icon"></i>
-          <input type="text" class="ipt" v-model="queryParams.startSubjectId" placeholder="请输入科目编码查询" @input="getSearch">
+          <input readonly type="text" class="ipt" v-model="subjectName" placeholder="请选择科目查询" @click="visible=true">
+          <i class="delete_icon" v-show="subjectName" @click="emptyInput"></i>
         </div>
-<!--        <div class="total">共{{listLength}}个资产</div>-->
+<!--        <div class="total">共{{listLength}}个资产</div> @input="getSearch"-->
       </div>
 
       <div class="radio_box">
-        <van-radio-group v-model="radio">
-          <van-radio name="1" checked-color="#2facfe">显示明细</van-radio>
-        </van-radio-group>
+        <van-checkbox v-model="queryParams.showSubSubject" @change="showSub" checked-color="#2facfe">显示明细</van-checkbox>
         <div class="total">共{{listLength}}条</div>
       </div>
 
@@ -44,7 +43,7 @@
             <van-col :span="24">科目编码/科目名称</van-col>
           </van-row>
           <van-row v-for="(item,index) in applicationList" :key="index">
-            <van-col :span="24">{{item.subjectId}}{{item.subjectName}}</van-col>
+            <van-col :span="24">{{item.subjectId}} {{item.subjectName}}</van-col>
           </van-row>
           <div class="name_bg"></div>
           <img src="../../assets/images/sunVillage_info/name_icon.png" class="name_icon"/>
@@ -89,18 +88,24 @@
         <div class="clear"></div>
       </div>
 
+      <SubjectTreeChooser :visible.sync="visible" @select="getSearch" v-model="queryParams.startSubjectId" :can-select-non-leaf="true" height="480px"></SubjectTreeChooser>
 
     </div>
 </template>
 
 <script>
   import { trailBalanceList , getLoginBook } from "@/api/sunVillage_info/fixedAssets";
+  import SubjectTreeChooser from "@/components/form/SubjectTreeChooser";
   import Cookies from "js-cookie";
   import request from '@/utils/request'
   export default {
     name: "certificateList",
+    components: { SubjectTreeChooser },
     data() {
       return {
+        subjectName:'',
+        visible:false,
+        subjectId:'',
         radio:'1',
         applicationList:[],
         applicationListSecond:[],
@@ -120,6 +125,7 @@
           startDate:'',
           startSubjectId:'',
           endSubjectId:'',
+          showSubSubject:false
         },
         uploadFiles1:[],
         projectId:'',
@@ -154,8 +160,21 @@
           console.log(_this.queryParams)
           trailBalanceList(_this.queryParams).then(response => {
             _this.listLength = response.total;
+            response.rows.map(res=>{
+              res.bqjffs = Number(res.bqjffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
+              res.bqdffs = Number(res.bqdffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
+              res.qcjfye = Number(res.qcjfye).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
+              res.qcdfye = Number(res.qcdfye).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
+              res.qmjffs = Number(res.qmjffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
+              res.qmdffs = Number(res.qmdffs).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
+            })
             _this.applicationList = response.rows;
-
             if(_this.applicationList.length >= response.total){
               _this.finished = true;
               return;
@@ -180,9 +199,22 @@
         }
         return val;
       },
-      getSearch(){
+      getSearch(val){
+        console.log(val)
+        this.subjectName = val.subjectId + " " + val.subjectName;
         this.queryParams.endSubjectId = this.queryParams.startSubjectId;
         this.getList();
+      },
+      showSub(val){
+        console.log(val)
+        this.queryParams.showSubSubject = val;
+        this.getList();
+      },
+      emptyInput(){
+        this.subjectName = '';
+        this.queryParams.endSubjectId = '';
+        this.queryParams.startSubjectId = '';
+        this.getList();
       }
     },
   }
@@ -235,6 +267,14 @@
         display: block;
         margin:0 8px 0 26px;
       }
+      .delete_icon{
+        width: 15PX;
+        height: 15PX;
+        background: url('../../assets/images/sunVillage_info/delete_icon_input.png') no-repeat;
+        background-size: 100% 100%;
+        display: block;
+        margin:0 8px 0 26px;
+      }
       .ipt{
         flex: 1;
         font-size: 26px;
@@ -527,7 +567,7 @@
     }
     .van-col{
       font-size: 16PX;
-      padding: 0PX 15PX;
+      padding: 0PX 5PX;
       text-align: left;
       line-height: 40PX;
       display: -webkit-box;
@@ -560,13 +600,14 @@
       .van-col{
         color: #2facfe;
         height: 60PX;
+        text-align: center;
         line-height: 30PX;
         border-right: 1px solid #ccc;
       }
     }
     .van-col{
       font-size: 16PX;
-      text-align: center;
+      text-align: right;
       height: 40PX;
       line-height: 40PX;
       &:nth-child(2n){

src/views/sunVillage_info/login.vue

@@ -148,30 +148,9 @@
       handleLogin(values) {
         console.log(this.formData.username)
         console.log(this.formData.password)
-        if (this.isSmsLogin) {
-          //短信登录
-          let myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
-          if (!myreg.test(this.formData.mobile)) {
-            this.$dialog.alert({
-              message: '手机号格式不正确',
-            });
-            return false;
-          } else if (this.formData.smsCode == "") {
-            this.$dialog.alert({
-              message: '短信验证码不能为空',
-            });
-            return false;
-          }
-          this.loading = true;
-          this.$store
-            .dispatch("SmsLogin", this.formData)
-            .then(() => {
-              this.$router.push({ path: this.redirect || "/" }).catch(() => {});
-            })
-            .catch(() => {
-              this.loading = false;
-            });
-        } else {
+        console.log(this.formData.code)
+
+
           if (this.formData.rememberMe) {
             Cookies.set("username", this.formData.username, { expires: 30 });
             Cookies.set("password", encrypt(this.formData.password), { expires: 30 });
@@ -192,7 +171,7 @@
               message: '密码不能为空',
             });
             return false;
-          } else if (this.formData.code == "") {
+          } else if (!this.formData.code) {
             this.$dialog.alert({
               message: '图片验证码不能为空',
             });
@@ -207,7 +186,6 @@
               this.loading = false;
               this.getCode();
             });
-        }
       },
     },
   };