From 68edca7409736705db50504b003cba66bb4ccd6e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 08 八月 2023 11:08:50 +0800
Subject: [PATCH] 1.新增用户组管理
---
src/views/makeModel/InventoryList.vue | 242 +++++++++++++++++++++++++-----------------------
1 files changed, 125 insertions(+), 117 deletions(-)
diff --git a/src/views/makeModel/InventoryList.vue b/src/views/makeModel/InventoryList.vue
index 6edf62f..35f4bc1 100644
--- a/src/views/makeModel/InventoryList.vue
+++ b/src/views/makeModel/InventoryList.vue
@@ -218,7 +218,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="total,prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes,jumper"
popper-class="select_bottom"
@pagination="getInventoryFileSelect"
/>
@@ -336,85 +336,85 @@
</el-form-item>
</el-form>
- <el-collapse>
- <el-collapse-item title="涓�鑷存�� Consistency" name="1">
- <template slot="title">
- <div>
- <i
- class="el-icon-s-operation"
- :style="{color:$store.state.settings.theme}"
- style="margin: -20px 10px 20px 20px"
- />楂樼骇璁剧疆锛�
- </div>
- </template>
- <div
- style="display: flex;flex-direction: column;height: 140px; align-content: center;justify-content: space-between"
- >
- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
- <div>
- <el-tooltip
- class="item"
- effect="dark"
- content=""
- placement="top"
- >
- <div slot="content" style="width: 300px">
- 鍚敤绠＄悊鍚庡簱瀛樻暟閲忎細鎸夋爣绛惧垎寮�鏄剧ず锛岄渶瑕佸仛閲囪喘鍒拌揣鎵嶈兘鍏ュ簱锛屼笖鐢熶骇鍙戞枡闇�瑕佹壂鐮佹爣绛捐繘琛屽彂鏂欙紝涓嶅惎鐢ㄦ壒娆＄鐞嗙殑涓嶉渶瑕侀噰璐埌璐э紝鍙互鐩存帴閫夋嫨鐗╂枡閲囪喘鍏ュ簱锛屼笖鍏ュ簱鍚庝細鍚堝苟鏄剧ず璇ョ墿鏂欑殑搴撳瓨锛岀敓浜у彂鏂欏垯鎸夊簱浣嶈繘琛屽嚭搴撱��
- </div>
- <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
- </el-tooltip>
- </div>
+ <!-- <el-collapse>-->
+ <!-- <el-collapse-item title="涓�鑷存�� Consistency" name="1">-->
+ <!-- <template slot="title">-->
+ <!-- <div>-->
+ <!-- <i-->
+ <!-- class="el-icon-s-operation"-->
+ <!-- :style="{color:$store.state.settings.theme}"-->
+ <!-- style="margin: -20px 10px 20px 20px"-->
+ <!-- />楂樼骇璁剧疆锛�-->
+ <!-- </div>-->
+ <!-- </template>-->
+ <!-- <div-->
+ <!-- style="display: flex;flex-direction: column;height: 140px; align-content: center;justify-content: space-between"-->
+ <!-- >-->
+ <!-- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">-->
+ <!-- <div>-->
+ <!-- <el-tooltip-->
+ <!-- class="item"-->
+ <!-- effect="dark"-->
+ <!-- content=""-->
+ <!-- placement="top"-->
+ <!-- >-->
+ <!-- <div slot="content" style="width: 300px">-->
+ <!-- 鍚敤绠＄悊鍚庡簱瀛樻暟閲忎細鎸夋爣绛惧垎寮�鏄剧ず锛岄渶瑕佸仛閲囪喘鍒拌揣鎵嶈兘鍏ュ簱锛屼笖鐢熶骇鍙戞枡闇�瑕佹壂鐮佹爣绛捐繘琛屽彂鏂欙紝涓嶅惎鐢ㄦ壒娆＄鐞嗙殑涓嶉渶瑕侀噰璐埌璐э紝鍙互鐩存帴閫夋嫨鐗╂枡閲囪喘鍏ュ簱锛屼笖鍏ュ簱鍚庝細鍚堝苟鏄剧ず璇ョ墿鏂欑殑搴撳瓨锛岀敓浜у彂鏂欏垯鎸夊簱浣嶈繘琛屽嚭搴撱��-->
+ <!-- </div>-->
+ <!-- <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
- <div style="margin: 0 3px">鎵规绠＄悊锛�</div>
- <el-switch
- v-model="isBatchNo"
- />
- </div>
- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
- <div style="margin: 0 3px">鍏堣繘鍏堝嚭锛�</div>
- <el-switch
- v-model="isFifo"
- />
- </div>
- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
- <div>
- <el-tooltip
- class="item"
- effect="dark"
- content=""
- placement="top"
- >
- <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍏ュ巶妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍏ュ巶鍙嶅垯璇ョ墿鏂欒川閲忕姸鎬佷负寰呮鐘舵�佹槸涓嶅厑璁稿叆鍘傜殑銆�</div>
- <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
- </el-tooltip>
- </div>
+ <!-- <div style="margin: 0 3px">鎵规绠＄悊锛�</div>-->
+ <!-- <el-switch-->
+ <!-- v-model="isBatchNo"-->
+ <!-- />-->
+ <!-- </div>-->
+ <!-- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">-->
+ <!-- <div style="margin: 0 3px">鍏堣繘鍏堝嚭锛�</div>-->
+ <!-- <el-switch-->
+ <!-- v-model="isFifo"-->
+ <!-- />-->
+ <!-- </div>-->
+ <!-- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">-->
+ <!-- <div>-->
+ <!-- <el-tooltip-->
+ <!-- class="item"-->
+ <!-- effect="dark"-->
+ <!-- content=""-->
+ <!-- placement="top"-->
+ <!-- >-->
+ <!-- <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍏ュ巶妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍏ュ巶鍙嶅垯璇ョ墿鏂欒川閲忕姸鎬佷负寰呮鐘舵�佹槸涓嶅厑璁稿叆鍘傜殑銆�</div>-->
+ <!-- <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
- <div style="margin: 0 3px">鍏ュ巶妫�楠岋細</div>
- <el-switch
- v-model="isInCheck"
- />
- </div>
- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">
- <div>
- <el-tooltip
- class="item"
- effect="dark"
- content=""
- placement="top"
- >
- <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍑哄巶妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍑哄巶锛屽弽鍒欒鐗╂枡璐ㄩ噺鐘舵�佷负寰呮鐘舵�佹槸涓嶅厑璁稿嚭鍘傜殑銆�</div>
- <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
- </el-tooltip>
- </div>
+ <!-- <div style="margin: 0 3px">鍏ュ巶妫�楠岋細</div>-->
+ <!-- <el-switch-->
+ <!-- v-model="isInCheck"-->
+ <!-- />-->
+ <!-- </div>-->
+ <!-- <div style="display: flex;width: 200px;align-content: center;justify-content: flex-end">-->
+ <!-- <div>-->
+ <!-- <el-tooltip-->
+ <!-- class="item"-->
+ <!-- effect="dark"-->
+ <!-- content=""-->
+ <!-- placement="top"-->
+ <!-- >-->
+ <!-- <div slot="content" style="width: 300px">寮�鍚悗璇ョ墿鏂欏繀椤诲仛鍑哄巶妫�楠屾垨璐ㄩ噺鍒ゆ柇鍚堟牸鍚庢墠鑳藉仛鍑哄巶锛屽弽鍒欒鐗╂枡璐ㄩ噺鐘舵�佷负寰呮鐘舵�佹槸涓嶅厑璁稿嚭鍘傜殑銆�</div>-->
+ <!-- <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />-->
+ <!-- </el-tooltip>-->
+ <!-- </div>-->
- <div style="margin: 0 3px">鍑哄巶妫�楠岋細</div>
- <el-switch
- v-model="isOutCheck"
- />
- </div>
- </div>
- </el-collapse-item>
- </el-collapse>
+ <!-- <div style="margin: 0 3px">鍑哄巶妫�楠岋細</div>-->
+ <!-- <el-switch-->
+ <!-- v-model="isOutCheck"-->
+ <!-- />-->
+ <!-- </div>-->
+ <!-- </div>-->
+ <!-- </el-collapse-item>-->
+ <!-- </el-collapse>-->
<!-- </div>-->
<span slot="footer" class="dialog-footer">
<div class="footerButton">
@@ -615,26 +615,26 @@
</div>
</div>
- <el-divider />
- <div>
- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 榛樿宸ヨ壓璺嚎
- </div>
- <div style="margin-top: 20px">
- <el-select
- v-model="defaultroute_code"
- filterable
- style="width: 200px;"
- placeholder="璇烽�夋嫨"
- class="defaultroute_code"
- >
- <el-option
- v-for="item in defaultroute_codeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </div>
+ <!-- <el-divider />-->
+ <!-- <div >-->
+ <!-- <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 榛樿宸ヨ壓璺嚎-->
+ <!-- </div>-->
+ <!-- <div style="margin-top: 20px">-->
+ <!-- <el-select-->
+ <!-- v-model="defaultroute_code"-->
+ <!-- filterable-->
+ <!-- style="width: 200px;"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- class="defaultroute_code"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in defaultroute_codeArr"-->
+ <!-- :key="item.code"-->
+ <!-- :label="item.name"-->
+ <!-- :value="item.code"-->
+ <!-- />-->
+ <!-- </el-select>-->
+ <!-- </div>-->
<el-divider />
<div style="margin-bottom: 10px">
<i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 宸ュ簭鍒楄〃
@@ -976,7 +976,7 @@
// routeOperationSelectedArr: [] // 宸ヨ壓璺嚎閫変腑闆嗗悎鏁扮粍
},
defaultroute_code: '', // 榛樿宸ヨ壓璺嚎閫変腑鍊�
- defaultroute_codeArr: '', // 榛樿宸ヨ壓璺嚎鏁扮粍
+ defaultroute_codeArr: [], // 榛樿宸ヨ壓璺嚎鏁扮粍
projectTableData: [], // 璁惧鍒楄〃
isBatchNo: false, // 鏄惁鎵规绠＄悊
isFifo: false, // 鏄惁鍏堣繘鍏堝嚭
@@ -1271,7 +1271,8 @@
background: 'rgba(0, 0, 0, 0.7)'
})
- this.defaultroute_code = row.default_route
+ // this.defaultroute_code = row.default_route
+ // this.defaultroute_code = ''
this.dialogFormRoute.projectCode = row.partcode
this.dialogFormRoute.projectName = row.partname
@@ -1310,7 +1311,7 @@
}
})
- this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
+ // this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.flag === 'Y')
}, 1000)
} else {
loading.close()
@@ -1320,7 +1321,7 @@
// 瀵硅瘽妗嗗叧闂�
handleCloseRoute() {
this.dialogFormRoute.routeOperationArr = []
- this.defaultroute_codeArr = []
+ // this.defaultroute_codeArr = []
},
// 鍙栨秷
routeDialogVisibleCancel() {
@@ -1328,20 +1329,26 @@
},
// 纭畾
async routeDialogVisibleConfirm() {
- console.log(this.defaultroute_code)
- if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
- return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
- }
+ // console.log(this.defaultroute_code)
+ // if (this.defaultroute_code === null || this.defaultroute_code === 'null') {
+ // return this.$message.info('榛樿宸ヨ壓璺嚎涓嶈兘涓虹┖锛�')
+ // }
// 鎻愪氦鏍煎紡
const data = []
this.dialogFormRoute.routeOperationArr.forEach(item => {
if (item.isSelected2) {
- data.push({ code: item.code, name: item.name })
+ data.push({
+ code: item.code,
+ name: item.name,
+ wkshopcode: item.wkshopcode,
+ wkshopname: item.wkshopname
+ })
}
})
this.$store.state.app.buttonIsDisabled = true
- const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
+ // const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, this.defaultroute_code, data)
+ const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, '', data)
if (res.code === '200') {
this.dialogVisibleRoute = false
this.$message.success('淇濆瓨鎴愬姛锛�')
@@ -1368,10 +1375,11 @@
item.flag = !item.flag
}
})
- if (val.code === this.defaultroute_code) {
- this.defaultroute_code = ''
- }
- this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
+ // if (val.code === this.defaultroute_code) {
+ // this.defaultroute_code = ''
+ // }
+ // this.defaultroute_codeArr = this.dialogFormRoute.routeOperationArr.filter(item => item.isSelected2)
+ this.$forceUpdate()
},
/* 鍗曚綅妯″潡*/
// 鍗曚綅鎸夐挳鐐瑰嚮浜嬩欢
@@ -1562,12 +1570,12 @@
}
}
-.defaultroute_code ::v-deep .el-input__suffix-inner {
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: -3px;
-}
+//.defaultroute_code ::v-deep .el-input__suffix-inner {
+// display: flex;
+// align-items: center;
+// justify-content: center;
+// margin-top: -3px;
+//}
</style>
<!--鍏叡椤甸潰鏍峰紡-->
--
Gitblit v1.9.3