Skip to content

J
jiedao-app-operator-master
Commit 2b34851d authored by 邓春圆's avatar 邓春圆
Browse files
Options

Merge remote-tracking branch 'origin/dev1.6' into dev1.6

parents bb655992 1d6de437
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 44 deletions
src/api/ecw/orderException.js
View file @ 2b34851d
...@@ -107,7 +107,9 @@ export function exportExcel(params) { ...@@ -107,7 +107,9 @@ export function exportExcel(params) {
return request({ return request({
url: '/ecw/order-exception/export-excel', url: '/ecw/order-exception/export-excel',
method: 'get', method: 'get',
timeout: 3*60*1000,
params, params,
// timeout: 3*60*1000,
responseType: 'arraybuffer' responseType: 'arraybuffer'
}) })
} }
\ No newline at end of file
src/components/WarehouseAreaSelect/index.vue
View file @ 2b34851d
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
methods: { methods: {
handleOpen(){ handleOpen(){
this.dialogVisible = true this.dialogVisible = true
this.initArea() // this.initArea()
}, },
handleSave(){ handleSave(){
this.$nextTick(() => { this.$nextTick(() => {
......
src/views/ecw/box/shippingSea/nodePage/tally/index.vue
View file @ 2b34851d
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
...oItem, ...oItem,
warehouseInInfo, warehouseInInfo,
multiSpecification: item.multiSpecification, multiSpecification: item.multiSpecification,
positionNo: item.positionNo, positionNo: oItem.positionNo,
tallyStatus: item.tallyStatus, tallyStatus: item.tallyStatus,
tallyTime: item.tallyTime, tallyTime: item.tallyTime,
}); });
......
src/views/ecw/financial/creatCollection.vue
View file @ 2b34851d
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span> <span v-if="scope.row.type !== 'total'">{{ scope.row.collectionAmount }}</span>
<div v-else> <div v-else>
<div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?(itemAmount?itemAmount.currencyNameZh:''):(itemAmount?itemAmount.currencyNameEn:'')}}: {{ itemAmount.amount}}</div> <div v-for="itemAmount in scope.row.collectionAmount">{{$i18n.locale=='zh_CN'?(itemAmount?itemAmount.currencyNameZh:''):(itemAmount?itemAmount.currencyNameEn:'')}}: {{ itemAmount.amount||''}}</div>
<!-- <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div> <!-- <div v-if="scope.row.collectionAmount[1]">{{ $t('人民币') }}: {{ scope.row.collectionAmount[1].toFixed(6) }}</div>
<div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div> <div v-if="scope.row.collectionAmount[2]">{{ $t('奈拉') }}: {{ scope.row.collectionAmount[2].toFixed(6) }}</div>
<div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> --> <div v-if="scope.row.collectionAmount[3]">{{ $t('西非法郎') }}: {{ scope.row.collectionAmount[3].toFixed(6) }}</div> -->
...@@ -961,10 +961,17 @@ export default { ...@@ -961,10 +961,17 @@ export default {
}, },
//明细改变税率 //明细改变税率
changeTaxRate(row,index){ changeTaxRate(row,index){
var regs=/^\d+$/; var pointArr = []
var regs=/^[1-9]+\d*(\.\d*)?$|^0?\.\d*[1-9]\d*$/;
if(row.taxPoint&&!regs.test(row.taxPoint)){ if(row.taxPoint&&!regs.test(row.taxPoint)){
row.taxPoint = 0 row.taxPoint = ''
this.$modal.msgError(this.$t('输入税率格式不对')); this.$modal.msgError(this.$t('输入税率格式不对'));
}else{
pointArr = row.taxPoint.split('.')
if(pointArr.length>1&&pointArr[1]){
row.taxPoint =Math.round(row.taxPoint*100)/100
}
} }
if(row.taxPoint){ if(row.taxPoint){
var amout = NP.times(NP.divide(row.taxPoint,100), row.totalAmount) var amout = NP.times(NP.divide(row.taxPoint,100), row.totalAmount)
...@@ -976,7 +983,12 @@ export default { ...@@ -976,7 +983,12 @@ export default {
this.list[index] = {...row} this.list[index] = {...row}
let dataArrTemp = JSON.stringify(this.list); let dataArrTemp = JSON.stringify(this.list);
this.list= JSON.parse(dataArrTemp); this.list= JSON.parse(dataArrTemp);
this.calculation() if(pointArr.length>1&&!pointArr[1]){
return
}else{
this.calculation()
}
}, },
calculation() { calculation() {
const copyList = this.form.receiptAccountList const copyList = this.form.receiptAccountList
...@@ -1211,6 +1223,7 @@ export default { ...@@ -1211,6 +1223,7 @@ export default {
// }else{ // }else{
var discount = this.list[this.selectListIndex] var discount = this.list[this.selectListIndex]
discount['discountTotal'] = this.discountForm.discountTotal discount['discountTotal'] = this.discountForm.discountTotal
discount['discountRemark'] = this.discountForm.discountRemark
setTimeout(()=>{ setTimeout(()=>{
// getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => { // getReceivableInfoByIds({ id: this.selectListRow.id }).then(res => {
this.$set(this.list, this.selectListIndex, {...discount}) this.$set(this.list, this.selectListIndex, {...discount})
......
src/views/ecw/order/detail.vue
View file @ 2b34851d
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<el-descriptions border :title="$t('物流信息')" :column="2"> <el-descriptions border :title="$t('物流信息')" :column="2">
<el-descriptions-item :label="$t('始发仓')">{{order.logisticsInfoDto.startTitleZh}}</el-descriptions-item> <el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">{{order.logisticsInfoDto.destTitleZh}}</el-descriptions-item> <el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> --> <!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
<el-descriptions-item :label="$t('运输方式')" :span="2"> <el-descriptions-item :label="$t('运输方式')" :span="2">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
...@@ -184,6 +184,7 @@ ...@@ -184,6 +184,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="" :label="$t('成交单价')" width="220px"> <el-table-column prop="" :label="$t('成交单价')" width="220px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<template v-if="row.charging ==1"> <template v-if="row.charging ==1">
<template v-if="!row.oneSeaFreight">{{ $t('未报价') }}</template> <template v-if="!row.oneSeaFreight">{{ $t('未报价') }}</template>
<el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link> <el-link type="primary" @click="showFeeDetail(row, 'clearance')" v-else>{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</el-link>
...@@ -218,7 +219,7 @@ ...@@ -218,7 +219,7 @@
<el-tab-pane :label="$t('订单动态')" name="second"> <el-tab-pane :label="$t('订单动态')" name="second">
<el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true"> <el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true">
<el-timeline-item v-for="(activity, index) in order.orderTimeVOList" :key="index" :timestamp="activity.timestamp"> <el-timeline-item v-for="(activity, index) in order.orderTimeVOList" :key="index" :timestamp="activity.timestamp">
{{ activity.titleZh }} {{ $l(activity, 'title') }}
<div>{{$l(activity, 'remarks')}}</div> <div>{{$l(activity, 'remarks')}}</div>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
...@@ -240,10 +241,10 @@ ...@@ -240,10 +241,10 @@
{{channelName}} {{channelName}}
</el-table-column> </el-table-column>
<el-table-column :label="$t('始发地')" prop="orderNo"> <el-table-column :label="$t('始发地')" prop="orderNo">
{{departure.titleZh || '-'}} {{$l(departure, 'title') || '-'}}
</el-table-column> </el-table-column>
<el-table-column :label="$t('目的地')"> <el-table-column :label="$t('目的地')">
{{objective.titleZh || '-'}} {{$l(objective, 'title') || '-'}}
</el-table-column> </el-table-column>
<el-table-column :label="$t('品名')" prop="titleZh"></el-table-column> <el-table-column :label="$t('品名')" prop="titleZh"></el-table-column>
<el-table-column :label="$t('箱数')" prop="num"> <el-table-column :label="$t('箱数')" prop="num">
...@@ -443,14 +444,14 @@ export default { ...@@ -443,14 +444,14 @@ export default {
currencyMap(){ currencyMap(){
let map = {} let map = {}
this.currencyList.forEach(item => { this.currencyList.forEach(item => {
map[item.id] = item.titleZh map[item.id] = this.$l(item, 'title')
}) })
return map return map
}, },
unitMap(){ unitMap(){
let map = {} let map = {}
this.unitList.forEach(item => { this.unitList.forEach(item => {
map[item.id] = item.titleZh map[item.id] = this.$l(item, 'title')
}) })
return map return map
}, },
...@@ -485,7 +486,7 @@ export default { ...@@ -485,7 +486,7 @@ export default {
console.log('listById', res) console.log('listById', res)
let region = '' let region = ''
res.data.forEach(item => { res.data.forEach(item => {
region += " " + item.titleZh region += " " + this.$l(item, 'title')
}) })
this.region = region this.region = region
}) })
......
src/views/ecw/order/index.vue
View file @ 2b34851d
...@@ -377,8 +377,11 @@ ...@@ -377,8 +377,11 @@
<!-- 调仓 --> <!-- 调仓 -->
<template v-if=" <template v-if="
include(scope.row.inWarehouseState, [202, 207, 209, 210, 202, 211, 212, 215, 216, 218]) || (
(include(scope.row.status, [16]) && exclude(scope.row.inWarehouseState, [213,214])) include(scope.row.inWarehouseState, [202, 207, 209, 210, 202, 211, 212, 215, 216, 218]) ||
(include(scope.row.status, [16]) && exclude(scope.row.inWarehouseState, [213,214]))
)
&& exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
"> ">
<el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" v-hasPermi="['ecw:order:warehouse_adjustment']">{{$t('调仓')}}</el-dropdown-item> <el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" v-hasPermi="['ecw:order:warehouse_adjustment']">{{$t('调仓')}}</el-dropdown-item>
</template> </template>
......
src/views/ecw/order/singleApply.vue
View file @ 2b34851d
...@@ -140,8 +140,8 @@ ...@@ -140,8 +140,8 @@
<el-checkbox v-model="checked">{{ $t('需要仓库打包') }}</el-checkbox> <el-checkbox v-model="checked">{{ $t('需要仓库打包') }}</el-checkbox>
</el-row> --> </el-row> -->
</el-card> </el-card>
<work-flow v-if='singleData.length>0' xmlkey="merge_order" v-model="selectedUsers"></work-flow> <work-flow v-if='singleData.length>0||orderData.inWarehouseState==209' xmlkey="merge_order" v-model="selectedUsers"></work-flow>
<div slot="footer" class="card footer_btn" v-if="singleData.length>0"> <div slot="footer" class="card footer_btn" v-if="singleData.length>0||orderData.inWarehouseState==209">
<el-button v-if="orderData.inWarehouseState!=209" type="primary" @click="submitForm">{{$t('提交申请')}}</el-button> <el-button v-if="orderData.inWarehouseState!=209" type="primary" @click="submitForm">{{$t('提交申请')}}</el-button>
<el-button v-if="orderData.inWarehouseState!=209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button> <el-button v-if="orderData.inWarehouseState!=209" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
<el-button v-if="orderData.inWarehouseState==209" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+bpmProcessId)">{{$t('审核中')}}</el-button> <el-button v-if="orderData.inWarehouseState==209" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+bpmProcessId)">{{$t('审核中')}}</el-button>
......
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @ 2b34851d
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<el-card class="box-card"> <el-card class="box-card">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>{{ $t('入仓记录') }}</span> <span>{{ $t('入仓记录') }}</span>
<el-button style="float: right;margin-left: 15px" size="mini" type="primary" icon="el-icon-minus" circle @click="handleDelete" :disabled="form.table.length <= protectRowCount"></el-button> <el-button style="float: right;margin-left: 15px" size="mini" type="primary" icon="el-icon-minus" circle @click="handleDelete" :disabled="form.table.length < protectRowCount"></el-button>
<el-button style="float: right" size="mini" type="primary" icon="el-icon-plus" circle @click="handleAdd()"></el-button> <el-button style="float: right" size="mini" type="primary" icon="el-icon-plus" circle @click="handleAdd()"></el-button>
</div> </div>
<el-form ref="tableForm" :rules="tableFormRules" :model="form" size="mini"> <el-form ref="tableForm" :rules="tableFormRules" :model="form" size="mini">
...@@ -77,10 +77,10 @@ ...@@ -77,10 +77,10 @@
<span style="color: red">*</span>{{ $t('箱数') }}</template> <span style="color: red">*</span>{{ $t('箱数') }}</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.cartonsNum"> <el-form-item :rules="tableFormRules.cartonsNum">
<el-input v-model="form.table[$index].cartonsNum" placeholder="" @blur="handleVolume($index)" :disabled="$index <= protectRowCount"> <el-input v-model="form.table[$index].cartonsNum" placeholder="" @blur="handleVolume($index)" :disabled="$index < protectRowCount">
<span slot="append">{{ getDictDataLabel(DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE, form.table[$index].specificationType) }}</span> <span slot="append">{{ getDictDataLabel(DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE, form.table[$index].specificationType) }}</span>
</el-input> </el-input>
<dict-selector :disabled="$index <= protectRowCount" :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form.table[$index].specificationType" @change="handleVolume($index)"></dict-selector> <dict-selector :disabled="$index < protectRowCount" :type="DICT_TYPE.WAREHOUSING_SPECIFICATION_TYPE" v-model="form.table[$index].specificationType" @change="handleVolume($index)"></dict-selector>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<span style="color: red">*</span>{{ $t('包装类型') }}</template> <span style="color: red">*</span>{{ $t('包装类型') }}</template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item> <el-form-item>
<dict-selector :disabled="$index <= protectRowCount" :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="form.table[$index].unit"></dict-selector> <dict-selector :disabled="$index < protectRowCount" :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="form.table[$index].unit"></dict-selector>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge1"> <el-form-item :rules="tableFormRules.boxGauge1">
<el-input :disabled="$index <= protectRowCount" type="number" v-model="form.table[$index].boxGauge1" placeholder="" @blur="handleVolume($index)"></el-input> <el-input :disabled="$index < protectRowCount" type="number" v-model="form.table[$index].boxGauge1" placeholder="" @blur="handleVolume($index)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge2"> <el-form-item :rules="tableFormRules.boxGauge2">
<el-input :disabled="$index <= protectRowCount" type="number" v-model="form.table[$index].boxGauge2" placeholder="" @blur="handleVolume($index)"></el-input> <el-input :disabled="$index < protectRowCount" type="number" v-model="form.table[$index].boxGauge2" placeholder="" @blur="handleVolume($index)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.boxGauge3"> <el-form-item :rules="tableFormRules.boxGauge3">
<el-input :disabled="$index <= protectRowCount" type="number" v-model="form.table[$index].boxGauge3" placeholder="" @blur="handleVolume($index)"></el-input> <el-input :disabled="$index < protectRowCount" type="number" v-model="form.table[$index].boxGauge3" placeholder="" @blur="handleVolume($index)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.volume"> <el-form-item :rules="tableFormRules.volume">
<el-input :disabled="$index <= protectRowCount" v-model="form.table[$index].volume" placeholder="" type="number"></el-input> <el-input :disabled="$index < protectRowCount" v-model="form.table[$index].volume" placeholder="" type="number"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -139,14 +139,14 @@ ...@@ -139,14 +139,14 @@
</template> </template>
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.weight"> <el-form-item :rules="tableFormRules.weight">
<el-input :disabled="$index <= protectRowCount" v-model="form.table[$index].weight" placeholder="" type="number"></el-input> <el-input :disabled="$index < protectRowCount" v-model="form.table[$index].weight" placeholder="" type="number"></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('数量')" width="130px"> <el-table-column :label="$t('数量')" width="130px">
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item :rules="tableFormRules.quantityAll"> <el-form-item :rules="tableFormRules.quantityAll">
<el-input :disabled="$index <= protectRowCount" v-model.number="form.table[$index].quantityAll" placeholder=""> <el-input :disabled="$index < protectRowCount" v-model.number="form.table[$index].quantityAll" placeholder="">
<template slot="append">{{ $t('个') }}</template> <template slot="append">{{ $t('个') }}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
<el-table-column :label="$t('快递单号')"> <el-table-column :label="$t('快递单号')">
<template v-slot="{r,c,$index}"> <template v-slot="{r,c,$index}">
<el-form-item> <el-form-item>
<el-input :disabled="$index <= protectRowCount" v-model="form.table[$index].expressNo" placeholder=""></el-input> <el-input :disabled="$index < protectRowCount" v-model="form.table[$index].expressNo" placeholder=""></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
...@@ -202,10 +202,10 @@ ...@@ -202,10 +202,10 @@
filterable filterable
remote remote
@change="handleBrandChange" @change="handleBrandChange"
:remote-method="getProductBrandPage" :remote-method="getProductBrandPage1"
clearable> clearable>
<el-option <el-option
v-for="item in brandList" v-for="item in brandList1"
:key="item.id" :key="item.id"
:label="item.titleZh" :label="item.titleZh"
:value="item.id"> :value="item.id">
...@@ -504,6 +504,7 @@ export default { ...@@ -504,6 +504,7 @@ export default {
visible(val){ visible(val){
if (val) { if (val) {
this.getProductBrandPage(this.warehousing.brandName) this.getProductBrandPage(this.warehousing.brandName)
this.getProductBrandPage1()
this.handleBrandChange(parseInt(this.form.brand)) this.handleBrandChange(parseInt(this.form.brand))
this.init() this.init()
} else { } else {
...@@ -556,6 +557,7 @@ export default { ...@@ -556,6 +557,7 @@ export default {
recordMode: undefined recordMode: undefined
}, },
brandList: [], brandList: [],
brandList1: [],
formRules: { formRules: {
prodId: [{required: true, message: this.$t("请选择品名"), trigger: "change"}], prodId: [{required: true, message: this.$t("请选择品名"), trigger: "change"}],
brand: [{required: true, message: this.$t("请选择品牌"), trigger: "change"}], brand: [{required: true, message: this.$t("请选择品牌"), trigger: "change"}],
...@@ -585,7 +587,6 @@ export default { ...@@ -585,7 +587,6 @@ export default {
methods: { methods: {
init(){ init(){
this.form.table = this.warehousing.orderWarehouseInBackItemDoList
this.form.brandType = this.warehousing.brandType this.form.brandType = this.warehousing.brandType
this.form.orderId = this.warehousing.orderId this.form.orderId = this.warehousing.orderId
this.form.orderItemId = this.warehousing.orderNo this.form.orderItemId = this.warehousing.orderNo
...@@ -605,17 +606,24 @@ export default { ...@@ -605,17 +606,24 @@ export default {
this.form.type = this.warehousing.type this.form.type = this.warehousing.type
this.form.feeType = this.warehousing.feeType this.form.feeType = this.warehousing.feeType
this.form.table.forEach(e => { this.warehousing.orderWarehouseInBackItemDoList.forEach(e => {
let bg = {}
if (e.boxGauge) { if (e.boxGauge) {
const boxGauge = e.boxGauge.split('*') const boxGauge = e.boxGauge.split('*')
e.boxGauge1 = boxGauge[0] // e.boxGauge1 = boxGauge[0]
e.boxGauge2 = boxGauge[1] // e.boxGauge2 = boxGauge[1]
e.boxGauge3 = boxGauge[2] // e.boxGauge3 = boxGauge[2]
bg = {
boxGauge1: boxGauge[0],
boxGauge2: boxGauge[1],
boxGauge3: boxGauge[2]
}
} }
this.form.table.push({...e, ...bg})
}) })
if (!this.edit){ if (!this.edit){
let protectRowCount = -1 let protectRowCount = 0
this.protectRowCount = this.form.table.map(e => { this.protectRowCount = this.form.table.map(e => {
if (e.id){ if (e.id){
protectRowCount++ protectRowCount++
...@@ -761,12 +769,12 @@ export default { ...@@ -761,12 +769,12 @@ export default {
}, },
getProductBrandPage(titleZh = undefined) { getProductBrandPage(titleZh = undefined) {
getProductBrankPage({pageSize: 20, titleZh}).then(r => { getProductBrankPage({pageSize: 20, titleZh}).then(r => {
this.brandList = r.data.list.map(e => { this.brandList = r.data.list
// if(e.id){ })
// e.id = e.id.toString() },
// } getProductBrandPage1(titleZh = undefined) {
return e getProductBrankPage({pageSize: 20, titleZh}).then(r => {
}) this.brandList1 = r.data.list
}) })
}, },
handleBrandChange(v){ handleBrandChange(v){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment