From 2a1585c218371490d328942b49257c5333739e5a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 23 七月 2025 10:48:13 +0800
Subject: [PATCH] 1.生产管理联调
---
src/views/productionManagement/productionCosting/index.vue | 57 +++++++++++++++-------------
src/api/productionManagement/productionCosting.js | 11 +++++
2 files changed, 41 insertions(+), 27 deletions(-)
diff --git a/src/api/productionManagement/productionCosting.js b/src/api/productionManagement/productionCosting.js
new file mode 100644
index 0000000..8cc0251
--- /dev/null
+++ b/src/api/productionManagement/productionCosting.js
@@ -0,0 +1,11 @@
+// 鐢熶骇鏍哥畻椤甸潰鎺ュ彛
+import request from "@/utils/request";
+
+// 鍒嗛〉鏌ヨ
+export function productionAccountingListPage(query) {
+ return request({
+ url: "/salesLedger/productionAccounting/listPage",
+ method: "get",
+ params: query,
+ });
+}
\ No newline at end of file
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index ed72bd5..76e7414 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -7,7 +7,7 @@
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
<span class="search_title ml10">鐢熶骇浜猴細</span>
<el-input
- v-model="searchForm.customerName"
+ v-model="searchForm.schedulingUserName"
style="width: 240px"
placeholder="璇疯緭鍏�"
@change="handleQuery"
@@ -42,70 +42,71 @@
} from "@/api/basicData/customerFile.js";
import { ElMessageBox } from "element-plus";
import dayjs from "dayjs";
+import {productionAccountingListPage} from "@/api/productionManagement/productionCosting.js";
const { proxy } = getCurrentInstance();
const tableColumn = ref([
{
label: "鐢熶骇鏃ユ湡",
- prop: "customerName",
+ prop: "schedulingDate",
width: 120,
},
{
label: "鐢熶骇浜�",
- prop: "customerName",
- width: 120,
+ prop: "schedulingUserName",
+ width: 90,
},
{
label: "鍚堝悓鍙�",
- prop: "taxpayerIdentificationNumber",
+ prop: "salesContractNo",
width: 220,
},
{
label: "瀹㈡埛鍚堝悓鍙�",
- prop: "addressPhone",
+ prop: "customerContractNo",
width: 250,
},
{
label: "瀹㈡埛鍚嶇О",
- prop: "contactPerson",
+ prop: "customerName",
+ width: 250,
},
{
label: "椤圭洰鍚嶇О",
- prop: "contactPhone",
- width:150
+ prop: "projectName",
+ width:300
},
{
label: "浜у搧澶х被",
- prop: "basicBankAccount",
- width: 220,
+ prop: "productCategory",
+ width: 160,
},
{
label: "瑙勬牸鍨嬪彿",
- prop: "bankAccount",
- width: 220,
+ prop: "specificationModel",
+ width: 160,
},
{
label: "鍗曚綅",
- prop: "bankCode",
- width:220
+ prop: "unit",
},
{
label: "宸ュ簭",
- prop: "maintainer",
+ prop: "process",
},
{
label: "鐢熶骇鏁伴噺",
- prop: "maintenanceTime",
+ prop: "finishedNum",
width: 100,
},
{
label: "宸ユ椂瀹氶",
- prop: "maintenanceTime",
+ prop: "workHours",
width: 100,
},
{
label: "宸ヨ祫",
- prop: "maintenanceTime",
+ prop: "wages",
width: 100,
},
]);
@@ -119,7 +120,7 @@
const data = reactive({
searchForm: {
- customerName: "",
+ schedulingUserName: "",
entryDate: [
dayjs().format("YYYY-MM-DD"),
dayjs().add(1, "day").format("YYYY-MM-DD"),
@@ -143,20 +144,22 @@
};
const changeDaterange = (value) => {
if (value) {
- searchForm.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
- searchForm.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD");
+ searchForm.value.entryDateStart = dayjs(value[0]).format("YYYY-MM-DD");
+ searchForm.value.entryDateEnd = dayjs(value[1]).format("YYYY-MM-DD");
} else {
- searchForm.entryDateStart = undefined;
- searchForm.entryDateEnd = undefined;
+ searchForm.value.entryDateStart = undefined;
+ searchForm.value.entryDateEnd = undefined;
}
handleQuery();
};
const getList = () => {
tableLoading.value = true;
- listCustomer({ ...searchForm.value, ...page }).then((res) => {
+ const params = { ...searchForm.value, ...page };
+ params.entryDate = undefined
+ productionAccountingListPage(params).then((res) => {
tableLoading.value = false;
- tableData.value = res.records;
- page.total = res.total;
+ tableData.value = res.data.records;
+ page.total = res.data.total;
});
};
--
Gitblit v1.9.3