From 49944c684bf75e1a90e85caf2c5d8523981916d6 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 01 四月 2025 11:22:17 +0800
Subject: [PATCH] 修改原辅料改成原辅材
---
src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue | 6
src/api/business/reliabilityPlan.js | 56 ++++----
src/views/business/inspectionReview/index.vue | 8
src/views/business/rawMaterialInspection/index.vue | 14 +-
src/api/business/finishedProductSampling.js | 2
src/api/business/rawMaterialOrder.js | 30 ++--
src/router/index.js | 6
src/views/standard/standardLibrary/audit.vue | 34 +++++
src/views/business/materialOrder/index.vue | 14 +-
src/api/business/materialInspection.js | 16 +-
src/views/business/materialOrder/customsInspection.vue | 8
src/views/business/reliabilityPlan/index.vue | 118 ++++++++++---------
src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue | 4
src/api/statisticalCharts/dataAnalysis.js | 10
src/views/structural/capabilityAndLaboratory/capability/index.vue | 6
15 files changed, 186 insertions(+), 146 deletions(-)
diff --git a/src/api/business/finishedProductSampling.js b/src/api/business/finishedProductSampling.js
index 47af65c..b5746e2 100644
--- a/src/api/business/finishedProductSampling.js
+++ b/src/api/business/finishedProductSampling.js
@@ -1,7 +1,7 @@
// 鎴愬搧鎶芥牱璇︽儏椤甸潰鐩稿叧鎺ュ彛
import request from "@/utils/request";
-// 鍘熻緟鏂欐牴鎹甶d鎶ユ
+// 鍘熻緟鏉愭牴鎹甶d鎶ユ
export function getIfsStock(query) {
return request({
url: "/finishProductSpotCheck/getIfsStock",
diff --git a/src/api/business/materialInspection.js b/src/api/business/materialInspection.js
index caebfce..625967c 100644
--- a/src/api/business/materialInspection.js
+++ b/src/api/business/materialInspection.js
@@ -1,4 +1,4 @@
-// 鍘熻緟鏂欐姤妫�椤甸潰鐩稿叧鎺ュ彛
+// 鍘熻緟鏉愭姤妫�椤甸潰鐩稿叧鎺ュ彛
import request from "@/utils/request";
// 鏌ヨIFS璁㈠崟-寰呮姤妫�
@@ -16,7 +16,7 @@
params: query,
});
}
-// 鏌ヨ鍘熻緟鏂欐姤妫�-宸插畬鎴�
+// 鏌ヨ鍘熻緟鏉愭姤妫�-宸插畬鎴�
export function getIfsByFinish(query) {
return request({
url: "/rawMaterialOrder/getIfsByFinish",
@@ -24,7 +24,7 @@
params: query,
});
}
-// 鏌ヨ鍘熻緟鏂欐姤妫�淇℃伅-鍏ㄩ儴
+// 鏌ヨ鍘熻緟鏉愭姤妫�淇℃伅-鍏ㄩ儴
export function getIfsByAll(query) {
return request({
url: "/rawMaterialOrder/getIfsByAll",
@@ -32,7 +32,7 @@
params: query,
});
}
-// 鍘熻緟鏂欐牴鎹甶d鍙栨秷鎶ユ
+// 鍘熻緟鏉愭牴鎹甶d鍙栨秷鎶ユ
export function revokeInspectionReport(query) {
return request({
url: "/rawMaterialOrder/revokeInspectionReport",
@@ -64,7 +64,7 @@
data: query,
});
}
-// 鍘熻緟鏂欐牴鎹墜鍔ㄦ姤妫�
+// 鍘熻緟鏉愭牴鎹墜鍔ㄦ姤妫�
export function addIfsInventoryQuantity(query) {
return request({
url: "/rawMaterialOrder/addIfsInventoryQuantity",
@@ -72,7 +72,7 @@
data: query,
});
}
-// 鍘熻緟鏂欐牴鎹甶d鎶ユ
+// 鍘熻緟鏉愭牴鎹甶d鎶ユ
export function inspectionReportOne(query) {
return request({
url: "/rawMaterialOrder/inspectionReportOne",
@@ -80,7 +80,7 @@
data: query,
});
}
-// 鍘熻緟鏂欐姤妫�鍒犻櫎
+// 鍘熻緟鏉愭姤妫�鍒犻櫎
export function delIfsInventory(query) {
return request({
url: "/rawMaterialOrder/delIfsInventory",
@@ -88,7 +88,7 @@
params: query,
});
}
-// 鍘熻緟鏂欐姤妫�鍏ㄩ儴瀵煎嚭
+// 鍘熻緟鏉愭姤妫�鍏ㄩ儴瀵煎嚭
export function rawAllExport(query) {
return request({
url: "/rawMaterialOrder/rawAllExport",
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index 4ae55df..76ee2b2 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -1,7 +1,7 @@
-// 鍘熻緟鏂欎笅鍗曢〉闈㈢浉鍏虫帴鍙�
+// 鍘熻緟鏉愪笅鍗曢〉闈㈢浉鍏虫帴鍙�
import request from "@/utils/request";
-// 鏌ヨ鍘熻緟鏂欎笅鍗�-寰呬笅鍗�
+// 鏌ヨ鍘熻緟鏉愪笅鍗�-寰呬笅鍗�
export function getPurchaseOrder(query) {
return request({
url: "/rawMaterialOrder/getPurchaseOrder",
@@ -17,7 +17,7 @@
params: query,
});
}
-// 鏌ヨ鍘熻緟鏂欎笅鍗�-宸叉楠�
+// 鏌ヨ鍘熻緟鏉愪笅鍗�-宸叉楠�
export function getIfsByOver(query) {
return request({
url: "/rawMaterialOrder/getIfsByOver",
@@ -25,7 +25,7 @@
params: query,
});
}
-// 鏌ヨ鍘熻緟鏂欎笅鍗�-鍏ㄩ儴
+// 鏌ヨ鍘熻緟鏉愪笅鍗�-鍏ㄩ儴
export function getIfsByAll(query) {
return request({
url: "/rawMaterialOrder/getIfsByAll",
@@ -63,7 +63,7 @@
params: query,
});
}
-// 鍘熻緟鏂欎笅鍗曠洿鎺ュ厤妫�鍏嶆鎺ュ彛
+// 鍘熻緟鏉愪笅鍗曠洿鎺ュ厤妫�鍏嶆鎺ュ彛
export function notificationRawOrder(query) {
return request({
url: "/rawMaterialOrder/notificationRawOrder",
@@ -79,7 +79,7 @@
params: query,
});
}
-// 鍒犻櫎鍘熻緟鏂欐ā鏉�
+// 鍒犻櫎鍘熻緟鏉愭ā鏉�
export function delRawMaterOrderTemplate(query) {
return request({
url: "/rawMaterialOrder/delRawMaterOrderTemplate",
@@ -95,7 +95,7 @@
params: query,
});
}
-// 鍘熻緟鏂欐ā鏉垮垪琛ㄦ煡璇�
+// 鍘熻緟鏉愭ā鏉垮垪琛ㄦ煡璇�
export function selectRawMaterOrderTemplate(query) {
return request({
url: "/rawMaterialOrder/selectRawMaterOrderTemplate",
@@ -103,7 +103,7 @@
params: query,
});
}
-// 鍘熻緟鏂欐柊澧炴ā鏉�
+// 鍘熻緟鏉愭柊澧炴ā鏉�
export function addRawMaterOrderTemplate(query) {
return request({
url: "/rawMaterialOrder/addRawMaterOrderTemplate",
@@ -182,7 +182,7 @@
data: query,
});
}
-// 鍘熻緟鏂欎笅鍗曞搴︽挙閿�
+// 鍘熻緟鏉愪笅鍗曞搴︽挙閿�
export function repealQuarterRawOrder(query) {
return request({
url: "/rawMaterialOrder/repealQuarterRawOrder",
@@ -190,7 +190,7 @@
data: query,
});
}
-// 鍘熻緟鏂欎笅鍗曠洿鎺ュ厤妫�鍏嶆鎺ュ彛
+// 鍘熻緟鏉愪笅鍗曠洿鎺ュ厤妫�鍏嶆鎺ュ彛
export function rawOrderRelease(query) {
return request({
url: "/rawMaterialOrder/rawOrderRelease",
@@ -198,7 +198,7 @@
data: query,
});
}
-// 鍘熻緟鏂欐牴鎹甶d鍙栨秷鎶ユ
+// 鍘熻緟鏉愭牴鎹甶d鍙栨秷鎶ユ
export function revokeInspectionReport(query) {
return request({
url: "/rawMaterialOrder/revokeInspectionReport",
@@ -206,7 +206,7 @@
data: query,
});
}
-// 鍘熻緟鏂欎笅鍗曞嚭鍘傛挙閿�
+// 鍘熻緟鏉愪笅鍗曞嚭鍘傛挙閿�
export function repealEnterRawOrder(query) {
return request({
url: "/rawMaterialOrder/repealEnterRawOrder",
@@ -214,7 +214,7 @@
data: query,
});
}
-// 鍘熻緟鏂欐姤妫�鍏ㄩ儴瀵煎嚭
+// 鍘熻緟鏉愭姤妫�鍏ㄩ儴瀵煎嚭
export function rawAllExport(query) {
return request({
url: "/rawMaterialOrder/rawAllExport",
@@ -223,7 +223,7 @@
responseType: "blob",
});
}
-// 鍘熻緟鏂欎笅鍗曞嚭鍘傛挙閿�
+// 鍘熻緟鏉愪笅鍗曞嚭鍘傛挙閿�
export function updateEntrustCode(query) {
return request({
url: "/insOrder/updateEntrustCode",
@@ -231,7 +231,7 @@
data: query,
});
}
-// 鍘熻緟鏂欎笅鍗曞嚭鍘傛挙閿�
+// 鍘熻緟鏉愪笅鍗曞嚭鍘傛挙閿�
export function printLabel(query) {
return request({
url: "/rawMaterialOrder/printLabel",
diff --git a/src/api/business/reliabilityPlan.js b/src/api/business/reliabilityPlan.js
index cac5a39..9482a2f 100644
--- a/src/api/business/reliabilityPlan.js
+++ b/src/api/business/reliabilityPlan.js
@@ -1,51 +1,51 @@
// 鍙潬鎬ц鍒掔浉鍏虫帴鍙�
-import request from '@/utils/request'
+import request from "@/utils/request";
// 鎴愬搧鏌ヨ
export function selectProduct(query) {
return request({
- url: '/reliabilityPlanProduct/selectProduct',
- method: 'get',
- params: query
- })
+ url: "/reliabilityPlanProduct/selectProduct",
+ method: "get",
+ params: query,
+ });
}
// 鎴愬搧娣诲姞
export function addOrUpdateProduct(query) {
return request({
- url: '/reliabilityPlanProduct/addOrUpdateProduct',
- method: 'post',
- data: query
- })
+ url: "/reliabilityPlanProduct/addOrUpdateProduct",
+ method: "post",
+ data: query,
+ });
}
// 鎴愬搧鍒犻櫎
export function delProduct(query) {
return request({
- url: '/reliabilityPlanProduct/delProduct',
- method: 'delete',
- params: query
- })
+ url: "/reliabilityPlanProduct/delProduct",
+ method: "delete",
+ params: query,
+ });
}
-// 鍘熻緟鏂欐煡璇�
+// 鍘熻緟鏉愭煡璇�
export function selectMaterial(query) {
return request({
- url: '/reliabilityPlanMaterial/selectMaterial',
- method: 'get',
- params: query
- })
+ url: "/reliabilityPlanMaterial/selectMaterial",
+ method: "get",
+ params: query,
+ });
}
-// 鍘熻緟鏂欐坊鍔�
+// 鍘熻緟鏉愭坊鍔�
export function addOrUpdateMaterial(query) {
return request({
- url: '/reliabilityPlanMaterial/addOrUpdateMaterial',
- method: 'post',
- data: query
- })
+ url: "/reliabilityPlanMaterial/addOrUpdateMaterial",
+ method: "post",
+ data: query,
+ });
}
-// 鍘熻緟鏂欏垹闄�
+// 鍘熻緟鏉愬垹闄�
export function delMaterial(query) {
return request({
- url: '/reliabilityPlanMaterial/delMaterial',
- method: 'delete',
- params: query
- })
+ url: "/reliabilityPlanMaterial/delMaterial",
+ method: "delete",
+ params: query,
+ });
}
diff --git a/src/api/statisticalCharts/dataAnalysis.js b/src/api/statisticalCharts/dataAnalysis.js
index 5dde540..c578fe8 100644
--- a/src/api/statisticalCharts/dataAnalysis.js
+++ b/src/api/statisticalCharts/dataAnalysis.js
@@ -9,7 +9,7 @@
params: query,
});
}
-//鍘熻緟鏂欑粺璁�
+//鍘熻緟鏉愮粺璁�
export function getRawPassRateByCake(query) {
return request({
url: "/dataAnalysis/getRawPassRateByCake",
@@ -31,7 +31,7 @@
method: "get",
});
}
-//鏌ヨ鍘熻緟鏂欓」妫�鍒嗘瀽
+//鏌ヨ鍘熻緟鏉愰」妫�鍒嗘瀽
export function getRawProductAnalysis(query) {
return request({
url: "/dataAnalysis/getRawProductAnalysis",
@@ -39,7 +39,7 @@
data: query,
});
}
-//鏌ヨ鍘熻緟鏂欓」妫�鍒嗘瀽鍚堟牸鐜�
+//鏌ヨ鍘熻緟鏉愰」妫�鍒嗘瀽鍚堟牸鐜�
export function getRawProductAnalysisRawPass(query) {
return request({
url: "/dataAnalysis/getRawProductAnalysisRawPass",
@@ -47,7 +47,7 @@
data: query,
});
}
-//鏌ヨ鍘熻緟鏂欓」妫�鍒嗘瀽鍒楄〃
+//鏌ヨ鍘熻緟鏉愰」妫�鍒嗘瀽鍒楄〃
export function getRawProductAnalysisAllList(query) {
return request({
url: "/dataAnalysis/getRawProductAnalysisAllList",
@@ -63,7 +63,7 @@
params: query,
});
}
-//鏌ヨ鍘熻緟鏂欓」妫�鍜屽巶瀹舵暟鎹姣�
+//鏌ヨ鍘熻緟鏉愰」妫�鍜屽巶瀹舵暟鎹姣�
export function getRawSupplierCompare(query) {
return request({
url: "/dataAnalysis/getRawSupplierCompare",
diff --git a/src/router/index.js b/src/router/index.js
index 54a9620..804b5d8 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -105,20 +105,20 @@
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
export const dynamicRoutes = [
{
- // 鍘熻緟鏂欎笅鍗�
+ // 鍘熻緟鏉愪笅鍗�
path: "/materialOrder",
component: Layout,
hidden: true,
permissions: ["business:order"],
children: [
{
- // 鍘熻緟鏂欎笅鍗�
+ // 鍘熻緟鏉愪笅鍗�
path: "customsInspection",
component: () =>
import("@/views/business/materialOrder/customsInspection"),
name: "CustomsInspection",
meta: {
- title: "鍘熻緟鏂欎笅鍗曡鎯�",
+ title: "鍘熻緟鏉愪笅鍗曡鎯�",
activeMenu: "/business/materialOrder",
keepAlive: true,
},
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index 0e0ddfc..c84a188 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -98,7 +98,7 @@
if (params == 0) {
return "鎴愬搧涓嬪崟";
} else {
- return "鍘熻緟鏂欎笅鍗�";
+ return "鍘熻緟鏉愪笅鍗�";
}
},
},
@@ -237,11 +237,11 @@
sonLaboratoryList: [],
typeSourceList: [
{ label: '鎴愬搧涓嬪崟', value: 0 },
- { label: '鍘熻緟鏂欎笅鍗�', value: 1 },
+ { label: '鍘熻緟鏉愪笅鍗�', value: 1 },
],
isCopper: null,
customsInspection: {},
- typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟
+ typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮潗涓嬪崟
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
issuedVisible: false,
fullscreen: false,
@@ -313,7 +313,7 @@
this.currentId = parseInt(row.id)
switch (row.isCopper) {
case 0:
- // 鍘熻緟鏂�
+ // 鍘熻緟鏉�
this.$router.push({
path: "/materialOrder/customsInspection", query: {
customsInspection: row,
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index d2a77d3..148f25b 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -329,7 +329,7 @@
<div class="search_input">
<el-radio-group v-model="item.bsm1Val" v-removeAriaHidden @input="upBsmAll(item)">
<el-radio v-for="(a, ai) in JSON.parse(item.bsmRow.sectionCopy)" :key="ai" :label="a">{{
- JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
+ JSON.parse(item.bsmRow.askCopy)[ai] }}</el-radio>
</el-radio-group>
</div>
</el-col>
@@ -425,7 +425,7 @@
export default {
name: "CustomsInspection",
dicts: ['check_type', 'urgency_level'],
- components: { limsTable,fileList },
+ components: { limsTable, fileList },
props: {
},
data() {
@@ -755,8 +755,8 @@
const str = res.data.treeName.split('-')
this.selectTreeTem = str.join(' - ')
this.selectTree = str.join(' - ')
- this.addListInfo(this.codeLevel, res.data) // 鍘熻緟鏂欐牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒�
- this.selectInsOrderTemplate() // 鍘熻緟鏂欐ā鏉垮垪琛ㄦ煡璇�
+ this.addListInfo(this.codeLevel, res.data) // 鍘熻緟鏉愭牱鍝佹槸鍥哄畾鐨勶紝灏遍粯璁よ祴鍊间竴鏉℃暟鎹紝鍙媶鍒�
+ this.selectInsOrderTemplate() // 鍘熻緟鏉愭ā鏉垮垪琛ㄦ煡璇�
} else {
this.dialogVisible = true
this.dialogMessage = res.message
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 7d9ba95..cb80901 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -20,7 +20,7 @@
<el-form-item label="鎶ユ绫诲瀷" prop="inspectionType">
<el-select v-model="entity.inspectionType" clearable placeholder="璇烽�夋嫨" size="small" @change="refreshTable"
style="width: 100%">
- <el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
+ <el-option label="鍘熻緟鏉�" value="鍘熻緟鏉�"></el-option>
<el-option label="鍖呮潗" value="鍖呮潗"></el-option>
</el-select>
</el-form-item>
@@ -182,7 +182,7 @@
</div>
</el-dialog>
<!-- <Inspection v-if="state>0" :key="InspectionKey" :inspectorList="inspectorList" :orderId="orderId"-->
- <!-- :sonLaboratory="'鍘熻緟鏂�'" :state="state"-->
+ <!-- :sonLaboratory="'鍘熻緟鏉�'" :state="state"-->
<!-- :typeSource="typeSource"-->
<!-- @goback="goback" @refreshView="refreshView"/>-->
</div>
@@ -849,7 +849,7 @@
tabIndex: 0,
multipleSelection: [],
active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪�
- orderType: 0, //0锛氬師杈呮枡涓嬪崟锛�1锛氬搴︽楠屼笅鍗�
+ orderType: 0, //0锛氬師杈呮潗涓嬪崟锛�1锛氬搴︽楠屼笅鍗�
currentId: null,
btnLoading: false,
quashDialogVisible: false, // 鎾ら攢涓嬪崟鎻愰啋寮规
@@ -881,7 +881,7 @@
orderId: 0,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
InspectionKey: 1,
- typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟, 2: 閾滃崟涓濅笅鍗�
+ typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮潗涓嬪崟, 2: 閾滃崟涓濅笅鍗�
InspectInfoDialog: false, // 鏁版嵁鏌ョ湅寮规
insInfo: {},
outLoading: false
@@ -1102,7 +1102,7 @@
this.$router.push({
path: "/inspectionTask/inspection",
query: {
- sonLaboratory: '鍘熻緟鏂�',
+ sonLaboratory: '鍘熻緟鏉�',
state: 3,
typeSource: this.insInfo.typeSource,
orderId: this.insInfo.enterOrderId,
@@ -1117,7 +1117,7 @@
this.$router.push({
path: "/inspectionTask/inspection",
query: {
- sonLaboratory: '鍘熻緟鏂�',
+ sonLaboratory: '鍘熻緟鏉�',
state: 3,
typeSource: this.insInfo.typeSource,
orderId: this.insInfo.quarterOrderId,
@@ -1322,7 +1322,7 @@
rawAllExport({ entity: entity }).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '鍘熻緟鏂欐娴嬩俊鎭鍑�.xlsx');
+ this.$download.saveAs(blob, '鍘熻緟鏉愭娴嬩俊鎭鍑�.xlsx');
})
},
// 鎻愪氦淇敼濮旀墭缂栧彿淇℃伅
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 05311d4..6f54e0b 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -20,7 +20,7 @@
<el-form-item label="鎶ユ绫诲瀷" prop="inspectionType">
<el-select v-model="componentData.inspectionType" clearable placeholder="璇烽�夋嫨" size="small"
@change="refreshTable" style="width: 100%">
- <el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
+ <el-option label="鍘熻緟鏉�" value="鍘熻緟鏉�"></el-option>
<el-option label="鍖呮潗" value="鍖呮潗"></el-option>
</el-select>
</el-form-item>
@@ -100,7 +100,7 @@
</span>
</el-dialog>
<!-- 纭鎶ユ -->
- <el-dialog :close-on-click-modal="false" :title="declareType === 'add' ? '鏂板鎶ユ淇℃伅' : '鍘熻緟鏂欐姤妫�'"
+ <el-dialog :close-on-click-modal="false" :title="declareType === 'add' ? '鏂板鎶ユ淇℃伅' : '鍘熻緟鏉愭姤妫�'"
:visible.sync="declareDialogVisible" width="800px" @close="resetFormData">
<el-form ref="declareObj" :inline="true" :model="declareObj" :rules="declareObjRules" label-width="130px"
label-position="right">
@@ -155,7 +155,7 @@
<el-form-item class="declareObj-form-item" label="鎶ユ绫诲瀷:" prop="inspectionType">
<el-select v-model="declareObj.inspectionType" :disabled="declareType !== 'add'" clearable class="addObj-info"
size="small" placeholder="璇烽�夋嫨鎶ユ绫诲瀷">
- <el-option label="鍘熻緟鏂�" value="鍘熻緟鏂�"></el-option>
+ <el-option label="鍘熻緟鏉�" value="鍘熻緟鏉�"></el-option>
<el-option label="鍖呮潗" value="鍖呮潗"></el-option>
</el-select>
</el-form-item>
@@ -192,7 +192,7 @@
<el-dialog title="閫夋嫨绫诲瀷" :visible.sync="ifsDialogVisible" width="30%" append-to-body>
<div style="text-align: center;">
<el-button type="primary" size="medium" style="margin: 0 10px;"
- @click="handleIfsSelect('鍘熻緟鏂�')">鑾峰彇MES鍘熻緟鏂欒鍗�</el-button>
+ @click="handleIfsSelect('鍘熻緟鏉�')">鑾峰彇MES鍘熻緟鏉愯鍗�</el-button>
<el-button type="primary" size="medium" style="margin: 0 10px;"
@click="handleIfsSelect('鍖呮潗')">鑾峰彇MES鍖呮潗璁㈠崟</el-button>
</div>
@@ -265,7 +265,7 @@
{
label: '鎶ユ绫诲瀷', prop: 'inspectionType', dataType: 'tag',
formatType: (params) => {
- if (params == '鍘熻緟鏂�') {
+ if (params == '鍘熻緟鏉�') {
return 'success'
} else {
return 'warning'
@@ -720,7 +720,7 @@
},
// 鎻愬墠鍏ュ簱
advancedGodown(row) {
- this.$confirm('褰撳墠鍘熻緟鏂欐槸鍚︽彁鍓嶅叆搴�?', '鎻愮ず', {
+ this.$confirm('褰撳墠鍘熻緟鏉愭槸鍚︽彁鍓嶅叆搴�?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
@@ -878,7 +878,7 @@
}).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, "鍘熻緟鏂欐娴嬩俊鎭鍑�.xlsx");
+ this.$download.saveAs(blob, "鍘熻緟鏉愭娴嬩俊鎭鍑�.xlsx");
})
},
clear() {
diff --git a/src/views/business/reliabilityPlan/index.vue b/src/views/business/reliabilityPlan/index.vue
index 4e3246f..a9c2486 100644
--- a/src/views/business/reliabilityPlan/index.vue
+++ b/src/views/business/reliabilityPlan/index.vue
@@ -4,12 +4,12 @@
<el-form :model="entity" ref="entity" size="small" :inline="true">
<el-form-item label="浜у搧鍨嬪彿" prop="productType" v-if="tabIndex === 0">
<el-input v-model="entity.productType" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="goSearch($event)">
+ @keyup.enter.native="goSearch($event)">
</el-input>
</el-form-item>
- <el-form-item label="鍘熻緟鏂欏悕绉�" prop="entrustCode" v-if="tabIndex === 1">
+ <el-form-item label="鍘熻緟鏉愬悕绉�" prop="entrustCode" v-if="tabIndex === 1">
<el-input v-model="entity.entrustCode" clearable placeholder="璇疯緭鍏�" size="small"
- @keyup.enter.native="goSearch($event)">
+ @keyup.enter.native="goSearch($event)">
</el-input>
</el-form-item>
<el-form-item>
@@ -23,7 +23,7 @@
<div>
<ul class="tab">
<li :class="{ active: tabIndex === 0 }" @click="handleTab(0)">鎴愬搧</li>
- <li :class="{ active: tabIndex === 1 }" @click="handleTab(1)">鍘熻緟鏂�</li>
+ <li :class="{ active: tabIndex === 1 }" @click="handleTab(1)">鍘熻緟鏉�</li>
</ul>
</div>
<div>
@@ -32,36 +32,33 @@
</div>
<!--鎴愬搧-->
<div class="table">
- <lims-table :tableData="tableData" :column="column"
- v-if="tabIndex === 0"
- @pagination="pagination"
- ref="tableData"
- :height="'calc(100vh - 290px)'"
- key="tableData" :page="page"
- :tableLoading="tableLoading"></lims-table>
+ <lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
+ ref="tableData" :height="'calc(100vh - 290px)'" key="tableData" :page="page"
+ :tableLoading="tableLoading"></lims-table>
</div>
- <!--鍘熻緟鏂�-->
+ <!--鍘熻緟鏉�-->
<div class="table">
- <lims-table :tableData="tableData1" :column="column1"
- v-if="tabIndex === 1" :isSelection="true"
- @pagination="pagination1"
- :height="'calc(100vh - 290px)'"
- key="tableData1" :page="page1" :tableLoading="tableLoading1"></lims-table>
+ <lims-table :tableData="tableData1" :column="column1" v-if="tabIndex === 1" :isSelection="true"
+ @pagination="pagination1" :height="'calc(100vh - 290px)'" key="tableData1" :page="page1"
+ :tableLoading="tableLoading1"></lims-table>
</div>
</div>
<el-dialog :visible.sync="proPlanDia" title="鎴愬搧璁″垝">
<el-form :model="proPlanForm" ref="proPlanForm" :rules="proPlanRules" label-width="80px" size="small">
<el-form-item label="浜у搧鍨嬪彿" prop="productType">
- <el-input v-model="proPlanForm.productType" placeholder="璇峰~鍐欎骇鍝佸瀷鍙�" :disabled="operationType === 'review'"></el-input>
+ <el-input v-model="proPlanForm.productType" placeholder="璇峰~鍐欎骇鍝佸瀷鍙�"
+ :disabled="operationType === 'review'"></el-input>
</el-form-item>
<el-form-item label="浜у搧鍚嶇О" prop="productName">
- <el-input v-model="proPlanForm.productName" placeholder="璇峰~鍐欎骇鍝佸悕绉�" :disabled="operationType === 'review'"></el-input>
+ <el-input v-model="proPlanForm.productName" placeholder="璇峰~鍐欎骇鍝佸悕绉�"
+ :disabled="operationType === 'review'"></el-input>
</el-form-item>
<el-form-item label="闆朵欢鍙�" prop="partNo">
<el-input v-model="proPlanForm.partNo" placeholder="璇峰~鍐欓浂浠跺彿" :disabled="operationType === 'review'"></el-input>
</el-form-item>
<el-form-item label="瀹℃牳浜�" prop="reviewerId">
- <el-select v-model="proPlanForm.reviewerId" clearable filterable size="small" style="width: 50%;" :disabled="operationType === 'review'">
+ <el-select v-model="proPlanForm.reviewerId" clearable filterable size="small" style="width: 50%;"
+ :disabled="operationType === 'review'">
<el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -69,21 +66,27 @@
</el-form>
<div slot="footer" class="foot">
<el-button v-if="operationType !== 'review'" @click="closeProDia">鍙� 娑�</el-button>
- <el-button v-if="operationType !== 'review'" type="primary" :loading="submitProLoading" @click="submitProForm">淇� 瀛�</el-button>
- <el-button v-if="operationType === 'review'" :loading="submitProLoading" @click="submitProForm(0)">涓嶉�氳繃</el-button>
- <el-button v-if="operationType === 'review'" type="primary" :loading="submitProLoading" @click="submitProForm(1)">閫氳繃</el-button>
+ <el-button v-if="operationType !== 'review'" type="primary" :loading="submitProLoading" @click="submitProForm">淇�
+ 瀛�</el-button>
+ <el-button v-if="operationType === 'review'" :loading="submitProLoading"
+ @click="submitProForm(0)">涓嶉�氳繃</el-button>
+ <el-button v-if="operationType === 'review'" type="primary" :loading="submitProLoading"
+ @click="submitProForm(1)">閫氳繃</el-button>
</div>
</el-dialog>
- <el-dialog :visible.sync="materialDia" title="鍘熻緟鏂欒鍒�">
+ <el-dialog :visible.sync="materialDia" title="鍘熻緟鏉愯鍒�">
<el-form :model="materialForm" ref="materialForm" :rules="materialRules" label-width="90px" size="small">
- <el-form-item label="鍘熻緟鏂欏悕绉�" prop="materialName">
- <el-input v-model="materialForm.materialName" placeholder="璇峰~鍐欎骇鍝佸悕绉�" :disabled="operationType === 'review'"></el-input>
+ <el-form-item label="鍘熻緟鏉愬悕绉�" prop="materialName">
+ <el-input v-model="materialForm.materialName" placeholder="璇峰~鍐欎骇鍝佸悕绉�"
+ :disabled="operationType === 'review'"></el-input>
</el-form-item>
<el-form-item label="闆朵欢鍙�" prop="partNo">
- <el-input v-model="materialForm.partNo" placeholder="璇峰~鍐欓浂浠跺彿" :disabled="operationType === 'review'"></el-input>
+ <el-input v-model="materialForm.partNo" placeholder="璇峰~鍐欓浂浠跺彿"
+ :disabled="operationType === 'review'"></el-input>
</el-form-item>
<el-form-item label="瀹℃牳浜�" prop="reviewerId">
- <el-select v-model="proPlanForm.reviewerId" clearable filterable size="small" style="width: 50%;" :disabled="operationType === 'review'">
+ <el-select v-model="proPlanForm.reviewerId" clearable filterable size="small" style="width: 50%;"
+ :disabled="operationType === 'review'">
<el-option v-for="item in responsibleOptions" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
@@ -91,9 +94,12 @@
</el-form>
<div slot="footer" class="foot">
<el-button v-if="operationType !== 'review'" @click="closeMaterialRulesDia">鍙� 娑�</el-button>
- <el-button v-if="operationType !== 'review'" type="primary" :loading="submitMatLoading" @click="submitMaterialRulesForm">淇� 瀛�</el-button>
- <el-button v-if="operationType === 'review'" :loading="submitMatLoading" @click="submitMaterialRulesForm(0)">涓嶉�氳繃</el-button>
- <el-button v-if="operationType === 'review'" type="primary" :loading="submitMatLoading" @click="submitMaterialRulesForm(1)">閫氳繃</el-button>
+ <el-button v-if="operationType !== 'review'" type="primary" :loading="submitMatLoading"
+ @click="submitMaterialRulesForm">淇� 瀛�</el-button>
+ <el-button v-if="operationType === 'review'" :loading="submitMatLoading"
+ @click="submitMaterialRulesForm(0)">涓嶉�氳繃</el-button>
+ <el-button v-if="operationType === 'review'" type="primary" :loading="submitMatLoading"
+ @click="submitMaterialRulesForm(1)">閫氳繃</el-button>
</div>
</el-dialog>
</div>
@@ -108,13 +114,13 @@
selectMaterial,
selectProduct
} from "@/api/business/reliabilityPlan";
-import {selectUserCondition} from "@/api/system/user";
-import {deleteAuxiliaryWorkingHours} from "@/api/performance/manHour";
+import { selectUserCondition } from "@/api/system/user";
+import { deleteAuxiliaryWorkingHours } from "@/api/performance/manHour";
export default {
name: '',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {limsTable},
+ components: { limsTable },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -162,14 +168,14 @@
name: '缂栬緫',
type: 'text',
clickFun: (row) => {
- this.openAddDia('edit',row);
+ this.openAddDia('edit', row);
}
},
{
name: '瀹℃牳',
type: 'text',
clickFun: (row) => {
- this.openAddDia('review',row);
+ this.openAddDia('review', row);
},
},
{
@@ -191,11 +197,11 @@
current: 1
},
//
- // 鍘熻緟鏂檛able鏁版嵁
+ // 鍘熻緟鏉恡able鏁版嵁
tableData1: [],
tableLoading1: false,
column1: [
- { label: '鍘熻緟鏂欏悕绉�', prop: 'materialName' },
+ { label: '鍘熻緟鏉愬悕绉�', prop: 'materialName' },
{ label: '闆朵欢鍙�', prop: 'partNo' },
{
dataType: 'tag',
@@ -229,14 +235,14 @@
name: '缂栬緫',
type: 'text',
clickFun: (row) => {
- this.openAddDia('edit',row);
+ this.openAddDia('edit', row);
}
},
{
name: '瀹℃牳',
type: 'text',
clickFun: (row) => {
- this.openAddDia('review',row);
+ this.openAddDia('review', row);
},
},
{
@@ -314,22 +320,22 @@
// 鎴愬搧鏌ヨ
this.getProductOrderList()
} else if (this.tabIndex === 1) {
- // 鍘熻緟鏂欐煡璇�
+ // 鍘熻緟鏉愭煡璇�
this.getMaterialOrderList()
}
},
- getProductOrderList () {
+ getProductOrderList() {
this.tableLoading = true
- selectProduct({...this.entity, ...this.page}).then(response => {
+ selectProduct({ ...this.entity, ...this.page }).then(response => {
this.tableLoading = false
this.tableData = response.data.records
}).catch(error => {
this.tableLoading = false
})
},
- getMaterialOrderList () {
+ getMaterialOrderList() {
this.tableLoading1 = true
- selectMaterial({...this.entity, ...this.page}).then(response => {
+ selectMaterial({ ...this.entity, ...this.page }).then(response => {
this.tableLoading1 = false
this.tableData1 = response.data.records
}).catch(err => {
@@ -348,17 +354,17 @@
if (this.tabIndex === 0) {
this.proPlanDia = true
if (this.operationType !== 'add') {
- this.proPlanForm = {...row}
+ this.proPlanForm = { ...row }
}
} else {
this.materialDia = true
if (this.operationType !== 'add') {
- this.materialForm = {...row}
+ this.materialForm = { ...row }
}
}
},
// 鎴愬搧淇℃伅鎻愪氦
- submitProForm (state) {
+ submitProForm(state) {
this.submitProLoading = true
if (this.operationType === 'add') {
this.proPlanForm.state = ''
@@ -378,12 +384,12 @@
})
},
// 鍏抽棴鎴愬搧淇℃伅寮规
- closeProDia () {
+ closeProDia() {
this.resetForm('proPlanDia')
this.proPlanDia = false
},
- // 鍘熻緟鏂欎俊鎭彁浜�
- submitMaterialRulesForm (state) {
+ // 鍘熻緟鏉愪俊鎭彁浜�
+ submitMaterialRulesForm(state) {
this.submitMatLoading = true
if (this.operationType === 'add') {
this.materialForm.state = ''
@@ -402,19 +408,19 @@
this.submitMatLoading = false
})
},
- // 鍏抽棴鍘熻緟鏂欎俊鎭脊妗�
+ // 鍏抽棴鍘熻緟鏉愪俊鎭脊妗�
closeMaterialRulesDia() {
this.resetForm('materialForm')
this.materialDia = false
},
- handleDelete (row) {
+ handleDelete(row) {
this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(() => {
delProduct({ id: row.id }).then((res) => {
- if (res.code == 200){
+ if (res.code == 200) {
this.$message.success("鍒犻櫎鎴愬姛");
this.goSearch();
}
@@ -423,14 +429,14 @@
});
},
- handleDeleteM (row) {
+ handleDeleteM(row) {
this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning",
}).then(() => {
delMaterial({ id: row.id }).then((res) => {
- if (res.code == 200){
+ if (res.code == 200) {
this.$message.success("鍒犻櫎鎴愬姛");
this.goSearch();
}
diff --git a/src/views/standard/standardLibrary/audit.vue b/src/views/standard/standardLibrary/audit.vue
new file mode 100644
index 0000000..831a4f5
--- /dev/null
+++ b/src/views/standard/standardLibrary/audit.vue
@@ -0,0 +1,34 @@
+<template>
+ <div class="capacity-scope">
+ <div class="search">
+ <div>
+ <el-form :model="queryParams" ref="queryParams" size="small" :inline="true">
+ <el-form-item label="妯℃澘鍚嶇О" prop="name">
+ <el-input v-model="queryParams.name" clearable placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+ <el-button size="mini" @click="refresh">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ queryParams: {}
+ }
+ },
+ methods: {
+ refreshTable() { },
+ refresh() { }
+ }
+}
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index ff4930d..943bfe6 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -290,7 +290,7 @@
// this.bindWokshop1(row);
// },
// disabled: (row) => {
- // return row.objectType != '鍘熻緟鏂�' && row.objectType != '鍖呮潗'
+ // return row.objectType != '鍘熻緟鏉�' && row.objectType != '鍖呮潗'
// }
// },
]
@@ -348,7 +348,7 @@
// this.bindWokshop(row);
// },
// showHide: (row) => {
- // if (this.currentObj.objectType != '鍘熻緟鏂�' && row.objectType != '鍖呮潗') {
+ // if (this.currentObj.objectType != '鍘熻緟鏉�' && row.objectType != '鍖呮潗') {
// return false
// } else {
// return true
@@ -586,7 +586,7 @@
// 浜у搧缁存姢
upProduct(row) {
this.currentObj = row;
- // if (this.currentObj.objectType == '鍘熻緟鏂�') {
+ // if (this.currentObj.objectType == '鍘熻緟鏉�') {
// if (this.productColumn.length < 4) {
// this.productColumn.splice(2, 0, { label: '杞﹂棿鍚嶇О', prop: 'workShopName' })
// }
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue
index ed4a048..8d13703 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/bindPartDialog.vue
@@ -23,7 +23,7 @@
<el-input v-model="bindPartData.colorCode" size="small"></el-input>
</el-form-item>
<el-form-item label="杩涘巶妫�楠岄」锛�" prop="inspectionItem"
- v-if="currentObj.objectType == '鍘熻緟鏂�' || currentObj.objectType == '鍖呮潗'" label-width="100px">
+ v-if="currentObj.objectType == '鍘熻緟鏉�' || currentObj.objectType == '鍖呮潗'" label-width="100px">
<!-- <el-input v-model="bindPartData.inspectionItem" disabled placeholder="閫夋嫨妫�楠岄」" size="small">
<template slot="append">
<el-button slot="append" icon="el-icon-search" @click="openItems"></el-button>
@@ -201,7 +201,7 @@
partNo: '', // 闆朵欢鍙�
color: '', // 棰滆壊
colorCode: '', // 鑹叉爣
- inspectionItem: [],//鍘熻緟鏂欒繘鍘傛楠屽璞″垪琛�
+ inspectionItem: [],//鍘熻緟鏉愯繘鍘傛楠屽璞″垪琛�
},
bindPartDataRules: {
partNo: [
@@ -212,7 +212,7 @@
upIndex: 0,
addBindLoad: false,
- itemList: [],//鍘熻緟鏂欒繘鍘傛楠屽璞″垪琛�
+ itemList: [],//鍘熻緟鏉愯繘鍘傛楠屽璞″垪琛�
editItem: false,
editList: [],
editColumn: [
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue
index e8052d0..bc88919 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/testObjectEditForm.vue
@@ -24,7 +24,7 @@
:value="item.value"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="杞﹂棿锛�" prop="objectType" v-if="editForm.objectType == '鍘熻緟鏂�' || editForm.objectType == '鍖呮潗'">
+ <el-form-item label="杞﹂棿锛�" prop="objectType" v-if="editForm.objectType == '鍘熻緟鏉�' || editForm.objectType == '鍖呮潗'">
<el-select v-model="editForm.workShopId" placeholder="璇烽�夋嫨" size="small">
<el-option v-for="item in workshopList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
@@ -107,7 +107,7 @@
this.$refs.editForm.validate(valid => {
if (valid) {
this.editLoad = true
- if (this.editForm.objectType != '鍘熻緟鏂�' && this.editForm.objectType != '鍖呮潗') {
+ if (this.editForm.objectType != '鍘熻緟鏉�' && this.editForm.objectType != '鍖呮潗') {
this.editForm.workShopId = ''
}
this.editForm.workShopName = this.editForm.workShopId ? this.workshopList.find(m => m.id == this.editForm.workShopId).name : ''
--
Gitblit v1.9.3