请示流程

master
lion 2 years ago
parent 8c680d51c1
commit bbe771a972

@ -2,15 +2,15 @@
ENV='development' ENV='development'
# base api # base api
#VUE_APP_BASE_API = http://192.168.60.99:9004/ VUE_APP_BASE_API = http://192.168.60.99:9004/
#VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file VUE_APP_UPLOAD_API = http://192.168.60.99:9004/api/admin/upload-file
#VUE_APP_OA_URL = http://192.168.60.18:2021 VUE_APP_OA_URL = http://192.168.60.18:2021
VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/ #VUE_APP_BASE_API = http://hd-wuziguanli-test.ali251.langye.net/
VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file #VUE_APP_UPLOAD_API = http://hd-wuziguanli-test.ali251.langye.net/api/admin/upload-file
VUE_APP_OA_URL= http://suzhouhedaooa.langye.net #VUE_APP_OA_URL= http://suzhouhedaooa.langye.net
VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}' #VUE_APP_OA_URL_TYPE = '{"领用":"31","处置":"32","应急":"33"}'

@ -16,8 +16,8 @@
//canvas宽高 //canvas宽高
var canvaswidth = 302; var canvaswidth = 302;
var canvasheight = 188; var canvasheight = 188;
var VUE_APP_BASE_API = window.location.protocol+"//"+window.location.host; // var VUE_APP_BASE_API = window.location.protocol+"//"+window.location.host;
// var VUE_APP_BASE_API="http://hd-wuziguanli-test.ali251.langye.net" var VUE_APP_BASE_API="http://192.168.60.99:9004"
//文字描述位置 //文字描述位置
var textleft = qrcodewidth / 2; var textleft = qrcodewidth / 2;
var texttop = qrcodeheight + 70; var texttop = qrcodeheight + 70;
@ -51,6 +51,7 @@
"<p style='margin:0'>编码:"+printObj['wuzibianma']+"</p>"+ "<p style='margin:0'>编码:"+printObj['wuzibianma']+"</p>"+
"<p style='margin:0'>类型:"+printObj['wuzileixing']+"</p>"+ "<p style='margin:0'>类型:"+printObj['wuzileixing']+"</p>"+
"<p style='margin:0'>名称:"+printObj['zichanmingcheng']+"</p>"+ "<p style='margin:0'>名称:"+printObj['zichanmingcheng']+"</p>"+
"<p style='margin:0'>型号:"+printObj['guigexinghao']+"</p>"+
"</div>"+ "</div>"+
"</div>"+ "</div>"+
"</li>") "</li>")

@ -16,6 +16,14 @@ export function show(params) {
}) })
} }
export function getQingShi(params) {
return request({
method: "get",
url: "/api/admin/other/flow-list",
params
})
}
export function getOatoken(params) { export function getOatoken(params) {
return request({ return request({
method: "get", method: "get",

@ -61,7 +61,7 @@
</div> </div>
</div> </div>
</template> </template>
<template v-slot:jieyongren> <!-- <template v-slot:jieyongren>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>借用人 <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>借用人
@ -70,7 +70,7 @@
<el-input v-model="form.jieyongren" placeholder="请填写借用人" clearable style="width: 300px;"></el-input> <el-input v-model="form.jieyongren" placeholder="请填写借用人" clearable style="width: 300px;"></el-input>
</div> </div>
</div> </div>
</template> </template> -->
<template v-slot:jilurenyuan> <template v-slot:jilurenyuan>
<div class="xy-table-item"> <div class="xy-table-item">
@ -251,6 +251,7 @@
<script> <script>
import {save,index,show} from "@/api/system/baseForm.js" import {save,index,show} from "@/api/system/baseForm.js"
import {getInfo} from "@/api/user.js"
import { Message } from 'element-ui' import { Message } from 'element-ui'
export default { export default {
@ -285,7 +286,7 @@ export default {
chukuleixing:'', chukuleixing:'',
jieyongcangku:"", jieyongcangku:"",
jieyongbumen:'', jieyongbumen:'',
jieyongren:'', // jieyongren:'',
jilurenyuan:'', jilurenyuan:'',
baofeiyuanyin:'', baofeiyuanyin:'',
beizhu:'', beizhu:'',
@ -300,10 +301,10 @@ export default {
// required: true, // required: true,
// message: '' // message: ''
// }], // }],
jieyongren: [{ // jieyongren: [{
required: true, // required: true,
message: '请填写借用人' // message: ''
}], // }],
jilurenyuan: [{ jilurenyuan: [{
required: true, required: true,
message: '请输入经办人' message: '请输入经办人'
@ -412,6 +413,7 @@ export default {
created(){ created(){
this.getCangku() this.getCangku()
this.getWuzi() this.getWuzi()
}, },
methods: { methods: {
jieyong(){ jieyong(){
@ -536,7 +538,7 @@ export default {
zhuangtai:res?.zhuangtai, zhuangtai:res?.zhuangtai,
jieyongcangku:res?.jieyongcangku, jieyongcangku:res?.jieyongcangku,
jieyongbumen:res?.jieyongbumen, jieyongbumen:res?.jieyongbumen,
jieyongren:res?.jieyongren, // jieyongren:res?.jieyongren,
jilurenyuan:res?.jilurenyuan, jilurenyuan:res?.jilurenyuan,
baofeiyuanyin:res?.baofeiyuanyin, baofeiyuanyin:res?.baofeiyuanyin,
beizhu:res?.beizhu, beizhu:res?.beizhu,
@ -579,7 +581,13 @@ export default {
this.$emit('refresh') this.$emit('refresh')
}) })
} }
} },
getUserName(){
getInfo().then(res=>{
this.form.jilurenyuan = res.name
})
},
}, },
watch:{ watch:{
isShow(newVal){ isShow(newVal){
@ -588,6 +596,8 @@ export default {
this.form.chukuleixing = this.chukuType this.form.chukuleixing = this.chukuType
if(this.type === 'editor'|| this.type==='outbounds'){ if(this.type === 'editor'|| this.type==='outbounds'){
this.getDetail() this.getDetail()
}else{
this.getUserName()
} }
}else{ }else{
this.id = '' this.id = ''

@ -131,14 +131,14 @@
prop: 'jieyongbumen', prop: 'jieyongbumen',
align: 'center', align: 'center',
}, },
// {
// label: "",
// width: 180,
// prop: 'jieyongren',
// align: 'center',
// },
{ {
label: "借用人", label: "经办人",
width: 180,
prop: 'jieyongren',
align: 'center',
},
{
label: "记录人员",
width: 180, width: 180,
prop: 'jilurenyuan', prop: 'jilurenyuan',
align:'center' align:'center'

@ -14,6 +14,17 @@
style="width: 300px;"></el-input> style="width: 300px;"></el-input>
</div> </div>
</div> </div>
</template>
<template v-slot:caigouhetong v-if="form.rukuleixing=='请示'">
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>请示流程
</div>
<div class="xy-table-item-content">
<el-input type="text" @focus="isShowQs=true" v-model="form.qingshiliucheng" placeholder="请选择请示流程"
style="width: 300px;"></el-input>
</div>
</div>
</template> </template>
<template v-slot:gudingzichanbianhao> <template v-slot:gudingzichanbianhao>
<div class="xy-table-item"> <div class="xy-table-item">
@ -251,7 +262,18 @@
<Table highlight-row ref="currentRowTable" :columns="htColumns" :data="htList" @on-current-change="htSelect" /> <Table highlight-row ref="currentRowTable" :columns="htColumns" :data="htList" @on-current-change="htSelect" />
<Page :current="htPageIndex" :total="htTotal" simple <Page :current="htPageIndex" :total="htTotal" simple
style="padding-top: 14px;display: flex;justify-content: center;" @on-change="htPageChange" /> style="padding-top: 14px;display: flex;justify-content: center;" @on-change="htPageChange" />
</Modal> </Modal>
<!-- 选择请示流程 -->
<Modal v-model="isShowQs" title="请示选择" width='70%' @on-cancel='qsCancel' @on-ok='qsComfirm'>
<div class="searchCompanys">
<el-input type="text" @keyup.enter.native="getQs" v-model="qskeyword" placeholder="请输入关键词查找"></el-input>
<el-button type="primary" @click="getQs"></el-button>
</div>
<Table highlight-row ref="currentRowTable" :columns="qsColumns" :data="qsList" @on-current-change="qsSelect" />
<Page :current="qsPageIndex" :total="qsTotal" simple
style="padding-top: 14px;display: flex;justify-content: center;" @on-change="qsPageChange" />
</Modal>
<detailContract ref='detailContract'></detailContract> <detailContract ref='detailContract'></detailContract>
<imports :table-name="importstableName" :istrueimport='false' :form-info="importForm" ref="imports" <imports :table-name="importstableName" :istrueimport='false' :form-info="importForm" ref="imports"
@importdata='getimportData'></imports> @importdata='getimportData'></imports>
@ -266,7 +288,9 @@
show show
} from "@/api/system/baseForm.js" } from "@/api/system/baseForm.js"
import { import {
index as getContract index as getContract,
getQingShi,
getOatoken
} from "@/api/contract.js" } from "@/api/contract.js"
import { import {
Message Message
@ -483,7 +507,58 @@
} }
}, '查看详情') }, '查看详情')
} }
}] }],
//
isShowQs:false,
qsList: [],
qskeyword: '',
qsPageIndex: 1,
qsTotal: 0,
editQs: '',
qsColumns: [{
width: 60,
_isChecked: false,
key: "isSelect",
resizable: true,
render: (h, params) => {
return h('div', [
h('Radio', {
props: {
value: params.row.isSelect
},
on: {
'on-change': (e) => {
this.qsList.forEach((items) => {
this.$set(items, 'isSelect', false)
});
this.qsList[params.index].isSelect = e;
}
}
})
])
}
}, {
title: '名称',
key: 'title',
}, {
title: '查看',
key: '',
width: 100,
render: (h, params) => {
return h('span', {
style: {
color: '#0077CC',
cursor: 'pointer'
},
on: {
'click': (e) => {
this.toQsFollow(params.row.belongs_id)
// @click=","
}
}
}, '查看详情')
}
}],
} }
}, },
created() { created() {
@ -547,6 +622,55 @@
console.log("e", e) console.log("e", e)
this.htPageIndex = e this.htPageIndex = e
this.getHt() this.getHt()
},
//
async getQs() {
let res = await getQingShi({
table:'qingshi',
page:this.qsPageIndex
// page_size: 10,
// page: this.htPageIndex,
// keyword: this.htkeyword,
})
for (var m of res.data.flow.data) {
m.isSelect = false
}
this.qsList = res.data.flow.data
this.qsTotal = res.data.flow.total
// this.hetongoptions = res.data
},
qsCancel() {
this.qsList.forEach((items) => {
this.$set(items, 'isSelect', false)
});
this.form.qingshiliucheng = this.editQs
},
qsSelect(e) {
this.qsList.forEach((items) => {
this.$set(items, 'isSelect', false)
if (items.id == e.id) {
this.$set(items, 'isSelect', true)
}
});
},
qsComfirm() {
this.qsList.forEach((items) => {
if (items.isSelect == true) {
this.form.qingshiliucheng = items.title
this.editQs = items.title
}
});
},
qsPageChange(e) {
this.qsPageIndex = e
this.getQs()
},
async toQsFollow(id){
let res = await getOatoken()
let url =
`${process.env.VUE_APP_OA_URL}/admin/flow/view/${id}?oatoken=${res.oatoken}`
let seeBuy = window.open(url, 'seeBuy','location=0')
}, },
// //
mingxiConfirm() { mingxiConfirm() {
@ -848,6 +972,9 @@
this.rukuTypeName = this.rukuType == '回库' ? '归还' : this.rukuType this.rukuTypeName = this.rukuType == '回库' ? '归还' : this.rukuType
if (this.rukuType == '采购') { if (this.rukuType == '采购') {
this.getHt() this.getHt()
}
if (this.rukuType == '请示') {
this.getQs()
} }
if (this.type === 'editor') { if (this.type === 'editor') {
this.getDetail() this.getDetail()

@ -76,7 +76,8 @@
return:'回库', return:'回库',
check:'盘点', check:'盘点',
data:"数据校对", data:"数据校对",
mock:'模拟盘点' mock:'模拟盘点',
ask:'请示'
}, },
customForm: { customForm: {
customFormId: "", customFormId: "",

Loading…
Cancel
Save