|
|
@@ -28,11 +28,11 @@
|
|
|
<el-checkbox v-model="checked">手动编辑重量</el-checkbox>
|
|
|
</div>
|
|
|
<el-form-item label="毛重（公斤）">
|
|
|
- <el-input :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
|
|
|
+ <el-input @input="grossWeightInput" :disabled="!checked" placeholder="输入毛重" v-model="form.grossWeight"></el-input>
|
|
|
<el-button type="text">获取</el-button>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="皮重（公斤）">
|
|
|
- <el-input :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
|
|
|
+ <el-input @input="tareInput" :disabled="!checked" placeholder="输入皮重" v-model="form.tare"></el-input>
|
|
|
<el-button type="text">获取</el-button>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="净重（公斤）">
|
|
|
@@ -49,9 +49,8 @@
|
|
|
<el-input placeholder="输入毛重车牌号" v-model="form.carNumber"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="仓位号">
|
|
|
- <el-select filterable clearable placeholder="输入仓位号" v-model="form.positionNo" >
|
|
|
- <el-option label="区域一" value="shanghai"></el-option>
|
|
|
- <el-option label="区域二" value="beijing"></el-option>
|
|
|
+ <el-select filterable clearable @change="positionNoChange" placeholder="输入仓位号" v-model="form.positionId" >
|
|
|
+ <el-option v-for="item in positionOptions" :key="item.id" :label="item.positionNo" :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<div class="form-title">定价信息</div>
|
|
|
@@ -67,8 +66,7 @@
|
|
|
<el-form ref="form" :model="form" label-position="left" label-width="120px">
|
|
|
<el-form-item label="货名">
|
|
|
<el-select filterable clearable placeholder="选择货名" v-model="form.goodsName" >
|
|
|
- <el-option label="区域一" value="shanghai"></el-option>
|
|
|
- <el-option label="区域二" value="beijing"></el-option>
|
|
|
+ <el-option v-for="item in goodOptions" :key="item.id" :label="item.goodsName" :value="item.goodsName"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="容重(克/升)">
|
|
|
@@ -128,7 +126,12 @@
|
|
|
<el-table-column prop="createDate" label="日期"></el-table-column>
|
|
|
<el-table-column prop="positionNo" label="仓位"></el-table-column>
|
|
|
<el-table-column prop="carNumber" label="车牌号"></el-table-column>
|
|
|
- <el-table-column prop="customerName" label="客户"></el-table-column>
|
|
|
+ <el-table-column prop="customerName" label="客户">
|
|
|
+ <template scope="scope">
|
|
|
+ <span v-if="scope.row.customerId">{{ scope.row.customerName }}</span>
|
|
|
+ <el-button v-else @click="lookCustomerName(scope.row)" type="text">{{ scope.row.customerName }}</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column width="120" prop="goodsName" label="货名"></el-table-column>
|
|
|
<el-table-column width="120" prop="grossWeight" label="毛重（吨）"></el-table-column>
|
|
|
<el-table-column width="120" prop="tare" label="皮重（吨）"></el-table-column>
|
|
|
@@ -183,9 +186,15 @@
|
|
|
import {
|
|
|
addList,
|
|
|
delList,
|
|
|
- getList
|
|
|
+ getList,
|
|
|
+ getcustomer
|
|
|
} from '@/model/warehouse/index'
|
|
|
import BalanceAlert from '@/components/balanceAlert'
|
|
|
+import {
|
|
|
+ speedPositionInfoList,
|
|
|
+ speedGoodsList,
|
|
|
+} from '@/model/speedGoods'
|
|
|
+// import { threadId } from 'worker_threads';
|
|
|
// import CenterMap from "./center-map.vue";
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -194,10 +203,25 @@ export default {
|
|
|
data() {
|
|
|
return {
|
|
|
tableData:[],
|
|
|
- form:{},
|
|
|
+ form:{
|
|
|
+ inOutFlag:1,
|
|
|
+ compId:localStorage.getItem('ws-pf_compId'),
|
|
|
+ },
|
|
|
information:'',
|
|
|
checked:false,
|
|
|
- searchKeyWord:''
|
|
|
+ searchKeyWord:'',
|
|
|
+ compId:localStorage.getItem('ws-pf_compId'),
|
|
|
+ positionOptions:[],
|
|
|
+ goodOptions:[],
|
|
|
+ startDate:'',
|
|
|
+ endDate:'',
|
|
|
+ searchKeyWord:'',
|
|
|
+ currentPage:1,
|
|
|
+ pageSize:10,
|
|
|
+ value:[],
|
|
|
+ deptBudgetTotal:0,
|
|
|
+ dialogVisible:false,
|
|
|
+ customerData:{}
|
|
|
};
|
|
|
},
|
|
|
filters: {
|
|
|
@@ -208,14 +232,36 @@ export default {
|
|
|
created() {
|
|
|
},
|
|
|
mounted() {
|
|
|
- getList().toPromise()
|
|
|
-
|
|
|
+ // getList().toPromise()
|
|
|
+ speedPositionInfoList({compId:this.compId}).toPromise().then((res)=>{
|
|
|
+ this.positionOptions=res
|
|
|
+ })
|
|
|
+ speedGoodsList({compId:this.compId}).toPromise().then((res)=>{
|
|
|
+ this.goodOptions=res
|
|
|
+ })
|
|
|
+ this.getList()
|
|
|
},
|
|
|
beforeDestroy() {
|
|
|
|
|
|
|
|
|
},
|
|
|
methods: {
|
|
|
+ lookCustomerName(){
|
|
|
+ getcustomer({}).toPromise().then((res)=>{
|
|
|
+ this.customerData=res
|
|
|
+ })
|
|
|
+ },
|
|
|
+ positionNoChange(e){
|
|
|
+ for (let i = 0; i < this.positionOptions.length; i++) {
|
|
|
+ if(this.positionOptions[i].id==e){
|
|
|
+ this.form.positionNo=this.positionOptions[i].positionNo
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
+ grossWeightInput(e){
|
|
|
+ if(this.form.tare) this.form.netWeight=e-this.form.tare
|
|
|
+ },
|
|
|
+ tareInput(e){if(this.form.grossWeight) this.form.netWeight=this.form.grossWeight-e},
|
|
|
changeDate(){
|
|
|
if(this.value){
|
|
|
this.startDate = this.value[0]
|
|
|
@@ -226,6 +272,12 @@ export default {
|
|
|
}
|
|
|
this.getList()
|
|
|
},
|
|
|
+ getList(){
|
|
|
+ getList({compId:this.compId,startDate:this.startDate,endDate:this.endDate,pageSize:this.pageSize,currentPage:this.currentPage}).toPromise().then((res)=>{
|
|
|
+ this.tableData=res.records
|
|
|
+ this.deptBudgetTotal=res.total
|
|
|
+ })
|
|
|
+ },
|
|
|
setVal(data) {
|
|
|
if (this.information == '毛重') {
|
|
|
this.form.grossWeight = data
|
|
|
@@ -234,10 +286,11 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
add(){
|
|
|
- this.form={}
|
|
|
+ this.form={inOutFlag:1,
|
|
|
+ compId:localStorage.getItem('ws-pf_compId'),}
|
|
|
},
|
|
|
save(){
|
|
|
- addList().toPromise()
|
|
|
+ addList(this.form).toPromise()
|
|
|
},
|
|
|
del(row){
|
|
|
this.$confirm('确定删除入库记录？', '提示', {
|
|
|
@@ -245,11 +298,13 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- delList().toPromise()
|
|
|
- this.$message({
|
|
|
- type: 'success',
|
|
|
- message: '删除成功!'
|
|
|
- });
|
|
|
+ delList({id:row.id}).toPromise().then((res)=>{
|
|
|
+ this.$message({
|
|
|
+ type: 'success',
|
|
|
+ message: '删除成功!'
|
|
|
+ });
|
|
|
+ })
|
|
|
+
|
|
|
}).catch(() => {
|
|
|
this.$message({
|
|
|
type: 'info',
|
高敬炎