From 057342138feb3dfd78351930df66ec6bb04990e1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 12 十二月 2023 10:43:19 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/basic/division/index.vue | 2 +-
src/views/basic/param/index.vue | 2 +-
src/views/basic/location/index.vue | 2 +-
src/views/basic/part/index.vue | 17 +++++++++++------
src/views/quality/processconfiguration/index.vue | 10 +++++-----
src/views/quality/finishedProductInspection/index.vue | 4 ++--
src/views/basic/workstation/index.vue | 2 +-
src/views/basic/warehouse/index.vue | 2 +-
src/views/quality/processInspect/index.vue | 8 ++++----
src/views/quality/rawMaterial/index.vue | 2 +-
src/views/common/ztt-table.vue | 8 ++++++++
11 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/src/views/basic/division/index.vue b/src/views/basic/division/index.vue
index 5fe0c36..bfea656 100644
--- a/src/views/basic/division/index.vue
+++ b/src/views/basic/division/index.vue
@@ -37,7 +37,7 @@
multipleSelection: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/division/upload'
},
prelang: 'operation',
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index d1c959d..7015cc8 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -44,7 +44,7 @@
mulLocation: [],
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/location/upload'
},
prelang: 'operation',
diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index c3f0223..e7dc72f 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -36,7 +36,7 @@
isShowQuery: false,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/param/upload'
},
prelang: 'operation',
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 52582c8..3266ab8 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -93,7 +93,8 @@
multiSelect: true, //
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
- isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
+ isSearch: false, // 楂樼骇鏌ヨ鎸夐挳,
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'id', direction: 'desc' }
},
table: {
@@ -190,7 +191,7 @@
searchInfoType: 'text'
},
// 涓�绾у垎绫�
- /* {
+ {
minWidth: '120',
prop: 'assortment',
label: '涓�绾у垎绫�',
@@ -227,7 +228,7 @@
optList: () => {
return this.getThreeLevelClassification()
}
- }, */
+ },
// 瑙勬牸
{
minWidth: '140',
@@ -448,14 +449,16 @@
created() {
this.table.column.find((e) => e.label === 'IFS鍚敤鎵规绠＄悊').isTrue = false
this.table.column.find((e) => e.label === '璁″垝鏂规硶').isTrue = false
- this.getUnitType('unit')
- this.getMaterialType('material_type')
this.getCategoryType('category')
this.getAssortmentType('assortment')
this.getPlanningMethodType('planning_method_type')
this.getThreeLevelClassificationType('three_classification_type')
- this.getMaterialAttributeType()
this.getExaminerDict('examiner_type')
+ },
+ mounted(){
+ this.getUnitType('unit')
+ this.getMaterialType('material_type')
+ this.getMaterialAttributeType()
},
computed: {
...mapGetters(['permissions'])
@@ -501,7 +504,9 @@
})
},
getMaterialType(type) {
+ console.log(type);
remote(type).then((response) => {
+ console.log("绫诲瀷",response);
const code = response.data.code
if (code === 0) {
const _data = response.data.data
diff --git a/src/views/basic/warehouse/index.vue b/src/views/basic/warehouse/index.vue
index df19356..7846c8b 100644
--- a/src/views/basic/warehouse/index.vue
+++ b/src/views/basic/warehouse/index.vue
@@ -39,7 +39,7 @@
isShowQuery: false,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/warehouse/uploadExcel'
},
prelang: 'operation',
diff --git a/src/views/basic/workstation/index.vue b/src/views/basic/workstation/index.vue
index dd1f2e5..c038c4c 100644
--- a/src/views/basic/workstation/index.vue
+++ b/src/views/basic/workstation/index.vue
@@ -37,7 +37,7 @@
innerVisible: false,
uploadInfo: {
// 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
- isShow: true,
+ isShow: false,
url: '/mes/workstation/upload'
},
prelang: 'workstation',
diff --git a/src/views/common/ztt-table.vue b/src/views/common/ztt-table.vue
index 37f0ef7..41c2e5b 100644
--- a/src/views/common/ztt-table.vue
+++ b/src/views/common/ztt-table.vue
@@ -1576,10 +1576,18 @@
if (response.code != '0') {
this.$message.warning(response.msg)
} else {
+ if(response.data!=""&&response.data!=[]){
+ this.$message({
+ message: response.data,
+ type: 'success'
+ })
+ }else{
this.$message({
message: '涓婁紶鎴愬姛',
type: 'success'
})
+ }
+ this.importDialogVisible=false
this.getDataList()
}
this.$refs.uploadScan.clearFiles()
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 595bedd..802e21e 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -192,12 +192,12 @@
text: '鏂板',
type: 'primary',
fun: this.addOrUpdateHandle
- }, */
+ },
{
text: '瀵煎嚭',
type: 'primary',
fun: this.exportExcel
- }
+ }*/
],
operator: [{
text: '鎵撳嵃',
diff --git a/src/views/quality/processInspect/index.vue b/src/views/quality/processInspect/index.vue
index 7059180..8c7a8b7 100644
--- a/src/views/quality/processInspect/index.vue
+++ b/src/views/quality/processInspect/index.vue
@@ -160,10 +160,10 @@
type: 'primary',
fun: this.addOrUpdateHandle
},
- {
- text: '瀵煎嚭',
- fun: this.exportExcel
- }
+ // {
+ // text: '瀵煎嚭',
+ // fun: this.exportExcel
+ // }
],
operator: [{
text: '浣滃簾',
diff --git a/src/views/quality/processconfiguration/index.vue b/src/views/quality/processconfiguration/index.vue
index 56ed60e..2802435 100644
--- a/src/views/quality/processconfiguration/index.vue
+++ b/src/views/quality/processconfiguration/index.vue
@@ -266,11 +266,11 @@
],
toolbar: [
- {
- text: '瀵煎嚭',
- type: 'primary',
- fun: this.handleExport
- },
+ // {
+ // text: '瀵煎嚭',
+ // type: 'primary',
+ // fun: this.handleExport
+ // },
],
operator: [
// {
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 0c11eb8..267b919 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -27,7 +27,7 @@
@queryParam="getQueryParam($event)"
ref="rawMaterialTable">
<template #toolbar>
- <el-button @click="exportRawMaterial" type="primary" >瀵煎嚭</el-button>
+ <!-- <el-button @click="exportRawMaterial" type="primary" >瀵煎嚭</el-button> -->
</template>
</ttable>
</basic-container>
--
Gitblit v1.9.3