|
...
|
...
|
@@ -109,6 +109,20 @@ |
|
|
|
</el-input>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-form-item label=" " :label-width="formLabelWidth" prop="remark1">
|
|
|
|
<div class="my-text-area">
|
|
|
|
<div class="el-input-group__prepend prepand">备  注</div>
|
|
|
|
<el-input v-model="addForm.remark1"
|
|
|
|
type="textarea"
|
|
|
|
autosize
|
|
|
|
placeholder="备注信息"
|
|
|
|
style="float: left;width:calc(100% - 89px)"
|
|
|
|
>
|
|
|
|
</el-input>
|
|
|
|
</div>
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
<el-divider content-position="left"><i class="el-icon-house"></i> 入库相关</el-divider>
|
|
|
|
<el-row>
|
|
...
|
...
|
@@ -166,7 +180,7 @@ |
|
|
|
:fetch-suggestions="crmQuerySearch"
|
|
|
|
placeholder="请输入客户代码"
|
|
|
|
:trigger-on-focus="false"
|
|
|
|
value-key = "roleName"
|
|
|
|
value-key = "departmentid"
|
|
|
|
clearable
|
|
|
|
highlight-first-item
|
|
|
|
style="width: 100%"
|
|
...
|
...
|
@@ -267,18 +281,19 @@ |
|
|
|
<!-- </el-row>-->
|
|
|
|
<el-divider content-position="left"><i class="el-icon-picture-outline"></i>图像操作</el-divider>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-form-item label=" " :label-width="formLabelWidth" prop="annex">
|
|
|
|
<el-input v-model="addForm.annex" autocomplete="off" suffix-icon="el-icon-document" clearable>
|
|
|
|
<template slot="prepend">图片地址</template>
|
|
|
|
</el-input>
|
|
|
|
|
|
|
|
</el-form-item>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-button type="success" icon="el-icon-edit" @click="imgdrawerVisible = true">入库图像</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="6">
|
|
|
|
<el-col :span="12">
|
|
|
|
<el-button-group style="float:right">
|
|
|
|
<el-button type="success" icon="el-icon-camera" @click="imgdrawerVisible = true">入库图像采集</el-button>
|
|
|
|
<el-button type="warning" icon="el-icon-edit" @click="otherDrawerVisible = true">其他入库信息</el-button>
|
|
|
|
</el-button-group>
|
|
|
|
</el-col>
|
|
|
|
|
|
|
|
<!-- <el-col :span="8">-->
|
|
...
|
...
|
@@ -312,31 +327,12 @@ |
|
|
|
</el-col>
|
|
|
|
</el-row>-->
|
|
|
|
</el-form>
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
<el-button @click="apply_dialog.addDialog = false" >取 消</el-button>
|
|
|
|
<el-button type="primary" @click="dialogApply==='create'?add():edit()" >提 交</el-button>
|
|
|
|
</div>
|
|
|
|
</el-row>
|
|
|
|
<!-- 搜索区域-->
|
|
|
|
<el-row :gutter="10" class="toolbar">
|
|
|
|
<el-col :span="5.5">
|
|
|
|
<el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search"
|
|
|
|
placeholder="货物单号" clearable>
|
|
|
|
<template slot="prepend">货物单号</template>
|
|
|
|
</el-input>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="5.5" :offset="1">
|
|
|
|
<el-input v-model="queryInfo.serialnumber" prefix-icon="el-icon-search"
|
|
|
|
placeholder="流水" clearable>
|
|
|
|
<template slot="prepend">流  水</template>
|
|
|
|
</el-input>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="8">
|
|
|
|
<el-button type="primary" icon="el-icon-search" @click="getList()">
|
|
|
|
查询
|
|
|
|
</el-button>
|
|
|
|
<el-button type="success" icon="el-icon-edit" @click="applyAdd()">直接入库</el-button>
|
|
|
|
<el-button type="success" icon="el-icon-edit" @click="batchAdd()">批量入库</el-button>
|
|
|
|
<el-row class="toolbar">
|
|
|
|
<el-col :span="24">
|
|
|
|
<el-button type="success" icon="el-icon-download" @click="batchAdd()">批量入库</el-button>
|
|
|
|
<el-button type="primary" icon="el-icon-right" @click="nextBill()" style="float:right">下一票</el-button>
|
|
|
|
</el-col>
|
|
|
|
</el-row>
|
|
|
|
<!-- 列表区域-->
|
|
...
|
...
|
@@ -384,12 +380,12 @@ |
|
|
|
<el-table-column
|
|
|
|
prop="pcs"
|
|
|
|
label="入库件数"
|
|
|
|
width="60">
|
|
|
|
width="70">
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
prop="billweight"
|
|
|
|
label="入库重量"
|
|
|
|
width="60">
|
|
|
|
width="70">
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column
|
|
|
|
prop="feeweight"
|
|
...
|
...
|
@@ -404,7 +400,7 @@ |
|
|
|
<el-table-column
|
|
|
|
prop="goodsvol"
|
|
|
|
label="入库体积"
|
|
|
|
width="60">
|
|
|
|
width="100">
|
|
|
|
</el-table-column>
|
|
|
|
<!-- <el-table-column-->
|
|
|
|
<!-- prop="area"-->
|
|
...
|
...
|
@@ -488,24 +484,32 @@ |
|
|
|
fixed="right"
|
|
|
|
label="操作"
|
|
|
|
width="160">
|
|
|
|
<template slot="header" slot-scope="scope">
|
|
|
|
<el-button type="success" icon="el-icon-check" @click="applyAdd()">入  库</el-button>
|
|
|
|
</template>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-row>
|
|
|
|
<Print :wmsInfo = "scope.row"></Print>
|
|
|
|
</el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
|
|
|
|
<el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
|
|
|
|
<el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">移除</el-button>
|
|
|
|
</el-row>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
</el-row>
|
|
|
|
<el-row style="margin-top: 10px" class="toolbar">
|
|
|
|
<el-pagination
|
|
|
|
@size-change="handleSizeChange"
|
|
|
|
@current-change="handleCurrentChange"
|
|
|
|
:current-page="queryInfo.pageNum"
|
|
|
|
:page-size="queryInfo.pageSize"
|
|
|
|
:page-sizes="[10, 50, 100, 500]"
|
|
|
|
layout="total, sizes, prev, pager, next, jumper"
|
|
|
|
:total="total">
|
|
|
|
</el-pagination>
|
|
|
|
</el-row>
|
|
|
|
<!-- <el-row style="margin-top: 10px" class="toolbar">-->
|
|
|
|
<!-- <el-pagination-->
|
|
|
|
<!-- @size-change="handleSizeChange"-->
|
|
|
|
<!-- @current-change="handleCurrentChange"-->
|
|
|
|
<!-- :current-page="queryInfo.pageNum"-->
|
|
|
|
<!-- :page-size="queryInfo.pageSize"-->
|
|
|
|
<!-- :page-sizes="[10, 50, 100, 500]"-->
|
|
|
|
<!-- layout="total, sizes, prev, pager, next, jumper"-->
|
|
|
|
<!-- :total="total">-->
|
|
|
|
<!-- </el-pagination>-->
|
|
|
|
<!-- </el-row>-->
|
|
|
|
</el-card>
|
|
|
|
<el-drawer
|
|
|
|
title="我是标题"
|
|
...
|
...
|
@@ -646,10 +650,12 @@ |
|
|
|
import packge from '@/api/nmms/packge'
|
|
|
|
import unusualOP from '@/api/wms/unusualOptions'
|
|
|
|
import damageOP from '@/api/wms/damageOptions'
|
|
|
|
import Print from '@/components/Print'
|
|
|
|
|
|
|
|
|
|
|
|
export default {
|
|
|
|
name: "inventroyrecord",
|
|
|
|
components:{Print},
|
|
|
|
data() {
|
|
|
|
var checkInputArea = (rule, value, callback) => {
|
|
|
|
let err = {
|
|
...
|
...
|
@@ -720,7 +726,7 @@ |
|
|
|
otherDrawerVisible: false,
|
|
|
|
addForm: {
|
|
|
|
area: '',
|
|
|
|
feeweight: '',
|
|
|
|
feeweight: 0,
|
|
|
|
custel: '',
|
|
|
|
customer: '',
|
|
|
|
custcode: '',
|
|
...
|
...
|
@@ -730,7 +736,7 @@ |
|
|
|
location:'',
|
|
|
|
opter:'',
|
|
|
|
opttime: '',
|
|
|
|
pcs: '',
|
|
|
|
pcs: 0,
|
|
|
|
totalpcs:0,
|
|
|
|
serialnumber: '',
|
|
|
|
station: '',
|
|
...
|
...
|
@@ -841,7 +847,6 @@ |
|
|
|
const _this = this
|
|
|
|
selectInventroyrecords(this.queryInfo).then((response) => {
|
|
|
|
const res = response.data
|
|
|
|
console.log(response.data)
|
|
|
|
if (res.code !== '200') {
|
|
|
|
return _this.$message.error('获取消息收发记录，失败！')
|
|
|
|
}
|
|
...
|
...
|
@@ -868,6 +873,7 @@ |
|
|
|
}
|
|
|
|
// 添加，成功
|
|
|
|
this.$message.success(res.msg);
|
|
|
|
this.tableData = [];
|
|
|
|
}).catch(error => {
|
|
|
|
this.$message.error(error.toString());
|
|
|
|
}).finally(()=>{
|
|
...
|
...
|
@@ -879,9 +885,9 @@ |
|
|
|
// 未通过，表单预校验
|
|
|
|
if (!valid) return;
|
|
|
|
const wmslog = Object.assign({},this.addForm)
|
|
|
|
wmslog.opttime = new Date().format('yyyy-MM-dd hh:mm:ss')
|
|
|
|
this.tableData.push(wmslog)
|
|
|
|
this.addForm.serialnumber = this.serialNumber()
|
|
|
|
console.log(JSON.stringify(wmslog))
|
|
|
|
})
|
|
|
|
},
|
|
|
|
// 添加功能
|
|
...
|
...
|
@@ -1226,6 +1232,12 @@ |
|
|
|
this.$message.error("合并体积录入数据出错")
|
|
|
|
}
|
|
|
|
},
|
|
|
|
nextBill(){
|
|
|
|
this.$refs.addForm.resetFields()
|
|
|
|
this.initUserInfo()
|
|
|
|
this.tableData = []
|
|
|
|
|
|
|
|
},
|
|
|
|
getSummaries(param) {
|
|
|
|
const { columns, data } = param;
|
|
|
|
const sums = [];
|
|
...
|
...
|
@@ -1245,7 +1257,8 @@ |
|
|
|
sums[index] = values.reduce((prev, curr) => {
|
|
|
|
const value = Number(curr);
|
|
|
|
if (!isNaN(value)) {
|
|
|
|
return prev + curr;
|
|
|
|
const r = Number(prev) + Number(curr)
|
|
|
|
return new Number(r).toFixed(2);
|
|
|
|
} else {
|
|
|
|
return prev;
|
|
|
|
}
|
|
...
|
...
|
@@ -1257,21 +1270,65 @@ |
|
|
|
});
|
|
|
|
|
|
|
|
return sums;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
mounted() {
|
|
|
|
this.getAreaList();
|
|
|
|
this.getLocationList();
|
|
|
|
this.getRoles();
|
|
|
|
this.getSPHCode()
|
|
|
|
this.addForm.serialnumber = this.serialNumber()
|
|
|
|
initUserInfo(){
|
|
|
|
let userinfo = loginedUserInfo();
|
|
|
|
if (!jsutil.checkNull(userinfo) && !jsutil.checkNull(userinfo.username)){
|
|
|
|
this.$message.error("获取用户信息出错")
|
|
|
|
}else{
|
|
|
|
this.addForm.opter = userinfo.username
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
mounted() {
|
|
|
|
this.addForm = {
|
|
|
|
area: '',
|
|
|
|
feeweight: 22.68,
|
|
|
|
custel: '',
|
|
|
|
customer: '',
|
|
|
|
custcode: 'APX',
|
|
|
|
goodstype: '运单',
|
|
|
|
house:'',
|
|
|
|
ietype:'I',
|
|
|
|
location:'hx001',
|
|
|
|
opter:'wuliu',
|
|
|
|
opttime: '',
|
|
|
|
pcs: 17,
|
|
|
|
totalpcs:113,
|
|
|
|
serialnumber: '',
|
|
|
|
station: '',
|
|
|
|
status: '',
|
|
|
|
licenseplate: '豫A61CR7',
|
|
|
|
transtype:'销售入库',
|
|
|
|
goodssize:'120x230x78x17',
|
|
|
|
goodsvol:36.60,
|
|
|
|
waybill:'172-12345678',
|
|
|
|
billfhl:'FILE788',
|
|
|
|
//随货文件
|
|
|
|
hasFiles:false,
|
|
|
|
hasUnusual:false,
|
|
|
|
unusuals:[],
|
|
|
|
files:[],
|
|
|
|
damages:[],
|
|
|
|
sphCodes:[],
|
|
|
|
billweight:12.34,
|
|
|
|
totalweight:2573,
|
|
|
|
packingid:'PK',
|
|
|
|
remark:'',
|
|
|
|
remark1:'备注',
|
|
|
|
remark2:'',
|
|
|
|
remark3:'',
|
|
|
|
remark4:'',
|
|
|
|
remark5:'',
|
|
|
|
annex:''
|
|
|
|
}
|
|
|
|
|
|
|
|
this.getAreaList();
|
|
|
|
this.getLocationList();
|
|
|
|
this.getRoles();
|
|
|
|
this.getSPHCode()
|
|
|
|
this.addForm.serialnumber = this.serialNumber()
|
|
|
|
this.initUserInfo()
|
|
|
|
},
|
|
|
|
computed: {
|
|
|
|
},
|
...
|
...
|
|
