Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
feiyue.teng
a355dd98 1 parent 1d14de6b

申报数据编辑页面bug修复

Inline Side-by-side
Showing 3 changed files with 99 additions and 58 deletions
......@@ -143,7 +143,6 @@
></el-input>
</Formitem>
</el-col>
<!-- DXPID -->
<el-col :span="8">
<Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
<el-input
......@@ -173,7 +172,6 @@
></el-input>
</Formitem>
</el-col>
<!-- DXPID -->
<el-col :span="8">
<Formitem label="山电用户密码" prop="qingdaoUserPassword" type="edit">
<el-input
......@@ -324,13 +322,13 @@
</div>
</el-col>
<el-col :span="8">
<Formitem label="证书序列号" prop="dxpid" type="edit">
<Formitem label="证书序列号" prop="certificateSerialNumber" type="edit">
<el-input
type="text"
class="inputShadow"
id="inputInner-edit-dxpid"
id="inputInner-edit-certificateSerialNumber"
resize="none"
v-model="formData.dxpid"
v-model="formData.certificateSerialNumber"
clearable
placeholder=""
></el-input>
......@@ -403,7 +401,7 @@ export default {
ecomEntEmail: "",
ecomEntName: "",
orderRequester: "",
dxpid: "",
certificateSerialNumber: "",
qingdaoKey: "",
qingdaoUserDxpid: "",
qingdaoDanyiUserDxpid:"",
......@@ -785,7 +783,7 @@ export default {
ecomEntEmail: "",
ecomEntName: "",
orderRequester: "",
dxpid: "",
certificateSerialNumber: "",
qingdaoKey: "",
qingdaoUserDxpid: "",
qingdaoDanyiUserDxpid:"",
......
......@@ -77,7 +77,7 @@
<el-col :span="4">
<Formitem label="规格型号" prop="model">
<el-input
type="textarea"
type="text"
class="inputShadow"
id="inputInner--model"
resize="none"
......@@ -156,11 +156,10 @@
<el-col :span="4">
<Formitem label="数量" prop="qty">
<el-input
type="number"
class="inputShadow"
id="inputInner--qty"
resize="none"
v-model="tableRowformData.qty"
v-model.number="tableRowformData.qty"
clearable
placeholder=""
></el-input>
......@@ -169,11 +168,10 @@
<el-col :span="4">
<Formitem label="法定数量" prop="legalQty">
<el-input
type="number"
class="inputShadow"
id="inputInner--legalQty"
resize="none"
v-model="tableRowformData.legalQty"
v-model.number="tableRowformData.legalQty"
clearable
placeholder=""
></el-input>
......@@ -242,7 +240,7 @@
<el-col :span="8">
<Formitem label="备注" prop="remark">
<el-input
type="textarea"
type="text"
class="inputShadow"
id="inputInner--remark"
resize="none"
......@@ -268,6 +266,24 @@
},
},
data() {
var checkNegativeNum = (rule, value, callback) => {
if (value < 0) {
callback(new Error('数值不能为负'));
} else {
callback();
}
};
var checkQty = (rule, value, callback) => {
if (!Number.isInteger(value)) {
callback(new Error('请输入整数值'));
} else {
if (value < 0) {
callback(new Error('数值不能为负'));
} else {
callback();
}
}
};
return {
tableRowformData:{},
tableRowFormRules:{
......@@ -307,22 +323,27 @@
{ required: true, message: '请选择计量单位', trigger: 'change' }
],
qty: [
{ required: true, message: '请输入数量', trigger: 'blur' }
{ required: true, message: '请输入数量', trigger: 'blur' },
{ validator: checkQty, trigger: 'blur' }
],
legalQty: [
{ required: true, message: '请输入法定数量', trigger: 'blur' }
{ required: true, message: '请输入法定数量', trigger: 'blur' },
{ validator: checkQty, trigger: 'blur' }
],
currency: [
{ required: true, message: '请选择币制', trigger: 'change' }
],
price: [
{ required: true, message: '请输入单价', trigger: 'blur' }
{ required: true, message: '请输入单价', trigger: 'blur' },
{ validator: checkNegativeNum, trigger: 'blur' }
],
totalPrice: [
{ required: true, message: '请输入总价', trigger: 'blur' }
{ required: true, message: '请输入总价', trigger: 'blur' },
{ validator: checkNegativeNum, trigger: 'blur' }
],
netWeight: [
{ required: true, message: '请输入净重', trigger: 'blur' }
{ required: true, message: '请输入净重', trigger: 'blur' },
{ validator: checkNegativeNum, trigger: 'blur' }
],
remark: [
{ max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
......@@ -369,7 +390,7 @@
}
}
.formRowDataOperate{
text-align: right;
text-align: center;
padding: 0 20px;
a{
color: #007AB7;
......
......@@ -78,7 +78,7 @@
</Formitem>
</el-col>
<!-- 电商企业代码 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="申报地海关" prop="declareCustomsCode">
<el-select
type="text"
......@@ -92,14 +92,14 @@
v-for="(item, index) in declareCustomsDataList"
:key="index"
:label="item.declarationUnitCompanyName"
:value="item.declarationUnit10"
:value="item.declarationPortCode"
></el-option>
</el-select>
</Formitem>
</el-col>
<!-- 电商企业 -->
<el-col :span="3">
<Formitem label="出生日期" prop="exportDate">
<Formitem label="出口日期" prop="exportDate">
<el-date-picker
class="inputInner--createTime"
id="inputInner--exportDate"
......@@ -126,6 +126,8 @@
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 运杂费 -->
<el-col :span="3">
<Formitem label="运杂费" prop="miscellaneousFreight">
......@@ -140,9 +142,6 @@
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<!-- 币制 -->
<el-col :span="3">
<Formitem label="币制" prop="currency">
......@@ -164,10 +163,10 @@
</Formitem>
</el-col>
<!-- 申报状态 -->
<el-col :span="3">
<el-col :span="6">
<Formitem label="主要货物信息" prop="mainGoodsInfo">
<el-input
type="textarea"
type="text"
class="inputShadow"
id="inputInner--mainGoodsInfo"
resize="none"
......@@ -233,6 +232,9 @@
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="3">
<Formitem label="监管场所代码" prop="regulatoryVenueCode">
<el-input
......@@ -259,8 +261,6 @@
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="3">
<Formitem label="运抵国(地区)" prop="destinationCountryRegion">
<el-select
......@@ -275,23 +275,28 @@
v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE"
:key="index"
:label="item.itemChineseName"
:value="item.itemValue"
:value="item.itemCode"
></el-option>
</el-select>
</Formitem>
</el-col>
<el-col :span="3">
<Formitem label="运港代码" prop="portCode">
<el-input
<el-select
type="text"
class="inputShadow"
id="inputInner--portCode"
resize="none"
v-model="formData.portCode"
clearable
filterable
placeholder=""
></el-input>
>
<el-option
v-for="(item, index) in $store.getters.dict.COUNTRY_REGION_CODE"
:key="index"
:label="item.itemChineseName"
:value="item.itemCode"
></el-option>
</el-select>
</Formitem>
</el-col>
<el-col :span="3">
......@@ -302,6 +307,7 @@
id="inputInner--freight"
resize="none"
v-model="formData.freight"
:min="0"
clearable
placeholder=""
></el-input>
......@@ -357,6 +363,9 @@
></el-input>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="3">
<Formitem label="保费币制" prop="insuredfeeCurrency">
<el-select
......@@ -394,8 +403,6 @@
</el-select>
</Formitem>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="3">
<Formitem label="包装种类代码" prop="packageTypeCode">
<el-select
......@@ -417,11 +424,10 @@
<el-col :span="3">
<Formitem label="件数" prop="packNo">
<el-input
type="number"
class="inputShadow"
id="inputInner--packNo"
resize="none"
v-model="formData.packNo"
v-model.number="formData.packNo"
clearable
placeholder=""
></el-input>
......@@ -453,7 +459,7 @@
></el-input>
</Formitem>
</el-col>
<el-col :span="9">
<el-col :span="6">
<Formitem label="备注" prop="remark">
<el-input
type="textarea"
......@@ -506,9 +512,9 @@
</template>
</Table>
</section>
<div class="addNewItem" @click="addNewItem">
<i class="el-icon-circle-plus-outline"></i>
<span>添加新物品</span>
<div class="addNewItem">
<i class="el-icon-circle-plus-outline" @click="addNewItem"></i>
<span @click="addNewItem">添加新物品</span>
</div>
<div style="margin-top: 20px; text-align: center">
<el-button
......@@ -532,6 +538,24 @@
name: "",
components: { RowDataEditForm },
data() {
var checkNegativeNum = (rule, value, callback) => {
if (value < 0) {
callback(new Error('数值不能为负'));
} else {
callback();
}
};
var checkPackNo = (rule, value, callback) => {
if (!Number.isInteger(value)) {
callback(new Error('请输入整数值'));
} else {
if (value < 0) {
callback(new Error('数值不能为负'));
} else {
callback();
}
}
};
return {
ebcDataList:[],
declareCustomsDataList:[],
......@@ -558,14 +582,11 @@
{ required: true, message: '请选择申报地海关', trigger: 'change' }
],
exportDate: [
{ required: true, message: '请选择出生日期', trigger: 'change' }
{ required: true, message: '请选择出口日期', trigger: 'change' }
],
goodsValue: [
{ required: true, message: '请输入商品金额', trigger: 'blur' }
],
miscellaneousFreight: [
{ required: true, message: '请输入运杂费', trigger: 'blur' }
],
currency: [
{ required: true, message: '请选择币制', trigger: 'change' }
],
......@@ -582,7 +603,6 @@
{ max: 37, message: '长度不能超过37个字符', trigger: 'blur' }
],
totalPackageNo: [
{ required: true, message: '请输入总包号', trigger: 'blur' },
{ max: 37, message: '长度不能超过37个字符', trigger: 'blur' }
],
regulatoryVenueCode: [
......@@ -595,10 +615,11 @@
{ required: true, message: '请选择运抵国', trigger: 'change' }
],
portCode: [
{ required: true, message: '请输入运港代码', trigger: 'blur' }
{ required: true, message: '请选择运港代码', trigger: 'change' }
],
freight: [
{ required: true, message: '请输入运费', trigger: 'blur' }
{ required: true, message: '请输入运费', trigger: 'blur' },
{ validator: checkNegativeNum, trigger: 'blur' }
],
freightCurrency: [
{ required: true, message: '请选择运费币制', trigger: 'change' }
......@@ -607,7 +628,8 @@
{ required: true, message: '请选择运费标志', trigger: 'change' }
],
insuredfee: [
{ required: true, message: '请输入保费', trigger: 'blur' }
{ required: true, message: '请输入保费', trigger: 'blur' },
{ validator: checkNegativeNum, trigger: 'blur' }
],
insuredfeeCurrency: [
{ required: true, message: '请输入保费币制', trigger: 'blur' }
......@@ -619,7 +641,8 @@
{ required: true, message: '请选择包装种类代码', trigger: 'change' }
],
packNo: [
{ required: true, message: '请输入件数', trigger: 'blur' }
{ required: true, message: '请输入件数', trigger: 'blur' },
{ validator: checkPackNo, trigger: 'blur' }
],
weight: [
{ required: true, message: '请输入毛重', trigger: 'blur' }
......@@ -628,7 +651,6 @@
{ required: true, message: '请输入净重', trigger: 'blur' }
],
remark: [
{ required: true, message: '请输入备注', trigger: 'blur' },
{ max: 1000, message: '长度不能超过1000个字符', trigger: 'blur' }
]
},
......@@ -668,14 +690,14 @@
value: "productCode",
width: "",
align: "left",
slot: true,
},
{
name: "规格型号",
value: "model",
width: "",
align: "left",
slot: true,
},
{
name: "账册备案料号",
......@@ -795,9 +817,9 @@
getDeclareData({declareId}).then(res =>{
console.log(1111, res)
if (res.code == 200) {
res.data.declare.orderNo = res.data.declare.orderno
this.formData = res.data.declare
this.formData.appType=9610
this.formData.orderNo = this.formData.orderno
this.detailData = res.data.product.length ? res.data.product.map((item, index) =>{
item.gnum = index+1
return item
......@@ -840,8 +862,6 @@
"totalPrice": 0,
"unit": ""
})
console.log(this.detailData)
},
updateRow(row){
this.expandRowKeys = [row.gnum]
......@@ -852,6 +872,8 @@
this.$nextTick(()=>{
this.$refs.rowEditForm.tableRowformData = obj
const table = this.$refs.entryTable.$el.querySelector('.el-table__body-wrapper');
table.scrollTop = row.gnum*51+10
})
},
deleteRow(row){
......@@ -937,13 +959,13 @@
align-items: center;
color:#007AB7;
line-height: 38px;
cursor: pointer;
i{
margin-right: 3px;
}
span{
font-size: 13px;
font-weight: 500;
cursor: pointer;
}
}
.formRowDataOperate{
......