Merge branch 'rongxin_dev' of http://218.59.175.43:3000/zhangzl/nsgk_mobile into rongxin_dev

config/index.js

@@ -12,7 +12,7 @@ module.exports = {
     proxyTable: {
       "/api": {
         // 请求的目标主机
-        // target: 'http://116.255.223.226:8082/nsgk_test/',  // 公网测试环境
+        // target: 'http://218.59.175.44:8082/nsgk_test/',  // 公网测试环境
         // target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境
         target: 'http://localhost:8080/',
         //target: 'http://192.168.0.106:8080/',

src/api/homesteadSurvey/zjdzd.js

@@ -114,3 +114,7 @@ export function surveyInspectByZjddm(zjddm) {
     method: 'get'
   })
 }
+
+export function submitUploadImageList() {
+  // missing???
+}

src/components/common/PagedList.vue

@@ -0,0 +1,176 @@
+<template>
+  <van-pull-refresh v-model="stateRefreshing" @refresh="getList()">
+    <van-list
+      v-model="stateLoading"
+      :finished="stateFinished"
+      finished-text="没有更多了"
+      @load="getList('+1')"
+    >
+      <slot name="default"/>
+    </van-list>
+  </van-pull-refresh>
+</template>
+
+<script>
+// 可刷新, 可下拉的vant列表
+export default {
+  name: 'PagedList',
+  props: {
+    pageNum: { // 页码 读写 无监听
+      type: Number,
+      default: 1,
+    },
+    pageSize: { // 页量 读写 无监听
+      type: Number,
+      default: 10,
+    },
+    total: { // 读取总数 只写
+      type: Number,
+      default: 0,
+    },
+    loading: { // 是否加载中 只写
+      type: Boolean,
+      default: false,
+    },
+    refreshing: { // 是否刷新中 只写
+      type: Boolean,
+      default: false,
+    },
+    finished: { // 是否完全加载 只写
+      type: Boolean,
+      default: false,
+    },
+    getWhenCreated: { // 创建后直接获取列表 只读 无监听
+      type: Boolean,
+      default: false,
+    },
+    getListFunc: { // 获取数据函数 返回Promise 成功参数传递本次请求响应的列表项数和总数 { length|rows|data, total }
+      type: Function,
+      default: null,
+    },
+  },
+  components: {
+  },
+  data() {
+    return {
+      stateLoading: false,
+      stateRefreshing: false,
+      stateFinished: false,
+      stateTotal: 0,
+      queryParams: {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize,
+      },
+    }
+  },
+  created() {
+    if(this.getWhenCreated)
+      this.getList();
+  },
+  methods: {
+    getList(target) {
+      let type = typeof (target);
+      this.log(type, target);
+      if(target && this.stateFinished)
+      {
+        this.log('nomore');
+        this.$emit('nomore');
+        return;
+      }
+      if (target === 0) {
+        this.setupRefreshing(true);
+        this.setupFinished(true);
+        this.setupTotal(0);
+        this.setupPageNum(1);
+        this.clearList();
+      }
+      else if (type === 'number')
+        this.setupPageNum(target);
+      else if (type === 'string') {
+        this.setupPageNum(eval(this.queryParams.pageNum + target));
+      }
+      else
+      {
+        this.setupRefreshing(true);
+        this.setupFinished(true);
+        this.setupTotal(0);
+        this.setupPageNum(1);
+        this.clearList();
+      }
+
+      this.getListFunc(this.queryParams).then((result) => {
+        if(result.hasOwnProperty('rows'))
+        {
+          this.setupTotal(this.stateTotal + result.rows.length);
+          this.setupFinished(this.stateTotal >= result.total);
+        }
+        else if(result.hasOwnProperty('data'))
+        {
+          this.setupTotal(this.stateTotal + result.data.length);
+          this.setupFinished(true);
+        }
+        else if(result.hasOwnProperty('length'))
+        {
+          this.setupTotal(this.stateTotal + result.length);
+          this.setupFinished(true);
+        }
+
+        if(result.hasOwnProperty('total'))
+        {
+          this.setupFinished(this.stateTotal >= result.total);
+        }
+        else
+        {
+          this.setupFinished(true);
+        }
+      }).finally(() => {
+        this.setupLoading(false);
+        this.setupRefreshing(false);
+      });
+    },
+    clearList() {
+      this.log(`reload`);
+      this.$emit('reload');
+    },
+    setupPageNum(num) {
+      this.queryParams.pageNum = num;
+      if(this.queryParams.pageNum != this.pageNum)
+        this.$emit('update:pageNum', this.queryParams.pageNum);
+    },
+    setupTotal(num) {
+      this.log(`total -> ${num}`);
+      this.stateTotal = num;
+      if(this.stateTotal != this.total)
+        this.$emit('update:total', this.stateTotal);
+    },
+    setupLoading(ok) {
+      this.log(`loading -> ${ok}`);
+      this.stateLoading = ok;
+      if(this.stateLoading != this.loading)
+        this.$emit('update:loading', this.stateLoading);
+    },
+    setupFinished(ok) {
+      this.log(`finished -> ${ok}`);
+      this.stateFinished = ok;
+      if(this.stateFinished != this.finished)
+        this.$emit('update:finished', this.stateFinished);
+      if(ok)
+        this.$emit('finished', this.stateTotal);
+    },
+    setupRefreshing(ok) {
+      this.log(`refreshing -> ${ok}`);
+      this.stateRefreshing = ok;
+      if(this.stateRefreshing != this.refreshing)
+        this.$emit('update:refreshing', this.stateRefreshing);
+    },
+    log() {
+      return;
+      console.log('[PagedList]: ', ...arguments);
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

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

@@ -80,27 +80,27 @@
 
      <!-- <p class="main_title">上传附件</p>
      <div class="main_box" style="padding: 5px 0 0 8px;">
-       <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader> 
+       <van-uploader v-model="fileList" :after-read="beforeRead" @delete="deleteFile"></van-uploader>
        </div> -->
       <p style="margin-top:20px;padding: 0 10px">附件{{fileList&&fileList.length==0?':暂无可下载文件':''}}</p>
       <van-cell v-for="(item,index) in fileList" :key="index">
         <a :href="item.url" target="_blank">{{index+1}}.{{item.fileName}}</a>
       </van-cell>
     </van-form>
-    <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
+    <div class="main_box examine_box">
       <van-row type="flex" justify="space-between" align="center">
         <van-col span="5">审批<br/>意见</van-col>
         <van-col span="19">
-          <van-radio-group v-model="pass" direction="horizontal">
+          <van-radio-group v-model="pass" direction="horizontal" :disabled="!isAudit">
             <van-radio name="true">同意</van-radio>
             <van-radio name="false">驳回</van-radio>
           </van-radio-group>
-          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
+          <van-field :readonly="!isAudit" rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
         </van-col>
       </van-row>
     </div>
 
-    <div style="margin: 16px 2%;" v-if="this.$route.query.type != 'done'">
+    <div style="margin: 16px 2%;" v-if="isAudit">
       <van-row>
         <van-col span="24" align="center">
           <van-button type="info" native-type="submit" @click="submitForm" class="submitButton">提交</van-button>
@@ -116,6 +116,7 @@
   import request from '@/utils/request';
   import Dialog from "vant/lib/dialog";
   import Editor from '@/components/Editor';
+  import {A_auditHistoryDetail} from "@/api/audit/aauditpipeline";
   export default {
     name: "approvalApproval13",
     components: {
@@ -229,10 +230,17 @@
       getForm(){
         getMajorevent(this.$route.query.id).then(response => {
           this.form = response.data;
+          if(!this.isAudit)
+          {
+            A_auditHistoryDetail(this.$route.query.taskId).then((resp) => {
+              this.pass = resp.data.auditStatus === '3' ? "true" : 'false';
+              this.comment = resp.data.auditRemark;
+            });
+          }
         });
       },
       goFlow(){
-        window.location='approvalProcess13?id='+this.form.instanceId;
+        window.location='approvalProcess13?id='+this.$route.query.auditbatchNo;
       },
       getChange(){
         updateMajorevent(this.form).then(response => {
@@ -289,14 +297,13 @@
       submitForm() {
         const data = {
           taskId: this.$route.query.taskId,
-          instanceId: this.form.instanceId,
-          variables: JSON.stringify({
-            comment: this.comment,
-            pass: this.pass,
-          }),
+          auditbatchNo: this.$route.query.auditbatchNo,
+          remark: this.comment,
+          pass: this.pass === "true",
+          deptId: this.form.deptId
         };
         approval(data).then((response) => {
-          if(response.code==200 && response.msg=="操作成功"){
+          if(response.code==200){
             this.$toast.success("操作成功");
             setTimeout(function(){
               history.go(-1)
@@ -309,9 +316,15 @@
     },
     watch: {
       pass: function (val) {
-        this.comment = val === "true" ? "同意" : "驳回";
+        if(this.isAudit)
+          this.comment = val === "true" ? "同意" : "驳回";
       },
     },
+    computed: {
+      isAudit() {
+        return this.$route.query.type != 'done';
+      }
+    }
   }
 </script>
 

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

@@ -11,25 +11,25 @@
         </template>
       </van-nav-bar>
       <div class="main_box">
-        <van-row v-if="approvalTemplateDetailList.length>0" v-for="(item1,index,i) in approvalTemplateDetailList" :key="i">
+        <van-row v-if="approvalTemplateDetailList.length>0" v-for="(item1,index) in approvalTemplateDetailList" :key="index">
           <van-col span="4" align="right">
-            <p class="icon_jian blue" ><van-icon name="minus" size="14" /></p>
+            <p :class="{'icon_jian': true, 'red': item1.auditStatus=='2', 'blue': item1.auditStatus=='3', }" ><van-icon :name="getIconClass(item1)" size="14" /></p>
           </van-col>
           <van-col span="20">
             <van-row>
-              <van-col span="9" style="padding: 0;">
-                <p>{{item1.activityName}}</p>
+              <van-col span="9" style="padding: 0;" :class="{ 'textRed': item1.auditStatus=='2', 'textBlue': item1.auditStatus=='3' }">
+                <p>{{item1.actorName}}</p>
               </van-col>
               <van-col span="15" style="padding: 0;">
-                <p style="text-align: right;">{{item1.startTime}}</p>
+                <p style="text-align: right;" :class="{ 'textRed': item1.auditStatus=='2', 'textBlue': item1.auditStatus=='3' }">{{item1.startTime}}</p>
               </van-col>
             </van-row>
-            <van-row>
+            <van-row style="font-size: .36rem">
               <van-col span="9" style="padding: 0;">
-                <p>{{item1.assigneeName}}</p>
+                <p :class="{ 'textRed': item1.auditStatus=='2', 'textBlue': item1.auditStatus=='3' }">{{item1.auditBy}}</p>
               </van-col>
               <van-col span="15" style="padding: 0;">
-                <p style="text-align: right;">{{item1.comment}}</p>
+                <p style="text-align: right;" :class="{ 'textRed': item1.auditStatus=='2', 'textBlue': item1.auditStatus=='3' }">{{item1.auditRemark}}</p>
               </van-col>
             </van-row>
           </van-col>
@@ -39,14 +39,11 @@
 </template>
 
 <script>
-import request from "@/utils/request";
+import {A_auditHistoryList} from "@/api/audit/aauditpipeline";
 export default {
-  name: "approvalProcess",
+  name: "approvalProcess13",
   data() {
     return {
-      processList:{},
-      form:{},
-      approvalTemplateDeptList:[],
       approvalTemplateDetailList:[]
     };
   },
@@ -56,18 +53,13 @@ export default {
   methods: {
     getHistoryList(instanceId) {
       this.loading = true;
-      return request({
-        url: "/activiti/process/listHistory",
-        method: "post",
-        data: { processInstanceId: instanceId },
-      })
-        .then((response) => {
+      A_auditHistoryList(instanceId).then((response) => {
           this.approvalTemplateDetailList = response.rows;
           this.approvalTemplateDetailList.forEach((row) => {
             row.startTime = this.format(row.startTime, "yyyy-MM-dd HH:mm:ss");
-            row.endTime = this.format(row.endTime, "yyyy-MM-dd HH:mm:ss");
-            row.durationInMillis = this.formatTotalDateSub(
-              row.durationInMillis / 1000
+            row.auditTime = this.format(row.auditTime, "yyyy-MM-dd HH:mm:ss");
+            row.duration = this.formatTotalDateSub(
+              row.duration / 1000
             );
           });
           this.total = response.total;
@@ -110,7 +102,19 @@ export default {
             break;
         }
       })
-    }
+    },
+    getIconClass(item) {
+      switch(item.auditStatus)
+      {
+        case '2':
+        default:
+          return 'close';
+        case '3':
+          return 'success';
+        case '1':
+          return 'minus';
+      }
+    },
   },
 }
 </script>
@@ -139,7 +143,7 @@ export default {
     color: #FFF;
   }
   .blue{
-    background-color: #1D6FE9;
+    background-color: #07c160;
   }
   .red{
     background-color: rgb(245, 108, 108);

src/views/yinnong/doneCompleted/completedNew.vue

@@ -8,45 +8,53 @@
         <img :src="image" style="width:100%;height: 150px"/>
       </van-swipe-item>
     </van-swipe>
-    <van-list
-      v-model="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-      @load="getList"
-    >
-    <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
-      <van-cell style="padding: 0 0">
-        <template #title>
-          <van-row style="">
-            <van-col span="23" :offset="1">
 
-              <p style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
-                <van-image
-                  height="20"
-                  width="20"
-                  style="vertical-align: middle;margin-right: 10px"
-                  src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-      <van-cell>
-        <template #title>
-          <van-row>
-            <van-col span="6" :offset="1">
-              <p style="color: #878787" >{{item.createTime.substring(0,10)}}</p>
-            </van-col>
-            <van-col span="10" :offset="1">
-              <p style="color: #878787">{{item.businessType}}</p>
-            </van-col>
-            <van-col span="5" :offset="1">
-              <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
-            </van-col>
-          </van-row>
-        </template>
-      </van-cell>
-    </van-cell-group>
-    </van-list>
+    <paged-list
+      ref="pagedList"
+      :page-num.sync="queryParams.pageNum"
+      :page-size.sync="queryParams.pageSize"
+      :total.sync="total"
+      :getListFunc="getListReq"
+      @reload="taskList = []"
+      get-when-created
+      :finished.sync="finished"
+      :loading.sync="loading">
+
+      <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
+        <van-cell style="padding: 0 0">
+          <template #title>
+            <van-row style="">
+              <van-col span="23" :offset="1">
+
+                <p style="display: inline-block;line-height: 30px;margin-left: 6px;width: 100%;overflow: hidden;">
+                  <van-image
+                    height="20"
+                    width="20"
+                    style="vertical-align: middle;margin-right: 10px"
+                    src="../../../../static/images/onlineHome/done.png"></van-image>{{item.auditName}}</p>
+              </van-col>
+            </van-row>
+          </template>
+        </van-cell>
+        <van-cell>
+          <template #title>
+            <van-row>
+              <van-col span="6" :offset="1">
+                <p style="color: #878787" >{{item.createTime.substring(0,10)}}</p>
+              </van-col>
+              <van-col span="10" :offset="1">
+                <p style="color: #878787">{{item.businessType}}</p>
+              </van-col>
+              <van-col span="5" :offset="1">
+                <p style="font-size: 14px;font-weight:bold;text-align: right;color: #1D6FE9">{{activeName=='1'?'待审批':'已审批'}}</p>
+              </van-col>
+            </van-row>
+          </template>
+        </van-cell>
+      </van-cell-group>
+
+    </paged-list>
+
     <van-empty v-if="taskList.length<1" description="暂无事项" />
     <yinnongIndex></yinnongIndex>
   </div>
@@ -58,9 +66,12 @@
     import { getInfo } from "../../../api/login/index";
     import {A_myTodoList} from "../../../api/audit/aauditpipeline";
     import Cookies from "js-cookie";
+    import {registrationList} from "@/api/sunVillage_info/subcontract";
+    import PagedList from "@/components/common/PagedList.vue";
 
     export default {
       components: {
+        PagedList,
         onlineHomeIndex,
         yinnongIndex
       },
@@ -116,7 +127,40 @@
             this.$router.push({name:"yinnongWorkbench"})
           }
         },
-        getList() {
+        getListReq(pageInfo) {
+          //console.log(pageInfo, this.queryParams.pageNum, this.queryParams.pageSize);
+          return new Promise((resolve, reject) => {
+            A_myTodoList(this.queryParams).then((response) => {
+              //console.info(_this.taskList.length)
+              response.rows.forEach(res => {
+                // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                //   res.tableName = '来自农村宅基地管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }
+                if(this.activityBusinessTypeOptions){
+                  this.activityBusinessTypeOptions.map(t => {
+                    if(t.dictValue === res.businessType){
+                      res.businessType = t.dictLabel
+                      this.taskList.push(res)
+                    }
+                  });
+                }
+              });
+              resolve(response);
+            });
+          });
+        },
+
+        getList(target) {
+          if(this.$refs.pagedList)
+          {
+            this.$refs.pagedList.getList(target);
+            return;
+          }
+
           //this.$set(this.queryParams, "systemType", '4');
           this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
           let _this = this;
@@ -150,11 +194,10 @@
 
             })
           }
-
         },
         goDetail(item){
           let type = item.tableName;
-          //console.info(type)
+          console.info(type)
           switch (type) {
             case 't_homeuse_zyyctc':
               this.$router.push({name:'sunVillageInfoPaidExitDetailNew',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo",electronicSignature:this.electronicSignature,nickName:this.nickName}})
@@ -189,8 +232,10 @@
                 this.$router.push({name:'approvalApproval',query: {id:item.data.id,taskId:item.id,auditbatchNo:item.auditbatchNo,type:"todo"}})
                 break;
               }
+              break;
             case 'yinnong_majorevent':
-              this.$router.push({name:'approvalApproval13',query: {id:item.data.id,taskId:item.id,type:"todo"}})
+            case 't_yinnong_majorevent':
+              this.$router.push({name:'approvalApproval13',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"todo"}})
                 break;
             case 't_yinnong_cashexpense':
               this.$router.push({

src/views/yinnong/doneCompleted/doneNew.vue

@@ -1,4 +1,4 @@
-done.vue<template>
+<template>
   <div>
     <van-nav-bar
       title="已办事项"
@@ -9,12 +9,17 @@ done.vue<template>
       </van-swipe-item>
     </van-swipe>
 
-    <van-list
-      v-model="loading"
-      :finished="finished"
-      finished-text="没有更多了"
-      @load="getList"
-    >
+    <paged-list
+      ref="pagedList"
+      :page-num.sync="queryParams.pageNum"
+      :page-size.sync="queryParams.pageSize"
+      :total.sync="total"
+      :getListFunc="getListReq"
+      @reload="taskList = []"
+      get-when-created
+      :finished.sync="finished"
+      :loading.sync="loading">
+
     <van-cell-group @click="goDetail(item)" v-for="(item,index) in taskList" :key="index" style="width: 96%;margin:2%;border-radius: 6px;overflow: hidden;padding-top: 10px;box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);">
       <van-cell style="padding: 0 0">
         <template #title>
@@ -48,7 +53,7 @@ done.vue<template>
         </template>
       </van-cell>
     </van-cell-group>
-    </van-list>
+    </paged-list>
       <van-empty v-if="taskList.length<1" description="暂无事项" />
     <yinnongIndex></yinnongIndex>
   </div>
@@ -57,10 +62,12 @@ done.vue<template>
 <script>
     import onlineHomeIndex from "../../onlineHomeIndex";
     import yinnongIndex from "../../yinnongIndex";
-    import {A_myDoneList} from "../../../api/audit/aauditpipeline";
+    import {A_myDoneList, A_myTodoList} from "../../../api/audit/aauditpipeline";
+    import PagedList from "@/components/common/PagedList.vue";
 
     export default {
       components: {
+        PagedList,
         onlineHomeIndex,
         yinnongIndex
       },
@@ -106,7 +113,39 @@ done.vue<template>
             this.$router.push({name:"yinnongWorkbench"})
           }
         },
+        getListReq(pageInfo) {
+          //console.log(pageInfo, this.queryParams.pageNum, this.queryParams.pageSize);
+          return new Promise((resolve, reject) => {
+            A_myDoneList(this.queryParams).then((response) => {
+              //console.info(_this.taskList.length)
+              response.rows.forEach(res => {
+                // if(res.tableName?res.tableName.indexOf('t_homeapply')>0:""){
+                //   res.tableName = '来自农村宅基地管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('sys_seal')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }else if(res.tableName?res.tableName.indexOf('yinnong')>0:""){
+                //   res.tableName = '来自银农直联审批管理系统'
+                // }
+                if(this.activityBusinessTypeOptions){
+                  this.activityBusinessTypeOptions.map(t => {
+                    if(t.dictValue === res.businessType){
+                      res.businessType = t.dictLabel
+                      this.taskList.push(res)
+                    }
+                  });
+                }
+              });
+              resolve(response);
+            });
+          });
+        },
         getList() {
+          if(this.$refs.pagedList)
+          {
+            this.$refs.pagedList.getList(target);
+            return;
+          }
+
           //this.$set(this.queryParams, "systemType", '4');
           this.$set(this.queryParams, "deptId", this.$store.state.user.deptId);
           A_myDoneList(this.queryParams).then((response) => {
@@ -176,7 +215,8 @@ done.vue<template>
                 break;
               }
             case 'yinnong_majorevent':
-              this.$router.push({name:'approvalApproval13',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+            case 't_yinnong_majorevent':
+              this.$router.push({name:'approvalApproval13',query: {id:item.data.id,taskId:item.id, auditbatchNo: item.auditbatchNo, type:"done"}})
               break;
             case 't_yinnong_cashexpense':
               this.$router.push({