Skip to content

J
jiedao-app-operator-master
Commit 3507247e authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents 0a006d75 adaf7141
Show whitespace changes
Inline Side-by-side
Showing with 73 additions and 27 deletions
src/views/ecw/box/costForm.vue
View file @ 3507247e
<template>
<div class="app-costForm shippingSea-dialog">
<el-form ref="costForm" :model="costObj" label-width="80px">
<el-form ref="costForm" :model="costObj" :rules="rules" label-width="80px">
<el-form-item label="操作步骤">
<el-form-item label="操作步骤" prop="opStepType">
<el-select v-model="costObj.opStepType" placeholder="请选择操作步骤">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="type.label" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="费用类型">
<el-form-item label="费用类型" prop="costType">
<el-select v-model="costObj.costType" placeholder="请选择费用类型">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.FEE_TYPE)" :key="type.value" :label="type.label" :value="type.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-form-item label="供应商" prop="supplierId">
<el-select v-model="costObj.supplierId" placeholder="请选择供应商">
<el-option v-for="supplier in allSupplier" :key="supplier.id" :label="supplier.companyZh" :value="supplier.id"></el-option>
</el-select>
</el-form-item>
<el-row class="two-element-formItem">
<el-form-item label="金额">
<el-form-item label="金额" prop="price">
<el-input-number v-model="costObj.price" controls-position="right" :min="1"></el-input-number>
</el-form-item>
<el-form-item label="" label-width="0px">
<el-form-item label="" label-width="0px" prop="priceUnit">
<el-select v-model="costObj.priceUnit" placeholder="请选择单位">
<el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PRICE_UNIT)" :key="type.value" :label="type.label" :value="type.value"></el-option>
</el-select>
......@@ -57,6 +57,14 @@ export default {
costObj: {},
// 供应商
allSupplier: [],
rules: {
opStepType: [{ required: true, message: "操作步骤不能为空", trigger: "change" }],
costType: [{ required: true, message: "费用类型不能为空", trigger: "change" }],
supplierId: [{ required: true, message: "供应商不能为空", trigger: "blur" }],
price: [{ required: true, message: "金额不能为空", trigger: "blur" }],
priceUnit: [{ required: true, message: "金额单位不能为空", trigger: "blur" }]
},
};
},
created() {
......
src/views/ecw/customer/edit.vue
View file @ 3507247e
......@@ -543,6 +543,7 @@ export default {
},
/** 取消按钮 */
cancel() {
this.$tab.closePage()
this.open = false;
this.reset();
},
......
src/views/ecw/deptTarget/index.vue
View file @ 3507247e
......@@ -111,9 +111,9 @@
</el-select>
</el-form-item>
<el-form-item label="运输方式" prop="transportType">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportType" formatter="number"/>
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportType" formatter="number" @change="showChannel"/>
</el-form-item>
<el-form-item label="出货渠道" prop="shippingChannel">
<el-form-item label="出货渠道" prop="shippingChannel" v-if="this.showFlag">
<el-select v-model="form.shippingChannel" placeholder="请选择出货渠道">
<el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId"
:key="item.channelId"></el-option>
......@@ -154,6 +154,7 @@
return {
// 遮罩层
loading: true,
showFlag:false,
// 导出遮罩层
exportLoading: false,
// 显示搜索条件
......@@ -206,8 +207,10 @@
form: {},
// 表单校验
rules: {
deptId: [{required: true, message: "部门ID不能为空", trigger: "blur"}],
deptId: [{required: true, message: "部门不能为空", trigger: "blur"}],
targetType: [{required: true, message: "目标类型不能为空", trigger: "change"}],
targetPeriodName: [{required: true, message: "计算周期不能为空", trigger: "change"}],
transportType: [{required: true, message: "运输方式不能为空", trigger: "change"}],
cubeNum: [{required: true, message: "立方数不能为空", trigger: "blur"}],
}
};
......@@ -279,6 +282,14 @@
}
})
},
showChannel(val){
console.log(val);
if(val===3 || val===4){
this.showFlag = true;
} else {
this.showFlag = false;
}
},
/** 查询列表 */
getList() {
this.loading = true;
......
src/views/ecw/order/index.vue
View file @ 3507247e
......@@ -254,13 +254,13 @@
include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) ||
include(scope.row.abnormalState, [99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
">
<el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
</template>
<!-- 入仓修改 -->
<template v-if="
include(scope.row.inWarehouseState, [202, 207, 208, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205, 206])
">
<el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
<el-dropdown-item @click.native="$router.push('/order/warehousing-update?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓修改')}}</el-dropdown-item>
</template>
<!-- 退仓 -->
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ 3507247e
<template>
<div>
<el-dialog
:title="(edit ? '入仓修改' : (warehousing.orderWarehouseInBackItemDoList.length > 0 ? '入仓补充' : '入仓操作')) + ' - ' + warehousing.orderNo"
:title="title + ' - ' + warehousing.orderNo"
:visible.sync="opened"
width="1080px"
>
......@@ -431,7 +431,7 @@ export default {
opened(val) {
if (val) {
this.form.material = this.warehousing.material
this.form.brand = this.warehousing.brand
this.form.brand = this.warehousing.brand || '0'
this.handleBrandChange(this.form.brand)
} else {
this.$emit('update:visible', false)
......@@ -442,10 +442,12 @@ export default {
this.form.orderWarehouseInItemDoList = []
this.form1.orderWarehouseInItemDoList = []
this.activeName = 'first'
if (!this.edit){
this.handleAdd()
this.handleAdd(1)
}
}
}
},
methods: {
......@@ -587,6 +589,9 @@ export default {
},
computed: {
title() {
return this.$route.name
},
brandObject(){
return this.brandList.find(e => e.id === this.form.brand) || ''
},
......
src/views/ecw/order/warehousing/index.vue
View file @ 3507247e
<template>
<div class="app-container">
<h2>入仓操作-{{ order.orderNo }}</h2>
<h2>{{ title }}-{{ order.orderNo }}</h2>
<order-base-info :order="order"></order-base-info>
......@@ -74,15 +74,13 @@
prop="address"
label="操作">
<template v-slot="{ row, column, $index }">
<el-button v-if="order.status === 5" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
<template v-else>
<template v-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0">
<el-button v-if="isEdit" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
<template v-else-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0">
<el-button size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
<el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
</template>
<el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
</template>
</template>
</el-table-column>
</el-table>
......@@ -145,7 +143,7 @@
<warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
:order-id="orderId" :city-id="cityId"></warehouse-area-dialog>
<edit-dialog :customer-id="order.customerId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="order.status === 5"></edit-dialog>
<edit-dialog :title="title" :customer-id="order.customerId" :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="isEdit"></edit-dialog>
<!-- 完成入仓 -->
<el-dialog
......@@ -267,6 +265,16 @@ export default {
},
methods: {
include(){
return (state, arr) => {
return arr.indexOf(state) > -1
}
},
exclude(){
return (state, arr) => {
return arr.indexOf(state) == -1
}
},
handleLabelSubmit(){
orderWarehouseInUpdateLabel({
...this.label,
......@@ -367,14 +375,14 @@ export default {
}).then(() => {
this.$message({
type: 'success',
message: '申请退仓成功!'
message: '货物退仓成功!'
});
getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
this.getOrder()
})
}).catch(() => {
}).catch(e => {
});
}
},
......@@ -398,6 +406,15 @@ export default {
},
computed: {
// isAdd() {
// return this.$route.path === "/order/warehousing-add"
// },
isEdit() {
return this.$route.path === "/order/warehousing-update"
},
title() {
return this.$route.name
},
orderSpecialNeedsDict() {
return this.$store.state.dict.dictDatas.order_special_needs
},
......
src/views/ecw/productPrice/index.vue
View file @ 3507247e
......@@ -145,13 +145,17 @@
<el-table-column prop="price" :label="$t('价格')" align="center">
<template slot-scope="scope">
<div>
<div v-if="scope.row.priceType == 0">
{{$t('运费')}}:{{ getCurrencySymbol(scope.row.transportPriceUnit) + scope.row.transportPrice}}&nbsp;
{{ getCurrencyTitle(scope.row.transportPriceUnit) + '/' + getUnitTitle(scope.row.transportVolumeUnit)}}
<br />
{{$t('清关费')}}:{{ getCurrencySymbol(scope.row.clearancePriceUnit) + scope.row.clearancePrice}}&nbsp;
{{ getCurrencyTitle(scope.row.clearancePriceUnit) + '/' + getUnitTitle(scope.row.clearanceVolumeUnit)}}
</div>
<div v-if="scope.row.priceType == 1">
{{$t('全包价')}}:{{ getCurrencySymbol(scope.row.allPriceUnit) + scope.row.allPrice}}&nbsp;
{{ getCurrencyTitle(scope.row.allPriceUnit) + '/' + getUnitTitle(scope.row.allVolumeUnit)}}
</div>
</template>
</el-table-column>
......
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