|
|
@ -23,15 +23,15 @@ |
|
|
|
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="盘库状态"> |
|
|
|
<el-select v-model="queryParams.params.stocktakType" placeholder="请选择"> |
|
|
|
<el-option v-for="item in stocktakTypeList" :key="item" :label="item.name" :value="item.name" /> |
|
|
|
<el-select v-model="queryParams.params.checkState" placeholder="请选择"> |
|
|
|
<el-option v-for="item in checkStateList" :key="item.sid" :label="item.name" :value="item.name" /> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="盘点人"> |
|
|
|
<el-input v-model="queryParams.params.createByName" placeholder="" clearable /> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="监盘人"> |
|
|
|
<el-input v-model="queryParams.params.finance" placeholder="" clearable /> |
|
|
|
<el-input v-model="queryParams.params.superviseName" placeholder="" clearable /> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<div class="btn" style="text-align: center;"> |
|
|
@ -54,42 +54,42 @@ |
|
|
|
<el-table-column fixed label="操作" align="center" width="220"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button type="primary" size="mini" @click="toDetail(scope.row)">查看</el-button> |
|
|
|
<el-button type="primary" size="mini" v-show="scope.row.isReport=='1'" |
|
|
|
<el-button type="primary" size="mini" v-show="scope.row.state=='0'" |
|
|
|
@click="toEdit(scope.row)">办理</el-button> |
|
|
|
<el-button type="primary" size="mini" v-show="scope.row.isReport=='1'" |
|
|
|
<el-button type="primary" size="mini" v-show="scope.row.state=='0'" |
|
|
|
@click="toReport(scope.row)">盘库报告</el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="nodeState" label="流程状态" width="120" align="center" /> |
|
|
|
<el-table-column prop="deptName" label="部门" width="120" align="center" /> |
|
|
|
<el-table-column prop="billNo" label="盘点编号" width="120" align="center" /> |
|
|
|
<el-table-column prop="createDate" label="生成日期" width="120" align="center" /> |
|
|
|
<el-table-column prop="createTime" label="生成日期" width="120" align="center" /> |
|
|
|
<el-table-column prop="createByName" label="盘点人" width="120" align="center" /> |
|
|
|
<el-table-column prop="finances" label="监盘人" width="120" align="center" /> |
|
|
|
<el-table-column prop="stocktakType" label="盘库状态" width="120" align="center" /> |
|
|
|
<el-table-column prop="superviseName" label="监盘人" width="120" align="center" /> |
|
|
|
<el-table-column prop="checkState" label="盘库状态" width="120" align="center" /> |
|
|
|
<el-table-column label="应盘" align="center"> |
|
|
|
<el-table-column prop="ypNum" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="ypMoney" label="金额" align="center" width="100" /> |
|
|
|
<el-table-column prop="bookCount" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="bookAmount" label="金额" align="center" width="100" /> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="实盘" align="center"> |
|
|
|
<el-table-column prop="spNum" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="spMoney" label="金额" align="center" width="100" /> |
|
|
|
<el-table-column prop="realCount" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="realAmount" label="金额" align="center" width="100" /> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="未盘" align="center"> |
|
|
|
<el-table-column prop="wpNum" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="wpMoney" label="金额" align="center" width="100" /> |
|
|
|
<el-table-column prop="notCount" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="notAmount" label="金额" align="center" width="100" /> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="盘盈" align="center"> |
|
|
|
<el-table-column prop="pyNum" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="pyMoney" label="金额" align="center" width="100" /> |
|
|
|
<el-table-column prop="profitCount" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="profitAmount" label="金额" align="center" width="100" /> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="盘亏" align="center"> |
|
|
|
<el-table-column prop="pkNum" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="pkMoney" label="金额" align="center" width="100" /> |
|
|
|
<el-table-column prop="loseCount" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="loseAmount" label="金额" align="center" width="100" /> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="盘损" align="center"> |
|
|
|
<el-table-column prop="psNum" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="psMoney" label="金额" align="center" width="100" /> |
|
|
|
<el-table-column prop="lossCount" label="数量" align="center" width="100" /> |
|
|
|
<el-table-column prop="lossAmount" label="金额" align="center" width="100" /> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="remarks" label="备注" align="center" width="200" /> |
|
|
|
</el-table> |
|
|
@ -126,14 +126,15 @@ |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<div class="span-sty"><span class="must">*</span> 监盘人</div> |
|
|
|
<el-form-item prop="financeSid"> |
|
|
|
<!-- <el-select v-model="formobj.financeNmae" placeholder="请选择" class="addinputInfo addinputw"> |
|
|
|
<el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid" /> |
|
|
|
</el-select> --> |
|
|
|
<el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable |
|
|
|
<el-form-item prop="superviseName"> |
|
|
|
<el-select v-model="formobj.superviseName" placeholder="请选择" class="addinputInfo addinputw" |
|
|
|
@change="selectFinance"> |
|
|
|
<el-option v-for="item in financeList" :key="item.sid" :label="item.name" :value="item.sid" /> |
|
|
|
</el-select> |
|
|
|
<!-- <el-select v-model="formobj.financeSid" placeholder="请选择" class="addinputInfo addinputw" filterable |
|
|
|
multiple @change="selectFinance"> |
|
|
|
<el-option v-for="item in financeList" :key="item" :label="item.name" :value="item.sid"></el-option> |
|
|
|
</el-select> |
|
|
|
</el-select> --> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
@ -171,7 +172,7 @@ |
|
|
|
getCurrentDate |
|
|
|
} from '@/utils/index.js' |
|
|
|
import { |
|
|
|
selFianceByOrgSidPath |
|
|
|
selAllByOrgSidPath |
|
|
|
} from '@/api/Common/dictcommons' |
|
|
|
|
|
|
|
export default { |
|
|
@ -232,14 +233,14 @@ |
|
|
|
"billNo": "", |
|
|
|
"createStartTime": "", |
|
|
|
"createEndTime": "", |
|
|
|
"stocktakType": "", |
|
|
|
"checkState": "", |
|
|
|
"createByName": "", |
|
|
|
"finance": "" |
|
|
|
"superviseName": "" |
|
|
|
} |
|
|
|
}, |
|
|
|
sids: [], |
|
|
|
selectionList: [], |
|
|
|
stocktakTypeList: [{ |
|
|
|
checkStateList: [{ |
|
|
|
sid: '1', |
|
|
|
name: '未完成' |
|
|
|
}, |
|
|
@ -251,14 +252,18 @@ |
|
|
|
formobj: { |
|
|
|
createByName: window.sessionStorage.getItem('name'), |
|
|
|
createBySid: window.sessionStorage.getItem('userSid'), |
|
|
|
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage |
|
|
|
.getItem('defaultOrgPath').lastIndexOf('/') + 1), |
|
|
|
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window |
|
|
|
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), |
|
|
|
createDate: getCurrentDate(), |
|
|
|
financeSid: [], |
|
|
|
finances: [], |
|
|
|
superviseName: '', |
|
|
|
superviseSid: '', |
|
|
|
remarks: "" |
|
|
|
}, |
|
|
|
financeList: [], |
|
|
|
rules: { |
|
|
|
financeSid: [{ |
|
|
|
superviseName: [{ |
|
|
|
required: true, |
|
|
|
message: '监盘人不能为空', |
|
|
|
trigger: 'change' |
|
|
@ -272,13 +277,17 @@ |
|
|
|
created() { |
|
|
|
this.loadList() |
|
|
|
|
|
|
|
selFianceByOrgSidPath({ |
|
|
|
orgPath: window.sessionStorage.getItem('defaultOrgPath') |
|
|
|
selAllByOrgSidPath({ |
|
|
|
orgSidPath: window.sessionStorage.getItem('defaultOrgPath') |
|
|
|
}).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
this.financeList = res.data |
|
|
|
|
|
|
|
console.log("aaaaaa", this.financeList); |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
methods: { |
|
|
|
selectFinance(val) { |
|
|
@ -287,20 +296,25 @@ |
|
|
|
|
|
|
|
const choose = this.financeList.filter((item) => val.includes(item.sid)) |
|
|
|
console.log('>>>>>>>>>selectFinance', choose) |
|
|
|
this.formobj.superviseName = choose[0].name |
|
|
|
this.formobj.superviseSid = choose[0].sid |
|
|
|
|
|
|
|
this.formobj.finances = [] |
|
|
|
for (var i = 0; i < choose.length; i++) { |
|
|
|
// this.formobj.finances = [] |
|
|
|
// for (var i = 0; i < choose.length; i++) { |
|
|
|
|
|
|
|
this.formobj.finances.push({ |
|
|
|
name: choose[i].name, |
|
|
|
sid: choose[i].sid |
|
|
|
}) |
|
|
|
// this.formobj.finances.push({ |
|
|
|
// name: choose[i].name, |
|
|
|
// sid: choose[i].sid |
|
|
|
// }) |
|
|
|
|
|
|
|
} |
|
|
|
// } |
|
|
|
|
|
|
|
}, |
|
|
|
handleClose() { |
|
|
|
this.dialogVisible = false |
|
|
|
this.formobj.superviseName = '' |
|
|
|
this.formobj.superviseSid = '' |
|
|
|
this.formobj.remarks = '' |
|
|
|
}, |
|
|
|
saveExamine() { |
|
|
|
|
|
|
@ -319,9 +333,13 @@ |
|
|
|
this.formobj = { |
|
|
|
createByName: window.sessionStorage.getItem('name'), |
|
|
|
createBySid: window.sessionStorage.getItem('userSid'), |
|
|
|
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage |
|
|
|
.getItem('defaultOrgPath').lastIndexOf('/') + 1), |
|
|
|
deptName: window.sessionStorage.getItem('defaultOrgPathName').substring(window |
|
|
|
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1), |
|
|
|
createDate: getCurrentDate(), |
|
|
|
financeSid: [], |
|
|
|
finances: [], |
|
|
|
superviseName: '', |
|
|
|
superviseSid: '', |
|
|
|
remarks: "" |
|
|
|
} |
|
|
|
this.loadList() |
|
|
@ -360,6 +378,9 @@ |
|
|
|
}, |
|
|
|
loadList() { |
|
|
|
this.tableLoading = true |
|
|
|
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') |
|
|
|
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') |
|
|
|
this.queryParams.params.menuUrl = this.$route.path |
|
|
|
req.listPage(this.queryParams).then((resp) => { |
|
|
|
this.tableLoading = false |
|
|
|
if (resp.success) { |
|
|
@ -407,9 +428,9 @@ |
|
|
|
"billNo": "", |
|
|
|
"createStartTime": "", |
|
|
|
"createEndTime": "", |
|
|
|
"stocktakType": "", |
|
|
|
"checkState": "", |
|
|
|
"createByName": "", |
|
|
|
"finance": "" |
|
|
|
"superviseName": "" |
|
|
|
} |
|
|
|
} |
|
|
|
this.loadList() |
|
|
@ -418,10 +439,11 @@ |
|
|
|
// this.viewState = 2 |
|
|
|
// this.$refs['divadd'].showAdd() |
|
|
|
|
|
|
|
|
|
|
|
this.dialogVisible = true |
|
|
|
this.$nextTick(() => { |
|
|
|
this.$refs['form_obj'].clearValidate() |
|
|
|
}) |
|
|
|
this.dialogVisible = true |
|
|
|
}, |
|
|
|
selectionLineChangeHandle(val) { |
|
|
|
console.log('val', val) |
|
|
@ -437,7 +459,7 @@ |
|
|
|
console.log('toDetail', row) |
|
|
|
|
|
|
|
this.viewState = 5 |
|
|
|
this.$refs['divinfo'].loadList(row.sid) |
|
|
|
this.$refs['divinfo'].showDetail(row.sid) |
|
|
|
}, |
|
|
|
toShowBill() { |
|
|
|
|
|
|
@ -451,10 +473,10 @@ |
|
|
|
} |
|
|
|
|
|
|
|
this.viewState = 2 |
|
|
|
this.$refs['divstocktak'].loadList(this.selectionList[0].sid) |
|
|
|
this.$refs['divstocktak'].showDetail(this.selectionList[0].sid) |
|
|
|
}, |
|
|
|
toStocktak() { |
|
|
|
if (this.selectionList.length == 0) { |
|
|
|
if (this.selectionList.length != 1) { |
|
|
|
this.$message({ |
|
|
|
type: 'warning', |
|
|
|
message: '请选择一条数据。', |
|
|
@ -463,19 +485,20 @@ |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
for (var i = this.selectionList.length - 1; i >= 0; i--) { |
|
|
|
|
|
|
|
if (this.selectionList[i].isReport == '1') { |
|
|
|
this.$message({ |
|
|
|
type: 'warning', |
|
|
|
message: '所选记录已生成报告,不可重复生成。', |
|
|
|
showClose: true |
|
|
|
}) |
|
|
|
return |
|
|
|
} |
|
|
|
if (this.selectionList[0].state == '0') { |
|
|
|
this.$message({ |
|
|
|
type: 'warning', |
|
|
|
message: '所选记录已生成报告,不可重复生成。', |
|
|
|
showClose: true |
|
|
|
}) |
|
|
|
return |
|
|
|
} |
|
|
|
var params = { |
|
|
|
sid: this.selectionList[0].sid |
|
|
|
} |
|
|
|
|
|
|
|
req.billCreateReport(this.sids).then((resp) => { |
|
|
|
req.billCreateReport(params).then((resp) => { |
|
|
|
if (resp.success) { |
|
|
|
this.$message({ |
|
|
|
type: 'success', |
|
|
|