银农独立app

src/router/index.js

@@ -1090,7 +1090,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalList2',
   //   name: 'approvalList2',
   //   meta: {
-  //     title: '信用卡转账列表',
+  //     title: '公务卡转账列表',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalList2'], resolve)
@@ -1162,7 +1162,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalDetail2',
   //   name: 'approvalDetail2',
   //   meta: {
-  //     title: '银农信用卡转账申请',
+  //     title: '银农公务卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
@@ -1234,7 +1234,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalAdd2',
   //   name: 'approvalAdd2',
   //   meta: {
-  //     title: '添加信用卡转账申请',
+  //     title: '添加公务卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
@@ -1342,7 +1342,7 @@ export const constantRoutes = [
   //   path: '/onlineHome/approvalModify2',
   //   name: 'approvalModify2',
   //   meta: {
-  //     title: '修改信用卡转账申请',
+  //     title: '修改公务卡转账申请',
   //     hidden: true,
   //   },
   //   component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalModify2'], resolve)
@@ -1730,7 +1730,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalDetail2',
     name: 'approvalDetail2',
     meta: {
-      title: '银农信用卡转账申请',
+      title: '银农公务卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalDetail2'], resolve)
@@ -1802,7 +1802,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalAdd2',
     name: 'approvalAdd2',
     meta: {
-      title: '添加信用卡转账申请',
+      title: '添加公务卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2'], resolve)
@@ -1910,7 +1910,7 @@ export const constantRoutes = [
     path: '/yinnong/approvalModify2',
     name: 'approvalModify2',
     meta: {
-      title: '修改信用卡转账申请',
+      title: '修改公务卡转账申请',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalModify2'], resolve)
@@ -1991,7 +1991,7 @@ export const constantRoutes = [
     path: '/yinnong/collectionList',
     name: 'collectionList',
     meta: {
-      title: '银农支付收款账户',
+      title: '银农收款账户列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionList'], resolve)
@@ -2000,7 +2000,7 @@ export const constantRoutes = [
     path: '/yinnong/collectionAdd',
     name: 'collectionAdd',
     meta: {
-      title: '添加支付收款账户',
+      title: '添加收款账户信息',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionAdd'], resolve)
@@ -2009,7 +2009,7 @@ export const constantRoutes = [
     path: '/yinnong/collectionModify',
     name: 'collectionModify',
     meta: {
-      title: '修改支付收款账户',
+      title: '修改收款账户信息',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionModify'], resolve)
@@ -2018,7 +2018,7 @@ export const constantRoutes = [
     path: '/yinnong/collectionDetail',
     name: 'collectionDetail',
     meta: {
-      title: '查看支付收款账户',
+      title: '查看收款账户详情',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/collectionAccount/collectionDetail'], resolve)
@@ -2027,7 +2027,7 @@ export const constantRoutes = [
     path: '/yinnong/paymentAccountList',
     name: 'paymentAccountList',
     meta: {
-      title: '查看支付收款账户',
+      title: '查看付款账户列表',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountList'], resolve)
@@ -2036,7 +2036,7 @@ export const constantRoutes = [
     path: '/yinnong/paymentAccountAdd',
     name: 'paymentAccountAdd',
     meta: {
-      title: '添加出纳账户设置',
+      title: '添加付款账户信息',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd'], resolve)
@@ -2045,7 +2045,7 @@ export const constantRoutes = [
     path: '/yinnong/paymentAccountModify',
     name: 'paymentAccountModify',
     meta: {
-      title: '修改出纳账户设置',
+      title: '修改付款账户信息',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify'], resolve)
@@ -2054,7 +2054,7 @@ export const constantRoutes = [
     path: '/yinnong/paymentAccountDetail',
     name: 'paymentAccountDetail',
     meta: {
-      title: '付款账户详情',
+      title: '查看付款账户详情',
       hidden: true,
     },
     component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentAccount/paymentAccountDetail'], resolve)
@@ -2374,6 +2374,7 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/homesteadSurvey/settle'], resolve)
   },
+
 ];
 
 

src/views/onlineHome/workbench.vue

@@ -19,20 +19,20 @@
             />
           </van-popup>
         </template>
-        <template #right>
-<!--          <van-icon name="wap-nav" color="#000" size="18"/>-->
-          <p  style="color: #878787;margin-left: 5px" @click="bookVisbile = true">{{bookName}}</p>
-          <van-popup v-model="bookVisbile" round position="bottom">
-            <van-picker
-              title="请选择账套"
-              show-toolbar
-              :columns="bookList"
-              @confirm="onConfirmBook"
-              @cancel="onCancelBook"
-              value-key="bookName"
-            />
-          </van-popup>
-        </template>
+<!--        <template #right>-->
+<!--&lt;!&ndash;          <van-icon name="wap-nav" color="#000" size="18"/>&ndash;&gt;-->
+<!--          <p  style="color: #878787;margin-left: 5px" @click="bookVisbile = true">{{bookName}}</p>-->
+<!--          <van-popup v-model="bookVisbile" round position="bottom">-->
+<!--            <van-picker-->
+<!--              title="请选择账套"-->
+<!--              show-toolbar-->
+<!--              :columns="bookList"-->
+<!--              @confirm="onConfirmBook"-->
+<!--              @cancel="onCancelBook"-->
+<!--              value-key="bookName"-->
+<!--            />-->
+<!--          </van-popup>-->
+<!--        </template>-->
       </van-nav-bar>
       </van-sticky>
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white" style="width: 96%;margin: 2%;height:120px;border-radius: 6px;">
@@ -53,7 +53,6 @@
           </template>
         </van-cell>
       </van-row>
-      <!--
       <van-row  class="indexCard">
         <van-cell style="border-radius: 6px;">
           <template #title>
@@ -346,82 +345,80 @@
           </van-grid-item>
         </van-grid>
       </van-row>
-      -->
 
-      <van-row  class="indexCard">
-        <van-cell style="border-radius: 6px;">
-          <template #title>
-            <p style="font-weight: bold;font-size: 18px;display: inline-block">银农支付</p>
-          </template>
-        </van-cell>
-        <van-grid :border="false">
-          <van-grid-item text="村户转账" :to="{name:'approvalList'}" >
-            <div class="icon" slot="default" style="background:#FF4646;" >
-              <img src="../../../static/images/onlineHome/icon_Y1.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">村户转账</p>
-          </van-grid-item>
-          <van-grid-item text="代管转账" :to="{name:'approvalList4'}" >
-            <div class="icon" slot="default" style="background:#c568f5;" >
-              <img src="../../../static/images/onlineHome/icon_Y4.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">代管转账</p>
-          </van-grid-item>
-          <van-grid-item text="公务卡转账" :to="{name:'approvalList2'}" >
-            <div class="icon" slot="default" style="background:#3ac2db;" >
-              <img src="../../../static/images/onlineHome/icon_Y2.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">公务卡转账</p>
-          </van-grid-item>
-          <!--
-          <van-grid-item text="虚拟挂账" :to="{name:'approvalList3'}" >
-            <div class="icon" slot="default" style="background:#FFA63E;" >
-              <img src="../../../static/images/onlineHome/icon_Y3.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">虚拟挂账</p>
-          </van-grid-item>
+<!--      <van-row  class="indexCard">-->
+<!--        <van-cell style="border-radius: 6px;">-->
+<!--          <template #title>-->
+<!--            <p style="font-weight: bold;font-size: 18px;display: inline-block">银农支付</p>-->
+<!--          </template>-->
+<!--        </van-cell>-->
+<!--        <van-grid :border="false">-->
+<!--          <van-grid-item text="村户转账" :to="{name:'approvalList'}" >-->
+<!--            <div class="icon" slot="default" style="background:#FF4646;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y1.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">村户转账</p>-->
+<!--          </van-grid-item>-->
+<!--          <van-grid-item text="代管转账" :to="{name:'approvalList4'}" >-->
+<!--            <div class="icon" slot="default" style="background:#c568f5;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y4.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">代管转账</p>-->
+<!--          </van-grid-item>-->
+<!--          <van-grid-item text="公务卡转账" :to="{name:'approvalList2'}" >-->
+<!--            <div class="icon" slot="default" style="background:#3ac2db;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y2.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">公务卡转账</p>-->
+<!--          </van-grid-item>-->
+<!--          &lt;!&ndash;-->
+<!--          <van-grid-item text="虚拟挂账" :to="{name:'approvalList3'}" >-->
+<!--            <div class="icon" slot="default" style="background:#FFA63E;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y3.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">虚拟挂账</p>-->
+<!--          </van-grid-item>-->
 
-          <van-grid-item text="母子转账" :to="{name:'approvalList5'}" >
-            <div class="icon" slot="default" style="background:#1D6FE9;" >
-              <img src="../../../static/images/onlineHome/icon_Y5.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">母子转账</p>
-          </van-grid-item>
-          -->
-          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >
-            <div class="icon" slot="default" style="background:#FF6464;" >
-              <img src="../../../static/images/onlineHome/icon_Y6.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">现金提现</p>
-          </van-grid-item>
-          <van-grid-item text="现金使用" :to="{name:'approvalList11'}" >
-            <div class="icon" slot="default" style="background:#7790FE;" >
-              <img src="../../../static/images/onlineHome/icon_Y7.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">现金使用</p>
-          </van-grid-item>
-          <van-grid-item text="汇票支出" :to="{name:'approvalList12'}" >
-            <div class="icon" slot="default" style="background:#539ffd;" >
-              <img src="../../../static/images/onlineHome/icon_Y8.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">汇票支出</p>
-          </van-grid-item>
-          <van-grid-item text="收款账户" :to="{name:'collectionList'}" >
-            <div class="icon" slot="default" style="background:#7dda4f;" >
-              <img src="../../../static/images/onlineHome/icon_Y9.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">收款账户</p>
-          </van-grid-item>
-          <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >
-            <div class="icon" slot="default" style="background:#FF4646;" >
-              <img src="../../../static/images/onlineHome/icon_Y10.png" alt />
-            </div>
-            <p style="margin-top: 5px;color: #666666;">付款账户</p>
-          </van-grid-item>
-        </van-grid>
-      </van-row>
+<!--          <van-grid-item text="母子转账" :to="{name:'approvalList5'}" >-->
+<!--            <div class="icon" slot="default" style="background:#1D6FE9;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y5.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">母子转账</p>-->
+<!--          </van-grid-item>-->
+<!--          &ndash;&gt;-->
+<!--          <van-grid-item text="现金提现" :to="{name:'approvalList10'}" >-->
+<!--            <div class="icon" slot="default" style="background:#FF6464;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y6.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">现金提现</p>-->
+<!--          </van-grid-item>-->
+<!--          <van-grid-item text="现金使用" :to="{name:'approvalList11'}" >-->
+<!--            <div class="icon" slot="default" style="background:#7790FE;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y7.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">现金使用</p>-->
+<!--          </van-grid-item>-->
+<!--          <van-grid-item text="汇票支出" :to="{name:'approvalList12'}" >-->
+<!--            <div class="icon" slot="default" style="background:#539ffd;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y8.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">汇票支出</p>-->
+<!--          </van-grid-item>-->
+<!--          <van-grid-item text="收款账户" :to="{name:'collectionList'}" >-->
+<!--            <div class="icon" slot="default" style="background:#7dda4f;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y9.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">收款账户</p>-->
+<!--          </van-grid-item>-->
+<!--          <van-grid-item text="付款账户" :to="{name:'paymentAccountList'}" >-->
+<!--            <div class="icon" slot="default" style="background:#FF4646;" >-->
+<!--              <img src="../../../static/images/onlineHome/icon_Y10.png" alt />-->
+<!--            </div>-->
+<!--            <p style="margin-top: 5px;color: #666666;">付款账户</p>-->
+<!--          </van-grid-item>-->
+<!--        </van-grid>-->
+<!--      </van-row>-->
 
-      <!--
       <van-row  class="indexCard">
         <van-cell style="border-radius: 6px;">
           <template #title>
@@ -525,7 +522,6 @@
           </van-grid-item>
         </van-grid>
       </van-row>
-      -->
       <onlineHomeIndex></onlineHomeIndex>
     </div>
 </template>

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

@@ -164,17 +164,7 @@
       };
     },
     created() {
-      let queryParams={
-        pageNum: 1,
-        pageSize: 100,
-      }
-      listProject(queryParams).then(response => {
-        console.log(response)
-        this.projectList = response.rows;
-        for (var i = 0; i < response.rows.length; i++) {
-          this.projectListShow.push({text: response.rows[i].projectName, value: response.rows[i].id});
-        }
-      });
+      console.log(this.$store.state.user);
       this.getDicts("project_fund_type").then((response) => {
         for (var i = 0; i < response.data.length; i++) {
           this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});

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

@@ -155,7 +155,7 @@
     },
     methods: {
       goFlow(){
-        window.location='approvalProcess2?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {

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

@@ -155,7 +155,7 @@
     },
     methods: {
       goFlow(){
-        window.location='approvalProcess2?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {

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

@@ -212,7 +212,7 @@
     },
     methods: {
       goFlow(){
-        window.location='approvalProcess2?id='+this.$route.query.id;
+        window.location='approvalProcess?id='+this.$route.query.id;
       },
       getDictionaries(){
         getCash(this.$route.query.id).then((response) => {

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

@@ -80,40 +80,6 @@
             </van-row>
           </van-col>
         </van-row>
-        <van-row v-show="form.transferType==1||form.transferType=='常用转账'">
-          <van-col span="6" align="right">
-            <p class="icon_jian" v-show="processList.支付状态==1"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="processList.支付状态==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="processList.支付状态==3"><van-icon name="cross" size="14" /></p>
-          </van-col>
-          <van-col span="18">
-            <p v-show="processList.支付状态==1">待支付</p>
-            <p v-show="processList.支付状态==2" class="textBlue">支付成功</p>
-            <p v-show="processList.支付状态==3" class="textRed">支付异常</p>
-            <van-row>
-              <van-col span="24" style="padding: 0;">
-                <p v-show="processList.支付状态==2||processList.支付状态==3">支付时间：{{processList.支付时间}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
-        </van-row>
-        <van-row v-show="form.transferType==1||form.transferType=='常用转账'">
-          <van-col span="6" align="right">
-            <p class="icon_jian" v-show="processList.入账状态==1"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="processList.入账状态==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="processList.入账状态==3"><van-icon name="cross" size="14" /></p>
-          </van-col>
-          <van-col span="18">
-            <p v-show="processList.入账状态==1">未入账</p>
-            <p v-show="processList.入账状态==2" class="textBlue">入账成功</p>
-            <p v-show="processList.入账状态==3" class="textRed">入账异常</p>
-            <van-row>
-              <van-col span="24" style="padding: 0;">
-                <p v-show="processList.入账状态==2||processList.入账状态==3">入账时间：{{processList.入账时间}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
-        </van-row>
       </div>
     </div>
 </template>
@@ -151,6 +117,7 @@ export default {
     handleUpdate(id) {
       getTransfer(id).then((response) => {
         this.form = response.data;
+        console.log(this.form)
         this.processList = {}
         this.getTransferProcess(this.$route.query.id);
         if(this.form.capitalExpenditureType==2){

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

@@ -80,40 +80,6 @@
             </van-row>
           </van-col>
         </van-row>
-        <van-row v-show="form.transferType==1||form.transferType=='常用转账'">
-          <van-col span="6" align="right">
-            <p class="icon_jian" v-show="processList.支付状态==1"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="processList.支付状态==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="processList.支付状态==3"><van-icon name="cross" size="14" /></p>
-          </van-col>
-          <van-col span="18">
-            <p v-show="processList.支付状态==1">待支付</p>
-            <p v-show="processList.支付状态==2" class="textBlue">支付成功</p>
-            <p v-show="processList.支付状态==3" class="textRed">支付异常</p>
-            <van-row>
-              <van-col span="24" style="padding: 0;">
-                <p v-show="processList.支付状态==2||processList.支付状态==3">支付时间：{{processList.支付时间}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
-        </van-row>
-        <van-row v-show="form.transferType==1||form.transferType=='常用转账'">
-          <van-col span="6" align="right">
-            <p class="icon_jian" v-show="processList.入账状态==1"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="processList.入账状态==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="processList.入账状态==3"><van-icon name="cross" size="14" /></p>
-          </van-col>
-          <van-col span="18">
-            <p v-show="processList.入账状态==1">未入账</p>
-            <p v-show="processList.入账状态==2" class="textBlue">入账成功</p>
-            <p v-show="processList.入账状态==3" class="textRed">入账异常</p>
-            <van-row>
-              <van-col span="24" style="padding: 0;">
-                <p v-show="processList.入账状态==2||processList.入账状态==3">入账时间：{{processList.入账时间}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
-        </van-row>
       </div>
     </div>
 </template>
@@ -144,7 +110,7 @@ export default {
   methods: {
     //查询审批进程
     getTransferProcess1(id){
-      getTransferProcess1(id).then(res => {
+      getTransferProcess(id).then(res => {
         this.processList = res.data.processSchedule
         console.log(res.data.processSchedule)
         this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):""