From 6de6e76034d1fafd98fc64c8c94eb4cb306b2a70 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 06 五月 2026 14:10:35 +0800
Subject: [PATCH] 新疆马铃薯 1.设备台账添加是否为物联设备和外联编码字段、删除设备品牌字段
---
src/views/equipmentManagement/ledger/Form.vue | 187 ++++++++++++++++++++++++++++++++--------------
1 files changed, 129 insertions(+), 58 deletions(-)
diff --git a/src/views/equipmentManagement/ledger/Form.vue b/src/views/equipmentManagement/ledger/Form.vue
index f85a7fa..67c772f 100644
--- a/src/views/equipmentManagement/ledger/Form.vue
+++ b/src/views/equipmentManagement/ledger/Form.vue
@@ -2,6 +2,22 @@
<el-form :model="form" label-width="120px" :rules="formRules" ref="formRef">
<el-row :gutter="20">
<el-col :span="12">
+ <el-form-item label="鎵�灞炲尯鍩�" prop="areaId">
+ <el-tree-select
+ v-model="form.areaId"
+ :data="areaOptions"
+ :props="areaTreeProps"
+ node-key="id"
+ value-key="id"
+ check-strictly
+ clearable
+ filterable
+ placeholder="璇烽�夋嫨鎵�灞炲尯鍩�"
+ style="width: 100%"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="璁惧鍚嶇О" prop="deviceName">
<el-input v-model="form.deviceName" placeholder="璇疯緭鍏ヨ澶囧悕绉�" />
</el-form-item>
@@ -11,11 +27,11 @@
<el-input v-model="form.deviceModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" />
</el-form-item>
</el-col>
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="璁惧鍝佺墝" prop="deviceBrand">
<el-input v-model="form.deviceBrand" placeholder="璇疯緭鍏ヨ澶囧搧鐗�" />
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="璁惧绫诲瀷" prop="type">
<el-select
@@ -72,63 +88,62 @@
<el-form-item label="鏁伴噺" prop="number">
<el-input-number :min="1" style="width: 100%"
v-model="form.number"
- disabled
placeholder="璇疯緭鍏ユ暟閲�"
@change="mathNum"
/>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="鍚◣鍗曚环" prop="taxIncludingPriceUnit">
- <el-input-number :step="0.01" :min="0" style="width: 100%"
- v-model="form.taxIncludingPriceUnit"
- placeholder="璇疯緭鍏ュ惈绋庡崟浠�"
- maxlength="10"
- @change="mathNum"
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍚◣鎬讳环" prop="taxIncludingPriceTotal">
- <el-input
- v-model="form.taxIncludingPriceTotal"
- placeholder="鑷姩鐢熸垚"
- type="number"
- disabled
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="绋庣巼(%)" prop="taxRate">
- <!-- <el-input
- v-model="form.taxRate"
- placeholder="璇疯緭鍏ョ◣鐜�"
- type="number"
- >
- <template #append> % </template>
- </el-input> -->
- <el-select
- v-model="form.taxRate"
- placeholder="璇烽�夋嫨"
- clearable
- @change="mathNum"
- >
- <el-option label="1" :value="1" />
- <el-option label="6" :value="6" />
- <el-option label="13" :value="13" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="涓嶅惈绋庢�讳环" prop="unTaxIncludingPriceTotal">
- <el-input
- v-model="form.unTaxIncludingPriceTotal"
- placeholder="鑷姩鐢熸垚"
- type="number"
- disabled
- />
- </el-form-item>
- </el-col>
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鍚◣鍗曚环" prop="taxIncludingPriceUnit">-->
+<!-- <el-input-number :step="0.01" :min="0" style="width: 100%"-->
+<!-- v-model="form.taxIncludingPriceUnit"-->
+<!-- placeholder="璇疯緭鍏ュ惈绋庡崟浠�"-->
+<!-- maxlength="10"-->
+<!-- @change="mathNum"-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="鍚◣鎬讳环" prop="taxIncludingPriceTotal">-->
+<!-- <el-input-->
+<!-- v-model="form.taxIncludingPriceTotal"-->
+<!-- placeholder="鑷姩鐢熸垚"-->
+<!-- type="number"-->
+<!-- disabled-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="绋庣巼(%)" prop="taxRate">-->
+<!-- <!– <el-input-->
+<!-- v-model="form.taxRate"-->
+<!-- placeholder="璇疯緭鍏ョ◣鐜�"-->
+<!-- type="number"-->
+<!-- >-->
+<!-- <template #append> % </template>-->
+<!-- </el-input> –>-->
+<!-- <el-select-->
+<!-- v-model="form.taxRate"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- clearable-->
+<!-- @change="mathNum"-->
+<!-- >-->
+<!-- <el-option label="1" :value="1" />-->
+<!-- <el-option label="6" :value="6" />-->
+<!-- <el-option label="13" :value="13" />-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
+<!-- <el-col :span="12">-->
+<!-- <el-form-item label="涓嶅惈绋庢�讳环" prop="unTaxIncludingPriceTotal">-->
+<!-- <el-input-->
+<!-- v-model="form.unTaxIncludingPriceTotal"-->
+<!-- placeholder="鑷姩鐢熸垚"-->
+<!-- type="number"-->
+<!-- disabled-->
+<!-- />-->
+<!-- </el-form-item>-->
+<!-- </el-col>-->
<!-- <el-col :span="12">
<el-form-item label="褰曞叆浜�" prop="createUser">
<el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ綍鍏ヤ汉" />
@@ -160,6 +175,16 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="鐗╄仈璁惧" prop="isIotDevice">
+ <el-switch v-model="form.isIotDevice" :active-value="1" :inactive-value="0" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="form.isIotDevice === 1">
+ <el-form-item label="澶栭儴缂栫爜" prop="externalCode">
+ <el-input v-model="form.externalCode" placeholder="璇疯緭鍏ュ閮ㄧ紪鐮�" />
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
</template>
@@ -168,19 +193,25 @@
import useFormData from "@/hooks/useFormData";
// import useUserStore from "@/store/modules/user";
import { getLedgerById } from "@/api/equipmentManagement/ledger";
+import { getDeviceAreaTree } from "@/api/equipmentManagement/deviceArea";
import dayjs from "dayjs";
import {
calculateTaxIncludeTotalPrice,
calculateTaxExclusiveTotalPrice,
} from "@/utils/summarizeTable";
import { ElMessage } from "element-plus";
-import {ref} from "vue";
+import { ref, onMounted } from "vue";
defineOptions({
name: "璁惧鍙拌处琛ㄥ崟",
});
const formRef = ref(null);
const operationType = ref('');
+const areaOptions = ref([]);
+const areaTreeProps = {
+ label: "areaName",
+ children: "children",
+};
// 璁惧绫诲瀷鍥哄畾閫夐」
const deviceTypeOptions = ref([
'鐢熶骇璁惧',
@@ -190,6 +221,7 @@
'鍏朵粬璁惧'
]);
const formRules = {
+ areaId: [{ required: true, trigger: "change", message: "璇烽�夋嫨鎵�灞炲尯鍩�" }],
deviceName: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
deviceModel: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
type: [{ required: true, trigger: "change", message: "璇烽�夋嫨鎴栬緭鍏ヨ澶囩被鍨�" }],
@@ -211,12 +243,25 @@
trigger: "blur"
}
],
+ externalCode: [
+ {
+ validator: (rule, value, callback) => {
+ if (form.isIotDevice === 1 && !value) {
+ callback(new Error('鐗╄仈璁惧涓烘槸鏃讹紝璇疯緭鍏ュ閮ㄧ紪鐮�'));
+ } else {
+ callback();
+ }
+ },
+ trigger: "blur"
+ }
+ ],
}
const { form, resetForm } = useFormData({
+ areaId: undefined, // 鍖哄煙ID
deviceName: undefined, // 璁惧鍚嶇О
deviceModel: undefined, // 瑙勬牸鍨嬪彿
- deviceBrand: undefined, // 璁惧鍝佺墝
+ // deviceBrand: undefined, // 璁惧鍝佺墝
type: undefined, // 璁惧绫诲瀷
supplierName: undefined, // 渚涘簲鍟�
storageLocation: undefined, // 瀛樻斁浣嶇疆
@@ -230,7 +275,9 @@
unTaxIncludingPriceTotal: undefined, // 涓嶅惈绋庢�讳环
// createUser: useUserStore().nickName, // 褰曞叆浜�
createTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), // 褰曞叆鏃ユ湡
- planRuntimeTime: dayjs().format("YYYY-MM-DD"), // 褰曞叆鏃ユ湡
+ planRuntimeTime: dayjs().format("YYYY-MM-DD"), // 棰勮杩愯鏃堕棿
+ isIotDevice: 0, // 鏄惁涓虹墿鑱旇澶� 0-鍚� 1-鏄�
+ externalCode: undefined, // 澶栭儴缂栫爜
});
const loadForm = async (id) => {
@@ -239,9 +286,10 @@
}
const { code, data } = await getLedgerById(id);
if (code == 200) {
+ form.areaId = data.areaId;
form.deviceName = data.deviceName;
form.deviceModel = data.deviceModel;
- form.deviceBrand = data.deviceBrand;
+ // form.deviceBrand = data.deviceBrand;
form.type = data.type;
form.supplierName = data.supplierName;
form.storageLocation = data.storageLocation;
@@ -254,7 +302,25 @@
form.taxRate = data.taxRate;
form.unTaxIncludingPriceTotal = data.unTaxIncludingPriceTotal;
form.createTime = data.createTime;
+ // 棰勮杩愯鏃堕棿锛氬悗绔繑鍥炲悗杞负 YYYY-MM-DD 浠ヤ究鏃ユ湡閫夋嫨鍣ㄦ纭睍绀�
+ if (data.planRuntimeTime) {
+ form.planRuntimeTime = dayjs(data.planRuntimeTime).format('YYYY-MM-DD');
+ } else {
+ form.planRuntimeTime = undefined;
+ }
+ // 鐗╄仈璁惧鍜屽閮ㄧ紪鐮�
+ form.isIotDevice = data.isIotDevice ?? 0;
+ form.externalCode = data.externalCode;
}
+};
+
+const setAreaId = (areaId) => {
+ form.areaId = areaId;
+};
+
+const loadAreaOptions = async () => {
+ const res = await getDeviceAreaTree();
+ areaOptions.value = Array.isArray(res?.data) ? res.data : Array.isArray(res) ? res : [];
};
const handleDeviceTypeChange = (value) => {
@@ -292,9 +358,14 @@
clearValidate();
};
+onMounted(() => {
+ loadAreaOptions();
+});
+
defineExpose({
form,
loadForm,
+ setAreaId,
resetForm,
clearValidate,
resetFormAndValidate,
--
Gitblit v1.9.3