bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-nx' into dev-nx

This commit is contained in:
liang.chao 2024-07-22 20:48:49 +08:00
parent 7b0b5eb1f8 25cdb4b077
commit 3bc4aa50b3
8 changed files with 458 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -366,6 +366,11 @@
width="55" width="55"
align="center" align="center"
v-if="repairTitle === '维修'" v-if="repairTitle === '维修'"
:selectable="
(row) => {
return row.status == 1
}
"
/> />
<el-table-column <el-table-column
label="类型名称" label="类型名称"

87
sgzb-ui/src/views/repairTest/repair/selectTree.vue
View File

@ -5,8 +5,6 @@
:placeholder="placeholder" :placeholder="placeholder"
ref="select" ref="select"
:filterable="true" :filterable="true"
:remote="true"
:remote-method="remoteMethod"
:clearable="clearable" :clearable="clearable"
@clear="clearSelect" @clear="clearSelect"
@visible-change="visibleChange" @visible-change="visibleChange"
@ -51,21 +49,21 @@ export default {
name: 'index', name: 'index',
props: { props: {
treeList: { treeList: {
type: Array type: Array,
}, //树形原始数据 }, //树形原始数据
treeProps: Object, //树形配置 treeProps: Object, //树形配置
nodeKey: String, //树形唯一键值 nodeKey: String, //树形唯一键值
defaultSelect: { defaultSelect: {
//默认选择 //默认选择
type: Boolean, type: Boolean,
default: true default: true,
}, },
defaultData: { defaultData: {
type: Object, type: Object,
default: null default: null,
}, },
clearable: { type: Boolean, default: false }, clearable: { type: Boolean, default: false },
placeholder: { type: String, default: '请选择' } placeholder: { type: String, default: '请选择' },
}, },
data() { data() {
return { return {
@ -73,7 +71,7 @@ export default {
value: '', value: '',
filterText: '', filterText: '',
currentKey: '', currentKey: '',
highlightNode: -1 highlightNode: -1,
} }
}, },
watch: { watch: {
@ -81,10 +79,9 @@ export default {
// console.log('val-----', val); // console.log('val-----', val);
// }, // },
clearable: { clearable: {
handler: function(val,old) { handler: function (val, old) {},
},
// 立即以obj.name的当前值触发回调 // 立即以obj.name的当前值触发回调
immediate: true immediate: true,
}, },
filterText(val) { filterText(val) {
this.$refs.selectTree.filter(val) this.$refs.selectTree.filter(val)
@ -98,9 +95,12 @@ export default {
if (val.length > 0) { if (val.length > 0) {
this.$nextTick(() => { this.$nextTick(() => {
if (this.defaultSelect) { if (this.defaultSelect) {
this.value = val[0][this.treeProps.children][0][this.nodeKey] this.value =
val[0][this.treeProps.children][0][this.nodeKey]
this.textStr = this.textStr =
val[0][this.treeProps.children][0][this.treeProps.label] val[0][this.treeProps.children][0][
this.treeProps.label
]
this.highlightNode = this.value this.highlightNode = this.value
this.currentKey = this.value this.currentKey = this.value
this.$refs.selectTree.setCurrentKey(this.highlightNode) this.$refs.selectTree.setCurrentKey(this.highlightNode)
@ -108,7 +108,7 @@ export default {
} }
}) })
} }
} },
}, },
methods: { methods: {
setEdit(obj) { setEdit(obj) {
@ -174,45 +174,44 @@ export default {
this.textStr = '' this.textStr = ''
this.$refs.selectTree.setCurrentKey() this.$refs.selectTree.setCurrentKey()
this.$emit('handleNodeClick', '') this.$emit('handleNodeClick', '')
} },
} },
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.user-select-tree { .user-select-tree {
::v-deep { // ::v-deep {
.el-icon-::before { // .el-icon-::before {
content: '\ea1b'; // content: '\ea1b';
font-family: 'icomoon' !important; // font-family: 'icomoon' !important;
display: inline-block; // display: inline-block;
-webkit-transform: scale(0.83); // -webkit-transform: scale(0.83);
font-size: 10px; // font-size: 10px;
//width: 100%; // //width: 100%;
//height: 100%; // //height: 100%;
color: #666666; // color: #666666;
pointer-events: none; // pointer-events: none;
} // }
.el-input.is-focus { // .el-input.is-focus {
.el-icon- { // .el-icon- {
transform: rotate(0deg); // transform: rotate(0deg);
} // }
} // }
.el-input__inner { // .el-input__inner {
height: 36px; // height: 36px;
line-height: 36px; // line-height: 36px;
} // }
.el-input__icon { // .el-input__icon {
line-height: 36px; // line-height: 36px;
} // }
.el-tree-node__content { // .el-tree-node__content {
height: 32px; // height: 32px;
} // }
} // }
} }
</style> </style>

5
sgzb-ui/src/views/repairTest/repairScrap/index.vue
View File

@ -377,6 +377,11 @@
type="selection" type="selection"
width="55" width="55"
align="center" align="center"
:selectable="
(row) => {
return row.status == 1
}
"
v-if="repairTitle === '维修'" v-if="repairTitle === '维修'"
/> />
<el-table-column <el-table-column

87
sgzb-ui/src/views/repairTest/repairScrap/selectTree.vue
View File

@ -5,8 +5,6 @@
:placeholder="placeholder" :placeholder="placeholder"
ref="select" ref="select"
:filterable="true" :filterable="true"
:remote="true"
:remote-method="remoteMethod"
:clearable="clearable" :clearable="clearable"
@clear="clearSelect" @clear="clearSelect"
@visible-change="visibleChange" @visible-change="visibleChange"
@ -51,21 +49,21 @@ export default {
name: 'index', name: 'index',
props: { props: {
treeList: { treeList: {
type: Array type: Array,
}, //树形原始数据 }, //树形原始数据
treeProps: Object, //树形配置 treeProps: Object, //树形配置
nodeKey: String, //树形唯一键值 nodeKey: String, //树形唯一键值
defaultSelect: { defaultSelect: {
//默认选择 //默认选择
type: Boolean, type: Boolean,
default: true default: true,
}, },
defaultData: { defaultData: {
type: Object, type: Object,
default: null default: null,
}, },
clearable: { type: Boolean, default: false }, clearable: { type: Boolean, default: false },
placeholder: { type: String, default: '请选择' } placeholder: { type: String, default: '请选择' },
}, },
data() { data() {
return { return {
@ -73,7 +71,7 @@ export default {
value: '', value: '',
filterText: '', filterText: '',
currentKey: '', currentKey: '',
highlightNode: -1 highlightNode: -1,
} }
}, },
watch: { watch: {
@ -81,10 +79,9 @@ export default {
// console.log('val-----', val); // console.log('val-----', val);
// }, // },
clearable: { clearable: {
handler: function(val,old) { handler: function (val, old) {},
},
// 立即以obj.name的当前值触发回调 // 立即以obj.name的当前值触发回调
immediate: true immediate: true,
}, },
filterText(val) { filterText(val) {
this.$refs.selectTree.filter(val) this.$refs.selectTree.filter(val)
@ -98,9 +95,12 @@ export default {
if (val.length > 0) { if (val.length > 0) {
this.$nextTick(() => { this.$nextTick(() => {
if (this.defaultSelect) { if (this.defaultSelect) {
this.value = val[0][this.treeProps.children][0][this.nodeKey] this.value =
val[0][this.treeProps.children][0][this.nodeKey]
this.textStr = this.textStr =
val[0][this.treeProps.children][0][this.treeProps.label] val[0][this.treeProps.children][0][
this.treeProps.label
]
this.highlightNode = this.value this.highlightNode = this.value
this.currentKey = this.value this.currentKey = this.value
this.$refs.selectTree.setCurrentKey(this.highlightNode) this.$refs.selectTree.setCurrentKey(this.highlightNode)
@ -108,7 +108,7 @@ export default {
} }
}) })
} }
} },
}, },
methods: { methods: {
setEdit(obj) { setEdit(obj) {
@ -174,45 +174,44 @@ export default {
this.textStr = '' this.textStr = ''
this.$refs.selectTree.setCurrentKey() this.$refs.selectTree.setCurrentKey()
this.$emit('handleNodeClick', '') this.$emit('handleNodeClick', '')
} },
} },
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.user-select-tree { .user-select-tree {
::v-deep { // ::v-deep {
.el-icon-::before { // .el-icon-::before {
content: '\ea1b'; // content: '\ea1b';
font-family: 'icomoon' !important; // font-family: 'icomoon' !important;
display: inline-block; // display: inline-block;
-webkit-transform: scale(0.83); // -webkit-transform: scale(0.83);
font-size: 10px; // font-size: 10px;
//width: 100%; // //width: 100%;
//height: 100%; // //height: 100%;
color: #666666; // color: #666666;
pointer-events: none; // pointer-events: none;
} // }
.el-input.is-focus { // .el-input.is-focus {
.el-icon- { // .el-icon- {
transform: rotate(0deg); // transform: rotate(0deg);
} // }
} // }
.el-input__inner { // .el-input__inner {
height: 36px; // height: 36px;
line-height: 36px; // line-height: 36px;
} // }
.el-input__icon { // .el-input__icon {
line-height: 36px; // line-height: 36px;
} // }
.el-tree-node__content { // .el-tree-node__content {
height: 32px; // height: 32px;
} // }
} // }
} }
</style> </style>

13
sgzb-ui/src/views/scrapManage/scrap/disposition/index.vue
View File

@ -124,6 +124,14 @@
<a <a
:href="filePreviewUrl + row.fileUrl" :href="filePreviewUrl + row.fileUrl"
target="_blank" target="_blank"
:download="row.fileName"
v-if="fileTypeJudge(row.fileName)"
>查看</a
>
<a
:href="filePreviewUrl + row.fileUrl"
target="_blank"
v-else
>查看</a >查看</a
> >
</template> </template>
@ -345,6 +353,11 @@ export default {
) )
console.log('数据导出', data) console.log('数据导出', data)
}, },
fileTypeJudge(url) {
const file = url.split('.')[1]
const docList = ['doc', 'docx', 'xls', 'xlsx']
return docList.some((e) => e === file)
},
}, },
} }
</script> </script>

20
sgzb-ui/src/views/warehouseManage/newPurchase/component/fileView.vue
View File

@ -5,9 +5,20 @@
<el-table-column align="center" label="文件名称" prop="name" /> <el-table-column align="center" label="文件名称" prop="name" />
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<a :href="`${filePreviewUrl}${row.url}`" target="_blank" <a
:href="`${filePreviewUrl}${row.url}`"
target="_blank"
:download="row.name"
v-if="fileTypeJudge(row.name)"
>查看</a >查看</a
> >
<a
v-else
:href="`${filePreviewUrl}${row.url}`"
target="_blank"
>
查看
</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -50,6 +61,13 @@ export default {
return tableList || [] return tableList || []
}, },
}, },
methods: {
fileTypeJudge(url) {
const file = url.split('.')[1]
const docList = ['doc', 'docx']
return docList.some((e) => e === file)
},
},
} }
</script> </script>

14
sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/codingTools.vue
View File

@ -297,7 +297,11 @@
</el-table> </el-table>
<div slot="footer" class="dialog-footer" style="text-align: center"> <div slot="footer" class="dialog-footer" style="text-align: center">
<el-button type="primary" @click="submitForm" v-if="!isDetail" <el-button
type="primary"
@click="submitForm"
v-if="!isDetail"
:loading="codingLoading"
>确 定</el-button >确 定</el-button
> >
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
@ -431,6 +435,7 @@ export default {
isDetail: false, isDetail: false,
surplusNoBindNum: 0, surplusNoBindNum: 0,
codingLoading: false,
} }
}, },
mounted() { mounted() {
@ -723,7 +728,9 @@ export default {
) )
return // 停止提交流程 return // 停止提交流程
} }
editPurchaseMacode(this.codeList).then((response) => { this.codingLoading = true
editPurchaseMacode(this.codeList)
.then((response) => {
if (response.data && response.data.length > 0) { if (response.data && response.data.length > 0) {
this.codeList = response.data this.codeList = response.data
this.$modal.msgError( this.$modal.msgError(
@ -735,6 +742,9 @@ export default {
this.getList() this.getList()
} }
}) })
.finally(() => {
this.codingLoading = false
})
} }
}, },
hasDuplicateField(array, field) { hasDuplicateField(array, field) {

2
sgzb-ui/vue.config.js
View File

@ -43,7 +43,7 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
target: `http://192.168.2.167:28080`, //超 target: `http://192.168.2.134:28080`, //超
// target: `http://10.40.92.81:28080`, //韩/ // target: `http://10.40.92.81:28080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
// target: `http://192.168.2.248:28080`, //帅 // target: `http://192.168.2.248:28080`, //帅