diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue index 1f2288f06..2e544ce8b 100644 --- a/src/pages/config/pages/attributeCustom/components/buss.vue +++ b/src/pages/config/pages/attributeCustom/components/buss.vue @@ -2,8 +2,8 @@ {{ !child.value || child.value === 'null' ? '-' : child.value }} @@ -245,147 +259,148 @@ v-for="(file, fileIndex) in child.value" :key="fileIndex" > - +

- - - - - - + + + + + + - +
{{ item.showAll ? '收起' : '更多' }} @@ -395,8 +410,9 @@
-
更多
- +
更多 +
+ - - - - - - - - -
- - - - - - - - -
- - - +
+ v-model="standItemSearch.XCXSSRQ" + type="date" + placeholder="新车实施日期">
- +
+ v-model="standItemSearch.ZCCSSRQ" + type="date" + placeholder="在产车实施日期">
- - -
- 导出 + + 导出 + 关联条款 + >关联条款 +
- - + + + + + + + prop="zccssrq" + label="在产车实施日期(文本)" + width="180"> - - -
- + - 查看 + 查看 + @@ -627,14 +626,14 @@ :rules="sarStandardItemRules" label-width="150px" > - + - +
- 保存 + + 保存 + 取消
@@ -775,11 +776,15 @@
- {{ standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' }} + {{ + standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : '' + }}
- {{ standShowItemEO.responsibleUnit }} + {{ + standShowItemEO.responsibleUnit + }}
@@ -787,7 +792,9 @@
- {{ standShowItemEO.dutyEngineerShow }} + {{ + standShowItemEO.dutyEngineerShow + }}
@@ -803,7 +810,9 @@
- {{ standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover) }} + {{ + standShowItemEO.busStandCoverShow ? standShowItemEO.busStandCoverShow : busStandCoverName(standShowItemEO.busStandCover) + }}
@@ -820,7 +829,7 @@ v-if="relateNowList" style="margin-bottom: 10px;line-height: 20px;max-height: 300px" > - {{index+1}}. {{item.creationUserName}} {{item.creationTime}} {{item.content}} + {{ index + 1 }}. {{ item.creationUserName }} {{ item.creationTime }} {{ item.content }}
@@ -840,11 +849,13 @@ class="common-button-primary add-button" size="mini" :v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'PVBSWCJQ9X4RVBM9RK7L' : 'NJ3YL4SVEJADWH7ESHDX'" - @click="addknowledge(1)">新增 + @click="addknowledge(1)">新增 + 批量删除 + @click="deleteknowledge(2)">批量删除 +
查看 - 编辑 - 删除 + + 编辑 + + + 删除 +
@@ -934,7 +949,9 @@
- 确定 + + 确定 + 取消
@@ -955,7 +972,9 @@ @click="downloadFile(item.id)" :key="index">{{ item.oldFileName }}

-

{{ knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : '' }}

+

{{ + knowSee.creationTime ? $moment(knowSee.creationTime).format('YYYY-MM-DD') : '' + }}

@@ -971,18 +990,20 @@ + icon="el-icon-search" + type="primary" + class="common-button-primary" + size="mini" + @click="getComparison()"> - 新增 + class="common-button-default" + icon="el-icon-refresh-left" + size="mini" + @click="clearComparison()"> + + 新增 + @@ -996,7 +1017,9 @@
- 确定 + + 确定 + 取消
@@ -1028,8 +1051,11 @@ @@ -1041,32 +1067,38 @@

- 确认 + + 确认 +
数据获取中
- {{$t('m.submit')}} - {{$t('m.cancel')}} + + {{ $t('m.submit') }} + + + {{ $t('m.cancel') }} +
@@ -1093,7 +1125,7 @@ export default { CustomOrg, RelatedTermsSelect }, - data () { + data() { return { relatedTermsDrawerVisible: false, btnLoading: false, @@ -1278,11 +1310,11 @@ export default { modalStandItemflag: false, tableLoading: false, standItemSearch: { - XCXSSRQ:'', - ZCCSSRQ:'', + XCXSSRQ: '', + ZCCSSRQ: '', standId: '', fileType: '', - itemsName:'', + itemsName: '', pageSize: this.$store.getters.userInfo.configContent, page: 1, }, @@ -1379,23 +1411,20 @@ export default { standMap: {} } }, - props: { - }, + props: {}, watch: {}, methods: { - FormatDate(date){ - return moment(date).format('YYYY-MM-DD'); + FormatDate(date) { + return moment(date).format('YYYY-MM-DD'); }, // 将文本状态的id与name对应 - setMap(data){ + setMap(data) { data.forEach(item => { this.$set(this.textStatusMap, item.value, item.label) this.$set(this.standMap, item.value, item.label) }) - console.log(this.textStatusMap, '文本状态的值') - console.log(this.standMap, '标准性质') }, - statusClick () { + statusClick() { let routeUrl = this.$router.resolve({ name: 'standInvolveProjectTwo', query: { @@ -1404,88 +1433,15 @@ export default { }) window.open(routeUrl.href, '_blank') }, - closeDrawer () { + closeDrawer() { this.modalStandItemflag = false - // svpps变化 - // Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => { - // const [displayLocation, standEO, formFieldList] = values - // const dynamicFormField = standEO ? standEO.attrInfoMap : {} - // formFieldList.forEach((field) => { - // displayLocation.forEach((location) => { - // location.isShowImp = '1' - // if (dynamicFormField) { - // let value = dynamicFormField[field.attrField] - // if (field.attrField === 'SVPPS') { - // let tips = dynamicFormField.SVPPSTips - // field['tips'] = tips - // } - // if (value && typeof value === 'number') { - // value = this.$dateFormat(value, 'yyyy-MM-dd') - // } - // field['value'] = value - // if (field.showRegionId === location.value) { - // if (!location.child) { - // location['child'] = [] - // } - // location['child'].push(field) - // if (field.isShowImp === '0') { - // location.isShowImp = '0' - // } - // } - // } - // }) - // }) - // displayLocation.forEach(location => { - // const child = location.child || [] - // const one = [] - // const half = [] - // child.map(field => { - // if (['DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'].includes(field.attrType)) { - // half.push(field) - // } else { - // one.push(field) - // } - // }) - // const fieldsIsTextAreaOrFile = child.filter(field => { - // return field.attrType === 'TEXTAREA' || field.attrType === 'FILE' - // }) - // const fieldOthers = child.filter(field => { - // return field.attrType !== 'TEXTAREA' && field.attrType !== 'FILE' - // }) - // location.child = [...fieldOthers, ...fieldsIsTextAreaOrFile] - // location.one = one - // location.half = half - // location.showAll = false - // }) - // this.$http.get('lawss/sarSarAccessInfo/selectProTimeInfoByStandId', { - // standId: this.$route.params.id - // }, { - // _this: this - // }, res => { - // displayLocation.map(item => { - // if (item.value === '2URVBGR2Y4UG77KZ5YPL') { - // for (let key in res.data) { - // item.one.push({ - // attrName: key, - // value: res.data[key].join(','), - // isShowImp: '0', - // id: key - // }) - // } - // } - // }) - // this.dynamicFormField = displayLocation - // }) - // sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) - // this.loading = false - // }) }, - clearComparison () { + clearComparison() { this.comparisonTitle = '' this.getComparison() }, // 验证条款号是否唯一 - validCode (rule, value, callback) { + validCode(rule, value, callback) { let find = 0 this.standItemList.map(item => { if (item.itemsNum === value) { @@ -1500,7 +1456,7 @@ export default { callback() }, // 新增清单 - submitDrawerForm (name) { + submitDrawerForm(name) { this.$refs[name].validate((valid) => { if (valid) { const formData = { @@ -1523,7 +1479,7 @@ export default { }) }, // 比对提交 - comparisonSub () { + comparisonSub() { if (this.comparisonId === '') { this.$message.error('请选择比对清单') } else { @@ -1559,13 +1515,13 @@ export default { } }, // 比对关闭 - comparisonClose () { + comparisonClose() { this.comparisonTitle = '' this.comparisonId = '' this.comparisonDialog = false }, // 获取清单 - getComparison () { + getComparison() { this.$http.get('lawss/sarStandCompareBase/page', { listName: this.comparisonTitle, page: '1', @@ -1580,22 +1536,22 @@ export default { }) }, // 打开比对模态框 - comparisonDialogOpen () { + comparisonDialogOpen() { this.comparisonDialog = true this.getComparison() }, // 比对新增 - addComparison () { + addComparison() { this.AddcomparisonDrawer = true this.listVO.name = '' this.listVO.public = false }, - beforeUpload1 (file) { + beforeUpload1(file) { var filename = file.name var index1 = filename.lastIndexOf('.') var index2 = filename.length var fileSuffix = filename.substring(index1, index2) - if (fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.PDF'|| fileSuffix === '.ppt' || fileSuffix === '.pptx') { + if (fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.PDF' || fileSuffix === '.ppt' || fileSuffix === '.pptx') { return true } else { this.$message.error('文件' + file.name + '格式不正确，请上传doc、docx、ppt、pptx、pdf、或PDF文件') @@ -1608,7 +1564,7 @@ export default { } return true }, - uploadSuccess1 (res, file, fileList) { + uploadSuccess1(res, file, fileList) { if (res.ok) { this.addForm.fileId += res.data.id + ',' this.$message({ @@ -1620,7 +1576,7 @@ export default { this.importForm.content = res.message } }, - removeOneFile1 (file, fileList) { + removeOneFile1(file, fileList) { let ids = this.addForm.fileId.split(',') if (file.response) { let fileIds = file.response.data.id @@ -1629,7 +1585,7 @@ export default { } }, // 删除数组中的某个对象 - removeAaary (_arr, _obj) { + removeAaary(_arr, _obj) { var length = _arr.length for (var i = 0; i < length; i++) { if (_arr[i] === _obj) { @@ -1646,7 +1602,7 @@ export default { } } }, - handleSelectionKnow (val) { + handleSelectionKnow(val) { this.knowIdList = '' val.map((item, index) => { if (val.length === 1) { @@ -1659,7 +1615,7 @@ export default { }) }, // 确定新增 - AddKnowSub () { + AddKnowSub() { this.$refs['addForm'].validate((valid) => { if (valid) { this.AddKnowSubLoading = true @@ -1705,7 +1661,7 @@ export default { }) }, // 关闭知识点新增 - AddKnowClose () { + AddKnowClose() { this.defaultFileList = [] this.addForm.title = '' this.addForm.content = '' @@ -1714,19 +1670,19 @@ export default { this.AddKnowledgDialog = false }, // 知识点分页 - pageChange1 (page) { + pageChange1(page) { this.pageNo = page this.getKnowList() }, - pageSizeChange1 () { + pageSizeChange1() { this.getKnowList() }, - knowledgeSharing () { + knowledgeSharing() { this.knowledgeSharingDialog = true this.getKnowList() }, // 获取知识点列表数据 - getKnowList () { + getKnowList() { this.$http.get('lawss/sarKnowledgeShare/page', { sarId: this.$route.params.id, sarType: this.$route.params.pageType, @@ -1741,7 +1697,7 @@ export default { } }) }, - handleCommand2 (command) { + handleCommand2(command) { switch (command[1]) { case '查看': this.handleKnow(command[0]) @@ -1755,12 +1711,12 @@ export default { } }, // 查看知识点 - handleKnow (row) { + handleKnow(row) { this.AddKnowledgDialogItem = true this.knowSee = row }, // 点击新增知识点 - addknowledge (type, row) { + addknowledge(type, row) { this.knowType = type if (type === 1) { this.KnowTitle = '新增知识点' @@ -1784,7 +1740,7 @@ export default { } }, // 删除知识点 - deleteknowledge (type, row) { + deleteknowledge(type, row) { // type = 2为批量删除 1为单条删除 var ids = '' if (type === 2) { @@ -1831,7 +1787,7 @@ export default { }) }, // 代替标准编号 - showReplaceStandInfo (item) { + showReplaceStandInfo(item) { this.replaceStandInfoEO.standNumber = item // this.replaceStandInfoEO.standType = this.sarStandardsInfoEO.standType this.$http.get('sarStandardsInfo/sar-standards-info/queryInfoByStandNum', this.replaceStandInfoEO, { @@ -1852,7 +1808,7 @@ export default { }, e => { }) }, - clickButtonToUpload (current) { + clickButtonToUpload(current) { this.currentFileList = current this.currentFile = JSON.parse(JSON.stringify(current).replace('List', '')) // this.importModalshowflagtemp = true @@ -1887,7 +1843,7 @@ export default { } }, // 新增、编辑上传文件之前的钩子 - beforeUpload (file) { + beforeUpload(file) { var filename = file.name var index1 = filename.lastIndexOf('.') var index2 = filename.length @@ -1903,7 +1859,7 @@ export default { return false } // 判断文件上传大小 - if (file.size / 1024 / 1024 <= 200) {// eslint-disable-line + if (file.size / 1024 / 1024 <= 200) {// eslint-disable-line return true } else { this.$message.error('文件' + file.name + '大小不超过200M') @@ -1912,7 +1868,7 @@ export default { return true }, // 导入标准数据成功后执行 - importFileSuccess (res, file, fileList) { + importFileSuccess(res, file, fileList) { if (res.ok) { // 使用字条款是否展示模态框判断导入的文件是标准，还是条款modalStandItemflag // this.selectSarStandItems(this.standItemSearch.standId) @@ -1929,7 +1885,7 @@ export default { this.showUploadlist = false } }, - removeOneFile (file, fileList) { + removeOneFile(file, fileList) { // this.sarStandardsInfoEO[this.currentFileList] = this.removeAaary(this.sarStandardsInfoEO[this.currentFileList], file.response.data) let ids = this.sarStandardsInfoEO[this.currentFile].split(',') if (file.response) { @@ -1949,32 +1905,32 @@ export default { } }, // 导入文件大小超出范围 - handleSizeError (file) { + handleSizeError(file) { this.$message.error('文件' + file.name + '大小不超过200M') }, // 导入标准文件格式错误执行 - handleFormatError (file) { + handleFormatError(file) { this.$message.error('文件' + file.name + '格式不正确，请上传以.xlsx结尾的excel文件') }, // 子条款部门名称改变后 - itemOrgNameChange () { + itemOrgNameChange() { if (this.standItemEO.orgName === '') { this.standItemEO.responsibleUnit = '' } this.getOrgTreeSource() }, - treeDblClickEngin (treeId, treeNode) { + treeDblClickEngin(treeId, treeNode) { this.standItemEO.dutyEngineer = treeNode.id this.standItemEO.dutyEngineerShow = treeNode.name $('#enginBtnS').click() }, - treeDblClickFO (treeId, treeNode) { + treeDblClickFO(treeId, treeNode) { this.standItemEO.fo = treeNode.id this.standItemEO.foShow = treeNode.name $('#foBtnS').click() }, // 标准条款新增 - saveOrUpdateStandItem () { + saveOrUpdateStandItem() { this.$refs['sarStandardsItemForm'].validate((valid) => { if (valid) { let nowstandItem = JSON.parse(JSON.stringify(this.standItemEO)) @@ -2010,31 +1966,31 @@ export default { }) }, // 表单清空 - resetForm () { + resetForm() { this.$nextTick(() => { // this.$refs['sarStandardsItemForm'].resetFields() this.$refs['sarStandardsItemForm'].clearValidate() }) this.modalItemaddShowflag = false }, - selectAllStand (alldata) { + selectAllStand(alldata) { this.selectedItemList = [] for (let i = 0; i < alldata.length; i++) { this.selectedItemList.push(alldata[i].id) } }, // 分页点击后方法 - pageChange (page) { + pageChange(page) { this.standItemSearch.page = page this.selectSarStandItems() }, // 分页每页显示数改变后方法 - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.standItemSearch.pageSize = this.$store.getters.userInfo.configContent this.selectSarStandItems() // 此处需要调用接口，修改个人配置 }, - selectStandMessage () { + selectStandMessage() { return new Promise((resolve, reject) => { this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoById', {id: this.sarStandardsInfoEO.id}, { _this: this @@ -2068,7 +2024,7 @@ export default { }) }, // 新增浏览记录 - addPersonCookie () { + addPersonCookie() { this.personCookieEO.cookieType = this.$route.params.pageType if (this.sarStandardsInfoEO.standYear != null && this.sarStandardsInfoEO.standYear !== '') { this.personCookieEO.resTitle = this.sarStandardsInfoEO.standName + '(编号：' + this.sarStandardsInfoEO.standSortShow + ' ' + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + ')' @@ -2083,7 +2039,7 @@ export default { }) }, // 获取组织机构数据 - getOrgTreeSource () { + getOrgTreeSource() { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { if (res.ok) { @@ -2102,9 +2058,10 @@ export default { this.zNodesSItem = treeNode this.searchInlandNodes = treeNode } - }, e => {}) + }, e => { + }) }, - getUserTreeSource () { + getUserTreeSource() { this.$http.get('sys/org/getTree', {}, {_this: this}, res => { if (res.ok) { @@ -2122,10 +2079,11 @@ export default { }) this.zNodesSItemEngin = treeNode } - }, e => {}) + }, e => { + }) }, // 查询相近标准 - selectCloseStand (id) { + selectCloseStand(id) { let obj = {} obj.id = id let url = '' @@ -2139,17 +2097,17 @@ export default { }, e => { }) }, - openFileInPdf (attId, oldFileName) { + openFileInPdf(attId, oldFileName) { // 判断是否是图片格式，图片格式不预览，直接下载 let index1 = oldFileName.lastIndexOf('.') let index2 = oldFileName.length let fileSuffix = oldFileName.substring(index1, index2) //把后缀转大写 - if(fileSuffix !== undefined && fileSuffix !== null){ + if (fileSuffix !== undefined && fileSuffix !== null) { fileSuffix = fileSuffix.toUpperCase() } // 判断上传文件格式 - if (fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') { + if (fileSuffix === '.PNG' || fileSuffix === '.JPG' || fileSuffix === '.JPEG') { this.downloadFile(attId) return true } @@ -2243,7 +2201,7 @@ export default { } } }, - showItemsModel (attField) { + showItemsModel(attField) { this.fileType = attField this.getOrgTreeSource() this.selectedItemList = [] @@ -2257,37 +2215,27 @@ export default { }) }, // 分解单----查看标准条款相关 - selectSarStandItems (id, flag) { + selectSarStandItems(id, flag) { this.standItemSearch.standId = this.sarStandardsInfoEO.id this.standItemSearch.fileType = this.fileType this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', this.standItemSearch, {}, res => { this.selectedItemList = [] if (res.ok) { this.standItemList = res.data; - console.log("hello"+this.standItemList+res.data); + console.log("hello" + this.standItemList + res.data); this.standitemTotal = res.data.count // 分页需要 } - - // if (this.standItemList != null && this.standItemList.length > 0) { - // for (let ind = 0; ind < this.standItemList.length; ind++) { - // // 去掉html标签 - // let itemContent = this.standItemList[ind].termsConditions - // itemContent = itemContent ? itemContent.replace(/<.*?>/ig, ' ') : '' - // this.standItemList[ind].termsConditions = itemContent - // } - // } - }, e => { }) }, - 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 { @@ -2299,9 +2247,9 @@ export default { } }, /** - * @Description: 跳转流程 - */ - processCenterClick (item) { + * @Description: 跳转流程 + */ + processCenterClick(item) { let routeUrl = this.$router.resolve({ name: 'ProcessDetail', query: { @@ -2310,12 +2258,12 @@ export default { }) window.open(routeUrl.href, '_blank') }, - searchSarStandItems () { + searchSarStandItems() { this.standItemSearch.page = 1 this.selectSarStandItems() }, // 清空搜索框 - clearAllSearch () { + clearAllSearch() { // 标准条款搜索 this.standItemSearch.responsibleUnit = '' this.standItemSearch.orgName = '' @@ -2324,17 +2272,17 @@ export default { this.standItemSearch.fileType = '' this.selectSarStandItems() }, - inputChange () { + inputChange() { this.standItemSearch.responsibleUnit = '' this.getOrgTreeSource() }, - searchInlandNodesClick (treeId, treeNode) { + searchInlandNodesClick(treeId, treeNode) { this.standItemSearch.responsibleUnit = treeNode.id this.standItemSearch.orgName = treeNode.name $('#searchInlandDeptBtn').click() }, // 点击条款表格上面的操作按钮新增 - addItemModal () { + addItemModal() { this.editAddType = 1 this.getOrgTreeSource() this.itemModalTitle = '新增标准法规条款' @@ -2348,18 +2296,18 @@ export default { this.itemFormdisableflag = false }, // 模板下载 - uploadImportModal (flag) { + uploadImportModal(flag) { window.open('/api/att/attFile/uploadModalFile?fileName=分解单导入模板.xlsx') }, // 点击导入标准 - addImportModal (flag) { + addImportModal(flag) { this.importModalshowflag = true this.importExcelUrl = '/api/lawss/sarStandItems/importSarStandItemsList?standId=' + this.standItemSearch.standId + '&fileType=' + this.fileType this.$nextTick(() => { this.$refs.importFileAboutStand.clearFiles() }) }, - exportStandardItem () { + exportStandardItem() { this.$confirm('您是否要导出数据?', '提示', { confirmButtonText: '确定', confirmButtonClass: 'common-button-primary', @@ -2375,10 +2323,11 @@ export default { } else { this.$message.warning('暂无可导出的数据') } - }).catch(() => {}) + }).catch(() => { + }) }, // 标准条款删除 - deleteStandItem (item, flag) { + deleteStandItem(item, flag) { // flag==1 删除单条 flag==2 批量删除 let ids = [] if (flag === 1) { @@ -2436,7 +2385,7 @@ export default { } }, // 分解单-查看 - handlePreview (item) { + handlePreview(item) { this.showItemInfoModal = true let fileList = [] item.defaultFileList = [] @@ -2477,7 +2426,7 @@ export default { } }, // 分解单-编辑 - selectStandardPro (item) { + selectStandardPro(item) { this.editAddType = 2 this.itemModalTitle = '编辑标准法规条款' item.orgName = '' @@ -2500,7 +2449,7 @@ export default { }) }, // 修改过程中，将resId 修改成 attid - updateResidToAttid (filetype) { + updateResidToAttid(filetype) { if (this.sarStandardsInfoEO[filetype] !== null && this.sarStandardsInfoEO[filetype] !== '') { this.$http.get('lawss/attFile/getMultiFileInfosByResid', { fileIds: this.sarStandardsInfoEO[filetype], fileType: 'stand' @@ -2515,7 +2464,7 @@ export default { /** * 展示位置 */ - queryDisplayLocation () { + queryDisplayLocation() { return new Promise((resolve, reject) => { this.$http.get('lawssBase/utArea/getAreaList', { sarType: 'INLAND_STAND' @@ -2532,13 +2481,13 @@ export default { /** * 获取新增弹框的表单 */ - getAddFormFieldList (isEdit) { + getAddFormFieldList(isEdit) { return new Promise((resolve, reject) => { this.$http.get('lawss/sarStandAttrDetails/list', {}, {_this: this}, res => { if (res.ok) { // const { data: { STAND: data } } = res - const { data = {} } = res + const {data = {}} = res this.formFieldListData = data[this.$route.params.pageType] console.log('this.formFieldListData') console.log(this.formFieldListData); @@ -2553,7 +2502,7 @@ export default { }) }, // 点击更多按钮事件 - moreClick () { + moreClick() { this.dynamicFormField.map(item => { item.isShowImp = '0' item.child.map(child => { @@ -2563,12 +2512,12 @@ export default { this.isMoreAwayBtn = true }, // 点击收起按钮事件 - putAwayClick () { + putAwayClick() { this.dynamicFormField = JSON.parse(sessionStorage.getItem('displayLocation')) this.isMoreAwayBtn = false }, // 鼠标滚轮事件 - handleScroll (e) { + handleScroll(e) { // 该语句可以用来判断滚轮是向上滑动还是向下 const direction = e.deltaY > 0 ? 'down' : 'up' if (direction === 'down') { @@ -2576,7 +2525,7 @@ export default { } }, // ... - handleCommand (command) { + handleCommand(command) { switch (command[1]) { case '查看': this.handlePreview(command[0]) @@ -2593,7 +2542,7 @@ export default { * 点击 加收藏 按钮事件 * @param collectId 有值：取消收藏 无值：加收藏 */ - collectClick (collectId) { + collectClick(collectId) { this.isSubmit = true if (collectId) { // 取消收藏 @@ -2632,7 +2581,7 @@ export default { } }, // 更新LOG - relateEvent () { + relateEvent() { this.$http.get('lawss/sarUpdLog/getLogList', { sarId: this.$route.params.id, sarType: this.$route.params.pageType @@ -2660,11 +2609,11 @@ export default { }) }, - relateDialogClose () { + relateDialogClose() { this.relateDialog = false this.relateNowList = [] }, - halfClass (data, nextData, index) { + halfClass(data, nextData, index) { const halfType = ['INPUT_STR', 'DATE_PICKER', 'SEL_OPTION', 'INPUT_NUM'] let flag = false if (halfType.includes(data.attrType)) { // 是 50% 显示的组件时 @@ -2681,7 +2630,7 @@ export default { return flag ? '' : 'clear' }, - handleToggleShowAll (item) { + handleToggleShowAll(item) { if (!item.showAll) { item.showAll = true } else { @@ -2689,7 +2638,7 @@ export default { } }, // 根据企标覆盖关系value值获取名称 - busStandCoverName (value) { + busStandCoverName(value) { let busStandCoverName = '' this.BZFGGXOUIUJ.map(item => { if (item.value === value) { @@ -2721,22 +2670,22 @@ export default { closeRelatedTermsDrawer() { this.$refs['relatedTermsDrawer'].closeDrawer() }, - itemsTextDialog (itemsNum, text) { + itemsTextDialog(itemsNum, text) { this.itemsTextDialogs = true this.itemsText = '

' + itemsNum + '

' + text.replace(/''/g, '\'') } }, computed: { - titleShow () { + titleShow() { return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '-' + this.sarStandardsInfoEO.standYear + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情' }, - titleHidden () { + titleHidden() { return (this.sarStandardsInfoEO.standSortShow || '') + this.sarStandardsInfoEO.standNumber + '《' + this.sarStandardsInfoEO.standName + '》' + '标准详情' }, - visibleBtn () { + visibleBtn() { return this.$route.name === 'DomesticStandardDetails' }, - sarType () { + sarType() { return this.$route.params.pageType }, standNum() { @@ -2752,7 +2701,7 @@ export default { return item.id } }, - async mounted () { + async mounted() { this.sarStandardsInfoEO.id = this.$route.params.id // await this.selectStandMessage() this.standItemEO.standId = this.$route.params.id @@ -2843,7 +2792,7 @@ export default { } }) this.dynamicFormField = displayLocation - console.log(this.dynamicFormField) + console.log(this.dynamicFormField) }) sessionStorage.setItem('displayLocation', JSON.stringify(displayLocation)) this.loading = false @@ -2856,7 +2805,7 @@ export default { // firefox window.addEventListener('DOMMouseScroll', this.handleScroll, false) }, - destroyed () { + destroyed() { window.removeEventListener('mousewheel', this.handleScroll, false) window.removeEventListener('DOMMouseScroll', this.handleScroll, false) sessionStorage.removeItem('displayLocation') @@ -2868,390 +2817,460 @@ export default { diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 1d6be7da5..9846d1ba6 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -77,6 +77,18 @@ show-overflow-tooltip align="center"> + + + 属性 - 编辑 + 编辑 + 编辑 复制 删除 @@ -685,6 +686,7 @@ export default { }, data () { return { + splitStatus: this.$route.query.splitStatus, auditFlag: this.$route.query.auditFlag, splitCheckDialog: false, submitLoading: false, @@ -1306,7 +1308,6 @@ export default { if (cur[i].pId == null || cur[i].pId === '') { this.parentNode = cur[i] } - console.log(str); this.zNodes = str } // 查完左侧目录后，如果没有选中的，设置最外层选中 diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue index 011d29d6d..c48455049 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue @@ -208,7 +208,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {inboundLiaisonDetail} from 'api/process' + import {inboundLiaisonDetail,saveTaskForPub} from 'api/process' export default { name: "bzdyStep5", diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index a59cea2ed..406528121 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -388,6 +388,7 @@ sarType: '', loading: false, standId: '', + statusId: '', commentText: '', textarea: '', // 意见 title: '', // 新增抽屉标题 @@ -401,6 +402,7 @@ itemsNum: '', itemsName: '', standId: '', + statusId: '', itemsNum1: '', itemsName1: '', oldNumber: '' @@ -622,6 +624,8 @@ this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId + this.statusId = bringData[0].id + this.form.statusId = bringData[0].id this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f5f4d3930..9339d3260 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -388,6 +388,7 @@ sarType: '', loading: false, standId: '', + statusId: '', commentText: '', textarea: '', // 意见 title: '', // 新增抽屉标题 @@ -401,6 +402,7 @@ itemsNum: '', itemsName: '', standId: '', + statusId: '', itemsNum1: '', itemsName1: '', oldNumber: '' @@ -627,6 +629,8 @@ this.form.standId = bringData[0].standId this.sarType = bringData[0].standType this.standId = bringData[0].standId + this.statusId = bringData[0].id + this.form.statusId = bringData[0].id this.listModel = false; this.listModel2 = true this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue index 53a1f75ad..ff73ee5f0 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue @@ -43,25 +43,25 @@ + type="selection" + width="55" + align="center">