From ffbcb7980d8d196c6df1146a7018351c8096e971 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 13 十二月 2023 16:08:11 +0800
Subject: [PATCH] modified: src/views/basic/company/index.vue modified: src/views/basic/crew/crew-form.vue modified: src/views/basic/division/index.vue modified: src/views/basic/factory/index.vue modified: src/views/basic/location/index.vue modified: src/views/basic/param/index.vue modified: src/views/basic/part/index.vue modified: src/views/basic/template/index.vue modified: src/views/basic/warehouse/index.vue modified: src/views/basic/workstation/workstation-form.vue modified: src/views/plan/manufacturingorder/customerorder.vue modified: src/views/technology/document/teststandard.vue
---
src/views/basic/division/index.vue | 1 +
src/views/basic/param/index.vue | 1 +
src/views/basic/template/index.vue | 1 +
src/views/basic/location/index.vue | 1 +
src/views/basic/part/index.vue | 2 --
src/views/basic/workstation/workstation-form.vue | 4 ++--
src/views/plan/manufacturingorder/customerorder.vue | 12 ++----------
src/views/basic/factory/index.vue | 1 +
src/views/basic/warehouse/index.vue | 1 +
src/views/basic/company/index.vue | 5 +++++
src/views/technology/document/teststandard.vue | 1 -
src/views/basic/crew/crew-form.vue | 4 ++--
12 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/views/basic/company/index.vue b/src/views/basic/company/index.vue
index 2e49f73..8ab14b4 100644
--- a/src/views/basic/company/index.vue
+++ b/src/views/basic/company/index.vue
@@ -49,6 +49,7 @@
isShowHide:true,//鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch:false,//楂樼骇鏌ヨ鎸夐挳
isCopy: true,
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy:{column:'createTime',direction:'desc'}
},
table: {
@@ -108,6 +109,10 @@
},
methods: {
hello(){
+ if(this.multipleSelection.length < 1){
+ this.$message.error("璇峰厛閫夋嫨瑕佸鍒剁殑鏁版嵁!")
+ return
+ }
copy(this.multipleSelection).then(response =>{
this.getData()
})
diff --git a/src/views/basic/crew/crew-form.vue b/src/views/basic/crew/crew-form.vue
index a388a1a..de33d0b 100644
--- a/src/views/basic/crew/crew-form.vue
+++ b/src/views/basic/crew/crew-form.vue
@@ -24,11 +24,11 @@
>纭畾</el-button
>
</span>
- <staffDialog
+ <!-- <staffDialog
:currshowlist.sync="showStaff"
:multiSelect="true"
@handleSelectionChange="selectStaff"
- />
+ /> -->
</el-dialog>
</template>
diff --git a/src/views/basic/division/index.vue b/src/views/basic/division/index.vue
index bfea656..2a86d74 100644
--- a/src/views/basic/division/index.vue
+++ b/src/views/basic/division/index.vue
@@ -52,6 +52,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/factory/index.vue b/src/views/basic/factory/index.vue
index f9c85c9..d5d4b83 100644
--- a/src/views/basic/factory/index.vue
+++ b/src/views/basic/factory/index.vue
@@ -53,6 +53,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: false, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/location/index.vue b/src/views/basic/location/index.vue
index 7015cc8..dfb4f75 100644
--- a/src/views/basic/location/index.vue
+++ b/src/views/basic/location/index.vue
@@ -59,6 +59,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index e7dc72f..071af0d 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -51,6 +51,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 3266ab8..7da5a07 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -504,9 +504,7 @@
})
},
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/template/index.vue b/src/views/basic/template/index.vue
index 0c21557..22996f0 100644
--- a/src/views/basic/template/index.vue
+++ b/src/views/basic/template/index.vue
@@ -204,6 +204,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'id', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/warehouse/index.vue b/src/views/basic/warehouse/index.vue
index 7846c8b..c2d706c 100644
--- a/src/views/basic/warehouse/index.vue
+++ b/src/views/basic/warehouse/index.vue
@@ -54,6 +54,7 @@
seqNo: true,
isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳
isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
+ isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
defaultOrderBy: { column: 'createTime', direction: 'desc' }
},
table: {
diff --git a/src/views/basic/workstation/workstation-form.vue b/src/views/basic/workstation/workstation-form.vue
index 7366bbb..f9f8c9e 100644
--- a/src/views/basic/workstation/workstation-form.vue
+++ b/src/views/basic/workstation/workstation-form.vue
@@ -1,10 +1,10 @@
<template>
<el-dialog
- v-diadrag
:title="!dataForm.id ? '鏂板' : '淇敼'"
:close-on-click-modal="false"
:visible.sync="visible"
- style="min-width: 2000px"
+ width="60%"
+ top="5vh"
>
<el-row>
<el-form
diff --git a/src/views/plan/manufacturingorder/customerorder.vue b/src/views/plan/manufacturingorder/customerorder.vue
index 81fa5d7..cafc820 100644
--- a/src/views/plan/manufacturingorder/customerorder.vue
+++ b/src/views/plan/manufacturingorder/customerorder.vue
@@ -321,16 +321,6 @@
</el-tab-pane>
</el-tabs>
</el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="visible = false">鍙栨秷</el-button>
- <el-button
- type="primary"
- :disabled="buttonDisable"
- v-thinclick="`dataFormSubmit`"
- v-if="editable"
- >纭畾</el-button
- >
- </span>
</el-tab-pane>
</el-tabs>
</template>
@@ -369,6 +359,8 @@
fileList: [],
title: '',
orderParamList: [],
+ progrecessFileLoading: false,
+ editable: true,
isFullScreen: false,
visible: false,
buttonDisable: false,
diff --git a/src/views/technology/document/teststandard.vue b/src/views/technology/document/teststandard.vue
index 64e25ab..8a21d7e 100644
--- a/src/views/technology/document/teststandard.vue
+++ b/src/views/technology/document/teststandard.vue
@@ -188,7 +188,6 @@
getTestStand(this.paramObj)
},
mounted(){
- console.log(11111);
getTestStand(this.paramObj)
},
methods: {
--
Gitblit v1.9.3