From 4f94a66bc8ad9a57295f161de9195d5528b1d181 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期二, 08 四月 2025 11:55:16 +0800
Subject: [PATCH] 基础数据维护+原辅材下单修改
---
src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | 2
src/views/business/productSamplingInfo/components/addQuarterItem.vue | 85 ++--
src/views/business/inspectionReview/index.vue | 2
src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue | 27
src/views/business/reportPreparation/index.vue | 8
src/views/business/finishedProductSampling/components/addQuarterItem.vue | 84 ++--
src/views/statisticalCharts/qualificationRateStatistics/index.vue | 79 +---
src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue | 5
src/api/business/finishedProductSampling.js | 6
src/api/business/rawMaterialOrder.js | 4
src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue | 2
src/views/business/productOrder/components/add.vue | 2
src/views/business/inspectionTask/index.vue | 2
src/views/business/materialOrder/index.vue | 30 +-
/dev/null | 116 -------
src/views/business/finishedProductSampling/index.vue | 217 +++-----------
src/views/business/materialOrder/customsInspection.vue | 16
src/api/business/productSamplingInfo.js | 100 +++---
src/api/business/add.js | 74 ++--
src/views/business/productSamplingInfo/index.vue | 21
20 files changed, 312 insertions(+), 570 deletions(-)
diff --git a/src/api/business/add.js b/src/api/business/add.js
index 68389df..8b79e07 100644
--- a/src/api/business/add.js
+++ b/src/api/business/add.js
@@ -1,74 +1,74 @@
// 鎴愬搧涓嬪崟璇︽儏椤甸潰鐩稿叧鎺ュ彛
-import request from '@/utils/request'
+import request from "@/utils/request";
-// 鎴愬搧涓嬪崟鐣岄潰鏌ヨ瀛ｅ害淇℃伅
+// 鎴愬搧涓嬪崟鐣岄潰鏌ヨ鍙潬鎬т俊鎭�
export function getQuarterOnOrder() {
return request({
- url: '/finishProductSpotCheck/getQuarterOnOrder',
- method: 'get'
- })
+ url: "/finishProductSpotCheck/getQuarterOnOrder",
+ method: "get",
+ });
}
// 淇敼鎴愬搧涓嬪崟鍐呭
export function updateInsOrder(query) {
return request({
- url: '/insOrder/updateInsOrder',
- method: 'post',
- data: query
- })
+ url: "/insOrder/updateInsOrder",
+ method: "post",
+ data: query,
+ });
}
// 娣诲姞妫�楠屼笅鍗曟暟鎹�
export function addInsOrder(query) {
return request({
- url: '/insOrder/addInsOrder',
- method: 'post',
- data: query
- })
+ url: "/insOrder/addInsOrder",
+ method: "post",
+ data: query,
+ });
}
// 瀹℃牳妫�楠屽崟鏈鸿繘琛岀姸鎬佷慨鏀�
export function upInsOrderOfState(query) {
return request({
- url: '/insOrder/upInsOrderOfState',
- method: 'post',
- data: query
- })
+ url: "/insOrder/upInsOrderOfState",
+ method: "post",
+ data: query,
+ });
}
// 鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿
export function selectOrderManDay(query) {
return request({
- url: '/insOrder/selectOrderManDay',
- method: 'get',
- params: query
- })
+ url: "/insOrder/selectOrderManDay",
+ method: "get",
+ params: query,
+ });
}
// 妫�楠屼笅鍙�
export function upInsOrder(query) {
return request({
- url: '/insOrder/upInsOrder',
- method: 'post',
- params: query
- })
+ url: "/insOrder/upInsOrder",
+ method: "post",
+ params: query,
+ });
}
// 鍒犻櫎妫�楠屽崟妯℃澘
export function delInsOrderTemplate(query) {
return request({
- url: '/insOrder/delInsOrderTemplate',
- method: 'delete',
- params: query
- })
+ url: "/insOrder/delInsOrderTemplate",
+ method: "delete",
+ params: query,
+ });
}
// 娣诲姞妫�楠屽崟妯℃澘
export function addInsOrderTemplate(query) {
return request({
- url: '/insOrder/addInsOrderTemplate',
- method: 'post',
- data: query
- })
+ url: "/insOrder/addInsOrderTemplate",
+ method: "post",
+ data: query,
+ });
}
// 閫氳繃妫�楠屽崟妯℃澘id鑾峰彇妫�楠屽崟妯℃澘鍐呭
export function selectInsOrderTemplateById(query) {
return request({
- url: '/insOrder/selectInsOrderTemplateById',
- method: 'get',
- params: query
- })
+ url: "/insOrder/selectInsOrderTemplateById",
+ method: "get",
+ params: query,
+ });
}
diff --git a/src/api/business/finishedProductSampling.js b/src/api/business/finishedProductSampling.js
index b5746e2..2c300a0 100644
--- a/src/api/business/finishedProductSampling.js
+++ b/src/api/business/finishedProductSampling.js
@@ -9,7 +9,7 @@
data: query,
});
}
-// 瀛ｅ害鎶芥鏌ョ湅璇︽儏
+// 鍙潬鎬ф娊妫�鏌ョ湅璇︽儏
export function getQuarter(query) {
return request({
url: "/finishProductSpotCheck/getQuarter",
@@ -17,7 +17,7 @@
params: query,
});
}
-// 鎻愪氦瀛ｅ害鎶芥牱
+// 鎻愪氦鍙潬鎬ф娊鏍�
export function addQuarter(query) {
return request({
url: "/finishProductSpotCheck/addQuarter",
@@ -25,7 +25,7 @@
data: query,
});
}
-// 缂栬緫瀛ｅ害妫�楠�
+// 缂栬緫鍙潬鎬ф楠�
export function updateQuarterOnOrder(query) {
return request({
url: "/finishProductSpotCheck/updateQuarterOnOrder",
diff --git a/src/api/business/productSamplingInfo.js b/src/api/business/productSamplingInfo.js
index b954bfe..1ff3a5f 100644
--- a/src/api/business/productSamplingInfo.js
+++ b/src/api/business/productSamplingInfo.js
@@ -1,101 +1,101 @@
// 鎶芥牱淇℃伅璇︽儏椤甸潰鐩稿叧鎺ュ彛
-import request from '@/utils/request'
+import request from "@/utils/request";
-// 鎶芥牱淇℃伅-瀛ｅ害鏌ヨ
+// 鎶芥牱淇℃伅-鍙潬鎬ф煡璇�
export function getQuarterPage(query) {
return request({
- url: '/finishProductSpotCheck/getQuarterPage',
- method: 'get',
- params: query
- })
+ url: "/finishProductSpotCheck/getQuarterPage",
+ method: "get",
+ params: query,
+ });
}
// 鎶芥牱淇℃伅-骞村害鏌ヨ
export function getSpotCheckYearPage(query) {
return request({
- url: '/finishProductSpotCheck/getSpotCheckYearPage',
- method: 'get',
- params: query
- })
+ url: "/finishProductSpotCheck/getSpotCheckYearPage",
+ method: "get",
+ params: query,
+ });
}
-// 鍒犻櫎瀛ｅ害鎶芥
+// 鍒犻櫎鍙潬鎬ф娊妫�
export function deleteQuarter(query) {
return request({
- url: '/finishProductSpotCheck/deleteQuarter',
- method: 'delete',
- params: query
- })
+ url: "/finishProductSpotCheck/deleteQuarter",
+ method: "delete",
+ params: query,
+ });
}
-// 鐢熸垚瀛ｅ害鎶ュ憡
+// 鐢熸垚鍙潬鎬ф姤鍛�
export function finalReportQuarter(query) {
return request({
- url: '/finishProductSpotCheck/finalReportQuarter',
- method: 'get',
+ url: "/finishProductSpotCheck/finalReportQuarter",
+ method: "get",
params: query,
- responseType: "blob"
- })
+ responseType: "blob",
+ });
}
// 鐢熸垚骞村害鎶ュ憡
export function finalReportSpotCheckYear(query) {
return request({
- url: '/finishProductSpotCheck/finalReportSpotCheckYear',
- method: 'get',
+ url: "/finishProductSpotCheck/finalReportSpotCheckYear",
+ method: "get",
params: query,
- responseType: "blob"
- })
+ responseType: "blob",
+ });
}
// 鍒犻櫎骞村害鎶芥
export function deleteSpotCheckYear(query) {
return request({
- url: '/finishProductSpotCheck/deleteSpotCheckYear',
- method: 'delete',
+ url: "/finishProductSpotCheck/deleteSpotCheckYear",
+ method: "delete",
params: query,
- })
+ });
}
// 骞村害鎶芥鏌ョ湅璇︽儏
export function getSpotCheckYear(query) {
return request({
- url: '/finishProductSpotCheck/getSpotCheckYear',
- method: 'get',
+ url: "/finishProductSpotCheck/getSpotCheckYear",
+ method: "get",
params: query,
- })
+ });
}
// 鎻愪氦骞村害鎶芥牱
export function addSpotCheckYear(query) {
return request({
- url: '/finishProductSpotCheck/addSpotCheckYear',
- method: 'post',
+ url: "/finishProductSpotCheck/addSpotCheckYear",
+ method: "post",
data: query,
- })
+ });
}
// 缂栬緫骞村害鎶芥牱
export function updateSpotCheckYear(query) {
return request({
- url: '/finishProductSpotCheck/updateSpotCheckYear',
- method: 'post',
+ url: "/finishProductSpotCheck/updateSpotCheckYear",
+ method: "post",
data: query,
- })
+ });
}
-// 瀛ｅ害鎶芥鏌ョ湅璇︽儏
+// 鍙潬鎬ф娊妫�鏌ョ湅璇︽儏
export function getQuarter(query) {
return request({
- url: '/finishProductSpotCheck/getQuarter',
- method: 'get',
+ url: "/finishProductSpotCheck/getQuarter",
+ method: "get",
params: query,
- })
+ });
}
-// 鎻愪氦瀛ｅ害鎶芥牱
+// 鎻愪氦鍙潬鎬ф娊鏍�
export function addQuarter(query) {
return request({
- url: '/finishProductSpotCheck/addQuarter',
- method: 'post',
- data : query,
- })
+ url: "/finishProductSpotCheck/addQuarter",
+ method: "post",
+ data: query,
+ });
}
-// 缂栬緫瀛ｅ害妫�楠�
+// 缂栬緫鍙潬鎬ф楠�
export function updateQuarterOnOrder(query) {
return request({
- url: '/finishProductSpotCheck/updateQuarterOnOrder',
- method: 'post',
- data : query,
- })
+ url: "/finishProductSpotCheck/updateQuarterOnOrder",
+ method: "post",
+ data: query,
+ });
}
diff --git a/src/api/business/rawMaterialOrder.js b/src/api/business/rawMaterialOrder.js
index f5cbd4b..c40aea1 100644
--- a/src/api/business/rawMaterialOrder.js
+++ b/src/api/business/rawMaterialOrder.js
@@ -33,7 +33,7 @@
params: query,
});
}
-// 鏌ヨ瀛ｅ害妫�楠�
+// 鏌ヨ鍙潬鎬ф楠�
export function getIfsByQuarter(query) {
return request({
url: "/rawMaterialOrder/getIfsByQuarter",
@@ -182,7 +182,7 @@
data: query,
});
}
-// 鍘熻緟鏉愪笅鍗曞搴︽挙閿�
+// 鍘熻緟鏉愪笅鍗曞彲闈犳�ф挙閿�
export function repealQuarterRawOrder(query) {
return request({
url: "/rawMaterialOrder/repealQuarterRawOrder",
diff --git a/src/views/business/finishedProductSampling/components/addQuarterItem.vue b/src/views/business/finishedProductSampling/components/addQuarterItem.vue
index c4b20b1..1842901 100644
--- a/src/views/business/finishedProductSampling/components/addQuarterItem.vue
+++ b/src/views/business/finishedProductSampling/components/addQuarterItem.vue
@@ -1,8 +1,9 @@
<template>
<div>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="quarterSampleDia" title="瀛ｅ害鎶芥牱" width="90%" @close="quarterSampleDia = false">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="quarterSampleDia"
+ title="鍙潬鎬ф娊鏍�" width="90%" @close="quarterSampleDia = false">
<div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 10px">
- <div style="width: 30%;display: flex;align-items: center;" >
+ <div style="width: 30%;display: flex;align-items: center;">
<span style="width: 50px">缂栧彿锛�</span>
<el-input v-model="quarterSampleForm.quarterNo" :disabled="operationType !== 'add'" size="small"></el-input>
</div>
@@ -13,11 +14,11 @@
</div>
<div>
<el-table v-loading="tableLoading" :data="quarterItems" border height="420" style="width: 100%"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column label="浜у搧绫诲瀷" prop="productType" width="200">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.productType" size="small"/>
+ <el-input v-model="row.productType" size="small" />
</template>
</template>
</el-table-column>
@@ -25,43 +26,37 @@
<el-table-column label="鍨嬪彿" prop="productModel" width="120">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.productModel" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.productModel" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column label="鎶芥牱鏁伴噺" min-width="340" prop="spotCheckNumber">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.spotCheckNumber" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.spotCheckNumber" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType === 'add'" label="鏁伴噺" min-width="120" prop="number">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.number" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.number" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType !== 'add'" label="鎶芥牱鏃堕棿" prop="spotCheckTime" width="160">
<template slot-scope="{row}">
<template>
- <el-date-picker v-model="row.spotCheckTime"
- format="yyyy-MM-dd"
- :disabled="operationType === 'view'"
- placeholder="閫夋嫨鏃ユ湡"
- size="small"
- clearable
- style="width:100%"
- type="date"
- value-format="yyyy-MM-dd">
+ <el-date-picker v-model="row.spotCheckTime" format="yyyy-MM-dd" :disabled="operationType === 'view'"
+ placeholder="閫夋嫨鏃ユ湡" size="small" clearable style="width:100%" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType !== 'add'" label="璇曟牱缁撹" prop="result" width="130">
<template v-slot="scope">
- <el-select v-model="scope.row.result" placeholder="璇烽�夋嫨" size="small" clearable :disabled="operationType === 'view'">
+ <el-select v-model="scope.row.result" placeholder="璇烽�夋嫨" size="small" clearable
+ :disabled="operationType === 'view'">
<el-option label="鍚堟牸" value="鍚堟牸"></el-option>
<el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�"></el-option>
</el-select>
@@ -70,54 +65,60 @@
<el-table-column v-if="operationType !== 'add'" label="鍙栨牱浜哄憳" prop="samplingUser" width="120">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.samplingUser" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.samplingUser" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="itemRemark" width="200">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.itemRemark" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.itemRemark" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType !== 'view'" fixed="right" label="鎿嶄綔" width="100">
<template slot-scope="scope">
- <el-button size="small" style="color: #f56c6c" type="text" @click="deleteScope(scope.$index)">鍒犻櫎</el-button>
+ <el-button size="small" style="color: #f56c6c" type="text"
+ @click="deleteScope(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div style="display: flex;align-items: center;margin: 10px 0">
<span style="width: 70px">澶囨敞锛�</span>
- <el-input v-model="quarterSampleForm.remark" :disabled="operationType === 'view'" size="small" style="width: 43%" type="textarea"></el-input>
+ <el-input v-model="quarterSampleForm.remark" :disabled="operationType === 'view'" size="small"
+ style="width: 43%" type="textarea"></el-input>
</div>
<div v-if="operationType !== 'add'">
<el-form ref="form" :model="editForm" label-width="70px">
<el-col :span="12">
<el-form-item label="缂栧埗浜猴細">
- <el-select v-model="editForm.writeUser" :disabled="operationType !=='edit'" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.writeUser" :disabled="operationType !== 'edit'" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="浼氱浜猴細">
- <el-select v-model="editForm.countersignUser" :disabled="operationType !=='edit'" multiple placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.countersignUser" :disabled="operationType !== 'edit'" multiple
+ placeholder="璇烽�夋嫨" size="small" style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="瀹℃牳浜猴細">
- <el-select v-model="editForm.examineUser" :disabled="operationType !=='edit'" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.examineUser" :disabled="operationType !== 'edit'" placeholder="璇烽�夋嫨"
+ size="small" style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎵瑰噯浜猴細">
- <el-select v-model="editForm.ratifyUser" :disabled="operationType !=='edit'" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.ratifyUser" :disabled="operationType !== 'edit'" placeholder="璇烽�夋嫨"
+ size="small" style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -134,9 +135,9 @@
</template>
<script>
-import {addQuarter, getQuarter, updateQuarterOnOrder} from "@/api/business/finishedProductSampling";
-import {selectUserCondition} from "@/api/business/inspectionTask";
-import {mapGetters} from "vuex";
+import { addQuarter, getQuarter, updateQuarterOnOrder } from "@/api/business/finishedProductSampling";
+import { selectUserCondition } from "@/api/business/inspectionTask";
+import { mapGetters } from "vuex";
export default {
name: "addQuarterItem",
@@ -146,7 +147,7 @@
// 杩欓噷瀛樻斁鏁版嵁
return {
tableLoading: false,
- quarterSampleDia: false, // 瀛ｅ害鎶芥牱寮规
+ quarterSampleDia: false, // 鍙潬鎬ф娊鏍峰脊妗�
quarterSampleForm: {
quarterNo: '', // 缂栧彿
},
@@ -172,7 +173,7 @@
},
// 鏂规硶闆嗗悎
methods: {
- openDia (quarterTemItems, type) {
+ openDia(quarterTemItems, type) {
this.quarterSampleDia = true
this.operationType = type
if (type === 'add') {
@@ -183,7 +184,7 @@
} else {
this.tableLoading = true
this.quarterRow = quarterTemItems
- getQuarter({quarterId: quarterTemItems.quarterId}).then(res => {
+ getQuarter({ quarterId: quarterTemItems.quarterId }).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.quarterItems = res.data.quarterItems
@@ -203,7 +204,7 @@
}
},
// 鎵嬪姩娣诲姞
- addQuarter () {
+ addQuarter() {
this.quarterItems.push({
productType: '',
dutyUser: this.nickName,
@@ -216,8 +217,8 @@
itemRemark: '',
})
},
- // 鎻愪氦瀛ｅ害鎶芥牱
- handleSample () {
+ // 鎻愪氦鍙潬鎬ф娊鏍�
+ handleSample() {
this.$confirm('鏄惁鎻愪氦璇ユ暟鎹�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -237,7 +238,7 @@
}
})
} else {
- const params = {...this.editForm}
+ const params = { ...this.editForm }
if (params.countersignUser.length > 0) {
params.countersignUser = params.countersignUser.join(',')
} else {
@@ -261,16 +262,16 @@
},
// 娓呯┖鎶芥牱璁″垝
- clearTable () {
+ clearTable() {
this.quarterItems = []
this.$parent.quarterTemItems = []
},
// 鎵嬪姩鍒犻櫎
- deleteScope (index) {
+ deleteScope(index) {
this.quarterItems.splice(index, 1)
},
- // 鍏抽棴瀛ｅ害鎶芥牱寮规
- closeQuarterSampleDia () {
+ // 鍏抽棴鍙潬鎬ф娊鏍峰脊妗�
+ closeQuarterSampleDia() {
this.quarterSampleDia = false
if (this.operationType === 'add') {
this.$parent.handleStockList()
@@ -278,7 +279,7 @@
this.$parent.refreshTable('page')
}
},
- getUserList(){
+ getUserList() {
selectUserCondition().then((res) => {
this.userList = res.data;
})
@@ -293,5 +294,4 @@
}
</script>
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/src/views/business/finishedProductSampling/index.vue b/src/views/business/finishedProductSampling/index.vue
index e013681..818f531 100644
--- a/src/views/business/finishedProductSampling/index.vue
+++ b/src/views/business/finishedProductSampling/index.vue
@@ -4,261 +4,134 @@
<div class="card">
<div class="title">
<el-button size="small" type="primary" @click="addTemQuarter">鏂板</el-button>
- <el-button size="small" type="primary" @click="quarterSample">瀛ｅ害鎶芥牱</el-button>
+ <el-button size="small" type="primary" @click="quarterSample">鍙潬鎬ф娊鏍�</el-button>
<el-button size="small" type="primary" @click="handleStockList">鍒锋柊</el-button>
</div>
- <el-table
- ref="finishedproducttransferTable"
- v-loading="tableLoading"
- :data="stockList"
- :header-cell-style="lineSideWarehouseTableHeaderCellStyle"
- :row-class-name="lineSideWarehouseTableRowClassName"
- class="finishedproducttransfer-table"
- height="calc(100vh - 240px)"
- @selection-change="handleSelectionChange"
- >
+ <el-table ref="finishedproducttransferTable" v-loading="tableLoading" :data="stockList"
+ :header-cell-style="lineSideWarehouseTableHeaderCellStyle" :row-class-name="lineSideWarehouseTableRowClassName"
+ class="finishedproducttransfer-table" height="calc(100vh - 240px)" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="45"></el-table-column>
- <el-table-column
- :show-overflow-tooltip="true"
- align="center"
- label="瀹㈡埛璁㈠崟缂栧彿"
- prop="customerOrderNo"
- width="140"
- >
+ <el-table-column :show-overflow-tooltip="true" align="center" label="瀹㈡埛璁㈠崟缂栧彿" prop="customerOrderNo" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">瀹㈡埛璁㈠崟缂栧彿</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.customerOrderNo"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.customerOrderNo" clearable size="mini" type="text"
+ @clear="handleStockList" @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.customerOrderNo }}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="鎴愬搧闆朵欢鍙�"
- prop="partNo"
- width="140"
- >
+ <el-table-column align="center" label="鎴愬搧闆朵欢鍙�" prop="partNo" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">鎴愬搧闆朵欢鍙�</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.partNo"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.partNo" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.partNo }}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="闆朵欢鍚嶇О"
- prop="partName"
- width="140"
- >
+ <el-table-column align="center" label="闆朵欢鍚嶇О" prop="partName" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">闆朵欢鍚嶇О</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.partName"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.partName" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.partName }}</span>
</template>
</el-table-column>
- <el-table-column
- :show-overflow-tooltip="true"
- align="center"
- label="浠撳簱"
- prop="warehouseName"
- width="140"
- >
+ <el-table-column :show-overflow-tooltip="true" align="center" label="浠撳簱" prop="warehouseName" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">浠撳簱</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.warehouseName"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.warehouseName" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.warehouseName }}</span>
</template>
</el-table-column>
- <el-table-column
- :show-overflow-tooltip="true"
- align="center"
- label="搴撲綅鍙�"
- prop="locationNo"
- width="140"
- >
+ <el-table-column :show-overflow-tooltip="true" align="center" label="搴撲綅鍙�" prop="locationNo" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">搴撲綅鍙�</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.locationNo"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.locationNo" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.locationNo }}</span>
</template>
</el-table-column>
- <el-table-column
- :show-overflow-tooltip="true"
- align="center"
- label="搴撲綅鍚嶇О"
- prop="locationName"
- width="140"
- >
+ <el-table-column :show-overflow-tooltip="true" align="center" label="搴撲綅鍚嶇О" prop="locationName" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">搴撲綅鍚嶇О</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.locationName"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.locationName" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.locationName }}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="鎵规鍙�"
- prop="partBatchNo"
- width="140"
- >
+ <el-table-column align="center" label="鎵规鍙�" prop="partBatchNo" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">鎵规鍙�</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.partBatchNo"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.partBatchNo" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.partBatchNo }}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="鍏ュ簱鏉ユ簮"
- prop="inSource"
- width="140"
- >
+ <el-table-column align="center" label="鍏ュ簱鏉ユ簮" prop="inSource" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">鍏ュ簱鏉ユ簮</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.inSource"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.inSource" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.inSource }}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="澶栨姢棰滆壊"
- prop="outerColor"
- width="140"
- >
+ <el-table-column align="center" label="澶栨姢棰滆壊" prop="outerColor" width="140">
<template slot="header" slot-scope="scope">
<div style="line-height: 14px;margin-bottom: 6px">澶栨姢棰滆壊</div>
<div class="th" @click.stop>
- <el-input
- v-model="queryParamOne.outerColor"
- clearable
- size="mini"
- type="text"
- @clear="handleStockList"
- @keyup.enter.native="handleStockList"
- ></el-input>
+ <el-input v-model="queryParamOne.outerColor" clearable size="mini" type="text" @clear="handleStockList"
+ @keyup.enter.native="handleStockList"></el-input>
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.outerColor }}</span>
</template>
</el-table-column>
- <el-table-column
- align="center"
- label="搴撳瓨鏁伴噺"
- prop="stockQuantity"
- width="140"
- >
+ <el-table-column align="center" label="搴撳瓨鏁伴噺" prop="stockQuantity" width="140">
</el-table-column>
- <el-table-column
- align="center"
- label="鍙敤搴撳瓨鏁伴噺"
- prop="availableStockQuantity"
- width="140"
- >
+ <el-table-column align="center" label="鍙敤搴撳瓨鏁伴噺" prop="availableStockQuantity" width="140">
<template slot-scope="scope">
<span>{{ scope.row.availableStockQuantity }}</span>
</template>
</el-table-column>
</el-table>
<div class="pagin-page" style="margin-top: 0;margin-bottom: 0;">
- <el-pagination
- background
- :current-page="queryReport.current"
- :page-size="queryReport.size"
- :page-sizes="[10, 15, 20, 50, 100]"
- :total="queryReport.total"
- layout="total, sizes, prev, pager, next, jumper"
- style="text-align:right;padding: 20px 16px;"
- @size-change="handleSizeChangeReport"
- @current-change="handleCurrentChangeReport"
- >
+ <el-pagination background :current-page="queryReport.current" :page-size="queryReport.size"
+ :page-sizes="[10, 15, 20, 50, 100]" :total="queryReport.total"
+ layout="total, sizes, prev, pager, next, jumper" style="text-align:right;padding: 20px 16px;"
+ @size-change="handleSizeChangeReport" @current-change="handleCurrentChangeReport">
</el-pagination>
</div>
</div>
@@ -269,8 +142,8 @@
<script>
import AddQuarterItem from "./components/addQuarterItem.vue";
-import {getIfsStock} from "@/api/business/finishedProductSampling";
-import {mapGetters} from "vuex";
+import { getIfsStock } from "@/api/business/finishedProductSampling";
+import { mapGetters } from "vuex";
export default {
name: 'FinishedProductSampling',
@@ -307,7 +180,7 @@
operationType: ''
}
},
- components: {AddQuarterItem},
+ components: { AddQuarterItem },
mounted() {
this.getIfsStock()
},
@@ -320,11 +193,11 @@
...mapGetters(["nickName"]),
},
methods: {
- // 瀛ｅ害鎶芥牱
- quarterSample () {
+ // 鍙潬鎬ф娊鏍�
+ quarterSample() {
this.$refs.addQuarterItem.openDia(this.quarterTemItems, 'add')
},
- addTemQuarter () {
+ addTemQuarter() {
if (this.multipleSelection.length > 0) {
const multipleSelection = JSON.parse(JSON.stringify(this.multipleSelection))
if (multipleSelection.length > 0) {
@@ -395,7 +268,7 @@
}
return newReqParam
},
- lineSideWarehouseTableHeaderCellStyle({row, column, rowIndex, columnIndex}) {
+ lineSideWarehouseTableHeaderCellStyle({ row, column, rowIndex, columnIndex }) {
let headerStyle = 'background:#FAFAFA;color:#666;'
if (columnIndex === 0) {
headerStyle += 'border-radius: 6px 0px 0px 0px;'
@@ -435,11 +308,13 @@
>>>.el-table__header {
height: 70px;
}
+
.card {
height: calc(100% - 40px);
background: #ffffff;
padding: 10px;
}
+
.title {
text-align: right;
margin-bottom: 10px;
diff --git a/src/views/business/inspectionReview/index.vue b/src/views/business/inspectionReview/index.vue
index c84a188..a3d259d 100644
--- a/src/views/business/inspectionReview/index.vue
+++ b/src/views/business/inspectionReview/index.vue
@@ -250,7 +250,7 @@
{ label: '濮旀墭璇曢獙', value: 'Customer-ordered test', type: 'success' },
{ label: '鎶芥', value: '鎶芥', type: 'danger' },
{ label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�', type: 'info' },
- { label: '瀛ｅ害妫�楠�', value: 'Quarterly inspection', type: '' },
+ { label: '鍙潬鎬ф楠�', value: 'Quarterly inspection', type: '' },
],
urgencyLevel: [],
inspectionTaskState: [],
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 98a7ed7..aa138cb 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -330,7 +330,7 @@
},
{
value: "Quarterly inspection",
- label: "瀛ｅ害妫�楠�",
+ label: "鍙潬鎬ф楠�",
type: "warning",
effect: "plain",
},
diff --git a/src/views/business/materialOrder/commom/fileList.vue b/src/views/business/materialOrder/commom/fileList.vue
deleted file mode 100644
index 378cf0e..0000000
--- a/src/views/business/materialOrder/commom/fileList.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
- <el-dialog title="鏌ョ湅闄勪欢" :visible.sync="fileDialogVisible" width="800px" top="5vh" fullscreen append-to-body
- @close="handleClose">
- <filePreview v-if="lookDialogVisible" :fileUrl="currentInfo.fileMinioUrl" :currentFile="currentInfo"
- style="max-height: 90vh;overflow-y: auto;" />
- </el-dialog>
-</template>
-
-<script>
-import limsTable from "@/components/Table/lims-table.vue";
-import partFileList from "@/api/structural/workshop.js"
-import filePreview from "@/components/Preview/filePreview.vue";
-export default {
- components: {
- limsTable,
- filePreview,
- },
- props: {
- visible: {
- type: Boolean,
- default: false
- },
- partNo: {
- type: String,
- default: ''
- }
- },
- computed: {},
- data() {
- return {
- columnFile: [
- {
- dataType: 'tag',
- label: '绫诲瀷',
- prop: 'type',
- formatData: (params) => {
- if (params == 1) {
- return '鍥剧墖'
- } else if (params == 2) {
- return '鏂囦欢'
- } else {
- return ''
- }
- },
- formatType: (params) => {
- if (params == 1) {
- return 'success'
- } else if (params == 2) {
- return 'warning'
- } else {
- return ''
- }
- }
- },
- { label: '闄勪欢鍚嶇О', prop: 'fileName' },
- { label: '涓婁紶浜�', prop: 'name' },
- { label: '涓婁紶鏃堕棿', prop: 'createTime' },
- {
- dataType: 'action',
- fixed: 'right',
- label: '鎿嶄綔',
- width: '170px',
- operation: [
- {
- name: '涓嬭浇',
- type: 'text',
- clickFun: (row) => {
- this.handleDown(row);
- }
- },
- {
- name: '棰勮',
- type: 'text',
- clickFun: (row) => {
- console.log('棰勮鏂囦欢淇℃伅:', row)
- this.currentInfo = row
- this.lookDialogVisible = true
- }
- },
- ]
- }
- ],
- tableDataFile: [],
- tableLoadingFile: false,
- lookDialogVisible: false,
- currentInfo: {},
- fileDialogVisible: false,
- }
- },
- mounted() {
- this.getFileList()
- },
- methods: {
- // 鏌ヨ闄勪欢鏌ョ湅鍒楄〃鍥炶皟
- getFileList() {
- this.tableLoadingFile = true
- partFileList({ partNo: this.partNo }).then(res => {
- this.tableLoadingFile = false
- if (res.code === 200) {
- this.tableDataFile = res.data
- console.log('鏂囦欢鍒楄〃鏁版嵁:', this.tableDataFile)
- }
- }).catch(err => {
- this.tableLoadingFile = false
- })
- },
-
- // 涓嬭浇闄勪欢鐨勬枃浠�
- handleDown(row) {
- this.$download.saveAs(row.fileUrl, row.fileName);
- },
- }
-}
-</script>
-
-<style scoped></style>
\ No newline at end of file
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index 4c9dd8c..d0506ed 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -136,6 +136,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item class="addObj-form-item" label="杞﹂棿鍚嶇О:">
+ <el-input v-model="addObj.workShopName" class="addObj-info" clearable disabled size="small"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
<el-form-item class="addObj-form-item" label="澶囨敞:">
<el-input v-model="addObj.remark" :autosize="{ minRows: 2, maxRows: 2 }" :disabled="active > 1"
:placeholder="active > 1 ? '' : '璇疯緭鍏�'" clearable size="small" type="textarea"></el-input>
@@ -168,7 +173,7 @@
闄勪欢鏌ョ湅
</el-button>
<el-dialog :visible.sync="fileDialogVisible" title="闄勪欢鏌ョ湅" width="80%">
- <fileList :currentNo="partNo" v-if="fileDialogVisible" />
+ <fileList :currentNo="addObj.workShopId" v-if="fileDialogVisible" />
</el-dialog>
</el-form-item>
</el-form>
@@ -419,7 +424,7 @@
selectStandardProductList,
selectStandardTreeListByPartNo
} from "@/api/business/rawMaterialOrder";
-import fileList from "./commom/fileList.vue"
+import fileList from "../../structural/capabilityAndLaboratory/workshop/components/fileList.vue"
import limsTable from "@/components/Table/lims-table.vue";
export default {
@@ -477,6 +482,8 @@
typeSource: 1,
ifsInventoryId: '',
sampleStatus: 'In good condition',
+ workShopName: '',//杞﹂棿鍚嶇О
+ workShopId: '',//杞﹂棿ID
},
addObjRules: { // 琛ㄥ崟鏍￠獙瑙勫垯
testQuantity: [
@@ -560,7 +567,7 @@
value: 0
},
{
- label: '瀛ｅ害妫�楠�',
+ label: '鍙潬鎬ф楠�',
value: 1
},
],
@@ -632,7 +639,6 @@
methods: {
handleFileDialog() {
this.fileDialogVisible = true
- this.currentNo = addObj.partNo || customsInspection.partNo;
},
save1() {
if (this.bsm1DiaList.length > 0) {
@@ -749,6 +755,8 @@
this.$set(this.addObj, 'buyUnitMeas', this.customsInspection.buyUnitMeas)
this.$set(this.addObj, 'updateBatchNo', this.customsInspection.updateBatchNo)
this.$set(this.addObj, 'partDetail', this.customsInspection.partDesc)
+ this.$set(this.addObj, 'workShopName', res.data.workShopName)
+ this.$set(this.addObj, 'workShopId', res.data.workShopId)
if (this.orderType == 1) {
this.$set(this.addObj, 'orderType', 'Quarterly inspection')
}
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 4cb05c3..7e0afb0 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -67,7 +67,7 @@
<li :class="{ active: tabIndex === 0 }" @click="handleTab(0)">寰呬笅鍗�</li>
<li :class="{ active: tabIndex === 1 }" @click="handleTab(1)">妫�楠屼腑</li>
<li :class="{ active: tabIndex === 2 }" @click="handleTab(2)">宸叉楠�</li>
- <li :class="{ active: tabIndex === 4 }" @click="handleTab(4)">瀛ｅ害妫�楠�</li>
+ <li :class="{ active: tabIndex === 4 }" @click="handleTab(4)">鍙潬鎬ф楠�</li>
<li :class="{ active: tabIndex === 3 }" v-if="checkPermi(['get:Ifs:ByAll'])" @click="handleTab(3)">鍏ㄩ儴</li>
</ul>
</div>
@@ -102,7 +102,7 @@
:rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination3"
:height="'calc(100vh - 290px)'" key="tableData3" :page="page3" :tableLoading="tableLoading3"></lims-table>
</div>
- <!--瀛ｅ害妫�楠�-->
+ <!--鍙潬鎬ф楠�-->
<div class="table">
<lims-table :tableData="tableData4" :column="column4" v-if="tabIndex === 4" :isSelection="true"
:rowClassName="changeRowClass" :handleSelectionChange="selectMethod" @pagination="pagination4"
@@ -138,7 +138,7 @@
<!-- 鎾ら攢涓嬪崟 -->
<el-dialog :visible.sync="quashDialogVisible" title="涓嬪崟鎾ら攢" width="30%">
<el-button size="small" type="primary" @click="cancelQuashOrder('enterOrderId')">鎾ら攢杩涘巶妫�楠屼笅鍗�</el-button>
- <el-button size="small" type="primary" @click="cancelQuashOrder('quarterOrderId')">鎾ら攢瀛ｅ害妫�楠屼笅鍗�</el-button>
+ <el-button size="small" type="primary" @click="cancelQuashOrder('quarterOrderId')">鎾ら攢鍙潬鎬ф楠屼笅鍗�</el-button>
<span slot="footer" class="dialog-footer">
<el-row>
<el-button @click="quashDialogVisible = false">鍙� 娑�</el-button>
@@ -176,7 +176,7 @@
type="primary" @click="viewInsInfo0">鏌ョ湅</el-link>
</div>
<div>
- <span style="font-size: 16px;">瀛ｅ害妫�楠屽師濮嬫暟鎹�</span>
+ <span style="font-size: 16px;">鍙潬鎬ф楠屽師濮嬫暟鎹�</span>
<el-link :disabled="!insInfo.quarterOrderId" :underline="false" style="vertical-align: bottom;margin-left: 6px"
type="primary" @click="viewInsInfo1">鏌ョ湅</el-link>
</div>
@@ -476,7 +476,7 @@
label: '鎿嶄綔',
operation: [
{
- name: '瀛ｅ害妫�楠�',
+ name: '鍙潬鎬ф楠�',
type: 'text',
clickFun: (row) => {
this.playOrderSec(row);
@@ -527,7 +527,7 @@
},
},
{
- name: '瀛ｅ害鎾ら攢',
+ name: '鍙潬鎬ф挙閿�',
type: 'text',
clickFun: (row) => {
this.repealQuarter(row);
@@ -773,7 +773,7 @@
label: '鎿嶄綔',
operation: [
{
- name: '瀛ｅ害妫�楠�',
+ name: '鍙潬鎬ф楠�',
type: 'text',
clickFun: (row) => {
this.playOrderSec(row);
@@ -837,7 +837,7 @@
value: 2
},
{
- label: '瀛ｅ害妫�楠�',
+ label: '鍙潬鎬ф楠�',
value: 4
},
{
@@ -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, // 鎾ら攢涓嬪崟鎻愰啋寮规
@@ -919,7 +919,7 @@
// 宸叉楠屾煡璇�
this.getIfsByOverList()
} else if (this.tabIndex === 4) {
- // 鏌ヨ瀛ｅ害妫�楠�
+ // 鏌ヨ鍙潬鎬ф楠�
this.getIfsByQuarterList()
} else {
// 鍏ㄩ儴鏌ヨ
@@ -975,7 +975,7 @@
this.tableLoading2 = false
})
},
- // 鏌ヨ瀛ｅ害妫�楠�
+ // 鏌ヨ鍙潬鎬ф楠�
getIfsByQuarterList() {
this.tableLoading4 = true
if (null != this.entity.date) {
@@ -1080,9 +1080,9 @@
});
});
},
- // 瀛ｅ害鎾ら攢
+ // 鍙潬鎬ф挙閿�
repealQuarter(row) {
- this.$confirm('鏄惁鎾ら攢瀛ｅ害涓嬪崟?', "璀﹀憡", {
+ this.$confirm('鏄惁鎾ら攢鍙潬鎬т笅鍗�?', "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
@@ -1158,7 +1158,7 @@
playOrder(row) {
this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 0, customsInspection: row, active: 1 } });
},
- // 瀛ｅ害妫�楠屼笅鍗�
+ // 鍙潬鎬ф楠屼笅鍗�
playOrderSec(row) {
this.$router.push({ path: "/materialOrder/customsInspection", query: { orderType: 1, customsInspection: row, active: 1 } });
},
@@ -1231,7 +1231,7 @@
})
}).catch(() => { })
} else if (!row.enterOrderId && row.quarterOrderId) {
- this.$confirm('鏄惁鎾ら攢瀛ｅ害涓嬪崟?', "璀﹀憡", {
+ this.$confirm('鏄惁鎾ら攢鍙潬鎬т笅鍗�?', "璀﹀憡", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning"
diff --git a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
index c379f86..ee84eda 100644
--- a/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -110,7 +110,7 @@
value: 0
},
{
- label: '瀛ｅ害妫�楠�',
+ label: '鍙潬鎬ф楠�',
value: 1
},
],
diff --git a/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue b/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
index 63b475c..4f46028 100644
--- a/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/downFileDialog.vue
@@ -5,15 +5,14 @@
<span style="font-size: 16px;">杩涘巶妫�楠屾姤鍛婁笅杞�</span>
<i class="el-icon-paperclip" style="color:#409EFF;margin-left: 6px"></i>
<el-link :underline="false" style="vertical-align: bottom;font-size: 16px;"
- :disabled="!downLoadInfo.enterUrls && !downLoadInfo.enterUrl"
- type="primary" @click="downLoad0">鏌ョ湅</el-link>
+ :disabled="!downLoadInfo.enterUrls && !downLoadInfo.enterUrl" type="primary" @click="downLoad0">鏌ョ湅</el-link>
</div>
<div>
- <span style="font-size: 16px;">瀛ｅ害妫�楠屾姤鍛婁笅杞�</span>
+ <span style="font-size: 16px;">鍙潬鎬ф楠屾姤鍛婁笅杞�</span>
<i class="el-icon-paperclip" style="color:#409EFF;margin-left: 6px"></i>
<el-link :underline="false" style="vertical-align: bottom;font-size: 16px;"
- :disabled="!downLoadInfo.quarterUrls && !downLoadInfo.quarterUrl"
- type="primary" @click="downLoad1">鏌ョ湅</el-link>
+ :disabled="!downLoadInfo.quarterUrls && !downLoadInfo.quarterUrl" type="primary"
+ @click="downLoad1">鏌ョ湅</el-link>
</div>
</el-dialog>
</div>
@@ -31,7 +30,7 @@
},
downLoadInfo: {
type: Object,
- default: () => {}
+ default: () => { }
},
},
data() {
@@ -43,10 +42,10 @@
// 鏂规硶闆嗗悎
methods: {
// 杩涘巶妫�楠屾姤鍛婁笅杞�
- downLoad0 () {
+ downLoad0() {
let url = this.downLoadInfo.enterUrlS ? this.downLoadInfo.enterUrlS : this.downLoadInfo.enterUrl
- if(url){
- url = url.split('.')[0]+'.pdf'
+ if (url) {
+ url = url.split('.')[0] + '.pdf'
const link = document.createElement('a');
link.href = this.javaApi + url;
link.target = '_blank';
@@ -54,11 +53,11 @@
link.click();
}
},
- // 瀛ｅ害妫�楠屾姤鍛婁笅杞�
- downLoad1 () {
+ // 鍙潬鎬ф楠屾姤鍛婁笅杞�
+ downLoad1() {
let url = this.downLoadInfo.quarterUrlS ? this.downLoadInfo.quarterUrlS : this.downLoadInfo.quarterUrl
- if(url){
- url = url.split('.')[0]+'.pdf'
+ if (url) {
+ url = url.split('.')[0] + '.pdf'
const link = document.createElement('a');
link.href = this.javaApi + url;
link.target = '_blank';
@@ -71,7 +70,7 @@
</script>
<style scoped>
->>> .el-dialog {
+>>>.el-dialog {
height: 160px;
}
</style>
diff --git a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
index bfbebb4..4a21f75 100644
--- a/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
+++ b/src/views/business/materialOrderComponents/materialOrder/filesLookVisible.vue
@@ -106,7 +106,7 @@
value: 0
},
{
- label: '瀛ｅ害妫�楠�',
+ label: '鍙潬鎬ф楠�',
value: 1
},
],
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 6135f46..cc5da0b 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -777,7 +777,7 @@
temId: '',
sonLaboratoryList: [],
selectiveEcho: [], // 妫�楠屼笅鍗曠殑鏃跺�欏嬀閫夋楠岄」鐩�,濡傛灉浣跨敤绛涢�夋彁浜ゆ樉绀烘楠岄」鐩负绌� 鍥炴樉鍒楄〃
- quarterItemOptions: [], // 鏌ヨ瀛ｅ害淇℃伅
+ quarterItemOptions: [], // 鏌ヨ鍙潬鎬т俊鎭�
specialStandardMethod: '',
isSpecial: false,
}
diff --git a/src/views/business/productSamplingInfo/components/addQuarterItem.vue b/src/views/business/productSamplingInfo/components/addQuarterItem.vue
index 57e3908..fa47685 100644
--- a/src/views/business/productSamplingInfo/components/addQuarterItem.vue
+++ b/src/views/business/productSamplingInfo/components/addQuarterItem.vue
@@ -1,8 +1,9 @@
<template>
<div>
- <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="quarterSampleDia" title="瀛ｅ害鎶芥牱" width="90%" @close="quarterSampleDia = false">
+ <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="quarterSampleDia"
+ title="鍙潬鎬ф娊鏍�" width="90%" @close="quarterSampleDia = false">
<div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 10px">
- <div style="width: 30%;display: flex;align-items: center;" >
+ <div style="width: 30%;display: flex;align-items: center;">
<span style="width: 50px">缂栧彿锛�</span>
<el-input v-model="quarterSampleForm.quarterNo" :disabled="operationType !== 'add'" size="small"></el-input>
</div>
@@ -13,11 +14,11 @@
</div>
<div>
<el-table v-loading="tableLoading" :data="quarterItems" height="400" style="width: 100%"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
<el-table-column label="浜у搧绫诲瀷" prop="productType" width="200">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.productType" size="small"/>
+ <el-input v-model="row.productType" size="small" />
</template>
</template>
</el-table-column>
@@ -25,43 +26,37 @@
<el-table-column label="鍨嬪彿" prop="productModel" width="120">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.productModel" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.productModel" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column label="鎶芥牱鏁伴噺" min-width="340" prop="spotCheckNumber">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.spotCheckNumber" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.spotCheckNumber" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType === 'add'" label="鏁伴噺" min-width="120" prop="number">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.number" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.number" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType !== 'add'" label="鎶芥牱鏃堕棿" prop="spotCheckTime" width="160">
<template slot-scope="{row}">
<template>
- <el-date-picker v-model="row.spotCheckTime"
- format="yyyy-MM-dd"
- :disabled="operationType === 'view'"
- placeholder="閫夋嫨鏃ユ湡"
- size="small"
- clearable
- style="width:100%"
- type="date"
- value-format="yyyy-MM-dd">
+ <el-date-picker v-model="row.spotCheckTime" format="yyyy-MM-dd" :disabled="operationType === 'view'"
+ placeholder="閫夋嫨鏃ユ湡" size="small" clearable style="width:100%" type="date" value-format="yyyy-MM-dd">
</el-date-picker>
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType !== 'add'" label="璇曟牱缁撹" prop="result" width="130">
<template v-slot="scope">
- <el-select v-model="scope.row.result" placeholder="璇烽�夋嫨" size="small" clearable :disabled="operationType === 'view'">
+ <el-select v-model="scope.row.result" placeholder="璇烽�夋嫨" size="small" clearable
+ :disabled="operationType === 'view'">
<el-option label="鍚堟牸" value="鍚堟牸"></el-option>
<el-option label="涓嶅悎鏍�" value="涓嶅悎鏍�"></el-option>
</el-select>
@@ -70,54 +65,60 @@
<el-table-column v-if="operationType !== 'add'" label="鍙栨牱浜哄憳" prop="samplingUser" width="120">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.samplingUser" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.samplingUser" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="itemRemark" width="200">
<template slot-scope="{row}">
<template>
- <el-input v-model="row.itemRemark" size="small" :disabled="operationType === 'view'"/>
+ <el-input v-model="row.itemRemark" size="small" :disabled="operationType === 'view'" />
</template>
</template>
</el-table-column>
<el-table-column v-if="operationType !== 'view'" fixed="right" label="鎿嶄綔" width="100">
<template slot-scope="scope">
- <el-button size="small" style="color: #f56c6c" type="text" @click="deleteScope(scope.$index)">鍒犻櫎</el-button>
+ <el-button size="small" style="color: #f56c6c" type="text"
+ @click="deleteScope(scope.$index)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div style="display: flex;align-items: center;margin: 10px 0">
<span style="width: 70px">澶囨敞锛�</span>
- <el-input v-model="quarterSampleForm.remark" :disabled="operationType === 'view'" size="small" style="width: 43%" type="textarea"></el-input>
+ <el-input v-model="quarterSampleForm.remark" :disabled="operationType === 'view'" size="small"
+ style="width: 43%" type="textarea"></el-input>
</div>
<div v-if="operationType !== 'add'">
<el-form ref="form" :model="editForm" label-width="70px">
<el-col :span="12">
<el-form-item label="缂栧埗浜猴細">
- <el-select v-model="editForm.writeUser" :disabled="operationType !=='edit'" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.writeUser" :disabled="operationType !== 'edit'" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="浼氱浜猴細">
- <el-select v-model="editForm.countersignUser" :disabled="operationType !=='edit'" multiple placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.countersignUser" :disabled="operationType !== 'edit'" multiple
+ placeholder="璇烽�夋嫨" size="small" style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="瀹℃牳浜猴細">
- <el-select v-model="editForm.examineUser" :disabled="operationType !=='edit'" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.examineUser" :disabled="operationType !== 'edit'" placeholder="璇烽�夋嫨"
+ size="small" style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎵瑰噯浜猴細">
- <el-select v-model="editForm.ratifyUser" :disabled="operationType !=='edit'" placeholder="璇烽�夋嫨" size="small" style="width: 100%">
+ <el-select v-model="editForm.ratifyUser" :disabled="operationType !== 'edit'" placeholder="璇烽�夋嫨"
+ size="small" style="width: 100%">
<el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
@@ -127,15 +128,16 @@
<span slot="footer" class="dialog-footer">
<el-button @click="quarterSampleDia = false">鍙� 娑�</el-button>
<el-button v-if="operationType === 'add'" @click="quarterSampleDia = false">淇� 瀛�</el-button>
- <el-button v-if="operationType !== 'add' && operationType !== 'view'" type="primary" @click="handleSample">纭� 瀹�</el-button>
+ <el-button v-if="operationType !== 'add' && operationType !== 'view'" type="primary" @click="handleSample">纭�
+ 瀹�</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
-import {addQuarter, getQuarter, updateQuarterOnOrder} from "@/api/business/productSamplingInfo";
-import {selectUserCondition} from "@/api/performance/class";
+import { addQuarter, getQuarter, updateQuarterOnOrder } from "@/api/business/productSamplingInfo";
+import { selectUserCondition } from "@/api/performance/class";
export default {
name: "addQuarterItem",
@@ -145,7 +147,7 @@
// 杩欓噷瀛樻斁鏁版嵁
return {
tableLoading: false,
- quarterSampleDia: false, // 瀛ｅ害鎶芥牱寮规
+ quarterSampleDia: false, // 鍙潬鎬ф娊鏍峰脊妗�
quarterSampleForm: {
quarterNo: '', // 缂栧彿
},
@@ -168,7 +170,7 @@
},
// 鏂规硶闆嗗悎
methods: {
- openDia (quarterTemItems, type) {
+ openDia(quarterTemItems, type) {
this.quarterSampleDia = true
this.operationType = type
if (type === 'add') {
@@ -179,7 +181,7 @@
} else {
this.tableLoading = true
this.quarterRow = quarterTemItems
- getQuarter({quarterId: quarterTemItems.quarterId}).then(res => {
+ getQuarter({ quarterId: quarterTemItems.quarterId }).then(res => {
this.tableLoading = false
if (res.code === 200) {
this.quarterItems = res.data.quarterItems
@@ -197,7 +199,7 @@
}
},
// 鎵嬪姩娣诲姞
- addQuarter () {
+ addQuarter() {
this.quarterItems.push({
productType: '',
dutyUser: JSON.parse(localStorage.getItem("user")).name,
@@ -210,8 +212,8 @@
itemRemark: '',
})
},
- // 鎻愪氦瀛ｅ害鎶芥牱
- handleSample () {
+ // 鎻愪氦鍙潬鎬ф娊鏍�
+ handleSample() {
this.$confirm('鏄惁鎻愪氦璇ユ暟鎹�', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -231,7 +233,7 @@
}
})
} else {
- const params = {...this.editForm}
+ const params = { ...this.editForm }
if (params.countersignUser.length > 0) {
params.countersignUser = params.countersignUser.join(',')
} else {
@@ -255,16 +257,16 @@
},
// 娓呯┖鎶芥牱璁″垝
- clearTable () {
+ clearTable() {
this.quarterItems = []
this.$parent.quarterTemItems = []
},
// 鎵嬪姩鍒犻櫎
- deleteScope (index) {
+ deleteScope(index) {
this.quarterItems.splice(index, 1)
},
- // 鍏抽棴瀛ｅ害鎶芥牱寮规
- closeQuarterSampleDia () {
+ // 鍏抽棴鍙潬鎬ф娊鏍峰脊妗�
+ closeQuarterSampleDia() {
this.quarterSampleDia = false
if (this.operationType === 'add') {
this.$parent.handleStockList()
@@ -272,7 +274,7 @@
this.$parent.refreshTable()
}
},
- getUserList(){
+ getUserList() {
selectUserCondition().then((res) => {
this.userList = res.data;
})
@@ -287,5 +289,4 @@
}
</script>
-<style scoped>
-</style>
+<style scoped></style>
diff --git a/src/views/business/productSamplingInfo/index.vue b/src/views/business/productSamplingInfo/index.vue
index 666512e..166404a 100644
--- a/src/views/business/productSamplingInfo/index.vue
+++ b/src/views/business/productSamplingInfo/index.vue
@@ -19,9 +19,10 @@
<div>
<div class="table">
<ul class="tab">
- <li v-for="(m, i) in tabList" :key="i" :class="{ active: i === tabIndex }" @click="handleTab(m, i)">{{ m.label }}</li>
+ <li v-for="(m, i) in tabList" :key="i" :class="{ active: i === tabIndex }" @click="handleTab(m, i)">{{ m.label
+ }}</li>
</ul>
- <!--瀛ｅ害-->
+ <!--鍙潬鎬�-->
<lims-table :tableData="tableData" :column="column" v-if="tabIndex === 0" @pagination="pagination"
:height="'calc(100vh - 290px)'" :page="page" :tableLoading="tableLoading"></lims-table>
<!--骞村害-->
@@ -34,8 +35,8 @@
<div style="display: flex;align-items: center;justify-content: space-between;margin-bottom: 10px">
<div style="width: 30%;display: flex;align-items: center;">
<el-input v-if="operationType !== 'view'" v-model="currentYear" size="small" />
- <span v-if="operationType === 'view'"
- style="width: 160px;font-size: 18px;font-weight: 600">{{ currentYear }}</span>
+ <span v-if="operationType === 'view'" style="width: 160px;font-size: 18px;font-weight: 600">{{ currentYear
+ }}</span>
</div>
<div v-if="operationType !== 'view'">
<el-button size="small" type="primary" @click="addQuarter">娣诲姞</el-button>
@@ -44,7 +45,7 @@
</div>
<div>
<el-table :data="yearItems" border height="450" style="width: 100%"
- :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
+ :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }">
<el-table-column label="绫诲埆" prop="yearType" width="240">
<template slot-scope="{row}">
<template v-if="operationType !== 'view'">
@@ -261,7 +262,7 @@
tabIndex: 0,
tabList: [
{
- label: '瀛ｅ害',
+ label: '鍙潬鎬�',
value: 0
},
{
@@ -434,15 +435,15 @@
this.page1.size = page.limit
this.refreshTable()
},
- // 缂栬緫瀛ｅ害鎶芥牱
+ // 缂栬緫鍙潬鎬ф娊鏍�
editForm(row) {
this.$refs.addQuarterItem.openDia(row, 'edit')
},
- // 鏌ョ湅瀛ｅ害鎶芥牱
+ // 鏌ョ湅鍙潬鎬ф娊鏍�
viewQuarterInfo(row) {
this.$refs.addQuarterItem.openDia(row, 'view')
},
- // 鍒犻櫎瀛ｅ害鎶芥牱
+ // 鍒犻櫎鍙潬鎬ф娊鏍�
deleteQuarterInfo(row) {
this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
confirmButtonText: "纭畾",
@@ -463,7 +464,7 @@
finalReportQuarter({ quarterId: row.quarterId, random: randomNum }).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '瀛ｅ害鎶芥牱淇℃伅瀵煎嚭.docx')
+ this.$download.saveAs(blob, '鍙潬鎬ф娊鏍蜂俊鎭鍑�.docx')
})
},
// 骞村害涓嬭浇
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 4e41931..b0d524c 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -186,8 +186,8 @@
<el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
</el-upload>
</div>
- <lims-table :tableData="tableDataFile" :column="columnFile" height="500px"
- key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
+ <lims-table :tableData="tableDataFile" :column="columnFile" height="500px" key="tableDataFile"
+ :tableLoading="tableLoadingFile"></lims-table>
</el-dialog>
</div>
</template>
@@ -207,7 +207,7 @@
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
import limsTable from "@/components/Table/lims-table.vue";
-import {delFile, downFile, getFileList} from "@/api/business/rawMaterialOrder";
+import { delFile, downFile, getFileList } from "@/api/business/rawMaterialOrder";
export default {
name: 'ReportPreparation',
components: { limsTable, onlyoffice },
@@ -257,7 +257,7 @@
{ label: '濮旀墭璇曢獙', value: 'Customer-ordered test' },
{ label: '鎶芥', value: '鎶芥' },
{ label: '杩涘巶妫�楠�', value: '杩涘巶妫�楠�' },
- { label: '瀛ｅ害妫�楠�', value: 'Quarterly inspection' },
+ { label: '鍙潬鎬ф楠�', value: 'Quarterly inspection' },
],
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
isReport: 1,
diff --git a/src/views/statisticalCharts/qualificationRateStatistics/index.vue b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
index 17fd9a9..8a828ba 100644
--- a/src/views/statisticalCharts/qualificationRateStatistics/index.vue
+++ b/src/views/statisticalCharts/qualificationRateStatistics/index.vue
@@ -11,18 +11,9 @@
<el-col :span="20">
<el-form ref="entity" size="small" :inline="true">
<el-form-item style="width: 20%;">
- <el-date-picker
- v-model="datePicker"
- end-placeholder="缁撴潫鏃ユ湡"
- format="yyyy-MM-dd"
- placeholder="閫夋嫨鏃ユ湡"
- range-separator="鑷�"
- size="small"
- start-placeholder="寮�濮嬫棩鏈�"
- type="daterange"
- style="width: 100%;"
- value-format="yyyy-MM-dd"
- @change="changeDatePicker">
+ <el-date-picker v-model="datePicker" end-placeholder="缁撴潫鏃ユ湡" format="yyyy-MM-dd" placeholder="閫夋嫨鏃ユ湡"
+ range-separator="鑷�" size="small" start-placeholder="寮�濮嬫棩鏈�" type="daterange" style="width: 100%;"
+ value-format="yyyy-MM-dd" @change="changeDatePicker">
</el-date-picker>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О" prop="sampleName">
@@ -32,7 +23,8 @@
<el-input v-model="modelName" clearable placeholder="璇疯緭鍏ュ瀷鍙�" size="small" @change="changeDate"></el-input>
</el-form-item>
<el-form-item label="渚涘簲鍟嗗悕绉�" prop="supplierName">
- <el-input v-model="supplierName" clearable placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" size="small" @change="changeDate"></el-input>
+ <el-input v-model="supplierName" clearable placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О" size="small"
+ @change="changeDate"></el-input>
</el-form-item>
</el-form>
</el-col>
@@ -41,38 +33,23 @@
<el-col :span="8">
<div class="pie-card">
<div class="title">鍘熸潗鏂欏悎鏍肩巼</div>
- <span class="data">{{passRate}}</span>
- <Echarts ref="chart"
- :legend="pieLegend"
- :series="materialPieSeries"
- :tooltip="pieTooltip"
- style="height: 36vh;"></Echarts>
+ <span class="data">{{ passRate }}</span>
+ <Echarts ref="chart" :legend="pieLegend" :series="materialPieSeries" :tooltip="pieTooltip"
+ style="height: 36vh;"></Echarts>
</div>
</el-col>
<el-col :span="8">
<div class="pie-card">
<div class="title"><span style="color: #F56C6C">鏈湀</span>妫�楠岀被鍨嬫暟閲�</div>
- <Echarts ref="chart"
- :chartStyle="chartStyle2"
- :legend="pieLegend"
- :series="materialPieSeries1"
- :tooltip="pieTooltip"
- style="height: 36vh;"></Echarts>
+ <Echarts ref="chart" :chartStyle="chartStyle2" :legend="pieLegend" :series="materialPieSeries1"
+ :tooltip="pieTooltip" style="height: 36vh;"></Echarts>
</div>
</el-col>
<el-col :span="8">
<div class="pie-card">
<div class="title">鍘熸潗鏂�<span style="color: #F56C6C">鏈湀</span>涓�<span style="color: #F56C6C">涓婃湀</span>鍚堟牸鐜囧姣�</div>
- <Echarts ref="chart"
- :barColors="barColors2"
- :chartStyle="chartStyle"
- :grid="grid"
- :legend="barLegend"
- :series="barSeries"
- :tooltip="tooltip"
- :xAxis="xAxis1"
- :yAxis="yAxis1"
- style="height: 36vh;"></Echarts>
+ <Echarts ref="chart" :barColors="barColors2" :chartStyle="chartStyle" :grid="grid" :legend="barLegend"
+ :series="barSeries" :tooltip="tooltip" :xAxis="xAxis1" :yAxis="yAxis1" style="height: 36vh;"></Echarts>
</div>
</el-col>
</el-row>
@@ -80,17 +57,9 @@
<el-col :span="24">
<div class="inspection-card">
<div class="title">鍚堟牸鐜�</div>
- <Echarts ref="chart"
- :barColors="barColors"
- :grid="grid"
- :legend="legend"
- :lineColors="lineColors"
- :options="echartsOptions"
- :series="echartsSeries"
- :tooltip="tooltip"
- :xAxis="xAxis"
- :yAxis="yAxis"
- style="height: 40vh;"></Echarts>
+ <Echarts ref="chart" :barColors="barColors" :grid="grid" :legend="legend" :lineColors="lineColors"
+ :options="echartsOptions" :series="echartsSeries" :tooltip="tooltip" :xAxis="xAxis" :yAxis="yAxis"
+ style="height: 40vh;"></Echarts>
</div>
</el-col>
</el-row>
@@ -109,7 +78,7 @@
export default {
name: "QualificationRateStatistics",
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
- components: {Echarts},
+ components: { Echarts },
data() {
// 杩欓噷瀛樻斁鏁版嵁
return {
@@ -189,7 +158,7 @@
containLabel: true
},
legend: {
- data: ['鎬绘暟','鍚堟牸鐜�']
+ data: ['鎬绘暟', '鍚堟牸鐜�']
},
tooltip: {
trigger: 'axis',
@@ -271,7 +240,7 @@
data: [
{ value: 0, name: '濮旀墭妫�楠�' },
{ value: 0, name: '杩涘巶妫�楠�' },
- { value: 0, name: '瀛ｅ害妫�楠�' },
+ { value: 0, name: '鍙潬鎬ф楠�' },
{ value: 0, name: '鎶芥牱' },
]
}
@@ -376,7 +345,7 @@
getOrderTypeCookie().then((res) => {
this.materialPieSeries1[0].data[0].value = res.data.customer // 濮旀墭
this.materialPieSeries1[0].data[1].value = res.data.enter // 杩涘巶
- this.materialPieSeries1[0].data[2].value = res.data.quarterly // 瀛ｅ害
+ this.materialPieSeries1[0].data[2].value = res.data.quarterly // 鍙潬鎬�
this.materialPieSeries1[0].data[3].value = res.data.spotCheck // 鎶芥牱
})
},
@@ -393,13 +362,13 @@
this.barSeries[0].data = barData
})
},
- changeDate () {
+ changeDate() {
this.getBar()
this.getRawPass()
// this.getOrderType()
// this.getPassRateCom()
},
- changeDatePicker (val) {
+ changeDatePicker(val) {
if (val) {
this.beginDate = val[0] + ' 00:00:00'
this.endDate = val[1] + ' 23:59:59'
@@ -420,15 +389,18 @@
.title {
padding: 10px 0 0 20px;
}
+
.table {
padding: 0 10px 10px;
}
+
.pie-card {
width: 100%;
background: #FFFFFF;
margin-top: 10px;
position: relative;
}
+
.data {
position: absolute;
font-size: 20px;
@@ -437,7 +409,8 @@
top: 42%;
z-index: 1;
}
-.inspection-card{
+
+.inspection-card {
width: 100%;
background: #FFFFFF;
margin-top: 10px;
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
index 6f3c320..d5b0e31 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
@@ -30,8 +30,9 @@
<el-col :span="12">
<el-form-item label="妫�楠屽璞★細" prop="sample">
<el-cascader v-model="editForm.sample" :options="itemParameterData.cascaderField.sample.tree"
- :props="{ value: 'name', label: 'name', checkStrictly: true, multiple: true }" :show-all-levels="false"
- clearable filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%;"></el-cascader>
+ :props="{ value: 'labelName', label: 'name', checkStrictly: true, multiple: true }"
+ :show-all-levels="false" clearable filterable placeholder="璇烽�夋嫨" size="small"
+ style="width: 100%;"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="12">
--
Gitblit v1.9.3