+
@@ -92,7 +92,32 @@ export default {
isBoolean: false
}
},
+ created() {
+ let _this = this;
+ //窗口改变时
+ window.onresize = function () {
+ _this.handleRefreshTable();
+ };
+ },
+ updated() {
+ this.handleRefreshTable()
+ },
methods: {
+ handleRefreshTable() {
+ this.$nextTick(() => {
+ // 获取页面中已注册过ref的所有的子组件。
+ let refList = this.$refs.appView.$refs;
+ if (refList) {
+ for (let i of Object.keys(refList)) {
+ // 根据doLayout方法判断子组件是不是el-table
+ if (refList[i] && refList[i].doLayout) {
+ // 执行doLayout方法
+ refList[i].doLayout();
+ }
+ }
+ }
+ })
+ },
// 点击下拉选项事件
handleCommand(command) {
// 退出登录
@@ -227,6 +252,8 @@ export default {
} else {
this.isBoolean = false
}
+ //切换标签时
+ this.handleRefreshTable();
}
},
mounted() {
diff --git a/src/api/process.js b/src/api/process.js
index ed2cf8171..ab709c7b6 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -93,6 +93,14 @@ export function processCreateBuss (data) {
})
}
+export function verifySnExists (data) {
+ return axios({
+ url: '/api/sarBussStandSn/sar-buss-stand-sn/verifySnExists',
+ method: 'get',
+ params: data
+ })
+}
+
export function processCreatePlan (data) {
return axios({
url: '/api/lawss/actSarItemsPlan/processCreatePlan',
diff --git a/src/common/axios/index.js b/src/common/axios/index.js
index 3df69f477..a2f783880 100644
--- a/src/common/axios/index.js
+++ b/src/common/axios/index.js
@@ -130,7 +130,7 @@ export default {
if (res.data.ok !== undefined && showTips) {
let type = res.data.ok ? 'success' : 'warning'
if (_this) {
- if (res.data.message !== '') {
+ if (res.data.message !== '' && res.data.message !== null) {
_this.$message[type](res.data.message)
}
}
diff --git a/src/components/CustomFormComponents/File.vue b/src/components/CustomFormComponents/File.vue
index 278d37d52..4dc120d31 100644
--- a/src/components/CustomFormComponents/File.vue
+++ b/src/components/CustomFormComponents/File.vue
@@ -256,6 +256,23 @@ export default {
const index = this.$refs.importFileAboutStand.uploadFiles.findIndex(e => e.response.data.id === file.response.data.id);
this.$refs.importFileAboutStand.uploadFiles.splice(index, 1);
this.showFileList.splice(index, 1)
+ const value = this.value
+ let ids = value.split(',')
+ if (file.response) {
+ let fileIds = file.response.data.id
+ let newIdList = this.removeArray(ids, fileIds)
+ let newStr = ''
+ if (newIdList != null && newIdList.length > 0) {
+ for (let i = 0; i < newIdList.length; i++) {
+ if (newIdList[i] !== '') {
+ newStr += newIdList[i] + ','
+ }
+ }
+ this.$emit('input', newStr)
+ } else {
+ this.$emit('input', '')
+ }
+ }
},
// 修改
handleModifyName(file) {
diff --git a/src/components/CustomFormComponents/FillingDatePicker.vue b/src/components/CustomFormComponents/FillingDatePicker.vue
index 659855673..1d7638233 100644
--- a/src/components/CustomFormComponents/FillingDatePicker.vue
+++ b/src/components/CustomFormComponents/FillingDatePicker.vue
@@ -14,7 +14,7 @@
:value="value"
type="date"
:editable="true"
- :disabled="true"
+ disabled
:placeholder="placeholder"
@input="handleChange"
>
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 3fbdc9c8b..8827ed2a8 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -399,11 +399,11 @@
// path: '/convertDocView',
// menuId: '3F52K25546'
// },
- {
- title: '菜单管理',
- path: '/menuManage',
- menuId: '87b8b4f5817a7829696e63185c744d52'
- },
+ // {
+ // title: '菜单管理',
+ // path: '/menuManage',
+ // menuId: '87b8b4f5817a7829696e63185c744d52'
+ // },
{
title: '链接管理',
path: '/linkManage',
diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 951b77249..e6a1e0880 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -308,7 +308,8 @@
}
})
this.$http.get('SarInstitution/institution/getNextById', {
- ids: ids
+ ids: ids,
+ topNum: 3,
}, {
_this: this
}, res => {
diff --git a/src/components/workTree/index.vue b/src/components/workTree/index.vue
index d93320d38..49f16915d 100644
--- a/src/components/workTree/index.vue
+++ b/src/components/workTree/index.vue
@@ -12,14 +12,18 @@
:inline="true"
@submit.native.prevent
>
-
+
-
-
+
+
+
+ 查询
+
+
+
-
+
-
+
{
- this.$message.warning(res.message);
+ if(!res.ok){
+ this.$message.warning(res.message);
+ }else {
+ this.$message.success(res.message);
+ }
this.getWorkData();
}, e => {
});
diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue
index 08125ceeb..491c9622e 100644
--- a/src/pages/home2/components/release/index.vue
+++ b/src/pages/home2/components/release/index.vue
@@ -91,13 +91,7 @@ export default {
// 此处需要调用接口,修改个人配置
},
togo () {
- if(this.total && this.total > 10){
- this.pageVerify = true
- this.pageSize = this.$store.getters.userInfo.configContent
- }else {
- this.pageVerify = false
- }
- this.getAdvice()
+ this.$router.push({path:'/release2'})
},
// 点击查看
handlePreview (item) {
diff --git a/src/pages/home2/components/release2/index.vue b/src/pages/home2/components/release2/index.vue
new file mode 100644
index 000000000..eec067b36
--- /dev/null
+++ b/src/pages/home2/components/release2/index.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standard }}
+
+
+
+
+ {{ scope.row.standardName }}
+
+
+
+
+ {{scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}
+
+
+
+
加载中...
+
+
+
+
+
+
+
diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue
index efd958425..c6692f926 100644
--- a/src/pages/home2/components/releaseBuss/index.vue
+++ b/src/pages/home2/components/releaseBuss/index.vue
@@ -91,13 +91,7 @@ export default {
// 此处需要调用接口,修改个人配置
},
togo () {
- if(this.total && this.total > 10){
- this.pageVerify = true
- this.pageSize = this.$store.getters.userInfo.configContent
- }else {
- this.pageVerify = false
- }
- this.getAdvice()
+ this.$router.push({path:'/releaseBuss2'})
},
// 点击查看
handlePreview (item) {
diff --git a/src/pages/home2/components/releaseBuss2/index.vue b/src/pages/home2/components/releaseBuss2/index.vue
new file mode 100644
index 000000000..cc029042a
--- /dev/null
+++ b/src/pages/home2/components/releaseBuss2/index.vue
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standard }}
+
+
+
+
+ {{ scope.row.standardName }}
+
+
+
+
+ {{scope.row.releaseDate ? $moment(scope.row.releaseDate).format('YYYY-MM-DD') : '' }}
+
+
+
+
加载中...
+
+
+
+
+
+
+
diff --git a/src/pages/home2/components/releaseQA/index.vue b/src/pages/home2/components/releaseQA/index.vue
index c50e6a01f..a9c494c35 100644
--- a/src/pages/home2/components/releaseQA/index.vue
+++ b/src/pages/home2/components/releaseQA/index.vue
@@ -91,13 +91,7 @@ export default {
// 此处需要调用接口,修改个人配置
},
togo () {
- if(this.total && this.total > 10){
- this.pageVerify = true
- this.pageSize = this.$store.getters.userInfo.configContent
- }else {
- this.pageVerify = false
- }
- this.getAdvice()
+ this.$router.push({path:'/releaseQA2'})
},
// 点击查看
handlePreview (item) {
diff --git a/src/pages/home2/components/releaseQA2/index.vue b/src/pages/home2/components/releaseQA2/index.vue
new file mode 100644
index 000000000..eff31d03d
--- /dev/null
+++ b/src/pages/home2/components/releaseQA2/index.vue
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
加载中...
+
+
+
+
+
+
+
diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue
index 33b4a8d56..3f76904e1 100644
--- a/src/pages/home2/components/releaseUs/index.vue
+++ b/src/pages/home2/components/releaseUs/index.vue
@@ -101,13 +101,7 @@ export default {
// 此处需要调用接口,修改个人配置
},
togo () {
- if(this.total && this.total > 10){
- this.pageVerify = true
- this.pageSize = this.$store.getters.userInfo.configContent
- }else {
- this.pageVerify = false
- }
- this.getAdvice()
+ this.$router.push({path:'/releaseUs2'})
},
// 将文本状态的id与name对应
setMap(data) {
diff --git a/src/pages/home2/components/releaseUs2/index.vue b/src/pages/home2/components/releaseUs2/index.vue
new file mode 100644
index 000000000..92cbe8a8f
--- /dev/null
+++ b/src/pages/home2/components/releaseUs2/index.vue
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standard }}
+
+
+
+
+ {{ scope.row.standardName }}
+
+
+
+
+ {{ textStatusMap[scope.row.textState] }}
+
+
+
+
加载中...
+
+
+
+
+
+
+
diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index 0edece2a4..739ce7de3 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -98,7 +98,7 @@
属性
编辑
- 编辑
+ 编辑
复制
删除
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
index 4f3f95e0d..7d8694f6b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue
@@ -49,6 +49,38 @@
- -
+
+
+
+ {{ item.name }}
+
+
+
+
+ - -
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+ - -
+
+
@@ -206,7 +238,9 @@ export default {
date: '', // 完成时间
hzfileId: '',
hzfileName: '',
- textpz: ''
+ textpz: '',
+ modelList:[],
+ fjList: []
},
formRules: {
textpz: [
@@ -224,6 +258,10 @@ export default {
ProcessTitle
},
methods: {
+ clickButtonToUpload(file) {
+ const attId = file.attId
+ this.$preview(attId)
+ },
foldForm() {
this.foldFormFlag = !this.foldFormFlag
},
@@ -237,6 +275,10 @@ export default {
updateFile (fileId) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + fileId
},
+ updateFile2 (item) {
+ let id = item.id
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
+ },
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 91c7fef8b..e66caa4d8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -26,21 +26,21 @@
-
-
-
{{ item.name }}
-
-