|
|
|
|
@ -231,11 +231,7 @@
|
|
|
|
|
width="90%" |
|
|
|
|
:model="addvalue" |
|
|
|
|
> |
|
|
|
|
<el-button |
|
|
|
|
type="primary" |
|
|
|
|
@click="Batchmodifycustomers" |
|
|
|
|
>批量修改客户 |
|
|
|
|
</el-button> |
|
|
|
|
<el-button type="primary" @click="Batchmodifycustomers">批量修改客户 </el-button> |
|
|
|
|
<tablecmt |
|
|
|
|
ref="orderTableNode" |
|
|
|
|
:columnList="stockArtcolumnList" |
|
|
|
|
@ -324,23 +320,23 @@
|
|
|
|
|
|
|
|
|
|
<el-col :xl="5" :lg="4" :md="4" :sm="12"> |
|
|
|
|
<div class="el_sumS"> |
|
|
|
|
<span>操作数量：</span> |
|
|
|
|
<el-input-number |
|
|
|
|
v-if="this.isrReservationEntry" |
|
|
|
|
v-model="item.reservationNum" |
|
|
|
|
min="0" |
|
|
|
|
:max="maxSum" |
|
|
|
|
placeholder="请输入预约数量" |
|
|
|
|
></el-input-number> |
|
|
|
|
<el-input-number |
|
|
|
|
v-else |
|
|
|
|
v-model="item.number" |
|
|
|
|
min="0" |
|
|
|
|
:max="maxSum" |
|
|
|
|
placeholder="请输入预约数量" |
|
|
|
|
></el-input-number> |
|
|
|
|
</div> |
|
|
|
|
</el-col> |
|
|
|
|
<span>操作数量：</span> |
|
|
|
|
<el-input-number |
|
|
|
|
v-if="this.isrReservationEntry" |
|
|
|
|
v-model="item.reservationNum" |
|
|
|
|
min="0" |
|
|
|
|
:max="maxSum" |
|
|
|
|
placeholder="请输入预约数量" |
|
|
|
|
></el-input-number> |
|
|
|
|
<el-input-number |
|
|
|
|
v-else |
|
|
|
|
v-model="item.number" |
|
|
|
|
min="0" |
|
|
|
|
:max="maxSum" |
|
|
|
|
placeholder="请输入预约数量" |
|
|
|
|
></el-input-number> |
|
|
|
|
</div> |
|
|
|
|
</el-col> |
|
|
|
|
</el-row> |
|
|
|
|
|
|
|
|
|
<!-- <el-input-number v-model="item.reservationNum" min="0" :max="item.quantity - item.deliveryQuantity -item.outboundQuantity " placeholder="请输入预约数量"></el-input-number>--> |
|
|
|
|
@ -461,7 +457,10 @@
|
|
|
|
|
<el-input v-model="clientData.customerName" placeholder="请输入用户名称"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="用户电话:"> |
|
|
|
|
<el-input v-model="clientData.customerTelephone" placeholder="请输入用户电话"></el-input> |
|
|
|
|
<el-input |
|
|
|
|
v-model="clientData.customerTelephone" |
|
|
|
|
placeholder="请输入用户电话" |
|
|
|
|
></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="用户地址:"> |
|
|
|
|
<el-input v-model="clientData.customerAddress" placeholder="请输入用户地址"></el-input> |
|
|
|
|
@ -1332,17 +1331,6 @@ export default {
|
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'incomingBatch', |
|
|
|
|
label: '入库批次', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// prop: 'serviceTypeName', |
|
|
|
|
// label: '服务类型', |
|
|
|
|
@ -1359,12 +1347,32 @@ export default {
|
|
|
|
|
label: '订单自编号', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
width: '240', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'descriptionGoods', |
|
|
|
|
label: '物料名称', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'cargoNumber', |
|
|
|
|
label: '物料编码', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'serviceNumber', |
|
|
|
|
label: '服务号', |
|
|
|
|
@ -1372,19 +1380,20 @@ export default {
|
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: true, |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'descriptionGoods', |
|
|
|
|
label: '物料名称', |
|
|
|
|
prop: 'incomingBatch', |
|
|
|
|
label: '入库批次', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
head: false, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// prop: 'warehouse', |
|
|
|
|
@ -1406,16 +1415,6 @@ export default {
|
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'cargoNumber', |
|
|
|
|
label: '物料编码', |
|
|
|
|
type: 2, |
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
prop: 'marketName', |
|
|
|
|
label: '商场/客户', |
|
|
|
|
@ -1423,7 +1422,7 @@ export default {
|
|
|
|
|
values: '', |
|
|
|
|
width: '130', |
|
|
|
|
checkarr: [], |
|
|
|
|
fixed: false, |
|
|
|
|
fixed: true, |
|
|
|
|
sortable: true, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
@ -2019,15 +2018,15 @@ export default {
|
|
|
|
|
return ids.join(','); |
|
|
|
|
}, |
|
|
|
|
// 最大数量 |
|
|
|
|
maxSum(){ |
|
|
|
|
let max=0 |
|
|
|
|
this.zeroOrderData.forEach(item=>{ |
|
|
|
|
maxSum() { |
|
|
|
|
let max = 0; |
|
|
|
|
this.zeroOrderData.forEach(item => { |
|
|
|
|
console.log(item); |
|
|
|
|
max+=item.deliveryQuantity;//冻结数量 |
|
|
|
|
}) |
|
|
|
|
let maxs = this.obj.handQuantity -max |
|
|
|
|
return maxs |
|
|
|
|
} |
|
|
|
|
max += item.deliveryQuantity; //冻结数量 |
|
|
|
|
}); |
|
|
|
|
let maxs = this.obj.handQuantity - max; |
|
|
|
|
return maxs; |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
methods: { |
|
|
|
|
@ -2170,29 +2169,29 @@ export default {
|
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 批量修改客户 |
|
|
|
|
Batchmodifycustomers(){ |
|
|
|
|
if(!this.orderList.length){ |
|
|
|
|
Batchmodifycustomers() { |
|
|
|
|
if (!this.orderList.length) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '请勾选要批量修改的数据', |
|
|
|
|
type: 'warning', |
|
|
|
|
}) |
|
|
|
|
return; |
|
|
|
|
message: '请勾选要批量修改的数据', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
let State= this.orderList.every(item=>item.mallName==this.orderList[0].mallName) |
|
|
|
|
let State = this.orderList.every(item => item.mallName == this.orderList[0].mallName); |
|
|
|
|
|
|
|
|
|
if(!State){ |
|
|
|
|
if (!State) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: '请勾选商场名称一样的单子', |
|
|
|
|
type: 'warning', |
|
|
|
|
}) |
|
|
|
|
return |
|
|
|
|
message: '请勾选商场名称一样的单子', |
|
|
|
|
type: 'warning', |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// this.orderList |
|
|
|
|
this.clientData={} |
|
|
|
|
this.clientData.mallName= this.orderList[0].mallName |
|
|
|
|
this.dialogVisible=true |
|
|
|
|
this.clientData = {}; |
|
|
|
|
this.clientData.mallName = this.orderList[0].mallName; |
|
|
|
|
this.dialogVisible = true; |
|
|
|
|
}, |
|
|
|
|
handleCheckedCitiesChange(value) { |
|
|
|
|
if (value) { |
|
|
|
|
@ -2307,51 +2306,52 @@ export default {
|
|
|
|
|
this.isrReservationEntry = false; |
|
|
|
|
}, |
|
|
|
|
submitClient() { |
|
|
|
|
if(this.orderList.length){ |
|
|
|
|
let data={ |
|
|
|
|
entityList:[] |
|
|
|
|
} |
|
|
|
|
if (this.orderList.length) { |
|
|
|
|
let data = { |
|
|
|
|
entityList: [], |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
this.orderList.forEach(item => { |
|
|
|
|
item.customerName = this.clientData.customerName; //用户名称 |
|
|
|
|
item.customerTelephone = this.clientData.customerTelephone; //用户电话 |
|
|
|
|
item.customerAddress = this.clientData.customerAddress; //用户地址 |
|
|
|
|
data['entityList'].push(item); |
|
|
|
|
}); |
|
|
|
|
this.loading = true; |
|
|
|
|
this.dialogVisible = false; //关闭修改谈弹窗 |
|
|
|
|
$_updateBatchClient(data) |
|
|
|
|
.then(res => { |
|
|
|
|
console.log(res, '修改成功'); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
ElMessage({ |
|
|
|
|
message: res.data.msg, |
|
|
|
|
type: 'success', |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
this.orderList.forEach(item=>{ |
|
|
|
|
item.customerName = this.clientData.customerName;//用户名称 |
|
|
|
|
item.customerTelephone=this.clientData.customerTelephone;//用户电话 |
|
|
|
|
item.customerAddress=this.clientData.customerAddress;//用户地址 |
|
|
|
|
data['entityList'].push(item) |
|
|
|
|
}) |
|
|
|
|
this.loading=true |
|
|
|
|
this.dialogVisible = false;//关闭修改谈弹窗 |
|
|
|
|
$_updateBatchClient(data).then(res=>{ |
|
|
|
|
console.log(res,'修改成功'); |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
ElMessage({ |
|
|
|
|
message: res.data.msg, |
|
|
|
|
type: 'success', |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
this.orderList = []; |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
this.orderList=[] |
|
|
|
|
} |
|
|
|
|
}).catch(()=>{ |
|
|
|
|
this.loading=false |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
}else{ |
|
|
|
|
this.loading=true |
|
|
|
|
this.dialogVisible = false;//关闭修改弹出 |
|
|
|
|
console.log('this.client===============>', this.clientData); |
|
|
|
|
updateClient(this.clientData).then(res => { |
|
|
|
|
console.log('res>>>>>>>>>>>', res.data.data); |
|
|
|
|
this.orderList=[] |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
this.dialogVisible = false; |
|
|
|
|
}).catch(()=>{ |
|
|
|
|
this.loading=false |
|
|
|
|
}).finally(()=>{ |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
.catch(() => { |
|
|
|
|
this.loading = false; |
|
|
|
|
}) |
|
|
|
|
.finally(() => {}); |
|
|
|
|
} else { |
|
|
|
|
this.loading = true; |
|
|
|
|
this.dialogVisible = false; //关闭修改弹出 |
|
|
|
|
console.log('this.client===============>', this.clientData); |
|
|
|
|
updateClient(this.clientData) |
|
|
|
|
.then(res => { |
|
|
|
|
console.log('res>>>>>>>>>>>', res.data.data); |
|
|
|
|
this.orderList = []; |
|
|
|
|
this.onLoadOrder(this.page); |
|
|
|
|
this.dialogVisible = false; |
|
|
|
|
}) |
|
|
|
|
.catch(() => { |
|
|
|
|
this.loading = false; |
|
|
|
|
}) |
|
|
|
|
.finally(() => {}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 选择包件信息 |
|
|
|
|
@ -3424,12 +3424,12 @@ input[type='number'] {
|
|
|
|
|
.footer-container { |
|
|
|
|
height: 60px; |
|
|
|
|
} |
|
|
|
|
.el_sumS{ |
|
|
|
|
span{ |
|
|
|
|
.el_sumS { |
|
|
|
|
span { |
|
|
|
|
width: 100px; |
|
|
|
|
} |
|
|
|
|
display: flex; |
|
|
|
|
height: 20px; |
|
|
|
|
width: 200px; |
|
|
|
|
height: 20px; |
|
|
|
|
width: 200px; |
|
|
|
|
} |
|
|
|
|
</style> |
|
|
|
|
|
