Skip to content

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

完善路线价格全包价，新建订单

parent e42e604c
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 174 deletions
src/App.vue
View file @ 19322c62
...@@ -31,4 +31,25 @@ export default { ...@@ -31,4 +31,25 @@ export default {
margin-right:10px; margin-right:10px;
} }
} }
.ml-10{
margin-left: 10px;
}
.mr-10{
margin-right: 10px;
}
.mb-10{
margin-bottom: 10px;
}
.mt-10{
margin-top: 10px;
}
.w-100{
width: 100px;
}
.w-150{
width: 150px;
}
.w-200{
width: 200px;
}
</style> </style>
src/components/CustomerContactSelector/index.vue
View file @ 19322c62
<template> <template>
<el-select <div>
v-model="index" <el-select
filterable v-model="index"
clearable filterable
remote clearable
reserve-keyword remote
placeholder="请输入关键词" reserve-keyword
:remote-method="remoteMethod" placeholder="请输入关键词"
:loading="loading"> :remote-method="remoteMethod"
<el-option :loading="loading">
v-for="(item, index) in list" <el-option
:key="item.id" v-for="(item, index) in list"
:label="`${item.contactsName}`" :key="item.id"
:value="index"> :label="`${item.contactsName}`"
</el-option> :value="index">
</el-select> </el-option>
</el-select>
<el-button v-if="quickable" type="text" @click="showQuickCreate=true" class="ml-10">快速新建</el-button>
<quick-create v-if="showQuickCreate" @success="onQuickCreateSuccess" @close="showQuickCreate=false"></quick-create>
</div>
</template> </template>
<script> <script>
import {getCustomerContactsSelect, getCustomerContacts} from '@/api/ecw/customerContacts' import {getCustomerContactsSelect, getCustomerContacts} from '@/api/ecw/customerContacts'
import QuickCreate from '@/views/ecw/customer/components/quickCreate'
export default { export default {
components:{QuickCreate},
props:{ props:{
value: [String, Number] value: [String, Number],
quickable: {
type: Boolean,
default: true
}
}, },
data(){ data(){
return { return {
index: null, index: null,
list:[], list:[],
loading: false, loading: false,
size: 20 size: 20,
showQuickCreate: false
} }
}, },
watch:{ watch:{
...@@ -67,6 +79,16 @@ export default { ...@@ -67,6 +79,16 @@ export default {
getCustomerContactsSelect(params) getCustomerContactsSelect(params)
.then(res => this.list = res.data) .then(res => this.list = res.data)
.finally(() => this.loading = false) .finally(() => this.loading = false)
},
onQuickCreateSuccess(id){
this.showQuickCreate = false
getCustomerContactsSelect({ids: id}).then(res => {
if(!res.data || !res.data.length){
return this.$message.error('联系人信息获取失败')
}
this.list.unshift(res.data[0])
this.index = 0
})
} }
} }
} }
......
src/views/ecw/customer/components/quickCreate.vue
View file @ 19322c62
<template> <template>
<div> <el-dialog :visible.sync="show" title="快速新建客户" :close-on-click-modal="false" class="quick-create-customer">
<el-row type="flex" style="margin-top: 15px;margin-bottom: 15px" justify="center"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-col :xs="24" :sm="24" :md="24" :lg="20" :xl="16"> <el-form-item label="客户类别" prop="type">
<el-form ref="form" :model="form" :rules="rules" label-width="150px"> <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" form-type="checkbox" multiple v-model="form.type"></dict-selector>
<el-form-item label="客户类别" prop="type"> </el-form-item>
<dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" form-type="checkbox" multiple v-model="form.type"></dict-selector> <el-form-item label="客户名称" prop="name">
</el-form-item> <el-input v-model="form.name" placeholder="请输入客户名称" />
<el-form-item label="客户名称" prop="name"> </el-form-item>
<el-input v-model="form.name" placeholder="请输入客户名称" />
</el-form-item>
<el-form-item label="联系人" prop="customerContacts.0.name"> <el-form-item label="联系人" prop="customerContacts.0.name">
<el-input v-model="form.customerContacts[0].name" placeholder="请输入联系人" /> <el-input v-model="form.customerContacts[0].name" placeholder="请输入联系人" />
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="customerContacts.0.phoneNew"> <el-form-item label="手机号" prop="customerContacts.0.phoneNew">
<el-select v-model="form.customerContacts[0].areaCode" placeholder="请选择区号" filterable> <el-select v-model="form.customerContacts[0].areaCode" placeholder="请选择区号" filterable class="w-200">
<el-option v-for="(item, index) in countryList" <el-option v-for="(item, index) in countryList"
:key="index" :label="item.nameShort + item.nameZh + '(' + item.tel + ')'" :value="item.tel" /> :key="index" :label="item.nameShort + item.nameZh + '(' + item.tel + ')'" :value="item.tel" />
</el-select> </el-select>
<el-input v-model="form.customerContacts[0].phoneNew" placeholder="请输入联系方式" style="width:200px; margin-left:10px"/> <el-input v-model="form.customerContacts[0].phoneNew" placeholder="请输入联系方式" class="w-150 ml-10"/>
</el-form-item> </el-form-item>
<el-form-item label="客户来源" prop="source"> <el-form-item label="客户来源" prop="source">
<el-select v-model="form.source" placeholder="请选择客户来源"> <el-select v-model="form.source" placeholder="请选择客户来源">
<el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)" <el-option v-for="dict in getDictDatas(DICT_TYPE.CUSTOMER_SOURCE)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" /> :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-date-picker <el-date-picker
v-model="form.createTime" v-model="form.createTime"
type="datetime" type="datetime"
value-format="timestamp" value-format="timestamp"
placeholder="选择创建时间"> placeholder="选择创建时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="客户经理" prop="customerService"> <el-form-item label="客户经理" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择客户经理"> <el-select v-model="form.customerService" placeholder="请选择客户经理">
<el-option v-for="item in serviceUserList" <el-option v-for="item in serviceUserList"
:key="item.id" :label="item.nickname" :value="item.id" /> :key="item.id" :label="item.nickname" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remarks"> <el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注"/> <el-input v-model="form.remarks" placeholder="请输入备注"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="text-align: right"> <div style="text-align: right">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-col> </el-dialog>
</el-row>
</div>
</template> </template>
<script> <script>
import { getDictDatas, DICT_TYPE } from '@/utils/dict'; import {createCustomer} from '@/api/ecw/customer'
import upload from '@/components/ImageUpload'
import {createCustomer, getCustomer, updateCustomer, userMemberUserList,} from '@/api/ecw/customer'
import {getNodeList} from "@/api/ecw/node"
import { getProductTypeList } from '@/api/ecw/productType'
import { getProductList } from '@/api/ecw/product'
import {getTradeCityList} from "@/api/ecw/region"
import {getWarehouseList} from "@/api/ecw/warehouse"
import CustomerLineTable from '@/components/CustomerLineTable'
import {getCustomerSelect} from "@/api/ecw/customer"
import {listServiceUser} from "@/api/system/user" import {listServiceUser} from "@/api/system/user"
import {getZhongPaoPage} from '@/api/ecw/zhongPao'
import { getCustomerContactsListByCustomer } from '@/api/ecw/customerContacts'
import { getCountryListAll } from '@/api/ecw/country' import { getCountryListAll } from '@/api/ecw/country'
export default { export default {
name: "quickCreateCustomer", name: "quickCreateCustomer",
props:{
default: Object
},
created() { created() {
if(this.default){
this.$set(this, 'form', Object.assign({}, this.default, this.form))
}
listServiceUser().then(r => { listServiceUser().then(r => {
this.serviceUserList = r.data this.serviceUserList = r.data
}) })
...@@ -85,6 +74,8 @@ export default { ...@@ -85,6 +74,8 @@ export default {
}, },
data(){ data(){
return { return {
show: true,
// 表单参数 // 表单参数
form: { form: {
customerContacts:[{}] customerContacts:[{}]
...@@ -93,8 +84,6 @@ export default { ...@@ -93,8 +84,6 @@ export default {
rules: { rules: {
name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }], name: [{ required: true, message: "客户名称不能为空", trigger: "blur" }],
'customerContacts.0.phoneNew': [{ required: true, message: "手机号不能为空", trigger: "blur" }], 'customerContacts.0.phoneNew': [{ required: true, message: "手机号不能为空", trigger: "blur" }],
// country: [{ required: true, message: "国家不能为空", trigger: "blur" }],
// level: [{ required: true, message: "客户等级不能为空", trigger: "blur" }],
type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }], type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }], createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }], source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
...@@ -106,11 +95,20 @@ export default { ...@@ -106,11 +95,20 @@ export default {
countryList: [], countryList: [],
} }
}, },
watch:{
show(){
if(!this.show){
this.$emit('close')
}
}
},
methods: { methods: {
open(){
this.show = true
},
/** 取消按钮 */ /** 取消按钮 */
cancel() { cancel() {
this.$emit('cancel') this.show = false
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
...@@ -119,7 +117,7 @@ export default { ...@@ -119,7 +117,7 @@ export default {
return; return;
} }
// 添加的提交 // 添加的提交
createCustomer(this.form).then(response => { createCustomer(this.form).then(res => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.$emit('success', res.data) this.$emit('success', res.data)
// this.getList(); // this.getList();
...@@ -129,3 +127,8 @@ export default { ...@@ -129,3 +127,8 @@ export default {
} }
} }
</script> </script>
<style scoped lang="scss">
.quick-create-customer .el-form-item{
margin-bottom: 22px;
}
</style>
\ No newline at end of file
src/views/ecw/order/components/BatchPickup.vue
View file @ 19322c62
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div>注：单号之间使用逗号或空格隔开</div> <div>注：单号之间使用逗号或空格隔开</div>
</el-form-item> </el-form-item>
<el-form-item label="提货时间"> <el-form-item label="提货时间">
<el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd"></el-date-picker> <el-date-picker v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="分批提货" name="createOrderPickupSplitBatch"> <el-tab-pane label="分批提货" name="createOrderPickupSplitBatch">
......
src/views/ecw/order/edit.vue
View file @ 19322c62
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<el-descriptions-item label="*请选择线路" :span="2" :labelStyle="labelStyle"> <el-descriptions-item label="*请选择线路" :span="2" :labelStyle="labelStyle">
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12"> <el-col :span="12">
<el-input :value="getRouterNameById(form.lineId)" readonly placeholder="请在右侧选择线路"></el-input> <el-input :value="selectedRouter ? selectedRouter.startTitleZh + ' > ' + selectedRouter.destTitleZh : ''" readonly placeholder="请在右侧选择线路"></el-input>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<select size="5" v-model="form.lineId" style="min-width: 300px"> <select size="5" v-model="form.lineId" style="min-width: 300px">
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable :disabled="!form.lineId" /> <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable :disabled="!form.lineId" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量(个)"> <el-table-column label="数量(个)" width="120px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input v-model="row.quantity" type="number" :disabled="!form.lineId" /> <el-input v-model="row.quantity" type="number" :disabled="!form.lineId" />
</template> </template>
...@@ -215,8 +215,6 @@ ...@@ -215,8 +215,6 @@
</el-descriptions> </el-descriptions>
</el-card> </el-card>
<el-card class="mt-10"> <el-card class="mt-10">
<div class="card-title" slot="header">预计费用</div> <div class="card-title" slot="header">预计费用</div>
...@@ -284,11 +282,12 @@ ...@@ -284,11 +282,12 @@
<el-descriptions-item label="是否控货"> <el-descriptions-item label="是否控货">
<dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCargoControl" form-type="radio" /> <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCargoControl" form-type="radio" />
</el-descriptions-item> </el-descriptions-item>
<!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项--> <!--代收货款，只有非控货订单、并且线路开通了代收货款后，才显示是否代收货款选项-->
<el-descriptions-item label="是否代收货款"> <el-descriptions-item label="是否代收货款" v-if="collectionProxy">
<dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" /> <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="代收货款金额"> <el-descriptions-item label="代收货款金额" v-if="collectionProxy">
<el-input v-model="form.collectionProxy" placeholder="" style="width:200px"></el-input> <el-input v-model="form.collectionProxy" placeholder="" style="width:200px"></el-input>
<selector v-model="form.collectionProxyCurrency" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> <selector v-model="form.collectionProxyCurrency" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
</el-descriptions-item> </el-descriptions-item>
...@@ -303,28 +302,29 @@ ...@@ -303,28 +302,29 @@
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="deliveryDate" required error="送货日期不能为空"> <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="deliveryDate" required error="送货日期不能为空">
<el-date-picker v-model="form.deliveryDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker v-model="form.deliveryDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<template v-if="homeDeliveryService">
<el-descriptions-item label="入仓类型"> <el-descriptions-item label="入仓类型">
<dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehouseType" /> <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="form.warehouseType" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="收货方式"> <el-descriptions-item label="收货方式">
<dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" /> <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="收货地区" :span="2"> <el-descriptions-item label="收货地区" :span="2">
<area-selector <area-selector
@countryChange="onAreaChange('country', $event)" @countryChange="onAreaChange('country', $event)"
@provinceChange="onAreaChange('province', $event)" @provinceChange="onAreaChange('province', $event)"
@cityChange="onAreaChange('city', $event)" @cityChange="onAreaChange('city', $event)"
></area-selector> ></area-selector>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="收货详细地址" :span="2"> <el-descriptions-item label="收货详细地址" :span="2">
<el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeAddress" required error="收货详细地址不能为空"> <el-form-item label="" label-width="0" style="margin-bottom: 0" prop="consigneeAddress" required error="收货详细地址不能为空">
<el-input v-model="form.consigneeAddress" placeholder=""></el-input> <el-input v-model="form.consigneeAddress" placeholder=""></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item>
</el-descriptions-item> </template>
<el-descriptions-item label="付款人" :span="2"> <el-descriptions-item label="付款人" :span="2">
<dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio" /> <dict-selector :type="DICT_TYPE.DRAWEE" v-model="form.drawee" defaultable form-type="radio" />
...@@ -389,6 +389,7 @@ ...@@ -389,6 +389,7 @@
<el-button @click="$router.back()">返回</el-button> <el-button @click="$router.back()">返回</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
</template> </template>
...@@ -446,7 +447,7 @@ export default { ...@@ -446,7 +447,7 @@ export default {
rules: { rules: {
}, },
labelStyle: 'width:120px' labelStyle: 'width:120px',
}; };
}, },
computed:{ computed:{
...@@ -464,7 +465,7 @@ export default { ...@@ -464,7 +465,7 @@ export default {
}, },
// 根据线路id显示线路名称 // 根据线路id显示线路名称
getRouterNameById(){ /* getRouterNameById(){
return routerId => { return routerId => {
let router = this.routerList.find(item => item.id == routerId) let router = this.routerList.find(item => item.id == routerId)
if(router){ if(router){
...@@ -472,6 +473,19 @@ export default { ...@@ -472,6 +473,19 @@ export default {
} }
return '-' return '-'
} }
}, */
selectedRouter(){
// otherService 1 送货上门，2非控货订单代收货款
if(!this.form.lineId)return null
return this.routerList.find(item => item.id == this.form.lineId)
},
// 送货上门
homeDeliveryService(){
return this.selectedRouter && this.selectedRouter.otherService && this.selectedRouter.otherService.indexOf('1') > -1
},
// 代收货款
collectionProxy(){
return this.selectedRouter && this.selectedRouter.otherService && this.selectedRouter.otherService.indexOf('2') > -1
}, },
// 根据渠道id显示渠道名 // 根据渠道id显示渠道名
getChannelNameById(){ getChannelNameById(){
...@@ -611,24 +625,6 @@ export default { ...@@ -611,24 +625,6 @@ export default {
this.$set(this.form, 'number', res.data) this.$set(this.form, 'number', res.data)
}) })
}, },
/* // 获取发货人
getConsignor(){
if(!this.consignorContact){
this.consignor = null
}
getCustomer(this.consignorContact.customerId).then(res => {
this.consignor = res.data
})
},
// 获取收货人
getConsignee(){
if(!this.consigneeContact){
this.consignee = null
}
getCustomer(this.consigneeContact.customerId).then(res => {
this.consignee = res.data
})
}, */
onProductAttrChange(row, attr){ onProductAttrChange(row, attr){
console.log(attr) console.log(attr)
this.calculationPrice(row) this.calculationPrice(row)
......
src/views/ecw/order/index.vue
View file @ 19322c62
...@@ -231,11 +231,11 @@ ...@@ -231,11 +231,11 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
@pagination="getList" /> @pagination="getList" />
<special-needs :show.sync="isShow":order-id="orderId" @determine="getList" ></special-needs> <special-needs :show.sync="isShow" :order-id="orderId" @determine="getList" ></special-needs>
<print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" /> <print-tag v-if="printTagOrderId !== null" :order-id="printTagOrderId" @close="printTagOrderId=null" />
<print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" /> <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
<print-lading-bill v-if="printLadingBillInfo !== null" v-bind="printLadingBillInfo" @close="printLadingBillInfo=null" /> <print-lading-bill v-if="printLadingBillInfo !== null" v-bind="printLadingBillInfo" @close="printLadingBillInfo=null" />
<batch-pickup v-if="showBatchPickup" @close="showBatchPickup=false"/> <batch-pickup v-if="showBatchPickup" @close="onBatchClose"/>
<withdrawal v-if="show" :dialog-visible="show" :orderId="orderId" ></withdrawal> <withdrawal v-if="show" :dialog-visible="show" :orderId="orderId" ></withdrawal>
<batch-single-application :order-list="orderId" :dialog-visible.sync="warehouseBol"></batch-single-application> <batch-single-application :order-list="orderId" :dialog-visible.sync="warehouseBol"></batch-single-application>
<fee-application :order-id="orderId" :dialog-visible.sync="feeApplicationBol"></fee-application> <fee-application :order-id="orderId" :dialog-visible.sync="feeApplicationBol"></fee-application>
...@@ -437,7 +437,7 @@ export default { ...@@ -437,7 +437,7 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNo = 1; this.queryParams.page = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
...@@ -497,6 +497,10 @@ export default { ...@@ -497,6 +497,10 @@ export default {
} }
) )
}, },
onBatchClose(){
this.showBatchPickup = false
this.handleQuery()
}
} }
}; };
</script> </script>
src/views/ecw/productPrice/edit.vue
View file @ 19322c62
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-form-item label="商品类型" prop="typeId"> <el-form-item label="商品类型" prop="typeId">
<el-select v-model="form.productType" :disabled="!!$route.query.ids"> <el-select v-model="form.productType" :disabled="!!$route.query.ids">
...@@ -101,44 +101,72 @@ ...@@ -101,44 +101,72 @@
</template> </template>
<template v-else> <template v-else>
<el-form-item label="默认运费" prop="transportPrice"> <el-form-item label="默认全包价" v-if="form.priceType == 1">
<el-row :gutter="20"> <inputor default="0" v-model.number="form.allPrice" type="number" placeholder="整数或者两位小数" class="w100 mr10" />
<el-col :span="4"> <selector v-model="form.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w100" />
<selector v-model="form.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> / <selector v-model="form.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w100" />
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="form.transportPrice" type="number" placeholder="整数或者两位小数" />
</el-col>
<el-col :span="4">
/ <selector v-model="form.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label="默认清关费" prop="clearancePrice">
<el-row :gutter="20">
<el-col :span="4">
<selector v-model="form.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="form.clearancePrice" type="number" placeholder="整数或者两位小数" />
</el-col>
<el-col :span="4">
/
<selector v-model="form.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
</el-col>
</el-row>
</el-form-item> </el-form-item>
<template v-else>
<el-form-item label="默认运费" prop="transportPrice">
<el-row :gutter="20">
<el-col :span="4">
<selector v-model="form.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="form.transportPrice" type="number" placeholder="整数或者两位小数" />
</el-col>
<el-col :span="4">
/ <selector v-model="form.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
</el-row>
</el-form-item>
<el-form-item label="默认清关费" prop="clearancePrice">
<el-row :gutter="20">
<el-col :span="4">
<selector v-model="form.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="form.clearancePrice" type="number" placeholder="整数或者两位小数" />
</el-col>
<el-col :span="4">
/
<selector v-model="form.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
</el-row>
</el-form-item>
</template>
<!--特需--> <!--特需-->
<template v-for="(special, specialIndex) in this.specialProducts"> <template v-if="form.priceType==1">
<el-form-item
v-for="(special, specialIndex) in this.specialProducts"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '全包价'"
:key="specialIndex + 'transport'">
<el-row :gutter="20">
<el-col :span="4">
<selector v-model="special.allPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
<el-col :span="6">
<inputor default="0" v-model.number="special.allPrice" type="number" placeholder="整数或者两位小数" />
</el-col>
<el-col :span="4">
/ <selector v-model="special.allVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col>
</el-row>
</el-form-item>
</template>
<template v-else v-for="(special, specialIndex) in this.specialProducts">
<el-form-item <el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '运费'" :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + '运费'"
:key="specialIndex + 'transport'"> :key="specialIndex + 'transport'">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<selector v-model="special.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> <selector v-model="special.transportPriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -146,7 +174,7 @@ ...@@ -146,7 +174,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
/ <selector v-model="special.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> / <selector v-model="special.transportVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
...@@ -155,7 +183,7 @@ ...@@ -155,7 +183,7 @@
:key="specialIndex + 'clearance'"> :key="specialIndex + 'clearance'">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<selector v-model="special.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> <selector v-model="special.clearancePriceUnit" :options="currencyList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
...@@ -163,7 +191,7 @@ ...@@ -163,7 +191,7 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
/ <selector v-model="special.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" /> / <selector v-model="special.clearanceVolumeUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable class="w-100" />
</el-col> </el-col>
</el-row> </el-row>
</el-form-item> </el-form-item>
...@@ -187,7 +215,7 @@ ...@@ -187,7 +215,7 @@
</el-form-item> </el-form-item>
<el-form-item label="每日入仓上限" prop="dayLimit"> <el-form-item label="每日入仓上限" prop="dayLimit">
<el-input v-model.number="form.dayLimit" type="number" style="width:100px" />立方米 <el-input v-model.number="form.dayLimit" type="number" class="w-100" />立方米
</el-form-item> </el-form-item>
<el-form-item label="货柜位置" prop="containerLocation"> <el-form-item label="货柜位置" prop="containerLocation">
......
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