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-11-29 18:05:39 +08:00
parent 3a64610ccf 0a4f6ac667
commit 251634f892
2 changed files with 184 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+88
View File
@@ -4734,6 +4734,94 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.5.0.tgz",
"integrity": "sha512-WXh+7AgFxGTgb5QAkQtFeUcHNIEq3PGVQ8WskY5ZiFbWBkOwcCPRs4w/2tVyTbh2q6TVRlO3xfvIukUtjsu62A==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
"dev": true,
"optional": true
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"emojis-list": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
"dev": true,
"optional": true
},
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"optional": true
},
"json5": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
"dev": true,
"optional": true,
"requires": {
"minimist": "^1.2.5"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"supports-color": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"optional": true,
"requires": {
"has-flag": "^4.0.0"
}
}
}
},
"vue-style-loader": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+96 -321
View File
@@ -108,10 +108,6 @@
fixed="left"
width="180"
label="标准号">
<!-- <template slot-scope="scope">-->
<!-- <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standId }}</a>-->
<!--&lt;!&ndash; {{ scope.row.standId }}&ndash;&gt;-->
<!-- </template>-->
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
@@ -403,178 +399,6 @@
@click="exportTestItem">提交</el-button>
</span>
</el-dialog>
<!-- 选择项目抽屉-->
<el-drawer
title="选择项目"
:visible.sync="projectModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectNumber"
placeholder="请输入项目编号"
></el-input>
</el-form-item>
<el-form-item label="项目名称" class="search-item search-item-last">
<el-input
v-model="projectSearch.projectName"
placeholder="请输入项目名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="''"
@click="getProjectDataBtn">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="''"
@click="clearSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="ProjectDatas"
tooltip-effect="dark"
style="width: 100%;"
border
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange"
@select="handleSelectionChanges"
ref="listSelection"
>
<el-table-column
type="selection"
width="55"
align="center" />
<el-table-column
prop="projectNumber"
align="center"
label="项目编号"
/>
<el-table-column
prop="projectName"
align="center"
label="项目名称"
/>
<el-table-column
prop="projectClassification"
align="center"
label="项目分类"
/>
<el-table-column
prop="uname"
align="center"
label="项目经理"
/>
</el-table>
</div>
<pagination
:page="page"
:pageSize="pageSize"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">带入</el-button>
</div>
</el-drawer>
<!-- 选择项目下标准抽屉-->
<el-drawer
title="选择标准"
:visible.sync="listModel"
size="900px"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<el-table
:data="dataList"
border
ref="selection"
height="100%"
style="width: 100%; border:1px solid #ccc"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
align="center"
label="标准号"
>
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort
}} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="中文名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="ssrq"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zrbm"
label="责任部门"
align="center"
>
</el-table-column>
</el-table>
</div>
<pagination
:page="standPage"
:pageSize="standPageSize"
:total="standTotal"
@pageChange="standPageChange"
@pageSizeChange="standPageSizeChange"
/>
</div>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeStand">取消</el-button>
<el-button type="primary" size="mini" @click="OkStand">带入</el-button>
</div>
</el-drawer>
<!-- 填写未符合项信息表单-->
<el-drawer
size="700px"
@@ -588,16 +412,52 @@
<el-col :span="24">
<el-form :model="addForm" inline class="label-input-form" :rules="formRules" label-width="180px"
ref="addForm">
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-select v-model="addForm.productName"@change="handleChange" placeholder="请选择项目名称">
<el-option
v-for="item in ProjectDatas"
:key="item.id"
:label="item.projectName"
:value="item"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.standSerialNumber"
placeholder="请输入标准号"
:disabled="true"
v-model="addForm.productType"
placeholder="请输入产品类型"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.productLine"
placeholder="请输入产品线"
:maxlength="500" />
</el-form-item>
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-select
v-model="addForm.standSerialNumber"
:disabled="serialNumber"
@change="standChange"
placeholder="请选择标准号">
<el-option
v-for="item in dataList"
:key="item.standId"
:label="item.standSort + '-' + item.standNumber + '-' + item.standYear"
:value="item"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="standName" label="标准名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.standName"
placeholder="请输入标准名称"
:maxlength="500" />
@@ -610,13 +470,6 @@
:maxlength="500">
</el-input>
</el-form-item>
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- @click="handSeek"-->
<!-- style="position:absolute;top: 10px; float: right;"-->
<!-- >手动查找</el-button>-->
<el-form-item prop="itemsName" label="条款名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
@@ -624,25 +477,12 @@
placeholder="请输入条款名称"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
<el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.productType"
placeholder="请输入产品类型"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.productLine"
placeholder="请输入产品线"
:maxlength="500" />
</el-form-item>
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.productName"
placeholder="请输入项目名称"
:disabled="true"
v-model="addForm.responsibleUnit"
placeholder="请输入责任部门"
:maxlength="500" />
</el-form-item>
<el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
@@ -652,13 +492,6 @@
placeholder="请输入不合规项目"
:maxlength="500" />
</el-form-item>
<el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.responsibleUnit"
placeholder="请输入责任部门"
:maxlength="500" />
</el-form-item>
<el-form-item prop="dutyEngineer" label="责任工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
@@ -711,50 +544,6 @@
</el-button>
</div>
</el-drawer>
<!-- 条款弹窗-->
<el-dialog title="条款信息" :append-to-body="true" width="875px" :visible.sync="itemModel">
<el-table
ref="selections"
:data="itemsData"
tooltip-effect="dark"
style="width: 100%;overflow-y: auto;overflow-x: hidden;"
border
:height="300"
@selection-change="selectReplaceStandNumRowChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
align="center"
>
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
align="center"
>
</el-table-column>
</el-table>
<loading :loading="replaceLoading">数据获取中</loading>
<!--分页-->
<pagination
style="position: relative;"
:page="replacePage"
:page-size="replacePageSize"
:total="replaceTotal"
@pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" @click="itemModel = false">取消</el-button>
<el-button type="primary" class="common-button-primary" @click="replaceLawsNumModelBt">带入</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -872,7 +661,10 @@ export default {
},
//数据查看
historySee: false,
historySeeForm: {}
historySeeForm: {},
// 新增编辑框的disabled
serialNumber: true,
addFormEdit: {}
};
},
methods: {
@@ -1032,11 +824,6 @@ export default {
}
},
//项目查询按钮
getProjectDataBtn() {
this.page = 1;
this.getProjectData();
},
//获取项目数据
getProjectData() {
this.$http.get("sarStandProjectLibrary/queryProjectWorkFlow", {
@@ -1116,7 +903,7 @@ export default {
editUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => {
if (res.ok) {
this.$message.success("新增成功");
this.$message.success("编辑成功");
this.drawerTable = false;
this.getTableByPage();
}
@@ -1204,8 +991,8 @@ export default {
}
},
//查询项目下的标准
getStandData() {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: this.projectId }, {
getStandData(val) {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: val.id }, {
_this: this
}, res => {
res.data.records.forEach(item => {
@@ -1230,61 +1017,21 @@ export default {
});
});
},
//条款的多选框改变
selectReplaceStandNumRowChange(data) {
this.selectItems = data;
},
//标准的多选框改变
selectStandChange(data) {
this.standList = data;
},
//项目的多选框改变
selectListChange(data) {
this.selectList = data;
},
//单选逻辑
handleSelectionChanges(selection, val) {
if (selection.length > 1) {
let del_row = selection.shift();
this.$refs.listSelection.toggleRowSelection(del_row, false);
}
},
standPageChange(page) {
this.standPage = page;
this.getStandData();
},
standPageSizeChange(pageSize) {
this.standPageSize = pageSize;
this.getStandData();
},
//条款分页
pageChangeReplace(page) {
this.replacePage = page;
this.getItem();
},
pageSizeChangeReplace(pageSize) {
this.replacePageSize = pageSize;
this.getItem();
},
pageChange(page) {
this.page = page;
this.getProjectData();
},
pageSizeChange(pageSize) {
this.pageSize = pageSize;
this.getProjectData();
},
//新增事件
addModel() {
this.addForm = {};
this.projectModel = true;
this.dataList = []
this.serialNumber = true
this.drawerTitle = "新增";
this.getProjectData()
this.drawerTable = true
},
//编辑事件
projectEdit(row) {
this.drawerTitle = "编辑";
this.addForm = row;
this.addFormEdit = row
this.getProjectData()
this.drawerTable = true;
console.log(row);
},
//点击查看按钮事件
showUser(row) {
@@ -1307,10 +1054,6 @@ export default {
}
});
},
//点击编辑按钮事件
openEditModal(item) {
console.log(item);
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -1361,7 +1104,29 @@ export default {
pageSizeChangeNo(pageSize) {
this.pageSizeNo = pageSize;
this.getTableByPage();
},
/** 项目名称change事件 */
handleChange(val) {
if (this.drawerTitle === '编辑') {
this.addForm.standName = ''
this.addForm.standSerialNumber = ''
this.addForm.responsibleUnit = ''
}
this.addForm.productLine = val.productLine
this.addForm.productName = val.projectName
this.addForm.productType = val.projectPlatfor
this.serialNumber = false
this.getStandData(val)
},
/** 标准号change事件 */
standChange(item) {
this.addForm.standName = item.standName
this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
this.addForm.responsibleUnit = item.zrbm || "--";
}
},
mounted() {
//查询已维护的项目
@@ -1382,13 +1147,6 @@ export default {
<style lang="less" scoped>
//.el-table {
// .el-table__fixed {
// height:auto !important; // 此处的important表示优先于element.style
// bottom:17px; // 改为自动高度后，设置与父容器的底部距离，则高度会动态改变
// }
//}
#rectification-dataBase {
/deep/ .table-wrap {
.el-table__fixed {
@@ -1448,5 +1206,22 @@ export default {
height: 49px;
float: right;
}
.demo-drawer-content {
.content {
.standard-table-search {
/deep/.el-input.is-disabled .el-input__inner {
background-color: #fff;
color: #7e8083;
}
/deep/.el-select-dropdown__item.selected {
color: #8d8e91;
}
}
}
}
/deep/.el-select-dropdown__item.selected {
color: #8d8e91 !important;
}
}
</style>