-
-
-
-
+
+
+
+
+
+
-
\ No newline at end of file
+ })
+ },
+ },
+ }
+
+
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
index 70ed571..eb3ae73 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/form.vue
@@ -105,8 +105,8 @@
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -155,6 +204,31 @@
+
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -249,7 +354,6 @@
v-model="dataForm.staffsId"
@change="changeData('staffsId', -1)"
placeholder="请选择"
- disabled
clearable
:style="{ width: '100%' }"
:options="staffsIdOptions"
@@ -264,7 +368,6 @@
v-model="dataForm.staffsName"
@change="changeData('staffsName', -1)"
placeholder="请输入"
- disabled
clearable
:style="{ width: '100%' }"
>
@@ -277,36 +380,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -375,6 +448,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -516,21 +619,26 @@ export default {
orderClientStatusId: undefined,
orderStaffsStatusId: undefined,
receivePeriod: undefined,
+ longitude: undefined,
+ latitude: undefined,
+ distance: "10",
+ orderStatusId: "520192817293693253",
clientId: undefined,
clientName: undefined,
clientMobile: undefined,
- // recycleAddress: undefined,
+ predictWeight: undefined,
appointmentTimeStart: undefined,
appointmentTimeEnd: undefined,
+ clientAddressId: undefined,
recycleStationId: undefined,
staffsId: undefined,
staffsName: undefined,
- creatorUserId: undefined,
- creatorTime: undefined,
consultTimeStart: undefined,
consultTimeEnd: undefined,
receiveTime: undefined,
settleTime: undefined,
+ creatorTime: undefined,
+ creatorUserId: undefined,
starScore: 0,
comment: undefined,
commentPics: [],
@@ -554,6 +662,41 @@ export default {
trigger: "blur",
},
],
+ clientId: [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "change",
+ },
+ ],
+ predictWeight: [
+ {
+ required: true,
+ message: "请输入",
+ trigger: "blur",
+ },
+ ],
+ appointmentTimeStart: [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "change",
+ },
+ ],
+ appointmentTimeEnd: [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "change",
+ },
+ ],
+ clientAddressId: [
+ {
+ required: true,
+ message: "请选择",
+ trigger: "change",
+ },
+ ],
recycleStationId: [
{
required: true,
@@ -568,6 +711,18 @@ export default {
orderClientStatusIdProps: { label: "fullName", value: "id" },
orderStaffsStatusIdOptions: [],
orderStaffsStatusIdProps: { label: "fullName", value: "id" },
+ orderStatusIdOptions: [],
+ orderStatusIdProps: { label: "fullName", value: "id" },
+ clientIdcolumnOptions: [
+ { label: "呢称", value: "nick_name" },
+ { label: "手机号", value: "mobile_phone" },
+ ],
+ clientAddressIdcolumnOptions: [
+ { label: "地址", value: "receive_street" },
+ // { label: "城市", value: "receive_city" },
+ { label: "姓名", value: "receive_user_name" },
+ { label: "手机号", value: "receive_mobile_phone" },
+ ],
recycleStationIdOptions: [],
recycleStationIdProps: { label: "station_name", value: "id" },
staffsIdOptions: [],
@@ -581,21 +736,37 @@ export default {
orderClientStatusId: [],
orderStaffsStatusId: [],
receivePeriod: [],
+ longitude: [],
+ latitude: [],
+ distance: [],
+ orderStatusId: [],
clientId: [],
clientName: [],
clientMobile: [],
- // recycleAddress: [],
+ predictWeight: [],
appointmentTimeStart: [],
appointmentTimeEnd: [],
+ clientAddressId: [
+ {
+ dataType: "varchar",
+ defaultValue: "",
+ field: "clientId",
+ fieldName: "",
+ id: "434Ri02",
+ jnpfKey: "popupSelect",
+ relationField: "clientId",
+ required: "0",
+ },
+ ],
recycleStationId: [],
staffsId: [],
staffsName: [],
- creatorUserId: [],
- creatorTime: [],
consultTimeStart: [],
consultTimeEnd: [],
receiveTime: [],
settleTime: [],
+ creatorTime: [],
+ creatorUserId: [],
starScore: [],
comment: [],
commentPics: [],
@@ -616,6 +787,14 @@ export default {
},
mounted() {},
methods: {
+ changeDataClient(model, row) {
+ this.dataForm.clientName = row.nick_name;
+ this.dataForm.clientMobile = row.mobile_phone;
+ },
+ changeDataAddress(model, row) {
+ this.dataForm.longitude = row.longitude;
+ this.dataForm.latitude = row.latitude;
+ },
prev() {
this.index--;
if (this.index === 0) {
@@ -696,6 +875,7 @@ export default {
this.getorderTypeIdOptions();
this.getorderClientStatusIdOptions();
this.getorderStaffsStatusIdOptions();
+ this.getorderStatusIdOptions();
this.getrecycleStationIdOptions();
this.getstaffsIdOptions();
},
@@ -714,6 +894,11 @@ export default {
this.orderStaffsStatusIdOptions = res.data.list;
});
},
+ getorderStatusIdOptions() {
+ getDictionaryDataSelector("520192751392788805").then((res) => {
+ this.orderStatusIdOptions = res.data.list;
+ });
+ },
getrecycleStationIdOptions() {
const index = this.childIndex;
let templateJsonList = JSON.parse(
diff --git a/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
index fb41a31..f75a619 100644
--- a/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/recycleorder/index.vue
@@ -6,757 +6,657 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 重置
-
- 展开
-
-
- 收起
-
-
-
-
-
-
-
-
- 新增
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+ 展开
+
+
+ 收起
+
+
+
+
+
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.staffsId}}
+
+
+
+
+ 编辑
+
+ 删除
+
+ 详情
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.staffsName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ jnpf.toDate(scope.row.creatorTime, "yyyy-MM-dd hh:mm:ss") }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
-
- 删除
-
- 详情
-
- 接单
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+