md
This commit is contained in:
linfso
parent
16f0cf415e
commit
cdd50c385b
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div >
|
||||
<el-row :gutter="0">
|
||||
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="类型名称" prop="prodName">
|
||||
<el-input v-model="form.prodName" placeholder="请输入名称" />
|
||||
@ -81,14 +81,13 @@
|
||||
<el-input v-model="form.orderNum" placeholder="" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<div style="text-align: center;margin-bottom: 10px;">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="启用状态" prop="status">
|
||||
<el-select v-model="queryParams.status" no-match-text filterable placeholder="启用状态" @change="handleQuery">
|
||||
<el-select v-model="queryParams.status" filterable clearable placeholder="启用状态" @change="handleQuery">
|
||||
<el-option key="0" label="停用" :value="0" />
|
||||
<el-option key="1" label="启用" :value="1" />
|
||||
</el-select>
|
||||
@ -129,48 +129,6 @@
|
||||
|
||||
</div>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!--
|
||||
<el-table-column label="序号" align="center" min-width="60">
|
||||
<template slot-scope="scope">
|
||||
<span v-text="getIndex(scope.$index)"> </span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="xxx" align="left" prop="xxx" min-width="180">
|
||||
<template slot-scope="scope">
|
||||
<div class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="结算状态" align="center" prop="settleStatus" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.settleStatus == 0" style="color:red;">
|
||||
<span class="el-tag el-tag--info">未结算</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 10" style="color:red;">
|
||||
<span class="el-tag">待确认</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 11" style="color:green;">
|
||||
<span class="el-tag el-tag--success el-tag--light">已确认</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 20" >
|
||||
<span class="el-tag el-tag--warning el-tag--light">待打款</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 21" style="color:green;">
|
||||
<span class="el-tag el-tag--success el-tag--light">已打款</span>
|
||||
</div>
|
||||
<div v-if="scope.row.settleStatus == 40" style="color:red;">
|
||||
<span class="el-tag el-tag--danger">已拒绝</span>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
-->
|
||||
|
||||
<!-- <el-table-column label="类型代码" align="center" prop="prodCode" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodCode}}</div>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="类型名称" align="left" prop="prodName" min-width="150" >
|
||||
<template slot-scope="scope">
|
||||
<div class="link-type" @click="handleUpdate(scope.row)">{{scope.row.prodName}}</div>
|
||||
@ -178,18 +136,10 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="英文名称" align="center" prop="prodNameEn" min-width="100" />
|
||||
<el-table-column label="时效标识" align="center" prop="agingDesc" min-width="100" />
|
||||
<el-table-column label="最小时效" align="center" prop="minAging" width="80" />
|
||||
<el-table-column label="最大时效" align="center" prop="maxAging" width="80" />
|
||||
<el-table-column label="所属路线" align="center" prop="transLine" min-width="100" />
|
||||
<el-table-column label="所属国家" align="center" prop="countryName" min-width="100" />
|
||||
<!-- <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.status"
|
||||
:active-value="1"
|
||||
:inactive-value="0"
|
||||
@change="handleStatusChange(scope.row)"
|
||||
></el-switch>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="启用状态" align="center" prop="status" min-width="100" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
|
||||
|
||||
@ -4,11 +4,8 @@
|
||||
<el-collapse v-model="activeNames">
|
||||
<el-collapse-item title="" name="1">
|
||||
<template slot="title">
|
||||
<i class="header-icon el-icon-s-goods"></i>商品管理
|
||||
<div class="form-group-title"><span class="title">{{ $t('基础信息') }}</span></div>
|
||||
</template>
|
||||
<!-- <div slot="title">
|
||||
<div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
|
||||
</div> -->
|
||||
<div>
|
||||
<el-row :gutter="0" >
|
||||
<!-- <el-col :span="24">
|
||||
@ -129,9 +126,9 @@
|
||||
</div>
|
||||
</el-collapse-item>
|
||||
<el-collapse-item title="" name="2">
|
||||
<div slot="title">
|
||||
<template slot="title">
|
||||
<div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
|
||||
</div>
|
||||
</template>
|
||||
<el-row :gutter="0" style="border: 1px dotted #f5f7fa;border-radius: 5px;margin-top:10px">
|
||||
<el-col :span="12">
|
||||
<el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
|
||||
@ -294,229 +291,97 @@
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-collapse-item>
|
||||
<el-collapse-item title="标题3" name="3">
|
||||
<div>内容3</div>
|
||||
<el-collapse-item title="" name="3">
|
||||
<template slot="title">
|
||||
<div class="form-group-title"><span class="title">{{ $t('货物信息') }}</span></div>
|
||||
</template>
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-table
|
||||
:cell-style="{
|
||||
'padding': '0px!important',
|
||||
'padding-left': '0px!important',
|
||||
'padding-right': '0px!important',
|
||||
}"
|
||||
:header-cell-style="{
|
||||
'background':'gray'
|
||||
}"
|
||||
border
|
||||
stripe
|
||||
:data="form.cargoList"
|
||||
size="mini"
|
||||
style="width: 100%"
|
||||
>
|
||||
<!-- @cell-mouse-enter="handleCellEnter"
|
||||
@cell-mouse-leave="handleCellLeave" -->
|
||||
<!-- "goodsCode": "货物代码:eg 123",
|
||||
"goodsName": "货物名称",
|
||||
"cargoQty": "货物数量: 10",
|
||||
"unit": "件",
|
||||
"price": "1.2",
|
||||
"currency": "CNY",
|
||||
"nationArea": "中国",
|
||||
"taxNo": "行邮税号",
|
||||
"hscode": "海关编码",
|
||||
"brand": "品牌",
|
||||
"material": "材质",
|
||||
"purpose": "用途",
|
||||
"ingredients": "成分",
|
||||
"goodsModel": "规格",
|
||||
"orderNum": "序号",
|
||||
"supplier": "供应商",
|
||||
"isSave": "是否保存 1-保存"
|
||||
-->
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column prop="goodsName" label="货物名称" align="center" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
|
||||
<!-- v-if="scope.row.isEdit" -->
|
||||
<!-- <div v-else class="txt">{{scope.row.goodsName}}</div> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="cargoQty" label="件数" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.cargoQty" size="mini" placeholder=""></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="length" label="长(cm)" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.length" size="mini" placeholder=""></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="width" label="宽(cm)" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.width" size="mini" placeholder=""></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="height" label="高(cm)" align="center" min-width="50">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.width" size="mini" placeholder=""></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="volumn" label="体积(m³)" align="center" min-width="80">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.volumn" size="mini" placeholder=""></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-collapse-item>
|
||||
<el-collapse-item title="" name="4">
|
||||
<template slot="title">
|
||||
<div class="form-group-title"><span class="title">{{ $t('收费信息') }}</span></div>
|
||||
</template>
|
||||
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<el-row :gutter="0" style="border-radius: 5px;margin-top:10px">
|
||||
<el-col :span="12">
|
||||
<el-col :span="24">
|
||||
<div class="form-group-title">货物信息</div>
|
||||
</el-col>
|
||||
|
||||
<div class="form-row-group-panel">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="货物描述" prop="goodsType">
|
||||
<GoodsPicker v-model="form.goodsType" @onChange="onGoodsChange"></GoodsPicker>
|
||||
<el-input v-model="form.goodsInfo" type="textarea" placeholder="货物描述" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="包装类型" prop="packType">
|
||||
<el-select v-model="form.packType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_tab_packing_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="件数" prop="parcelQty">
|
||||
<el-input v-model="form.parcelQty" style="text-align: right;" placeholder="请输入件数" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="实际重量" prop="billWeight">
|
||||
<el-input v-model="form.billWeight" @blur="calcSettlementWeightByRemote()" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
|
||||
<span slot="suffix">(kg)</span>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<el-form-item label="体积" prop="totalVolume" label-width="60px" >
|
||||
<div style="display:inline-flex">
|
||||
<el-input v-model="form.length" style="width:80px" placeholder="长" >
|
||||
<span slot="suffix">(cm)</span>
|
||||
</el-input>
|
||||
<el-input v-model="form.width" style="margin-left:5px;width:80px" placeholder="宽" >
|
||||
<span slot="suffix">(cm)</span>
|
||||
</el-input>
|
||||
<el-input v-model="form.height" style="margin-left:5px;width:80px" placeholder="高" >
|
||||
<span slot="suffix">(cm)</span>
|
||||
</el-input>
|
||||
</div>
|
||||
<div style="">
|
||||
<el-input v-model="form.totalVolume" @blur="calcSettlementWeightByRemote()" style="text-align: right;width: 120px" placeholder="体积" >
|
||||
<span slot="suffix">(m³)</span>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="体积重量" prop="volumeWeight">
|
||||
<el-input v-model="form.volumeWeight" placeholder="" disabled>
|
||||
<span slot="suffix">(kg)</span>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="结算重量" prop="settlementWeight">
|
||||
<el-input v-model="form.settlementWeight" placeholder="" disabled >
|
||||
<span slot="suffix">(kg)</span>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="" prop="blOverWeight">
|
||||
<el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="超重件数" prop="overWeightNumber">
|
||||
<el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否生成子单" prop="blGenSubbill" label-width="120px">
|
||||
<el-radio-group v-model="form.blGenSubbille">
|
||||
<el-radio label="1">是</el-radio>
|
||||
<el-radio label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="子单号" prop="billCodeSub">
|
||||
<el-input v-model="form.billCodeSub" type="textarea" placeholder="" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="合同号" prop="custOrderId">
|
||||
<el-input v-model="form.custOrderId" placeholder="" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="进仓单" prop="warehouseInNo">
|
||||
<WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="运单备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-col :span="24">
|
||||
<div class="form-group-title">收费信息</div>
|
||||
</el-col>
|
||||
|
||||
<div class="form-row-group-panel">
|
||||
|
||||
<el-col :span="24">
|
||||
<el-divider content-position="left"><span style="font-size: 12px;color: gray;">收费项明细</span></el-divider>
|
||||
<el-row>
|
||||
<el-col :span="24" v-for="item in this.form.feeItems" :key="item.code" >
|
||||
<el-form-item v-if="item.feeCode=='1001'" :label="item.feeName" prop="fee" >
|
||||
<div style="display:inline-flex">
|
||||
<div style="width:50%">
|
||||
<el-input v-model="item.fee" placeholder="" disabled>
|
||||
<span slot="append">CNY</span>
|
||||
</el-input>
|
||||
</div>
|
||||
<div style="font-size: 12px;color: gray;width:50%">
|
||||
(计算说明:{{item.calcExp}},续重单价:{{item.addWeightPrice}})
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item v-else :label="item.feeName" prop="fee" >
|
||||
<el-input v-model="item.fee" placeholder="" disabled>
|
||||
<span slot="append">CNY</span>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
|
||||
<!-- <el-select size="mini" v-model="item.fee.currency" slot="append" placeholder="请选择">
|
||||
<el-option label="CNY" value="CNY"></el-option>
|
||||
<el-option label="USD" value="USD"></el-option>
|
||||
</el-select> -->
|
||||
|
||||
<el-col :span="24">
|
||||
<el-divider content-position="left"><span style="font-size: 12px;color: gray;">付款方式</span></el-divider>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="付款方式" prop="paymentType">
|
||||
<el-select v-model="form.paymentType" placeholder="请选择">
|
||||
<el-option
|
||||
v-for="dict in dict.type.emis_payment_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
|
||||
<el-form-item label="月结账号" prop="thirdCustomerCode" label-width="80px">
|
||||
<EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="回款联系人" prop="payee" label-width="100px">
|
||||
<EmisUserSimplePicker2 :placeholder="$t('回款联系人')" v-model="form.payee" ></EmisUserSimplePicker2>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="销售联系人" prop="salesmen" label-width="100px">
|
||||
<EmisUserSimplePicker3 :placeholder="$t('销售联系人')" v-model="form.salesmen" ></EmisUserSimplePicker3>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24">
|
||||
<el-form-item label="计费方式" prop="calcFeeType" >
|
||||
<!-- <el-input v-model="form.calcFeeType" placeholder="请输入计费方式" /> -->
|
||||
<el-radio-group v-model="form.calcFeeType" >
|
||||
<el-radio
|
||||
v-for="dict in dict.type.emis_calc_fee_type"
|
||||
:key="dict.value"
|
||||
:label="dict.value"
|
||||
>{{dict.label}}</el-radio>
|
||||
</el-radio-group>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="24">
|
||||
<el-divider content-position="left">收费明细</el-divider>
|
||||
<el-form-item label="总运费" prop="freight">
|
||||
<el-input v-model="form.freight" placeholder="" >
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="费用备注" prop="feeRemaker">
|
||||
<el-input v-model="form.feeRemaker" type="textarea" placeholder="" >
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
</el-col>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
</el-form>
|
||||
<!-- </el-row> -->
|
||||
<div style="text-align: center;margin-bottom: 10px;">
|
||||
@ -861,6 +726,27 @@ methods: {
|
||||
this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
|
||||
this.loading = false;
|
||||
});
|
||||
}else{
|
||||
let cargo={
|
||||
"goodsCode": "货物代码:eg 123",
|
||||
"goodsName": "货物名称",
|
||||
"cargoQty": "货物数量: 10",
|
||||
"unit": "件",
|
||||
"price": "1.2",
|
||||
"currency": "CNY",
|
||||
"nationArea": "中国",
|
||||
"taxNo": "行邮税号",
|
||||
"hscode": "海关编码",
|
||||
"brand": "品牌",
|
||||
"material": "材质",
|
||||
"purpose": "用途",
|
||||
"ingredients": "成分",
|
||||
"goodsModel": "规格",
|
||||
"orderNum": "序号",
|
||||
"supplier": "供应商",
|
||||
"isSave": "是否保存 1-保存"
|
||||
};
|
||||
this.form.cargoList.push(cargo);
|
||||
}
|
||||
|
||||
},
|
||||
@ -1204,5 +1090,20 @@ methods: {
|
||||
}
|
||||
}
|
||||
|
||||
.el-collapse {
|
||||
border-top: none!important;
|
||||
border-bottom: none!important;
|
||||
}
|
||||
|
||||
.el-table .el-table__cell:first-child .cell {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
.el-table .cell {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user