问题修改

src/api/onlineHome/bankAgriculture/paymentApproval.js

@@ -116,3 +116,12 @@ export function getQmyeFlow(id) {
     method: 'post'
   })
 }
+
+// 查询当前账期余额
+export function approval(data) {
+  return request({
+    url: '/activiti/process/complete',
+    method: 'post',
+    params:data
+  })
+}

src/router/index.js

@@ -1014,6 +1014,15 @@ export const constantRoutes = [
     },
     component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd'], resolve)
   },
+  {
+    path: '/approvalApproval',
+    name: 'approvalApproval',
+    meta: {
+      title: '付款审批',
+      hidden: true,
+    },
+    component: (resolve) => require(['@/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval'], resolve)
+  },
   {
     path: '/approvalModify',
     name: 'approvalModify',

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

@@ -10,14 +10,14 @@
         <p style="font-weight: bold;">添加付款申请</p>
       </template>
     </van-nav-bar>
-    <van-form>
+    <van-form @submit="getChange" @failed="getError" :show-error-message="false" scroll-to-error validate-first>
       <p class="main_title">基础信息</p>
       <div class="main_box">
         <van-field
           readonly
           clickable
           required
-          :rules="[{ required: true }]"
+          :rules="[{ required: true , message:'请选择申请时间'  }]"
           v-model="form.applyDate"
           label="申请时间"
           placeholder="请选择申请时间"
@@ -39,7 +39,7 @@
           readonly
           clickable
           required
-          :rules="[{ required: true }]"
+          :rules="[{ required: true , message:'请选择资金支出类别' }]"
           label="资金支出类别"
           placeholder="请选择"
           v-model="capitalExpenditureType"
@@ -78,12 +78,12 @@
           rows="3"
           label-width="auto"
           required
-          :rules="[{ required: true }]"
+          :rules="[{ required: true , message:'请输入付款事由' }]"
         />
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
-        <van-field required :rules="[{ required: true }]" label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
+        <van-field label="说明情况" v-model="form.explainSituation" type="textarea" placeholder="请输入说明情况" input-align="right" rows="3" label-width="auto"/>
       </div>
 
       <p class="main_title" v-if="capitalExpenditureOpen">关联项目</p>
@@ -97,6 +97,8 @@
           @click="showproject = true"
           input-align="right"
           right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目名称' }]"
         />
         <van-popup v-model="showproject" position="bottom">
           <van-picker
@@ -106,8 +108,8 @@
             @cancel="showproject = false"
           />
         </van-popup>
-        <van-field v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
-        <van-field v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入承建单位' }]" v-model="projectForm.projectContractor" label="承建单位" placeholder="请输入承建单位" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入合同价款' }]" v-model="projectForm.projectAmount" label="合同价款（元）" placeholder="请输入合同价款（元）" input-align="right" label-width="auto"/>
         <van-field
           readonly
           clickable
@@ -117,6 +119,8 @@
           @click="showFundType = true"
           input-align="right"
           right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择工程款类型' }]"
         />
         <van-popup v-model="showFundType" position="bottom">
           <van-picker
@@ -126,8 +130,9 @@
             @cancel="showFundType = false"
           />
         </van-popup>
-        <van-field v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
+        <van-field required :rules="[{ required: true , message:'请输入工程发票号' }]" v-model="projectForm.projectBillNum" label="工程发票号" placeholder="请输入工程发票号" input-align="right" label-width="auto"/>
       </div>
+
       <p class="main_title">付款方信息</p>
       <div class="main_box">
         <!--      <van-field label="付款方" v-model="form.payer" placeholder="请输入付款方" input-align="right" label-width="auto"/>-->
@@ -142,7 +147,7 @@
           right-icon="arrow-down"
           label-width="auto"
           required
-          :rules="[{ required: true }]"
+          :rules="[{ required: true , message:'请选择付款方' }]"
         />
         <van-popup v-model="showpayer" position="bottom">
           <van-picker
@@ -152,11 +157,10 @@
             @cancel="showpayer = false"
           />
         </van-popup>
-        <van-field :rules="[{ required: true }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
+        <van-field :rules="[{ required: true , message:'请输入付款方账户' }]" required label="付款方账户" v-model="form.payerAccount" placeholder="请输入账户" input-align="right" label-width="auto"/>
       </div>
 
       <p class="main_title">收款方信息<van-button icon="plus" @click="addChargeItme(chargeItme.length)" size="mini" type="info" native-type="button" class="addFamily"/></p>
-
       <div class="main_box" style="margin-bottom: 15px;">
         <van-cell title="收款账户类型">
           <template #right-icon>
@@ -168,65 +172,67 @@
         </van-cell>
       </div>
       <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
-      <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
-      <div class="main_box" style="margin-bottom: 10px;position:relative;">
-        <van-field
-          readonly
-          clickable
-          label="收款方"
-          placeholder="请选择"
-          v-model="item.payee"
-          @click="item.showPayee = true"
-          input-align="right"
-          right-icon="arrow-down"
-          required
-          :rules="[{ required: true }]"
-        />
-        <van-popup v-model="item.showPayee" position="bottom">
-          <van-picker
-            show-toolbar
-            :columns="payeeList"
-            @confirm="onConfirmPayee($event,index)"
-            @cancel="item.showPayee = false"
+        <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteChargeItme(index)" />
+        <div class="main_box" style="margin-bottom: 10px;position:relative;">
+          <van-field
+            readonly
+            clickable
+            label="收款方"
+            placeholder="请选择"
+            v-model="item.payee"
+            @click="item.showPayee = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择收款方' }]"
           />
-        </van-popup>
-        <van-field required :rules="[{ required: true }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
-        <van-field required :rules="[{ required: true }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
-        <van-field required :rules="[{ required: true }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
-        <van-field
-          readonly
-          clickable
-          label="所属银行"
-          placeholder="请选择"
-          v-model="item.bankTypeText"
-          @click="item.showbankType = true"
-          input-align="right"
-          right-icon="arrow-down"
-          required
-          :rules="[{ required: true }]"
-        />
-        <van-popup v-model="item.showbankType" position="bottom">
-          <van-picker
-            show-toolbar
-            :columns="bankTypeDictionaries"
-            @confirm="onConfirmBankType($event,index)"
-            @cancel="item.showbankType = false"
+          <van-popup v-model="item.showPayee" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="payeeList"
+              @confirm="onConfirmPayee($event,index)"
+              @cancel="item.showPayee = false"
+            />
+          </van-popup>
+          <van-field required :rules="[{ required: true , message:'请输入账户' }]" v-model="item.payeeAccount" label="收款账户" placeholder="请输入账户" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入银行' }]" v-model="item.bankDeposit" label="开户银行" placeholder="请输入银行" input-align="right" label-width="auto"/>
+          <van-field required :rules="[{ required: true , message:'请输入金额' }]" v-model="item.incomeAmount" label="收入金额" placeholder="请输入金额" input-align="right" label-width="auto" @change="moneyChange"/>
+          <van-field
+            readonly
+            clickable
+            label="所属银行"
+            placeholder="请选择"
+            v-model="item.bankTypeText"
+            @click="item.showbankType = true"
+            input-align="right"
+            right-icon="arrow-down"
+            required
+            :rules="[{ required: true , message:'请选择所属银行' }]"
           />
-        </van-popup>
+          <van-popup v-model="item.showbankType" position="bottom">
+            <van-picker
+              show-toolbar
+              :columns="bankTypeDictionaries"
+              @confirm="onConfirmBankType($event,index)"
+              @cancel="item.showbankType = false"
+            />
+          </van-popup>
+        </div>
+      </div>
+      <div style="padding: 16px 0;">
+        <van-row>
+          <van-col span="12" align="center">
+<!--            @click="goUpdate"-->
+            <van-button type="info" native-type="submit" ref="submit" name="aaa" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
+          </van-col>
+          <van-col span="12" align="center">
+<!--            @click="goAdd"-->
+            <van-button type="info" native-type="submit" ref="submit" name="bbb" class="submitButton">保存并提交</van-button>
+          </van-col>
+        </van-row>
+        <div class="clear"></div>
       </div>
-    </div>
     </van-form>
-    <div style="padding: 16px 0;">
-      <van-row>
-        <van-col span="12" align="center">
-          <van-button type="info" native-type="submit" @click="goUpdate" class="submitButton">保<i style="margin-right: 1em;"></i>存</van-button>
-        </van-col>
-        <van-col span="12" align="center">
-          <van-button type="info" native-type="submit" @click="goAdd" class="submitButton">保存并提交</van-button>
-        </van-col>
-      </van-row>
-      <div class="clear"></div>
-    </div>
   </div>
 </template>
 
@@ -359,6 +365,10 @@
           ynType:'1'
         }
       },
+      getChange(){
+        console.log(this.$refs.submit)
+
+      },
       getDictionaries(){
         this.getDicts("capital_expenditure_type").then((res) => {
           for (var i = 0; i < res.data.length; i++) {
@@ -372,6 +382,10 @@
         });
         this.getPayeeList();
       },
+      getError(e){
+        console.log(e)
+        this.$notify({ type: 'danger', message: e.errors[0].message });
+      },
       addChargeItme(index){
         if(this.chargeItme.length>0&&this.chargeItme[this.chargeItme.length-1].payee == ''){
           this.$notify({ type: 'danger', message: '请勿添加多个空列表信息' });
@@ -507,17 +521,23 @@
         this.$set(this.form, "expenditureAmount", total);
       },
       goAdd(){
+        console.log('aaa');
+        return;
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
         if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-          this.$toast.error("付款事由禁止包含|。");
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
           return;
         }
         if(this.form.capitalExpenditureType==2){
           if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-            this.$toast.error('请选择项目名称！');
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
             return;
           }
           if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-            this.$toast.error('请输入工程发票号！');
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
             return;
           }
         }
@@ -525,12 +545,9 @@
         this.$set(this.form, "bankTypeList", this.chargeItme);
         this.$set(this.form, "accountTypeList", this.chargeItme);
         this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
         addTransfer(this.form).then(response => {
-          console.log(response);
           this.projectForm.outId = response.data.id
           this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
           if(this.form.capitalExpenditureType==2){
             addProjectto(this.projectForm).then(res => {
               customSubmit(response.data.id).then(res => {
@@ -551,17 +568,23 @@
         });
       },
       goUpdate(){
+        console.log('aaa');
+        return;
+        if(this.chargeItme.length<1){
+          this.$notify({ type: 'danger', message: '请添加收款方信息' });
+          return;
+        }
         if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-          this.$toast.error("付款事由禁止包含|。");
+          this.$notify({ type: 'danger', message: '付款事由禁止包含！' });
           return;
         }
         if(this.form.capitalExpenditureType==2){
           if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-            this.$toast.error('请选择项目名称！');
+            this.$notify({ type: 'danger', message: '请选择项目名称！' });
             return;
           }
           if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-            this.$toast.error('请输入工程发票号！');
+            this.$notify({ type: 'danger', message: '请输入工程发票号！' });
             return;
           }
         }

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

@@ -0,0 +1,306 @@
+<template>
+  <div class="app-container">
+    <van-nav-bar
+      left-arrow
+      fixed
+      placeholder
+      @click-left="$router.back(-1)"
+    >
+      <template #title>
+        <p style="font-weight: bold;">付款审批</p>
+      </template>
+      <template #right>
+        <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
+      </template>
+    </van-nav-bar>
+    <p class="main_title">基础信息</p>
+    <div class="main_box">
+      <van-field readonly label="申请时间" v-model="form.applyDate" input-align="right" />
+      <van-field readonly label="资金支出类别" v-model="capitalExpenditureType" input-align="right" label-width="auto" />
+      <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="付款事由" v-model="form.remark" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <div class="main_box" style="margin-top: 10px;">
+      <van-field readonly label="说明情况" v-model="form.explainSituation" type="textarea" input-align="right" rows="3" label-width="auto"/>
+    </div>
+
+    <p class="main_title">付款方信息</p>
+    <div class="main_box">
+      <van-field readonly label="付款方" v-model="form.payer" input-align="right" label-width="auto"/>
+      <van-field readonly label="付款方账户" v-model="form.payerAccount" input-align="right" label-width="auto"/>
+    </div>
+
+    <div class="main_box" v-if="capitalExpenditureOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="项目名称" v-model="projectForm.projectName" input-align="right" />
+      <van-field readonly label="承建单位" v-model="projectForm.projectContractor" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="projectForm.projectAmount" input-align="right" label-width="auto"/>
+      <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
+      <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
+    </div>
+
+    <p class="main_title">列表信息</p>
+
+    <div class="main_box" style="margin-bottom: 15px;">
+      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+    </div>
+
+    <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
+      <div class="main_box" style="margin-bottom: 10px;position:relative;">
+        <van-field readonly label="收款方" v-model="item.payee" input-align="right" />
+        <van-field readonly label="收款账户" v-model="item.payeeAccount" input-align="right" label-width="auto"/>
+        <van-field readonly label="开户银行" v-model="item.bankDeposit" input-align="right" label-width="auto"/>
+        <van-field readonly label="收入金额" v-model="item.incomeAmount" input-align="right" label-width="auto"/>
+        <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
+      </div>
+    </div>
+
+    <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 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-col>
+      </van-row>
+    </div>
+
+    <div style="margin: 16px 2%;">
+      <van-row>
+        <van-col span="24" align="center">
+          <van-button type="info" native-type="submit" @click="submitForm" class="submitButton">提交</van-button>
+        </van-col>
+      </van-row>
+      <div class="clear"></div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import { getTransfer , queryTransferDetail , listPayee , getProjectto , listProject , approval } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  export default {
+    name: "approvalModify",
+    data() {
+      return {
+        showcapital:false,
+        showpayee:false,
+        showlasj:false,
+        showbankType:false,
+        showproject:false,
+        showFundType:false,
+
+        minDate: new Date(),
+        maxDate: new Date(2025, 10, 1),
+        currentDate: new Date(),
+        form:{},
+
+        capitalExpenditureType:'',
+        payee:'',
+        bankType:'',
+
+        wfydlxDictionaries:[],
+        jglxDictionaries:[],
+        sysDictionaries:[],
+        capitalExpenditureTypeOptions:[],
+        bankTypeDictionaries:[],
+        projectList:[],
+        projectFundTypeOptions:[],
+        projectFundTypeDictionaries:[],
+        projectListShow:[],
+
+        chargeItme:[],
+        chargeItmeShow:[],
+
+        payeeList:[],
+        // 查询参数
+        queryParams: {
+          transferType:"",
+          orderByColumn: "id",
+          isAsc: "desc",
+        },
+        capitalExpenditureOpen:false,
+        projectForm:{
+          projectId:null,
+          projectName:null,
+          projectContractor:null,
+          projectAmount:null,
+          projectBillNum:null,
+          projectFundType:'1',
+          outId:null,
+          ynType:'1'
+        },
+        projectFundType:'',
+        // 审核意见默认值
+        pass: "true",
+        comment: "同意",
+      };
+    },
+    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});
+        }
+      });
+      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});
+        }
+        this.projectFundTypeDictionaries = response.data;
+      });
+      this.getDictionaries();
+    },
+    methods: {
+      goFlow(){
+        window.location='approvalProcess?id='+this.$route.query.id;
+      },
+      getDictionaries(){
+        getTransfer(this.$route.query.id).then((response) => {
+          this.getDicts("capital_expenditure_type").then((res) => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.capitalExpenditureTypeOptions.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            this.capitalExpenditureType = this.selectDictLabel(res.data, response.data.capitalExpenditureType);
+          });
+          if(response.data.capitalExpenditureType==2){
+            this.capitalExpenditureOpen = true
+            let param={
+              'outId' : response.data.id,
+              'ynType' : '1'
+            }
+            getProjectto(param).then(res => {
+              this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
+              this.projectForm = res.data
+            })
+          }else{
+            this.showproject = false
+          }
+          this.form = response.data;
+        });
+        queryTransferDetail(this.$route.query.id).then((response) => {
+          this.getDicts("bank_type").then(res => {
+            for (var i = 0; i < res.data.length; i++) {
+              this.bankTypeDictionaries.push({text: res.data[i].dictLabel, value: res.data[i].dictValue});
+            }
+            for (var j = 0 ; j < response.rows.length ; j++){
+              response.rows[j].bankTypeText = this.selectDictLabel(res.data, response.rows[j].bankType);
+            }
+            this.chargeItme = response.rows;
+          });
+          this.getPayeeList();
+        });
+      },
+      getPayeeList() {
+        //普通转账
+        this.queryParams.accountType = this.form.accountType
+        this.queryParams.status = "0"
+        listPayee(this.queryParams).then((response) => {
+          for (var i = 0; i < response.rows.length; i++) {
+            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
+          }
+        });
+      },
+      /** 提交按钮 */
+      submitForm() {
+        const data = {
+          taskId: this.$route.query.taskId,
+          instanceId: this.form.instanceId,
+          variables: JSON.stringify({
+            comment: this.comment,
+            pass: this.pass,
+          }),
+        };
+        console.log(data);
+        approval(data).then((response) => {
+          if(response.code==200 && response.msg=="操作成功"){
+            this.$toast.success("操作成功");
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          } else{
+            this.$toast.success("操作失败");
+          }
+        });
+      },
+    },watch: {
+      pass: function (val) {
+        this.comment = val === "true" ? "同意" : "驳回";
+      },
+    },
+  }
+</script>
+
+<style scoped lang="scss">
+  .app-container {
+    padding: 2% 0;
+  }
+  .main_title{
+    font-size: 0.4rem;
+    color: #1D6FE9;
+    margin: 0.2rem 6%;
+    position: relative;
+  }
+  .main_box{
+    width: 96%;
+    margin: 0 auto;
+    border-radius: 6px;
+    box-shadow: 0px 3px 6px 0px rgba(0,0,0,0.16);
+    overflow: hidden;
+    background-color: #FFF;
+  }
+  .submitButton{
+    width: 96%;
+    margin: 0 auto;
+  }
+
+  .addFamily{
+    position: absolute;
+    top: -2px;
+    right: 0;
+    border-radius: 50%;
+  }
+  .deleteFamily{
+    position: absolute;
+    top: 0rem;
+    right: 6%;
+    z-index: 9;
+    border-radius: 50%;
+  }
+  .examine_box{
+    background-color: #1D6FE9!important;
+    padding: 0.18rem!important;
+    padding-left: 0!important;
+    border-radius: 0.15rem!important;
+    margin-top: 0.3rem!important;
+  }
+  .examine_box .van-col:first-child{
+    color: #FFF!important;
+    font-size: 0.45rem!important;
+    text-align: center!important;
+  }
+  .examine_box .van-col:last-child{
+    background-color: #FFF!important;
+    border-radius: 0.15rem!important;
+    overflow: hidden!important;
+    .van-radio-group--horizontal{
+      padding: 0.2rem 0;
+      border-bottom: 1px solid #eee;
+    }
+  }
+  /deep/.van-radio--horizontal{
+    margin-left: 20px;
+    margin-right: 0;
+  }
+</style>

src/views/onlineHome/done.vue

@@ -129,6 +129,9 @@
             case 'accepting':
               this.$router.push({name:'approvalForm',query: {id:item.formData.id}})
               break;
+            case 'yinnong_transfer':
+              this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId}})
+              break;
           }
         }
       },

src/views/onlineHome/homestead/homeApproval/approvalForm.vue

@@ -7,9 +7,6 @@
         placeholder
         @click-left="$router.back(-1)"
       >
-        <template #right>
-          <van-icon name="../../../static/images/icon/icon_flow.png" size="20" @click="goFlow"/>
-        </template>
       </van-nav-bar>
       <van-steps :active="active" active-color="#38f">
         <van-step>申请</van-step>
@@ -244,6 +241,30 @@
             </van-col>
           </van-row>
         </div>
+        <div class="main_box examine_box">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">村级<br/>审核<br/>意见</van-col>
+            <van-col span="19">
+              <van-radio-group v-model="radio" direction="horizontal">
+                <van-radio name="1">同意</van-radio>
+                <van-radio name="2">驳回</van-radio>
+              </van-radio-group>
+              <van-field rows="2" autosize readonly type="textarea" placeholder="同意申请宅基地"/>
+            </van-col>
+          </van-row>
+        </div>
+        <div class="main_box examine_box">
+          <van-row type="flex" justify="space-between" align="center">
+            <van-col span="5">镇级<br/>审核<br/>意见</van-col>
+            <van-col span="19">
+              <van-radio-group v-model="radio" direction="horizontal">
+                <van-radio name="1">同意</van-radio>
+                <van-radio name="2">驳回</van-radio>
+              </van-radio-group>
+              <van-field rows="2" autosize readonly type="textarea" placeholder="同意申请宅基地"/>
+            </van-col>
+          </van-row>
+        </div>
 
         <div class="main_box examine_box">
           <van-row type="flex" justify="space-between" align="center">
@@ -324,7 +345,6 @@
         </div>
       <!--        审核流程结束-->
       </div>
-
     </div>
 </template>
 
@@ -395,25 +415,6 @@
     this.getDetail();
   },
   methods: {
-    goFlow(){
-      window.location='flowChart?id='+this.id;
-    },
-    //更新文件回显
-    afterRead(file) {
-      this.$forceUpdate();
-    },
-    //删除图片
-    deleteFile(elIndex){
-      if(elIndex.id != ''){
-        removeFile(elIndex.id).then(response => {});
-      }
-      this.$forceUpdate();
-      return (file, name) => {
-        let fileIndex = name.index
-        this.fileList[elIndex].splice(fileIndex, 1)
-        this.upLoadList[elIndex].splice(fileIndex, 1)
-      }
-    },
     //获取数据集合
     getDetail(){
       allInformation(this.id).then(response => {
@@ -462,7 +463,6 @@
             this.showHouse = true;
           }
         });
-        console.log(response.data.tHouseApplyProposer.auditStatus != 0)
         this.applicationDetail = response.data;
         this.parameter.houseApplyStatus = response.data.tHouseApplyProposer.houseApplyStatus;
         let currentProcessKey = response.data.currentProcessKey;
@@ -489,7 +489,6 @@
               for (let j = 0 ; j < res2.data.length ; j++){
                 this.fileArray[i].findList[j] = {url: process.env.VUE_APP_BASE_ROUTING_URL + res2.data[j].fileUrl, isImage: true , id:res2.data[j].id} ;
                 this.$forceUpdate();
-                console.log(this.fileArray[i].findList[j])
               }
             });
           }
@@ -500,108 +499,6 @@
         },2000)
       });
     },
-    onConfirmApplyTime(date) {
-      this.applicationDetail.tHouseApplyProposer.applyTime = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
-      this.showApplyTime = false;
-    },
-    //基地开工时间
-    onConfirmStartDate(date) {
-      this.applicationDetail.tHouseApplyStart.startDate = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
-      this.showStartDate = false;
-    },
-    //基地竣工时间
-    onConfirmEndDate(date) {
-      this.applicationDetail.tHouseApplyStart.endDate = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
-      this.showEndDate = false;
-    },
-    //选择建房类型
-    onConfirmBuildingType(data){
-      this.buildingTypeValue = data.text;
-      this.applicationDetail.tHouseApplyProposedSituation.buildingType = data.value;
-      this.showBuildingType = false;
-    },
-    //选择宅基地处置情况
-    onConfirmLandIsposal(data){
-      this.landIsposalValue = data.text;
-      this.applicationDetail.tHouseApplyCurrentSituation.landIsposal = data.value;
-      this.showLandIsposal = false;
-    },
-    //选择房屋构造
-    onConfirmHousingStructure(data){
-      this.housingStructureValue = data.text;
-      this.applicationDetail.tHouseApplyProposedSituation.housingStructure = data.value;
-      this.showHousingStructure = false;
-    },
-    //选择户型
-    onConfirmHouseType(data){
-      this.houseTypeValue = data.text;
-      this.applicationDetail.tHouseApplyProposedSituation.houseTypeId = data.value;
-      this.showHouseType = false;
-    },
-    //选择性别
-    onConfirmSex(data){
-      this.sexValue = data.text;
-      this.applicationDetail.tHouseApplyProposer.sex = data.value;
-      this.showSex = false;
-    },
-    //添加家庭成员
-    addFamily(){
-      this.applicationDetail.tHouseApplyFamilyMembers.push({
-        applyProposerId:this.applicationDetail.tHouseApplyFamilyMembers[0].applyProposerId,
-        memberName:'',
-        age:'',
-        familyStatusName:'',
-        idcard :'',
-        householdRegister:'',
-      });
-    },
-    //删除家庭成员
-    deleteFamily(index){
-      this.applicationDetail.tHouseApplyFamilyMembers.splice(index,1)
-    },
-    //是否有宅基地选项改变
-    existHomesteadChange(name){
-      if (name == 'Y'){
-        if (this.applicationDetail.tHouseApplyCurrentSituation == null){
-          //现宅基地情况
-          this.applicationDetail.tHouseApplyCurrentSituation = {
-            //宅基地面积
-            landArea: '',
-            //人均宅基地面积
-            landPerArea: '',
-            //不动产单元号
-            landCertificateNo: '',
-            //农民房屋幢号
-            houseCertificateNo: '',
-            //建筑面积
-            buildingArea: '',
-            //人均建筑面积
-            buildingPerArea: '',
-            //现宅基地处置情况 字典 land_isposal
-            landIsposal: ""
-          };
-          this.CurrentSituation = true ;
-          //处置情况字典查询
-          this.houseGetDicts("land_isposal").then((res) => {
-            res.data.map(item => {
-              this.landIsposal.push({ value:item.dictValue, text: item.dictLabel});
-            });
-            this.landIsposalValue= this.selectDictLabel(res.data, this.applicationDetail.tHouseApplyCurrentSituation.landIsposal);
-          });
-        }
-        this.CurrentSituation = true;
-      }else{
-        this.CurrentSituation = false;
-      }
-    },
-    //图纸选择改变
-    designPaperChange(name){
-      if(name == 2){
-        this.showHouse = true;
-      }else{
-        this.showHouse = false;
-      }
-    },
     base64toFile(dataurl, filename = "file") {
       let arr = dataurl.split(",");
       let mime = arr[0].match(/:(.*?);/)[1];