FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-12-05 18:49:28 +08:00
parent 6f31ef20a8 193a5dc341
commit da1f05a21a
11 changed files with 139 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/SelectArray.vue
+2
View File
@@ -16,6 +16,7 @@
multiple
@change="handleChange"
>
<!-- <el-option value="全选" label="全选" @click.native="clickOption"></el-option>-->
<el-option
v-for="opt in options"
:key="opt.value"
@@ -73,6 +74,7 @@ export default {
handleChange (event) {
// const value = event.target.value
this.$emit('input', event)
}
},
watch: {
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+3 -2
View File
@@ -67,7 +67,7 @@
<el-table
:data="dataList"
border
ref="selection"
ref="standSelection"
height="65%"
@selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc"
@@ -1009,12 +1009,13 @@ export default {
this.projectStand.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.standId === item.standId;
return items.id === item.id;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.$refs.standSelection.clearSelection()
}).catch(() => {
});
}
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+31 -2
View File
@@ -59,7 +59,7 @@
<el-table
:data="dataList"
border
ref="selection"
ref="standSelection"
height="65%"
@selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc"
@@ -138,6 +138,34 @@
width="180px"
>
</el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
<template slot-scope="scope">
<el-select v-model="scope.row.involve"
placeholder="请选择涉不涉及"
max-length="30"
clearable>
<el-option value="involve" label="涉及"></el-option>
<el-option value="noInvolve" label="不涉及"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
<template slot-scope="scope">
<el-input
v-model.trim="dataList[scope.$index].remarks"
placeholder="请输入备注"
>
</el-input>
</template>
</el-table-column>
</el-table>
</div>
<div>
@@ -1015,12 +1043,13 @@ export default {
this.projectStand.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.standId === item.standId;
return items.id === item.id;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.$refs.standSelection.clearSelection()
}).catch(() => {
});
}
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+15 -2
View File
@@ -59,7 +59,7 @@
<el-table
:data="dataList"
border
ref="selection"
ref="standSelection"
height="65%"
@selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc"
@@ -138,6 +138,18 @@
width="180px"
>
</el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
</el-table-column>
</el-table>
</div>
<div>
@@ -1016,12 +1028,13 @@ export default {
this.projectStand.map(item => {
let index;
index = this.dataList.findIndex(items => {
return items.standId === item.standId;
return items.id === item.id;
});
if (index > -1) {
this.dataList.splice(index, 1);
}
});
this.$refs.standSelection.clearSelection()
}).catch(() => {
});
}
src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+12
View File
@@ -132,6 +132,18 @@
width="180px"
>
</el-table-column>
<el-table-column
prop="involve"
width="160px"
align="center"
label="标准是否涉及">
</el-table-column>
<el-table-column
prop="remarks"
align="center"
width="180"
label="备注">
</el-table-column>
</el-table>
</div>
<div>
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -403,6 +403,7 @@
:wrapperClosable="false"
size="800px"
@close="resetForm"
ref="standard"
append-to-body
>
<!-- 新增样式 -->
@@ -3320,7 +3321,6 @@ export default {
})
})
this.dynamicFormField = displayLocation
console.log(this.dynamicFormField);
this.loading = false
})
})
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+1 -1
View File
@@ -382,7 +382,7 @@
},
addFormRules: {
unit: [
{required: true, message: '请输入单位', trigger: 'blur'},
{required: true, message: '请输入单位', trigger: 'change'},
],
esName: [
{required: true, message: '请输入企标名称', trigger: 'blur'},
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+17 -7
View File
@@ -87,9 +87,9 @@
ref="multipleTable"
:data="localProTableList"
tooltip-effect="dark"
style="width: 100%;height: inherit"
style="width: 100%"
border
:max-height="400"
max-height="600"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '15px',
fontWeight: 'normal', height: '48px'}"
@selection-change="handleSelectionChange">
@@ -97,18 +97,23 @@
show-overflow-tooltip
prop="projectPlatfor"
align="center"
fixed="left"
min-width="100"
label="产品平台">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="90"
fixed="left"
min-width="150"
label="项目编号">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="projectName"
align="center"
fixed="left"
min-width="300"
label="项目名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.projectName }}</a>
@@ -142,7 +147,7 @@
show-overflow-tooltip
prop="productLine"
label="产品线"
min-width="120"
min-width="160"
align="center"
>
</el-table-column>
@@ -184,7 +189,7 @@
align="center"
label="项目经理">
</el-table-column>
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<el-table-column label="" fixed="right" width="50" :resizable="false" label="操作" align="center">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
@@ -1638,9 +1643,14 @@ export default {
}
}
}
///deep/ .el-table--scrollable-x .el-table__body-wrapper {
// overflow-x: scroll;
//}
///deep/.el-table__fixed {
// height: 48px !important;
//}
/deep/.el-table .el-table__body-wrapper {
height: 86%;
height: 84%;
}
::v-deep .el-drawer__header {
& > span:first-child {
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+3 -3
View File
@@ -37,10 +37,10 @@
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>
<el-col :span="5">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="1"> 项目计划开始时间: <span
<el-col :span="5" :push="1">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="5" :push="2"> 项目计划开始时间: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="5" :push="2">项目计划完成时间: <span
<el-col :span="4" :push="3">项目计划完成时间: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row>
</div>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+13 -6
View File
@@ -91,6 +91,7 @@
tooltip-effect="dark"
height="100%"
border
max-height="100%"
class="table"
v-loading="myLoading.loadData"
@selection-change="standSelectChange"
@@ -106,7 +107,7 @@
<el-table-column
prop="standSerialNumber"
fixed="left"
width="180"
min-width="180"
label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
@@ -115,7 +116,7 @@
<el-table-column
prop="standName"
fixed="left"
width="200"
min-width="300"
show-overflow-tooltip
label="标准名称">
<template slot-scope="scope">
@@ -124,12 +125,12 @@
</el-table-column>
<el-table-column
prop="itemsNum"
width="75"
min-width="100"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="180"
min-width="300"
show-overflow-tooltip
label="条款名称">
</el-table-column>
@@ -145,7 +146,7 @@
</el-table-column>
<el-table-column
prop="productName"
width="180"
min-width="300"
show-overflow-tooltip
label="项目名称">
</el-table-column>
@@ -186,7 +187,7 @@
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50">
<el-table-column label="操作" align="center" width="50">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">
@@ -1187,6 +1188,12 @@ export default {
color: #606266 !important;
}
#rectification-dataBase {
/deep/ .el-table__fixed {
height: 100% !important; //设置高优先，以覆盖内联样式
}
/deep/ .el-table__fixed-right {
height: 100% !important; //设置高优先，以覆盖内联样式
}
/deep/ .table-wrap {
.el-table__fixed {
height: calc(~'100% - 20px') !important;