|
@@ -29,12 +29,19 @@
|
|
|
</div> -->
|
|
|
<!-- <div class="videoImg">
|
|
|
<div class="videoImg-row">
|
|
|
- <img :src="imgSrc1.videoSrc1" alt="" class="" style="width:100%"/>
|
|
|
- <el-button @click='positionPlace(1)' type="primary">定位车辆</el-button>
|
|
|
+ <video id="videoElement" autoplay muted width="50%"></video>
|
|
|
+ <video id="videoElement1" autoplay muted width="50%"></video>
|
|
|
</div>
|
|
|
+
|
|
|
<div class="videoImg-row">
|
|
|
- <img :src="imgSrc1.videoSrc2" alt="" class="" style="width:100%"/>
|
|
|
- <el-button @click='positionPlace(2)' type="primary">定位车辆</el-button>
|
|
|
+ <div class="carnumber-style">
|
|
|
+ <el-button @click='positionPlace(1)' type="primary" class="btn">定位车辆</el-button>
|
|
|
+ <div class="number">车牌号1:{{ $store.state.user.carNumber1 }}</div>
|
|
|
+ </div>
|
|
|
+ <div class="carnumber-style">
|
|
|
+ <el-button @click='positionPlace(2)' type="primary" class="btn">定位车辆</el-button>
|
|
|
+ <div class="number">车牌号2:{{ $store.state.user.carNumber2 }}</div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div> -->
|
|
|
<!-- <img :src="imgSrc1.videoSrc.videoSrc2" alt="" class="" style="width:100%"/> -->
|
|
@@ -190,7 +197,7 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
<el-button @click='refreshClick(1)' type="primary">刷新</el-button>
|
|
|
- <el-button @click='refreshClick' type="primary">{{ timer ? refresh : '自动刷新' }}</el-button>
|
|
|
+ <el-button @click='refreshClick' type="primary">{{ timer? refresh: '自动刷新' }}</el-button>
|
|
|
<!-- <el-checkbox v-model="checked">默认</el-checkbox> -->
|
|
|
</div>
|
|
|
<div class="screen frame">
|
|
@@ -274,7 +281,8 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='甘南宏旗库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
|
|
|
+ <div
|
|
|
+ v-if="warehouseName == '鲅鱼圈金信库' || warehouseName == '白城内陆港' || warehouseName == '杜尔伯特家禾库' || warehouseName == '甘南宏旗库' || warehouseName == '洮南新友谊兴旺库' || warehouseName == '哈尔滨依兰库' || warehouseName == '山东园丰库'">
|
|
|
<div class="print-type-ew">
|
|
|
<el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
|
|
|
<el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
|
|
@@ -308,6 +316,7 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
+import flvjs from 'flv.js';
|
|
|
import {
|
|
|
tare,
|
|
|
grossWeight,
|
|
@@ -318,18 +327,15 @@ import {
|
|
|
selectWarehouseSelf,
|
|
|
getsettleaccout,
|
|
|
newSubmit,
|
|
|
- getVideo,
|
|
|
- getCarNumber
|
|
|
+ getToken,
|
|
|
+ getRom,
|
|
|
} from '@/model/houseSelfCollect/index'
|
|
|
-import {
|
|
|
- addstorageputList
|
|
|
-} from '@/model/warehouse/index'
|
|
|
import weightCheckPrint from './component/weightCheckPrint.vue'
|
|
|
import BalanceAlert from '@/components/balanceAlert'
|
|
|
import html2canvas from 'html2canvas'
|
|
|
import axios from 'axios'
|
|
|
import configText from '../../../vue.config.js'
|
|
|
-import {whetherWebSocket1,whetherWebSocket2} from '@/utils/webSocket';
|
|
|
+import { whetherWebSocket1, whetherWebSocket2 } from '@/utils/webSocket';
|
|
|
export default {
|
|
|
components: {
|
|
|
weightCheckPrint,
|
|
@@ -360,7 +366,7 @@ export default {
|
|
|
if (_saomaData.managementType) {
|
|
|
this.inWarehouseType = _saomaData.managementType
|
|
|
}
|
|
|
- } else if (localStorage.getItem('houseSelfCollect_house1')) {debugger
|
|
|
+ } else if (localStorage.getItem('houseSelfCollect_house1')) {
|
|
|
// this.ip1 =
|
|
|
// this.ip2 =
|
|
|
this.warehouseName = JSON.parse(localStorage.getItem('houseSelfCollect_house1')).value
|
|
@@ -374,7 +380,6 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- debugger
|
|
|
localStorage.setItem('houseSelfCollect_house1', JSON.stringify({
|
|
|
value: this.warehouseList[0].warehouseName,
|
|
|
warehouseId: this.warehouseList[0].id,
|
|
@@ -382,8 +387,9 @@ export default {
|
|
|
No: this.warehouseList[0].commonWarehouseNo,
|
|
|
allowEdit: this.warehouseList[0].allowEdit,
|
|
|
compId: localStorage.getItem('ws-pf_compId'),
|
|
|
- ip1:this.warehouseList[0].shexiang1,
|
|
|
- ip2:this.warehouseList[0].shexiang2
|
|
|
+ ip1: this.warehouseList[0].shexiang1,
|
|
|
+ ip2: this.warehouseList[0].shexiang2
|
|
|
+
|
|
|
}))
|
|
|
this.warehouseName = this.warehouseList[0].warehouseName
|
|
|
localStorage.setItem('ck', this.warehouseName)
|
|
@@ -439,9 +445,18 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- warehouseInfo:{},
|
|
|
- carNumber:this.$store.state.user.carNumber,
|
|
|
- imgSrc1:this.$store.state.user,
|
|
|
+ player: null,
|
|
|
+ // VideoSrc: '',
|
|
|
+ // VideoSrc1:'',
|
|
|
+ ip1: '',
|
|
|
+ ip2: '',
|
|
|
+ rom1: '',
|
|
|
+ rom2: '',
|
|
|
+ warehouseInfo: {},
|
|
|
+ carNumber1: this.$store.state.user.carNumber1,
|
|
|
+ carNumber2: this.$store.state.user.carNumber2,
|
|
|
+ // // carNumber: '辽HLZ126',
|
|
|
+ // imgSrc1: this.$store.state.user,
|
|
|
timer: '',
|
|
|
refresh: 60,
|
|
|
isShowBalance: false,
|
|
@@ -581,7 +596,7 @@ export default {
|
|
|
companyNameEWOptions: [{
|
|
|
value: '天津建源供应链管理有限公司',
|
|
|
label: '天津建源供应链管理有限公司'
|
|
|
- },{
|
|
|
+ }, {
|
|
|
value: '厦门建发物产有限公司',
|
|
|
label: '厦门建发物产有限公司'
|
|
|
}],
|
|
@@ -605,137 +620,138 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
+
|
|
|
localStorage.setItem('serverIp', configText.devServer.proxy['/pb'].target)
|
|
|
if (localStorage.getItem('compNameoptions')) {
|
|
|
- var company=JSON.parse(localStorage.getItem('compNameoptions'))
|
|
|
-
|
|
|
- var extra=company.filter((item)=>{
|
|
|
- return item!='黑龙江中天昊元贸易有限公司'
|
|
|
- &&item!='黑龙江利润元粮食贸易有限公司'
|
|
|
- &&item!= '黑龙江众利合粮食贸易有限公司'
|
|
|
- &&item!='黑龙江鑫满仓粮食贸易有限公司'
|
|
|
- &&item!='黑龙江谷香粮食贸易有限公司'
|
|
|
- &&item!='黑龙江秋收有限公司'
|
|
|
- &&item!= '黑龙江欣洋粮食贸易有限公司'
|
|
|
- &&item!='黑龙江益储益运粮食贸易有限公司'
|
|
|
- &&item!='黑龙江启兴粮食贸易有限公司'
|
|
|
- })
|
|
|
- if(extra.length>0){
|
|
|
- this.companyNameOptions=[
|
|
|
+ var company = JSON.parse(localStorage.getItem('compNameoptions'))
|
|
|
+
|
|
|
+ var extra = company.filter((item) => {
|
|
|
+ return item != '黑龙江中天昊元贸易有限公司'
|
|
|
+ && item != '黑龙江利润元粮食贸易有限公司'
|
|
|
+ && item != '黑龙江众利合粮食贸易有限公司'
|
|
|
+ && item != '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ && item != '黑龙江谷香粮食贸易有限公司'
|
|
|
+ && item != '黑龙江秋收有限公司'
|
|
|
+ && item != '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ && item != '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ && item != '黑龙江启兴粮食贸易有限公司'
|
|
|
+ })
|
|
|
+ if (extra.length > 0) {
|
|
|
+ this.companyNameOptions = [
|
|
|
{
|
|
|
- value: '黑龙江中天昊元贸易有限公司',
|
|
|
- label: '黑龙江中天昊元贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江利润元粮食贸易有限公司',
|
|
|
- label: '黑龙江利润元粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江众利合粮食贸易有限公司',
|
|
|
- label: '黑龙江众利合粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
- label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
- label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江谷香粮食贸易有限公司',
|
|
|
- label: '黑龙江谷香粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江秋收有限公司',
|
|
|
- label: '黑龙江秋收有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
- label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江启兴粮食贸易有限公司',
|
|
|
- label: '黑龙江启兴粮食贸易有限公司'
|
|
|
- }]
|
|
|
-
|
|
|
- this.ewCustomerOptions= [
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }]
|
|
|
+
|
|
|
+ this.ewCustomerOptions = [
|
|
|
{
|
|
|
- value: '天津建源供应链管理有限公司',
|
|
|
- label: '天津建源供应链管理有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江中天昊元贸易有限公司',
|
|
|
- label: '黑龙江中天昊元贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江利润元粮食贸易有限公司',
|
|
|
- label: '黑龙江利润元粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江众利合粮食贸易有限公司',
|
|
|
- label: '黑龙江众利合粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
- label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
- label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江谷香粮食贸易有限公司',
|
|
|
- label: '黑龙江谷香粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江秋收有限公司',
|
|
|
- label: '黑龙江秋收有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
- label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江启兴粮食贸易有限公司',
|
|
|
- label: '黑龙江启兴粮食贸易有限公司'
|
|
|
- }]
|
|
|
- this.companyNameEWOptions=[
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }]
|
|
|
+ this.companyNameEWOptions = [
|
|
|
{
|
|
|
- value: '天津建源供应链管理有限公司',
|
|
|
- label: '天津建源供应链管理有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江中天昊元贸易有限公司',
|
|
|
- label: '黑龙江中天昊元贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江利润元粮食贸易有限公司',
|
|
|
- label: '黑龙江利润元粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江众利合粮食贸易有限公司',
|
|
|
- label: '黑龙江众利合粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
- label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
- label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江谷香粮食贸易有限公司',
|
|
|
- label: '黑龙江谷香粮食贸易有限公司'
|
|
|
- },{
|
|
|
- value: '黑龙江秋收有限公司',
|
|
|
- label: '黑龙江秋收有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
- label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
- }, {
|
|
|
- value: '黑龙江启兴粮食贸易有限公司',
|
|
|
- label: '黑龙江启兴粮食贸易有限公司'
|
|
|
- }]
|
|
|
- if(localStorage.getItem('print_company_name')){
|
|
|
- this.companyName=localStorage.getItem('print_company_name')
|
|
|
- }else{
|
|
|
- this.companyName=extra[0]
|
|
|
- }
|
|
|
- if(localStorage.getItem('print_company_name_ew')){
|
|
|
- this.companyNameEW=localStorage.getItem('print_company_name_ew')
|
|
|
- }else{
|
|
|
- this.companyNameEW=extra[0]
|
|
|
- }
|
|
|
- if(localStorage.getItem('print_customer_name_ew')){
|
|
|
- this.ewCustomer=localStorage.getItem('print_customer_name_ew')
|
|
|
- }else{
|
|
|
- this.ewCustomer=extra[0]
|
|
|
- }
|
|
|
- for (let i = 0; i < extra.length; i++) {
|
|
|
- this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
|
|
|
- this.companyNameOptions.push({value: extra[i],label:extra[i]})
|
|
|
- this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
|
|
|
- }
|
|
|
+ value: '天津建源供应链管理有限公司',
|
|
|
+ label: '天津建源供应链管理有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江中天昊元贸易有限公司',
|
|
|
+ label: '黑龙江中天昊元贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江利润元粮食贸易有限公司',
|
|
|
+ label: '黑龙江利润元粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江众利合粮食贸易有限公司',
|
|
|
+ label: '黑龙江众利合粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江鑫满仓粮食贸易有限公司',
|
|
|
+ label: '黑龙江鑫满仓粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江欣洋粮食贸易有限公司',
|
|
|
+ label: '黑龙江欣洋粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江谷香粮食贸易有限公司',
|
|
|
+ label: '黑龙江谷香粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江秋收有限公司',
|
|
|
+ label: '黑龙江秋收有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江益储益运粮食贸易有限公司',
|
|
|
+ label: '黑龙江益储益运粮食贸易有限公司'
|
|
|
+ }, {
|
|
|
+ value: '黑龙江启兴粮食贸易有限公司',
|
|
|
+ label: '黑龙江启兴粮食贸易有限公司'
|
|
|
+ }]
|
|
|
+ if (localStorage.getItem('print_company_name')) {
|
|
|
+ this.companyName = localStorage.getItem('print_company_name')
|
|
|
+ } else {
|
|
|
+ this.companyName = extra[0]
|
|
|
+ }
|
|
|
+ if (localStorage.getItem('print_company_name_ew')) {
|
|
|
+ this.companyNameEW = localStorage.getItem('print_company_name_ew')
|
|
|
+ } else {
|
|
|
+ this.companyNameEW = extra[0]
|
|
|
+ }
|
|
|
+ if (localStorage.getItem('print_customer_name_ew')) {
|
|
|
+ this.ewCustomer = localStorage.getItem('print_customer_name_ew')
|
|
|
+ } else {
|
|
|
+ this.ewCustomer = extra[0]
|
|
|
+ }
|
|
|
+ for (let i = 0; i < extra.length; i++) {
|
|
|
+ this.ewCustomerOptions.push({ value: extra[i], label: extra[i] })
|
|
|
+ this.companyNameOptions.push({ value: extra[i], label: extra[i] })
|
|
|
+ this.companyNameEWOptions.push({ value: extra[i], label: extra[i] })
|
|
|
}
|
|
|
+ }
|
|
|
}
|
|
|
this.isShowBalance = true
|
|
|
var _saomaData = JSON.parse(localStorage.getItem('saoma_data')) //判断是否扫码进来的
|
|
@@ -747,7 +763,6 @@ export default {
|
|
|
.toPromise()
|
|
|
.then((response) => {
|
|
|
this.warehouseList = response
|
|
|
- let _ip1,_ip2;
|
|
|
if (_saomaData) { //缓存中有值,证明扫码进来的
|
|
|
if (_saomaData.managementType) {
|
|
|
this.inWarehouseType = _saomaData.managementType
|
|
@@ -762,15 +777,16 @@ export default {
|
|
|
this.number = _saomaData.number
|
|
|
for (var i = 0; i < response.length; i++) {
|
|
|
if (this.warehouseName == this.warehouseList[i].warehouseName) {
|
|
|
- _ip1 = this.warehouseList[i].shexiang1
|
|
|
- _ip2 = this.warehouseList[i].shexiang2
|
|
|
+ this.ip1 = this.warehouseList[i].shexiang1
|
|
|
+ this.ip2 = this.warehouseList[i].shexiang2
|
|
|
+ this.rom1 = this.warehouseList[i].rom1
|
|
|
+ this.rom2 = this.warehouseList[i].rom2
|
|
|
break
|
|
|
}
|
|
|
}
|
|
|
|
|
|
localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
|
|
|
} else if (localStorage.getItem('houseSelfCollect_house1')) {
|
|
|
- debugger
|
|
|
this.warehouseName = JSON.parse(localStorage.getItem('houseSelfCollect_house1')).value
|
|
|
for (var i = 0; i < response.length; i++) {
|
|
|
if (this.warehouseName == this.warehouseList[i].warehouseName) {
|
|
@@ -778,8 +794,10 @@ export default {
|
|
|
this.monitorUrl1 = this.warehouseList[i].monitorUrl1
|
|
|
this.monitorUrl2 = this.warehouseList[i].monitorUrl2
|
|
|
this.allowEdit = this.warehouseList[i].allowEdit
|
|
|
- _ip1 = this.warehouseList[i].shexiang1
|
|
|
- _ip2 = this.warehouseList[i].shexiang2
|
|
|
+ this.ip1 = this.warehouseList[i].shexiang1
|
|
|
+ this.ip2 = this.warehouseList[i].shexiang2
|
|
|
+ this.rom1 = this.warehouseList[i].rom1
|
|
|
+ this.rom2 = this.warehouseList[i].rom2
|
|
|
break
|
|
|
}
|
|
|
}
|
|
@@ -798,8 +816,10 @@ export default {
|
|
|
this.allowEdit = this.warehouseList[0].allowEdit
|
|
|
this.monitorUrl1 = this.warehouseList[0].monitorUrl1
|
|
|
this.monitorUrl2 = this.warehouseList[0].monitorUrl2
|
|
|
- _ip1 = this.warehouseList[0].shexiang1
|
|
|
- _ip2 = this.warehouseList[0].shexiang2
|
|
|
+ this.ip1 = this.warehouseList[0].shexiang1
|
|
|
+ this.ip2 = this.warehouseList[0].shexiang2
|
|
|
+ this.rom1 = this.warehouseList[0].rom1
|
|
|
+ this.rom2 = this.warehouseList[0].rom2
|
|
|
}
|
|
|
|
|
|
this.deptBudgetList.warehouseName = this.warehouseName
|
|
@@ -814,7 +834,8 @@ export default {
|
|
|
} else if (this.tpyeNo == 2) {
|
|
|
this.information = '皮重'
|
|
|
}
|
|
|
- // this.getVideos(_ip1,_ip2)
|
|
|
+
|
|
|
+ // this.getVideos(this.ip1, this.ip2, this.rom1, this.rom2)
|
|
|
this.getList()
|
|
|
})
|
|
|
},
|
|
@@ -836,38 +857,131 @@ export default {
|
|
|
|
|
|
},
|
|
|
methods: {
|
|
|
- positionPlace(type){
|
|
|
- getCarNumber({
|
|
|
- flag:type
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- console.log(111)
|
|
|
- console.log(response)
|
|
|
-
|
|
|
- })
|
|
|
- .catch((response) => {
|
|
|
-
|
|
|
- })
|
|
|
+ play() {
|
|
|
+ this.flvPlayer.play();
|
|
|
+ },
|
|
|
+ positionPlace(type) {
|
|
|
+ let _number = ''
|
|
|
+ if(type ==1){
|
|
|
+ _number = this.carNumber1
|
|
|
+ }else{
|
|
|
+ _number = this.carNumber2
|
|
|
+ }
|
|
|
console.log('定位车辆')
|
|
|
+ console.log(this.carList)
|
|
|
+ for (let i = 0; i < this.carList.length; i++) {
|
|
|
+ if (_number == this.carList[i].carNumber) {
|
|
|
+ this.setCurrent(this.carList[2])
|
|
|
+ return
|
|
|
+ } else {
|
|
|
+ this.$message({
|
|
|
+ message: '未识别到车辆信息',
|
|
|
+ type: 'warning'
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // getCarNumber({
|
|
|
+ // flag: type,
|
|
|
+ // ip1: this.ip1,
|
|
|
+ // ip2: this.ip2
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // console.log(111)
|
|
|
+ // console.log(response)
|
|
|
+
|
|
|
+ // })
|
|
|
+ // .catch((response) => {
|
|
|
+
|
|
|
+ // })
|
|
|
+ // console.log('定位车辆')
|
|
|
+ // console.log(this.carList)
|
|
|
+ // for (let i = 0; i < this.carList.length; i++) {
|
|
|
+ // if ('黑AU4139' == this.carList[i].carNumber) {
|
|
|
+ // this.setCurrent(this.carList[2])
|
|
|
+ // } else {
|
|
|
+ // this.$message({
|
|
|
+ // message: '未识别到车辆信息',
|
|
|
+ // type: 'warning'
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // }
|
|
|
},
|
|
|
- getVideos(ip1,ip2) {debugger
|
|
|
- if(ip1&&ip2){
|
|
|
- whetherWebSocket1(ip1,localStorage.getItem('ws-pf_userId'))
|
|
|
- whetherWebSocket2(ip2,localStorage.getItem('ws-pf_userId'))
|
|
|
- getVideo({
|
|
|
- ip1:ip1,
|
|
|
- ip2:ip2,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- console.log(111)
|
|
|
-
|
|
|
- })
|
|
|
- .catch((response) => {
|
|
|
+ getVideos(ip1, ip2, rom1, rom2) {
|
|
|
+ if (rom1) {
|
|
|
+ if (flvjs.isSupported()) {
|
|
|
+ getToken({ romId: rom1 })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ console.log(111)
|
|
|
+ // let _accessToken = response.split('$$')[0]
|
|
|
+ let _playUrl = response.split('$$')[1]
|
|
|
+ // this.VideoSrc = _playUrl
|
|
|
+ let videoElement = document.getElementById('videoElement');
|
|
|
+ this.flvPlayer = flvjs.createPlayer({
|
|
|
+ type: 'flv',
|
|
|
+ isLive: true,
|
|
|
+ hasAudio: false,
|
|
|
+ url: _playUrl
|
|
|
+ });
|
|
|
+ this.flvPlayer.attachMediaElement(videoElement);
|
|
|
+ this.flvPlayer.load();
|
|
|
+ this.flvPlayer.play();
|
|
|
|
|
|
- })
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+ whetherWebSocket1(ip1, localStorage.getItem('ws-pf_userId'))
|
|
|
}
|
|
|
+ if (rom2) {
|
|
|
+ if (flvjs.isSupported()) {
|
|
|
+ getRom({ romId: rom2 })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ console.log(111)
|
|
|
+ // let _accessToken = response.split('$$')[0]
|
|
|
+ let _playUrl = response.split('$$')[1]
|
|
|
+ // this.VideoSrc1 = _playUrl
|
|
|
+ let videoElement1 = document.getElementById('videoElement1');
|
|
|
+ this.flvPlayer = flvjs.createPlayer({
|
|
|
+ type: 'flv',
|
|
|
+ isLive: true,
|
|
|
+ hasAudio: false,
|
|
|
+ url: _playUrl
|
|
|
+ });
|
|
|
+ this.flvPlayer.attachMediaElement(videoElement1);
|
|
|
+ this.flvPlayer.load();
|
|
|
+ this.flvPlayer.play();
|
|
|
+
|
|
|
+ })
|
|
|
+ .catch((response) => {
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ whetherWebSocket2(ip2, localStorage.getItem('ws-pf_userId'))
|
|
|
+ }
|
|
|
+
|
|
|
+ // getVideo({
|
|
|
+ // ip1:ip1,
|
|
|
+ // ip2:ip2,
|
|
|
+ // userId:localStorage.getItem('ws-pf_userId')
|
|
|
+ // })
|
|
|
+ // .toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // console.log(111)
|
|
|
+
|
|
|
+ // })
|
|
|
+ // .catch((response) => {
|
|
|
+
|
|
|
+ // })
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
},
|
|
|
refreshClick(type) {
|
|
|
let that = this
|
|
@@ -993,43 +1107,43 @@ export default {
|
|
|
this.isShowPrintType = false
|
|
|
},
|
|
|
async typePrintClick(type) {
|
|
|
- localStorage.setItem('print_company_name',this.companyName)
|
|
|
- localStorage.setItem('print_company_name_ew',this.companyNameEW)
|
|
|
- localStorage.setItem('print_customer_name_ew',this.ewCustomer)
|
|
|
- getPrint({
|
|
|
- id: this.idPrint
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
-
|
|
|
- localStorage.removeItem('print_in_data')
|
|
|
- this.dialogDataList = [] //点击确认时先清空要打印的数组
|
|
|
- this.dialogData = response
|
|
|
- if (response.compName == '黑龙江秋收有限公司') {
|
|
|
- this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
- }else{
|
|
|
- this.dialogData.compName = this.companyName
|
|
|
- }
|
|
|
- if (this.checked) {
|
|
|
- this.dialogDataList.push(this.dialogData)
|
|
|
- var _datas = JSON.stringify(this.dialogData)
|
|
|
- _datas = JSON.parse(_datas)
|
|
|
- _datas.compName = this.companyNameEW;
|
|
|
- _datas.customer = this.ewCustomer
|
|
|
- this.dialogDataList.push(_datas)
|
|
|
- } else if (this.ddchecked) {
|
|
|
- _datas = this.dialogData
|
|
|
- _datas.compName = this.companyNameEW;
|
|
|
- _datas.customer = this.ewCustomer
|
|
|
- this.dialogDataList.push(_datas)
|
|
|
- } else {
|
|
|
- this.dialogData.compName = this.companyName
|
|
|
- this.dialogDataList.push(this.dialogData)
|
|
|
- }
|
|
|
-
|
|
|
- localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
|
|
|
- // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
|
|
|
- window.open('../../../../static/weightCheck.html?type=2&tableData=' )
|
|
|
+ localStorage.setItem('print_company_name', this.companyName)
|
|
|
+ localStorage.setItem('print_company_name_ew', this.companyNameEW)
|
|
|
+ localStorage.setItem('print_customer_name_ew', this.ewCustomer)
|
|
|
+ getPrint({
|
|
|
+ id: this.idPrint
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+
|
|
|
+ localStorage.removeItem('print_in_data')
|
|
|
+ this.dialogDataList = [] //点击确认时先清空要打印的数组
|
|
|
+ this.dialogData = response
|
|
|
+ if (response.compName == '黑龙江秋收有限公司') {
|
|
|
+ this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
|
|
|
+ } else {
|
|
|
+ this.dialogData.compName = this.companyName
|
|
|
+ }
|
|
|
+ if (this.checked) {
|
|
|
+ this.dialogDataList.push(this.dialogData)
|
|
|
+ var _datas = JSON.stringify(this.dialogData)
|
|
|
+ _datas = JSON.parse(_datas)
|
|
|
+ _datas.compName = this.companyNameEW;
|
|
|
+ _datas.customer = this.ewCustomer
|
|
|
+ this.dialogDataList.push(_datas)
|
|
|
+ } else if (this.ddchecked) {
|
|
|
+ _datas = this.dialogData
|
|
|
+ _datas.compName = this.companyNameEW;
|
|
|
+ _datas.customer = this.ewCustomer
|
|
|
+ this.dialogDataList.push(_datas)
|
|
|
+ } else {
|
|
|
+ this.dialogData.compName = this.companyName
|
|
|
+ this.dialogDataList.push(this.dialogData)
|
|
|
+ }
|
|
|
+
|
|
|
+ localStorage.setItem('print_in_data', JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
|
|
|
+ // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
|
|
|
+ window.open('../../../../static/weightCheck.html?type=2&tableData=')
|
|
|
// this.printBig("", this.radio)
|
|
|
})
|
|
|
.catch((response) => { })
|
|
@@ -1046,18 +1160,22 @@ export default {
|
|
|
count: this.warehouseList[i].count,
|
|
|
No: this.warehouseList[i].commonWarehouseNo,
|
|
|
allowEdit: this.warehouseList[i].allowEdit,
|
|
|
- compId: localStorage.getItem('ws-pf_compId')
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ rom1: this.warehouseList[i].rom1,
|
|
|
+ rom2: this.warehouseList[i].rom2
|
|
|
}))
|
|
|
this.cangid = this.warehouseList[i].id
|
|
|
this.monitorUrl1 = this.warehouseList[i].monitorUrl1
|
|
|
this.monitorUrl2 = this.warehouseList[i].monitorUrl2
|
|
|
+ this.rom1 = this.warehouseList[i].rom1
|
|
|
+ this.rom2 = this.warehouseList[i].rom2
|
|
|
this.allowEdit = this.warehouseList[i].allowEdit
|
|
|
if (this.allowEdit == 0) {
|
|
|
this.disabled = true
|
|
|
} else if (this.allowEdit == 1) {
|
|
|
this.disabled = false
|
|
|
}
|
|
|
- this.getVideos(this.warehouseList[i].shexiang1,this.warehouseList[i].shexiang2)
|
|
|
+ // this.getVideos(this.warehouseList[i].shexiang1, this.warehouseList[i].shexiang2, this.rom1, this.rom2)
|
|
|
}
|
|
|
}
|
|
|
this.getList()
|
|
@@ -1236,18 +1354,18 @@ export default {
|
|
|
console.log(this.mList)
|
|
|
|
|
|
var _saomaData = JSON.parse(localStorage.getItem('saoma_data'))
|
|
|
-
|
|
|
- if (_saomaData) {
|
|
|
- let _array = JSON.parse(JSON.stringify(this.mList))
|
|
|
- for (let i = 0; i < this.mList.length; i++) {
|
|
|
- if (this.mList[i].number == _saomaData.number) {
|
|
|
- _array.splice(i, 1)
|
|
|
- _array.unshift(this.mList[i]);
|
|
|
- }
|
|
|
- }
|
|
|
- this.mList = _array
|
|
|
- localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
|
|
|
- }
|
|
|
+
|
|
|
+ if (_saomaData) {
|
|
|
+ let _array = JSON.parse(JSON.stringify(this.mList))
|
|
|
+ for (let i = 0; i < this.mList.length; i++) {
|
|
|
+ if (this.mList[i].number == _saomaData.number) {
|
|
|
+ _array.splice(i, 1)
|
|
|
+ _array.unshift(this.mList[i]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.mList = _array
|
|
|
+ localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
|
|
|
+ }
|
|
|
this.carList = this.mList
|
|
|
this.carList1 = this.mListTotal
|
|
|
for (let i = 0; i < this.mList.length; i++) {
|
|
@@ -1276,7 +1394,7 @@ export default {
|
|
|
this.index = 1
|
|
|
console.log(this.pList)
|
|
|
var _saomaData = JSON.parse(localStorage.getItem('saoma_data'))
|
|
|
-
|
|
|
+
|
|
|
if (_saomaData) {
|
|
|
let _array = JSON.parse(JSON.stringify(this.pList))
|
|
|
for (let i = 0; i < this.pList.length; i++) {
|
|
@@ -1852,68 +1970,68 @@ export default {
|
|
|
//毛检保存前进行校验
|
|
|
var arr = {}
|
|
|
// if (this.purchasePriceList.length != 0) {
|
|
|
- for (let i = 0; i < this.purchasePriceList.length; i++) {
|
|
|
- if (
|
|
|
- this.weighingList.goodsName ==
|
|
|
- this.purchasePriceList[i].goodsName
|
|
|
- ) {
|
|
|
- arr = JSON.parse(JSON.stringify(this.purchasePriceList[i]))
|
|
|
- arr.saleLimit = this.purchasePriceList[i].saleLimit
|
|
|
- }
|
|
|
+ for (let i = 0; i < this.purchasePriceList.length; i++) {
|
|
|
+ if (
|
|
|
+ this.weighingList.goodsName ==
|
|
|
+ this.purchasePriceList[i].goodsName
|
|
|
+ ) {
|
|
|
+ arr = JSON.parse(JSON.stringify(this.purchasePriceList[i]))
|
|
|
+ arr.saleLimit = this.purchasePriceList[i].saleLimit
|
|
|
}
|
|
|
- // console.log('1111111',arr)
|
|
|
- if (Object.keys(arr).length != 0) {
|
|
|
- getamount({
|
|
|
- compId: localStorage.getItem('ws-pf_compId'),
|
|
|
- customerNumberCard: this.weighingList.customerNumberCard,
|
|
|
- goodsName: this.weighingList.goodsName,
|
|
|
- })
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- //累计售粮超上限不能完成毛检保存
|
|
|
- let count = (
|
|
|
- arr.saleLimit -
|
|
|
- response / 1000
|
|
|
- ).toFixed(2)
|
|
|
- if (count - this.weighingList.grossWeight / 1000 < 0) {
|
|
|
- this.$alert(
|
|
|
- '该客户累计销售' +
|
|
|
- this.weighingList.goodsName +
|
|
|
- (response / 1000).toFixed(2) +
|
|
|
- '吨,还可售粮' +
|
|
|
- count +
|
|
|
- '吨',
|
|
|
- '提示', {
|
|
|
- confirmButtonText: '确定',
|
|
|
- // callback: (action) => {
|
|
|
- // this.$message({
|
|
|
- // type: 'info',
|
|
|
- // message: `累计售粮已超出上限`,
|
|
|
- // })
|
|
|
- // },
|
|
|
+ }
|
|
|
+ // console.log('1111111',arr)
|
|
|
+ if (Object.keys(arr).length != 0) {
|
|
|
+ getamount({
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ customerNumberCard: this.weighingList.customerNumberCard,
|
|
|
+ goodsName: this.weighingList.goodsName,
|
|
|
+ })
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ //累计售粮超上限不能完成毛检保存
|
|
|
+ let count = (
|
|
|
+ arr.saleLimit -
|
|
|
+ response / 1000
|
|
|
+ ).toFixed(2)
|
|
|
+ if (count - this.weighingList.grossWeight / 1000 < 0) {
|
|
|
+ this.$alert(
|
|
|
+ '该客户累计销售' +
|
|
|
+ this.weighingList.goodsName +
|
|
|
+ (response / 1000).toFixed(2) +
|
|
|
+ '吨,还可售粮' +
|
|
|
+ count +
|
|
|
+ '吨',
|
|
|
+ '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ // callback: (action) => {
|
|
|
+ // this.$message({
|
|
|
+ // type: 'info',
|
|
|
+ // message: `累计售粮已超出上限`,
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ })
|
|
|
+ }
|
|
|
+ //累计售粮没有超上限完成毛检保存
|
|
|
+ grossWeight(this.weighingList)
|
|
|
+ .toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ if (this.reader) {
|
|
|
+ this.reader.cancel()
|
|
|
+ }
|
|
|
+ this.$notify.success({
|
|
|
+ title: '成功',
|
|
|
+ message: '保存成功',
|
|
|
})
|
|
|
- }
|
|
|
- //累计售粮没有超上限完成毛检保存
|
|
|
- grossWeight(this.weighingList)
|
|
|
- .toPromise()
|
|
|
- .then((response) => {
|
|
|
- if (this.reader) {
|
|
|
- this.reader.cancel()
|
|
|
- }
|
|
|
- this.$notify.success({
|
|
|
- title: '成功',
|
|
|
- message: '保存成功',
|
|
|
- })
|
|
|
- this.getList()
|
|
|
- })
|
|
|
- })
|
|
|
- return
|
|
|
- }
|
|
|
- else {
|
|
|
- this.$alert(this.weighingList.goodsName + '的收购价格正在审核中,请审核通过后进行操作', {
|
|
|
- confirmButtonText: '确定',
|
|
|
+ this.getList()
|
|
|
+ })
|
|
|
})
|
|
|
- }
|
|
|
+ return
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ this.$alert(this.weighingList.goodsName + '的收购价格正在审核中,请审核通过后进行操作', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ })
|
|
|
+ }
|
|
|
// }
|
|
|
// else {
|
|
|
// this.$message.error('该仓库未设置收购价格或收购价格正在审核中,请审核通过后进行操作')
|
|
@@ -2060,7 +2178,7 @@ export default {
|
|
|
// console.log(this.inWarehouseType)
|
|
|
//贸易入库需要再走入库接口
|
|
|
if (this.inWarehouseType == 1) {
|
|
|
- //贸易入库皮检
|
|
|
+ //贸易入库皮检
|
|
|
getsettleaccout({//查看结算单
|
|
|
id: this.weighingList.warehouseInOutId
|
|
|
}).toPromise().then((response) => {
|
|
@@ -2111,8 +2229,8 @@ export default {
|
|
|
this
|
|
|
.warehouseName == '哈尔滨依兰库' || this
|
|
|
.warehouseName == '白城内陆港' || this
|
|
|
- .warehouseName == '山东园丰库'|| this
|
|
|
- .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='甘南宏旗库'||this.warehouseName=='洮南新友谊兴旺库')) {
|
|
|
+ .warehouseName == '山东园丰库' || this
|
|
|
+ .warehouseName == '杜尔伯特家禾库' || this.warehouseName == '甘南宏旗库' || this.warehouseName == '洮南新友谊兴旺库')) {
|
|
|
if (this.weighingList.seller && this.weighingList.buyer) {
|
|
|
let cang = {}
|
|
|
cang.value = this.weighingList.seller
|
|
@@ -2192,7 +2310,7 @@ export default {
|
|
|
.then((response) => {
|
|
|
//累计售粮超上限不能完成皮检保存
|
|
|
let count = (
|
|
|
- arr2.saleLimit - response / 1000
|
|
|
+ arr2.saleLimit - response / 1000
|
|
|
).toFixed(2)
|
|
|
if (count - this.weighingList.netWeight / 1000 < 0) {
|
|
|
this.$alert(
|
|
@@ -2211,7 +2329,7 @@ export default {
|
|
|
message: `累计售粮已超出上限`,
|
|
|
})
|
|
|
},
|
|
|
- })
|
|
|
+ })
|
|
|
}
|
|
|
else {
|
|
|
//累计售粮没有超上限完成皮检保存
|
|
@@ -2857,14 +2975,30 @@ export default {
|
|
|
width: 300px;
|
|
|
height: 300px
|
|
|
}
|
|
|
-.videoImg{
|
|
|
- width: 60%;
|
|
|
+
|
|
|
+.videoImg {
|
|
|
// display: flex;
|
|
|
// flex-direction: column;
|
|
|
// align-items: center;
|
|
|
// justify-content: center;
|
|
|
}
|
|
|
-.videoImg-row{
|
|
|
+
|
|
|
+.videoImg-row {
|
|
|
+ display: flex;
|
|
|
+ margin-bottom: 20px;
|
|
|
+}
|
|
|
+
|
|
|
+.carnumber-style {
|
|
|
+ // background: red;
|
|
|
display: flex;
|
|
|
+ flex-direction: column;
|
|
|
+ justify-content: center;
|
|
|
+ align-items: center;
|
|
|
+
|
|
|
+ width: 50%;
|
|
|
+
|
|
|
+ .btn {
|
|
|
+ margin-bottom: 10px;
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|