From e02b7926dbdfd3f816a7cf174bd0e4097c3d1b8d Mon Sep 17 00:00:00 2001
From: "271556543@qq.com" <271556543@qq.com>
Date: Fri, 2 Sep 2022 14:43:15 +0800
Subject: [PATCH] 2022.9.2

---
 .env.development                              |   4 +-
 .../contract/components/detailContract.vue    |  10 +-
 src/views/contract/contractList.vue           |  13 +-
 src/views/contract/seeContract.vue            | 605 +++++++++---------
 .../statisticalReport/budgetProgress.vue      |  18 +-
 5 files changed, 350 insertions(+), 300 deletions(-)

diff --git a/.env.development b/.env.development
index f14882a..56074d9 100644
--- a/.env.development
+++ b/.env.development
@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_DOMIAN=http://192.168.60.99:9003/
-VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
+VUE_APP_DOMIAN=http://192.168.60.99:9003/
+#VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
 VUE_APP_BASE_API = ''
 
 
diff --git a/src/views/contract/components/detailContract.vue b/src/views/contract/components/detailContract.vue
index 23cd7cb..c2683ff 100644
--- a/src/views/contract/components/detailContract.vue
+++ b/src/views/contract/components/detailContract.vue
@@ -66,11 +66,11 @@
         <div class="related-processes">
           <div class="related-processes-title">相关流程</div>
           <div class="related-processes-item">
-            <div @click="seeBuyProcess">采购流程查看</div>
-            <div @click="seeSignProcess">合同会签流程</div>
-            <div @click="seeBidding">招标审批流程</div>
+            <div @click="seeBuyProcess" :style="{'color':detail.purchase_last_flow_id ? 'green' : 'red'}">采购流程查看</div>
+            <div @click="seeSignProcess" :style="{'color':detail.join_last_flow_id ? 'green' : 'red'}">合同会签流程</div>
+            <div @click="seeBidding" :style="{'color':detail.invite_last_flow_id ? 'green' : 'red'}">招标审批流程</div>
             <template v-if="detail.is_plan != 1">
-              <div @click="seeAskProcess">请示流程查看</div>
+              <div @click="seeAskProcess" :style="{'color':detail.req_last_flow_id ? 'green' : 'red'}">请示流程查看</div>
             </template>
           </div>
         </div>
@@ -455,7 +455,7 @@ export default {
       @extend .link-budget-plan-title;
     }
     &-item{
-      color: red;
+      //color: red;
 
       display: flex;
 
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index af1a582..97d329e 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -502,6 +502,15 @@ export default {
 
           }
         },
+        {
+          label:'已申请金额(元)',
+          prop:'apply_money_total',
+          width:180,
+          align:'right',
+          formatter:(cell,data,value)=>{
+            return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+          }
+        },
         {
           label:'已付金额(元)',
           prop:'fund_log_total',
@@ -518,7 +527,7 @@ export default {
             let per = ((((row.fund_log_total)/row.money)||0)*100)?.toFixed(2) || 0
             return (
               <div style={{'color':per > 110 ? 'red' : 'green'}}>
-                {per.padStart(5,'0')}%
+                {per}%
               </div>
             )
           }
@@ -806,8 +815,8 @@ export default {
     showPaymentPlan(row, column, cell){
       if(column.property === 'sign_plan_count'){
         this.$refs['contractPaymentRegistration'].getSignPlan(row.id)
+        row.status === 2 ? this.$refs['contractPaymentRegistration'].isSign = true : this.$refs['contractPaymentRegistration'].isSign = false
         this.$refs['contractPaymentRegistration'].isShow = true
-        row.id === 2 ? this.$refs['contractPaymentRegistration'].isSign = true : this.$refs['contractPaymentRegistration'].isSign = false
       }
       if(column.property === 'fund_log_total'){
         this.$router.push(`/contract/paymentRegistrationList?contractId=${row.id}`)
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 99575e4..c6f3f28 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -1,20 +1,21 @@
 <template>
-  <div style="padding: 0 20px;" ref="contractList">
-    <lx-header icon="md-apps" text="合同列表" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+  <div ref="contractList" style="padding: 0 20px;">
+    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="合同列表">
       <div slot="content"></div>
       <slot>
         <div class="selects">
           <div>
             <span style="padding: 0 6px;word-break: keep-all;">关键字</span>
             <span>
-              <Input v-model="select.keyword" clearable placeholder="关键字搜索"  style="width: 200px"/>
+              <Input v-model="select.keyword" clearable placeholder="关键字搜索" style="width: 200px"/>
             </span>
           </div>
 
           <div>
             <span style="padding: 0 6px;word-break: keep-all;">创建日期</span>
             <span>
-              <DatePicker v-model="select.showDatePicker" clearable placeholder="请选择日期" type="daterange" placement="bottom-start" style="width: 200px" @on-change="datePick"></DatePicker>
+              <DatePicker v-model="select.showDatePicker" clearable placeholder="请选择日期" placement="bottom-start"
+                          style="width: 200px" type="daterange" @on-change="datePick"></DatePicker>
             </span>
           </div>
 
@@ -22,8 +23,8 @@
             <span style="padding: 0 6px;word-break: keep-all;">
             项目类型
             </span>
-            <Select placeholder="请选择项目类型" v-model="select.type" style="width:140px;" clearable>
-              <Option v-for="item in type" :value="item.value" :key="item.value">{{ item.label }}</Option>
+            <Select v-model="select.type" clearable placeholder="请选择项目类型" style="width:140px;">
+              <Option v-for="item in type" :key="item.value" :value="item.value">{{ item.label }}</Option>
             </Select>
           </div>
 
@@ -31,8 +32,8 @@
             <span style="padding: 0 6px;word-break: keep-all;">
             业务科室
           </span>
-            <el-select placeholder="业务科室选择" clearable size="small" v-model="select.department" style="width: 160px;">
-              <el-option v-for="item in departments" :label="item.name" :value="item.id" :key="item.id">
+            <el-select v-model="select.department" clearable placeholder="业务科室选择" size="small" style="width: 160px;">
+              <el-option v-for="item in departments" :key="item.id" :label="item.name" :value="item.id">
               </el-option>
             </el-select>
           </div>
@@ -41,8 +42,8 @@
             <span style="padding: 0 6px;word-break: keep-all;">
             采购形式
           </span>
-            <Select clearable placeholder="请选择采购形式" v-model="select.purchaseModality" style="width:200px;">
-              <Option v-for="item in purchaseType" :value="item.id" :key="item.id">{{ item.value }}</Option>
+            <Select v-model="select.purchaseModality" clearable placeholder="请选择采购形式" style="width:200px;">
+              <Option v-for="item in purchaseType" :key="item.id" :value="item.id">{{ item.value }}</Option>
             </Select>
           </div>
 
@@ -50,8 +51,8 @@
             <span style="padding: 0 6px;word-break: keep-all;">
             采购方式
           </span>
-            <Select clearable placeholder="请选择采购方式" v-model="select.purchaseMethods" style="width:200px;">
-              <Option v-for="item in purchaseWay" :value="item.id" :key="item.id">{{ item.value }}</Option>
+            <Select v-model="select.purchaseMethods" clearable placeholder="请选择采购方式" style="width:200px;">
+              <Option v-for="item in purchaseWay" :key="item.id" :value="item.id">{{ item.value }}</Option>
             </Select>
           </div>
 
@@ -60,41 +61,49 @@
             预算金额
             </span>
             <InputNumber
-              style="width: 100px;"
-              placeholder="最小金额"
+              v-model="select.priceMin"
               :min="0"
-              v-model="select.priceMin"/>
+              placeholder="最小金额"
+              style="width: 100px;"/>
             <span style="padding: 0 5px;">-</span>
             <InputNumber
-              style="width: 100px;"
-              placeholder="最大金额"
+              v-model="select.priceMax"
               :min="0"
-              v-model="select.priceMax"/>
+              placeholder="最大金额"
+              style="width: 100px;"/>
           </div>
 
           <div>
             <span style="padding: 0 6px;word-break: keep-all;">
             状态
           </span>
-            <Select clearable placeholder="请选择合同状态" v-model="select.status" style="width:200px;">
-              <Option v-for="item in [{label:'待签订',value:1},{label:'已签订',value:2}]" :value="item.value" :key="item.value">{{ item.label }}</Option>
+            <Select v-model="select.status" clearable placeholder="请选择合同状态" style="width:200px;">
+              <Option v-for="item in [{label:'待签订',value:1},{label:'已签订',value:2}]" :key="item.value"
+                      :value="item.value">{{ item.label }}
+              </Option>
             </Select>
           </div>
 
-          <Button type="primary"  style="margin-left: 10px" @click="getContracts">查询</Button>
-          <Button type="primary"  style="margin-left: 10px" ghost
-                  @click=" select = {showDatePicker:'',ageIndex:1,startDate:'',endDate:'',type:'',department:'',purchaseModality:'',purchaseMethods:'',priceMin:null,priceMax:null,status:''}">重置</Button>
+          <Button style="margin-left: 10px" type="primary" @click="getContracts">查询</Button>
+          <Button ghost style="margin-left: 10px" type="primary"
+                  @click=" select = {showDatePicker:'',ageIndex:1,startDate:'',endDate:'',type:'',department:'',purchaseModality:'',purchaseMethods:'',priceMin:null,priceMax:null,status:''}">
+            重置
+          </Button>
           <!--          <Button type="primary"  style="margin-left: 10px">导出</Button>-->
         </div>
       </slot>
     </lx-header>
 
-    <xy-table ref="xyTable" :table-item="table" :list="list" @editor="" @delete="(row)=>deleteContract(row.id)" @cellClick="showPaymentPlan" :cell-style="cellStyle" :show-summary="true" :summary-method="summary">
+    <xy-table ref="xyTable" :cell-style="cellStyle" :list="list" :show-summary="true" :summary-method="summary"
+              :table-item="table" @cellClick="showPaymentPlan" @delete="(row)=>deleteContract(row.id)" @editor="">
       <template v-slot:btns>
-        <el-table-column label="操作" fixed="right" width="100" header-align="center" align="center">
+        <el-table-column align="center" fixed="right" header-align="center" label="操作" width="100">
           <template slot-scope="scope">
             <div class="slot-btns">
-              <Button class="slot-btns-item" type="primary" size="small" @click="$refs['detailContract'].getDetail(scope.row.id),$refs['detailContract'].isShowDetail = true">查看</Button>
+              <Button class="slot-btns-item" size="small" type="primary"
+                      @click="$refs['detailContract'].getDetail(scope.row.id),$refs['detailContract'].isShowDetail = true">
+                查看
+              </Button>
             </div>
           </template>
         </el-table-column>
@@ -114,7 +123,7 @@
 </template>
 
 <script>
-import {getContract,addContrant,delContract} from "@/api/contract/contract"
+import {getContract, addContrant, delContract} from "@/api/contract/contract"
 import {getparameter} from "@/api/system/dictionary"
 import {listdeptNoAuth} from "@/api/system/department";
 import {getBudget} from "@/api/budget/budget"
@@ -128,8 +137,9 @@ import paymentRegistration from "./components/paymentRegistration";
 import contractSign from "@/views/contract/components/contractSign";
 import contractPaymentRegistration from "@/views/contract/components/contractPaymentRegistration";
 import {login} from "@/api/user";
+
 export default {
-  components:{
+  components: {
     editor,
     detail,
     paymentRegistration,
@@ -138,66 +148,67 @@ export default {
   },
   data() {
     var planPass = (rule, value, callback) => {
-      if(this.form.isBudget){
-        if(this.form.plan.length === 0){
+      if (this.form.isBudget) {
+        if (this.form.plan.length === 0) {
           return callback(new Error('必选'))
-        }else{
+        } else {
           callback()
         }
-      }else{
+      } else {
         callback()
       }
     }
     return {
-      window:{
-        width:0,
-        height:0,
-        top:0,
-        left:0
+      window: {
+        width: 0,
+        height: 0,
+        top: 0,
+        left: 0
       },
 
       //搜索
-      select:{
-        keyword:'',
-        showDatePicker:'',
-        pageIndex:1,
-        startDate:"",
-        endDate:"",
-        type:"",
-        department:"",
-        purchaseModality:"",
-        purchaseMethods:"",
-        priceMin:null,
-        priceMax:null,
-        status:""
+      select: {
+        keyword: '',
+        showDatePicker: '',
+        pageIndex: 1,
+        startDate: "",
+        endDate: "",
+        type: "",
+        department: "",
+        purchaseModality: "",
+        purchaseMethods: "",
+        priceMin: null,
+        priceMax: null,
+        status: ""
       },
-      type:[{label:'服务',value:1},{label:'货物',value:2},{label:'工程',value:3}],
+      type: [{label: '服务', value: 1}, {label: '货物', value: 2}, {label: '工程', value: 3}],
       purchaseType: [],//购买形式
-      purchaseWay:[],//购买方式
-      moneyWay:[],//资金渠道
-      departments:[],//部门科室
-      list:[],//数据
-      total:0,
+      purchaseWay: [],//购买方式
+      moneyWay: [],//资金渠道
+      departments: [],//部门科室
+      list: [],//数据
+      total: 0,
       //表格
-      table:[
+      table: [
         {
-          label:"项目名称",
+          label: "项目名称",
           width: 150,
-          prop:'name',
-          fixed:'left',
-          align:'left'
+          prop: 'name',
+          fixed: 'left',
+          align: 'left'
         },
         {
-          label:"采购形式",
+          label: "采购形式",
           width: 120,
-          prop:'purchase_type.value'
+          prop: 'purchase_type.value'
         },
         {
-          label:"项目类型",
+          label: "项目类型",
           width: 120,
-          prop:'type',
-          formatter:(cell,data,value)=>{
-            switch (value){
+          prop: 'type',
+          formatter: (cell, data, value) => {
+
+            switch (value) {
               case 1:
                 return "服务"
                 break;
@@ -213,17 +224,17 @@ export default {
           }
         },
         {
-          label:"采购流程",
-          multiHd:[
+          label: "采购流程",
+          multiHd: [
             {
-              label:"请示流程",
+              label: "请示流程",
               width: 140,
-              prop:'req_status',
-              formatter:(cell,data,value)=>{
-                if(cell.is_plan === 1){
+              prop: 'req_status',
+              formatter: (cell, data, value) => {
+                if (cell.is_plan === 1) {
                   return '无'
                 }
-                switch (value){
+                switch (value) {
                   case 1:
                     return "待申请"
                     break;
@@ -240,11 +251,11 @@ export default {
               }
             },
             {
-              label:"采购业务审批流程",
+              label: "采购业务审批流程",
               width: 158,
-              prop:'purchase_status',
-              formatter:(cell,data,value)=>{
-                switch (value){
+              prop: 'purchase_status',
+              formatter: (cell, data, value) => {
+                switch (value) {
                   case 1:
                     return "待申请"
                     break;
@@ -261,11 +272,11 @@ export default {
               }
             },
             {
-              label:"招标审核流程",
+              label: "招标审核流程",
               width: 145,
-              prop:'invite_status',
-              formatter:(cell,data,value)=>{
-                switch (value){
+              prop: 'invite_status',
+              formatter: (cell, data, value) => {
+                switch (value) {
                   case 1:
                     return "待申请"
                     break;
@@ -282,11 +293,11 @@ export default {
               }
             },
             {
-              label:"合同会签流程",
+              label: "合同会签流程",
               width: 145,
-              prop:'join_status',
-              formatter:(cell,data,value)=>{
-                switch (value){
+              prop: 'join_status',
+              formatter: (cell, data, value) => {
+                switch (value) {
                   case 1:
                     return "待申请"
                     break;
@@ -305,14 +316,14 @@ export default {
           ]
         },
         {
-          label:"采购方式",
+          label: "采购方式",
           width: 120,
-          prop:"purchase_way.value"
+          prop: "purchase_way.value"
         },
         {
-          label:"资金来源",
+          label: "资金来源",
           width: 120,
-          customFn:(row)=>{
+          customFn: (row) => {
             {
               return row.money_way_detail.map(item => {
                 return (<div>{item.value}</div>)
@@ -322,38 +333,59 @@ export default {
           }
         },
         {
-          label:'已付金额(元)',
-          prop:'fund_log_total',
-          width:120,
-          align:'right',
-          formatter:(cell,data,value)=>{
-            if(!value){
-              return '0.00'
-            }
-            return value
+          label: '已申请金额(元)',
+          prop: 'apply_money_total',
+          width: 180,
+          align: 'right',
+          formatter: (cell, data, value) => {
+            return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
           }
         },
         {
-          label:"合同预算价(元)",
-          width: 160,
-          prop:"plan_price",
-          align:'right',
-          formatter:(v1,v2,value)=>{
+          label: '已付金额(元)',
+          prop: 'fund_log_total',
+          width: 180,
+          align: 'right',
+          formatter: (cell, data, value) => {
+            return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+          }
+        },
+        {
+          label: '支付占比',
+          width: 180,
+          customFn: (row) => {
+            let per = ((((row.fund_log_total) / row.money) || 0) * 100)?.toFixed(2) || 0
+            return (
+              <div style={{'color': per > 110 ? 'red' : 'green'}}>
+                {per}%
+              </div>
+            )
+          }
+        },
+        {
+          label: "合同预算价(元)",
+          width: 180,
+          prop: "plan_price",
+          align: 'right',
+          formatter: (v1, v2, value) => {
             return value.toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
           }
         },
         {
-          label:'合同签订价（元）',
+          label: '合同签订价（元）',
           width: 180,
-          prop:'money',
-          align:'right'
+          prop: 'money',
+          align: 'right',
+          formatter: (cell, data, value) => {
+            return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
+          }
         },
         {
-          label:"合同状态",
+          label: "合同状态",
           width: 120,
-          prop:"status",
-          formatter:(cell,data,value)=>{
-            switch (value){
+          prop: "status",
+          formatter: (cell, data, value) => {
+            switch (value) {
               case 1:
                 return "待签订"
                 break;
@@ -366,51 +398,51 @@ export default {
           }
         },
         {
-          label:'付款计划',
-          prop:'sign_plan_count',
+          label: '付款计划',
+          prop: 'sign_plan_count',
           width: 120,
-          formatter:(cell,data,value)=>{
-            if(value == 0) return '暂无'
+          formatter: (cell, data, value) => {
+            if (value == 0) return '暂无'
             return value + '期'
           }
         },
         {
-          label:"业务科室",
+          label: "业务科室",
           width: 140,
-          prop:'department.name'
+          prop: 'department.name'
         },
         {
-          label:"经办人",
+          label: "经办人",
           width: 140,
-          prop:'admin.name'
+          prop: 'admin.name'
         },
         {
-          label:"创建日期",
+          label: "创建日期",
           width: 160,
-          prop:'created_at',
-          formatter:(cell,data,value)=>{
-            return parseTime(new Date(value),"{y}-{m}-{d}")
+          prop: 'created_at',
+          formatter: (cell, data, value) => {
+            return parseTime(new Date(value), "{y}-{m}-{d}")
           }
         }
       ],
       //总计
-      tableTotal:{
-        fundLogTotal:0,
-        moneyTotal:0,
-        planPriceTotal:0
+      tableTotal: {
+        fundLogTotal: 0,
+        moneyTotal: 0,
+        planPriceTotal: 0
       },
 
-      planTable:[
+      planTable: [
         {
           width: 36,
           sortable: false,
-          type:'selection'
+          type: 'selection'
         },
         {
-          label:"分类",
-          prop:'type',
-          formatter:(cell,data,value)=>{
-            switch (value){
+          label: "分类",
+          prop: 'type',
+          formatter: (cell, data, value) => {
+            switch (value) {
               case 1:
                 return "部门预算"
                 break;
@@ -429,97 +461,97 @@ export default {
           }
         },
         {
-          label:"名称",
-          prop:'name',
-          align:'left'
+          label: "名称",
+          prop: 'name',
+          align: 'left'
         },
         {
-          label:"计划金额",
-          prop:'money',
-          align:'right'
+          label: "计划金额",
+          prop: 'money',
+          align: 'right'
         }
       ],
 
 
       //新增
-      isShowAdd:false,
-      form:{
-        name:"",
-        type:"",
-        methods:"",
-        modality:"",
-        price:"",
-        fundingChannels:[],
-        isBudget:true,
-        plan:[]
+      isShowAdd: false,
+      form: {
+        name: "",
+        type: "",
+        methods: "",
+        modality: "",
+        price: "",
+        fundingChannels: [],
+        isBudget: true,
+        plan: []
       },
-      rules:{
-        name:[
-          {required:true,message:"必填"}
+      rules: {
+        name: [
+          {required: true, message: "必填"}
         ],
-        type:[
-          {required:true,message:"必选"}
+        type: [
+          {required: true, message: "必选"}
         ],
-        methods:[
-          {required:true,message:"必选"}
+        methods: [
+          {required: true, message: "必选"}
         ],
-        modality:[
-          {required:true,message:"必选"}
+        modality: [
+          {required: true, message: "必选"}
         ],
-        price:[
-          {required:true,message:"必填"},
-          {pattern:/^\d+(\.\d+)?$/, message: '必须为数字'}
+        price: [
+          {required: true, message: "必填"},
+          {pattern: /^\d+(\.\d+)?$/, message: '必须为数字'}
         ],
-        fundingChannels:[
-          {required:true,message:"必填"}
+        fundingChannels: [
+          {required: true, message: "必填"}
         ],
-        plan:[
-          {validator:planPass, trigger: 'change'}
+        plan: [
+          {validator: planPass, trigger: 'change'}
         ]
       },
-      isShowPlan:false,//新增中预算计划
-      plans:[],//预算数据
-      planSearch:'',
-      planTotal:0,
-      plansPageIndex:1,
+      isShowPlan: false,//新增中预算计划
+      plans: [],//预算数据
+      planSearch: '',
+      planTotal: 0,
+      plansPageIndex: 1,
 
-      isShowEditor:false,
+      isShowEditor: false,
     }
   },
   methods: {
     //预算计划金额输入
-    planInput(e,row){
-      if(e <= (Number(row.money) - Number(row.use_money_total))){
+    planInput(e, row) {
+      if (e <= (Number(row.money) - Number(row.use_money_total))) {
         row.useMoney = e
-      }else{
+      } else {
         Message({
-          type:'warning',
-          message:'使用金额大于剩余预算'
+          type: 'warning',
+          message: '使用金额大于剩余预算'
         })
         row.useMoney = 0
       }
     },
     //合计
-    summary(param){
-      this.$nextTick(()=>{
+    summary(param) {
+      this.$nextTick(() => {
         this.$refs['xyTable'].$children[0].doLayout()
       })
-      const { columns, data } = param
+      const {columns, data} = param
       const sums = []
-      columns.map((column,index) => {
-        if(index === 0){
+      columns.map((column, index) => {
+        if (index === 0) {
           sums[index] = '总计'
           return
         }
-        if(column.property === 'fund_log_total'){
+        if (column.property === 'fund_log_total') {
           sums[index] = this.tableTotal.fundLogTotal
           return
         }
-        if(column.property === 'plan_price'){
+        if (column.property === 'plan_price') {
           sums[index] = this.tableTotal.planPriceTotal
           return
         }
-        if(column.property === 'money'){
+        if (column.property === 'money') {
           sums[index] = this.tableTotal.moneyTotal
           return
         }
@@ -536,116 +568,116 @@ export default {
       return sums
     },
 
-    cellStyle({row, column, rowIndex, columnIndex}){
-      if(column.property === 'req_status'){
-        if(row.is_plan === 1){
-          return {'color':'rgb(140,140,140)'}
+    cellStyle({row, column, rowIndex, columnIndex}) {
+      if (column.property === 'req_status') {
+        if (row.is_plan === 1) {
+          return {'color': 'rgb(140,140,140)'}
         }
-        switch (row.req_status){
+        switch (row.req_status) {
           case 1:
-            return {'color':'rgb(96,109,241)'}
+            return {'color': 'rgb(96,109,241)'}
             break;
           case 2:
-            return {'color':'rgb(219,122,122)'}
+            return {'color': 'rgb(219,122,122)'}
             break;
           case 3:
-            return {'color':'rgb(147,201,134)'}
+            return {'color': 'rgb(147,201,134)'}
             break;
           default:
-            return {'color':'rgb(220,185,126)'}
+            return {'color': 'rgb(220,185,126)'}
         }
       }
-      if(column.property === 'purchase_status'){
-        switch (row.purchase_status){
+      if (column.property === 'purchase_status') {
+        switch (row.purchase_status) {
           case 1:
-            return {'color':'rgb(96,109,241)'}
+            return {'color': 'rgb(96,109,241)'}
             break;
           case 2:
-            return {'color':'rgb(219,122,122)'}
+            return {'color': 'rgb(219,122,122)'}
             break;
           case 3:
-            return {'color':'rgb(147,201,134)'}
+            return {'color': 'rgb(147,201,134)'}
             break;
           default:
-            return {'color':'rgb(220,185,126)'}
+            return {'color': 'rgb(220,185,126)'}
         }
       }
-      if(column.property === 'invite_status'){
-        switch (row.invite_status){
+      if (column.property === 'invite_status') {
+        switch (row.invite_status) {
           case 1:
-            return {'color':'rgb(96,109,241)'}
+            return {'color': 'rgb(96,109,241)'}
             break;
           case 2:
-            return {'color':'rgb(219,122,122)'}
+            return {'color': 'rgb(219,122,122)'}
             break;
           case 3:
-            return {'color':'rgb(147,201,134)'}
+            return {'color': 'rgb(147,201,134)'}
             break;
           default:
-            return {'color':'rgb(220,185,126)'}
+            return {'color': 'rgb(220,185,126)'}
         }
       }
-      if(column.property === 'join_status'){
-        switch (row.join_status){
+      if (column.property === 'join_status') {
+        switch (row.join_status) {
           case 1:
-            return {'color':'rgb(96,109,241)'}
+            return {'color': 'rgb(96,109,241)'}
             break;
           case 2:
-            return {'color':'rgb(219,122,122)'}
+            return {'color': 'rgb(219,122,122)'}
             break;
           case 3:
-            return {'color':'rgb(147,201,134)'}
+            return {'color': 'rgb(147,201,134)'}
             break;
           default:
-            return {'color':'rgb(220,185,126)'}
+            return {'color': 'rgb(220,185,126)'}
         }
       }
     },
 
     //点击付款计划查看
-    showPaymentPlan(row, column, cell){
+    showPaymentPlan(row, column, cell) {
       //console.log(column)
-      if(column.property === 'sign_plan_count'){
+      if (column.property === 'sign_plan_count') {
         this.$refs['contractPaymentRegistration'].getSignPlan(row.id)
         this.$refs['contractPaymentRegistration'].isShow = true
       }
-      if(column.property === 'fund_log_total'){
+      if (column.property === 'fund_log_total') {
         this.$router.push(`/contract/paymentRegistrationList?contractId=${row.id}`)
       }
     },
     //招标文件审查
-    async bidding(row){
+    async bidding(row) {
       let baseInfo = {
-        "项目名称":row?.name,
-        "项目预算（万元）":row?.plan_price
+        "项目名称": row?.name,
+        "项目预算（万元）": row?.plan_price
       }
       let res = await getOatoken()
-      let url =`${process.env.VUE_APP_OUT_URL}/admin/flow/create/27?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
-      let bidding = window.open(url,'bidding',`top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
+      let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/27?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
+      let bidding = window.open(url, 'bidding', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
     },
 
     //采购流程
-    async buyProcess(row){
+    async buyProcess(row) {
       let baseInfo = {
-        "项目名称":row?.name,
-        "采购形式":row?.purchase_type?.value,
-        "采购方式":row?.purchase_way?.value,
-        "项目类型":this.type.filter(item => {
+        "项目名称": row?.name,
+        "采购形式": row?.purchase_type?.value,
+        "采购方式": row?.purchase_way?.value,
+        "项目类型": this.type.filter(item => {
           return item.value === row.type
         })[0]?.label,
-        "项目预算（万元）":row?.plan_price,
-        "资金渠道":row?.money_way?.value
+        "项目预算（万元）": row?.plan_price,
+        "资金渠道": row?.money_way?.value
       }
       let res = await getOatoken()
       let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/2?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
       let buyProcess = window.open(url, 'buyProcess', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
     },
     //会签流程
-    async signProcess(row){
+    async signProcess(row) {
       let baseInfo = {
-        "合同名称":row?.name,
-        "执行部门":row?.carry_department,
-        "合同金额（万元）":row?.money,
+        "合同名称": row?.name,
+        "执行部门": row?.carry_department,
+        "合同金额（万元）": row?.money,
         //"承包商\\供应商":row.supply
       }
       let res = await getOatoken()
@@ -653,14 +685,14 @@ export default {
       let signProcess = window.open(url, 'signProcess', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
     },
     //请示流程
-    async askProcess(row){
+    async askProcess(row) {
       let res = await getOatoken()
       let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/17?oatoken=${res.oatoken}&out_contract_id=${row.id}`
       let askProcess = window.open(url, 'askProcess', `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`)
     },
 
     //防抖
-    debounce(fn,delay=500){
+    debounce(fn, delay = 500) {
       let timer = null
       return function _debounce() {
         if (timer) clearTimeout(timer)
@@ -671,58 +703,58 @@ export default {
     },
 
     //翻页
-    pageChange(e){
+    pageChange(e) {
       this.select.pageIndex = e
       this.getContracts()
     },
-    planPageChange(e){
+    planPageChange(e) {
       this.plansPageIndex = e
       this.getBudgets()
     },
     //日期选择
-    datePick(e){
+    datePick(e) {
       this.select.startDate = e[0]
       this.select.endDate = e[1]
     },
 
     //获取预算计划
-    async getBudgets(){
-      let res = await getBudget({name:this.planSearch,page_size:10,page:this.plansPageIndex})
+    async getBudgets() {
+      let res = await getBudget({name: this.planSearch, page_size: 10, page: this.plansPageIndex})
       this.plans = res.list.data
       this.planTotal = res.list.total
     },
     //获取资金渠道
-    async getMoneyWay(){
-      this.moneyWay = (await getparameter({number:'money_way'})).detail
+    async getMoneyWay() {
+      this.moneyWay = (await getparameter({number: 'money_way'})).detail
     },
     //获取购买方式
-    async getPurchaseWay(){
-      this.purchaseWay = (await getparameter({number:'purchase_way'})).detail
+    async getPurchaseWay() {
+      this.purchaseWay = (await getparameter({number: 'purchase_way'})).detail
     },
     //获取科室
-    async getDepartment(){
+    async getDepartment() {
       this.departments = await listdeptNoAuth()
     },
     //获取购买形式列表
-    async getPurchaseType(){
-      this.purchaseType = (await getparameter({number:'purchase_type'})).detail
+    async getPurchaseType() {
+      this.purchaseType = (await getparameter({number: 'purchase_type'})).detail
     },
 
     //获取合同列表
-    async getContracts(){
+    async getContracts() {
       const res = await getContract({
-        keyword:this.select.keyword,
-        page_size:10,
-        page:this.select.pageIndex,
-        start_created_at:this.select.startDate,
-        end_created_at:this.select.endDate,
-        type:this.select.type,
-        department_id:this.select.department,
-        purchase_type_id:this.select.purchaseModality,
-        purchase_way_id:this.select.purchaseMethods,
-        start_plan_price:this.select.priceMin,
-        end_plan_price:this.select.priceMax,
-        status:this.select.status
+        keyword: this.select.keyword,
+        page_size: 10,
+        page: this.select.pageIndex,
+        start_created_at: this.select.startDate,
+        end_created_at: this.select.endDate,
+        type: this.select.type,
+        department_id: this.select.department,
+        purchase_type_id: this.select.purchaseModality,
+        purchase_way_id: this.select.purchaseMethods,
+        start_plan_price: this.select.priceMin,
+        end_plan_price: this.select.priceMax,
+        status: this.select.status
       })
       this.list = res.list.data
       this.total = res.list.total
@@ -734,7 +766,7 @@ export default {
 
     //新建合同
     //显示
-    async showPlan(){
+    async showPlan() {
       this.isShowPlan = true
       await this.getBudgets()
       this.toggleSelection(this.form.plan.map(item => {
@@ -742,20 +774,20 @@ export default {
       }))
     },
     //选择计划
-    selectPlan(sel,row){
-      if(sel){
+    selectPlan(sel, row) {
+      if (sel) {
         //console.log(sel,row)
         this.form.plan = sel.map(item => {
           return {
-            label:item.name,
-            value:{
-              plan_id:item.id,
-              use_money:item.useMoney,
-              new_money:item.money
+            label: item.name,
+            value: {
+              plan_id: item.id,
+              use_money: item.useMoney,
+              new_money: item.money
             }
           }
         })
-      }else{
+      } else {
         this.form.plan = []
       }
     },
@@ -771,10 +803,10 @@ export default {
         this.$refs.planTable.clearSelection()
       }
     },
-    delPlan(val){
-      this.form.plan.map((item,index)=>{
-        if(item.value.plan_id === val.value.plan_id){
-          this.form.plan.splice(index,1)
+    delPlan(val) {
+      this.form.plan.map((item, index) => {
+        if (item.value.plan_id === val.value.plan_id) {
+          this.form.plan.splice(index, 1)
         }
       })
     },
@@ -784,8 +816,8 @@ export default {
 
     this.window.width = screen.availWidth * 0.95
     this.window.height = screen.availHeight * 0.95
-    this.window.top = (window.screen.height - 30 - this.window.height)/2
-    this.window.left = (window.screen.width - 10 - this.window.width)/2
+    this.window.top = (window.screen.height - 30 - this.window.height) / 2
+    this.window.left = (window.screen.width - 10 - this.window.width) / 2
 
     this.getPurchaseType()
     this.getContracts()
@@ -804,20 +836,21 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
-.selects{
+<style lang="scss" scoped>
+.selects {
   display: flex;
   flex-wrap: wrap;
 
-  &>div{
+  & > div {
     margin-bottom: 6px;
   }
 }
-.selectTop{
+
+.selectTop {
   margin-top: 10px;
 }
 
-.contract-add-plan{
+.contract-add-plan {
   min-height: 30px;
   border: 1px solid #dcdee2;
   border-radius: 4px;
@@ -827,7 +860,8 @@ export default {
   align-content: center;
 
   padding: 0 8px;
-  &-no-plan{
+
+  &-no-plan {
     height: 30px;
     line-height: 30px;
     color: #CDD0D5;
@@ -835,28 +869,29 @@ export default {
 }
 
 
-
-.slot-btns{
+.slot-btns {
   display: flex;
   flex-wrap: wrap;
   align-content: center;
   justify-content: flex-start;
 
-  &-item{
+  &-item {
     margin: 0 6px 4px 0;
   }
 }
 
-.xy-table-item-label{
+.xy-table-item-label {
   width: 140px;
 }
-.xy-table-item-price{
+
+.xy-table-item-price {
   position: relative;
-  &::after{
+
+  &::after {
     position: absolute;
     right: 0;
     top: 0;
-    content:'（元）'
+    content: '（元）'
   }
 }
 </style>
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index bebbf9f..3ecd1c1 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -98,6 +98,18 @@ export default {
           align:'left',
           minWidth:300
         },
+        {
+          prop:'money',
+          width: 180,
+          label:'项目金额(元)',
+          align:'right'
+        },
+        {
+          prop:'use_money_total',
+          label:'使用金额',
+          align:'right',
+          width: 180
+        },
         {
           prop:'rate',
           label:'进展率',
@@ -106,12 +118,6 @@ export default {
             return value + '%'
           }
         },
-        {
-          prop:'use_money_total',
-          label:'使用金额',
-          align:'right',
-          width: 180
-        }
       ]
     }
   },