Merge branch 'master' of https://gitee.com/longyears/contract-business-we

up

.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 = ''
 
 

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;
 

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}`)

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
-        }
       ]
     }
   },