|
@@ -58,6 +58,11 @@
|
|
|
<div v-if="item.groupOrderCodeList && item.groupOrderCodeList.length > 0">{{ item.groupOrderCodeList.join(",") }}</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
+ <template #total="{ item }">
|
|
|
+ <div>
|
|
|
+ <a style="color: #409eff; cursor: pointer; word-break: break-all" @click="clickTotal(item)">{{ item.total }}</a>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<template #address="{ item }">
|
|
|
<div>{{ item.province }},{{ item.city }},{{ item.county }},{{ item.detailedAddress }}</div>
|
|
|
</template>
|
|
@@ -81,6 +86,78 @@
|
|
|
<el-button type="primary" @click="submitPicture()" size="large" v-preReClick>提 交</el-button>
|
|
|
</template>
|
|
|
</el-dialog>
|
|
|
+
|
|
|
+ <el-dialog title="合并订单" v-if="openMerge" v-model="openMerge" width="500">
|
|
|
+ <el-form :model="formMerge.data" :rules="rulesMerge" label-width="100px" ref="refMerge">
|
|
|
+ <el-form-item label="主订单号" prop="id">
|
|
|
+ <el-select v-model="formMerge.data.id" placeholder="请选择" style="width: 100%">
|
|
|
+ <el-option v-for="item in selectData" :key="item.id" :label="item.code" :value="item.id"> </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="合并订单号" prop="mergeIdList">
|
|
|
+ <el-select v-model="formMerge.data.mergeIdList" placeholder="请选择" style="width: 100%" multiple :disabled="!formMerge.data.id">
|
|
|
+ <el-option v-for="item in selectData.filter((item) => item.id !== formMerge.data.id)" :key="item.id" :label="item.code" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <template #footer>
|
|
|
+ <el-button @click="openMerge = false" size="large">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitMerge()" size="large" v-preReClick>提 交</el-button>
|
|
|
+ </template>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
+ <el-dialog title="修改收件信息" v-if="openInformation" v-model="openInformation" width="600">
|
|
|
+ <el-form :model="formInformation.data" :rules="rulesInformation" label-width="120px" ref="refInformation">
|
|
|
+ <el-form-item label="省" prop="province">
|
|
|
+ <el-input v-model="formInformation.data.province" placeholder="请输入省" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="市" prop="city">
|
|
|
+ <el-input v-model="formInformation.data.city" placeholder="请输入市" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="区/县" prop="county">
|
|
|
+ <el-input v-model="formInformation.data.county" placeholder="请输入区/县" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="详细地址" prop="detailedAddress">
|
|
|
+ <el-input v-model="formInformation.data.detailedAddress" placeholder="请输入详细地址" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="收货人" prop="consignee">
|
|
|
+ <el-input v-model="formInformation.data.consignee" placeholder="请输入收货人" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="收货人电话" prop="consigneeNumber">
|
|
|
+ <el-input v-model="formInformation.data.consigneeNumber" placeholder="请输入收货人电话" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <template #footer>
|
|
|
+ <el-button @click="openInformation = false" size="large">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitInformation()" size="large" v-preReClick>保 存</el-button>
|
|
|
+ </template>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
+ <el-dialog title="修改快递" v-if="openExpress" v-model="openExpress" width="500">
|
|
|
+ <el-form :model="formExpress.data" :rules="rulesExpress" label-width="100px" ref="refExpress">
|
|
|
+ <el-form-item label="快递" prop="expressDeliveryId">
|
|
|
+ <el-select v-model="formExpress.data.expressDeliveryId" placeholder="请选择快递" style="width: 100%">
|
|
|
+ <el-option v-for="item in useUserStore().allDict['express_delivery']" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <template #footer>
|
|
|
+ <el-button @click="openExpress = false" size="large">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitExpress()" size="large" v-preReClick>保 存</el-button>
|
|
|
+ </template>
|
|
|
+ </el-dialog>
|
|
|
+
|
|
|
+ <el-dialog title="修改快递" v-if="openExpressCode" v-model="openExpressCode" width="500">
|
|
|
+ <el-form :model="formExpressCode.data" :rules="rulesExpressCode" label-width="100px" ref="refExpressCode">
|
|
|
+ <el-form-item label="快递单号" prop="expressDeliveryCode">
|
|
|
+ <el-input v-model="formExpressCode.data.expressDeliveryCode" placeholder="请输入快递单号" />
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <template #footer>
|
|
|
+ <el-button @click="openExpressCode = false" size="large">取 消</el-button>
|
|
|
+ <el-button type="primary" @click="submitExpressCode()" size="large" v-preReClick>保 存</el-button>
|
|
|
+ </template>
|
|
|
+ </el-dialog>
|
|
|
</el-card>
|
|
|
</template>
|
|
|
|
|
@@ -186,7 +263,7 @@ const config = computed(() => {
|
|
|
{
|
|
|
attrs: {
|
|
|
label: "总包裹数",
|
|
|
- slot: "groupOrderCodeList",
|
|
|
+ slot: "total",
|
|
|
width: 90,
|
|
|
},
|
|
|
},
|
|
@@ -363,6 +440,9 @@ const clickCode = (row) => {
|
|
|
},
|
|
|
});
|
|
|
};
|
|
|
+const clickTotal = (row) => {
|
|
|
+ console.log(row);
|
|
|
+};
|
|
|
const openPackagePicture = ref(false);
|
|
|
const rowData = ref({});
|
|
|
const loadingPackagePicture = ref(false);
|
|
@@ -432,6 +512,186 @@ const submitPicture = () => {
|
|
|
}
|
|
|
);
|
|
|
};
|
|
|
+const clickUnpack = () => {
|
|
|
+ console.log("拆分包裹");
|
|
|
+};
|
|
|
+const openMerge = ref(false);
|
|
|
+const formMerge = reactive({
|
|
|
+ data: {
|
|
|
+ id: "",
|
|
|
+ mergeIdList: [],
|
|
|
+ },
|
|
|
+});
|
|
|
+const rulesMerge = ref({
|
|
|
+ id: [{ required: true, message: "请选择主订单", trigger: "change" }],
|
|
|
+ mergeIdList: [{ required: true, message: "请选择合并订单", trigger: "change" }],
|
|
|
+});
|
|
|
+const clickMerge = () => {
|
|
|
+ if (selectData.value && selectData.value.length > 1) {
|
|
|
+ for (let i = 0; i < selectData.value.length; i++) {
|
|
|
+ if (selectData.value[i].groupOrderCodeList && selectData.value[i].groupOrderCodeList.length > 0) {
|
|
|
+ return ElMessage("请选择未合并订单进行合并");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ formMerge.data = {
|
|
|
+ id: "",
|
|
|
+ mergeIdList: [],
|
|
|
+ };
|
|
|
+ openMerge.value = true;
|
|
|
+ } else {
|
|
|
+ return ElMessage("请选择需要合并的订单");
|
|
|
+ }
|
|
|
+};
|
|
|
+const submitMerge = () => {
|
|
|
+ proxy.$refs.refMerge.validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ proxy.post("/issueBill/merge", formMerge.data).then(() => {
|
|
|
+ openMerge.value = false;
|
|
|
+ ElMessage({ message: "提交成功", type: "success" });
|
|
|
+ getList();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+};
|
|
|
+const clickUnMerge = () => {
|
|
|
+ if (selectData.value && selectData.value.length > 0) {
|
|
|
+ if (selectData.value.length > 1) {
|
|
|
+ return ElMessage("每次只能选一个");
|
|
|
+ }
|
|
|
+ if (!(selectData.value[0].groupOrderCodeList && selectData.value[0].groupOrderCodeList.length > 0)) {
|
|
|
+ return ElMessage("该订单没有合并");
|
|
|
+ }
|
|
|
+ proxy.post("/issueBill/unmerge", { id: selectData.value[0].id }).then(() => {
|
|
|
+ ElMessage({ message: "取消合并成功", type: "success" });
|
|
|
+ getList();
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ return ElMessage("请先选择需要取消合并的订单");
|
|
|
+ }
|
|
|
+};
|
|
|
+const openInformation = ref(false);
|
|
|
+const formInformation = reactive({
|
|
|
+ data: {
|
|
|
+ id: "",
|
|
|
+ province: "",
|
|
|
+ city: "",
|
|
|
+ county: "",
|
|
|
+ detailedAddress: "",
|
|
|
+ consignee: "",
|
|
|
+ consigneeNumber: "",
|
|
|
+ },
|
|
|
+});
|
|
|
+const rulesInformation = ref({
|
|
|
+ province: [{ required: true, message: "请输入省", trigger: "blur" }],
|
|
|
+ city: [{ required: true, message: "请输入市", trigger: "blur" }],
|
|
|
+ county: [{ required: true, message: "请输入县", trigger: "blur" }],
|
|
|
+ detailedAddress: [{ required: true, message: "请输入详细地址", trigger: "blur" }],
|
|
|
+ consignee: [{ required: true, message: "请输入收货人", trigger: "blur" }],
|
|
|
+ consigneeNumber: [{ required: true, message: "请输入收货人电话", trigger: "blur" }],
|
|
|
+});
|
|
|
+const clickModifyInformation = () => {
|
|
|
+ if (selectData.value && selectData.value.length > 0) {
|
|
|
+ if (selectData.value.length > 1) {
|
|
|
+ return ElMessage("每次只能选一个");
|
|
|
+ }
|
|
|
+ formInformation.data = {
|
|
|
+ id: selectData.value[0].id,
|
|
|
+ province: selectData.value[0].province,
|
|
|
+ city: selectData.value[0].city,
|
|
|
+ county: selectData.value[0].county,
|
|
|
+ detailedAddress: selectData.value[0].detailedAddress,
|
|
|
+ consignee: selectData.value[0].consignee,
|
|
|
+ consigneeNumber: selectData.value[0].consigneeNumber,
|
|
|
+ };
|
|
|
+ openInformation.value = true;
|
|
|
+ } else {
|
|
|
+ return ElMessage("请先选择需要修改收件信息的订单");
|
|
|
+ }
|
|
|
+};
|
|
|
+const submitInformation = () => {
|
|
|
+ proxy.$refs.refInformation.validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ proxy.post("/issueBill/editAddress", formInformation.data).then(() => {
|
|
|
+ openInformation.value = false;
|
|
|
+ ElMessage({ message: "保存成功", type: "success" });
|
|
|
+ getList();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+};
|
|
|
+const openExpress = ref(false);
|
|
|
+const formExpress = reactive({
|
|
|
+ data: {
|
|
|
+ id: "",
|
|
|
+ expressDeliveryId: "",
|
|
|
+ },
|
|
|
+});
|
|
|
+const rulesExpress = ref({
|
|
|
+ expressDeliveryId: [{ required: true, message: "请选择快递", trigger: "change" }],
|
|
|
+});
|
|
|
+const clickModifiedExpress = () => {
|
|
|
+ if (selectData.value && selectData.value.length > 0) {
|
|
|
+ if (selectData.value.length > 1) {
|
|
|
+ return ElMessage("每次只能选一个");
|
|
|
+ }
|
|
|
+ formExpress.data = {
|
|
|
+ id: selectData.value[0].id,
|
|
|
+ expressDeliveryId: selectData.value[0].expressDeliveryId,
|
|
|
+ };
|
|
|
+ openExpress.value = true;
|
|
|
+ } else {
|
|
|
+ return ElMessage("请先选择需要修改快递的订单");
|
|
|
+ }
|
|
|
+};
|
|
|
+const submitExpress = () => {
|
|
|
+ proxy.$refs.refExpress.validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ proxy.post("/issueBill/editExpressDeliveryId", formExpress.data).then(() => {
|
|
|
+ openExpress.value = false;
|
|
|
+ ElMessage({ message: "保存成功", type: "success" });
|
|
|
+ getList();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+};
|
|
|
+const clickPrint = () => {
|
|
|
+ console.log("打印快递单");
|
|
|
+};
|
|
|
+const openExpressCode = ref(false);
|
|
|
+const formExpressCode = reactive({
|
|
|
+ data: {
|
|
|
+ id: "",
|
|
|
+ expressDeliveryCode: "",
|
|
|
+ },
|
|
|
+});
|
|
|
+const rulesExpressCode = ref({
|
|
|
+ expressDeliveryCode: [{ required: true, message: "请输入快递单号", trigger: "blur" }],
|
|
|
+});
|
|
|
+const clickFillInExpressCode = () => {
|
|
|
+ if (selectData.value && selectData.value.length > 0) {
|
|
|
+ if (selectData.value.length > 1) {
|
|
|
+ return ElMessage("每次只能选一个");
|
|
|
+ }
|
|
|
+ formExpressCode.data = {
|
|
|
+ id: selectData.value[0].id,
|
|
|
+ expressDeliveryCode: selectData.value[0].expressDeliveryCode,
|
|
|
+ };
|
|
|
+ openExpressCode.value = true;
|
|
|
+ } else {
|
|
|
+ return ElMessage("请先选择需要填写快递单号的订单");
|
|
|
+ }
|
|
|
+};
|
|
|
+const submitExpressCode = () => {
|
|
|
+ proxy.$refs.refExpressCode.validate((valid) => {
|
|
|
+ if (valid) {
|
|
|
+ proxy.post("/issueBill/editExpressDeliveryCode", formExpressCode.data).then(() => {
|
|
|
+ openExpressCode.value = false;
|
|
|
+ ElMessage({ message: "保存成功", type: "success" });
|
|
|
+ getList();
|
|
|
+ });
|
|
|
+ }
|
|
|
+ });
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|