Skip to content

P
police-jyzb-vue-hzzj
Commit 7baa5c8f by T
Options

配置及环境版本升级

parent 84db9bf8
正在显示 包含 138 行增加 和 31 行删除
config/index.js
......@@ -32,8 +32,8 @@ module.exports = {
},
// Various Dev Server settings
host: '192.168.3.101', // can be overwritten by process.env.HOST
port: 8013, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
host: '192.168.2.104', // can be overwritten by process.env.HOST
port: 8999, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,
notifyOnErrors: false,
......
index.html
......@@ -9,8 +9,8 @@
<!-- 全局配置 -->
<script>
window._CONFIG = {};
window._CONFIG['serviceURL'] = 'http://192.168.2.112:5000';
window._CONFIG['userURL'] = 'http://192.168.2.112:10004';
window._CONFIG['serviceURL'] = 'http://192.168.2.105:5000';
window._CONFIG['userURL'] = 'http://192.168.2.105:10004';
// window._CONFIG['serviceURL'] = 'http://41.190.20.132:5000';
// window._CONFIG['userURL'] = 'http://41.190.20.132:10004';
</script>
......
package.json
......@@ -27,7 +27,7 @@
"codemirror": "^5.38.0",
"connect": "3.6.6",
"echarts": "^4.1.0",
"element-ui": "^2.12.0",
"element-ui": "^2.15.6",
"file-saver": "1.3.8",
"js-cookie": "2.2.0",
"js-md5": "^0.7.3",
......@@ -42,7 +42,6 @@
"screenfull": "3.3.3",
"vbt-table": "^1.0.5",
"viser-vue": "^2.4.8",
"vue": "^2.5.17",
"vue-count-to": "1.0.13",
"vue-native-websocket": "^2.0.14",
"vue-router": "3.1.3",
......@@ -99,9 +98,10 @@
"svgo": "1.2.2",
"uglifyjs-webpack-plugin": "1.2.7",
"url-loader": "1.0.1",
"vue-loader": "15.3.0",
"vue": "^2.6.14",
"vue-loader": "^15.9.7",
"vue-template-compiler": "^2.6.14",
"vue-style-loader": "4.1.2",
"vue-template-compiler": "2.5.17",
"webpack": "^4.41.2",
"webpack-bundle-analyzer": "^3.6.0",
"webpack-cli": "^3.3.9",
......
src/components/Github/index.vue
......@@ -8,6 +8,7 @@
</template>
<script>
import { encrypt } from '@/utils/rsaEncrypt'
export default {
name: 'Github',
data() {
......@@ -16,7 +17,7 @@ export default {
}
},
created() {
this.url = "http://" + window.location.host +"/my-app/?findCode=" + this.$store.state.user.user.baseJpOrganization.findCode
this.url = "http://" + window.location.host +"/my-app/?findCode=" + window.encodeURIComponent(window.btoa(this.$store.state.user.user.baseJpOrganization.findCode))
}
}
</script>
......
src/views/base/houseBaseInfo/index.vue
......@@ -154,7 +154,7 @@
<el-button style="padding: 3px 0" type="text" @click="remoteOpenDoor">远程开门</el-button>
<el-button style="float: right; padding: 3px 0" type="text" @click="$router.push('/video/list')">查看更多</el-button>
</div>
<iframe :src="src" frameborder="no" style="width:100%;height:410px;margin-top:-8px;"/>
<iframe :src="src" frameborder="no" style="width:100%;height:410px;margin-top:-8px;" v-if="showVideo"/>
</el-card>
</el-col>
</el-row>
......@@ -195,6 +195,7 @@ export default {
data() {
return {
isLocked: true,
showVideo: true,
timer: null,
inAndOutList: [],
radio: '库存状态',
......@@ -355,7 +356,7 @@ export default {
//单个库房直接显示库房
this.warehouseId = this.warehouseList[0].id
this.isLocked = !this.warehouseList[0].isLocked
this.src = this.warehouseList[0].cameraUrl ? 'http://'+ this.warehouseList[0].cameraUrl +':8080/ckzp.html' : 'http://127.0.0.1:8080/ckzp.html'
this.src = 'http://'+ this.warehouseList[0].cameraUrl +':8080/ckzp.html'
this.devList = []
this.devId = ''
this.devState = 0
......@@ -397,8 +398,9 @@ export default {
warehouseChange(data) {
this.warehouseId = data.id
this.isLocked = !data.isLocked
this.showVideo = true
let obj = this.warehouseList.find(i => i.id === this.warehouseId)
this.src = obj.cameraUrl ? 'http://'+ obj.cameraUrl +':8080/ckzp.html' : 'http://127.0.0.1:8080/ckzp.html'
this.src = 'http://'+ obj.cameraUrl +':8080/ckzp.html'
this.initInAndOutList()
this.getPieInfo()
this.getListDev()
......@@ -468,6 +470,7 @@ export default {
},
showWarehouseList() {
const _this = this.$refs.form
this.showVideo = false
_this.form = {
warehouseList : this.warehouseList
}
......
src/views/system/process/processDefin/PropertyPanel.vue
......@@ -246,7 +246,6 @@ export default {
// 在这里我们封装一个通用的更新节点属性的方法
updateProperties(properties) {
const modeling = this.modeler.get("modeling");
//console.log(this.element, properties)
modeling.updateProperties(this.element, properties);
}
}
......
src/views/warehouse/inAndOut/warehouseLog.vue
......@@ -54,14 +54,14 @@
<!--表格开始-->
<el-table ref="table" v-loading="loading" :data="data" style="width: 100%;" stripe border :header-cell-style="{'text-align':'center'}">
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column label="订单编号" :show-overflow-tooltip="true" align="center" v-if="actionState!=13" width="200">
<el-table-column label="订单编号" :show-overflow-tooltip="true" align="center" v-if="actionState!=13" width="200" sortable>
<template slot-scope="scope">
<el-link type="primary" @click="showOrder(scope.row)">{{ scope.row.order }}</el-link>
</template>
</el-table-column>
<el-table-column prop="warehouseName" label="仓库名称" align="center"/>
<el-table-column prop="equipmentName" label="装备名称" align="center"/>
<el-table-column prop="sizeName" label="装备型号名称" align="center"/>
<el-table-column prop="equipmentName" label="装备名称" align="center" sortable/>
<el-table-column prop="sizeName" label="型号名称" align="center" sortable/>
<el-table-column prop="policeName" label="操作人员" align="center"/>
<el-table-column prop="createTime" label="操作时间" align="center" width="200"/>
<el-table-column prop="epc" label="epc" align="center" :show-overflow-tooltip="true" v-if="roleIds.includes(4) || roleIds.includes(1)"/>
......
src/views/warehouse/inAndOutMang/common.vue
......@@ -80,7 +80,7 @@
<template slot-scope="scope">
<el-button size="mini" type="primary" key="2" @click="show(scope.row)">查看</el-button>
<el-button size="mini" type="warning" key="3" @click="printExcel(scope.row.order)" v-if="scope.row.stateType == '0' && scope.row.type == 1">打印</el-button>
<el-button size="mini" type="warning" key="4" @click="printExcel2(scope.row.order)" v-if="scope.row.stateType == '0' && (scope.row.type == 0 || scope.row.type == 4)">打印</el-button>
<el-button size="mini" type="warning" key="4" @click="printExcel2(scope.row.order)" v-if="(scope.row.type == 0 || scope.row.type == 4)">打印</el-button>
<el-button size="mini" type="warning" key="1" v-if="scope.row.type == 11 && scope.row.currentState == 1" @click="transfer(scope.row)">转换</el-button>
</template>
</el-table-column>
......@@ -129,7 +129,6 @@
import initData from '@/mixins/initData'
import { initPdata } from '@/api/data'
import { borrowTransfer } from '@/api/borrow'
import md5 from 'js-md5'
import BorrowDetail from '@/views/warehouse/borrow/list/form'
import PurseDetail from '@/views/purse/list/form'
import RmDetail from '@/views/rms/rm/rmList/form'
......
src/views/warehouse/inAndOutMang/dbPrint.vue
......@@ -14,20 +14,30 @@
<col width=207 style='mso-width-source:userset;mso-width-alt:6624;width:155pt'>
<tr height=48 style='mso-height-source:userset;height:36.0pt'>
<td colspan=10 height=48 class=xl8426343 width=1071 style='height:36.0pt;
width:804pt'>{{ $store.state.user.user.baseJpOrganization.dname ||$store.state.user.user.baseJpOrganization.name }}警用装备{{ dbType }}拨单</td>
width:804pt'>{{ $store.state.user.user.baseJpOrganization.dname || $store.state.user.user.baseJpOrganization.name }}警用装备调拨单</td>
</tr>
<tr height=33 style='mso-height-source:userset;height:24.95pt'>
<td colspan=2 height=33 class=xl6526343 style='height:24.95pt'></td>
<td class=xl6526343></td>
<td class=xl6626343>单<span style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;
<td class=xl6626343>单<span style='mso-spacerun:yes'>
</span>号：</td>
<td class=xl6726343 colspan=2>{{printOrderCode.replace('类', dbType)}}</td>
<td class=xl6826343></td>
<td class=xl6626343>日<span style='mso-spacerun:yes'>&nbsp;&nbsp;&nbsp;
<td class=xl6626343>日<span style='mso-spacerun:yes'>
</span>期：</td>
<td class=xl7926343>{{ printOrderTime }}</td>
<td class=xl6926343></td>
</tr>
<tr height=33 style='mso-height-source:userset;height:24.95pt'>
<td height=33 class=xl6526343 style='height:24.95pt'></td>
<td class=xl6526343></td>
<td class=xl6526343></td>
<td class=xl6626343>调 拨 依 据：</td>
<td class=xl6726343 colspan=2>领导批准同意</td>
<td class=xl6826343></td>
<td class=xl6626343>调 拨 性 质：</td>
<td class=xl7926343 colspan=2>{{ dbType }}拨</td>
</tr>
<tr height=33 style='mso-height-source:userset;height:24.95pt'>
<td height=33 class=xl6526343 style='height:24.95pt'></td>
<td class=xl6526343></td>
......@@ -67,7 +77,7 @@
<td class=xl7226343 style='border-top:none'>{{ this.form.resultPriceList ? this.form.resultPriceList.length >= 1 ? this.form.resultPriceList[0].price : '' : ''}}</td>
<td class=xl7026343 style='border-top:none;border-left:none'>{{ this.form.resultPriceList ? this.form.resultPriceList.length >= 1 ? this.form.resultPriceList[0].count : '' : ''}}</td>
<td class=xl7226343 style='border-top:none'>{{ this.form.resultPriceList ? this.form.resultPriceList.length >= 1 ? this.form.resultPriceList[0].totalPrice : '' : ''}}</td>
<td class=xl8026343 style='border-top:none;border-left:none'>　</td>
<td class=xl8026343 style='border-top:none;border-left:none'> </td>
</tr>
<tr height=33 style='mso-height-source:userset;height:24.95pt'>
<td height=33 class=xl7026343 style='height:24.95pt;border-top:none'>2</td>
......@@ -162,7 +172,7 @@
<tr height=33 style='mso-height-source:userset;height:24.95pt'>
<td colspan=3 height=33 class=xl8526343 style='height:24.95pt'>合计金额（大写）：</td>
<td colspan=5 class=xl8926343 style='border-right:.5pt solid black'>{{digitUppercase(totalPrice)}}</td>
<td class=xl8126343 align=right style='border-top:none;border-left:none'>￥{{totalPrice}}
<td class=xl8126343 align=right style='border-top:none;border-left:none'>￥{{totalPrice.toFixed(2)}}
</td>
<td class=xl8126343 style='border-top:none;border-left:none'>　</td>
</tr>
......@@ -179,13 +189,13 @@
<tr height=66 style='page-break-before:always;mso-height-source:userset;
height:50.1pt'>
<td colspan=2 height=66 class=xl9126343 style='height:50.1pt'>审 批 人</td>
<td colspan=2 class=xl7626343>{{ this.form.historyList ? this.form.historyList[0].auditUserName : '' }}</td>
<td colspan=2 class=xl7626343></td>
<td class=xl7726343>财 务 章</td>
<td class=xl7726343>　</td>
<td class=xl7826343>经 办 人</td>
<td class=xl7626343> &nbsp;{{ this.form.historyList ? this.form.historyList[1].auditUserName : '' }}</td>
<td class=xl7626343> &nbsp;</td>
<td class=xl7826343>经 办 人</td>
<td class=xl8326343>&nbsp;{{ this.form.historyList ? this.form.historyList[this.form.historyList.length-1].auditUserName : '' }}</td>
<td class=xl8326343>&nbsp;</td>
</tr>
<!-- <![if supportMisalignedColumns]> -->
<tr height=0 style='display:none'>
......
src/views/warehouse/scrap/index.vue
......@@ -17,9 +17,11 @@
<el-cascader v-model="orgId" :options="orgList" @change="toPostQuery" class="filter-item" style="width: 300px"
:props="{ value: 'id', label: 'name', checkStrictly: true, emitPath: false }" filterable
:show-all-levels="false" placeholder="请选择本级或下级的组织机构"/>
<el-button :loading="downloadLoading" class="filter-item" type="warning" icon="el-icon-download" style="float: right" @click="download">导出</el-button>
</div>
<!--表格渲染-->
<el-table v-loading="loading" :data="data" style="width: 100%;" stripe border ref="table" @row-click="rowClick">
<el-table v-loading="loading" :data="data" style="width: 100%;" show-summary :summary-method="getSummaries" stripe border ref="table" @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;">
......@@ -46,6 +48,7 @@
<el-table-column prop="equName" label="装备名称" align="center"/>
<el-table-column prop="sizeName" label="装备型号名称" align="center"/>
<el-table-column prop="count" label="数量" align="center"/>
</el-table>
<!--分页组件-->
<el-pagination
......@@ -66,6 +69,8 @@ import { parseTime } from '@/utils/index'
import equInfoDetail from '@/views/warehouse/maintenance/form'
import { getInfoByID } from '@/api/inventory'
import { getListOrg } from '@/api/org'
import { initPdata } from '@/api/data'
import { transform } from '@/utils/index'
export default {
mixins: [initData],
data() {
......@@ -73,7 +78,8 @@ export default {
days: "7",
scrap: true,
orgList: [],
orgId: this.$store.state.user.user.baseJpOrganization.id
orgId: this.$store.state.user.user.baseJpOrganization.id,
downloadLoading: false
}
},
components: { equInfoDetail },
......@@ -116,6 +122,68 @@ export default {
const table = this.$refs.table
table.toggleRowExpansion(row)
},
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 2) {
sums[index] = '本页合计';
return;
}
if (index === 4) {
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
sums[index] += '';
} else {
sums[index] = '';
}
});
return sums;
},
download() {
this.downloadLoading = true
var params = { page: this.page, size: 9999, orgId: this.orgId || this.$store.state.user.user.baseJpOrganization.id }
const days = this.days
const scrap = this.scrap
if (days) { params['days'] = days }
if (scrap != null && scrap != undefined) { params['scrap'] = scrap }
let list = []
let result = []
initPdata(this.url, transform(params)).then(res => {
if(res.code == '10000') {
list = res.data.content
import('@/utils/Export2Excel备份').then(excel => {
const tHeader = ['仓库名称', '装备名称', '装备型号名称', '数量']
const filterVal = ['warehouseName', 'equName', 'sizeCount', 'count']
result = this.formatJson(filterVal, list)
excel.export_json_to_excel({
header: tHeader,
data: result,
filename: this.excelName || '已超期未报废列表',
autoWidth: true,
bookType: 'xlsx'
})
this.downloadLoading = false
})
} else {
this.$message.error(res.msg)
}
})
},
formatJson(filterVal, jsonData) {
return jsonData.map(v => filterVal.map(j => { return v[j] }))
},
}
}
</script>
......
src/views/warehouse/transfer/main/common.vue
......@@ -75,6 +75,7 @@
<el-table-column label="操作" width="150" align="left" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="primary" key="1" @click="show(scope.row)" v-if="activeName != 1">查看</el-button>
<el-button size="mini" type="warning" key="5" @click="printExcel2(scope.row.order)" v-if="activeName != 1 && scope.row.flowState">打印</el-button>
<el-button size="mini" type="warning" key="2" @click="edit(scope.row)" v-if="!scope.row.flowState && scope.row.userInfo === '' && activeName == 0">编辑</el-button>
<el-button size="mini" type="warning" key="3" @click="approval(scope.row)" v-if="activeName == 1">审批</el-button>
<el-button size="mini" type="danger" key="4" :loading="loading" v-if="!scope.row.flowState && scope.row.userInfo !== '' && activeName == 0" @click="back(scope.row)">撤销</el-button>
......@@ -89,6 +90,18 @@
layout="total, prev, pager, next, sizes"
@size-change="postSizeChange"
@current-change="postPageChange"/>
<el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="dialogVisible" title="选择调拨单据类型" width="500px">
<el-radio-group v-model="dbType" class="filter-item" style="margin-left: 110px;">
<el-radio label="支" border>支拨单</el-radio>
<el-radio label="价" border>价拨单</el-radio>
</el-radio-group>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="clickOrderType">确认</el-button>
</div>
</el-dialog>
<db-print-excel ref="dbprint" />
</div>
</template>
<script>
......@@ -98,13 +111,18 @@ import approvalForm from '../tranApproval/form'
import listForm from '../list/form'
import { getProcess } from '@/api/process'
import { approveOrder, getByID } from '@/api/transfer'
import DbPrintExcel from '../../inAndOutMang/dbPrint.vue'
export default {
name: 'TransferCommon',
mixins: [initData],
props: ['warehouseList', 'activeName'],
components: { applyForm, listForm, approvalForm },
components: { applyForm, listForm, approvalForm, DbPrintExcel },
data() {
return {
dialogVisible: false,
dbOrder: '',
dbType: '支',
loading: false,
orderId: '',
approveType: '3',
......@@ -129,6 +147,15 @@ export default {
this.orderId = this.$route.query.orderId
},
methods: {
printExcel2(order) {
this.dbOrder = order
this.dialogVisible = true
},
clickOrderType() {
this.$refs.dbprint.dbType = this.dbType
this.$refs.dbprint.showOrderDetail(this.dbOrder)
this.$refs.dbprint.dialog = true
},
tabChange() {
this.query = {}
this.$nextTick(() => {
......
src/views/warehouse/transfer/tranApply/form.vue
......@@ -230,13 +230,13 @@ export default {
else {
var iseEquipmentAdd = false;
for(var i=0;i<this.form.detailList.length;i++){
if(this.form.detailList[i].equipmentSizeId === this.equipmentSizeId){
if((this.form.detailList[i].equipmentDetailId + this.form.detailList[i].equipmentSizeId) === (this.equipmentDetailId + this.equipmentSizeId)){
iseEquipmentAdd = true;
}
}
if(iseEquipmentAdd){
this.$message({
message: '此装备号型已添加过',
message: '此装备已添加过',
type: 'warning'
})
} else {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论