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

up

Browse Source
master
liuxy 2 years ago
parent 81fcb9c041
commit d0256d8315
5 changed files with 120 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
.env.development
Unescape View File

@ -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 = ''
VUE_APP_UPLOAD=http://hdcontract.ali251.langye.net/api/admin/upload-file
#VUE_APP_UPLOAD=http://192.168.60.99:9003/api/admin/upload-file

18
src/api/contractSign/contractSign.js
Unescape View File

@ -39,3 +39,21 @@ export function editorContractSign(data){
data
})
}
export function httpCurl(params,noloading = true,s= '/Api/flowDetail',method='GET',url) {
return request({
method: 'post',
url: '/api/admin/other/http-curl',
data: {
url: url || process.env.VUE_APP_OUT_OLD,
method,
params: {
s,
...params
}
},
noloading
})
}

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

@ -199,7 +199,8 @@
import {
addContractSign,
getContractSign,
delContractSign
delContractSign,
httpCurl
} from "@/api/contractSign/contractSign";
import {
detailContract,
@ -440,14 +441,30 @@
//获取oa合同信息
async getOaContractInfo() {
try {
let res = await getOatoken()
let resToken = await getOatoken();
let ourl =`/oa/admin/flow/view/${this.contract.join_last_flow_id}?oatoken=${resToken.oatoken}&get_raw=1`
console.log(ourl)
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['合同编号']
this.form.supply = oaInfo.data.flow['承包商\\供应商']
this.form.carryDepartment = oaInfo.data.flow['执行部门']
`${process.env.VUE_APP_OUT_URL}/admin/flow/view/${this.contract.join_last_flow_id}`
//?oatoken=${res.oatoken}&get_raw=1
let paras={oatoken:resToken.oatoken,get_raw:1};
const res = await httpCurl(paras,true,'/Api/flowDetail','GET',url);
console.log(res)
this.form.money = Number(res.flow['合同金额（元）'])
this.form.number = res.flow['合同编号']
this.form.supply = res.flow['承包商\\供应商']
this.form.carryDepartment = res.flow['执行部门']
// let res = await getOatoken()
// let url =
// `/oa/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['合同编号']
// this.form.supply = oaInfo.data.flow['承包商\\供应商']
// this.form.carryDepartment = oaInfo.data.flow['执行部门']
} catch {
}

39
src/views/statisticalReport/components/addGovPlane.vue
Unescape View File

@ -85,6 +85,40 @@
</div>
</div>
</template>
<template v-slot:year >
<div class="xy-table-item">
<div class="xy-table-item-label">年份 ：</div>
<div class="xy-table-item-content">
<el-date-picker
type="year"
v-model="form.year"
placeholder="所属年份"
style="width: 300px"
value-format="yyyy"
></el-date-picker>
</div>
</div>
</template>
<template v-slot:is_face_small>
<div class="xy-table-item">
<div class="xy-table-item-label">
专门面向中小企业采购
</div>
<div class="xy-table-item-content">
<el-switch v-model="form.is_face_small" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
</div>
</div>
</template>
<template v-slot:is_conserve>
<div class="xy-table-item">
<div class="xy-table-item-label">采购节能产品、环境标志产品
</div>
<div class="xy-table-item-content">
<el-switch v-model="form.is_conserve" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
</div>
</div>
</template>
<template v-slot:public_plane_date v-if="role == 0">
<div class="xy-table-item">
<div class="xy-table-item-label">采购意向公开计划时间 ：</div>
@ -343,6 +377,9 @@ export default {
department_id: this.$store.state.user.info?.department_id,
content: "",
plan_money: "",
year:"",
is_face_small:0,
is_conserve:0,
public_plane_date: "",
public_act_date: "",
invite_plane_date: "",
@ -413,7 +450,9 @@ export default {
async getDetail() {
const res = await show({ id: this.id });
this.$integrateData(this.form, res);
this.form.year = res.year+"";
},
submit() {

36
src/views/statisticalReport/govProcure.vue
Unescape View File

@ -7,6 +7,13 @@
>
<div slot="content"></div>
<slot>
<span style="padding: 0 6px;word-break: keep-all;">年份</span>
<span>
<DatePicker :value="select.year" placeholder="选择年份" placement="bottom" style="width: 90px;"
type="year"
@on-change="(e)=>select.year = e"></DatePicker>
</span>
<span style="padding: 0 6px; word-break: keep-all">科室</span>
<span>
<el-select
@ -123,16 +130,44 @@ export default {
page: 1,
page_size: 10,
keyword: "",
year:""
},
total: 0,
list: [],
table: [
{
prop: "year",
label: "年份",
width: 100,
align: "center",
},
{
prop: "name",
label: "项目名称",
width: 180,
align: "left",
},
{
prop: "is_face_small",
label: "是否面向专门面向中小企业采购",
width: 190,
formatter: (cell, data, value) => {
return value
? "是"
: "否";
},
},
{
prop: "is_conserve",
label: "是否采购节能产品、环境标志产品",
width: 190,
formatter: (cell, data, value) => {
return value
? "是"
: "否";
},
},
{
label: '完成情况',
width: 160,
@ -287,6 +322,7 @@ export default {
created() {
this.getDepartment();
this.getList();
this.select.year = this.$moment().format("YYYY");
},
beforeRouteEnter(to, from, next) {
let type = to.path.split("_")[1];

Write Preview
Loading…
Cancel
Save