From 8a4e96f11329efda507799260b6b95ae9860df5f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 21 一月 2026 10:09:30 +0800
Subject: [PATCH] 浪潮对接单点登录:质量检测管理系统
---
src/views/qualityManagement/processInspection/components/formDia.vue | 25 +++---
src/main.js | 2
src/views/qualityManagement/finalInspection/components/formDia.vue | 15 ++-
src/views/qualityManagement/rawMaterialInspection/components/formDia.vue | 29 +++---
src/api/procurementManagement/procurementLedger.js | 27 ------
src/views/qualityManagement/rawMaterialInspection/index.vue | 42 +++++-----
src/views/qualityManagement/finalInspection/index.vue | 46 +++++-----
vite.config.js | 4
src/views/qualityManagement/processInspection/index.vue | 46 +++++-----
9 files changed, 106 insertions(+), 130 deletions(-)
diff --git a/src/api/procurementManagement/procurementLedger.js b/src/api/procurementManagement/procurementLedger.js
index 06a0c7e..5b6327d 100644
--- a/src/api/procurementManagement/procurementLedger.js
+++ b/src/api/procurementManagement/procurementLedger.js
@@ -99,30 +99,3 @@
params: query,
});
}
-export function updateApprovalStatus(query) {
- return request({
- url: "/purchase/ledger/updateApprovalStatus",
- method: "post",
- data: query,
- });
-}
-
-// 淇濆瓨閲囪喘妯℃澘
-// /purchase/ledger/addPurchaseTemplate
-export function addPurchaseTemplate(data) {
- return request({
- url: "/purchase/ledger/addPurchaseTemplate",
- method: "post",
- data: data,
- });
-}
-
-// 鏌ヨ閲囪喘妯℃澘
-// /purchase/ledger/getPurchaseTemplateList
-export function getPurchaseTemplateList(query) {
- return request({
- url: "/purchase/ledger/getPurchaseTemplateList",
- method: "get",
- params: query,
- });
-}
diff --git a/src/main.js b/src/main.js
index 0b3f714..cede5b7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -78,7 +78,7 @@
app.config.globalProperties.addDateRange = addDateRange;
app.config.globalProperties.selectDictLabel = selectDictLabel;
app.config.globalProperties.selectDictLabels = selectDictLabels;
-app.config.globalProperties.javaApi = __BASE_API__;
+app.config.globalProperties.javaApi = "http://127.0.0.1:8034";
app.config.globalProperties.HaveJson = (val) => {
return JSON.parse(JSON.stringify(val));
};
diff --git a/src/views/qualityManagement/finalInspection/components/formDia.vue b/src/views/qualityManagement/finalInspection/components/formDia.vue
index 5bd847f..db4d289 100644
--- a/src/views/qualityManagement/finalInspection/components/formDia.vue
+++ b/src/views/qualityManagement/finalInspection/components/formDia.vue
@@ -76,10 +76,11 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
- :value="item.nickName"/>
- </el-select>
+ <el-input v-model="form.checkName" placeholder="璇疯緭鍏�" clearable/>
+<!-- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>-->
+<!-- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"-->
+<!-- :value="item.nickName"/>-->
+<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -225,7 +226,7 @@
// 濡傛灉缂栬緫鏁版嵁涓湁 testStandardId锛屽垯璁剧疆骞跺姞杞藉搴旂殑鍙傛暟
if (savedTestStandardId) {
// 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
- const matchedOption = testStandardOptions.value.find(item =>
+ const matchedOption = testStandardOptions.value.find(item =>
item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
);
if (matchedOption) {
@@ -287,7 +288,7 @@
if (children && children.length > 0) {
newItem.children = convertIdToValue(children);
}
-
+
return newItem;
});
}
@@ -373,4 +374,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/qualityManagement/finalInspection/index.vue b/src/views/qualityManagement/finalInspection/index.vue
index 17e74b1..2e95624 100644
--- a/src/views/qualityManagement/finalInspection/index.vue
+++ b/src/views/qualityManagement/finalInspection/index.vue
@@ -134,17 +134,17 @@
}
},
},
- {
- label: "鎻愪氦鐘舵��",
- prop: "inspectState",
- formatData: (params) => {
- if (params) {
- return "宸叉彁浜�";
- } else {
- return "鏈彁浜�";
- }
- },
- },
+ // {
+ // label: "鎻愪氦鐘舵��",
+ // prop: "inspectState",
+ // formatData: (params) => {
+ // if (params) {
+ // return "宸叉彁浜�";
+ // } else {
+ // return "鏈彁浜�";
+ // }
+ // },
+ // },
{
dataType: "action",
label: "鎿嶄綔",
@@ -169,16 +169,16 @@
openFilesFormDia(row);
},
},
- {
- name: "鎻愪氦",
- type: "text",
- clickFun: (row) => {
- submit(row.id);
- },
- disabled: (row) => {
- return row.inspectState == 1;
- }
- },
+ // {
+ // name: "鎻愪氦",
+ // type: "text",
+ // clickFun: (row) => {
+ // submit(row.id);
+ // },
+ // disabled: (row) => {
+ // return row.inspectState == 1;
+ // }
+ // },
{
name: "鍒嗛厤妫�楠屽憳",
type: "text",
@@ -359,13 +359,13 @@
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
})
const downloadUrl = window.URL.createObjectURL(blob)
-
+
const link = document.createElement('a')
link.href = downloadUrl
link.download = '鍘熸潗鏂欐楠屾姤鍛�.docx'
document.body.appendChild(link)
link.click()
-
+
document.body.removeChild(link)
window.URL.revokeObjectURL(downloadUrl)
})
diff --git a/src/views/qualityManagement/processInspection/components/formDia.vue b/src/views/qualityManagement/processInspection/components/formDia.vue
index 4821db2..1a05921 100644
--- a/src/views/qualityManagement/processInspection/components/formDia.vue
+++ b/src/views/qualityManagement/processInspection/components/formDia.vue
@@ -10,10 +10,10 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="宸ュ簭锛�" prop="processId">
- <el-select
- v-model="form.processId"
- placeholder="璇烽�夋嫨宸ュ簭"
- clearable
+ <el-select
+ v-model="form.processId"
+ placeholder="璇烽�夋嫨宸ュ簭"
+ clearable
@change="handleProcessChange"
style="width: 100%"
>
@@ -96,10 +96,11 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="妫�楠屽憳锛�" prop="checkName">
- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>
- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
- :value="item.nickName"/>
- </el-select>
+ <el-input v-model="form.checkName" placeholder="璇疯緭鍏�" clearable/>
+<!-- <el-select v-model="form.checkName" placeholder="璇烽�夋嫨" clearable>-->
+<!-- <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"-->
+<!-- :value="item.nickName"/>-->
+<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -274,7 +275,7 @@
// 濡傛灉缂栬緫鏁版嵁涓湁 testStandardId锛屽垯璁剧疆骞跺姞杞藉搴旂殑鍙傛暟
if (savedTestStandardId) {
// 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
- const matchedOption = testStandardOptions.value.find(item =>
+ const matchedOption = testStandardOptions.value.find(item =>
item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
);
if (matchedOption) {
@@ -335,7 +336,7 @@
if (children && children.length > 0) {
newItem.children = convertIdToValue(children);
}
-
+
return newItem;
});
}
@@ -360,7 +361,7 @@
})
}
const data = {
- ...form.value,
+ ...form.value,
process: processName, // 淇濈暀 process 瀛楁浠ュ吋瀹瑰悗绔�
qualityInspectParams: tableData.value
}
@@ -438,4 +439,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/qualityManagement/processInspection/index.vue b/src/views/qualityManagement/processInspection/index.vue
index cebda55..229ca73 100644
--- a/src/views/qualityManagement/processInspection/index.vue
+++ b/src/views/qualityManagement/processInspection/index.vue
@@ -139,17 +139,17 @@
}
},
},
- {
- label: "鎻愪氦鐘舵��",
- prop: "inspectState",
- formatData: (params) => {
- if (params) {
- return "宸叉彁浜�";
- } else {
- return "鏈彁浜�";
- }
- },
- },
+ // {
+ // label: "鎻愪氦鐘舵��",
+ // prop: "inspectState",
+ // formatData: (params) => {
+ // if (params) {
+ // return "宸叉彁浜�";
+ // } else {
+ // return "鏈彁浜�";
+ // }
+ // },
+ // },
{
dataType: "action",
label: "鎿嶄綔",
@@ -174,16 +174,16 @@
openFilesFormDia(row);
},
},
- {
- name: "鎻愪氦",
- type: "text",
- clickFun: (row) => {
- submit(row.id);
- },
- disabled: (row) => {
- return row.inspectState == 1;
- }
- },
+ // {
+ // name: "鎻愪氦",
+ // type: "text",
+ // clickFun: (row) => {
+ // submit(row.id);
+ // },
+ // disabled: (row) => {
+ // return row.inspectState == 1;
+ // }
+ // },
{
name: "鍒嗛厤妫�楠屽憳",
type: "text",
@@ -344,13 +344,13 @@
type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
})
const downloadUrl = window.URL.createObjectURL(blob)
-
+
const link = document.createElement('a')
link.href = downloadUrl
link.download = '杩囩▼妫�楠屾姤鍛�.docx'
document.body.appendChild(link)
link.click()
-
+
document.body.removeChild(link)
window.URL.revokeObjectURL(downloadUrl)
})
diff --git a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
index 5cafd2c..674ea08 100644
--- a/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/components/formDia.vue
@@ -10,18 +10,19 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="渚涘簲鍟嗭細" prop="supplier">
- <el-select
- v-model="form.supplier"
- placeholder="璇烽�夋嫨"
- clearable
- >
- <el-option
- v-for="item in supplierList"
- :key="item.id"
- :label="item.supplierName"
- :value="item.supplierName"
- />
- </el-select>
+ <el-input v-model="form.supplier" placeholder="璇烽�夋嫨" clearable></el-input>
+<!-- <el-select-->
+<!-- v-model="form.supplier"-->
+<!-- placeholder="璇烽�夋嫨"-->
+<!-- clearable-->
+<!-- >-->
+<!-- <el-option-->
+<!-- v-for="item in supplierList"-->
+<!-- :key="item.id"-->
+<!-- :label="item.supplierName"-->
+<!-- :value="item.supplierName"-->
+<!-- />-->
+<!-- </el-select>-->
</el-form-item>
</el-col>
<el-col :span="12">
@@ -243,7 +244,7 @@
// 濡傛灉缂栬緫鏁版嵁涓湁 testStandardId锛屽垯璁剧疆骞跺姞杞藉搴旂殑鍙傛暟
if (savedTestStandardId) {
// 纭繚绫诲瀷鍖归厤锛坕tem.id 鍙兘鏄暟瀛楁垨瀛楃涓诧級
- const matchedOption = testStandardOptions.value.find(item =>
+ const matchedOption = testStandardOptions.value.find(item =>
item.id == savedTestStandardId || String(item.id) === String(savedTestStandardId)
);
if (matchedOption) {
@@ -394,4 +395,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index c9ea3db..6bf0500 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -141,17 +141,17 @@
}
},
},
- {
- label: "鎻愪氦鐘舵��",
- prop: "inspectState",
- formatData: (params) => {
- if (params) {
- return "宸叉彁浜�";
- } else {
- return "鏈彁浜�";
- }
- },
- },
+ // {
+ // label: "鎻愪氦鐘舵��",
+ // prop: "inspectState",
+ // formatData: (params) => {
+ // if (params) {
+ // return "宸叉彁浜�";
+ // } else {
+ // return "鏈彁浜�";
+ // }
+ // },
+ // },
{
dataType: "action",
label: "鎿嶄綔",
@@ -176,16 +176,16 @@
openFilesFormDia(row);
},
},
- {
- name: "鎻愪氦",
- type: "text",
- clickFun: (row) => {
- submit(row.id);
- },
- disabled: (row) => {
- return row.inspectState == 1;
- }
- },
+ // {
+ // name: "鎻愪氦",
+ // type: "text",
+ // clickFun: (row) => {
+ // submit(row.id);
+ // },
+ // disabled: (row) => {
+ // return row.inspectState == 1;
+ // }
+ // },
{
name: "鍒嗛厤妫�楠屽憳",
type: "text",
diff --git a/vite.config.js b/vite.config.js
index 37bb1df..035c8fb 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,8 +8,8 @@
const { VITE_APP_ENV } = env;
const baseUrl =
VITE_APP_ENV == "development"
- ? "http://114.132.189.42:8089" // 寮�鍙戠幆澧冨悗绔帴鍙�
- : "http://114.132.189.42:7003"; // 鐢熶骇鐜鍚庣鎺ュ彛
+ ? "http://127.0.0.1:8034" // 寮�鍙戠幆澧冨悗绔帴鍙�
+ : "http://127.0.0.1:8034"; // 鐢熶骇鐜鍚庣鎺ュ彛
return {
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
--
Gitblit v1.9.3