|
|
|
|
@ -5,14 +5,10 @@
|
|
|
|
|
<template v-slot:rukushijian>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>入库时间：
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库时间：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
style="width: 300px;"
|
|
|
|
|
v-model="form.rukushijian"
|
|
|
|
|
type="date"
|
|
|
|
|
placeholder="选择日期"
|
|
|
|
|
<el-date-picker style="width: 300px;" v-model="form.rukushijian" type="date" placeholder="选择日期"
|
|
|
|
|
value-format="yyyy-MM-dd">
|
|
|
|
|
</el-date-picker>
|
|
|
|
|
</div>
|
|
|
|
|
@ -21,15 +17,11 @@
|
|
|
|
|
<template v-slot:rukuleixing>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>入库类型：
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>入库类型：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-select v-model="form.rukuleixing" style="width: 300px;" placeholder="请选择">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in lexingoptions"
|
|
|
|
|
:key="item.value"
|
|
|
|
|
:label="item.label"
|
|
|
|
|
:value="item.value">
|
|
|
|
|
<el-option v-for="item in lexingoptions" :key="item.value" :label="item.label" :value="item.value">
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
</div>
|
|
|
|
|
@ -42,10 +34,7 @@
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-select v-model="form.rukucangku" filterable style="width: 300px;" placeholder="请选择入库仓库">
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in cangkuList"
|
|
|
|
|
:key="item.cangkumingcheng"
|
|
|
|
|
:label="item.cangkumingcheng"
|
|
|
|
|
<el-option v-for="item in cangkuList" :key="item.cangkumingcheng" :label="item.cangkumingcheng"
|
|
|
|
|
:value="item.cangkumingcheng">
|
|
|
|
|
</el-option>
|
|
|
|
|
</el-select>
|
|
|
|
|
@ -56,7 +45,7 @@
|
|
|
|
|
<template v-slot:jingbanren>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>经办人：
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>经办人：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-input v-model="form.jingbanren" placeholder="请输入经办人" clearable style="width: 300px;"></el-input>
|
|
|
|
|
@ -66,7 +55,7 @@
|
|
|
|
|
<template v-slot:jilurenyuan>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>记录人员：
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>记录人员：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-input v-model="form.jilurenyuan" placeholder="请输入记录人员" clearable style="width: 300px;"></el-input>
|
|
|
|
|
@ -123,19 +112,20 @@
|
|
|
|
|
|
|
|
|
|
</xy-dialog>
|
|
|
|
|
<!-- 新增明细 -->
|
|
|
|
|
<Modal v-model="isShowMingxi" width='650' title="新增明细" @on-cancel='mingxiCancel' @on-ok="mingxiConfirm">
|
|
|
|
|
<Modal v-model="isShowMingxi" width='650' title="新增明细" :loading='showLoading' @on-cancel='mingxiCancel'
|
|
|
|
|
@on-ok="mingxiConfirm">
|
|
|
|
|
<div class="mingxiwrap">
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>物资编码：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content" style="display: flex;align-items: center;">
|
|
|
|
|
<el-input v-if="form.rukuleixing!='回库'" type="text" @focus="showWuzi" v-model="mingxiObj.wuzibianma" placeholder="请选择物资编码"
|
|
|
|
|
style="width: 300px;"></el-input>
|
|
|
|
|
<el-input v-if="form.rukuleixing=='回库'" @change='getKucunShow' ref='huikubianma' type="text" v-model="mingxiObj.wuzibianma" placeholder="请扫码获取回库物资编码"
|
|
|
|
|
style="width: 300px;"></el-input>
|
|
|
|
|
<Button @click='showWuzi("回库")' v-if="form.rukuleixing=='回库'" type="primary" icon="md-add" style="margin-left: 10px"
|
|
|
|
|
>选择</Button>
|
|
|
|
|
<el-input v-if="form.rukuleixing!='回库'" type="text" @focus="showWuzi" v-model="mingxiObj.wuzibianma"
|
|
|
|
|
placeholder="请选择物资编码" style="width: 300px;"></el-input>
|
|
|
|
|
<el-input v-if="form.rukuleixing=='回库'" @change='getKucunShow' ref='huikubianma' type="text"
|
|
|
|
|
v-model="mingxiObj.wuzibianma" placeholder="请扫码获取回库物资编码" style="width: 300px;"></el-input>
|
|
|
|
|
<Button @click='showWuzi("回库")' v-if="form.rukuleixing=='回库'" type="primary" icon="md-add"
|
|
|
|
|
style="margin-left: 10px">选择</Button>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item">
|
|
|
|
|
@ -165,15 +155,23 @@
|
|
|
|
|
style="width: 300px;"></el-input>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item" v-if="mingxiObj.wuzileixing=='一类一码'">
|
|
|
|
|
<div class="xy-table-item" v-if="form.rukuleixing=='回库'">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>批次：
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>在库数量：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-input type="text" v-model="mingxiObj.pici" placeholder="请选择或新增批次"
|
|
|
|
|
<el-input type="text" v-model="mingxiObj.zaikushuliang" placeholder="请选择计量单位" disabled
|
|
|
|
|
style="width: 300px;"></el-input>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item" v-if="mingxiObj.wuzileixing=='一类一码'">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>入库批次：
|
|
|
|
|
</div>
|
|
|
|
|
<div class="xy-table-item-content">
|
|
|
|
|
<el-input type="text" v-model="mingxiObj.rukupici" placeholder="请输入入库批次" style="width: 300px;"></el-input>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<!-- <div class="xy-table-item" v-if="!mingxiObj.wuzileixing=='一类一码'">
|
|
|
|
|
<div class="xy-table-item-label">
|
|
|
|
|
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>批次：
|
|
|
|
|
@ -231,35 +229,53 @@
|
|
|
|
|
type: 'add',
|
|
|
|
|
id: '',
|
|
|
|
|
tableName: 'stocks',
|
|
|
|
|
cangkuList:[],
|
|
|
|
|
lexingoptions:[{
|
|
|
|
|
label:'盘点',
|
|
|
|
|
value:'盘点'
|
|
|
|
|
},{
|
|
|
|
|
label:'采购',
|
|
|
|
|
value:'采购'
|
|
|
|
|
},{
|
|
|
|
|
label:'回库',
|
|
|
|
|
value:'回库'
|
|
|
|
|
cangkuList: [],
|
|
|
|
|
lexingoptions: [{
|
|
|
|
|
label: '盘点',
|
|
|
|
|
value: '盘点'
|
|
|
|
|
}, {
|
|
|
|
|
label: '采购',
|
|
|
|
|
value: '采购'
|
|
|
|
|
}, {
|
|
|
|
|
label: '回库',
|
|
|
|
|
value: '回库'
|
|
|
|
|
}],
|
|
|
|
|
form: {
|
|
|
|
|
rukushijian: '',
|
|
|
|
|
rukuleixing: '',
|
|
|
|
|
rukucangku:'',
|
|
|
|
|
rukucangku: '',
|
|
|
|
|
jingbanren: "",
|
|
|
|
|
jilurenyuan: '',
|
|
|
|
|
baoguanrenyuan: '',
|
|
|
|
|
beizhu: '',
|
|
|
|
|
rukumingxi: ''
|
|
|
|
|
},
|
|
|
|
|
rules: {},
|
|
|
|
|
isShowMingxi:false,
|
|
|
|
|
mingxiObj:{
|
|
|
|
|
rules: {
|
|
|
|
|
rukushijian: [{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择入库时间'
|
|
|
|
|
}],
|
|
|
|
|
rukushijian: [{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请选择入库类型'
|
|
|
|
|
}],
|
|
|
|
|
jingbanren: [{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请填写经办人'
|
|
|
|
|
}],
|
|
|
|
|
jilurenyuan: [{
|
|
|
|
|
required: true,
|
|
|
|
|
message: '请填写记录人员'
|
|
|
|
|
}]
|
|
|
|
|
},
|
|
|
|
|
isShowMingxi: false,
|
|
|
|
|
showLoading: true,
|
|
|
|
|
mingxiObj: {
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
mingxiObjBefore:{},
|
|
|
|
|
mingxiObjBefore: {},
|
|
|
|
|
mingxiList: [],
|
|
|
|
|
mingxiIndex:'',
|
|
|
|
|
mingxiIndex: '',
|
|
|
|
|
mingxiTable: [{
|
|
|
|
|
label: "物资编码",
|
|
|
|
|
prop: "wuzibianma",
|
|
|
|
|
@ -280,22 +296,48 @@
|
|
|
|
|
prop: "rukushuliang",
|
|
|
|
|
width: 200
|
|
|
|
|
}, {
|
|
|
|
|
label: "批次",
|
|
|
|
|
prop: "pici",
|
|
|
|
|
label: "入库批次",
|
|
|
|
|
prop: "rukupici",
|
|
|
|
|
width: 200
|
|
|
|
|
}
|
|
|
|
|
}, {
|
|
|
|
|
label: "在库数量",
|
|
|
|
|
prop: "zaikushuliang",
|
|
|
|
|
width: 200
|
|
|
|
|
},
|
|
|
|
|
],
|
|
|
|
|
// 物资
|
|
|
|
|
isShowWuzi: false,
|
|
|
|
|
wuziList: [],
|
|
|
|
|
kucunList:[],
|
|
|
|
|
showList:[],
|
|
|
|
|
kucunList: [],
|
|
|
|
|
showList: [],
|
|
|
|
|
wuziPageIndex: 1,
|
|
|
|
|
keyword:'',
|
|
|
|
|
showTotal:0,
|
|
|
|
|
keyword: '',
|
|
|
|
|
showTotal: 0,
|
|
|
|
|
wuziTotal: 0,
|
|
|
|
|
kucunTotal:0,
|
|
|
|
|
kucunTotal: 0,
|
|
|
|
|
wuziColumns: [{
|
|
|
|
|
width: 60,
|
|
|
|
|
_isChecked: false,
|
|
|
|
|
key: "isSelect",
|
|
|
|
|
resizable: true,
|
|
|
|
|
render: (h, params) => {
|
|
|
|
|
return h('div', [
|
|
|
|
|
h('Radio', {
|
|
|
|
|
props: {
|
|
|
|
|
value: params.row.isSelect
|
|
|
|
|
},
|
|
|
|
|
on: {
|
|
|
|
|
'on-change': (e) => {
|
|
|
|
|
this.showList.forEach((items) => {
|
|
|
|
|
this.$set(items, 'isSelect', false)
|
|
|
|
|
});
|
|
|
|
|
this.showList[params.index].isSelect = e;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
])
|
|
|
|
|
}
|
|
|
|
|
}, {
|
|
|
|
|
title: '名称',
|
|
|
|
|
key: 'names',
|
|
|
|
|
}]
|
|
|
|
|
@ -307,28 +349,44 @@
|
|
|
|
|
// this.getKucun()
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
mingxiConfirm(){
|
|
|
|
|
mingxiConfirm() {
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
this.showLoading = false
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.showLoading = true
|
|
|
|
|
})
|
|
|
|
|
}, 500)
|
|
|
|
|
|
|
|
|
|
if(this.mingxiIndex!=''){
|
|
|
|
|
if (this.mingxiObj.rukushuliang > this.mingxiObj.zaikushuliang) {
|
|
|
|
|
Message({
|
|
|
|
|
type: 'warning',
|
|
|
|
|
message: '请填写正确的入库数量'
|
|
|
|
|
})
|
|
|
|
|
this.showLoading = false
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
console.log("123")
|
|
|
|
|
if (this.mingxiIndex != '') {
|
|
|
|
|
|
|
|
|
|
// 比较是否改变了 数据 改变提交到明细
|
|
|
|
|
// let isTrue = this.isEqual(this.mingxiObjBefore,this.mingxiObj)
|
|
|
|
|
// if(this.type=='editor'&&!isTrue){
|
|
|
|
|
// this.submitMingxi(this.mingxiObj)
|
|
|
|
|
// }
|
|
|
|
|
this.mingxiList[this.mingxiIndex-1]=this.mingxiObj
|
|
|
|
|
}else{
|
|
|
|
|
this.mingxiList[this.mingxiIndex - 1] = this.mingxiObj
|
|
|
|
|
} else {
|
|
|
|
|
this.mingxiList.push(this.mingxiObj)
|
|
|
|
|
}
|
|
|
|
|
this.mingxiObj = {}
|
|
|
|
|
this.mingxiObjBefore = {}
|
|
|
|
|
this.mingxiIndex = ''
|
|
|
|
|
this.isShowMingxi = false
|
|
|
|
|
this.showLoading = false
|
|
|
|
|
this.showList = []
|
|
|
|
|
this.showTotal = 0
|
|
|
|
|
this.wuziPageIndex = 1
|
|
|
|
|
},
|
|
|
|
|
mingxiCancel(){
|
|
|
|
|
mingxiCancel() {
|
|
|
|
|
this.mingxiObj = {}
|
|
|
|
|
this.mingxiObjBefore = {}
|
|
|
|
|
this.mingxiIndex = ''
|
|
|
|
|
@ -337,17 +395,17 @@
|
|
|
|
|
this.showTotal = 0
|
|
|
|
|
this.wuziPageIndex = 1
|
|
|
|
|
},
|
|
|
|
|
editMingxi(index){
|
|
|
|
|
editMingxi(index) {
|
|
|
|
|
const before = this.mingxiList[index]
|
|
|
|
|
for(var m in this.mingxiList[index]){
|
|
|
|
|
for (var m in this.mingxiList[index]) {
|
|
|
|
|
this.mingxiObjBefore[m] = this.mingxiList[index][m]
|
|
|
|
|
}
|
|
|
|
|
this.mingxiObj = this.mingxiList[index]
|
|
|
|
|
this.mingxiIndex = index+1 // 为0时！=‘’为false
|
|
|
|
|
this.mingxiIndex = index + 1 // 为0时！=‘’为false
|
|
|
|
|
this.isShowMingxi = true
|
|
|
|
|
},
|
|
|
|
|
showWuzi(type) {
|
|
|
|
|
if(this.form.rukuleixing==''){
|
|
|
|
|
if (this.form.rukuleixing == '') {
|
|
|
|
|
Message({
|
|
|
|
|
type: 'warning',
|
|
|
|
|
message: '请先选择入库类型'
|
|
|
|
|
@ -355,14 +413,14 @@
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
this.isShowWuzi = true
|
|
|
|
|
if(type=='回库'){
|
|
|
|
|
if (type == '回库') {
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.$refs.huikubianma.focus()
|
|
|
|
|
})
|
|
|
|
|
this.getKucun()
|
|
|
|
|
// this.showList = this.kucunList
|
|
|
|
|
// this.showTotal = this.kucunTotal
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
this.getWuzi()
|
|
|
|
|
// this.showList = this.wuziList
|
|
|
|
|
// this.showTotal = this.wuziTotal
|
|
|
|
|
@ -370,12 +428,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
getList(){
|
|
|
|
|
if(this.form.rukuleixing=='回库'){
|
|
|
|
|
getList() {
|
|
|
|
|
if (this.form.rukuleixing == '回库') {
|
|
|
|
|
this.getKucun()
|
|
|
|
|
// this.showList = this.kucunList
|
|
|
|
|
// this.showTotal = this.kucunTotal
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
this.getWuzi()
|
|
|
|
|
// this.showList = this.wuziList
|
|
|
|
|
// this.showTotal = this.wuziTotal
|
|
|
|
|
@ -386,10 +444,15 @@
|
|
|
|
|
page_size: 10,
|
|
|
|
|
page: this.wuziPageIndex,
|
|
|
|
|
table_name: 'material_infos',
|
|
|
|
|
filter:[{"key":"zichanmingcheng","op":"like","value":this.keyword}]
|
|
|
|
|
filter: [{
|
|
|
|
|
"key": "zichanmingcheng",
|
|
|
|
|
"op": "like",
|
|
|
|
|
"value": this.keyword
|
|
|
|
|
}]
|
|
|
|
|
})
|
|
|
|
|
for (var m of res.data) {
|
|
|
|
|
m.names = m.wuzibianma + "--" + m.zichanmingcheng
|
|
|
|
|
m.isSelect = false
|
|
|
|
|
}
|
|
|
|
|
this.showList = res.data
|
|
|
|
|
this.showTotal = res.total
|
|
|
|
|
@ -399,24 +462,29 @@
|
|
|
|
|
page_size: 10,
|
|
|
|
|
page: this.wuziPageIndex,
|
|
|
|
|
table_name: 'inventorys',
|
|
|
|
|
filter:[{"key":"zichanmingcheng","op":"like","value":this.keyword}]
|
|
|
|
|
filter: [{
|
|
|
|
|
"key": "zichanmingcheng",
|
|
|
|
|
"op": "like",
|
|
|
|
|
"value": this.keyword
|
|
|
|
|
}]
|
|
|
|
|
})
|
|
|
|
|
for (var m of res.data) {
|
|
|
|
|
m.names = m.wuzibianma + "--" + m.zichanmingcheng
|
|
|
|
|
m.isSelect = false
|
|
|
|
|
}
|
|
|
|
|
this.showList = res.data
|
|
|
|
|
this.showTotal = res.total
|
|
|
|
|
},
|
|
|
|
|
async getKucunShow(e){
|
|
|
|
|
async getKucunShow(e) {
|
|
|
|
|
console.log(e)
|
|
|
|
|
let id = ''
|
|
|
|
|
if(e){
|
|
|
|
|
if (e) {
|
|
|
|
|
id = e.split('-')[1]
|
|
|
|
|
this.$nextTick(() => {
|
|
|
|
|
this.$refs.huikubianma.blur()
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
} else {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
const res = await show({
|
|
|
|
|
@ -427,6 +495,8 @@
|
|
|
|
|
this.mingxiObj.zichanmingcheng = res.zichanmingcheng
|
|
|
|
|
this.mingxiObj.wuzileixing = res.wuzileixing
|
|
|
|
|
this.mingxiObj.jiliangdanwei = res.jiliangdanwei
|
|
|
|
|
this.mingxiObj.zaikushuliang = res.zaikushuliang
|
|
|
|
|
this.mingxiObj.rukukupici = res.rukukupici
|
|
|
|
|
this.mingxiObj.id = res.id
|
|
|
|
|
},
|
|
|
|
|
async getCangku() {
|
|
|
|
|
@ -438,13 +508,31 @@
|
|
|
|
|
this.cangkuList = res.data
|
|
|
|
|
},
|
|
|
|
|
wuziSelect(e) {
|
|
|
|
|
console.log(e)
|
|
|
|
|
this.showList.forEach((items) => {
|
|
|
|
|
this.$set(items, 'isSelect', false)
|
|
|
|
|
if(items.id==e.id){
|
|
|
|
|
this.$set(items, 'isSelect', true)
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
if (this.form.rukuleixing == '回库') {
|
|
|
|
|
this.mingxiObj.wuzibianma = e.wuzibianma
|
|
|
|
|
this.mingxiObj.zichanmingcheng = e.zichanmingcheng
|
|
|
|
|
this.mingxiObj.wuzileixing = e.wuzileixing
|
|
|
|
|
this.mingxiObj.jiliangdanwei = e.jiliangdanwei
|
|
|
|
|
this.mingxiObj.zaikushuliang = e.zaikushuliang
|
|
|
|
|
this.mingxiObj.rukukupici = e.rukukupici
|
|
|
|
|
this.mingxiObj.id = e.id
|
|
|
|
|
} else {
|
|
|
|
|
this.mingxiObj.wuzibianma = e.wuzibianma
|
|
|
|
|
this.mingxiObj.zichanmingcheng = e.zichanmingcheng
|
|
|
|
|
this.mingxiObj.wuzileixing = e.wuzileixing
|
|
|
|
|
this.mingxiObj.jiliangdanwei = e.jiliangdanwei
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
},
|
|
|
|
|
wuziPageChange(e) {
|
|
|
|
|
console.log("e",e)
|
|
|
|
|
console.log("e", e)
|
|
|
|
|
this.wuziPageIndex = e
|
|
|
|
|
this.getList()
|
|
|
|
|
},
|
|
|
|
|
@ -478,9 +566,9 @@
|
|
|
|
|
this.total = res.total
|
|
|
|
|
},
|
|
|
|
|
// 编辑入库管理时 单个提交更改的明细
|
|
|
|
|
submitMingxi(params,callback){
|
|
|
|
|
submitMingxi(params, callback) {
|
|
|
|
|
save({
|
|
|
|
|
table_name:'stocks_items',
|
|
|
|
|
table_name: 'stocks_items',
|
|
|
|
|
...params
|
|
|
|
|
}).then(res => {
|
|
|
|
|
Message({
|
|
|
|
|
@ -521,49 +609,49 @@
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
isEqual(objA,objB){
|
|
|
|
|
isEqual(objA, objB) {
|
|
|
|
|
//相等
|
|
|
|
|
if(objA === objB) return objA !== 0 || 1/objA === 1/objB;
|
|
|
|
|
if (objA === objB) return objA !== 0 || 1 / objA === 1 / objB;
|
|
|
|
|
//空判断
|
|
|
|
|
if(objA == null || objB == null) return objA === objB;
|
|
|
|
|
if (objA == null || objB == null) return objA === objB;
|
|
|
|
|
//类型判断
|
|
|
|
|
if(Object.prototype.toString.call(objA) !== Object.prototype.toString.call(objB)) return false;
|
|
|
|
|
if (Object.prototype.toString.call(objA) !== Object.prototype.toString.call(objB)) return false;
|
|
|
|
|
|
|
|
|
|
switch(Object.prototype.toString.call(objA)){
|
|
|
|
|
switch (Object.prototype.toString.call(objA)) {
|
|
|
|
|
case '[object RegExp]':
|
|
|
|
|
case '[object String]':
|
|
|
|
|
//字符串转换比较
|
|
|
|
|
return '' + objA ==='' + objB;
|
|
|
|
|
return '' + objA === '' + objB;
|
|
|
|
|
case '[object Number]':
|
|
|
|
|
//数字转换比较,判断是否为NaN
|
|
|
|
|
if(+objA !== +objA){
|
|
|
|
|
if (+objA !== +objA) {
|
|
|
|
|
return +objB !== +objB;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return +objA === 0?1/ +objA === 1/objB : +objA === +objB;
|
|
|
|
|
return +objA === 0 ? 1 / +objA === 1 / objB : +objA === +objB;
|
|
|
|
|
case '[object Date]':
|
|
|
|
|
case '[object Boolean]':
|
|
|
|
|
return +objA === +objB;
|
|
|
|
|
case '[object Array]':
|
|
|
|
|
//判断数组
|
|
|
|
|
for(let i = 0; i < objA.length; i++){
|
|
|
|
|
if (!this.isEqual(objA[i],objB[i])) return false;
|
|
|
|
|
for (let i = 0; i < objA.length; i++) {
|
|
|
|
|
if (!this.isEqual(objA[i], objB[i])) return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
case '[object Object]':
|
|
|
|
|
//判断对象
|
|
|
|
|
let keys = Object.keys(objA);
|
|
|
|
|
for(let i = 0; i < keys.length; i++){
|
|
|
|
|
if (!this.isEqual(objA[keys[i]],objB[keys[i]])) return false;
|
|
|
|
|
for (let i = 0; i < keys.length; i++) {
|
|
|
|
|
if (!this.isEqual(objA[keys[i]], objB[keys[i]])) return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
keys = Object.keys(objB);
|
|
|
|
|
for(let i = 0; i < keys.length; i++){
|
|
|
|
|
if (!this.isEqual(objA[keys[i]],objB[keys[i]])) return false;
|
|
|
|
|
for (let i = 0; i < keys.length; i++) {
|
|
|
|
|
if (!this.isEqual(objA[keys[i]], objB[keys[i]])) return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
default :
|
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -587,21 +675,25 @@
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
<style scoped lang="scss">
|
|
|
|
|
.mingxiwrap{
|
|
|
|
|
.mingxiwrap {
|
|
|
|
|
display: flex;
|
|
|
|
|
flex-wrap: wrap;
|
|
|
|
|
}
|
|
|
|
|
.mingxiwrap .xy-table-item{
|
|
|
|
|
margin-bottom:10px
|
|
|
|
|
|
|
|
|
|
.mingxiwrap .xy-table-item {
|
|
|
|
|
margin-bottom: 10px
|
|
|
|
|
}
|
|
|
|
|
.searchCompanys{
|
|
|
|
|
|
|
|
|
|
.searchCompanys {
|
|
|
|
|
display: flex;
|
|
|
|
|
justify-content: space-between;
|
|
|
|
|
margin-bottom:15px;
|
|
|
|
|
margin-bottom: 15px;
|
|
|
|
|
}
|
|
|
|
|
::v-deep .searchCompanys .el-input{
|
|
|
|
|
width:82%
|
|
|
|
|
|
|
|
|
|
::v-deep .searchCompanys .el-input {
|
|
|
|
|
width: 82%
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.xy-table-item-label {
|
|
|
|
|
width: 160px;
|
|
|
|
|
}
|
|
|
|
|
|
