From 6de6e76034d1fafd98fc64c8c94eb4cb306b2a70 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 06 五月 2026 14:10:35 +0800
Subject: [PATCH] 新疆马铃薯 1.设备台账添加是否为物联设备和外联编码字段、删除设备品牌字段
---
/dev/null | 7 ---
src/views/salesManagement/deliveryLedger/index.vue | 10 ++--
src/views/equipmentManagement/ledger/index.vue | 19 +++++++--
vite.config.js | 2
src/views/equipmentManagement/ledger/Form.vue | 37 ++++++++++++++++--
multiple/assets/logo/Logo.png | 0
6 files changed, 53 insertions(+), 22 deletions(-)
diff --git a/multiple/assets/logo/Logo.png b/multiple/assets/logo/Logo.png
index cc7c2e6..17e2f8d 100644
--- a/multiple/assets/logo/Logo.png
+++ b/multiple/assets/logo/Logo.png
Binary files differ
diff --git a/src/views/equipmentManagement/ledger/Form.vue b/src/views/equipmentManagement/ledger/Form.vue
index 327655e..67c772f 100644
--- a/src/views/equipmentManagement/ledger/Form.vue
+++ b/src/views/equipmentManagement/ledger/Form.vue
@@ -27,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
@@ -175,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>
@@ -233,13 +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, // 瀛樻斁浣嶇疆
@@ -253,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) => {
@@ -265,7 +289,7 @@
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;
@@ -284,6 +308,9 @@
} else {
form.planRuntimeTime = undefined;
}
+ // 鐗╄仈璁惧鍜屽閮ㄧ紪鐮�
+ form.isIotDevice = data.isIotDevice ?? 0;
+ form.externalCode = data.externalCode;
}
};
diff --git a/src/views/equipmentManagement/ledger/index.vue b/src/views/equipmentManagement/ledger/index.vue
index 8e3fae5..ebc0325 100644
--- a/src/views/equipmentManagement/ledger/index.vue
+++ b/src/views/equipmentManagement/ledger/index.vue
@@ -321,10 +321,10 @@
label: "瑙勬牸鍨嬪彿",
prop: "deviceModel",
},
- {
- label: "璁惧鍝佺墝",
- prop: "deviceBrand",
- },
+ // {
+ // label: "璁惧鍝佺墝",
+ // prop: "deviceBrand",
+ // },
{
label: "璁惧绫诲瀷",
prop: "type",
@@ -354,6 +354,17 @@
},
},
{
+ label: "鐗╄仈璁惧",
+ prop: "isIotDevice",
+ formatData: (v) => {
+ return v === 1 ? "鏄�" : "鍚�";
+ },
+ },
+ {
+ label: "澶栭儴缂栫爜",
+ prop: "externalCode",
+ },
+ {
dataType: "action",
label: "鎿嶄綔",
align: "center",
diff --git a/src/views/equipmentManagement/measurementEquipment/components/dialogForm.vue b/src/views/equipmentManagement/measurementEquipment/components/dialogForm.vue
deleted file mode 100644
index c6aa70e..0000000
--- a/src/views/equipmentManagement/measurementEquipment/components/dialogForm.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-
-</template>
-
-<script setup>
-
-</script>
\ No newline at end of file
diff --git a/src/views/salesManagement/deliveryLedger/index.vue b/src/views/salesManagement/deliveryLedger/index.vue
index 0eb60cc..97ac1d8 100644
--- a/src/views/salesManagement/deliveryLedger/index.vue
+++ b/src/views/salesManagement/deliveryLedger/index.vue
@@ -38,8 +38,8 @@
<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
<el-table-column label="鍙戣揣鏃堕棿" prop="shippingDate" show-overflow-tooltip />
<el-table-column label="鍙戣揣杞︾墝鍙�" prop="shippingCarNumber" show-overflow-tooltip />
- <el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip />
- <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip />
+ <!-- <el-table-column label="蹇�掑叕鍙�" prop="expressCompany" show-overflow-tooltip /> -->
+ <!-- <el-table-column label="蹇�掑崟鍙�" prop="expressNumber" show-overflow-tooltip /> -->
<el-table-column label="瀹℃牳鐘舵��" prop="status" align="center" width="120">
<template #default="scope">
<el-tag :type="getApprovalStatusType(scope.row.status)">
@@ -186,8 +186,8 @@
<el-descriptions-item label="鍙戣揣鏃ユ湡">{{ detailRow.shippingDate || '--' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳鐘舵��">{{ getApprovalStatusText(detailRow.status) }}</el-descriptions-item>
<el-descriptions-item label="鍙戣揣杞︾墝鍙�">{{ detailRow.shippingCarNumber || '--' }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item>
- <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailRow.expressNumber || '--' }}</el-descriptions-item>
+ <!-- <el-descriptions-item label="蹇�掑叕鍙�">{{ detailRow.expressCompany || '--' }}</el-descriptions-item> -->
+ <!-- <el-descriptions-item label="蹇�掑崟鍙�" :span="2">{{ detailRow.expressNumber || '--' }}</el-descriptions-item> -->
</el-descriptions>
<div class="detail-images" v-if="detailImages.length">
@@ -368,7 +368,7 @@
id: row.id ?? null,
salesContractNo: row.salesContractNo ?? "",
customerName: row.customerName ?? "",
- type: row.type || "璐ц溅",
+ type: "璐ц溅",
shippingDate: row.shippingDate || getCurrentDate(),
shippingCarNumber: row.shippingCarNumber ?? "",
expressCompany: row.expressCompany ?? "",
diff --git a/vite.config.js b/vite.config.js
index dc687a8..999bd01 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,7 +8,7 @@
const { VITE_APP_ENV } = env;
const baseUrl =
env.VITE_APP_ENV === "development"
- ? "http://1.15.17.182:9003"
+ ? "http://192.168.0.226:7003"
: env.VITE_BASE_API;
const javaUrl =
env.VITE_APP_ENV === "development"
--
Gitblit v1.9.3