WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_bug_first_stage'

Browse Source 
# Conflicts:
#	jero-web/src/components/CollectionType/index.vue
This commit is contained in:
lixuetao
2022-07-05 19:48:17 +08:00
parent 7ddac7eb75 eb6ab02004
commit 4b092fc07c
15 changed files with 415 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/CollectionType/index.vue
+3 -4
View File
@@ -729,10 +729,9 @@
font-weight: bold;
}
.ant-table td {
white-space: nowrap;
}
/*.ant-table td {*/
/* white-space: nowrap;*/
/*}*/
.selectWid .ant-select-selection--multiple {
overflow: auto;
}
jero-web/src/components/SplitDetailTable/index.vue
+3 -3
View File
@@ -277,9 +277,6 @@
font-weight: bold;
}
.ant-table td {
white-space: nowrap;
}
.split-detail-wrap{
.table{
.ant-table-row-cell-break-word{
@@ -305,6 +302,9 @@
}
</style>
<style lang="less" scoped>
.ant-table td {
white-space: nowrap;
}
.box {
width: 100%;
height: calc(100% - 100px);
jero-web/src/components/jero/JLoading.vue
+1 -1
View File
@@ -54,7 +54,7 @@
position: absolute;
top: 0;
left: 0;
z-index: 111999;
z-index: 1009;
width: 100%;
height: 100%;
background-color: rgba(255, 255, 255, 0.9);
jero-web/src/components/libraryAddForm/index.vue
+2
View File
@@ -327,6 +327,7 @@
this.$emit('addFormClick')
} else {
this.confirmLoading = false
this.$emit('addFormWarning')
if (res.message.indexOf('发布日期不能大于') >= 0) {
this.$message.warning(res.message)
} else if (res.message.indexOf('编号已存在') >= 0) {
@@ -337,6 +338,7 @@
}
})
} else {
this.$emit('addFormWarning')
return false
}
})
jero-web/src/components/tableCollection/index.vue
-4
View File
@@ -671,10 +671,6 @@
font-weight: bold;
}
.ant-table td {
white-space: nowrap;
}
.content-text {
width: 100%;
display: flex;
jero-web/src/views/documentManage/library/modules/addForm.vue
+7
View File
@@ -11,6 +11,7 @@
<addFormData
ref="addFormDataRef"
@addFormClick="addFormClick"
@addFormWarning="addFormWarning"
:flag="'1'"
v-if="visible"
:url="url"
@@ -59,6 +60,7 @@
this.visible = false
},
add() {
this.confirmLoading = false
this.title = this.$t('add')
this.visible = true
this.$nextTick(() => {
@@ -66,6 +68,7 @@
})
},
edit(item) {
this.confirmLoading = false
this.title = this.$t('edit')
this.visible = true
this.$nextTick(() => {
@@ -73,8 +76,12 @@
})
},
handleSubmit() {
this.confirmLoading = true
this.$refs.addFormDataRef.sumber()
},
addFormWarning(){
this.confirmLoading = false
},
addFormClick() {
this.visible = false
}
jero-web/src/views/processCenter/components/PersonnelSelection/index.vue
+13 -13
View File
@@ -58,7 +58,7 @@
export default {
name: 'index',
props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass','isDelete','distributionEngineerList'],
props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass', 'isDelete', 'distributionEngineerList'],
data() {
return {
loading: true,
@@ -90,10 +90,10 @@
this.queryDepartUserTreeList()
this.visible = true
},
standardDelete(){
standardDelete() {
this.$emit('input', null)
this.$forceUpdate()
this.$emit('deleteData',this.query.db_field_name)
this.$emit('deleteData', this.query.db_field_name)
},
// onSelect(selectedKeys, info) {
// console.log(selectedKeys)
@@ -155,23 +155,23 @@
for (var i = 0; i < arr.length - 1; i++) {
for (var j = i + 1; j < arr.length; j++) {
if (arr[i] === arr[j]) {
arr.splice(j, 1);
j--;
arr.splice(j, 1)
j--
}
}
}
return arr;
return arr
}
if (this.distributionEngineerList && this.distributionEngineerList.length > 0){
this.distributionEngineerList.forEach(res=>{
userIds.shift(res.userId)
userName.shift(res.name)
if (this.distributionEngineerList && this.distributionEngineerList.length > 0) {
this.distributionEngineerList.forEach(res => {
userIds.unshift(res.userId)
userName.unshift(res.name)
})
}
userIds = noRepeat1(userIds)
userName = noRepeat1(userName)
this.$emit('input', userName.join(','))
this.$emit('change', this.query.db_field_name, userIds.join(','),this.query.subscript)
this.$emit('change', this.query.db_field_name, userIds.join(','), this.query.subscript)
this.visible = false
this.treeVisible = false
// } else {
@@ -198,8 +198,8 @@
},
getUserAndDepart() {
getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
if (res){
this.gData = res.filter(ele => ele.flag === 'DEPART');
if (res) {
this.gData = res.filter(ele => ele.flag === 'DEPART')
} else {
this.gData = []
}
jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+40 -9
View File
@@ -505,6 +505,7 @@
for (let j = 0; j < this.distributionEngineerList.length; j++) {
if (this.dataSourceTable[i].userId == this.distributionEngineerList[j].userId) {
this.distributionEngineerList[j].isSend = '1'
this.distributionEngineerList[j].id = this.dataSourceTable[i].id
}
}
}
@@ -688,19 +689,49 @@
userId: this.formInline[value].split(',')[index]
})
})
for (let i = 0; i < this.dataSourceTable.length; i++) {
for (let j = 0; j < this.distributionEngineerList.length; j++) {
if (this.dataSourceTable[i].userId == this.distributionEngineerList[j].userId) {
this.distributionEngineerList[j].deliveryInstructions = this.dataSourceTable[i].deliveryInstructions
}
}
}
}
this.distributionEngineerList = [...this.distributionEngineerList]
this.formInline = { ...this.formInline }
},
deleteText(num) {
this.distributionEngineerList.splice(num, 1)
this.distributionEngineerList = [...this.distributionEngineerList]
this.formInline.userName = this.formInline.userName.split(',')
this.formInline.userName.splice(num, 1)
this.formInline.userName = this.formInline.userName.join(',')
this.formInline.userId = this.formInline.userId.split(',')
this.formInline.userId.splice(num, 1)
this.formInline.userId = this.formInline.userId.join(',')
this.formInline = { ...this.formInline }
let _this = this
this.$confirm({
content: _this.$t('ConfirmDelete'),
onOk() {
let id = ''
_this.dataSourceTable.forEach(res => {
if (res.userName == _this.distributionEngineerList[num].name) {
id = res.id
}
})
_this.distributionEngineerList.splice(num, 1)
_this.distributionEngineerList = [..._this.distributionEngineerList]
_this.formInline.userName = _this.formInline.userName.split(',')
_this.formInline.userName.splice(num, 1)
_this.formInline.userName = _this.formInline.userName.join(',')
_this.formInline.userId = _this.formInline.userId.split(',')
_this.formInline.userId.splice(num, 1)
_this.formInline.userId = _this.formInline.userId.join(',')
_this.formInline = { ..._this.formInline }
if (id){
deleteAction('/project/projectTaskInventoryDetailEO/delete', { id: id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
} else {
_this.$message.warning(res.message)
}
})
}
}
})
},
edit(val, title) {
this.title = title
jero-web/src/views/projectManagement/components/TaskList.vue
+2 -2
View File
@@ -55,8 +55,8 @@
>
<div slot="standardInformation" slot-scope="text,result" class="box-left">
<div class="content">
<a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}</a>
<a class="box-content-buttom" :title="result.title">{{result.title}}</a>
<a class="box-content-a" :title="result.serialNumber">{{result.serialNumber}}dsf jdslfkj dsflkdsjfdslkfjds fldskfjdsklfds</a>
<a class="box-content-buttom" :title="result.title">{{result.title}}sdfdsfdsfdsfjds lfdjsfdslfjsflkdsfjdsklfdjsfklsd</a>
</div>
</div>
<div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
jero-web/src/views/projectManagement/components/TaskParameterCollection.vue
+3 -3
View File
@@ -429,9 +429,9 @@
<style lang="less" scoped>
@import '~@assets/less/common.less';
/deep/ .ant-table td {
white-space: normal;
}
/*/deep/ .ant-table td {*/
/* white-space: normal;*/
/*}*/
.doc-detail {
background: #fff;