|
@@ -335,12 +335,12 @@ const selectConfig = computed(() => {
|
|
|
return [
|
|
|
{
|
|
|
label: "订单状态",
|
|
|
- prop: "blessingType",
|
|
|
+ prop: "state",
|
|
|
data: orderState.value
|
|
|
},
|
|
|
{
|
|
|
label: "回告状态",
|
|
|
- prop: "blessingType",
|
|
|
+ prop: "confirmState",
|
|
|
data: confirmState.value
|
|
|
},
|
|
|
{
|
|
@@ -355,6 +355,10 @@ const selectConfig = computed(() => {
|
|
|
label: "已确认",
|
|
|
value: "1",
|
|
|
},
|
|
|
+ {
|
|
|
+ label: "已回告",
|
|
|
+ value: "2",
|
|
|
+ },
|
|
|
],
|
|
|
},
|
|
|
{
|
|
@@ -428,16 +432,22 @@ const config = computed(() => {
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "订单状态",
|
|
|
- prop: "stateName",
|
|
|
+ prop: "state",
|
|
|
align: "center"
|
|
|
},
|
|
|
+ render(value) {
|
|
|
+ return proxy.dictValueLabel(value, orderState.value);
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "回告状态",
|
|
|
- prop: "confirmStateName",
|
|
|
+ prop: "confirmState",
|
|
|
align: "center"
|
|
|
},
|
|
|
+ render(value) {
|
|
|
+ return proxy.dictValueLabel(value, confirmState.value);
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
attrs: {
|