|
...
|
...
|
@@ -20,7 +20,7 @@ |
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-form-item label=" " :label-width="formLabelWidth" prop="waybill">
|
|
|
|
<el-form-item label=" " :label-width="formLabelWidth" prop="waybillsub">
|
|
|
|
<el-input v-model="addForm.waybillsub" autocomplete="off" suffix-icon="el-icon-document" clearable>
|
|
|
|
<template slot="prepend">分  单</template>
|
|
|
|
</el-input>
|
|
...
|
...
|
@@ -48,6 +48,27 @@ |
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-form-item label=" " :label-width="formLabelWidth" prop="packge">
|
|
|
|
<div class="my-text-area">
|
|
|
|
<div class="el-input-group__prepend prepand">货物包装</div>
|
|
|
|
<el-select v-model="addForm.packge"
|
|
|
|
placeholder="货物包装"
|
|
|
|
filterable
|
|
|
|
default-first-option
|
|
|
|
:filter-method="packgeOptionsFilter">
|
|
|
|
<el-option
|
|
|
|
v-for="item in packgeOptions"
|
|
|
|
:key="item.code"
|
|
|
|
:label="item.name"
|
|
|
|
:value="item.code">
|
|
|
|
<span style="float: left">{{ item.code }}</span>
|
|
|
|
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
|
|
|
|
</el-option>
|
|
|
|
</el-select>
|
|
|
|
</div>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-form-item label=" " :label-width="formLabelWidth" prop="vol">
|
|
|
|
<div class="my-text-area">
|
|
|
|
<div class="el-input-group__prepend prepand">体  积</div>
|
|
...
|
...
|
@@ -227,7 +248,10 @@ |
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-button type="success" icon="el-icon-edit" @click="drawerVisible = true">入库图像</el-button>
|
|
|
|
<el-button type="success" icon="el-icon-edit" @click="imgdrawerVisible = true">入库图像</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-button type="warning" icon="el-icon-edit" @click="otherDrawerVisible = true">其他入库信息</el-button>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
...
|
...
|
@@ -242,7 +266,7 @@ |
|
|
|
<!-- <el-option label="状态-成功" value="1"></el-option>-->
|
|
|
|
<!-- </el-select>-->
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
</el-col>
|
|
|
|
<!-- </el-col>-->
|
|
|
|
</el-row>
|
|
|
|
<!-- <el-row>
|
|
|
|
<el-col :span="7">
|
|
...
|
...
|
@@ -439,15 +463,20 @@ |
|
|
|
</el-card>
|
|
|
|
<el-drawer
|
|
|
|
title="我是标题"
|
|
|
|
:visible.sync="drawerVisible"
|
|
|
|
:visible.sync="imgdrawerVisible"
|
|
|
|
:with-header="false">
|
|
|
|
<video width="100%" height="200" autoplay loop controls id="videos">
|
|
|
|
<source src="/static/login/New-jumbo.mp4" type="video/mp4">
|
|
|
|
</video>
|
|
|
|
<el-row>
|
|
|
|
<el-image
|
|
|
|
:src="imgBase64" width="200" height="200"
|
|
|
|
fit="fill"></el-image>
|
|
|
|
:src="imgBase64"
|
|
|
|
style="width: 200px; height: 200px"
|
|
|
|
fit="fill">
|
|
|
|
<div slot="error" class="image-slot">
|
|
|
|
未截图<i class="el-icon-picture-outline"></i>
|
|
|
|
</div>
|
|
|
|
</el-image>
|
|
|
|
</el-row>
|
|
|
|
<el-button type="success" class="btns" @click="screenshot">一键截屏上传</el-button>
|
|
|
|
<!-- <el-upload-->
|
|
...
|
...
|
@@ -467,6 +496,89 @@ |
|
|
|
<!-- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>-->
|
|
|
|
|
|
|
|
</el-drawer>
|
|
|
|
<el-drawer
|
|
|
|
title="其他入库信息"
|
|
|
|
:visible.sync="otherDrawerVisible"
|
|
|
|
:with-header="false">
|
|
|
|
<el-row style="margin-top:0;padding-top:0">
|
|
|
|
<el-card shadow="always" >
|
|
|
|
<div slot="header" class="clearfix">
|
|
|
|
<span>随货文件</span>
|
|
|
|
<el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
|
|
|
|
</div>
|
|
|
|
<el-switch
|
|
|
|
v-model="addForm.hasFiles"
|
|
|
|
active-text="有随货文件"
|
|
|
|
inactive-text="无随货文件"
|
|
|
|
active-color="#13ce66"
|
|
|
|
inactive-color="#ff4949"
|
|
|
|
>
|
|
|
|
</el-switch>
|
|
|
|
<el-card shadow="always" style="margin-top:10px;" v-if="addForm.hasFiles">
|
|
|
|
<el-checkbox-group v-model="addForm.files" @change="handleCheckedfilessChange">
|
|
|
|
<el-checkbox v-for="filename in flieOptions" :label="filename" :key="filename">{{filename}}</el-checkbox>
|
|
|
|
</el-checkbox-group>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
|
|
|
|
</el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-card shadow="always" >
|
|
|
|
<div slot="header" class="clearfix">
|
|
|
|
<span>异常状况</span>
|
|
|
|
<el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
|
|
|
|
</div>
|
|
|
|
<el-switch
|
|
|
|
v-model="addForm.hasUnusual"
|
|
|
|
active-text="有异常"
|
|
|
|
inactive-text="无异常"
|
|
|
|
active-color="#13ce66"
|
|
|
|
inactive-color="#ff4949"
|
|
|
|
>
|
|
|
|
</el-switch>
|
|
|
|
<el-card shadow="always" style="margin-top:10px;" v-if="addForm.hasUnusual">
|
|
|
|
<el-checkbox-group v-model="addForm.unusuals" @change="handleCheckedfilessChange">
|
|
|
|
<el-checkbox v-for="op in unusualOptions" :label="op" :key="op">
|
|
|
|
{{op}}
|
|
|
|
</el-checkbox>
|
|
|
|
</el-checkbox-group>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
</el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-card shadow="always" >
|
|
|
|
<div slot="header" class="clearfix">
|
|
|
|
<span>破损状况</span>
|
|
|
|
<el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
|
|
|
|
</div>
|
|
|
|
<el-card shadow="always" style="margin-top:10px;">
|
|
|
|
<el-checkbox-group v-model="addForm.damages" @change="handleCheckedfilessChange">
|
|
|
|
<el-checkbox v-for="op in damageOptions" :label="op" :key="op">
|
|
|
|
{{op}}
|
|
|
|
</el-checkbox>
|
|
|
|
</el-checkbox-group>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
</el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-card shadow="always" >
|
|
|
|
<div slot="header" class="clearfix">
|
|
|
|
<span>特殊操作情况</span>
|
|
|
|
<el-button style="float: right; padding: 3px 0" type="text">操作按钮</el-button>
|
|
|
|
</div>
|
|
|
|
<el-card shadow="always" style="margin-top:10px;">
|
|
|
|
<el-checkbox-group v-model="addForm.sphCodes" @change="handleCheckedfilessChange">
|
|
|
|
<el-checkbox v-for="op in SPHOptions" :label="op.code" :key="op.code" border>
|
|
|
|
<template>
|
|
|
|
({{op.code}}){{op.desCn}}
|
|
|
|
</template>
|
|
|
|
</el-checkbox>
|
|
|
|
</el-checkbox-group>
|
|
|
|
</el-card>
|
|
|
|
</el-card>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
</el-drawer>
|
|
|
|
</el-row>
|
|
|
|
</template>
|
|
|
|
|
|
...
|
...
|
@@ -476,7 +588,9 @@ |
|
|
|
delInventoryrecord,
|
|
|
|
addInventoryrecord,
|
|
|
|
ediInventroyrecord,
|
|
|
|
selectAreas, selectLocations
|
|
|
|
selectAreas,
|
|
|
|
selectLocations,
|
|
|
|
getSPHCode
|
|
|
|
} from '../../api/consigner/station';
|
|
|
|
import dateUtil from "@/utils/index"
|
|
|
|
import jsutil from "@/common/js/util";
|
|
...
|
...
|
@@ -484,6 +598,9 @@ |
|
|
|
import { loginedUserInfo } from '@/api/user';
|
|
|
|
import html2canvas from 'html2canvas'
|
|
|
|
import {uploadPath,upfileWithPost} from "../../api/technological";
|
|
|
|
import packge from '@/api/nmms/packge'
|
|
|
|
import unusualOP from '@/api/wms/unusualOptions'
|
|
|
|
import damageOP from '@/api/wms/damageOptions'
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
...
|
...
|
@@ -520,7 +637,8 @@ |
|
|
|
// 编辑对话框
|
|
|
|
editDialog: false
|
|
|
|
},
|
|
|
|
drawerVisible: false,
|
|
|
|
imgdrawerVisible: false,
|
|
|
|
otherDrawerVisible: false,
|
|
|
|
addForm: {
|
|
|
|
area: '',
|
|
|
|
billweight: '',
|
|
...
|
...
|
@@ -542,7 +660,15 @@ |
|
|
|
vol:'',
|
|
|
|
waybillmaster:'',
|
|
|
|
waybillsub:'',
|
|
|
|
//随货文件
|
|
|
|
hasFiles:false,
|
|
|
|
hasUnusual:false,
|
|
|
|
unusuals:[],
|
|
|
|
files:[],
|
|
|
|
damages:[],
|
|
|
|
sphCodes:[],
|
|
|
|
weight:'',
|
|
|
|
packge:'',
|
|
|
|
remark:'',
|
|
|
|
remark1:'',
|
|
|
|
remark2:'',
|
|
...
|
...
|
@@ -551,6 +677,7 @@ |
|
|
|
remark5:'',
|
|
|
|
picUrl:''
|
|
|
|
},
|
|
|
|
packgeOptions:packge,
|
|
|
|
options: [{
|
|
|
|
value: '板箱',
|
|
|
|
label: '货物类型-板箱'
|
|
...
|
...
|
@@ -572,7 +699,17 @@ |
|
|
|
label: '交易类型-销售入库'
|
|
|
|
}],
|
|
|
|
formLabelWidth: '5px',
|
|
|
|
flieOptions:['报关单证','关封','运单','信封','保函','安检申报清单','随机文件','备案清单','放行通知书','货物运输条件鉴定书(磁化/化工品)','其他'],
|
|
|
|
unusualOptions:unusualOP,
|
|
|
|
damageOptions:damageOP,
|
|
|
|
SPHOptions:[],
|
|
|
|
rules: {
|
|
|
|
waybillmaster:[
|
|
|
|
{ pattern: /^[0-9\-]+$/, message: '主单号格式只支持数字与-符号' }
|
|
|
|
],
|
|
|
|
waybillsub:[
|
|
|
|
{ pattern: /^[0-9A-Z]+$/, message: '分单号格式只支持数字与大写字母' }
|
|
|
|
],
|
|
|
|
pcs: [
|
|
|
|
{ required: true, message: '件数必填', trigger: 'blur' },
|
|
|
|
{ type:"number", message: '件数必须为整数'}
|
|
...
|
...
|
@@ -649,6 +786,7 @@ |
|
|
|
transcar: '',
|
|
|
|
transtype:'',
|
|
|
|
vol:'',
|
|
|
|
pacage:'',
|
|
|
|
waybill:'',
|
|
|
|
weight:'',
|
|
|
|
remark:'',
|
|
...
|
...
|
@@ -666,7 +804,9 @@ |
|
|
|
this.$refs.addForm.validate(valid => {
|
|
|
|
// 未通过，表单预校验
|
|
|
|
if (!valid) return;
|
|
|
|
this.tableData.push(this.addForm);
|
|
|
|
const wmslog = Object.assign({},this.addForm)
|
|
|
|
this.tableData.push(wmslog)
|
|
|
|
this.addForm.serialnumber = this.serialNumber()
|
|
|
|
})
|
|
|
|
},
|
|
|
|
// 添加功能
|
|
...
|
...
|
@@ -808,6 +948,26 @@ |
|
|
|
ld.close()
|
|
|
|
})
|
|
|
|
},
|
|
|
|
getSPHCode() {
|
|
|
|
const _this = this
|
|
|
|
let ld = this.$loading({
|
|
|
|
text:"特货代码数加载中..."
|
|
|
|
})
|
|
|
|
getSPHCode({}).then((response) => {
|
|
|
|
const res = response.data
|
|
|
|
if (res.code !== '200') {
|
|
|
|
return _this.$message.error('获取特货代码记录，失败！')
|
|
|
|
}
|
|
|
|
// 获取列表数据
|
|
|
|
_this.SPHOptions = res.data
|
|
|
|
_this.$message.success('获取特货代码记录，成功！')
|
|
|
|
}).catch(error => {
|
|
|
|
// 关闭加载
|
|
|
|
_this.$message.error(error.toString())
|
|
|
|
}).finally(()=>{
|
|
|
|
ld.close()
|
|
|
|
})
|
|
|
|
},
|
|
|
|
locationQuerySearch(queryString, cb){
|
|
|
|
var restaurants = this.locationData;
|
|
|
|
var results = queryString ? restaurants.filter(this.locationFilter(queryString)) : restaurants;
|
|
...
|
...
|
@@ -938,12 +1098,36 @@ |
|
|
|
},
|
|
|
|
checkSelectable(){
|
|
|
|
|
|
|
|
},
|
|
|
|
handleCheckedfilessChange(value){
|
|
|
|
console.log(JSON.stringify(value))
|
|
|
|
},
|
|
|
|
packgeOptionsFilter(searchStr){
|
|
|
|
let tempIndex = -1
|
|
|
|
if (searchStr){
|
|
|
|
this.packgeOptions = packge.filter((item,index,arr) =>{
|
|
|
|
if (item.code.toLocaleUpperCase().indexOf(searchStr.toLocaleUpperCase()) > -1){
|
|
|
|
tempIndex = index
|
|
|
|
return true
|
|
|
|
}else{
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
})
|
|
|
|
if (tempIndex === -1){
|
|
|
|
this.packgeOptions = packge
|
|
|
|
}
|
|
|
|
}else {
|
|
|
|
this.packgeOptions = packge
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
},
|
|
|
|
mounted() {
|
|
|
|
this.getAreaList();
|
|
|
|
this.getLocationList();
|
|
|
|
this.getRoles();
|
|
|
|
this.getSPHCode()
|
|
|
|
this.addForm.serialnumber = this.serialNumber()
|
|
|
|
let userinfo = loginedUserInfo();
|
|
|
|
if (!jsutil.checkNull(userinfo) && !jsutil.checkNull(userinfo.username)){
|
...
|
...
|
|
