From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/views/auxiliaryentry/productoutput/productOutput.vue | 278 +++++++++++++++++--------------------------------------
1 files changed, 87 insertions(+), 191 deletions(-)
diff --git a/zhitan-vue/src/views/auxiliaryentry/productoutput/productOutput.vue b/zhitan-vue/src/views/auxiliaryentry/productoutput/productOutput.vue
index 8f3de9a..8d1f378 100644
--- a/zhitan-vue/src/views/auxiliaryentry/productoutput/productOutput.vue
+++ b/zhitan-vue/src/views/auxiliaryentry/productoutput/productOutput.vue
@@ -6,12 +6,7 @@
</div>
<div class="page-container-right">
<div class="form-card">
- <el-form
- :model="queryParams"
- ref="queryRef"
- :inline="true"
- v-show="showSearch"
- >
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
<el-form-item label="鏈熼棿" prop="timeType">
<el-select
v-model="queryParams.timeType"
@@ -19,12 +14,7 @@
style="width: 120px"
@change="handleTimeType"
>
- <el-option
- v-for="dict in period"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-option v-for="dict in period" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="鏃堕棿">
@@ -58,33 +48,20 @@
/>
</el-form-item>
<el-form-item label="浜у搧绫诲瀷">
- <el-select
- v-model="queryParams.productType"
- placeholder="浜у搧绫诲瀷"
- style="width: 100%"
- >
- <el-option
- v-for="dict in product_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.productType" placeholder="浜у搧绫诲瀷" style="width: 100%">
+ <el-option v-for="dict in product_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">
- 鎼滅储
- </el-button>
+ <el-button type="primary" icon="Search" @click="handleQuery"> 鎼滅储 </el-button>
<el-button icon="Refresh" @click="resetQuery"> 閲嶇疆 </el-button>
+ </el-form-item>
+ <el-form-item style="float: right">
+ <el-button type="primary" icon="Plus" @click="handleAdd"> 鏂板 </el-button>
</el-form-item>
</el-form>
</div>
<div class="table-box">
- <div class="mt20 mb20">
- <el-button type="primary" icon="Plus" @click="handleAdd">
- 鏂板
- </el-button>
- </div>
<el-table v-loading="loading" :data="productoutputList">
<el-table-column
label="鐢ㄨ兘鍗曞厓"
@@ -93,13 +70,7 @@
prop="nodeName"
:show-overflow-tooltip="true"
/>
- <el-table-column
- label="鏈熼棿"
- align="center"
- key="timeType"
- prop="timeType"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="鏈熼棿" align="center" key="timeType" prop="timeType" :show-overflow-tooltip="true">
<template #default="scope">
<dict-tag :options="period" :value="scope.row.timeType" />
</template>
@@ -120,10 +91,7 @@
:show-overflow-tooltip="true"
>
<template #default="scope">
- <dict-tag
- :options="product_type"
- :value="scope.row.productType"
- />
+ <dict-tag :options="product_type" :value="scope.row.productType" />
</template>
</el-table-column>
<!-- <el-table-column
@@ -133,24 +101,12 @@
prop="name"
:show-overflow-tooltip="true"
/> -->
- <el-table-column
- label="鍗曚綅"
- align="center"
- key="unit"
- prop="unit"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="鍗曚綅" align="center" key="unit" prop="unit" :show-overflow-tooltip="true">
<template #default="scope">
<dict-tag :options="sys_unit" :value="scope.row.unit" />
</template>
</el-table-column>
- <el-table-column
- label="浜ч噺"
- align="center"
- key="number"
- prop="number"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="浜ч噺" align="center" key="number" prop="number" :show-overflow-tooltip="true" />
<el-table-column
label="鎻愪氦鏃堕棿"
align="center"
@@ -158,32 +114,13 @@
:show-overflow-tooltip="true"
width="200"
/>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- width="200"
- >
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="200">
<template #default="scope">
<el-tooltip content="缂栬緫" placement="top">
- <el-button
- link
- type="primary"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- >
- 缂栬緫
- </el-button>
+ <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"> 缂栬緫 </el-button>
</el-tooltip>
<el-tooltip content="鍒犻櫎" placement="top">
- <el-button
- link
- type="primary"
- icon="Delete"
- @click="handleDelete(scope.row)"
- >
- 鍒犻櫎
- </el-button>
+ <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"> 鍒犻櫎 </el-button>
</el-tooltip>
</template>
</el-table-column>
@@ -203,11 +140,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="鐢ㄨ兘鍗曞厓" prop="nodeName">
- <el-input
- v-model="form.nodeName"
- placeholder="璇疯緭鍏ョ敤鑳藉崟鍏�"
- disabled
- />
+ <el-input v-model="form.nodeName" placeholder="璇疯緭鍏ョ敤鑳藉崟鍏�" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -219,12 +152,7 @@
style="width: 100%"
@change="handleTimeTypeAdd"
>
- <el-option
- v-for="dict in period"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-option v-for="dict in period" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -261,18 +189,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="浜у搧绫诲瀷" prop="productType">
- <el-select
- v-model="form.productType"
- placeholder="浜у搧绫诲瀷"
- clearable
- style="width: 100%"
- >
- <el-option
- v-for="dict in product_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="form.productType" placeholder="浜у搧绫诲瀷" clearable style="width: 100%">
+ <el-option v-for="dict in product_type" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -287,18 +205,8 @@
</el-col> -->
<el-col :span="12">
<el-form-item label="鍗曚綅" prop="unit">
- <el-select
- v-model="form.unit"
- placeholder="璇烽�夋嫨鍗曚綅"
- clearable
- style="width: 100%"
- >
- <el-option
- v-for="dict in sys_unit"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="form.unit" placeholder="璇烽�夋嫨鍗曚綅" clearable style="width: 100%">
+ <el-option v-for="dict in sys_unit" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -331,19 +239,15 @@
addProductoutput,
updateProductoutput,
delProductoutput,
-} from "@/api/auxiliaryEntry/productOutput";
-const { proxy } = getCurrentInstance();
-import { useRoute } from "vue-router";
-const { period, sys_unit, product_type } = proxy.useDict(
- "period",
- "sys_unit",
- "product_type"
-);
-const productoutputList = ref([]);
-const open = ref(false);
-const loading = ref(false);
-const showSearch = ref(true);
-const title = ref("");
+} from "@/api/auxiliaryEntry/productOutput"
+const { proxy } = getCurrentInstance()
+import { useRoute } from "vue-router"
+const { period, sys_unit, product_type } = proxy.useDict("period", "sys_unit", "product_type")
+const productoutputList = ref([])
+const open = ref(false)
+const loading = ref(false)
+const showSearch = ref(true)
+const title = ref("")
const data = reactive({
form: {},
queryParams: {
@@ -358,12 +262,8 @@
},
query: { ...useRoute().query },
rules: {
- timeType: [
- { required: true, message: "鏈熼棿涓嶈兘涓虹┖", trigger: ["blur", "change"] },
- ],
- dataTime: [
- { required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: ["blur", "change"] },
- ],
+ timeType: [{ required: true, message: "鏈熼棿涓嶈兘涓虹┖", trigger: ["blur", "change"] }],
+ dataTime: [{ required: true, message: "鏃堕棿涓嶈兘涓虹┖", trigger: ["blur", "change"] }],
productType: [
{
required: true,
@@ -373,78 +273,74 @@
],
// name: [{ required: true, message: "浜у搧鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
unit: [{ required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }],
- number: [
- { required: true, message: "浜ч噺涓嶈兘涓虹┖", trigger: ["blur", "change"] },
- ],
+ number: [{ required: true, message: "浜ч噺涓嶈兘涓虹┖", trigger: ["blur", "change"] }],
},
-});
-const { queryParams, query, form, rules } = toRefs(data);
+})
+const { queryParams, query, form, rules } = toRefs(data)
/** 鑺傜偣鍗曞嚮浜嬩欢 */
function handleNodeClick(data) {
- queryParams.value.nodeId = data.id;
- queryParams.value.nodeName = data.label;
- queryParams.value.productType = null;
- handleTimeType(period.value[0].value);
- handleQuery();
+ queryParams.value.nodeId = data.id
+ queryParams.value.nodeName = data.label
+ queryParams.value.productType = null
+ handleTimeType(period.value[0].value)
+ handleQuery()
}
function handleTimeType(e) {
- queryParams.value.timeType = e;
+ queryParams.value.timeType = e
queryParams.value.dataTime = proxy
.dayjs(new Date())
- .format(e == "YEAR" ? "YYYY" : e == "MONTH" ? "YYYY-MM" : "YYYY-MM-DD");
+ .format(e == "YEAR" ? "YYYY" : e == "MONTH" ? "YYYY-MM" : "YYYY-MM-DD")
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-鍒楄〃
function getList() {
- loading.value = true;
+ loading.value = true
listProductoutput(
proxy.addDateRange({
...queryParams.value,
...query.value,
})
).then((res) => {
- loading.value = false;
- productoutputList.value = res.rows;
- queryParams.value.total = res.total;
- });
+ loading.value = false
+ productoutputList.value = res.rows
+ queryParams.value.total = res.total
+ })
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-鎼滅储
function handleQuery() {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1
+ getList()
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-閲嶇疆
function resetQuery() {
- proxy.resetForm("queryRef");
- queryParams.value.pageNum = 1;
- queryParams.value.pageSize = 10;
- queryParams.value.total = 0;
- queryParams.value.timeType = null;
- queryParams.value.dataTime = null;
- queryParams.value.productType = null;
- handleTimeType(period.value[0].value);
- handleQuery();
+ proxy.resetForm("queryRef")
+ queryParams.value.pageNum = 1
+ queryParams.value.pageSize = 10
+ queryParams.value.total = 0
+ queryParams.value.timeType = null
+ queryParams.value.dataTime = null
+ queryParams.value.productType = null
+ handleTimeType(period.value[0].value)
+ handleQuery()
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-鏂板
function handleAdd() {
- reset();
- form.value.nodeId = queryParams.value.nodeId;
- form.value.nodeName = queryParams.value.nodeName;
- handleTimeTypeAdd(period.value[0].value);
- title.value = "鏂板浜у搧浜ч噺褰曞叆";
- open.value = true;
+ reset()
+ form.value.nodeId = queryParams.value.nodeId
+ form.value.nodeName = queryParams.value.nodeName
+ handleTimeTypeAdd(period.value[0].value)
+ title.value = "鏂板浜у搧浜ч噺褰曞叆"
+ open.value = true
}
function handleTimeTypeAdd(e) {
- form.value.timeType = e;
- form.value.dataTime = proxy
- .dayjs(new Date())
- .format(e == "YEAR" ? "YYYY" : e == "MONTH" ? "YYYY-MM" : "YYYY-MM-DD");
+ form.value.timeType = e
+ form.value.dataTime = proxy.dayjs(new Date()).format(e == "YEAR" ? "YYYY" : e == "MONTH" ? "YYYY-MM" : "YYYY-MM-DD")
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-缂栬緫
function handleUpdate(row) {
- reset();
- form.value = { ...row };
- open.value = true;
- title.value = "缂栬緫浜у搧浜ч噺褰曞叆";
+ reset()
+ form.value = { ...row }
+ open.value = true
+ title.value = "缂栬緫浜у搧浜ч噺褰曞叆"
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-鏂板/缂栬緫-淇濆瓨
function submitForm() {
@@ -452,24 +348,24 @@
if (valid) {
if (form.value.productOutputId != undefined) {
updateProductoutput(form.value).then((response) => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
+ proxy.$modal.msgSuccess("淇敼鎴愬姛")
+ open.value = false
+ getList()
+ })
} else {
addProductoutput(form.value).then((response) => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
+ proxy.$modal.msgSuccess("鏂板鎴愬姛")
+ open.value = false
+ getList()
+ })
}
}
- });
+ })
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-鏂板/缂栬緫-鍙栨秷
function cancel() {
- open.value = false;
- reset();
+ open.value = false
+ reset()
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-鏂板/缂栬緫-琛ㄥ崟閲嶇疆
function reset() {
@@ -480,8 +376,8 @@
number: "1",
timeType: "",
unit: "",
- };
- proxy.resetForm("formRef");
+ }
+ proxy.resetForm("formRef")
}
// 杈呭姪褰曞叆-浜у搧浜ч噺褰曞叆-鍒犻櫎
function handleDelete(row) {
@@ -489,13 +385,13 @@
.confirm('鏄惁纭鍒犻櫎鏃堕棿涓�"' + row.dataTime + '"鐨勬暟鎹」锛�')
// .confirm('鏄惁纭鍒犻櫎浜у搧鍚嶇О涓�"' + row.name + '"鐨勬暟鎹」锛�')
.then(function () {
- return delProductoutput(row.productOutputId);
+ return delProductoutput(row.productOutputId)
})
.then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ getList()
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛")
})
- .catch(() => {});
+ .catch(() => {})
}
</script>
<style scoped lang="scss">
--
Gitblit v1.9.3