Skip to content

P
police-bigdata-vue-all
Commit d7eff98c by T
Options

调拨销毁单自适应打印

parent df714b2f
正在显示 包含 88 行增加 和 48 行删除
src/components/Github/index.vue
......@@ -17,7 +17,13 @@ export default {
}
},
created() {
this.url = "http://" + window.location.host +"/my-app/?findCode=" + window.encodeURIComponent(window.btoa(this.$store.state.user.user.baseJpOrganization.findCode))
//若为分局及以上则传findCode
if(this.$store.state.user.user.baseJpOrganization.code.substring(6,8) == '00'){
this.url = "http://" + window.location.host +"/my-app/?findCode=" + window.encodeURIComponent(window.btoa(this.$store.state.user.user.baseJpOrganization.findCode))
}else{
this.url = "http://" + window.location.host +"/my-app/?findCode=" + window.encodeURIComponent(window.btoa(this.$store.state.user.user.baseJpOrganization.code))
}
}
}
</script>
......
src/layout/components/Navbar.vue
......@@ -6,7 +6,8 @@
<div style="font-size:30px;font-weight:600;letter-spacing:3px;position:relative;top:-6px;color: #f6f6f6;z-index: -1;"><center><span>{{ name }}警用装备智能管理平台</span></center></div>
<div class="right-menu" style="margin-top:-50px;">
<template v-if="device!=='mobile'">
<el-tooltip content="大屏展示" effect="dark" placement="bottom" v-show="$store.state.user.user.baseJpOrganization.code.substring(6,8) == '00'">
<el-tooltip content="大屏展示" effect="dark" placement="bottom" v-show="$store.state.user.user.baseJpOrganization.code.substring(9,11) == '00'">
<!-- <el-tooltip content="大屏展示" effect="dark" placement="bottom" v-show="$store.state.user.user.baseJpOrganization.code.substring(6,8) == '00'"> -->
<Github class="screenfull right-menu-item"/>
</el-tooltip>
</template>
......
src/views/login.vue
......@@ -152,6 +152,7 @@ export default {
this.$store.dispatch('Login', user).then(() => {
this.loading = false
setTimeout(this.purchaseAlert , 2000)
//判断密码为123456(MD5)，跳转强行提示修改
if(user.password === 'e10adc3949ba59abbe56e057f20f883e'){
this.$router.push({path:'/user/center', query: { fromLoginPage: 'true' }});
......
src/views/purse/list/index.vue
......@@ -13,7 +13,7 @@
<eForm ref="form"/>
<eListForm ref="eListForm"/>
<!--表格渲染-->
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;" stripe border >
<el-table v-loading="loading" :data="data" size="small" style="width: 100%;" stripe border>
<el-table-column type="index" label="序号" width="50"/>
<el-table-column prop="orderCode" label="采购单号"/>
<el-table-column prop="warehouseName" label="目标仓库"/>
......
src/views/warehouse/equipmentall/form.vue
......@@ -2,10 +2,10 @@
<el-dialog :append-to-body="true" :close-on-click-modal="false" :before-close="cancel" ref="form" :visible.sync="dialog" :title="'查看装备库存状态'" width="1200px">
<!-- 搜索 -->
<div class="head-container">
<el-cascader v-model="id" :options="orgList"
<!-- <el-cascader v-model="id" :options="orgList"
:props="{ value: 'id', label: 'name', checkStrictly: true, emitPath: false }" filterable
class="filter-item" style="width: 300px;margin-left:0px" placeholder="请选择本级或下级的组织机构" @change="orgChange"/>
<el-select v-model="sizeId"
class="filter-item" style="width: 300px;margin-left:0px" placeholder="请选择本级或下级的组织机构" @change="orgChange"/> -->
<!-- <el-select v-model="sizeId"
v-if="id!==''"
style="width:240px "
class="filter-item"
......@@ -13,9 +13,8 @@
placeholder="请选择装备型号"
@change="orgChangeSizeFind">
<el-option v-for="item in equipmentSizeList" :key="item.id" :label="item.sizeName" :value="item.id"/>
</el-select>
</el-select> -->
<el-select v-model="sizeId"
v-if="id==''"
style="width:240px "
class="filter-item"
:filterable="true"
......@@ -35,7 +34,7 @@
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="equipmentName" label="装备名称" align="center"/>
<el-table-column prop="sizeName" label="装备型号名称" align="center"/>
<el-table-column prop="orgName" label="组织机构名称" width="300" align="center"/>
<!-- <el-table-column prop="orgName" label="组织机构名称" width="300" align="center"/> -->
<el-table-column prop="zsCount" label="装备总数" align="center"/>
<el-table-column prop="zkCount" label="在库数" align="center"/>
<el-table-column prop="ckCount" label="出库数" align="center"/>
......@@ -81,6 +80,7 @@ export default {
},
methods: {
initTable(equipmentId, findCode, orgCode, code, orgId) {
console.log(orgCode)
this.equipmentId = equipmentId
this.findCode= findCode
this.orgId = orgId
......@@ -132,21 +132,22 @@ export default {
reject(err)
})
})
},
orgChangeSizeFind(){
this.findCode=this.findCode,
this.initPost2()
},
// orgChangeSizeFind(){
// this.findCode=this.findCode,
// this.initPost2()
// },
orgChangeSizeFind2(sizeId){
this.sizeId =sizeId
this.findCode=this.findCode,
this.initPost3()
// this.findCode=this.findCode,
this.initPost()
//console.log('2222')
},
async initPost3() {
return new Promise((resolve, reject) => {
this.loading = true
initPdata(this.url, transform({findCode: this.findCode, equipmentId: this.equipmentId, sizeId: this.sizeId})).then(res => {
initPdata(this.url, transform({findCode: this.findCode, orgCode: this.orgCode, equipmentId: this.equipmentId, sizeId: this.sizeId})).then(res => {
if (res.code === '10000') {
this.data = res.data
//按号型重新排序
......@@ -172,6 +173,7 @@ export default {
async initPost() {
return new Promise((resolve, reject) => {
this.loading = true
this.params.sizeId = this.sizeId
initPdata(this.url, transform(this.params)).then(res => {
if (res.code === '10000') {
this.data = res.data
......
src/views/warehouse/equipmentall/index.vue
......@@ -51,9 +51,33 @@
<el-table ref="table" v-loading="loading" :data="data" show-summary :summary-method="getSummaries" stripe border style="width: 100%;" @row-click="rowClick">
<el-table-column type="expand" width="50">
<template slot-scope="props">
<el-table :data="props.row.children" stripe border style="width: 94%;margin: auto;">
<el-table :data="props.row.orgChild" stripe border style="width: 94%;margin: auto;" >
<el-table-column type="expand" width="50">
<template slot-scope="props1">
<el-table :data="props1.row.children" stripe border style="width: 94%;margin: auto;">
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="name" label="装备类型名称" align="center"/>
<el-table-column prop="zsCount" label="总数" sortable align="center"/>
<el-table-column prop="zkCount" label="在库数" sortable align="center"/>
<el-table-column prop="ckCount" label="出库数" sortable align="center"/>
<el-table-column prop="djgCount" label="单警柜在库数" sortable align="center"/>
<el-table-column prop="djgckCount" label="单警柜出库数" sortable align="center"/>
<el-table-column prop="bfCount" label="销毁数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code === '330200000000'"/>
<el-table-column prop="bfCount" label="报废数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code !== '330200000000'"/>
<el-table-column label="操作" width="80" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="show(scope.row.id, props1.row.findCode, props1.row.orgCode,props1.row.orgId)">查看</el-button>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="name" label="装备类型名称" align="center"/>
<el-table-column prop="nameJc" label="组织机构名称" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ (scope.row.orgCode === code ? scope.row.orgName + '本级' : scope.row.orgName.replace(orgName, '')) }}
</template>
</el-table-column>
<el-table-column prop="zsCount" label="总数" sortable align="center"/>
<el-table-column prop="zkCount" label="在库数" sortable align="center"/>
<el-table-column prop="ckCount" label="出库数" sortable align="center"/>
......@@ -61,20 +85,11 @@
<el-table-column prop="djgckCount" label="单警柜出库数" sortable align="center"/>
<el-table-column prop="bfCount" label="销毁数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code === '330200000000'"/>
<el-table-column prop="bfCount" label="报废数" sortable align="center" v-if="$store.state.user.user.baseJpOrganization.code !== '330200000000'"/>
<el-table-column label="操作" width="80" align="center" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="show(scope.row.id, props.row.findCode, props.row.orgCode,props.row.orgId)">查看</el-button>
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column type="index" label="序号" align="center" width="50"/>
<el-table-column prop="orgName" label="组织机构名称" align="center" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{ scope.row.nameJc ? scope.row.nameJc : scope.row.orgName }}
<!-- {{ scope.row.nameJc ? scope.row.nameJc : (scope.row.orgCode === code ? scope.row.orgName + '本级' : scope.row.orgName.replace(orgName, '')) }} -->
</template>
<el-table-column prop="nameJc" label="组织机构名称" align="center" :show-overflow-tooltip="true">
</el-table-column>
<el-table-column prop="zsCount" label="总数" sortable align="center"/>
<el-table-column prop="zkCount" label="在库数" sortable align="center"/>
......@@ -107,6 +122,8 @@ import { initPdata } from '@/api/data'
import md5 from 'js-md5'
import cnchar from "cnchar";
import eForm from './form'
import XLSX from 'xlsx';
export default {
name: 'Equipmentall',
mixins: [initData],
......@@ -116,7 +133,7 @@ export default {
data() {
return {
orgId: this.$store.state.user.user.baseJpOrganization.id,
orgName: '',
orgName: this.$store.state.user.user.baseJpOrganization.name,
code: this.$store.state.user.user.baseJpOrganization.code,
typeId: '',
orgList: [],
......@@ -263,16 +280,24 @@ export default {
initPdata(this.url, params).then(res => {
if(res.code == '10000') {
list = res.data.content
let arr = []
import('@/utils/Export2Excel').then(excel => {
const tHeader = ['装备名称', '总数', '在库数', '出库数', '报废数']
const filterVal = ['name', 'zsCount', 'zkCount', 'ckCount', 'bfCount']
for (let org of list) {
for (let item of list) {
let orgChild = item.orgChild;
for (let org of orgChild) {
arr.push(org)
}
}
for(let k of arr) {
result.push({
sheetTitle: org.orgName,
sheetTitle: k.orgName,
th: tHeader,
data: this.formatJson(filterVal, org.children)
})
data: this.formatJson(filterVal, k.children)
});
}
excel.export_json_to_excel({
// header: tHeader,
data: result,
......
src/views/warehouse/scrap/index.vue
......@@ -51,7 +51,7 @@
<el-table-column prop="count" label="数量" align="center"/>
<el-table-column label="操作" v-if="orgCode === '330200000000'" width="150px" align="center">
<template slot-scope="scope">
<el-button size="mini" type="primary" @click="quickScrap(scope.row)">报废</el-button>
<el-button size="mini" type="primary" @click.stop="quickScrap(scope.row)">报废</el-button>
</template>
</el-table-column>
</el-table>
......@@ -206,13 +206,14 @@ export default {
this.detailList = val
console.log(val)
},
quickScrap(row){
// console.log(row)
this.form.warehouseId = row.warehouseId
this.form.flowType = 'scrap'
this.form.detailList = []
this.detailList.forEach(element => {
this.form.detailList.push({
quickScrap(row) {
this.form.warehouseId = row.warehouseId;
this.form.flowType = 'scrap';
this.form.detailList = [];
// 添加一个条件判断来确保 this.detailList 是一个有效的数组
if (Array.isArray(this.detailList) && this.detailList.length !== 0) {
this.form.detailList = this.detailList.map(element => ({
equipmentId: element.equId,
equipmentSizeId: element.sizeId,
supplierId: element.supplierId,
......@@ -220,19 +221,23 @@ export default {
quantity: 1,
unitPrice: element.unitPrice,
price: element.unitPrice * 1
})
})
if (this.form.detailList.length == 0) {
return this.$message.warning('至少报废一件')
}));
} else {
return this.$message.warning('至少报废一件,请展开勾选');
}
quickAddFixed(this.form).then(res => {
if (res.code === '10000') {
this.initPost()
this.$message.success('操作成功！');
this.initPost();
this.detailList = [];
} else {
this.$message.error(res.msg)
this.$message.error(res.msg);
}
})
});
}
}
}
</script>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论