diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index d13400055..8a5edbd2d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -3,7 +3,7 @@
标准征求意见流程
- 责任部门对接人汇总并选择审批人
+ 审批人审批
@@ -259,6 +335,18 @@ export default {
name: "bzzqyjStep4",
data() {
return {
+ acceptShow: false,
+ idList: [],
+ options: [],
+ itemId: '',
+ modalshowflag2: false,
+ editForm: {
+ chapterNumber: '',
+ chapterName: '',
+ oldText: '',
+ newText: '',
+ reason: '',
+ },
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
@@ -308,6 +396,107 @@ export default {
ProcessTitle
},
methods: {
+ handleSelectionChange(val) {
+ this.idList = []
+ val.forEach(item => {
+ this.idList.push(item.id)
+ })
+ },
+ addDelete() {
+ if (this.idList.length > 0) {
+ this.$confirm('删除选中数据, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ for (let a = 0; a < this.data.length; a++) {
+ this.idList.forEach(item => {
+ if (this.data[a].id === item) {
+ this.data.splice(a, 1)
+ }
+ })
+ }
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '已取消删除'
+ });
+ });
+ } else {
+ this.$message.warning('请选择要删除的数据')
+ }
+ },
+ addModal() {
+ var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+ var json = {
+ chapterNumber: '',
+ chapterName: '',
+ commentText: '',
+ oldText: '',
+ newText: '',
+ reason: '',
+ id: id,
+ department: this.$store.getters.userInfo.upDeptName,
+ responUserName: this.$store.getters.userInfo.userName,
+ }
+ this.data.push(json)
+ this.itemId = id
+ this.editForm = {
+ chapterNumber: '',
+ chapterName: '',
+ oldText: '',
+ newText: '',
+ reason: '',
+ }
+ this.modalshowflag2 = true
+ },
+ getItemList (standId, fileType) { // 查询分解单条款数据
+ this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
+ standId: standId,
+ fileType: fileType,
+ pageSize: 9999,
+ page: 1
+ }, {}, res => {
+ if (res.ok) {
+ this.options = res.data.list
+ }
+ }, e => {
+ })
+ },
+ optionsChange (data) {
+ for (let a = 0; a < this.options.length; a++) {
+ if (data === this.options[a].itemsNum) {
+ this.editForm.chapterName = this.options[a].itemsName
+ this.editForm.oldText = this.options[a].termsConditions
+ }
+ }
+ },
+ saveUserInfo2 () {
+ for( let a = 0; a < this.data.length; a++) {
+ if (this.data[a].id === this.itemId) {
+ this.data[a].chapterNumber = this.editForm.chapterNumber
+ this.data[a].chapterName = this.editForm.chapterName
+ this.data[a].oldText = this.editForm.oldText
+ this.data[a].newText = this.editForm.newText
+ this.data[a].reason = this.editForm.reason
+ }
+ }
+ this.modalshowflag2 = false
+ },
+ cancleUserInfo2 () {
+ this.modalshowflag2 = false
+ },
+ itemEdit (row) {
+ this.itemId = row.id
+ this.modalshowflag2 = true
+ this.editForm = {
+ chapterNumber: row.chapterNumber,
+ chapterName: row.chapterName,
+ oldText: row.oldText,
+ newText: row.newText,
+ reason: row.reason,
+ }
+ },
checkedRole2(data) {
this.form.spId = data[0].id
this.form.spName = data[0].name
@@ -429,6 +618,14 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
+ let commitStatus = res.commitStatus
+ if(commitStatus && commitStatus > 0){
+ this.acceptShow = true
+ this.submitShow = false
+ }else {
+ this.acceptShow = false
+ this.submitShow = true
+ }
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
@@ -444,6 +641,7 @@ export default {
this.form.spId = data.spId || ''
this.form.spName = data.spName || ''
this.json = data
+ this.getItemList(data.standId,this.form.textValue)
this.data = data.info || data.data
}).catch(e => {
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index d83214356..995ed952d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -103,7 +103,7 @@
align="center"
label="修改意见内容(包括理由或依据)">
@@ -111,12 +111,12 @@
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index e1c15431d..a38e79e0b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -52,6 +52,16 @@
+
+
+
+ - -
+
+
@@ -108,6 +118,9 @@
prop="oldText"
align="center"
label="修改前">
+
+ 查看修改前内容
+
+
+
+
+ 关闭
+
+
@@ -247,6 +269,8 @@ export default {
name: "bzzqyjStep6",
data() {
return {
+ itermsConditionsFlag: false,
+ itermsConditionsTitle: '',
drawerModal: false,
histortData: [],
oldData: [],
@@ -278,6 +302,9 @@ export default {
cname: "", // 名称
fjList: [],
fjListId: '',
+ textType: '',
+ modelList: [],
+ modelNameList: '',
},
formRules: {
responUserList: [
@@ -293,6 +320,13 @@ export default {
ProcessTitle
},
methods: {
+ itermsConditionsClose () {
+ this.itermsConditionsFlag = false
+ },
+ itermsConditionsOpen (row) {
+ this.itermsConditionsFlag = true
+ this.itermsConditionsTitle = row
+ },
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
@@ -453,6 +487,9 @@ export default {
}
})
this.json = data
+ this.form.textType = data.textType
+ this.form.modelList = data.modelList
+ this.form.modelNameList = data.modelNameList
this.data = arr
this.oldData = data.oldinfo
}).catch(e => {