From 46f828b435f7705b3aeba3d7c55194df77ecc127 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 10 Nov 2021 16:26:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=AE=A1=E6=8E=A7=20-=20=E6=89=B9=E9=87=8F=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/businessDivision.vue | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue index 3271a1037..0d8d85d26 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDivision.vue @@ -25,6 +25,8 @@ placeholder="请输入" clearable :maxlength="100"> + @@ -120,6 +122,7 @@ style="width: 100%;" height="100%" border + @selection-change="standSelectChange" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" > @@ -228,10 +231,12 @@ export default { name: "businessDivision", data() { return { + selectedList: [], //标准选中的数据 sarAccessListTotal: 0, sarAccessListDatas: [], // 查询相关参数 sarSarAccessEOSearch: { + isClose:'0', lawNumOrName: '', // 编号/名称 productType: '', // 产品类型 responseDept: '', // 责任部门 @@ -262,9 +267,40 @@ export default { this.sarSarAccessEOSearch.lawName = this.sarSarAccessEOSearch.lawNumOrName this.sarSarAccessEOSearch.lawNumber = this.sarSarAccessEOSearch.lawNumOrName }, + // 修改成表格样式后,选择项勾选改变 + standSelectChange (data) { + this.selectedList = [] + for (let i = 0; i < data.length; i++) { + this.selectedList.push(data[i].id) + } + }, //点击批量关闭按钮事件 userCloAll() { - console.log('至少选择一条数据'); + if (this.selectedList.length === 0){ + this.$message.warning('请选择一条数据进行关闭') + }else{ + this.$confirm('确认关闭这些数据?', '提示', { + confirmButtonText: '确定', + confirmButtonClass: 'common-button-primary', + cancelButtonTxe: '取消', + type: 'warning', + roundButton: false, + }).then(() => { + this.$http.post('sarStandUnqualified/businessDeptIssue/closeIssue',{ + ids: this.selectedList + },{ + _this: this + }, res => { + if (res.ok) { + this.searchSarAccessBtn() + this.selectedList = [] + this.$message.success('关闭成功') + } + }) + }).catch(() => { + + }) + } }, //点击历史数据按钮事件 historyClick() { From 54e01cdc02b875efa20f774adeef3d7b85812227 Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 10 Nov 2021 16:28:18 +0800 Subject: [PATCH 2/5] commit --- .../nonConfomity/pages/businessDetails.vue | 455 +++++++++--------- 1 file changed, 239 insertions(+), 216 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue index ad2d94e51..8563f747d 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue @@ -9,7 +9,7 @@
- + - +
+ :zNodes="zNodesSItem" + treeDivId="zNodesSItemSearch" + deptSelect + showRMenu + @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)" + class="ztree" style="width: 200px;height: 400px;overflow: auto">
+ type="primary" + size="mini" + class="common-button-primary" + @click="getTableBtn"> 查询 清空 + size="mini" + class="common-button-default" + @click="clearAllSearch">清空 +
@@ -73,166 +74,170 @@
数据获取中 + type="selection" + width="55" + fixed="left" + align="center"> + prop="standId" + width="180px" + label="标准编号/政策编号"> + prop="standName" + width="180px" + label="标准名称/政策名称"> + prop="itemsNum" + label="产品类型"> + prop="itemsName" + label="实施时间"> + prop="productLine" + label="实施要求"> + + + + + + + prop="dutyEngineer" + width="150px" + label="开发计划"> + prop="responsibleUnit" + label="责任部门"> + prop="responsePeople" + width="100" + label="责任人"> - - - - - - - - - - - - - - - - + prop="actualCloseTime" + width="150px" + sortable + label="SOP时间"> + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
{{historySeeForm.standId}}
+
{{ historySeeForm.standId }}
-
{{historySeeForm.standName}}
+
{{ historySeeForm.standName }}
-
{{historySeeForm.itemsNum}}
+
{{ historySeeForm.itemsNum }}
-
{{historySeeForm.itemsName}}
+
{{ historySeeForm.itemsName }}
-
{{historySeeForm.productLine}}
+
{{ historySeeForm.productLine }}
-
{{historySeeForm.productName}}
+
{{ historySeeForm.productName }}
-
{{historySeeForm.responsibleUnit}}
+
{{ historySeeForm.responsibleUnit }}
-
{{historySeeForm.dutyEngineer}}
+
{{ historySeeForm.dutyEngineer }}
-
{{historySeeForm.authEngineer}}
+
{{ historySeeForm.authEngineer }}
-
{{historySeeForm.qaEngineer}}
+
{{ historySeeForm.qaEngineer }}
-
{{historySeeForm.actualCloseTime}}
+
{{ historySeeForm.actualCloseTime }}
@@ -241,11 +246,11 @@
条款号:
-
{{item.itemNum}}
+
{{ item.itemNum }}
涉及项目:
-
{{item.productNameShow}}
+
{{ item.productNameShow }}
目前状态:
@@ -254,100 +259,101 @@
设计完成时间:
-
{{(item.stepFirTime ? item.stepFirTime.substring(0, 10): '')}}
+
{{ (item.stepFirTime ? item.stepFirTime.substring(0, 10) : '') }}
佐证材料:

{{ file.oldFileName }} - +

备注信息:
-
{{item.remark}}
+
{{ item.remark }}
验证完成时间:
-
{{(item.stepSecTime ? item.stepSecTime.substring(0, 10): '')}}
+
{{ (item.stepSecTime ? item.stepSecTime.substring(0, 10) : '') }}
佐证材料:

{{ file.oldFileName }} - +

备注信息:
-
{{item.secRemark}}
+
{{ item.secRemark }}
整改完成时间:
-
{{(item.stepThiTime ? item.stepThiTime.substring(0, 10): '')}}
+
{{ (item.stepThiTime ? item.stepThiTime.substring(0, 10) : '') }}
佐证材料:

{{ file.oldFileName }} - +

备注信息:
-
{{item.thrRemark}}
+
{{ item.thrRemark }}
责任部门:
-
{{item.responseUnitShow}}
+
{{ item.responseUnitShow }}
责任工程师:
-
{{item.responseEnginShow}}
+
{{ item.responseEnginShow }}
-
+
待验证项
条款号:
-
{{item.itemNum}}
+
{{ item.itemNum }}
涉及项目:
-
{{item.productNameShow}}
+
{{ item.productNameShow }}
责任部门:
-
{{item.responseUnitShow}}
+
{{ item.responseUnitShow }}
责任工程师:
-
{{item.responseEnginShow}}
+
{{ item.responseEnginShow }}
验证时间:
-
{{(item.validTime ? item.validTime.substring(0, 11): '')}}
+
{{ (item.validTime ? item.validTime.substring(0, 11) : '') }}
验证结果:
@@ -363,7 +369,7 @@ export default { name: 'BusinessDetails', components: {}, - data () { + data() { return { loading: false, // 搜索条件字段 @@ -397,7 +403,7 @@ export default { } }, methods: { - openFileInPdf (attId, oldFileName) { + openFileInPdf(attId, oldFileName) { // 缺少文件 if (this.$hasPermission('ZWBGBNTL11')) { this.$http.get('lawss/sarStandFile/queryConvertAtt', { @@ -442,14 +448,14 @@ export default { this.$message.error('没有在线预览文档权限!') } }, - downloadFile (attId) { + downloadFile(attId) { if (attId != null && attId !== '') { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId } else { this.$message.error('请选择要下载的文件') } }, - downloadFileByWater (attId, fileSuffix) { + downloadFileByWater(attId, fileSuffix) { if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { @@ -460,7 +466,7 @@ export default { } } }, - typeColor (row, type) { + typeColor(row, type) { this.$confirm('确定修改此标准分级?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -477,21 +483,21 @@ export default { color = '#f00' } this.$http.postData('lawss/sarInconformInfo/updateInconformInfo', - { - id: row.id, - color: color - }, { - _this: this - }, res => { - if (res.ok) { - this.getTableBtn() - } else { - this.$message({ - type: 'error', - message: '修改失败!' - }) - } - }) + { + id: row.id, + color: color + }, { + _this: this + }, res => { + if (res.ok) { + this.getTableBtn() + } else { + this.$message({ + type: 'error', + message: '修改失败!' + }) + } + }) }).catch(() => { this.$message({ type: 'info', @@ -499,7 +505,7 @@ export default { }) }) }, - detailsStandard (item) { + detailsStandard(item) { this.$http.post('lawss/sarTestItem/validateStandNumber', { standnumber: item.standNum }, { @@ -517,29 +523,30 @@ export default { }, e => { }) }, - getOrgTreeSource () { + getOrgTreeSource() { this.$http.get('sys/org/getTree', {}, {_this: this}, - res => { - if (res.ok) { - let treeNode = [] - res.data.map((item, index) => { - let treeItem = {} - for (let key in item) { - if (key === 'orgName') { - treeItem.name = item[key] - } else { - treeItem[key] = item[key] + res => { + if (res.ok) { + let treeNode = [] + res.data.map((item, index) => { + let treeItem = {} + for (let key in item) { + if (key === 'orgName') { + treeItem.name = item[key] + } else { + treeItem[key] = item[key] + } } - } - treeNode[index] = treeItem - }) - this.zNodesSItem = treeNode - // this.searchInlandNodes = treeNode - } - }, e => {}) + treeNode[index] = treeItem + }) + this.zNodesSItem = treeNode + // this.searchInlandNodes = treeNode + } + }, e => { + }) }, // 更多 - handleCommand (command) { + handleCommand(command) { switch (command[1]) { case '查看': this.showUser(command[0]) @@ -547,7 +554,7 @@ export default { } }, // 查看方法 - showUser (row) { + showUser(row) { this.historySeeForm = JSON.parse(JSON.stringify(row)) this.historySee = true this.$nextTick(() => { @@ -566,30 +573,30 @@ export default { }) }, // 分页事件 - pageChange (page) { + pageChange(page) { this.pageNo = page this.getTableBtn() }, - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.pageSize = this.$store.getters.userInfo.configContent this.getTableBtn() }, - back () { + back() { this.$router.push({ name: 'NonConfomity' }) }, // 未符合项table selected事件 - handleRowChange (selection) { + handleRowChange(selection) { // }, // 分页查询未符合项数据 - getTableBtn () { + getTableBtn() { this.$http.get('sarStandUnqualified/sar-stand-unqualified/history', { ...this.historySearch, current: this.pageNo, size: this.pageSize, - },{ + }, { _this: this }, res => { console.log(res); @@ -616,12 +623,12 @@ export default { // }, e => { // }) // }, - treeClickSearch (treeId, treeNode) { + treeClickSearch(treeId, treeNode) { this.historySearch.responseUnit = treeNode.id this.historySearch.responseUnitShow = treeNode.name }, // 点击清空按钮事件 - clearAllSearch () { + clearAllSearch() { this.historySearch = { standNumOrName: '', quesType: '', @@ -633,7 +640,7 @@ export default { /** * @Description: 跳转流程 */ - processCenterClick (item) { + processCenterClick(item) { let routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { @@ -643,15 +650,16 @@ export default { window.open(routeUrl.href, '_blank') } }, - mounted () { + mounted() { this.getTableBtn() this.getOrgTreeSource() } } From 1cc1ce08c6d8f0b10950493660c6d61c2c36fccd Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Wed, 10 Nov 2021 16:54:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=8D=E7=82=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E7=AE=A1=E6=8E=A7=20-=20=E5=8E=86=E5=8F=B2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nonConfomity/pages/businessDetails.vue | 287 +++++++++++------- 1 file changed, 178 insertions(+), 109 deletions(-) diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue index 8563f747d..075d19a30 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/businessDetails.vue @@ -9,62 +9,82 @@
- + - - - + - - - -
- - -
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + size="mini" + v-btn-permission="'aff4a409c3c3856986c535a5f4782b13'" + @click="searchSarAccessBtn('')"> 查询 清空 @@ -74,15 +94,14 @@
数据获取中 - - - - - + + prop="timeoutSituation" + width="150" + label="SOP时间超过法规时限的空档期的业务应对方案"> - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +
- + { + let arr = res.data.records; + this.sarAccessListDatas = arr + this.tableLoading = false + this.sarAccessListTotal = res.data.total + }, e => { + }); + }, openFileInPdf(attId, oldFileName) { // 缺少文件 if (this.$hasPermission('ZWBGBNTL11')) { @@ -574,12 +631,13 @@ export default { }, // 分页事件 pageChange(page) { - this.pageNo = page - this.getTableBtn() + this.sarSarAccessEOSearch.page = page + this.searchSarAccess() }, pageSizeChange(pageSize) { - this.pageSize = this.$store.getters.userInfo.configContent - this.getTableBtn() + this.sarSarAccessEOSearch.page = 1 + this.sarSarAccessEOSearch.pageSize = this.$store.getters.userInfo.configContent + this.searchSarAccess() }, back() { this.$router.push({ @@ -627,15 +685,24 @@ export default { this.historySearch.responseUnit = treeNode.id this.historySearch.responseUnitShow = treeNode.name }, - // 点击清空按钮事件 - clearAllSearch() { - this.historySearch = { - standNumOrName: '', - quesType: '', - productName: '', - responseUnit: '' +// 清空 查询条件 + clearAllSearch(search = true) { + this.sarSarAccessEOSearch = { + lawNumOrName: '', // 编号/名称 + productType: '', // 产品类型 + responseDept: '', // 责任部门 + lawNumber: '', + lawName: '', + accessContent: '', + energyKind: '', + applyArctic: '', + region: '', + page: 1, + pageSize: this.$store.getters.userInfo.configContent, + validFlag: 0 } - this.getTableBtn() + this.searchSarAccessBtn() + console.log(this.sarSarAccessEOSearch) }, /** * @Description: 跳转流程 @@ -651,8 +718,10 @@ export default { } }, mounted() { - this.getTableBtn() - this.getOrgTreeSource() + // this.getTableBtn() + // this.getOrgTreeSource() + // 分页查询数据 + this.searchSarAccess() } } From aa548dd9a5cf46182850b6530c39be65bad187ef Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 10 Nov 2021 16:59:16 +0800 Subject: [PATCH 4/5] commit --- .../components/workingGroup1/index.vue | 385 ++++++++++++++---- 1 file changed, 310 insertions(+), 75 deletions(-) diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue index e96c628c6..911cd821f 100644 --- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue +++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue @@ -26,7 +26,7 @@ size="mini" class="common-button-primary" v-if="editButton" - @click=""> + @click="editItem"> 编辑 + @click="seeItem"> 查看 + @click="delItem"> 删除
@@ -62,7 +62,7 @@ :title="addDrawerTitle" :visible.sync="addDrawer" :before-close="addDrawerClose"> -
+