master
lion 4 months ago
parent fbd3d0e59d
commit 61934239de

@ -4,7 +4,7 @@ ENV='development'
VUE_APP_BASE_API = http://192.168.60.99:8004/
VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
VUE_APP_OA_URL= http://192.168.60.18:8001
VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'

@ -8,11 +8,11 @@ VUE_APP_UPLOAD_API = 'http://192.168.60.99:8004/api/admin/upload-file'
# 正式oa
#VUE_APP_OA_URL = http://192.168.60.18:2021
#VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
#VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'
#测试oa
VUE_APP_OA_URL = http://192.168.60.18:8001
VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'

@ -9,5 +9,5 @@ ENV = 'staging'
VUE_APP_BASE_API = http://192.168.60.99:8004/
VUE_APP_UPLOAD_API = http://192.168.60.99:8004/api/admin/upload-file
VUE_APP_OA_URL= http://192.168.60.18:8001
VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":43,"调拨入库":52,"领用出库":37,"处置出库":38,"调拨出库":53}'
VUE_APP_OA_URL_TYPE = '{"采购入库":51,"请示入库":54,"调拨入库":55,"领用出库":56,"处置出库":57,"调拨出库":53}'

@ -0,0 +1,20 @@
import request from '@/utils/request'
// 绑定/更新物资与运维规则的关系
export function saveOutbounds(data) {
return request({
url: '/api/admin/outbounds/save',
method: 'post',
data
})
}
export function delOutbounds(params) {
return request({
url: '/api/admin/Outbounds/destroy',
method: 'get',
params
})
}

@ -0,0 +1,28 @@
import request from '@/utils/request'
// 绑定/更新物资与运维规则的关系
export function saveStock(data) {
return request({
url: '/api/admin/stocks/save',
method: 'post',
data
})
}
export function showStock(params) {
return request({
url: '/api/admin/stocks/show',
method: 'get',
params
})
}
export function delStock(params) {
return request({
url: '/api/admin/stocks/destroy',
method: 'get',
params
})
}

@ -195,15 +195,18 @@ export default {
},
//
processInventoryData(data) {
// wuzileixing =
// wuzileixing =
const matchedData = data
.filter(item => item.wuzileixing === '一物一码' && item.zaikushuliang !== 0); // zaikushuliang !== 0
.filter(item => item.wuzileixing === '一物一码' && parseFloat(item.zaikushuliang) !== 0 && parseFloat(item.wait_num)> 0 ); // zaikushuliang !== 0
//
const unmatchedData = data
.filter(item => item.wuzileixing !== '一物一码' || item.zaikushuliang === 0)
.filter(item => item.zaikushuliang !== 0); // zaikushuliang=0
.filter(item => item.wuzileixing !== '一物一码' || (parseFloat(item.zaikushuliang)-parseFloat(item.wait_num) === 0))
.filter(item => (parseFloat(item.zaikushuliang)-parseFloat(item.wait_num)) !== 0) // zaikushuliang=0
console.log("unmatchedData",unmatchedData)
unmatchedData.map(item=>{
item.zaikushuliang = parseFloat(item.zaikushuliang)-parseFloat(item.wait_num)
})
// 使Map
const mergedMap = new Map();
@ -220,11 +223,12 @@ export default {
zichanmingcheng: item.zichanmingcheng,
wuzibianma: item.wuzibianma,
rukupici: item.rukupici,
zaikushuliang: item.zaikushuliang || 0, //
zaikushuliang: parseFloat(item.zaikushuliang) - parseFloat(item.wait_num) || 0, //
wuzileixing: item.wuzileixing,
guigexinghao: item.guigexinghao,
wuziguige: item.wuziguige,
jiliangdanwei: item.jiliangdanwei,
shengchanriqi:item.shengchanriqi,
wuzibianma_material_infos_wuzibianma_relation: item.wuzibianma_material_infos_wuzibianma_relation,
//
otherMetadata: []
@ -250,7 +254,7 @@ export default {
//
if (item.zaikushuliang !== undefined) {
mergedItem.zaikushuliang += item.zaikushuliang;
mergedItem.zaikushuliang += parseFloat(item.zaikushuliang);
}
//
@ -271,11 +275,11 @@ export default {
//
const mergedArray = Array.from(mergedMap.values())
.filter(item => item.zaikushuliang !== 0); // zaikushuliang=0
.filter(item => parseFloat(item.zaikushuliang) !== 0); // zaikushuliang=0
// zaikushuliang=0
return [...mergedArray, ...unmatchedData]
.filter(item => item.zaikushuliang !== 0); //
.filter(item => parseFloat(item.zaikushuliang) !== 0); //
}
}
}

@ -220,9 +220,14 @@
prop: 'zaikushuliang',
customFn: (row) => {
console.log("row",row)
return (<span>{row.row.zaikushuliang}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}</span>)
return (<span>{row.row.zaikushuliang}{row.row.jiliangdanwei?row.row.jiliangdanwei:''}{row.row.shunxuhao?'-'+row.row.shunxuhao:''}</span>)
}
}
},
{
label: '待出库',
width: 120,
prop: 'wait_num'
},
]
},
{

@ -34,7 +34,18 @@
:auths="[]"
@pageSizeChange="e => select.pageSize = e"
@pageIndexChange="pageChange"
>
>
<template v-slot:outbounds_zhuangtai>
<el-table-column label="出库状态" width="120" align="center" header-align="center">
<template slot-scope="scope">
<div v-for="item in statusList">
<el-tag :type="item.type" v-if="scope.row.outbounds_zhuangtai==item.id">
{{ item.value }}
</el-tag>
</div>
</template>
</el-table-column>
</template>
<template v-slot:btns>
<div />
<!-- <el-table-column v-if="isCkName=='仓库管理员'||roleName=='系统管理员'" fixed="right" label="操作" width="180" header-align="center">
@ -96,7 +107,28 @@ export default {
form: [],
total: 0,
list: [],
dateRanges: '',
dateRanges: '',
statusList: [{
id: 0,
value: '待处理',
type: 'info'
}, {
id: 1,
value: '待办结',
type: 'warning'
}, {
id: 2,
value: '待出库',
type: ''
}, {
id: 3,
value: '已出库',
type: 'success'
}, {
id: 4,
value: '退回',
type: 'danger'
}],
table: [{
label: '序号',
type: 'index',
@ -118,11 +150,11 @@ export default {
prop: 'outbounds_zhuangtai',
width: 180
},
{
label: '借用仓库',
prop: 'outbounds_jieyongcangku',
width: 180
},
// {
// label: '',
// prop: 'outbounds_jieyongcangku',
// width: 180
// },
{
label: '借用部门',
prop: 'outbounds_jieyongbumen',

@ -25,7 +25,18 @@
</div>
<xy-table v-loading="loading" :list="list" :total="total" :table-item="table" :auths="[]"
@pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange">
@pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange">
<template v-slot:stocks_zhuangtai>
<el-table-column label="入库状态" width="120" align="center" header-align="center">
<template slot-scope="scope">
<div v-for="item in statusList">
<el-tag :type="item.type" v-if="scope.row.stocks_zhuangtai==item.id">
{{ item.value }}
</el-tag>
</div>
</template>
</el-table-column>
</template>
<template v-slot:btns>
<div />
<!-- <el-table-column v-if="isCkName=='仓库管理员'||roleName=='系统管理员'" fixed="right" label="操作" width="180" header-align="center">
@ -87,7 +98,28 @@
form: [],
total: 0,
list: [],
dateRanges: '',
dateRanges: '',
statusList: [{
id: 0,
value: '待处理',
type: 'info'
}, {
id: 1,
value: '待办结',
type: 'warning'
}, {
id: 2,
value: '待入库',
type: ''
}, {
id: 3,
value: '已入库',
type: 'success'
}, {
id: 4,
value: '退回',
type: 'danger'
}],
table: [{
label: '序号',
type: 'index',
@ -103,12 +135,18 @@
label: '入库类型',
prop: 'stocks_rukuleixing',
width: 80,
},
{
label: '关联记录',
prop: 'stocks_guanlianjilu',
width: 180,
},
},
{
label: '入库状态',
prop: 'stocks_zhuangtai',
width: 80,
},
// {
// label: '',
// prop: 'stocks_guanlianjilu',
// width: 180,
// },
{
label: '经办人',
prop: 'stocks_jingbanren',
@ -310,11 +348,12 @@
if (k.stocks_id_stocks_id_relation) {
k.stocks_rukushijian = k.stocks_id_stocks_id_relation.rukushijian?.substring(0, 10)
k.stocks_rukuleixing = k.stocks_id_stocks_id_relation.rukuleixing
const rowname = k.stocks_rukuleixing == '采购' ? 'caigouhetong' : (k.stocks_rukuleixing == '请示' ?
'qingshiliucheng' : (k.stocks_rukuleixing == '应急采购' ? 'yingjicaigou' : ''))
// const rowname = k.stocks_rukuleixing == '' ? 'caigouhetong' : (k.stocks_rukuleixing == '' ?
// 'qingshiliucheng' : (k.stocks_rukuleixing == '' ? 'yingjicaigou' : ''))
k.stocks_guanlianjilu = k.stocks_id_stocks_id_relation[rowname]
k.stocks_jingbanren = k.stocks_id_stocks_id_relation.jingbanren
// k.stocks_guanlianjilu = k.stocks_id_stocks_id_relation[rowname]
k.stocks_jingbanren = k.stocks_id_stocks_id_relation.jingbanren
k.stocks_zhuangtai = k.stocks_id_stocks_id_relation.zhuangtai
k.stocks_jilurenyuan = k.stocks_id_stocks_id_relation.jilurenyuan
k.stocks_baoguanrenyuan = k.stocks_id_stocks_id_relation.baoguanrenyuan
k.stocks_beizhu = k.stocks_id_stocks_id_relation.beizhu
@ -361,10 +400,10 @@
if (k.stocks_id_stocks_id_relation) {
k.stocks_rukushijian = k.stocks_id_stocks_id_relation.rukushijian?.substring(0, 10)
k.stocks_rukuleixing = k.stocks_id_stocks_id_relation.rukuleixing
const rowname = k.stocks_rukuleixing == '采购' ? 'caigouhetong' : (k.stocks_rukuleixing == '请示' ?
'qingshiliucheng' : (k.stocks_rukuleixing == '应急采购' ? 'yingjicaigou' : ''))
k.stocks_guanlianjilu = k.stocks_id_stocks_id_relation[rowname]
// const rowname = k.stocks_rukuleixing == '' ? 'caigouhetong' : (k.stocks_rukuleixing == '' ?
// 'qingshiliucheng' : (k.stocks_rukuleixing == '' ? 'yingjicaigou' : ''))
k.stocks_zhuangtai = k.stocks_id_stocks_id_relation.zhuangtai
// k.stocks_guanlianjilu = k.stocks_id_stocks_id_relation[rowname]
k.stocks_jingbanren = k.stocks_id_stocks_id_relation.jingbanren
k.stocks_jilurenyuan = k.stocks_id_stocks_id_relation.jilurenyuan
k.stocks_baoguanrenyuan = k.stocks_id_stocks_id_relation.baoguanrenyuan

File diff suppressed because one or more lines are too long

@ -107,9 +107,14 @@ export default {
name: '虎丘区',
id: 23,
coord: [120.331625, 31.32967]
}, {
}, {
id:19,
name: '吴中区',
coord: [120.334974, 31.162319]
}, {
id:22,
name: '园区',
coord: [120.736747, 31.275494]
}, {
name: '太仓市',
id: 16,
@ -273,6 +278,17 @@ export default {
areaColor: '#1d39c4'
}
}
},
{
name: '园区',
itemStyle: {
normal: {
areaColor: '#5d39e9'
},
emphasis: {
areaColor: '#5d39e9'
}
}
},
{
name: '太仓市',

@ -33,7 +33,7 @@
</div>
</div>
</template>
<template v-if="activeStep===0 && chukuType===''" v-slot:guanliandiaoling>
<template v-if="activeStep===0 && chukuType===''" v-slot:guanliandiaoling>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;" />关联工单
@ -67,7 +67,7 @@
</div>
</div>
</template> -->
<template v-if="activeStep===0" v-slot:jieyongcangku>
<!-- <template v-if="activeStep===0" v-slot:jieyongcangku>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;" />借用仓库
@ -83,7 +83,7 @@
</el-select>
</div>
</div>
</template>
</template> -->
<template v-if="activeStep===0" v-slot:jieyongbumen>
<div class="xy-table-item">
@ -116,7 +116,7 @@
</div>
</div>
</template>
<template v-if="activeStep===0 && chukuType==''" v-slot:baofeiyuanyin>
<!-- <template v-if="activeStep===0 && chukuType==''" v-slot:baofeiyuanyin>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;" />报废原因
@ -131,7 +131,7 @@
/>
</div>
</div>
</template>
</template> -->
<template v-if="activeStep===0" v-slot:zuozhengwenjian>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -336,7 +336,7 @@
</div>
<div class="xy-table-item-content">
<el-select multiple v-model="mingxiObj.indexList" style="width: 300px;" placeholder="请选择">
<el-option v-for="item in mingxiObj.otherMetadata" :key="item.id" :label="item.zichanmingcheng" :value="item.id" />
<el-option v-for="item in mingxiObj.otherMetadata" :key="item.id" :label="item.shunxuhao" :value="item.id" />
</el-select>
</div>
</div>
@ -382,6 +382,9 @@ import {
show,
destroy
} from '@/api/system/baseForm.js'
import {
saveOutbounds
} from '@/api/outbounds.js'
import {
index as indexDiaoling
} from '@/api/workOrder.js'
@ -503,10 +506,9 @@ export default {
prop: 'jiliangdanwei',
width: 80
}, {
label: '生产日期',
prop: 'shengchanriqi',
width: 120
label: '生产日期',
prop: 'shengchanriqi',
width: 120
},{
label: '入库批次',
prop: 'rukupici',
@ -635,7 +637,7 @@ export default {
return
}
//
if (this.chukuType === '调令') {
if (this.chukuType === '调令出库') {
if (!this.form.guanliandiaoling) {
Message({
type: 'warning',
@ -923,7 +925,7 @@ export default {
this.form.zhuangtai = 0
delete this.form.id
}
save({
saveOutbounds({
table_name: this.tableName,
...this.form
}).then(res => {

@ -123,7 +123,11 @@
import {
show,
save,
} from '@/api/system/baseForm.js'
} from '@/api/system/baseForm.js'
import {
saveOutbounds
} from '@/api/outbounds.js'
import {
Message
} from 'element-ui'
@ -245,7 +249,7 @@ export default {
return
}
this.form.zhuangtai = 3
save({
saveOutbounds({
table_name: this.tableName,
...this.form
}).then(res => {

@ -4,8 +4,7 @@
<template v-slot:normalContent>
<el-descriptions title="基本信息" :column="2" border>
<el-descriptions-item label="出库类型">{{form.chukuleixing}}</el-descriptions-item>
<el-descriptions-item label="出库日期">{{form.rukushijian}}</el-descriptions-item>
<el-descriptions-item label="借用仓库">{{form.jieyongcangku}}</el-descriptions-item>
<el-descriptions-item label="出库日期">{{form.chukushijian}}</el-descriptions-item>
<el-descriptions-item label="借用部门">{{form.jieyongbumen}}</el-descriptions-item>
<el-descriptions-item label="经办人">{{form.jilurenyuan}}</el-descriptions-item>
<el-descriptions-item label="物资信息单" :span="2">
@ -30,12 +29,15 @@
<!-- 确认出库 -->
<div>
<template v-for="(item,index) in fileList">
<el-image
<div>
<a :href="item.url" style="color:blue" target="_blank">{{item.name}}</a>
</div>
<!-- <el-image
style="width: 100px; height: 100px"
:src="item.url"
:key="index"
:initial-index="index">
</el-image>
</el-image> -->
</template>
</div>
@ -170,7 +172,8 @@
id: this.id,
table_name: this.tableName
})
this.form = {
this.form = {
chukuleixing:res?.chukuleixing,
chukushijian: res?.chukushijian,
zhuangtai: res?.zhuangtai,
guanliandiaoling: res?.guanliandiaoling,

@ -33,7 +33,7 @@
@pageIndexChange="pageChange"
>
<template v-slot:zhuangtai>
<el-table-column label="状态" width="120" align="center" header-align="left">
<el-table-column label="状态" width="120" align="center" header-align="center">
<template slot-scope="scope">
<div v-for="item in statusList">
<el-tag :type="item.type" v-if="scope.row.zhuangtai==item.id">
@ -63,7 +63,7 @@
@click="editorChuku(scope.row.id,'editor',scope.row.chukuleixing)">编辑</Button>
<Button v-if="scope.row.zhuangtai==0 || scope.row.zhuangtai==4" style="margin-right: 10px;" type="primary" size="small"
@click="toOaFollow(scope.row.id,scope.row.chukuleixing)">发起流程</Button>
@click="toOaFollow(scope.row,scope.row.chukuleixing)">发起流程</Button>
<Button v-if="scope.row.zhuangtai==2" style="margin-right: 10px;" type="primary" size="small"
@click="printChuku(scope.row.id)">确认出库</Button>
@ -92,6 +92,10 @@ import {
index,
destroy
} from '@/api/system/baseForm.js'
import {
delOutbounds
} from '@/api/outbounds.js'
import {
getInfo
} from '@/api/user.js'
@ -198,12 +202,12 @@ export default {
prop: 'zhuangtai',
align: 'center'
},
{
label: '借用仓库',
width: 180,
prop: 'jieyongcangku',
align: 'center'
},
// {
// label: '',
// width: 180,
// prop: 'jieyongcangku',
// align: 'center'
// },
{
label: '借用部门',
width: 180,
@ -323,7 +327,7 @@ export default {
this.$refs['printoutbounds'].chukuType = leixing
this.$refs['printoutbounds'].isShow = true
},
async toOaFollow(id, type) {
async toOaFollow(res, type) {
let typeid = ''
const typeObj = JSON.parse(process.env.VUE_APP_OA_URL_TYPE)
console.log("typeObj",typeObj,type)
@ -332,16 +336,25 @@ export default {
typeid = parseInt(typeObj[k])
}
}
let default_json = {
outbounds_id:res.id,
chukuriqi:res.chukushijian,
jieyongbumen:res.jieyongbumen,
jingbanren:res.jilurenyuan,
beizhu:res.beizhu,
wuzixinxidan:res.zuozhengwenjian.join(',')
// jieyongcangku:''
}
const url =
`${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.authName}&link_id=${id}`
`${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&&outbounds_id=${res.id}&default_json=${JSON.stringify(default_json)}`
const seeBuy = window.open(url, '_blank')
},
deleteChuku(row) {
// return
destroy({
delOutbounds({
id: row.id,
table_name: 'outbounds',
destroy_relation: ['id_outbounds_items_outbounds_id_relation']
// table_name: 'outbounds',
// destroy_relation: ['id_outbounds_items_outbounds_id_relation']
}).then(res => {
Message({
type: 'success',

@ -10,7 +10,31 @@
<div class="step-content" style="margin-top: 20px;">
<!-- 第一步基本信息 -->
<div v-show="activeStep === 0">
<el-form ref="basicForm" :model="form" :rules="rules" label-width="100px">
<el-form ref="basicForm" :model="form" :rules="rules" label-width="100px">
<el-form-item v-if="form.rukuleixing=='采购入库'" label="采购流程" prop="xiangguanliucheng">
<!-- <el-input
v-model="form.caigouhetong"
type="text"
clearable
placeholder="请选择采购流程"
@focus="isShowHt=true"
/> -->
<el-select v-model="form.xiangguanliucheng" style="width:100%" filterable placeholder="请选择流程">
<el-option v-for="item in flowList" :key="item.belongs_id" :label="item['60d1f8f1c8f3d']" :value="item.belongs_id">
<span style="float: left">{{ item['60d1f8f1c8f3d'] }}</span>
<!-- <span style="float: right; color: blue; font-size: 13px">查看</span> -->
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.rukuleixing=='请示入库'" label="请示流程" prop="xiangguanliucheng">
<el-select v-model="form.xiangguanliucheng" style="width:100%" filterable placeholder="请选择流程">
<el-option v-for="item in flowList" :key="item.belongs_id" :label="item['title']" :value="item.belongs_id">
<span style="float: left">{{ item['title'] }}</span>
<!-- <span style="float: right; color: blue; font-size: 13px">查看</span> -->
</el-option>
</el-select>
</el-form-item>
<el-form-item v-if="form.rukuleixing=='盘点入库'" label="盘点类型" prop="pandianleixing">
<el-select v-model="form.pandianleixing" style="width:100%" filterable placeholder="请选择盘点类型">
<el-option v-for="item in pandianList" :key="item.value" :label="item.value" :value="item.value" />
@ -88,7 +112,24 @@
@importdata="getimportData" />
<!-- 新增入库物资 -->
<addStock ref="addStock" @refresh="addStockMingxi" />
<addStock ref="addStock" @refresh="addStockMingxi" />
<!-- 选择采购流程 请示流程 -->
<!-- <Modal v-model="isShowQs" :z-index="10000" title="请示选择" width="70%" @on-cancel="qsCancel" @on-ok="qsComfirm">
<div class="searchCompanys">
<el-input v-model="qskeyword" type="text" placeholder="请输入关键词查找" @keyup.enter.native="getQs" />
<el-button type="primary" @click="getQs"></el-button>
</div>
<Table ref="currentRowTable" highlight-row :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> -->
</el-dialog>
</template>
@ -99,9 +140,13 @@
index,
show,
destroy
} from '@/api/system/baseForm.js'
} from '@/api/system/baseForm.js'
import {
saveStock
} from '@/api/stocks.js'
import {
getOatoken
getOatoken,
getQingShi
} from '@/api/contract.js'
import {
Message
@ -139,9 +184,12 @@
headers: {
token: ''
},
link_id:'', // id
wuziguanli_oatoken: '',
form: {
link_id:'', // id
link_res:'', // s
wuziguanli_oatoken: '',
flowList:[],
form: {
xiangguanliucheng:'',
rukushijian: '',
rukuleixing: '',
pandianleixing: '',
@ -247,16 +295,16 @@
label: '入库数量',
prop: 'rukushuliang',
width: 80
}
},{
label: "生产日期",
prop: "shengchanriqi",
width: 180
},
// ,{
// label: "",
// prop: "wuzizhuangtai",
// width: 180
// },{
// label: "",
// prop: "shengchanriqi",
// width: 180
// },
// }
],
//
printArr: ''
@ -268,14 +316,22 @@
this.form.rukuleixing = this.rukuType
if (this.rukuType == '盘点入库') {
this.form.pandianleixing = '正常盘点'
}
}
if (this.rukuType == '采购入库') {
this.getQs('caigou')
}
if (this.rukuType == '请示入库') {
this.getQs('qingshi')
}
if (this.type === 'editor') {
this.getDetail()
}
if (this.type == 'add') {
this.form.jingbanren = this.authName
}
} else {
} else {
this.flowList = []
this.resetForm()
}
}
@ -325,10 +381,21 @@
},
//
async getPici() {
if (this.form.rukuleixing != '库') {
if (this.form.rukuleixing != '归还入库') {
const res = await getWzpc()
this.currentPici = res.msg
}
},
//
async getQs(tableName) {
this.flowList = []
const res = await getQingShi({
table: tableName,
page: 1,
page_size:999,
status: 1,
})
this.flowList = res.data.flow.data
},
//
prevStep() {
@ -403,15 +470,20 @@
if (this.type === 'add') {
this.form.zhuangtai = 0
delete this.form.id
}
if(this.rukuType==='盘点入库' || this.rukuType==='归还入库'){
this.form.zhuangtai = 3
}
save({
saveStock({
table_name: this.tableName,
...this.form
}).then(res => {
this.$message.success('保存成功')
console.log('res', res)
this.link_id = res.id
// if (this.type === 'editor' || this.form.rukuleixing === '') {
this.link_id = res.id
this.link_res = res
console.log("this.link_res",this.link_res)
// if (this.type === 'editor' || this.form.rukuleixing === '') {
// this.resetForm()
// this.$emit('refresh')
// this.isShow = false
@ -420,7 +492,7 @@
// if (res && res.inventorysIds && res.inventorysIds.length > 0) {
// this.printArr = res.inventorysIds.join(',')
// }
//
//
if(this.rukuType==='盘点入库' || this.rukuType==='归还入库'){
this.resetForm()
this.$emit('refresh')
@ -493,9 +565,22 @@
typeid = parseInt(typeObj[k])
}
}
const url =
`${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.authName}&link_id=${this.link_id}`
const seeBuy = window.open(url, '_blank')
console.log("this.link_res",this.link_res)
let default_json = {
stocks_id:this.link_res.id,
xiangguanliucheng:this.link_res.xiangguanliucheng,
// xiangguanliucheng:res.link_id,
rukuriqi:this.link_res.rukushijian,
jingbanren:this.link_res.jingbanren,
jiluren:this.link_res.jilurenyuan,
baoguanren:this.link_res.baoguanrenyuan,
remark:this.link_res.beizhu,
huowudan:this.link_res.zuozhengwenjian.join(",")
}
const url =
`${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&stocks_id=${this.link_res.id}&default_json=${JSON.stringify(default_json)}`
const seeBuy = window.open(url, '_blank')
},
//
handleClose() {
@ -525,7 +610,8 @@
this.mingxiList = []
this.fileList = []
this.activeStep = 0
this.link_id = ''
this.link_id = ''
this.link_res = ''
this.form = {
rukushijian: '',
rukuleixing: '',
@ -559,13 +645,13 @@
}
this.form.id = this.id
this.form.zhuangtai = res.zhuangtai?res.zhuangtai:0
this.mingxiList = []
for (var r of res.id_stocks_item_links_stocks_id_relation) {
const yuanshishuju = JSON.parse(r.yuanshishuju)
yuanshishuju['id'] = r.id
yuanshishuju['stocks_items_id'] = r.stocks_items_id
this.mingxiList.push(yuanshishuju)
}
this.mingxiList = res.id_stocks_items_stocks_id_relation
// for (var r of res.id_stocks_item_links_stocks_id_relation) {
// const yuanshishuju = JSON.parse(r.yuanshishuju)
// yuanshishuju['id'] = r.id
// yuanshishuju['stocks_items_id'] = r.stocks_items_id
// this.mingxiList.push(yuanshishuju)
// }
this.fileList = []
const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
for (var f of _lists) {

@ -3,14 +3,14 @@
<el-dialog :visible.sync="isShowMingxi" :modal="false" width="80%" title="新增明细">
<el-form ref="form" :model="formData" :rules="rules" label-width="100px">
<el-form-item label="种类编码" prop="wuzibianma">
<!-- 不是库的 选择物资档案信息 -->
<template v-if="rukuleixing!='库'">
<!-- 不是归还入库的 选择物资档案信息 -->
<template v-if="rukuleixing!='归还入库'">
<el-input v-model="formData.wuzibianma" @focus="showMaterial">
<el-button slot="append" @click="addMaterial"></el-button>
</el-input>
</template>
<template v-else>
<el-input ref="huikubianma" v-model="formData.wuzibianma" placeholder="请扫码获取库种类编码"
<el-input ref="huikubianma" v-model="formData.wuzibianma" placeholder="请扫码获取归还入库种类编码"
@change="getKucunShow">
<el-button slot="append" @click="showInventorys"></el-button>
</el-input>
@ -53,9 +53,9 @@
<el-form-item label="在库数量" prop="zaikushuliang">
<el-input v-model="formData.zaikushuliang" disabled />
</el-form-item>
<!-- v-if="formData.wuzileixing=='一类一码' && rukuleixing!='库'" -->
<!-- v-if="formData.wuzileixing=='一类一码' && rukuleixing!='归还入库'" -->
<el-form-item label="入库批次" prop="rukupici">
<el-input v-model="formData.rukupici" disabled />
<el-input v-model="formData.rukupici" disabled/>
<!-- <el-select v-model="formData.rukupici" style="width:100%" filterable clearable allow-create
default-first-option placeholder="入库批次" @change="changePici">
<el-option v-for="item in rukupiciList" :key="item.value" :label="item.label" :value="item.value" />
@ -222,7 +222,7 @@
},
watch: {
rukuleixing(newVal) {
if (newVal === '库') {
if (newVal === '归还入库') {
this.hasPici = true
}
}
@ -233,9 +233,9 @@
this.getConfig()
},
methods: {
//
//
setPici(e,date){
if(this.rukuleixing!='库'){
if(this.rukuleixing!='归还入库'){
this.formData.rukupici = e
}
this.formData.rukuriqi = date?date:''
@ -318,23 +318,20 @@
this.formData.cunfangyaoqiu = e.cunfangyaoqiu
this.formData.weihuyaoqiu = e.weihuyaoqiu
this.formData.equipment_maintain_config_id = e.equipment_maintain_config_id?parseFloat(e.equipment_maintain_config_id):''
if (this.formData.wuzileixing == '一类一码') {
this.getPici()
}
},
//
//
selectInventorysMx(res) {
console.log('res', res)
this.formData.id = res.id
this.formData.inventorys_id = res.id
const stocks_items_arr = res.stocks_items.filter(f => f.rukupici === res.rukupici)
const stocks_items_info = stocks_items_arr.length > 0 ? stocks_items_arr[0] : {}
this.formData.wuzibianma = stocks_items_info.wuzibianma
this.formData.rukupici = stocks_items_info.rukupici
this.formData.zichanmingcheng = stocks_items_info.zichanmingcheng
this.formData.wuzileixing = stocks_items_info.wuzileixing
this.formData.guigexinghao = stocks_items_info.guigexinghao
this.formData.zaikushuliang = res.zaikushuliang ? res.zaikushuliang : 0
this.formData.wuzibianma = res.wuzibianma
this.formData.rukupici = res.rukupici
this.formData.zichanmingcheng = res.zichanmingcheng
this.formData.wuzileixing = res.wuzileixing
this.formData.guigexinghao = res.guigexinghao
this.formData.zaikushuliang = res.res ? res.zaikushuliang : 0
this.formData.wuziguige = stocks_items_info.wuziguige
this.formData.jiliangdanwei = stocks_items_info.jiliangdanwei
this.formData.fenlei = stocks_items_info.fenlei

@ -61,7 +61,11 @@
index,
show,
destroy
} from '@/api/system/baseForm.js'
} from '@/api/system/baseForm.js'
import {
saveStock,
showStock
} from '@/api/stocks.js'
import {
Message
} from 'element-ui'
@ -109,7 +113,7 @@
{
label: '所属种类',
width: 80,
prop: 'fenleiName',
prop: 'fenlei_detail.name',
align: 'center'
},
{
@ -254,12 +258,10 @@
this.form.rukutupian.push(k?.response?.id)
}
}
save({
saveStock({
...this.form,
zhuangtai:3,
id: this.id,
table_name: this.tableName,
}).then(res => {
this.$message.success('入库成功')
this.$emit('refresh')
@ -268,9 +270,9 @@
},
//
async getDetail() {
const res = await show({
const res = await showStock({
id: this.id,
table_name: this.tableName
// table_name: this.tableName
})
this.form = {
rukushijian: res?.rukushijian,
@ -285,13 +287,7 @@
}
this.form.id = this.id
this.form.zhuangtai = res.zhuangtai?res.zhuangtai:0
this.mingxiList = []
for (var r of res.id_stocks_item_links_stocks_id_relation) {
const yuanshishuju = JSON.parse(r.yuanshishuju)
yuanshishuju['id'] = r.id
yuanshishuju['stocks_items_id'] = r.stocks_items_id
this.mingxiList.push(yuanshishuju)
}
this.mingxiList = res.id_stocks_items_stocks_id_relation
this.zuozhengList = []
const _lists = res.zuozhengwenjian_upload_details ? res.zuozhengwenjian_upload_details : []
for (var f of _lists) {

@ -1,91 +1,86 @@
<template>
<div>
<div class="button-wrap" v-if="roleName=='系统管理员'||isCkName=='仓库管理员'">
<Button type="primary" @click="editorRuku('','add','采购入库')"></Button>
<Button type="primary" @click="editorRuku('','add','请示入库')"></Button>
<Button type="primary" @click="editorRuku('','add','调拨入库')"></Button>
<Button type="primary" @click="editorRuku('','add','盘点入库')"></Button>
<Button type="primary" @click="editorRuku('','add','归还入库')"></Button>
<div class="button-wrap" v-if="roleName=='系统管理员'||isCkName=='仓库管理员'">
<Button type="primary" @click="editorRuku('','add','采购入库')"></Button>
<Button type="primary" @click="editorRuku('','add','请示入库')"></Button>
<Button type="primary" @click="editorRuku('','add','调拨入库')"></Button>
<Button type="primary" @click="editorRuku('','add','盘点入库')"></Button>
<Button type="primary" @click="editorRuku('','add','归还入库')"></Button>
</div>
<div ref="lxHeader">
<lx-header icon="md-apps" text="入库管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
<slot>
<div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
<Input v-model="select.keyword" style="width: 200px;margin-right: 10px;" placeholder="经办人搜索" />
<Select v-model="select.rukuleixing" style="width: 200px;margin-right: 10px;" placeholder="入库类型" clearable>
<Option v-for="item in rukuTypeList" :key="item.id" :value="item.id">{{ item.value }}</Option>
</Select>
<Select v-model="select.zhuangtai" style="width: 200px;margin-right: 10px;" placeholder="状态" clearable>
<Option v-for="item in statusList" :key="item.id" :value="item.id">{{ item.value }}</Option>
</Select>
<Select v-model="select.rukuleixing" style="width: 200px;margin-right: 10px;" placeholder="入库类型" clearable>
<Option v-for="item in rukuTypeList" :key="item.id" :value="item.id">{{ item.value }}</Option>
</Select>
<Select v-model="select.zhuangtai" style="width: 200px;margin-right: 10px;" placeholder="状态" clearable>
<Option v-for="item in statusList" :key="item.id" :value="item.id">{{ item.value }}</Option>
</Select>
<Button type="primary" @click="getindex"></Button>
</div>
</slot>
</lx-header>
</div>
<xy-table
v-loading="loading"
:list="list"
:total="total"
:table-item="table"
@pageSizeChange="e => select.pageSize = e"
@pageIndexChange="pageChange"
>
<!-- <template v-slot:guanlianjilu>
<el-table-column label="关联记录" width="260" header-align="left">
<template slot-scope="scope">
<div v-for="item in rukuTypeList">
<div v-if="scope.row.rukuleixing===item.id">
{{ item.prop?scope.row[item.prop]:'' }}
</div>
</div>
</template>
</el-table-column>
</template> -->
<template v-slot:zhuangtai>
<el-table-column label="状态" width="120" align="center" header-align="left">
<template slot-scope="scope">
<div v-for="item in statusList">
<el-tag :type="item.type" v-if="scope.row.zhuangtai==item.id">
{{ item.value }} {{scope.row.zhuangtai}}
</el-tag>
</div>
</template>
</el-table-column>
</template>
<xy-table v-loading="loading" :list="list" :total="total" :table-item="table"
@pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange">
<!-- <template v-slot:guanlianjilu>
<el-table-column label="关联记录" width="260" header-align="left">
<template slot-scope="scope">
<div v-for="item in rukuTypeList">
<div v-if="scope.row.rukuleixing===item.id">
{{ item.prop?scope.row[item.prop]:'' }}
</div>
</div>
</template>
</el-table-column>
</template> -->
<template v-slot:zhuangtai>
<el-table-column label="状态" width="120" align="center" header-align="center">
<template slot-scope="scope">
<div v-for="item in statusList">
<el-tag :type="item.type" v-if="scope.row.zhuangtai==item.id">
{{ item.value }}
</el-tag>
</div>
</template>
</el-table-column>
</template>
<template v-slot:btns>
<el-table-column label="操作" width="240" header-align="center">
<!-- 1 盘点 归还不用发起流程 不用确认入库 -->
<!-- 2 待处理 退回 可编辑 -->
<!-- 3 待处理 可删除 -->
<!-- 4 退回 待处理 可发起流程 -->
<!-- 5 待入库 可确认入库 -->
<el-table-column label="操作" width="240" header-align="center">
<!-- 1 盘点 归还不用发起流程 不用确认入库 -->
<!-- 2 待处理 退回 可编辑 -->
<!-- 3 待处理 可删除 -->
<!-- 4 退回 待处理 可发起流程 -->
<!-- 5 待入库 可确认入库 -->
<!-- 6 已入库 只有查看 -->
<template slot-scope="scope">
<div v-if="roleName=='系统管理员'||isCkName=='仓库管理员'">
<template v-if="scope.row.zhuangtai===3 || scope.row.zhuangtai===1">
<Button style="margin-right: 10px;" type="primary" size="small"
@click="showRukuDetail(scope.row.id)">查看</Button>
</template>
<template v-else>
<Button v-if="scope.row.zhuangtai===0 || scope.row.zhuangtai===4" style="margin-right: 10px;" type="primary" size="small"
@click="editorRuku(scope.row.id,'editor',scope.row.rukuleixing)">编辑</Button>
<Button v-if="scope.row.zhuangtai===0 || scope.row.zhuangtai===4" style="margin-right: 10px;" type="primary" size="small"
@click="toOaFollow(scope.row.id,scope.row.rukuleixing)">发起流程</Button>
<Button v-if="scope.row.zhuangtai===2" style="margin-right: 10px;" type="primary" size="small"
@click="showRukuDetail(scope.row.id)">确认入库</Button>
<Poptip v-if="scope.row.zhuangtai===0" transfer confirm title="确认要删除该入库记录?入库明细将一同删除。"
@on-ok="deleteRuku(scope.row)">
<Button type="error" size="small" ghost>删除</Button>
</Poptip>
</template>
<template slot-scope="scope">
<div v-if="roleName=='系统管理员'||isCkName=='仓库管理员'">
<template v-if="scope.row.zhuangtai===3 || scope.row.zhuangtai===1">
<Button style="margin-right: 10px;" type="primary" size="small"
@click="showRukuDetail(scope.row.id)">查看</Button>
</template>
<template v-else>
<Button v-if="scope.row.zhuangtai===0 || scope.row.zhuangtai===4" style="margin-right: 10px;"
type="primary" size="small"
@click="editorRuku(scope.row.id,'editor',scope.row.rukuleixing)">编辑</Button>
<Button v-if="scope.row.zhuangtai===0 || scope.row.zhuangtai===4" style="margin-right: 10px;"
type="primary" size="small" @click="toOaFollow(scope.row,scope.row.rukuleixing)">发起流程</Button>
<Button v-if="scope.row.zhuangtai===2" style="margin-right: 10px;" type="primary" size="small"
@click="showRukuDetail(scope.row.id)">确认入库</Button>
<Poptip v-if="scope.row.zhuangtai===0" transfer confirm title="确认要删除该入库记录?入库明细将一同删除。"
@on-ok="deleteRuku(scope.row)">
<Button type="error" size="small" ghost>删除</Button>
</Poptip>
</template>
</div>
</template>
</el-table-column>
@ -100,276 +95,291 @@
</template>
<script>
import {
index,
destroy
} from '@/api/system/baseForm.js'
import addRuku from './component/addRuku.vue'
import showRuku from './component/showRuku.vue'
import {
index,
destroy
} from '@/api/system/baseForm.js'
import addRuku from './component/addRuku.vue'
import showRuku from './component/showRuku.vue'
import {
delStock
} from '@/api/stocks.js'
import {
getOatoken
} from '@/api/contract.js'
import {
Message
} from 'element-ui'
import {
getInfo
} from '@/api/user.js'
import imports from '@/views/component/imports.vue'
import {
index as fieldIndex
} from '@/api/system/customFormField'
import {
getparameter
} from '@/api/system/dictionary'
export default {
components: {
addRuku,
imports,
showRuku
},
data() {
return {
authName: '',
roleName: '',
isCkName: '',
wuziguanli_oatoken:'',
loading: false,
select: {
pageSize: 10,
pageIndex: 1,
keyword: '',
rukuleixing: '',
zhuangtai:''
},
rukuTypeList: [{
id: '采购入库',
value: '采购入库',
prop: 'caigouhetong'
}, {
id: '请示入库',
value: '请示入库',
prop: 'qingshiliucheng'
}, {
id: '调拨入库',
value: '调拨入库',
}, {
id: '盘点',
value: '盘点入库'
}, {
id: '回库',
value: '归还入库'
}],
statusList:[{
id:0,
value:'待处理',
type:'info'
},{
id:1,
value:'待办结',
type:'warning'
},{
id:2,
value:'待入库',
type:''
},{
id:3,
value:'已入库',
type:'success'
},{
id:4,
value:'退回',
type:'danger'
}],
// rukuTypeList:{
// purchase:'',
// return:'',
// check:'',
// data:"",
// mock:'',
// ask:'',
// yingji:''
// },
customForm: {
customFormId: '',
tableName: 'stocks'
import {
Message
} from 'element-ui'
import {
getInfo
} from '@/api/user.js'
import imports from '@/views/component/imports.vue'
import {
index as fieldIndex
} from '@/api/system/customFormField'
import {
getparameter
} from '@/api/system/dictionary'
export default {
components: {
addRuku,
imports,
showRuku
},
data() {
return {
authName: '',
roleName: '',
isCkName: '',
wuziguanli_oatoken: '',
loading: false,
select: {
pageSize: 10,
pageIndex: 1,
keyword: '',
rukuleixing: '',
zhuangtai: ''
},
rukuTypeList: [{
id: '采购入库',
value: '采购入库',
prop: 'caigouhetong'
}, {
id: '请示入库',
value: '请示入库',
prop: 'qingshiliucheng'
}, {
id: '调拨入库',
value: '调拨入库',
}, {
id: '盘点',
value: '盘点入库'
}, {
id: '回库',
value: '归还入库'
}],
statusList: [{
id: 0,
value: '待处理',
type: 'info'
}, {
id: 1,
value: '待办结',
type: 'warning'
}, {
id: 2,
value: '待入库',
type: ''
}, {
id: 3,
value: '已入库',
type: 'success'
}, {
id: 4,
value: '退回',
type: 'danger'
}],
// rukuTypeList:{
// purchase:'',
// return:'',
// check:'',
// data:"",
// mock:'',
// ask:'',
// yingji:''
// },
customForm: {
customFormId: '',
tableName: 'stocks'
},
form: [],
total: 0,
list: [],
table: [{
label: '序号',
type: 'index',
fixed: 'left',
width: 80
},
{
label: '入库日期',
width: 120,
prop: 'rukushijian',
align: 'center',
formatter: (cell, data, value) => {
return value ? value.substring(0, 10) : ''
}
},
{
label: '入库类型',
width: 120,
prop: 'rukuleixing',
align: 'center'
},
{
label: '状态',
width: 120,
prop: 'zhuangtai',
align: 'center'
},
// {
// label: '',
// width: 240,
// prop: 'guanlianjilu',
// align: 'left'
// },
{
label: '经办人',
width: 120,
prop: 'jingbanren',
align: 'center'
},
{
label: '记录人',
width: 120,
prop: 'jilurenyuan',
align: 'center'
},
{
label: '保管人',
width: 120,
prop: 'baoguanrenyuan',
align: 'center'
},
// {
// label: "",
// width: 180,
// prop: 'gudingzichanbianhao',
// align: 'center'
// },
{
label: '备注',
// width: 240,
prop: 'beizhu',
align: 'left'
}
]
}
},
mounted() {
this.getUserName()
this.getindex()
getOatoken().then(res => {
this.wuziguanli_oatoken = res.oatoken
})
},
methods: {
async getUserName() {
getInfo().then(res => {
for (var k of res.role) {
if (k.name == '系统管理员') {
this.roleName = k.name
}
if (k.name == '仓库管理员') {
this.isCkName = '仓库管理员'
}
}
this.authName = res.name
}).catch(error => {})
},
form: [],
total: 0,
list: [],
table: [{
label: '序号',
type: 'index',
fixed: 'left',
width: 80
async getindex() {
this.loading = true
const res = await index({
page_size: this.select.pageSize,
page: this.select.pageIndex,
table_name: 'stocks',
filter: [{
'key': 'jingbanren',
'op': 'like',
'value': this.select.keyword
},
{
'key': 'rukuleixing',
'op': 'eq',
'value': this.select.rukuleixing ? this.select.rukuleixing : ''
},
{
'key': 'zhuangtai',
'op': 'like',
'value': this.select.zhuangtai ? this.select.zhuangtai : (this.select.zhuangtai === 0 ? 0 : '')
}
]
})
this.list = res.data
this.total = res.total
this.loading = false
},
{
label: '入库日期',
width: 120,
prop: 'rukushijian',
align: 'center',
formatter: (cell, data, value) => {
return value ? value.substring(0, 10) : ''
}
pageChange(e) {
this.select.pageIndex = e
this.getindex()
},
{
label: '入库类型',
width: 120,
prop: 'rukuleixing',
align: 'center'
},
{
label: '状态',
width: 120,
prop: 'zhuangtai',
align: 'center'
},
// {
// label: '',
// width: 240,
// prop: 'guanlianjilu',
// align: 'left'
// },
{
label: '经办人',
width: 120,
prop: 'jingbanren',
align: 'center'
editorRuku(id, type, rukuleixing) {
if (id) {
this.$refs['addRuku'].id = id
}
this.$refs['addRuku'].type = type
this.$refs['addRuku'].authName = this.authName
this.$refs['addRuku'].rukuType = rukuleixing
this.$refs['addRuku'].isShow = true
},
{
label: '记录人',
width: 120,
prop: 'jilurenyuan',
align: 'center'
//
showRukuDetail(id) {
this.$refs['showRuku'].id = id
this.$refs['showRuku'].isShow = true
},
{
label: '保管人',
width: 120,
prop: 'baoguanrenyuan',
align: 'center'
},
// {
// label: "",
// width: 180,
// prop: 'gudingzichanbianhao',
// align: 'center'
// },
{
label: '备注',
// width: 240,
prop: 'beizhu',
align: 'left'
}
]
}
},
mounted() {
this.getUserName()
this.getindex()
getOatoken().then(res => {
this.wuziguanli_oatoken = res.oatoken
})
},
methods: {
async getUserName() {
getInfo().then(res => {
for (var k of res.role) {
if (k.name == '系统管理员') {
this.roleName = k.name
}
if (k.name == '仓库管理员') {
this.isCkName = '仓库管理员'
}
}
this.authName = res.name
}).catch(error => {})
},
async getindex() {
this.loading = true
const res = await index({
page_size: this.select.pageSize,
page: this.select.pageIndex,
table_name: 'stocks',
filter: [{
'key': 'jingbanren',
'op': 'like',
'value': this.select.keyword
},
{
'key': 'rukuleixing',
'op': 'eq',
'value': this.select.rukuleixing ? this.select.rukuleixing : ''
},
{
'key': 'zhuangtai',
'op': 'like',
'value': this.select.zhuangtai ? this.select.zhuangtai : (this.select.zhuangtai===0?0:'')
//
toOaFollow(res, type) {
let typeid = ''
const typeObj = JSON.parse(process.env.VUE_APP_OA_URL_TYPE)
console.log("typeObj", typeObj, type)
for (var k in typeObj) {
if (k == type) {
typeid = parseInt(typeObj[k])
}
}
]
})
this.list = res.data
this.total = res.total
this.loading = false
},
let default_json = {
stocks_id:res.id,
xiangguanliucheng:res.xiangguanliucheng,
// xiangguanliucheng:res.link_id,
rukuriqi:res.rukushijian,
jingbanren:res.jingbanren,
jiluren:res.jilurenyuan,
baoguanren:res.baoguanrenyuan,
remark:res.beizhu,
huowudan:res.zuozhengwenjian.join(",")
}
pageChange(e) {
this.select.pageIndex = e
this.getindex()
},
editorRuku(id, type, rukuleixing) {
if (id) {
this.$refs['addRuku'].id = id
}
this.$refs['addRuku'].type = type
this.$refs['addRuku'].authName = this.authName
this.$refs['addRuku'].rukuType = rukuleixing
this.$refs['addRuku'].isShow = true
},
//
showRukuDetail(id){
this.$refs['showRuku'].id = id
this.$refs['showRuku'].isShow = true
},
//
toOaFollow(id,type) {
let typeid = ''
const typeObj = JSON.parse(process.env.VUE_APP_OA_URL_TYPE)
console.log("typeObj",typeObj,type)
for (var k in typeObj) {
if (k == type) {
typeid = parseInt(typeObj[k])
}
}
const url =
`${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&username=${this.authName}&link_id=${id}`
const seeBuy = window.open(url, '_blank')
},
deleteRuku(row) {
console.log(row.id)
// return
destroy({
id: row.id,
table_name: this.customForm.tableName,
destroy_relation: ['id_stocks_item_links_stocks_id_relation', 'id_stocks_items_stocks_id_relation']
}).then(res => {
Message({
type: 'success',
message: '删除成功'
const url =
`${process.env.VUE_APP_OA_URL}/admin/flow/create/${typeid}?wuziguanli_oatoken=${this.wuziguanli_oatoken}&stocks_id=${res.id}&default_json=${JSON.stringify(default_json)}`
const seeBuy = window.open(url, '_blank')
},
deleteRuku(row) {
console.log(row.id)
// return
delStock({
id: row.id,
// table_name: this.customForm.tableName,
// destroy_relation: ['id_stocks_item_links_stocks_id_relation', 'id_stocks_items_stocks_id_relation']
}).then(res => {
Message({
type: 'success',
message: '删除成功'
})
this.getindex()
})
this.getindex()
})
}
}
}
}
}
</script>
<style scoped lang="scss">
.button-wrap{
button{
margin-right:10px;
}
<style scoped lang="scss">
.button-wrap {
button {
margin-right: 10px;
}
}
</style>

Loading…
Cancel
Save