tianyi 2 months ago
parent
commit
630d46b279
  1. 24
      src/views/app/business/logistics/logistics.vue
  2. 8
      src/views/app/business/problemFeedback/problemFeedback.vue

24
src/views/app/business/logistics/logistics.vue

@ -287,7 +287,8 @@
render: (h, params) => { render: (h, params) => {
let re = "", let re = "",
color = ""; color = "";
if (this.getTimeDifference(params.row.mustFinishTime) > 15 && (params.row.orderStatus == if (this.getTimeDifference(params.row.mustFinishTime) > 15 && (params.row
.orderStatus ==
"0" || params.row.orderStatus == "1")) { "0" || params.row.orderStatus == "1")) {
re = params.row.mustFinishTime; re = params.row.mustFinishTime;
color = "red"; color = "red";
@ -340,8 +341,8 @@
align: "center", align: "center",
fixed: "right", fixed: "right",
render: (h, params) => { render: (h, params) => {
return h("div", [ //
h( const orderDetailLink = h(
"a", { "a", {
on: { on: {
click: () => { click: () => {
@ -350,11 +351,16 @@
}, },
}, },
"订单详情" "订单详情"
), );
// status == 10
if (params.row.status != 3) {
return h("div", [
orderDetailLink,
h("Divider", { h("Divider", {
props: { props: {
type: "vertical", type: "vertical"
}, }
}), }),
h( h(
"a", { "a", {
@ -367,7 +373,11 @@
"改派订单" "改派订单"
), ),
]); ]);
}, } else {
// status 10
return h("div", [orderDetailLink]);
}
}
}, },
], ],
chooseColumns: [], chooseColumns: [],

8
src/views/app/business/problemFeedback/problemFeedback.vue

@ -7,8 +7,12 @@
<Row> <Row>
<Form ref="searchForm" :model="searchForm" inline :label-width="100"> <Form ref="searchForm" :model="searchForm" inline :label-width="100">
<FormItem label="免单人数" prop="name"> <FormItem label="" prop="name">
<Input v-model="form.orderNumber"></Input> <div style="display: flex;">
<div style="width: 40px;">完成</div>
<Input v-model="form.orderNumber" style="width: 60px;"></Input>
<div style="width: 180px;">&nbsp;&nbsp;单后免单</div>
</div>
</FormItem> </FormItem>
<FormItem label="免单金额" prop="name"> <FormItem label="免单金额" prop="name">
<Input v-model="form.freeAmount"></Input> <Input v-model="form.freeAmount"></Input>

Loading…
Cancel
Save