|
|
@@ -103,10 +103,10 @@
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="form" v-if="form.status == '1' || form.status == '2'">
|
|
|
<el-form :model="form" ref="form" :rules="rules" label-width="100px" class="demo-ruleForm">
|
|
|
- <el-form-item label="寄出运单号" prop="shop_transport_no">
|
|
|
+ <el-form-item label="寄出运单号" prop="shop_transport_no" v-if="form.transport_type == '0'">
|
|
|
<el-input v-model="form.shop_transport_no" placeholder="请输入运单号,快递公司,同时填入" size="small"></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="快递公司" prop="shop_transport_type">
|
|
|
+ <el-form-item label="快递公司" prop="shop_transport_type" v-if="form.transport_type == '0'">
|
|
|
<el-select
|
|
|
v-model="form.shop_transport_type"
|
|
|
filterable
|
|
|
@@ -197,9 +197,9 @@ export default {
|
|
|
transport_typeList: [],
|
|
|
loading: false,
|
|
|
rules: {
|
|
|
- // shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
|
|
|
- // shop_transport_type: [{ required: true, message: '请选择快递公司', trigger: 'change' }],
|
|
|
- // transport_type: [{ required: true, message: '请选择快递类型', trigger: 'change' }],
|
|
|
+ shop_transport_no: [{ required: true, message: '请输入快递单号', trigger: 'blur' }],
|
|
|
+ shop_transport_type: [{ required: true, message: '请选择快递公司', trigger: 'change' }],
|
|
|
+ transport_type: [{ required: true, message: '请选择快递类型', trigger: 'change' }],
|
|
|
},
|
|
|
loadings: true,
|
|
|
};
|
|
|
@@ -280,7 +280,6 @@ export default {
|
|
|
if (form.shop_transport_type != undefined) transport.shop_transport_type = form.shop_transport_type;
|
|
|
if (form.transport_type) transport.transport_type = form.transport_type;
|
|
|
form.transport = transport;
|
|
|
- if (val != undefined || val != '') form.status = val;
|
|
|
if (form.shop_transport_no == undefined || form.shop_transport_type == undefined) {
|
|
|
this.$refs[formName].validate(async (valid) => {
|
|
|
if (valid) {
|
|
|
@@ -289,6 +288,7 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning',
|
|
|
}).then(async () => {
|
|
|
+ if (val != undefined || val != '') form.status = val;
|
|
|
if (form.id) res = await this.update(form);
|
|
|
if (this.$checkRes(res)) {
|
|
|
this.$message({ type: `success`, message: `维护信息成功` });
|
|
|
@@ -307,6 +307,7 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning',
|
|
|
}).then(async () => {
|
|
|
+ if (val != undefined || val != '') form.status = val;
|
|
|
if (form.id) res = await this.update(form);
|
|
|
if (this.$checkRes(res)) {
|
|
|
this.$message({ type: `success`, message: `维护信息成功` });
|
|
|
@@ -332,7 +333,7 @@ export default {
|
|
|
if (this.$checkRes(res)) {
|
|
|
this.$set(this, `order_processList`, res.data);
|
|
|
}
|
|
|
- // 减免方式
|
|
|
+ // 快递类型
|
|
|
res = await this.dictQuery({ code: 'transport_type' });
|
|
|
if (this.$checkRes(res)) {
|
|
|
this.$set(this, `transport_typeList`, res.data);
|
