xiaoy
/
contract-business-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

up

Browse Source
master
刘翔宇-旅管家 3 years ago
parent 283d33ddc6
commit 45c7a785ea
5 changed files with 151 additions and 119 deletions
Show Stats Download Patch File Download Diff File

11
src/views/contract/components/contractSign.vue
Unescape View File

@ -325,6 +325,7 @@
methods: {
//合同签订
sign() {
editorContract({
id: this.contractId,
number: this.form.number,
@ -359,8 +360,11 @@
id: this.contractId
})
this.contract = res;
Object.assign(this.form, res)
this.form.time = [res.start_date, res.end_date];
Object.assign(this.form, res);
if (res.start_date && res.end_date)
this.form.time = [res.start_date, res.end_date];
else
this.form.time = [];
this.form.carryDepartment = res.carry_department;
this.form.guaranteeMoney = res.guarantee_money;
this.form.guaranteeYear = res.guarantee_year;
@ -401,7 +405,8 @@
async getOaContractInfo() {
try {
let res = await getOatoken()
let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
let url =
`${process.env.VUE_APP_OUT_URL}/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${res.oatoken}&get_raw=1`
const oaInfo = await axios.get(url)
this.form.money = Number(oaInfo.data.flow['合同金额（元）'])
this.form.number = oaInfo.data.flow['合同编号']

27
src/views/contract/contractList.vue
Unescape View File

@ -677,7 +677,9 @@
customFn: (row) => {
{
return row.plans.map(item => {
return ( < div > [{item.year}] - {
return ( < div > [{
item.year
}] - {
item.name
} < /div>)
})
@ -828,11 +830,19 @@
label: "名称",
prop: 'name',
align: 'left'
},
},
{
label: "计划金额",
prop: 'money',
align: 'right'
align: 'right',
width: 120,
customFn: (row) => {
let m1 = row.money;
let m2 = row.update_money;
return m2 == 0 ? m1 : m2;
}
}
],
planTable: [{
@ -876,7 +886,13 @@
label: "计划金额",
prop: 'money',
align: 'right',
width: 120
width: 120,
customFn: (row) => {
let m1 = row.money;
let m2 = row.update_money;
return m2 == 0 ? m1 : m2;
}
}
],
@ -965,7 +981,8 @@
row.useMoney = 0
return
}
if (e <= (Number(row.money) - Number(row.use_money_total))) {
let money = Number(row.update_money) == 0 ? Number(row.money) : Number(row.update_money);
if (e <= (money - Number(row.use_money_total))) {
row.useMoney = e
this.plan.forEach(item => {
if (item.value.plan_id == row.id) {

166
src/views/dashboard/index.vue
Unescape View File

@ -65,55 +65,60 @@
<Page :total="total" show-elevator @on-change="pageChange" />
</div>
</div>
<el-row :gutter="20">
<el-col :span="12" :xs="24">
<div ref="lxHeader" v-if="statistic.departmentList">
<LxHeader icon="md-apps" text="科室进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content" />
<slot>
<div style="width: 100%">
<xy-table :height="380" :list="statistic.departmentList" :table-item="departmentTable">
<template v-slot:btns>
<el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
<template slot-scope="scope">
<router-link
:to="`/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`">查看
</router-link>
<div class="demo-split">
<Split v-model="split" style="height: 440px;">
<template #left>
<div class="demo-split-pane" style="padding-right: 5px;">
<div ref="lxHeader" v-if="statistic.departmentList">
<LxHeader icon="md-apps" text="科室进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content" />
<slot>
<div style="width: 100%">
<xy-table :height="380" :list="statistic.departmentList" :table-item="departmentTable">
<template v-slot:btns>
<el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
<template slot-scope="scope">
<router-link
:to="`/statisticalReport/budgetProgress?departmentId=${scope.row.plan_department_id}`">查看
</router-link>
</template>
</el-table-column>
</template>
</el-table-column>
</template>
</xy-table>
</div>
</slot>
</LxHeader>
</div>
</el-col>
<el-col :span="12" :xs="24">
<div ref="lxHeader" v-if="statistic.typeList">
<LxHeader icon="md-apps" text="预算类型进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content" />
<slot>
<div style="width: 100%">
<xy-table :height="380" :list="statistic.typeList" :table-item="typeTable">
<template v-slot:btns>
<el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
<template slot-scope="scope">
<router-link :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`">查看</router-link>
</xy-table>
</div>
</slot>
</LxHeader>
</div>
</div>
</template>
<template #right>
<div class="demo-split-pane" style="padding-left: 10px;">
<div ref="lxHeader" v-if="statistic.typeList">
<LxHeader icon="md-apps" text="预算类型进展情况" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<div slot="content" />
<slot>
<div style="width: 100%">
<xy-table :height="380" :list="statistic.typeList" :table-item="typeTable">
<template v-slot:btns>
<el-table-column :width="80" fixed="right" label="操作" header-align="center" align="center">
<template slot-scope="scope">
<router-link :to="`/statisticalReport/budgetProgress?typeId=${scope.row.type}`">查看
</router-link>
</template>
</el-table-column>
</template>
</el-table-column>
</template>
</xy-table>
</div>
</slot>
</LxHeader>
</div>
</el-col>
</el-row>
</xy-table>
</div>
</slot>
</LxHeader>
</div>
</div>
</template>
</Split>
</div>
<detailContract ref="detailContract"></detailContract>
</div>
</template>
@ -150,6 +155,8 @@
},
data() {
return {
value2: 12,
split: 0.5,
select: {
year: ''
},
@ -178,30 +185,30 @@
label: '科室',
width: 80,
prop: 'plan_department.name',
sortable: false,
fixed:"left"
sortable: false,
fixed: "left"
},
{
label: '进展情况',
sortable: false,
minWidth: 220,
align: 'left',
width: 320,
fixed:"right",
customFn: (row) => {
let m2=row.money_total_2;
let m1=row.money_total_1;
let m3=row.use_money_total;
let per =0 ;
if (m2 != 0) {
per= ((m3 / m2) * 100).toFixed(2);
} else if (m1 != 0) {
per= ((m3 / m1) * 100).toFixed(2);
fixed: "right",
customFn: (row) => {
let m2 = row.money_total_2;
let m1 = row.money_total_1;
let m3 = row.use_money_total;
let per = 0;
if (m2 != 0) {
per = ((m3 / m2) * 100).toFixed(2);
} else if (m1 != 0) {
per = ((m3 / m1) * 100).toFixed(2);
}
return ( < div >
<el-progress percentage = {
Number(per)
} > </el-progress> </div >
} > < /el-progress> </div >
)
}
},
@ -240,30 +247,30 @@
label: '预算类别',
width: 100,
prop: 'type_text',
sortable: false,
fixed:"left",
sortable: false,
fixed: "left",
},
{
label: '进展情况',
sortable: false,
minWidth: 220,
align: 'left',
fixed:"right",
align: 'left',
fixed: "right",
customFn: (row) => {
let m2=row.money_total_2;
let m1=row.money_total_1;
let m3=row.use_money_total;
let per =0 ;
if (m2 != 0) {
per= ((m3 / m2) * 100).toFixed(2);
} else if (m1 != 0) {
per= ((m3 / m1) * 100).toFixed(2);
}
return ( < div >
<el-progress percentage = {
Number(per)
} > </el-progress> </div >
let m2 = row.money_total_2;
let m1 = row.money_total_1;
let m3 = row.use_money_total;
let per = 0;
if (m2 != 0) {
per = ((m3 / m2) * 100).toFixed(2);
} else if (m1 != 0) {
per = ((m3 / m1) * 100).toFixed(2);
}
return ( < div >
<el-progress percentage = {
Number(per)
} > < /el-progress> </div >
)
}
},
@ -472,7 +479,8 @@
}
}
</style>
<style lang="scss" scoped>
<style lang="scss" scoped>
.ivu-btn {
margin-right: 10px;
}

56
src/views/finance/components/examineRegistration.vue
Unescape View File

@ -57,16 +57,16 @@
</div>
</div>
</div>
</template>
<template v-slot:remark>
<div class="xy-table-item">
<div class="xy-table-item-label">备注
</div>
<div class="xy-table-item-content">
{{paymentRegistrationForm.remark}}
</div>
</div>
</template>
<template v-slot:remark>
<div class="xy-table-item">
<div class="xy-table-item-label">备注
</div>
<div class="xy-table-item-content">
{{paymentRegistrationForm.remark}}
</div>
</div>
</template>
<template v-slot:applyMoney>
<div class="xy-table-item">
@ -308,7 +308,13 @@
label: "计划金额",
prop: 'money',
width: 136,
align: 'right'
align: 'right',
customFn: (row) => {
let m1 = row.money;
let m2 = row.update_money;
return m2 == 0 ? m1 : m2;
}
}
],
}
@ -495,18 +501,24 @@
new_money: item.money,
label: item.name
}
});
//说明被删除了
if(sel.filter(plan=>{ return plan.id==row.id}).length==0){
this.delPlan({plan_id:row.id})
});
//说明被删除了
if (sel.filter(plan => {
return plan.id == row.id
}).length == 0) {
this.delPlan({
plan_id: row.id
})
}
let _plan = JSON.parse(JSON.stringify(this.paymentRegistrationForm.plan));
var _select=[];
select.map(item => {
if(_plan.filter(plan=>{ return plan.plan_id==item.plan_id}).length==0){
_select.push(item)
}
let _plan = JSON.parse(JSON.stringify(this.paymentRegistrationForm.plan));
var _select = [];
select.map(item => {
if (_plan.filter(plan => {
return plan.plan_id == item.plan_id
}).length == 0) {
_select.push(item)
}
});
this.paymentRegistrationForm.plan = [..._plan, ..._select]

10
src/views/system/user.vue
Unescape View File

@ -141,22 +141,12 @@
required: true,
message: '请输入姓名',
trigger: 'blur'
},
{
min: 3,
message: '长度至少3位',
trigger: 'blur'
}
],
username: [{
required: true,
message: '请输入用户名',
trigger: 'blur'
},
{
min: 3,
message: '长度至少三位',
trigger: 'blur'
}
],
password: [{

Write Preview
Loading…
Cancel
Save