|
@@ -305,6 +305,17 @@
|
|
|
/>
|
|
/>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
|
+
|
|
|
|
|
+ <el-form-item label="物流状态" prop="deliveryStatus" v-if="editForm.oldDeliveryStatus==='4'">
|
|
|
|
|
+ <el-select style="width:220px" v-model="editForm.deliveryStatus" placeholder="请选择物流状态" clearable size="small" >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in deliveryStatusOptions"
|
|
|
|
|
+ :key="item.dictValue" :disabled="!(item.dictValue==='5' || item.dictValue===editForm.oldDeliveryStatus+'')"
|
|
|
|
|
+ :label="item.dictLabel"
|
|
|
|
|
+ :value="item.dictValue"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-select>
|
|
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="档期归属" prop="scheduleId" >
|
|
<el-form-item label="档期归属" prop="scheduleId" >
|
|
|
<el-select filterable style="width: 200px" v-model="editForm.scheduleId" placeholder="请选择档期" clearable size="small" >
|
|
<el-select filterable style="width: 200px" v-model="editForm.scheduleId" placeholder="请选择档期" clearable size="small" >
|
|
|
<el-option
|
|
<el-option
|
|
@@ -600,6 +611,8 @@ export default {
|
|
|
editForm:{
|
|
editForm:{
|
|
|
orderType:null,
|
|
orderType:null,
|
|
|
scheduleId:null,
|
|
scheduleId:null,
|
|
|
|
|
+ deliveryStatus:null,
|
|
|
|
|
+ oldDeliveryStatus:null,
|
|
|
orderVisit:null,
|
|
orderVisit:null,
|
|
|
mark:"",
|
|
mark:"",
|
|
|
userPhone:null,
|
|
userPhone:null,
|
|
@@ -612,6 +625,7 @@ export default {
|
|
|
]
|
|
]
|
|
|
},
|
|
},
|
|
|
createTypeOptions:[],
|
|
createTypeOptions:[],
|
|
|
|
|
+ deliveryStatusOptions:[],
|
|
|
orderTypeOptions:[],
|
|
orderTypeOptions:[],
|
|
|
payTypeOptions:[],
|
|
payTypeOptions:[],
|
|
|
statusOptions:[],
|
|
statusOptions:[],
|
|
@@ -642,6 +656,9 @@ export default {
|
|
|
this.getDicts("store_order_create_type").then((response) => {
|
|
this.getDicts("store_order_create_type").then((response) => {
|
|
|
this.createTypeOptions = response.data;
|
|
this.createTypeOptions = response.data;
|
|
|
});
|
|
});
|
|
|
|
|
+ this.getDicts("store_order_delivery_status").then((response) => {
|
|
|
|
|
+ this.deliveryStatusOptions = response.data;
|
|
|
|
|
+ });
|
|
|
getTcmScheduleList().then(response => {
|
|
getTcmScheduleList().then(response => {
|
|
|
this.scheduleOptions = response.data;
|
|
this.scheduleOptions = response.data;
|
|
|
});
|
|
});
|
|
@@ -872,6 +889,8 @@ export default {
|
|
|
this.editForm.mark=this.order.mark
|
|
this.editForm.mark=this.order.mark
|
|
|
this.editForm.id=this.order.id;
|
|
this.editForm.id=this.order.id;
|
|
|
this.editForm.userPhone=null;
|
|
this.editForm.userPhone=null;
|
|
|
|
|
+ this.editForm.deliveryStatus=this.order.deliveryStatus+'';
|
|
|
|
|
+ this.editForm.oldDeliveryStatus=this.order.deliveryStatus+''
|
|
|
if(this.order.orderType!=null){
|
|
if(this.order.orderType!=null){
|
|
|
this.editForm.orderType=this.order.orderType.toString();
|
|
this.editForm.orderType=this.order.orderType.toString();
|
|
|
}
|
|
}
|