oa

src/api/flow/pay.js

@@ -35,3 +35,13 @@ export function getFundLog(params,noloading = false){
     noloading
   })
 }
+
+// 设置最后一笔为 最后一笔支付
+
+export function fundLogEnd(params){
+  return request({
+    method:'get',
+    url:'/api/ht/fund_log/end',
+    params
+  })
+}

src/views/SpecialDays/components/AddSpecialDays.vue

@@ -23,6 +23,7 @@
           <el-select v-model="form.type">
             <el-option value="workday" label="工作日" />
             <el-option value="holiday" label="节假日" />
+            <el-option value="week" label="双休日" />
           </el-select>
         </el-form-item>
         <el-form-item label="说明" prop="reason">

src/views/SpecialDays/index.vue

@@ -31,6 +31,7 @@
             <el-select v-model="row.type">
               <el-option value="workday" label="工作日" />
               <el-option value="holiday" label="节假日" />
+              <el-option value="week" label="双休日" />
             </el-select>
           </template>
         </vxe-column>

src/views/flow/components/payMx.vue

@@ -3,6 +3,102 @@
     <vxe-modal :value="isShow" show-footer :z-index="zIndex" title="支付审批明细" show-zoom show-confirm-button transfer
       resize :width="defaultModalSize.width" :height="defaultModalSize.height" @input="e => $emit('update:isShow',e)">
       <div>
+        <!-- 历史支付记录查看 -->
+        <h3>历史支付记录查看</h3>
+        <vxe-table ref="tables" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
+          :print-config="{}" :export-config="{}" :expand-config="{
+              accordion: true,
+              padding: true,
+            }" :row-config="{ keyField: 'id' }" :custom-config="{ mode: 'popup' }" :data="paymentsList">
+
+          <vxe-column title="项目名称" width="250" align="left" field="contract.name">
+            <template #default="{ row }">
+              {{row.contract_id ? (row.contract?row.contract.name:'') : row.away.title}}
+            </template>
+          </vxe-column>
+          <vxe-column title="付款申请金额(元)" width="180" align="right" field="apply_money">
+            <template #default="{ row }">
+              {{Number(row.apply_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
+            </template>
+          </vxe-column>
+          <vxe-column title="实际支付金额(元)" width="180" align="right" field="act_money">
+            <template #default="{ row }">
+              {{Number(row.act_money).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, "$1,")}}
+            </template>
+          </vxe-column>
+          <vxe-column title="款项类型" width="120" align="center" field="type"></vxe-column>
+          <vxe-column title="预算计划" width="330" align="left" field="act_plan_link">
+            <template #default="{ row }">
+              <template v-if="row.act_plan_link && row.act_plan_link.length > 0">
+                <div v-for="item in row.act_plan_link">
+                  [{{item.plan?item.plan.year:''}}] {{(item.plan && item.plan.pid_info) ? item.plan.pid_info.name: ''}}
+                  - {{item.plan?item.plan.name:''}}
+                  <br />
+                  [使用金额] {{item.use_money}}元
+                </div>
+              </template>
+            </template>
+          </vxe-column>
+          <vxe-column title="审核状态" width="120" align="center" field="status">
+            <template #default="{ row }">
+              <div v-if="row.status===0">待审核</div>
+              <div v-else>已审核</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="流程状态" width="120" align="center" field="fund_log_flow_links">
+            <template #default="{ row }">
+              <template v-for="item in row.fund_log_flow_links">
+                <div v-if="item.tag === 'pay'">
+                  {{flowStatus[item.flow_status]}}
+                </div>
+              </template>
+            </template>
+          </vxe-column>
+          <vxe-column title="次数" width="80" align="center" field="pay_count">
+            <template #default="{ row }">
+              {{row.contract_id ? row.pay_count : row.pay_count_away}}
+            </template>
+          </vxe-column>
+          <vxe-column title="是否为最后一笔" width="120" align="center" field="is_end">
+            <template #default="{ row }">
+              <div v-if="row.is_end===1">是</div>
+              <div v-else>否</div>
+            </template>
+          </vxe-column>
+          <vxe-column title="经办人" width="120" align="center" field="admin.name">
+            <template #default="{ row }">
+              {{row.admin?row.admin.name:''}}
+            </template>
+          </vxe-column>
+          <vxe-column title="业务科室" width="160" align="center" field="department.name">
+            <template #default="{ row }">
+              {{row.department?row.department.name:''}}
+            </template>
+          </vxe-column>
+          <vxe-column title="备注" width="460" align="left" field="remark">
+          </vxe-column>
+          <vxe-column title="创建信息" width="180" align="center" field="created_at">
+          </vxe-column>
+          <vxe-column
+            min-width="120"
+            header-align="center"
+            field="operate"
+            title="操作"
+            fixed="right"
+          >
+          <template #default="{ row }">
+            <el-button type="primary" size="small" @click="showDetail(row)"
+            >查看</el-button>
+          </template>
+
+          </vxe-column>
+        </vxe-table>
+        <div style="display: flex;justify-content: center;margin-top:15px">
+          <el-button :disabled="paymentsList.length>0?false:true" type="primary" size="small" @click="payClose">设为已支付完毕 <i class="el-icon-arrow-right"></i> </el-button>
+        </div>
+
+
+        <h3>发起新的支付审批</h3>
         <div style="display: flex;align-items: center;justify-content: space-between;">
           <div style="display: flex;align-items: center;">
             <div class="xy-table-item-label">
@@ -35,7 +131,6 @@
             </div>
           </div>
         </div>
-
         <vxe-table ref="table" stripe style="margin-top: 10px" keep-source :column-config="{ resizable: true }"
           :print-config="{}" :export-config="{}" :expand-config="{
               accordion: true,
@@ -52,7 +147,8 @@
           <vxe-column title="本次报销数量" width="120" align="center" field="payNum">
             <template #default="{ row }">
 
-              <vxe-number-input v-if="parseFloat(row.hasPayNum) < parseFloat(row.num)" v-model="row.payNum" placeholder="数量"></vxe-number-input>
+              <vxe-number-input v-if="parseFloat(row.hasPayNum) < parseFloat(row.num)" v-model="row.payNum"
+                placeholder="数量"></vxe-number-input>
               <div v-else>-</div>
             </template>
           </vxe-column>
@@ -69,19 +165,18 @@
         </div>
       </template>
     </vxe-modal>
-    <!-- <Modal
-      :width="86"
-      class-name="oa-modal"
-      title="流程办理"
+    <vxe-modal
       fullscreen
-      :mask-closable="false"
+      :remember="true"
+      class-name="oa-modal"
+      title="流程查看"
       v-model="isShowOaModal"
-      footer-hide
+      :z-index="zIndex+100"
     >
       <div style="width: 100%;height: 100%;">
         <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0"></iframe>
       </div>
-    </Modal> -->
+    </vxe-modal>
   </div>
 </template>
 
@@ -93,7 +188,8 @@
   import {
     getItems,
     detailContract,
-    getFundLog
+    getFundLog,
+    fundLogEnd
   } from '@/api/flow/pay'
   import {
     PopupManager
@@ -101,7 +197,7 @@
   import {
     defaultModalSize
   } from "@/settings";
-
+import {getToken} from "@/utils/auth";
   export default {
     props: {
       isShow: {
@@ -118,14 +214,20 @@
         list: [],
         table_item: [],
         flowDetail: {},
-        fundlogForm:{
-          applyMoney:0,
-          type:'',
-          isLast:false,
+        fundlogForm: {
+          applyMoney: 0,
+          type: '',
+          isLast: false,
         },
         paymentType: ["进度款", "结算款", "质保金"],
-        oaUrl:'',
-        isShowOaModal:false,
+        oaUrl: '',
+        isShowOaModal: false,
+        paymentsList: [],
+        flowStatus: {
+          '-1': '已退回',
+          '0': '办理中',
+          '1': '已完成'
+        }
       }
     },
     methods: {
@@ -158,6 +260,7 @@
               this.getFieldConfig(field.sub_custom_model_id)
             }
           });
+          this.getFundLogList()
           console.log("this.list", this.list)
           loading.close();
         } catch (err) {
@@ -166,6 +269,18 @@
           loading.close();
         }
       },
+      // 获取历史支付明细
+      async getFundLogList() {
+        let payments =
+          (
+            await getFundLog({
+              contract_id: this.flowDetail.out_contract_id,
+              show_type: 1
+            })
+          )?.data || [];
+        this.paymentsList = payments
+        console.log("paymentsList", this.paymentsList)
+      },
       // 获取采购明细
       async getFieldConfig(id) {
         try {
@@ -191,8 +306,8 @@
           const item = await getItems({
             flow_id: id
           })
-          console.log("item",item)
-          if(item.length>0){
+          console.log("item", item)
+          if (item.length > 0) {
             const itemMap = new Map();
             item.forEach(item => {
               itemMap.set(item.wuzicaigou_item_id, item.total_num);
@@ -208,9 +323,35 @@
           console.error(err)
         }
       },
+      showDetail(row){
+        let url = `/oa/#/flow/detail?module_name=oa&auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
+        let pay = row.fund_log_flow_links.find(i => i.tag === 'pay')
+        //url += `&to=/flow/detail?flow_id=${caigou.id}`
+        url += pay?.flow_id
+        this.oaUrl = url
+        this.isShowOaModal = true
+      },
+      payClose(){
+        this.$confirm('将此采购记录设为“已⽀付完毕”，同时会将最后⼀笔⽀付记录的“是否为最后⼀笔”属性设置为“是”，请确认是否要进⾏此操作', '提示', {
+          confirmButtonText: '确定',
+          callback: action => {
+            if(action==='confirm'){
+              fundLogEnd({
+                contract_id:this.flowDetail.out_contract_id,
+              }).then(res=>{
+                this.$emit('update:isShow', false)
+                this.$emit('refresh')
+              })
+            }
+
+
+            // this.fundlogForm.isLast = true
+          }
+        });
+      },
       async submit() {
         try {
-          if(!this.fundlogForm.applyMoney){
+          if (!this.fundlogForm.applyMoney) {
             this.$message({
               message: '请填写本次申请付款金额',
               duration: 2000,
@@ -218,7 +359,7 @@
             })
             return
           }
-          if(!this.fundlogForm.type){
+          if (!this.fundlogForm.type) {
             this.$message({
               message: '请选择款项类型',
               duration: 2000,
@@ -230,6 +371,7 @@
           console.log("records", records)
           let count = 0
           let totalCount = 0
+          let allCount = 0 // 每一条本次报销数量+已报销数量 = 数量
           if (records.length < 1) {
             this.$message({
               message: '请选择需要报销的明细',
@@ -242,9 +384,12 @@
             if (parseFloat(item.payNum) === 0 || parseFloat(item.payNum) > parseFloat(item.num)) {
               count++
             }
-            if(parseFloat(item.payNum)+parseFloat(item.hasPayNum) > parseFloat(item.num)){
+            if (parseFloat(item.payNum) + parseFloat(item.hasPayNum) > parseFloat(item.num)) {
               totalCount++
             }
+            if (parseFloat(item.payNum) + parseFloat(item.hasPayNum) === parseFloat(item.num)) {
+              allCount++
+            }
           })
           if (count > 0) {
             this.$message({
@@ -262,23 +407,32 @@
             })
             return
           }
+          if (allCount === records.length) {
+            this.$alert('本次报销数量已等于总数量，默认为最后一笔', '提示', {
+              confirmButtonText: '确定',
+              callback: action => {
+                this.fundlogForm.isLast = true
+              }
+            });
+          }
+          // return
           //wuzicaigou_items 报销的物资明细数组
           let wuzicaigou_items = []
           let zhifutitle = ''
-          records.map(item=>{
+          records.map(item => {
             wuzicaigou_items.push({
-              flow_id:this.payId,
-              wuzicaigou_id:item.belongs_id,
-              wuzicaigou_item_id:item.id,
-              name:item.pinminghuofuwuxuqiu,
-              num:item.payNum,
-              total:item.num
+              flow_id: this.payId,
+              wuzicaigou_id: item.belongs_id,
+              wuzicaigou_item_id: item.id,
+              name: item.pinminghuofuwuxuqiu,
+              num: item.payNum,
+              total: item.num
             })
-            zhifutitle+= item.pinminghuofuwuxuqiu+'*'+item.payNum+','
+            zhifutitle += item.pinminghuofuwuxuqiu + '*' + item.payNum + ','
           })
 
           // 跳转到支付审批流程
-          let payments = [];
+          let payments = this.paymentsList;
           const actNumsTotal = () => {
             return payments.reduce((pre, cur) => {
               return pre + (!!Number(cur.act_money) ? Number(cur.act_money) : 0);
@@ -291,45 +445,45 @@
             });
           }
 
-          payments =
-            (
-              await getFundLog({
-                contract_id: this.flowDetail.out_contract_id,
-                show_type: 1
-              })
-            )?.data || [];
-            // 付款登记的字段
-            let zhifutitle2 = zhifutitle.slice(0,-1)
-            zhifutitle += "（"+this.flowDetail.title+'）'
-            let baseInfo = {
-              "oaUrl": contract?.number,
-              "zhifutitle": zhifutitle,
-
-// ?contract?.name
-              "contract_id":contract.id,
-              "type":this.fundlogForm.type,
-              "is_end":this.fundlogForm.isLast ? 1 : 0,
-              "amt": this.fundlogForm.applyMoney,
-              // out_pay_id: row?.id,
-              "xiangxishuoming": zhifutitle,
-              "yifujine": actNumsTotal(),
-              "xiangmuzonge": contract.money,
-              "zhifucishu": contract?.sign_plan?.length,
-              "cishu": payments.length,
+          // payments = this.paymentsList
+          // (
+          //   await getFundLog({
+          //     contract_id: this.flowDetail.out_contract_id,
+          //     show_type: 1
+          //   })
+          // )?.data || [];
+          // 付款登记的字段
+          let zhifutitle2 = zhifutitle.slice(0, -1)
+          zhifutitle += "（" + this.flowDetail.title + '）'
+          let baseInfo = {
+            "oaUrl": contract?.number,
+            "zhifutitle": zhifutitle,
+            // ?contract?.name
+            "contract_id": contract.id,
+            "type": this.fundlogForm.type,
+            "is_end": this.fundlogForm.isLast ? 1 : 0,
+            "amt": this.fundlogForm.applyMoney,
+            // out_pay_id: row?.id,
+            "xiangxishuoming": zhifutitle,
+            "yifujine": actNumsTotal(),
+            "xiangmuzonge": contract.money,
+            "zhifucishu": contract?.sign_plan?.length,
+            "cishu": payments.length,
 
-              "liezhiqudao": contract?.plans.map(i => i.name)?.toString(),
-              "contractno": contract?.number,
-              "guanlianliucheng": contract?.contract_flow_links?.map(i => i.flow_id)?.toString(),
-              "wuzicaigou_items":wuzicaigou_items
-            };
-            console.log(baseInfo,baseInfo)
-            let url = `/flow/create?&module_name=oa&isSinglePage=1&module_id=75&default_json=${window.encodeURIComponent(JSON.stringify(baseInfo))}`;
-            this.$router.push(
-              url
-            );
-            // this.oaUrl = url;
-            // this.isShowOaModal = true;
-            this.$emit('update:isShow',false)
+            "liezhiqudao": contract?.plans.map(i => i.name)?.toString(),
+            "contractno": contract?.number,
+            "guanlianliucheng": contract?.contract_flow_links?.map(i => i.flow_id)?.toString(),
+            "wuzicaigou_items": wuzicaigou_items
+          };
+          console.log(baseInfo, baseInfo)
+          let url =
+            `/flow/create?&module_name=oa&isSinglePage=1&module_id=75&default_json=${window.encodeURIComponent(JSON.stringify(baseInfo))}`;
+          this.$router.push(
+            url
+          );
+          // this.oaUrl = url;
+          // this.isShowOaModal = true;
+          this.$emit('update:isShow', false)
         } catch (err) {
           console.error(err)
         }
@@ -351,11 +505,12 @@
           this.oaUrl = ''
           this.isShowOaModal = false
           this.table_item = []
+          this.paymentsList = []
           this.flowDetail = {}
           this.fundlogForm = {
-            applyMoney:0,
-            type:'',
-            isLast:false,
+            applyMoney: 0,
+            type: '',
+            isLast: false,
           }
           this.$refs.table.clearCheckboxRow()
         }

src/views/flow/list.vue

@@ -491,7 +491,7 @@
                   >删除</el-button
                   >
                   <el-button
-                    v-if="$route.params.type === 'handled' && row.custom_model_id===99 && row.status===1"
+                    v-if="$route.params.type === 'handled' && row.custom_model_id===99 && row.status===1 && row.fund_log_is_end===0"
                     type="primary"
                     size="mini"
                     @click="toOutPay(row)"
@@ -542,7 +542,7 @@
     </el-card>
 
     <share ref="share" :is-show.sync="isShowShare" :flow="pickedFlow"></share>
-    <payMx ref="payMx" :is-show.sync="isShowPay" ></payMx>
+    <payMx ref="payMx" :is-show.sync="isShowPay"  @refresh="getList"></payMx>
     <list-popover :is-show.sync="isShowListPopover" :id="listPopoverId" :pos="listPopoverPos" />
     <multi-deal :is-show.sync="isShowMultiDeal" :deal-flows="multiDealFlows" @refresh="getList" />
     <field-export ref="isShowFieldExport" :is-show.sync="isShowFieldExport" :select="select" />