银农app

src/api/onlineHome/bankAgriculture/paymentApproval.js

@@ -313,3 +313,11 @@ export function listInfo(query) {
     params: query
   })
 }
+// 查询审批模板列表
+export function listTemplate(query) {
+  return request({
+    url: '/service/template/list',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -66,6 +66,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
         <van-field
           readonly
           required
@@ -286,7 +307,7 @@
 </template>
 
 <script>
-  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow , attach ,listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow , attach ,listInfo ,getInfoto ,addInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import Dialog from "vant/lib/dialog";
@@ -294,6 +315,7 @@
     name: "approvalAdd",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -329,7 +351,7 @@
 
         chargeItme:[],
         chargeItmeShow:[],
-
+        templateList:[],
         payeeList:[],
         // 查询参数
         queryParams: {
@@ -397,8 +419,24 @@
         })
       });
       this.getDictionaries();
+      this.getTemplateList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       getNowDate(){
         var _this = this;
         let yy = new Date().getFullYear();
@@ -587,6 +625,7 @@
         })
         this.showcontract = false;
       },
+
       onConfirmProject(data){
         this.projectList.map(res => {
           if(res.projectName==data.text){

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

@@ -75,6 +75,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -231,7 +252,8 @@
 </template>
 
 <script>
-  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , cashSubmit , getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto ,
+    cashSubmit , getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     addCash,
@@ -244,6 +266,7 @@
     name: "approvalAdd11",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -319,7 +342,8 @@
         uploadFiles1:[],
         uploadFiles2:[],
         uploadFiles3:[],
-        nowDate:""
+        nowDate:"",
+        templateList:[],
       };
     },
     created() {
@@ -349,8 +373,24 @@
       });
       this.getDictionaries();
       this.addChargeItme();
+      this.getTemplateList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       getNowDate(){
         var _this = this;
         let yy = new Date().getFullYear();

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

@@ -66,6 +66,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -275,7 +296,8 @@
 </template>
 
 <script>
-  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , cashSubmit, getAccount ,getQmyeFlow ,listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto ,
+    cashSubmit, getAccount ,getQmyeFlow ,listInfo ,getInfoto ,addInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     addCash,
@@ -289,6 +311,7 @@
     name: "approvalAdd12",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -367,7 +390,8 @@
         uploadFiles1:[],
         uploadFiles2:[],
         uploadFiles3:[],
-        nowDate:""
+        nowDate:"",
+        templateList:[],
       };
     },
     created() {
@@ -398,8 +422,24 @@
         })
       });
       this.getDictionaries();
+      this.getTemplateList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       getNowDate(){
         var _this = this;
         let yy = new Date().getFullYear();

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

@@ -75,6 +75,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -278,7 +299,9 @@
 </template>
 
 <script>
-  import { addTransfer , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit , getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { addTransfer , listPayee , updateTransfer ,
+    getProjectto , listProject , addProjectto , customSubmit ,
+    getAccount ,getQmyeFlow,listInfo ,getInfoto ,addInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import Dialog from "vant/lib/dialog";
@@ -286,6 +309,7 @@
     name: "approvalAdd2",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -361,7 +385,8 @@
         uploadFiles1:[],
         uploadFiles2:[],
         uploadFiles3:[],
-        nowDate:""
+        nowDate:"",
+        templateList:[],
       };
     },
     created() {
@@ -387,8 +412,24 @@
         })
       });
       this.getDictionaries();
+      this.getTemplateList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       getNowDate(){
         var _this = this;
         let yy = new Date().getFullYear();

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

@@ -26,6 +26,7 @@
           </van-radio-group>
         </template>
       </van-field>
+      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -84,19 +85,11 @@
       <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
       <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" ></van-uploader>
     </div>
-    <p class="main_title">上传附件(发票)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-
-    </div>
-    <p class="main_title">上传附件(其他)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-
-    </div>
   </div>
 </template>
 
 <script>
-  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit,getInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit,getInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     attachmentList,
@@ -165,7 +158,8 @@
           contractionId:null,
           transferId:null
         },
-        projectFundType:''
+        projectFundType:'',
+        templateList:[],
       };
     },
     created() {
@@ -177,8 +171,29 @@
       });
       this.getDictionaries();
       this.getFileList();
+      this.getTemplateList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      tempalteFormat(id){
+        let name = ""
+        this.templateList.map(res => {
+          if(res.id==id){
+            console.log(res.name)
+            name =  res.name
+          }
+        })
+        return name
+      },
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id;
       },

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

@@ -26,6 +26,7 @@
           </van-radio-group>
         </template>
       </van-field>
+      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -80,7 +81,8 @@
 </template>
 
 <script>
-  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit,getInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto ,
+    listProject , addProjectto , customSubmit,getInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     attachmentList,
@@ -150,7 +152,8 @@
           contractionId:null,
           transferId:null
         },
-        projectFundType:''
+        projectFundType:'',
+        templateList:[],
       };
     },
     created() {
@@ -164,6 +167,25 @@
       this.getFileList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      tempalteFormat(id){
+        let name = ""
+        this.templateList.map(res => {
+          if(res.id==id){
+            name =  res.name
+          }
+        })
+        return name
+      },
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id;
       },

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

@@ -25,6 +25,7 @@
           </van-radio-group>
         </template>
       </van-field>
+      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -132,7 +133,8 @@
 </template>
 
 <script>
-  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit, getInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject
+    , addProjectto , customSubmit, getInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     attachmentList,
@@ -204,7 +206,8 @@
         },
         projectFundType:'',
         orderTypeName:'',
-        orderTypeOptions:[]
+        orderTypeOptions:[],
+        templateList:[],
       };
     },
     created() {
@@ -221,6 +224,25 @@
       this.getFileList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      tempalteFormat(id){
+        let name = ""
+        this.templateList.map(res => {
+          if(res.id==id){
+            name =  res.name
+          }
+        })
+        return name
+      },
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id;
       },
@@ -255,13 +277,11 @@
           }
           this.form = response.data;
           this.orderTypeOptions.map(res => {
-            console.log(this.orderTypeOptions)
             if(res.dictValue==this.form.orderType){
               this.orderTypeName = res.dictLabel
             }
           })
         });
-        console.log(this.$route.query.id)
         listCashdetailByCashId(this.$route.query.id).then((response) => {
           this.chargeItme = response.data;
           console.log(response.data)

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

@@ -26,6 +26,7 @@
           </van-radio-group>
         </template>
       </van-field>
+      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -85,7 +86,7 @@
 </template>
 
 <script>
-  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit,getInfoto } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit,getInfoto,listTemplate } from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     attachmentList,
@@ -154,7 +155,8 @@
           contractionId:null,
           transferId:null
         },
-        projectFundType:''
+        projectFundType:'',
+        templateList:[],
       };
     },
     created() {
@@ -166,8 +168,29 @@
       });
       this.getDictionaries();
       this.getFileList();
+      this.getTemplateList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      tempalteFormat(id){
+        let name = ""
+        this.templateList.map(res => {
+          if(res.id==id){
+            console.log(res.name)
+            name =  res.name
+          }
+        })
+        return name
+      },
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id;
       },

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

@@ -75,6 +75,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -284,7 +305,7 @@
 </template>
 
 <script>
-  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow ,listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow ,listInfo ,getInfoto ,addInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {
     attachmentList,
     commonAttach,
@@ -296,6 +317,7 @@
     name: "approvalModify",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -372,6 +394,7 @@
         uploadFiles1:[],
         uploadFiles2:[],
         uploadFiles3:[],
+        templateList:[],
       };
     },
     created() {
@@ -416,8 +439,15 @@
       this.getFileList();
     },
     methods: {
+
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       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});
@@ -431,10 +461,8 @@
               'ynType' : '1'
             }
             getProjectto(param).then(res => {
-              console.log(this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType))
               this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
               this.projectForm = res.data
-              console.log(res.data)
             })
           }else if(response.data.capitalExpenditureType==4){
             this.contractOpen = true
@@ -449,6 +477,20 @@
           }
           this.form = response.data;
           this.getPayeeList();
+          let _this = this
+          let templateQueryParams = {
+            // 分页
+            pageNum: 1,
+            pageSize: 999,
+          };
+          listTemplate(templateQueryParams).then(rrr => {
+            this.templateList = rrr.rows;
+            this.templateList.map(ra => {
+              if(ra.id == response.data.approvalTemplateId){
+                _this.form.approvalTemplateName = ra.name
+              }
+            })
+          });
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
           this.getDicts("bank_type_all").then(res => {

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

@@ -75,6 +75,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -231,7 +252,8 @@
 </template>
 
 <script>
-  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , cashSubmit ,getQmyeFlow,listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto
+    , cashSubmit ,getQmyeFlow,listInfo ,getInfoto ,addInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {
     addCash, addCashdetail,
     attachmentList,
@@ -244,6 +266,7 @@
     name: "approvalModify11",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -320,6 +343,7 @@
         uploadFiles1:[],
         uploadFiles2:[],
         uploadFiles3:[],
+        templateList:[],
       };
     },
     created() {
@@ -349,6 +373,11 @@
       this.getFileList();
     },
     methods: {
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       initProjectInfo(){
         let _this = this
         let queryParams={
@@ -365,7 +394,6 @@
           }
         });
         listInfo(this.queryContractionParams).then(response => {
-          console.log(response)
           _this.infoList = response.rows;
           for (let i = 0; i < response.rows.length; i++) {
             //_this.infoList[i].push({text: response.rows[i].name, value: response.rows[i].code});
@@ -408,6 +436,20 @@
             this.showproject = false
           }
           this.form = response.data;
+          let _this = this
+          let templateQueryParams = {
+            // 分页
+            pageNum: 1,
+            pageSize: 999,
+          };
+          listTemplate(templateQueryParams).then(rrr => {
+            this.templateList = rrr.rows;
+            this.templateList.map(ra => {
+              if(ra.id == response.data.approvalTemplateId){
+                _this.form.approvalTemplateName = ra.name
+              }
+            })
+          });
         });
         listCashdetailByCashId(this.$route.query.id).then((response) => {
           this.chargeItme = response.data;

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

@@ -75,6 +75,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -281,7 +302,8 @@
 </template>
 
 <script>
-  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow,listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto ,
+    listProject , addProjectto , customSubmit ,getQmyeFlow,listInfo ,getInfoto ,addInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request';
   import {
     addCash, addCashdetail,
@@ -294,6 +316,7 @@
     name: "approvalModify12",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -371,7 +394,8 @@
         uploadFiles2:[],
         uploadFiles3:[],
         orderTypeName:'',
-        orderTypeOptions:[]
+        orderTypeOptions:[],
+        templateList:[],
       };
     },
     created() {
@@ -403,6 +427,11 @@
       this.getFileList();
     },
     methods: {
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       initProjectInfo(){
         let _this = this
         let queryParams={
@@ -453,7 +482,6 @@
             let param={
               'transferId' : response.data.id
             }
-            console.log(param)
             getInfoto(param).then(res => {
 
               this.infoForm = res.data
@@ -462,8 +490,21 @@
             this.showproject = false
           }
           this.form = response.data;
+          let _this = this
+          let templateQueryParams = {
+            // 分页
+            pageNum: 1,
+            pageSize: 999,
+          };
+          listTemplate(templateQueryParams).then(rrr => {
+            this.templateList = rrr.rows;
+            this.templateList.map(ra => {
+              if(ra.id == response.data.approvalTemplateId){
+                _this.form.approvalTemplateName = ra.name
+              }
+            })
+          });
           this.orderTypeOptions.map(res => {
-            console.log(this.orderTypeOptions)
             if(res.dictValue==this.form.orderType){
               this.orderTypeName = res.dictLabel
             }

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

@@ -75,6 +75,27 @@
             </van-radio-group>
           </template>
         </van-field>
+        <van-field
+          readonly
+          clickable
+          label="审批流程"
+          placeholder="请选择"
+          v-model="form.approvalTemplateName"
+          @click="showtemplate = true"
+          input-align="right"
+          right-icon="arrow-down"
+          required
+          :rules="[{ required: true , message:'请选择项目流程' }]"
+        />
+        <van-popup v-model="showtemplate" position="bottom">
+          <van-picker
+            show-toolbar
+            value-key="name"
+            :columns="templateList"
+            @confirm="onConfirmTemplate"
+            @cancel="showtemplate = false"
+          />
+        </van-popup>
       </div>
 
       <div class="main_box" style="margin-top: 10px;">
@@ -286,7 +307,7 @@
 </template>
 
 <script>
-  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow , listInfo ,getInfoto ,addInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto , customSubmit ,getQmyeFlow , listInfo ,getInfoto ,addInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {
     attachmentList,
     commonAttach,listVaccount, listVaccount1,
@@ -298,6 +319,7 @@
     name: "approvalModify2",
     data() {
       return {
+        showtemplate:false,
         showcontract:false,
         showcapital:false,
         showpayee:false,
@@ -374,6 +396,7 @@
         uploadFiles1:[],
         uploadFiles2:[],
         uploadFiles3:[],
+        templateList:[],
       };
     },
     created() {
@@ -417,6 +440,11 @@
       this.getFileList();
     },
     methods: {
+      onConfirmTemplate(data){
+        this.form.approvalTemplateName = data.name
+        this.form.approvalTemplateId = data.id
+        this.showtemplate = false;
+      },
       getDictionaries(){
         getTransfer(this.$route.query.id).then((response) => {
           this.getDicts("capital_expenditure_type").then((res) => {
@@ -452,6 +480,20 @@
           }
           this.form = response.data;
           this.getPayeeList();
+          let _this = this
+          let templateQueryParams = {
+            // 分页
+            pageNum: 1,
+            pageSize: 999,
+          };
+          listTemplate(templateQueryParams).then(rrr => {
+            this.templateList = rrr.rows;
+            this.templateList.map(ra => {
+              if(ra.id == response.data.approvalTemplateId){
+                _this.form.approvalTemplateName = ra.name
+              }
+            })
+          });
         });
         queryTransferDetail(this.$route.query.id).then((response) => {
           this.getDicts("bank_type_all").then(res => {

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

@@ -26,58 +26,58 @@
             </van-row>
           </van-col>
         </van-row>
-        <van-row>
+<!--        <van-row>-->
+<!--          <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;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">-->
+<!--                <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>-->
+<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>-->
+<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>-->
+<!--              </van-col>-->
+<!--            </van-row>-->
+<!--            <van-row>-->
+<!--              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">-->
+<!--                <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>-->
+<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>-->
+<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>-->
+<!--              </van-col>-->
+<!--            </van-row>-->
+<!--          </van-col>-->
+<!--        </van-row>-->
+        <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
           <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>
+            <p class="icon_jian" v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="item1[0].deptStatus==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="item1[0].deptStatus==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;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">
-                <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>
-                <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>
-                <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>
-              </van-col>
-            </van-row>
-            <van-row>
-              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">
-                <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>
-                <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>
-                <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
-        </van-row>
-        <van-row v-if="form.approveLevel==2">
-          <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;" v-if="processList.区县审批人!=null&&processList.区县审批人!=''">
-                <p v-show="processList.区县审批==1">审批人：{{processList.区县审批人}}</p>
-                <p v-show="processList.区县审批==2" class="textBlue">审批人：{{processList.区县审批人}}</p>
-                <p v-show="processList.区县审批==3" class="textRed">审批人：{{processList.区县审批人}}</p>
-              </van-col>
-            </van-row>
-            <van-row>
-
-              <van-col span="24" style="padding: 0;" v-if="processList.区县审批时间!=null&&processList.区县审批时间!=''">
-                <p v-show="processList.区县审批==1">审批时间：{{processList.区县审批时间}}</p>
-                <p v-show="processList.区县审批==2" class="textBlue">审批时间：{{processList.区县审批时间}}</p>
-                <p v-show="processList.区县审批==3" class="textRed">审批时间：{{processList.区县审批时间}}</p>
-              </van-col>
-            </van-row>
+            <p v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''">{{item1[0].deptLabel}}</p>
+            <p v-show="item1[0].deptStatus==2" class="textBlue">{{item1[0].deptLabel}}</p>
+            <p v-show="item1[0].deptStatus==3" class="textRed">{{item1[0].deptLabel}}</p>
+            <div v-for="(item2,index) in item1" :key="item1.assigneeName">
+              <van-row>
+                <van-col span="24" style="padding: 0;">
+                  <p v-show="item2.approverStatus == 1">审批人：{{item2.assigneeName}}</p>
+                  <p v-show="item2.approverStatus == 2" class="textBlue">审批人：{{item2.assigneeName}}</p>
+                  <p v-show="item2.approverStatus == 3" class="textRed">审批人：{{item2.assigneeName}}</p>
+                </van-col>
+              </van-row>
+              <van-row>
+                <van-col span="24" style="padding: 0;" >
+                  <p v-show="item2.approverStatus == 1">审批时间：{{item2.time}}</p>
+                  <p v-show="item2.approverStatus == 2" class="textBlue">审批时间：{{item2.time}}</p>
+                  <p v-show="item2.approverStatus == 3" class="textRed">审批时间：{{item2.time}}</p>
+                </van-col>
+              </van-row>
+            </div>
           </van-col>
         </van-row>
       </div>
@@ -117,7 +117,6 @@ 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

@@ -26,58 +26,58 @@
             </van-row>
           </van-col>
         </van-row>
-        <van-row>
+<!--        <van-row>-->
+<!--          <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;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">-->
+<!--                <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>-->
+<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>-->
+<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>-->
+<!--              </van-col>-->
+<!--            </van-row>-->
+<!--            <van-row>-->
+<!--              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">-->
+<!--                <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>-->
+<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>-->
+<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>-->
+<!--              </van-col>-->
+<!--            </van-row>-->
+<!--          </van-col>-->
+<!--        </van-row>-->
+        <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
           <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>
+            <p class="icon_jian" v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="item1[0].deptStatus==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="item1[0].deptStatus==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;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">
-                <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>
-                <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>
-                <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>
-              </van-col>
-            </van-row>
-            <van-row>
-              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">
-                <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>
-                <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>
-                <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
-        </van-row>
-        <van-row v-if="form.approveLevel==2">
-          <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;" v-if="processList.区县审批人!=null&&processList.区县审批人!=''">
-                <p v-show="processList.区县审批==1">审批人：{{processList.区县审批人}}</p>
-                <p v-show="processList.区县审批==2" class="textBlue">审批人：{{processList.区县审批人}}</p>
-                <p v-show="processList.区县审批==3" class="textRed">审批人：{{processList.区县审批人}}</p>
-              </van-col>
-            </van-row>
-            <van-row>
-
-              <van-col span="24" style="padding: 0;" v-if="processList.区县审批时间!=null&&processList.区县审批时间!=''">
-                <p v-show="processList.区县审批==1">审批时间：{{processList.区县审批时间}}</p>
-                <p v-show="processList.区县审批==2" class="textBlue">审批时间：{{processList.区县审批时间}}</p>
-                <p v-show="processList.区县审批==3" class="textRed">审批时间：{{processList.区县审批时间}}</p>
-              </van-col>
-            </van-row>
+            <p v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''">{{item1[0].deptLabel}}</p>
+            <p v-show="item1[0].deptStatus==2" class="textBlue">{{item1[0].deptLabel}}</p>
+            <p v-show="item1[0].deptStatus==3" class="textRed">{{item1[0].deptLabel}}</p>
+            <div v-for="(item2,index) in item1" :key="item1.assigneeName">
+              <van-row>
+                <van-col span="24" style="padding: 0;">
+                  <p v-show="item2.approverStatus == 1">审批人：{{item2.assigneeName}}</p>
+                  <p v-show="item2.approverStatus == 2" class="textBlue">审批人：{{item2.assigneeName}}</p>
+                  <p v-show="item2.approverStatus == 3" class="textRed">审批人：{{item2.assigneeName}}</p>
+                </van-col>
+              </van-row>
+              <van-row>
+                <van-col span="24" style="padding: 0;" >
+                  <p v-show="item2.approverStatus == 1">审批时间：{{item2.time}}</p>
+                  <p v-show="item2.approverStatus == 2" class="textBlue">审批时间：{{item2.time}}</p>
+                  <p v-show="item2.approverStatus == 3" class="textRed">审批时间：{{item2.time}}</p>
+                </van-col>
+              </van-row>
+            </div>
           </van-col>
         </van-row>
       </div>
@@ -112,7 +112,6 @@ export default {
     getTransferProcess1(id){
       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"):""
         this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):""
         this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):""