diff --git a/src/api/process.js b/src/api/process.js
index cfab0cb4e..683f86681 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -137,6 +137,15 @@ export function queryTaskFirst (data) {
params: data
})
}
+
+// 草稿删除
+export function taskDel (data) {
+ return axios({
+ url: '/api/lawss/activiti/delCG',
+ method: 'post',
+ params: data
+ })
+}
// 整改流程 详情查询nonconformity
export function getNonconformity (data) {
return axios({
diff --git a/src/pages/config/pages/attributeCustom/components/buss.vue b/src/pages/config/pages/attributeCustom/components/buss.vue
index ee5883e7a..e45fbcff2 100644
--- a/src/pages/config/pages/attributeCustom/components/buss.vue
+++ b/src/pages/config/pages/attributeCustom/components/buss.vue
@@ -2,8 +2,8 @@
- 新增
- 展示区域管理
+ 新增
+ 展示区域管理
数据处理中
diff --git a/src/pages/config/pages/attributeCustom/components/laws.vue b/src/pages/config/pages/attributeCustom/components/laws.vue
index 0282e8977..3903b5b4f 100644
--- a/src/pages/config/pages/attributeCustom/components/laws.vue
+++ b/src/pages/config/pages/attributeCustom/components/laws.vue
@@ -2,8 +2,8 @@
- 新增
- 展示区域管理
+ 新增
+ 展示区域管理
数据处理中
diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 9421c573f..12c0430c7 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -2,7 +2,7 @@
- 新增
+ 新增
展示区域管理
数据处理中
diff --git a/src/pages/config/pages/linkManage/linkType/firstLink.vue b/src/pages/config/pages/linkManage/linkType/firstLink.vue
index c15071f96..5e0fa37d1 100644
--- a/src/pages/config/pages/linkManage/linkType/firstLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/firstLink.vue
@@ -52,14 +52,14 @@
prop="name"
label="链接名称">
-
{{ '-' }}
-
+ -->
-
+
@@ -203,6 +203,7 @@ export default {
imageUrl: '',
uploadUrl: 'api/att/attFile/upload',
+ subLoading: false
}
},
methods: {
@@ -351,6 +352,7 @@ export default {
submit() {
this.$refs['sarStandardsInfoForm'].validate((valid) => {
if (valid) {
+ this.subLoading = true
if (this.type === 1) {
this.$http.postData('sarUrl/tsUrl/add', {
...this.sarStandardsInfoEO,
@@ -360,12 +362,14 @@ export default {
}, res => {
if (res.ok) {
this.$message.success('新增成功')
+ this.subLoading = false
this.modalshowflag = false
this.imageUrl = ''
this.linkListFirst = []
this.getLink()
} else {
this.$message.warning(res.message)
+ this.subLoading = false
}
})
} else {
@@ -382,11 +386,13 @@ export default {
}, res => {
if (res.ok) {
this.$message.success('修改成功')
+ this.subLoading = false
this.modalshowflag = false
this.linkListFirst = []
this.getLink()
} else {
this.$message.warning(res.message)
+ this.subLoading = false
}
})
}
diff --git a/src/pages/config/pages/linkManage/linkType/secondLink.vue b/src/pages/config/pages/linkManage/linkType/secondLink.vue
index 6c91e0b35..176f84c68 100644
--- a/src/pages/config/pages/linkManage/linkType/secondLink.vue
+++ b/src/pages/config/pages/linkManage/linkType/secondLink.vue
@@ -52,14 +52,14 @@
prop="name"
label="链接名称">
-
{{ '-' }}
-
+ -->
-
+
@@ -203,7 +203,8 @@ export default {
imageUrl: '',
uploadUrl: 'api/att/attFile/upload',
- verifyImg: ''
+ verifyImg: '',
+ subLoading: false
}
},
methods: {
@@ -353,6 +354,7 @@ export default {
submit() {
this.$refs['sarStandardsInfoForm'].validate((valid) => {
if (valid) {
+ this.subLoading = true
if (this.type === 1) {
this.$http.postData('sarUrl/tsUrl/add', {
...this.sarStandardsInfoEO,
@@ -362,11 +364,13 @@ export default {
}, res => {
if (res.ok) {
this.$message.success('新增成功')
+ this.subLoading = false
this.modalshowflag = false
this.linkListSecond = []
this.getLink()
} else {
this.$message.warning(res.message)
+ this.subLoading = false
}
})
} else {
@@ -382,11 +386,13 @@ export default {
}, res => {
if (res.ok) {
this.$message.success('修改成功')
+ this.subLoading = false
this.modalshowflag = false
this.linkListSecond = []
this.getLink()
} else {
this.$message.warning(res.message)
+ this.subLoading = false
}
})
}
diff --git a/src/pages/config/pages/menuManage/index.vue b/src/pages/config/pages/menuManage/index.vue
index b116a8a1f..52762bab6 100644
--- a/src/pages/config/pages/menuManage/index.vue
+++ b/src/pages/config/pages/menuManage/index.vue
@@ -21,7 +21,7 @@
class="common-button-primary add-button"
@click="Add"
size="mini">新增
-
删除
diff --git a/src/pages/config/pages/standLawsAttrManage/index.vue b/src/pages/config/pages/standLawsAttrManage/index.vue
index 9f9443fbc..60b75bec1 100644
--- a/src/pages/config/pages/standLawsAttrManage/index.vue
+++ b/src/pages/config/pages/standLawsAttrManage/index.vue
@@ -52,10 +52,10 @@
size="mini"
@click="showAddModel(1, null)"
v-btn-permission="''"
- >
新增新增
-
删除删除
diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue
index 8404410b8..66e7ad0ea 100644
--- a/src/pages/home2/components/empennage/index.vue
+++ b/src/pages/home2/components/empennage/index.vue
@@ -9,10 +9,10 @@
-
+ v-if="index < 5">-->
{{ item.name.slice(0, 8) + '...' }}
{{ item.name }}
@@ -29,10 +29,10 @@
-
+ v-if="index < 5">-->
{{ item.name.slice(0, 8) + '...' }}
{{ item.name }}
diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue
index 9b9f0d737..606229d2c 100644
--- a/src/pages/localTool/standCalendar/index.vue
+++ b/src/pages/localTool/standCalendar/index.vue
@@ -8,12 +8,12 @@
- {{ item }}
+ {{ item }}
- {{ item }}
+ {{ item }}
@@ -56,7 +56,7 @@
暂无会议
-
+
会议
会议
diff --git a/src/pages/localTool/standardRecognition/index.vue b/src/pages/localTool/standardRecognition/index.vue
index baf52ffe1..a7cdcad16 100644
--- a/src/pages/localTool/standardRecognition/index.vue
+++ b/src/pages/localTool/standardRecognition/index.vue
@@ -10,6 +10,9 @@
删除
+ 编辑
@@ -100,26 +103,17 @@
width="120"
>
-
+
-
-
-
- 获取文件
- 编辑
- 删除
-
-
-
+ 获取文件
@@ -165,12 +159,14 @@
{{ $t("m.upload")+' PDF'}}
{{ $t("m.upload")+' PDF'}}
@@ -719,6 +715,7 @@ export default {
components: {},
data() {
return {
+ selectTableDatas: [],
textStatusMap: {}, // 文本状态id与name对应
lawInfoTable:[],
lawInfoTableLoading: true,
@@ -784,184 +781,7 @@ export default {
{ required: true, message: '文件不能为空', trigger: 'change' }
]
},
- options: [
- // {
- // value: "STAND_FILE",
- // label: "标准文本",
- // },
- // {
- // value: "DRAFT_FILE",
- // label: "草案",
- // },
- // {
- // value: "OPINION_FILE",
- // label: "征求意见稿",
- // },
- // {
- // value: "SENT_SCREEN_FILE",
- // label: "送审稿",
- // },
- // {
- // value: "APPROVAL_FILE",
- // label: "报批稿",
- // },
- // {
- // value: "RELEVANCE_FILE",
- // label: "关联文件",
- // },
- ],
-/* standRecoColumn: [
- {
- type: 'selection',
- width: 60,
- align: 'center'
- },
- {
- title: '序号',
- type: 'index',
- align: 'center'
- },
- {
- title: '资料类型',
- key: 'fileType',
- align: 'center',
- render: (h, params) => {
- let texts
- if (params.row.fileType === '1') {
- texts = '国内标准法规'
- } else if (params.row.fileType === '2') {
- texts = '海外标准法规'
- } else if (params.row.fileType === '3') {
- texts = '政策'
- } else if (params.row.fileType === '4') {
- texts = '企业标准'
- } else {
- texts = '标准'
- }
- return h('div', {
- class: {
- 'text-overflow-hidden': true
- },
- attrs: {
- title: texts
- }
- }, texts)
- }
- },
- {
- title: '标准号/政策号',
- key: 'standNumber',
- align: 'center'
- },
- {
- title: '标准名称/政策名称',
- key: 'standName',
- align: 'center'
- },
- {
- title: '文本状态',
- key: 'fileStatus',
- align: 'center',
- render: (h, params) => {
- let texts
- if (params.row.fileType === 'STAND_FILE') {
- texts = '标准文本'
- } else if (params.row.fileType === 'DRAFT_FILE') {
- texts = '草案'
- } else if (params.row.fileType === 'OPINION_FILE') {
- texts = '征求意见稿'
- } else if (params.row.fileType === 'SENT_SCREEN_FILE') {
- texts = '送审稿'
- } else if (params.row.fileType === 'APPROVAL_FILE') {
- texts = '报批稿'
- } else if (params.row.fileType === 'RELEVANCE_FILE') {
- texts = '关联文件'
- }
- return h('div', {
- class: {
- 'text-overflow-hidden': true
- },
- attrs: {
- title: texts
- }
- }, texts)
- }
- },
- {
- title: '转换结果',
- key: 'resultContent',
- align: 'center'
- },
- {
- title: '消耗时间',
- key: 'spendTime',
- align: 'center'
- },
- {
- title: '操作',
- key: 'action',
- width: 200,
- align: 'center',
- render: (h, params) => {
- return h('div', [
- h('Button', {
- props: {
- type: 'primary',
- size: 'small'
- },
- style: {
- marginRight: '5px'
- },
- on: {
- click: () => {
- this.downloadFile(params.row)
- }
- }
- }, '获取文件'),
- h('Button', {
- props: {
- type: 'warning',
- size: 'small'
- },
- style: {
- marginRight: '5px'
- },
- on: {
- click: () => {
- this.editOcrRecord(params.row)
- }
- }
- }, '编辑'),
- h('Dropdown', {
- props: {
- trigger: 'click'
- },
- on: {
- 'on-click': (value) => {}
- }
- }, [
- h('Button', {
- props: {
- type: 'primary',
- size: 'small'
- }
- }, '更多'),
- h('DropdownMenu', {
- slot: 'list'
- },
- this.dropdownItems.map(function (type) {
- return h('DropdownItem', {
- props: {
- name: type.val
- }
- }, type.val)
- })
- )
- ])
- ])
- }
- }
- ],*/
+ options: [],
modalType: "",
standRecoList: [],
selectTableData: [],
@@ -1237,6 +1057,7 @@ export default {
this.selectTableData = [];
for (let i = 0; i < data.length; i++) {
this.selectTableData.push(data[i].id);
+ this.selectTableDatas.push(data[i])
}
},
// 上传
@@ -1326,28 +1147,32 @@ export default {
this.$refs["importFileAboutStand"].clearFiles();
},
// 编辑
- editOcrRecord(row) {
- console.log('575',row)
- this.modalType = "2";
- this.title = "编辑信息";
- this.btnName = "保存";
- this.uploadFilesdfEo.fileName = row.fileName
- this.uploadModal = true;
- this.uploadFilesdfEo.standNumber = JSON.parse(
- JSON.stringify(row)
- ).standNumber;
- this.uploadFilesdfEo.standName = JSON.parse(
- JSON.stringify(row)
- ).standName;
- // this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType
- this.options.map((item) => {
- if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) {
- this.uploadFilesdfEo.fileType = item.attrName;
- }
- });
- this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id;
- this.uploadFilesdfEo.attId = "";
- this.defaultFileList = [];
+ editOcrRecord() {
+ if (this.selectTableDatas.length === 1) {
+ let row = this.selectTableDatas[0]
+ this.modalType = "2";
+ this.title = "编辑信息";
+ this.btnName = "保存";
+ this.uploadFilesdfEo.fileName = row.fileName
+ this.uploadModal = true;
+ this.uploadFilesdfEo.standNumber = JSON.parse(
+ JSON.stringify(row)
+ ).standNumber;
+ this.uploadFilesdfEo.standName = JSON.parse(
+ JSON.stringify(row)
+ ).standName;
+ // this.uploadFilesdfEo.fileType = JSON.parse(JSON.stringify(row)).fileType
+ this.options.map((item) => {
+ if (item.attrName === JSON.parse(JSON.stringify(row)).fileType) {
+ this.uploadFilesdfEo.fileType = item.attrName;
+ }
+ });
+ this.uploadFilesdfEo.id = JSON.parse(JSON.stringify(row)).id;
+ this.uploadFilesdfEo.attId = "";
+ this.defaultFileList = [];
+ } else {
+ this.$message.warning('请选择一条数据进行编辑')
+ }
},
// 提交
uploadSave() {
@@ -1519,7 +1344,7 @@ export default {
(res) => {
if (res.ok) {
this.standRecoList = res.data.list;
- this.total = res.data.list.length;
+ this.total = res.data.count
}
},
e => {}
@@ -1533,7 +1358,6 @@ export default {
_this: this
}, res => {
this.options = res.data
- console.log(this.options);
})
this.getTableData();
},
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index cb3106e91..1082a588c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -269,6 +269,9 @@ export default {
this.getData()
},
methods: {
+ phoneClick () {
+ this.$router.push('/phoneBzrhStep2')
+ },
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
index 593e411dc..a306f33cf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
@@ -292,6 +292,9 @@ export default {
this.getData()
},
methods: {
+ phoneClick () {
+ this.$router.push('/phoneBzrhStep4')
+ },
// 右上标签页面切换
handleTabs(name) {
this.active = name
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
index 51673820e..834b8905c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue
@@ -303,6 +303,11 @@ export default {
this.getData()
},
methods: {
+ phoneClick () {
+ if (this.taskInfo !== '标准法规工程师汇总修订完毕') {
+ this.$router.push('/phoneBzrhStep6')
+ }
+ },
// 右上标签页面切换
handleTabs(name) {
this.active = name
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
index aac1c3c67..de46ff5d8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step2.vue
@@ -274,6 +274,9 @@ export default {
this.getData()
},
methods: {
+ phoneClick () {
+ this.$router.push('/phoneBzhhStep2')
+ },
// 右上标签页面切换
handleTabs(name) {
this.active = name
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
index df261c830..1a8d9166d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
@@ -241,6 +241,9 @@ export default {
this.getData()
},
methods: {
+ phoneClick () {
+ this.$router.push('/phoneBzchStep2')
+ },
// 右上标签页面切换
handleTabs(name) {
this.active = name
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
index 40e385017..5b07fb850 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step4.vue
@@ -246,6 +246,9 @@ export default {
this.getData()
},
methods: {
+ phoneClick () {
+ this.$router.push('/phoneBzchStep4')
+ },
// 右上标签页面切换
handleTabs(name) {
this.active = name
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
index a11847ce6..c2daaa0c5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step6.vue
@@ -260,6 +260,11 @@ export default {
this.getData()
},
methods: {
+ phoneClick () {
+ if (this.taskInfo !== '标准法规工程师修订完毕') {
+ this.$router.push('/phoneBzchStep6')
+ }
+ },
// 右上标签页面切换
handleTabs(name) {
this.active = name
diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
index 9f94f9e6c..3c5bf7f10 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfs/step2.vue
@@ -121,7 +121,7 @@
v-model="qbfsForm.jgUser"
placeholder="请选择工作组成员"
clearable
- @click.native="choiceZRR(null,'jgUser', '选择工作组成员', roleForm.jgUser)"
+ @click.native="choiceZRRS"
>
@@ -235,7 +235,7 @@
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
- :nodeList="nodeList"
+ :nodeList="nodeList2"
>
@@ -260,6 +260,7 @@ export default {
commentText: '',
detailData: [],
nodeList: [],
+ nodeList2: [],
isSubmit: false,
saveLoading: false,
isTransfer: false,
@@ -396,14 +397,12 @@ export default {
this.processStep = window.URL.createObjectURL(res.data)
})
},
- choiceZRR(scope, type, title, id) {
- if (scope != null) {
- this.dsadadadsada = scope.$index;
+ choiceZRRS() {
+ this.drawerTitle = '请选择工作组成员'
+ this.nodeList2 = [];
+ if (this.qbfsForm.jgUserId) {
+ this.nodeList2 = this.qbfsForm.jgUserId.split(",");
}
- this.nodeList = [];
- this.nodeList.push(id);
- this.type = type;
- this.drawerTitle = title;
this.modalshowflag = true;
},
checkedRole(data) {
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
index 6873b34a1..ab6692037 100644
--- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
@@ -2,7 +2,7 @@
企标废止流程
- 标准法规部部长审核
+ 批准负责人批准