From 34fd98222109dca47e8805d41895c3c37261258c Mon Sep 17 00:00:00 2001
From: pengwei <2071057782@qq.com>
Date: 星期五, 21 三月 2025 10:07:26 +0800
Subject: [PATCH] 优化新增工艺
---
项目代码/client/src/views/tts/CraftCenter/Craftcenter.vue | 227 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 128 insertions(+), 99 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/CraftCenter/Craftcenter.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/CraftCenter/Craftcenter.vue"
index ad852c4..b0201d8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/CraftCenter/Craftcenter.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/client/src/views/tts/CraftCenter/Craftcenter.vue"
@@ -34,10 +34,12 @@
<span>姝や负浠诲姟浣滅敤涓數姘旂殑鐨勮鎯呮楠ゅ伐鑹恒��</span>
<div style="display: flex; margin-top: 0.81rem">
<span style="margin-right: 1.25rem"
- >姝ラ锛歿{ electric ? electric.maxNodal : "0" }}</span
+ >姝ラ锛歿{ electric ? electric[0].maxNodal : "0" }}</span
>
<span
- >濂楃瓛鏁伴噺锛歿{ electric ? electric.sumTorqueSum : "0" }}</span
+ >濂楃瓛鏁伴噺锛歿{
+ electric ? electric[0].sumTorqueSum : "0"
+ }}</span
>
</div>
</div>
@@ -102,11 +104,11 @@
<span>姝や负浠诲姟浣滅敤涓満姊扮殑鐨勮鎯呮楠ゅ伐鑹恒��</span>
<div style="display: flex; margin-top: 0.81rem">
<span style="margin-right: 1.25rem"
- >姝ラ锛歿{ mechanical ? mechanical.maxNodal : "0" }}</span
+ >姝ラ锛歿{ mechanical ? mechanical[0].maxNodal : "0" }}</span
>
<span
>濂楃瓛鏁伴噺锛歿{
- mechanical ? mechanical.sumTorqueSum : "0"
+ mechanical ? mechanical[0].sumTorqueSum : "0"
}}</span
>
</div>
@@ -172,9 +174,11 @@
<span>姝や负浠诲姟浣滅敤涓湴娌熺殑鐨勮鎯呮楠ゅ伐鑹恒��</span>
<div style="display: flex; margin-top: 0.81rem">
<span style="margin-right: 1.25rem"
- >姝ラ锛歿{ trench ? trench.maxNodal : "0" }}</span
+ >姝ラ锛歿{ trench ? trench[0].maxNodal : "0" }}</span
>
- <span>濂楃瓛鏁伴噺锛歿{ trench ? trench.sumTorqueSum : "0" }}</span>
+ <span
+ >濂楃瓛鏁伴噺锛歿{ trench ? trench[0].sumTorqueSum : "0" }}</span
+ >
</div>
</div>
</div>
@@ -332,7 +336,7 @@
min-width="5%"
/>
<el-table-column prop="tools" label="宸ュ叿" min-width="2%" />
- <el-table-column prop="date" label="鐗╂枡" min-width="1%" />
+ <el-table-column prop="material" label="鐗╂枡" min-width="1%" />
<!-- <el-table-column prop="date" label="鍥剧墖瑙嗛" min-width="2%" /> -->
<el-table-column prop="" label="鏄惁娑夊強" min-width="2%" />
<el-table-column prop="setpNum" label="鎺掑簭" min-width="1%" />
@@ -387,7 +391,45 @@
ref="ruleFormRef"
>
<el-row :gutter="10">
- <el-col :span="16"
+ <el-col :span="8"
+ ><el-form-item prop="nodal">
+ <template #label>
+ <span style="font-size: 0.88rem; color: black">搴忓彿</span>
+ </template>
+ <el-input
+ size="small"
+ v-model.number="form.nodal"
+ placeholder="璇疯緭鍏�"
+ style="height: 2rem"
+ /> </el-form-item
+ ></el-col>
+
+ <el-col :span="8"
+ ><el-form-item prop="setpNum">
+ <template #label>
+ <span style="font-size: 0.88rem; color: black">鎺掑簭</span>
+ </template>
+ <el-input
+ size="small"
+ v-model.number="form.setpNum"
+ placeholder="璇疯緭鍏�"
+ style="height: 2rem"
+ /> </el-form-item
+ ></el-col>
+ <el-col :span="8"
+ ><el-form-item prop="DeviceCode">
+ <template #label>
+ <span style="font-size: 0.88rem; color: black">鐗╂枡</span>
+ </template>
+ <el-input
+ v-model="form.material"
+ style="height: 2rem"
+ placeholder="璇疯緭鍏�"
+ /> </el-form-item
+ ></el-col>
+ </el-row>
+ <el-row :gutter="10">
+ <el-col
><el-form-item prop="craftsStep">
<template #label>
<span style="font-size: 0.88rem; color: black"
@@ -401,32 +443,10 @@
style="height: 2rem"
/> </el-form-item
></el-col>
- <el-col :span="8"
- ><el-form-item prop="DeviceCode">
- <template #label>
- <span style="font-size: 0.88rem; color: black">鐗╂枡</span>
- </template>
- <el-select
- v-model="WLvalue"
- placeholder="璇烽�夋嫨"
- multiple
- filterable
- :remote-method="remoteMethod"
- :loading="loading"
- size="small"
- style="width: 240px"
- >
- <el-option
- v-for="item in WLoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select> </el-form-item
- ></el-col>
</el-row>
+
<el-row :gutter="10">
- <el-col :span="8"
+ <!-- <el-col :span="8"
><el-form-item prop="isinvolved">
<template #label>
<span style="font-size: 0.88rem; color: black">鏄惁娑夊強</span>
@@ -444,20 +464,8 @@
:value="item.value"
/>
</el-select> </el-form-item
- ></el-col>
- <el-col :span="8"
- ><el-form-item prop="setnum">
- <template #label>
- <span style="font-size: 0.88rem; color: black">鎺掑簭</span>
- </template>
- <el-input
- size="small"
- v-model.number="form.setnum"
- placeholder="璇疯緭鍏�"
- style="height: 2rem"
- /> </el-form-item
- ></el-col>
- <el-col :span="8"
+ ></el-col> -->
+ <el-col :span="16"
><el-form-item prop="tools">
<template #label>
<div style="display: flex; align-items: center">
@@ -472,7 +480,6 @@
:remote-method="GJremoteMethod"
:loading="GJloading"
size="small"
- style="width: 240px"
value-key="id"
>
<el-option
@@ -481,20 +488,6 @@
:label="item.toolName"
:value="item"
/> </el-select></el-form-item
- ></el-col>
- </el-row>
- <el-row :gutter="10">
- <el-col :span="8"
- ><el-form-item prop="nodal">
- <template #label>
- <span style="font-size: 0.88rem; color: black">搴忓彿</span>
- </template>
- <el-input
- size="small"
- v-model.number="form.nodal"
- placeholder="璇疯緭鍏�"
- style="height: 2rem"
- /> </el-form-item
></el-col>
</el-row>
<!-- <el-row>
@@ -563,7 +556,12 @@
<template #label>
<span style="font-size: 0.88rem; color: black">鍐呭鎻忚堪</span>
</template>
- <el-input v-model="form.craftContent" placeholder="璇疯緭鍏�" />
+ <el-input
+ type="textarea"
+ :rows="3"
+ v-model="form.craftContent"
+ placeholder="璇疯緭鍏�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -618,7 +616,7 @@
<el-checkbox-group
:indeterminate="isIndeterminate"
@change="checkChange"
- v-model="checkList"
+ v-model="checkboxId"
style="display: flex; flex-direction: column"
>
<el-checkbox
@@ -626,10 +624,7 @@
v-for="item in sleeveData"
:key="item.id"
:label="item.articleName"
- :value="{
- ...item,
- num: 1,
- }"
+ :value="item.id"
/>
</el-checkbox-group>
</el-scrollbar>
@@ -760,7 +755,7 @@
const selectoptions = ref([
{
value: "setpNum",
- label: "搴忓彿",
+ label: "鎺掑簭",
},
{
value: "tools",
@@ -783,28 +778,30 @@
{ required: true, message: "璇疯緭鍏ュ伐鑹哄唴瀹�", trigger: "blur" },
],
nodal: [{ required: true, message: "璇疯緭鍏ュ簭鍙�", trigger: "blur" }],
- setnum: [{ required: true, message: "璇疯緭鍏ユ帓搴忓彿", trigger: "blur" }],
+ setpNum: [{ required: true, message: "璇疯緭鍏ユ帓搴忓彿", trigger: "blur" }],
});
// isinvolved: "", //鏄惁娑夊強
//鏂板宸ヨ壓/缂栬緫宸ヨ壓琛ㄥ崟鏁版嵁
const form = ref({
+ id: 0,
craftstype: "", //宸ヨ壓绫诲瀷锛堢粍锛�
nodal: null, //鑺傜偣
craftsStep: "", //宸ヨ壓姝ラ
craftContent: "", //宸ヨ壓鍐呭
sleeveNum: "", //濂楃瓛鏁伴噺
tools: "", //宸ュ叿
- setnum: null,
+ setpNum: null,
torqueOne: 0,
torqueOneQuantity: 0,
- articleOne: "",
- articleOneid: "",
- articleTowid: "",
- articleTwo: "",
+ articleone: "",
+ aritcleoneid: "",
+ aritcletowid: "",
+ articletwo: "",
torqueSum: 0,
torqueTwo: 0,
torqueTwoQuantity: 0,
+ material: "",
creater: localStorage.getItem("user")
? JSON.parse(localStorage.getItem("user")).userName
: "",
@@ -863,6 +860,8 @@
//缂栬緫宸ヨ壓
const Editcraft = (row) => {
+ console.log(row);
+
let data = Object.assign({}, row);
type.value = "缂栬緫";
detailsDialogVisible.value = false;
@@ -930,11 +929,26 @@
// });
// return;
// }
- string = tools.value
- .map((item) => {
- return item.toolName;
- })
- .join(",");
+ if (tools.value.length > 0) {
+ if (type.value == "缂栬緫") {
+ string = tools.value
+ ? tools.value
+ .map((item) => {
+ return item;
+ })
+ .join(",")
+ : "";
+ return;
+ }
+ string = tools.value
+ ? tools.value
+ .map((item) => {
+ return item.toolName;
+ })
+ .join(",")
+ : "";
+ }
+
// if (checkList.value.length == 0) {
// ElMessage({
// message: "璇烽�夋嫨濂楃瓛",
@@ -950,10 +964,14 @@
return;
}
- form.value.articleOneid = checkList.value[0].id;
- form.value.articleOne = checkList.value[0].num;
- form.value.articleTowid = checkList.value[1].id;
- form.value.articleTwo = checkList.value[1].num;
+ form.value.aritcleoneid =
+ checkList.value.length != 0 ? checkList.value[0].id : "";
+ form.value.articleone =
+ checkList.value.length != 0 ? checkList.value[0].num : "";
+ form.value.aritcletowid =
+ checkList.value.length != 0 ? checkList.value[1].id : "";
+ form.value.articletwo =
+ checkList.value.length != 0 ? checkList.value[1].num : "";
form.value.creater = userName.value;
form.value.tools = string;
form.value.craftstype = title.value;
@@ -1069,7 +1087,7 @@
{},
{
craftstype: "", //宸ヨ壓绫诲瀷锛堢粍锛�
- nodal: 0, //鑺傜偣
+ nodal: "", //鑺傜偣
craftsStep: "", //宸ヨ壓姝ラ
craftContent: "", //宸ヨ壓鍐呭
sleeveNum: "", //濂楃瓛鏁伴噺
@@ -1078,10 +1096,10 @@
setpNum: "",
torqueOne: 0,
torqueOneQuantity: 0,
- articleOne: "",
- articleOneid: "",
- articleTowid: "",
- articleTwo: "",
+ articleone: "",
+ articleoneid: "",
+ articletowid: "",
+ articletwo: "",
torqueSum: 0,
torqueTwo: 0,
torqueTwoQuantity: 0,
@@ -1089,6 +1107,7 @@
createDate: formatTime(new Date()),
}
);
+ tools.value = [];
};
//瀵煎嚭鏂规硶
const printExcel = () => {
@@ -1123,17 +1142,24 @@
const clear = () => {
checkList.value = [];
};
+const checkboxId = ref([]); //澶嶉�夋閫変腑浜嬩欢
const checkChange = (e) => {
- console.log(e, checkList.value);
+ checkList.value = [];
+ sleeveData.value.forEach((item, index) => {
+ if (checkboxId.value.includes(item.id)) {
+ checkList.value.push({
+ ...item,
+ num: 1,
+ });
+ }
+ });
};
const handleChange = () => {
console.log(checkList.value);
};
const handleCheckAllChange = (val) => {
- console.log(val);
checkList.value = val ? sleeveData.value : [];
isIndeterminate.value = false;
- console.log(checkList.value);
};
// 鍒犻櫎宸ヨ壓
const delProcess = (val) => {
@@ -1149,14 +1175,17 @@
};
onMounted(() => {
- GetSleeveandStep("鐢垫皵").then((res) => {
- electric.value = res.data[0];
- });
- GetSleeveandStep("鏈烘").then((res) => {
- mechanical.value = res.data[0];
- });
- GetSleeveandStep("鍦版矡").then((res) => {
- trench.value = res.data[0];
+ GetSleeveandStep().then((res) => {
+ electric.value = res.data.filter((item) => {
+ return item.craftType == "鐢垫皵";
+ });
+ mechanical.value = res.data.filter((item) => {
+ return item.craftType == "鏈烘";
+ });
+ trench.value = res.data.filter((item) => {
+ return item.craftType == "鍦版矡";
+ });
+ console.log(electric.value);
});
user.value = JSON.parse(localStorage.getItem("user")).userName;
});
--
Gitblit v1.9.3