-
-
- - +
- +
-
更多链接> @@ -19,36 +19,7 @@ export default { mixins: [], data() { return { - linkList: [ - { - newWebSite: 'http://www.sac.gov.cn/', - webName: '国家标准化管理委员会' - }, - { - newWebSite: 'http://std.samr.gov.cn/', - webName: '全国标准公共服务平台' - }, - { - newWebSite: 'http://www.catarc.org.cn/', - webName: '全国汽车标准化技术委员会' - }, - { - newWebSite: 'http://jtst.mot.gov.cn/news/', - webName: '交通运输标准化信息平台' - }, - { - newWebSite: 'http://www.miit-eidc.org.cn/', - webName: '工信部装备工业发展中心' - }, - { - newWebSite: 'http://www.mee.gov.cn/', - webName: '中华人民共和国生态环境部' - }, - // { - // newWebSite: '', - // webName: '更多链接>' - // } - ] + linkList: [], } }, computed: {}, @@ -67,13 +38,14 @@ export default { window.open('https://' + linkUri) } }, + // 获取链接数据 getLink () { - this.$http.get('sarUrl/tsUrl', {}, { + this.$http.get('sarUrl/tsUrl', { + }, { _this: this, loading: 'Loading' }, res=> { - this.data = res.data - console.log(data); + this.linkList = res.data }) } }, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 94e7d8975..5b56a0e57 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -496,7 +496,6 @@
+
点击上传 @@ -89,77 +89,77 @@ + type="primary" + class="common-button-primary" + size="small" + @click="searchLawsStands"> 查询 清空 + class="common-button-default" + size="small" + @click="clearSearchLaws">清空@@ -172,116 +172,116 @@
{{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+ {{ opt.label}}
+
+
+
+
+
+
+
+ 查询
+
+
+ 清空
+
+
+
@@ -473,6 +571,68 @@ export default {
// }
// }
return {
+ selectSarMenu: {}, // 用来记录当前选中的二级菜单对象
+ tableFlag: '',
+ isAdvancedSearch: false, // 高级检索窗口是否打开
+ // 一般检索搜索
+ standCommonlySearch: {
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ standType: 'INLAND',
+ validFlag: '0',
+ standSort: '',
+ standNumber: ''
+ },
+ standItemSearch: {
+ standId: '',
+ responsibleUnit: '',
+ orgName: '',
+ validFlag: '0'
+ },
+ standItemList: [],
+ sarStandardsSearch: {
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ standType: 'INLAND',
+ validFlag: '0',
+ menuId: '',
+ country: '',
+ standNumber: '',
+ standName: '',
+ standState: '',
+ standNature: '',
+ issueTime: '',
+ // applyArctic: '',
+ replaceStandNum: '',
+ // replaceStandNumCope: '',
+ // replaceStandNumList: [],
+ replacedStandNum: '',
+ synopsis: '', // 内容摘要
+ // category: '', // 所属类别
+ standSort: '' // 标准类别
+ }, // 分页查询过程中用到的对象
+ sarConfigStandSearch: {
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent,
+ standType: 'INLAND',
+ validFlag: '0',
+ menuId: '',
+ country: '',
+ standSort: '',
+ standNumber: '',
+ standName: '',
+ standState: '',
+ standNature: '',
+ category: '',
+ issueTime: '',
+ applyArctic: '',
+ replaceStandNum: '',
+ synopsis: '',
+ // replaceStandNumCope: '',
+ replacedStandNum: '',
+ orderBy:''
+ }, // 分页查询过程中用到的对象
+ categoryOptions: [], // 所属类别下拉框
selectSearch : [],
// 新增、编辑 基础信息字段
sarAccessEO: {
@@ -541,8 +701,8 @@ export default {
sarAccessInfoSearchList: [], // 数据搜索 table列表数据
importmodalFlag: false, // 导入model 状态
searching: false,
- sarAccessInfoList: [], // 清单条目 技术要求table 数据
- sarAccessInfoListArry: [], // 清单条目 table选中数据
+ stahndinfoList: [], // 清单条目 技术要求table 数据
+ stahndinfoListArry: [], // 清单条目 table选中数据
moreSearchShow: false, // 多属性搜索 状态
loadData: false, // 提交按钮loading效果
drawerPage: 1, // 数据搜索table页码
@@ -751,6 +911,8 @@ export default {
methods: {
// 高级检索
selectMoreBtn () {
+ this.isAdvancedSearch = true
+ this.sarStandardsSearch = []
},
// 法规维护人树
getDept () {
@@ -1009,30 +1171,29 @@ export default {
*/
addSarAccess () {
//判断是否是清单类型
- if (this.selectedAccInfoSearchList.length > 0) {
- // 追加字段
- this.selectedAccInfoSearchList.map(item => {
- let addList;
- addList = this.sarAccessInfoList.findIndex(items => {
- return items.id == item.id
- })
- if(addList > -1){
- this.$message.warning('请勿添加重复数据')
- this.$refs.accessTypeSelect.clearSelection()
- this.$refs.entryTable.clearSelection()
- this.$refs.searchTable.clearSelection()
- } else{
- this.sarAccessInfoList.push(item)
- this.$refs.accessTypeSelect.clearSelection()
- this.$refs.entryTable.clearSelection()
- this.$refs.searchTable.clearSelection()
- }
+ if (this.selectedAccInfoSearchList.length > 0) {
+ // 追加字段
+ this.selectedAccInfoSearchList.map(item => {
+ let addList;
+ addList = this.stahndinfoList.findIndex(items => {
+ return items.id == item.id
})
- } else {
- this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
- }
+ if(addList > -1){
+ this.$message.warning('请勿添加重复数据')
+ this.$refs.accessTypeSelect.clearSelection()
+ this.$refs.entryTable.clearSelection()
+ this.$refs.searchTable.clearSelection()
+ } else{
+ this.stahndinfoList.push(item)
+ this.$refs.accessTypeSelect.clearSelection()
+ this.$refs.entryTable.clearSelection()
+ this.$refs.searchTable.clearSelection()
+ }
+ })
+ } else {
+ this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
+ }
},
-
// 上移 事件
moveUp (index, row) {
if (index === 0) {
@@ -1041,21 +1202,21 @@ export default {
type: 'warning'
})
} else {
- let temp = this.sarAccessInfoList[index - 1]
- this.$set(this.sarAccessInfoList, index - 1, this.sarAccessInfoList[index])
- this.$set(this.sarAccessInfoList, index, temp)
+ let temp = this.stahndinfoList[index - 1]
+ this.$set(this.stahndinfoList, index - 1, this.stahndinfoList[index])
+ this.$set(this.stahndinfoList, index, temp)
}
},
moveDown (index) {
- if (index === (this.sarAccessInfoList.length - 1)) {
+ if (index === (this.stahndinfoList.length - 1)) {
this.$message({
message: '已经是列表中最后一个素材！',
type: 'warning'
})
} else {
- let i = this.sarAccessInfoList[index + 1]
- this.$set(this.sarAccessInfoList, index + 1, this.sarAccessInfoList[index])
- this.$set(this.sarAccessInfoList, index, i)
+ let i = this.stahndinfoList[index + 1]
+ this.$set(this.stahndinfoList, index + 1, this.stahndinfoList[index])
+ this.$set(this.stahndinfoList, index, i)
}
},
// 点击清单条目导入按钮事件
@@ -1074,36 +1235,35 @@ export default {
* 删除不想添加的AccessInfo信息
*/
deleteSelectSarAccessInfo () {
- if (this.sarAccessInfoListArry.length > 0) {
- this.$confirm('确认删除选中数据？', '确认删除', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- confirmButtonClass: 'common-button-primary',
- roundButton: true,
- type: 'warning'
- }).then(() => {
- // i 全部对象数组的下标
- // s 选中对象数组的下标
- for (var s in this.sarAccessInfoListArry) {
- for (var i in this.sarAccessInfoList) {
- if (this.sarAccessInfoListArry[s].uuid === this.sarAccessInfoList[i].uuid) {
- this.sarAccessInfoList.splice(i, 1)
- }
+ if (this.stahndinfoListArry.length > 0) {
+ this.$confirm('确认删除选中数据？', '确认删除', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ confirmButtonClass: 'common-button-primary',
+ roundButton: true,
+ type: 'warning'
+ }).then(() => {
+ // i 全部对象数组的下标
+ // s 选中对象数组的下标
+ for (var s in this.stahndinfoListArry) {
+ for (var i in this.stahndinfoList) {
+ if (this.stahndinfoListArry[s].uuid === this.stahndinfoList[i].uuid) {
+ this.stahndinfoList.splice(i, 1)
}
}
- this.sarAccessInfoListArry = []
- this.$refs.entryTable.clearSelection()
- }).catch(() => {})
- } else {
- this.$message.error('请选择需要删除的清单条目!')
- }
+ }
+ this.stahndinfoListArry = []
+ this.$refs.entryTable.clearSelection()
+ }).catch(() => {})
+ } else {
+ this.$message.error('请选择需要删除的清单条目!')
+ }
},
// 清单条目 table select事件
sarAccessInfoSelect (selectData) {
- this.sarAccessInfoListArry = selectData
- let sarAccessInfoListArryId = []
+ this.stahndinfoListArry = selectData
+ let stahndinfoListArryId = []
for(let i=0; i {
if (valid) {
- let rowlist = []
- for (let i = 0; i < this.sarAccessInfoList.length; i++) {
- rowlist.push(this.sarAccessInfoList[i].id)
- }
- rowlist = rowlist.join(',')
- let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
- sarAccessEO.inforlist = JSON.stringify(rowlist)
- sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
- sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
- // 判断是否有附件
- if (this.fileInfoList.length > 0) {
- let relateFile = []
- this.fileInfoList.map(item => {
- relateFile.push(item.id)
- })
- sarAccessEO.relateFile = relateFile.join(',')
- }
- if (!sarAccessEO.id) {
- // 新增
- sarAccessEO.state = '1'
- sarAccessEO.version = 0
- this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
- _this: this,
- loading: 'loadData'
- }, res => {
- if (res.ok) {
- this.isNext = true
- this.$router.push({
- name: 'AccessStandardsAndRegulations'
- })
- }
- }, e => {
- })
- } else {
- // 编辑
- this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
- _this: this,
- loading: 'loadData'
- }, res => {
- if (res.ok) {
- this.isNext = true
- this.$router.push({
- name: 'AccessStandardsAndRegulations'
- })
- }
- }, e => {
- })
- }
+ let rowlist = []
+ for (let i = 0; i < this.stahndinfoList.length; i++) {
+ rowlist.push(this.stahndinfoList[i].id)
+ }
+ rowlist = rowlist.join(',')
+ let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
+ sarAccessEO.inforlist = JSON.stringify(rowlist)
+ sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
+ sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
+ // 判断是否有附件
+ if (this.fileInfoList.length > 0) {
+ let relateFile = []
+ this.fileInfoList.map(item => {
+ relateFile.push(item.id)
+ })
+ sarAccessEO.relateFile = relateFile.join(',')
+ }
+ if (!sarAccessEO.id) {
+ // 新增
+ sarAccessEO.state = '1'
+ sarAccessEO.version = 0
+ this.$http.post('sarLawsDetailedList/sar-laws-detailed-list/insertList', sarAccessEO, {
+ _this: this,
+ loading: 'loadData'
+ }, res => {
+ if (res.ok) {
+ this.isNext = true
+ this.$router.push({
+ name: 'AccessStandardsAndRegulations'
+ })
+ }
+ }, e => {
+ })
+ } else {
+ // 编辑
+ this.$http.putData('sarLawsDetailedList/sar-laws-detailed-list/updateList', sarAccessEO, {
+ _this: this,
+ loading: 'loadData'
+ }, res => {
+ if (res.ok) {
+ this.isNext = true
+ this.$router.push({
+ name: 'AccessStandardsAndRegulations'
+ })
+ }
+ }, e => {
+ })
+ }
}else {
this.$message.error('请检查表单是否填写正确')
}
@@ -1171,12 +1331,14 @@ export default {
},
// 查询数据搜索 table 数据
selectLawsStands () {
- this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, {
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', {
+ ...this.sarAccessInfoSearch,
+ ...this.sarStandardsSearch
+ }, {
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list
}, e => {
-
})
},
// 数据搜索table判断checked状态
@@ -1186,7 +1348,6 @@ export default {
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val
- console.log(val)
},
// 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) {
@@ -1198,7 +1359,6 @@ export default {
this.sarAccessInfoSearch.page = this.drawerPage
this.selectLawsStands()
},
-
// 数据搜索table分页条数改变回调
drawerPageSizeChange () {
this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent
@@ -1213,10 +1373,10 @@ export default {
exportTestItem () {
let exportNames = this.exportName
let exportList = []
- if (this.sarAccessInfoListArry.length > 0) {
- exportList = this.sarAccessInfoListArry
+ if (this.stahndinfoListArry.length > 0) {
+ exportList = this.stahndinfoListArry
} else {
- exportList = this.sarAccessInfoList
+ exportList = this.stahndinfoList
}
if (exportList != null && exportList.length > 0) {
let accIdAndrestype = []
@@ -1257,9 +1417,9 @@ export default {
var a
var b = ''
if (response.data) {
- for (var sADMIN in this.sarAccessInfoListADMIN) {
+ for (var sADMIN in this.stahndinfoListADMIN) {
for (var iADMIN in response.data) {
- if (this.sarAccessInfoListADMIN[sADMIN].code === response.data[iADMIN].code) {
+ if (this.stahndinfoListADMIN[sADMIN].code === response.data[iADMIN].code) {
// ('在全部对象中的位置' + i)
response.data.splice(i, 1)
b = '数据重复添加,现已自动清除! '
@@ -1268,8 +1428,8 @@ export default {
}
if (response.data.length > 0) {
for (let i = 0; i < response.data.length; i++) {
- this.sarAccessInfoList.push(response.data[i])
- }
+ this.stahndinfoList.push(response.data[i])
+ }
}
a = response.data.length
}
@@ -1321,25 +1481,25 @@ export default {
// 请求部门结构树
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.depNode = treeNode
- this.depFONode = treeNode
- this.depRoleNode = treeNode
- }
- })
+ treeNode[index] = treeItem
+ })
+ this.depNode = treeNode
+ this.depFONode = treeNode
+ this.depRoleNode = treeNode
+ }
+ })
},
// 新增提交事件
saveOrUpdateStands () {
@@ -1377,18 +1537,18 @@ export default {
nowstandinfo.askNature = nowstandinfo.askNature.join(',')
// 判断新增还是编辑
if (this.editAddType === 1) {
- this.sarAccessInfoList.push(nowstandinfo)
- this.sarAccessInfoList[this.sarAccessInfoList.length - 1].uuid = this.number
- this.number++
+ this.stahndinfoList.push(nowstandinfo)
+ this.stahndinfoList[this.stahndinfoList.length - 1].uuid = this.number
+ this.number++
this.isSubmit = false
this.$message.success('添加成功')
} else {
- this.sarAccessInfoList.map((item, index) => {
- if (item.uuid === nowstandinfo.uuid) {
- // this.sarAccessInfoList[index] = nowstandinfo
- this.$set(this.sarAccessInfoList, index, nowstandinfo)
- }
- })
+ this.stahndinfoList.map((item, index) => {
+ if (item.uuid === nowstandinfo.uuid) {
+ // this.stahndinfoList[index] = nowstandinfo
+ this.$set(this.stahndinfoList, index, nowstandinfo)
+ }
+ })
this.isSubmit = false
this.$message.success('编辑成功')
}
@@ -1474,17 +1634,17 @@ export default {
getAddFormFieldList (ruKu) {
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
- this.formFieldListData = data[ruKu] || []
- // this.resolveFormFieldList()
- resolve()
- }
- }, e => {
- reject(e)
- })
+ res => {
+ if (res.ok) {
+ // const { data: { STAND: data } } = res
+ const { data = {} } = res
+ this.formFieldListData = data[ruKu] || []
+ // this.resolveFormFieldList()
+ resolve()
+ }
+ }, e => {
+ reject(e)
+ })
})
},
resolveFormFieldList (isEdit) {
@@ -1582,11 +1742,11 @@ export default {
// 新增、编辑标准时验证标准编号是否重复
validCode (rule, value, callback) {
let find = 0
- this.sarAccessInfoList.map(item => {
- if (item.code === value) {
- find++
- }
- })
+ this.stahndinfoList.map(item => {
+ if (item.code === value) {
+ find++
+ }
+ })
if (find > 1 && this.editAddType === 2) {
return callback(new Error('标准编号已存在'))
} else if (find > 0 && this.editAddType === 1) {
@@ -1620,7 +1780,6 @@ export default {
let askTypeName = this.askNatureOptions.filter(item => {
return val.indexOf(item.value) > -1
}).map(item => item.label)
-
return askTypeName.join(',')
},
onChecked () {
@@ -1634,11 +1793,176 @@ export default {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, {
_this: this
}, res => {
- this.sarAccessInfoList = res.data
+ this.stahndinfoList = res.data
}, e => {
-
})
- }
+ },
+ treeClick (treeNode) {
+ this.selectSarMenu = treeNode
+ this.standCommonlySearch.menuId = treeNode.id
+ this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
+ this.sarStandardsSearch.page = 1
+ this.standCommonlySearch.page = 1
+ this.getDomesticStandardTable(this.tableFlag)
+ },
+ // 分页查询国内标准
+ getDomesticStandardTable (item) {
+ if (item !== '' && item !== null && item !== undefined) {
+ item.pageSize = this.$store.getters.userInfo.configContent
+ }
+ this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
+ const data = item || this.sarStandardsSearch
+ if (item) {
+ this.sarStandardsSearch.advanceSearchVOStr = item.advanceSearchVOStr
+ }
+ // this.sarStandardsSearch.menuId = this.selectSarMenu.id
+ const formData = {...data}
+ if (!item) {
+ formData.menuId = this.sarStandardsSearch.menuId
+ } else {
+ formData.menuId = this.selectSarMenu.id
+ }
+
+ // 排序
+ formData.orderBy = this.orderBy
+ // 处理我的收藏和个性化标签传参
+ if (this.selectSarMenu.id === 'wdsc') {
+ formData.menuId = undefined
+ formData.labelMenuId = undefined
+ formData.collectMenuId = 'wdsc'
+ } else if (this.selectSarMenu.id === 'gxhbq' || this.selectSarMenu.pId === 'gxhbq') {
+ formData.menuId = undefined
+ formData.labelMenuId = this.selectSarMenu.id
+ formData.collectMenuId = undefined
+ } else {
+ formData.labelMenuId = undefined
+ formData.collectMenuId = undefined
+ }
+ formData.standType = 'INLAND'
+ this.SarExportSearchEo = formData
+ this.loading = true
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+ _this: this, loading: 'loading'
+ }, res => {
+ this.isAdvancedSearch = false
+ this.loading = false
+ if (res.ok) {
+ for (let i = 0; i < res.data.list.length; i++) {
+ res.data.list[i].checked = false
+ if (res.data.list[i].collectId != null && res.data.list[i].collectId !== '') {
+ res.data.list[i].collectBtn = false
+ res.data.list[i].cancelCollectBtn = true
+ } else {
+ res.data.list[i].collectBtn = true
+ res.data.list[i].cancelCollectBtn = false
+ }
+ res.data.list[i].isSubmit = false
+ if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.XCXSSRQ) {
+ res.data.list[i].XCXSSRQ = res.data.list[i].attrInfoMap.XCXSSRQ
+ }
+ if (res.data.list[i].attrInfoMap && res.data.list[i].attrInfoMap.ZCCSSRQ) {
+ res.data.list[i].ZCCSSRQ = res.data.list[i].attrInfoMap.ZCCSSRQ
+ }
+ }
+ this.stahndinfoList = res.data.list
+ this.total = res.data.count
+ if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarStandardsSearch.page !== 1) {
+ this.pageChange(1)
+ }
+ } else {
+ this.$message.error(res.message)
+ }
+ }, e => {
+ this.loading = false
+ this.stahndinfoList = []
+ this.total = 0
+ })
+ },
+ // 点击搜索按钮
+ searchBtnClick (standCommonlySearch) {
+ let item = this.standCommonlySearch
+ this.getDomesticStandardTable(item)
+ this.isAdvancedSearch = false
+ this.selectLawsStands()
+ },
+ // 搜索
+ getDomesticStandardTableBtn (item) {
+ this.tableFlag = item
+ item.page = 1
+ item.sarStandardsSearch = ''
+ this.getDomesticStandardTable(item)
+ },
+ // 提交配置搜索项
+ saveConfigStand () {
+ let search = {}
+ search.menuId = this.selectSarMenu.id
+ if (this.selectConfigStand.length === 0) {
+ this.$message({
+ showClose: true,
+ message: '请至少选择一条标准',
+ type: 'warning'
+ })
+ } else {
+ search.idlist = this.selectConfigStand
+ this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenu', search, {
+ _this: this,
+ loading: 'isSubmit'
+ }, res => {
+ if (res.ok) {
+ this.configStandFlag = false
+ // this.$message({
+ // showClose: true,
+ // message: '配置标准成功!',
+ // type: 'success'
+ // })
+ this.getDomesticStandardTable(this.tableFlag)
+ }
+ }, e => {
+ })
+ }
+ },
+ // 清空搜索框
+ clearAllSearch (flag) {
+ this.isAdvancedSearch = false
+ if (flag === 'sarStandardsSearch') {
+ // 标准搜索
+ this.sarStandardsSearch.country = ''
+ this.sarStandardsSearch.standSort = ''
+ this.sarStandardsSearch.standNumber = ''
+ this.sarStandardsSearch.standName = ''
+ this.sarStandardsSearch.standState = ''
+ this.sarStandardsSearch.standNature = ''
+ this.sarStandardsSearch.issueTime = ''
+ this.sarStandardsSearch.applyArctic = ''
+ this.sarStandardsSearch.replaceStandNum = ''
+ this.sarStandardsSearch.replacedStandNum = ''
+ this.sarStandardsSearch.synopsis = ''
+ this.sarStandardsSearch.category = ''
+ this.pageChange(1)
+ this.getDomesticStandardTable(this.sarStandardsSearch)
+ } else if (flag === 'standCommonlySearch') {
+ this.standCommonlySearch.standSort = ''
+ this.standCommonlySearch.standNumber = ''
+ this.pageChange(1)
+ this.getDomesticStandardTable(this.standCommonlySearch)
+ } else if (flag === 2) {
+ // 标准条目搜索
+ this.standItemSearch.responsibleUnit = ''
+ this.standItemSearch.orgName = ''
+ } else {
+ this.configPage = 1
+ // 游离标准搜索清空
+ this.sarConfigStandSearch.standSort = ''
+ this.sarConfigStandSearch.standNumber = ''
+ this.sarConfigStandSearch.standName = ''
+ this.sarConfigStandSearch.category = ''
+ this.sarConfigStandSearch.standNature = ''
+ this.sarConfigStandSearch.synopsis = ''
+ this.sarConfigStandSearch.applyArctic = ''
+ this.sarConfigStandSearch.replaceStandNum = ''
+ this.selectConfiguraStand()
+ }
+ },
},
watch: {
// 监听 清单类型
@@ -1652,6 +1976,59 @@ export default {
},
computed: {
...mapGetters(['getAccessStandardRegRow']),
+ created(){
+ },
+ async mounted () {
+ // 进入页面后查询树形结构目录
+ await this.selectMenu()
+ // 进入页面后查询标准体系树形结构目录
+ await this.selectStandardMenu()
+ this.treeReload = true
+ // 从数据库中查询各下拉框数据
+ this.$http.get('sys/dictype/getDicTypeListCode', '', {
+ _this: this
+ }, res => {
+ this.allSelectOptions = res.data || {}
+ this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+ this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+ this.standStateOptions = res.data.WBZTCLASS // 文本状态
+ this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+ this.categoryOptions = res.data.NYLXCLASS // 能源类型
+ this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+ this.cysdOptions = res.data.WSCYSD // 我司参与深度
+ this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+ this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+ this.txlbOptions = res.data.TXLBCLASS // 体系类别
+ this.getGzzOption()
+ }, e => {
+ })
+ this.getDomesticStandardTable(this.tableFlag)
+ // 加载所有的部门
+ this.getOrgTreeSource()
+ // 加载动态表单数据
+ this.getAddFormFieldList()
+ this.getDept()
+ },
+ destroyed () {
+ this.allSelectOptions = {}
+ this.countryOptions = []
+ this.regionOptions = []
+ this.standSortOptions = []
+ this.applyArcticOptions = []
+ this.standStateOptions = []
+ this.standNatureOptions = []
+ this.adoptExtentOptions = []
+ this.emergyKindOptions = []
+ this.applyAuthOptions = []
+ this.categoryOptions = []
+ this.assemClassOptions = []
+ this.categoryConfigOptions = []
+ this.standAttributeList = []
+ this.zNodesS = []
+ this.zNodesSItem = []
+ this.searchInlandNodes = []
+ this.orgData = []
+ }
},
mounted () {
this.zqaId =this.$route.query.id;
@@ -1663,7 +2040,8 @@ export default {
}, res => {
this.allSelectOptions = res.data || {}
this.regionOptions = res.data.REGION // 基础信息 区域list
- this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list
+ this.applyArcticOptions = res.data.ENERGYTYPES || [] // 基础车型 适用车型list
+ this.sycpxOptions = res.data.SYCPXCLASS || []// 适用产品线
this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list
this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
this.applyOptions = res.data.COUNTRY //适用区域list
@@ -1711,67 +2089,86 @@ export default {
}
+}
+
\ No newline at end of file
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index b7a1cda74..4677280c3 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -85,9 +85,6 @@
icon="export"
>导出
- 高级查询
-
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 42a67b79e..ae7fc80b0 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1654,9 +1654,7 @@ export default {
},
methods: {
popoverHide (checkedIds, checkedData) {
- console.log(checkedData)
this.sarStandardsInfoEO.standSystem = checkedData.id
- console.log(this.sarStandardsInfoEO.standSystem);
},
closeModal () {
this.productModal = false
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessFooter.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessFooter.vue
new file mode 100644
index 000000000..7afe67ada
--- /dev/null
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessFooter.vue
@@ -0,0 +1,324 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessHeader.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessHeader.vue
new file mode 100644
index 000000000..c48fa575c
--- /dev/null
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessHeader.vue
@@ -0,0 +1,89 @@
+
+
+
-
-
-
+
@@ -227,7 +287,6 @@
-
-
+} .demo-drawer-content {
+ margin-top: 10px;
+ }
+
\ No newline at end of file
From fe64b291642a008b4b2dd3f5a03befba2559c9a7 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Thu, 15 Jul 2021 19:38:46 +0800
Subject: [PATCH 03/13] commit
---
.../pages/creatProcess/bzjd/step1.vue | 3 +-
.../pages/creatProcess/bzjd/step2.vue | 186 +++++++++++++-----
.../pages/creatProcess/bzjd/step3.vue | 63 +++++-
3 files changed, 192 insertions(+), 60 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 194ae0752..b6d86c38e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -136,7 +136,7 @@
@@ -526,6 +526,7 @@
},
choiceZRRS (row, type, index) {
if (type === 1) {
+ this.nodeList2 = []
this.zrIndex= index
this.zrType = type
this.nodeList2.push(row)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index e7904ad72..52ddae196 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -9,7 +9,7 @@
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessTitle.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessTitle.vue
new file mode 100644
index 000000000..30951677b
--- /dev/null
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/ProcessTitle.vue
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+ 流程中心 ——
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index e0e122a87..8fe0f3fb0 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1460,28 +1460,6 @@ export default {
this.reletionSelectNum = []
this.showModelRelation = false
},
- // 删除
- handleDelete (row) {
- this.$confirm('此操作将永久删除这条数据, 是否继续?', '提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- confirmButtonClass: 'common-button-primary',
- roundButton: true,
- type: 'warning'
- }).then(() => {
- this.$http.post('lawss/sarProductInfo/deleteLocalProducts',
- {
- ids: row.id
- }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.getLocalProductTable()
- }
- })
- }).catch(() => {
- })
- },
// 分页点击后方法
pageChange (page) {
this.localProTableSearch.page = page
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 4783a3960..3ec0cdcb2 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -9,210 +9,270 @@
-
- 产品平台: {{ localProEO.projectPlatfor}}
- 项目编号: {{ localProEO.projectNumber }}
- 项目名称: {{ localProEO.projectName }}
-
- 项目分类:{{ localProEO.projectClassification }}
-
-
- 项目状态: {{ localProEO.projectStatus }}
- 项目群: {{ localProEO.projectGroup }}
- 当前节点: {{ localProEO.currentNode }}
- 项目级别: {{ localProEO.projectLevel }}
-
-
- 项目经理: {{ localProEO.projectManager }}
- 项目计划开始时间: {{ localProEO.projectStartDate}}
- 项目计划完成时间: {{localProEO.projectEndDate }}
-
+
+ 产品平台: {{ localProEO.projectPlatfor}}
+ 项目编号: {{ localProEO.projectNumber }}
+ 项目名称: {{ localProEO.projectName }}
+
+ 项目分类:{{ localProEO.projectClassification }}
+
+
+ 项目状态: {{ localProEO.projectStatus }}
+ 项目群: {{ localProEO.projectGroup }}
+ 当前节点: {{ localProEO.currentNode }}
+ 项目级别: {{ localProEO.projectLevel }}
+
+
+ 项目经理: {{ localProEO.projectManager }}
+ 项目计划开始时间: {{ localProEO.projectStartDate}}
+ 项目计划完成时间: {{localProEO.projectEndDate }}
+
- -->
+
+ 数据获取中
+
+
+
-
-
-
-
-
-
-
-
- 数据获取中
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ scope.row.eopPutTime !== null && scope.row.eopPutTime !== 'N/A' && scope.row.eopPutTime !== 'TBD'
&& scope.row.eopPutTime !== '已实施' ? $moment(scope.row.eopPutTime).format('YYYY-MM-DD') : scope.row.eopPutTime }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
- 
-
-
-
-
-
- 
-
-
-
- 
-
-
-
-
+ @selection-change="standSelectChange"
+ ref="selection"
+ >
+
-
-
-
-
-
-
- 
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standSortShow }} {{ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{ scope.row.standSortShow }}
+ {{ scope.row.standNumber }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基础信息
-
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
-
-
-
+
@@ -76,28 +120,29 @@
>
+ ref="tree2">
-
@@ -113,18 +158,22 @@
name: "bzjdStep2",
data() {
return {
- commentText: '',
- taskIds: this.$route.query.taskIds,
- pId: this.$route.query.prcId,
- roleRow: {},
- nodeList: [],
- type: '',
+ zxIndex: '',
+ zxType: '',
+ zxIdList: [],
+ modalshowflag2: false,
+ treeData: [],
+ nodeList2: [],
defaultProps: {
children: 'children',
label: 'name'
},
- treeData: [], // 人员数据
- modalshowflag: false, // drawer开关
+ loading: false,
+ commentText: '',
+ taskIds: this.$route.query.taskIds,
+ pId: this.$route.query.prcId,
+ roleRow: {},
+ type: '',
drawerTitle: '', //drawer标题
textarea: '', // 意见
ListModel: false, // 新增编辑抽屉开关
@@ -142,7 +191,8 @@
{ required: true, message: '请选择执行人', trigger: 'change' },
]
},
- json: {}
+ json: {},
+ itemList: []
}
},
components: {
@@ -151,10 +201,37 @@
ProcessTitle
},
methods: {
- saveUserInfo () {
+ drawerCheck2 (data) {
+ var getlist = this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes());
+ if(getlist.length == 1) {
+ this.roleRow = getlist[0]
+ }else {
+ this.$refs.tree2.setCheckedKeys([data.id]);
+ this.roleRow = this.$refs.tree2.getCheckedNodes()[0]
+ }
+ },
+ choiceZRRS (row, type, index) {
+ if (type === 1) {
+ this.nodeList2 = []
+ this.zxIndex= index
+ this.zxType = type
+ this.nodeList2.push(row)
+ this.modalshowflag2 = true
+ } else {
+ // 批量
+ if (this.zxIdList.length > 0) {
+ this.zxType = type
+ this.nodeList2 = []
+ this.modalshowflag2 = true
+ } else {
+ this.$message.warning('请选择要编辑的数据')
+ }
+ }
+ },
+ saveUserInfo2 () {
var idList = ''
var nameList = ''
- this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
+ this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach( item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
@@ -162,19 +239,23 @@
idList += item.id
nameList += item.name
})
- this.form.zxUserId = idList
- this.form.zxUserIdName = nameList
- this.modalshowflag = false
- },
- cancleUserInfo () {
- this.modalshowflag = false
- },
- choiceZRR () {
- this.nodeList = []
- if (this.form.zxUserId.length > 0) {
- this.nodeList = this.form.zxUserId.split(',')
+ if (this.zxType == 1) {
+ this.itemList[this.zxIndex].zxUserId = idList
+ this.itemList[this.zxIndex].zxUserIdName = nameList
+ } else {
+ this.itemList.forEach( item => {
+ this.zxIdList.forEach( items => {
+ if (item.id === items) {
+ item.zxUserId = idList
+ item.zxUserIdName = nameList
+ }
+ })
+ })
}
- this.modalshowflag = true
+ this.modalshowflag2 = false
+ },
+ cancleUserInfo2 () {
+ this.modalshowflag2 = false
},
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
@@ -189,16 +270,8 @@
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
var json = this.json
+ json.itemList = this.itemList
json.commentText = this.commentText
- var arr = this.form.zxUserId.split(',')
- var newArr = []
- arr.forEach(item => {
- var json1 = {}
- json1.id = item
- newArr.push(json1)
- })
- json.zxUserId = newArr
- json.zxUserIdName = this.form.zxUserIdName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -214,6 +287,12 @@
}
})
},
+ handleSelectionChange (val){
+ this.zxIdList = []
+ val.forEach( item => {
+ this.zxIdList.push(item.id)
+ })
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -224,6 +303,13 @@
this.form.number = data.number
this.form.name = data.name
this.json = data
+ var arr = []
+ arr = JSON.parse(data.itemList)
+ arr.forEach(item => {
+ item.zxUserId = ''
+ item.zxUserIdName = ''
+ })
+ this.itemList = arr
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index d0da3fac1..1a0e8ddb8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -9,7 +9,7 @@
基础信息
-
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
@@ -617,6 +668,8 @@ export default {
},
data() {
return {
+ fileUrl: 'api/att/attFile/upload',
+ fileMadel: false,
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
@@ -686,7 +739,9 @@ export default {
listName: "", //清单名称
applyRegion: "", //适用区域
descriptionList: "", //清单说明
- fileId: "", //附件
+ fileId:'',
+ model: '', // 上传模板
+ modelName: '',
standId: "", //选择的清单的id
signFlag: "1", //是否会签 1为会签 2为不会签
inforlist: "", //用来存放标准列表的标准id
@@ -856,12 +911,12 @@ export default {
},
//提交事件
handleSubmit() {
- // let json = this.listForm;
- let json = Object.assign(this.listForm, this.roleForm)
- json.zrUserId = this.$store.getters.userInfo.userId;
- json.jlUserId = this.$store.getters.userInfo.userId;
+ let json = this.listForm;
+ // let json = Object.assign(this.listForm, this.roleForm)
+ json.zrUserId = this.roleForm.dockUser; //会签人
+ json.jlUserId = this.roleForm.directorUser; //业务经理
// (如果是业务经理应该这样写 后续需要更改 例：json.jlUserId = this.roleForm.directorUser;)
- json.applyUpdUserId = this.$store.getters.userInfo.userId;
+ json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
json.approvalOpinion = "";
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -900,23 +955,81 @@ export default {
},
// 删除上传的文件
delFileInfo(file, fileList) {
- // this.fileInfoList = fileList
+ this.fileInfoList = fileList
},
- // 上传文件成功回调
- uploadBackSuccess(res, file, fileList) {
- // if (res.ok) {
- // this.fileInfoList = fileList
- // this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
- // this.$message.success('上传成功')
- // } else {
- // this.$message.error(res.message)
- // fileList.pop()
- // }
+ fileUpload () {
+ this.fileMadel = true
},
- //上传之前的钩子
- beforeUpload() {
-
+ // 导入标准数据成功后执行
+ importFileSuccess (response, file) {
+ if (response.ok) {
+ this.fileMadel = false
+ this.listForm.model = response.data.id
+ this.listForm.modelName = response.data.name
+ this.$message({
+ showClose: true,
+ message: response.message,
+ type: 'success'
+ })
+ }
},
+ // 导入按钮 上传之前的钩子
+ beginImportFile (file) {
+ var filename = file.name
+ var index1 = filename.lastIndexOf('.')
+ var index2 = filename.length
+ var fileSuffix = filename.substring(index1, index2)
+ // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // 判断上传文件格式
+ if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+ || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+ || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' ||
+ fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt'
+ || fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx'
+ || fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') {
+ return true
+ } else {
+ this.spinShow = false
+ this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+ return false
+ }
+ // 判断文件上传大小
+ // eslint-disable-next-line no-unreachable
+ if (file.size / 1024 / 1024 <= 200) {
+ return true
+ } else {
+ this.$message.error('文件' + file.name + '大小不超过200M')
+ return false
+ }
+ return true
+ },
+ // beginImportFile (file) {
+ // var filename = file.name
+ // var index1 = filename.lastIndexOf('.')
+ // var index2 = filename.length
+ // var fileSuffix = filename.substring(index1, index2)
+ // // const fileSuffix = file.name.split('.')[1] // 后缀名
+ // // 判断上传文件格式
+ // // 判断上传文件格式
+ // if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT'
+ // || fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX'
+ // || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
+ // return true
+ // } else {
+ // this.spinShow = false
+ // this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
+ // return false
+ // }
+ // // 判断文件上传大小
+ // // eslint-disable-next-line no-unreachable
+ // if (file.size / 1024 / 1024 <= 200) {
+ // return true
+ // } else {
+ // this.$message.error('文件' + file.name + '大小不超过200M')
+ // return false
+ // }
+ // return true
+ // },
//选择清单取消事件
closeDrawer() {
this.ListModel = false;
@@ -1123,7 +1236,11 @@ export default {
}
}
}
-
+ .add-form-el-select{
+ /deep/ .el-select{
+ width: 210px;
+ }
+ }
.demo-drawer-content {
margin-top: 10px;
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index f6de56f6f..994a198e4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -344,6 +344,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
+ console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
@@ -363,6 +364,9 @@ export default {
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
+ this.listForm.applyUpdUserId = item.applyUpdUserId
+ this.listForm.jlUserId = item.jlUserId
+ this.listForm.zrUserId = item.zrUserId
})
},
@@ -373,10 +377,11 @@ export default {
},
//提交事件
handleSubmit() {
+ this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+ this.listForm.zrUserId = this.listForm.zrUserId;
+ this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index f98995dff..eb8d88b53 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -499,6 +499,9 @@ export default {
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
+ this.listForm.applyUpdUserId = item.applyUpdUserId
+ this.listForm.jlUserId = item.jlUserId
+ this.listForm.zrUserId = item.zrUserId
})
},
//保存事件
@@ -515,11 +518,12 @@ export default {
},
//提交事件
handleSubmit() {
- this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+ this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+ this.listForm.zrUserId = this.listForm.zrUserId;
+ this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm);
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index 559444354..e9cadf774 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -335,6 +335,9 @@ export default {
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
+ this.listForm.applyUpdUserId = item.applyUpdUserId
+ this.listForm.jlUserId = item.jlUserId
+ this.listForm.zrUserId = item.zrUserId
})
},
//驳回事件
@@ -344,12 +347,12 @@ export default {
},
//提交事件
handleSubmit() {
- this.listForm.jlUserId = this.$store.getters.userInfo.userId ;
+ this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
+ this.listForm.zrUserId = this.listForm.zrUserId;
+ this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
- this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText;
- this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.signflag = "";
this.listForm.standId = this.listForm.standId;
const json = JSON.stringify(this.listForm);
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 4783a3960..29bc99cf6 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -281,8 +281,12 @@ export default {
exportProducdata() {},
deleteStandLawsForProduct() {},
selectStandLawsForProduct() {},
- pageChangeLaws() {},
- pageSizeChangeLaws() {},
+ pageChangeLaws() {
+
+ },
+ pageSizeChangeLaws() {
+
+ },
standSelectChange() {},//选项值发生改变
},
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 2f0b17269..67456cdbd 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -204,7 +204,11 @@
+
-
-
-
+
@@ -113,6 +154,8 @@
name: "bzjdStep3",
data() {
return {
+ itemList: [],
+ loading: false,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
@@ -151,6 +194,7 @@
ProcessTitle
},
methods: {
+ handleSelectionChange () {},
saveUserInfo () {
var idList = ''
var nameList = ''
@@ -224,6 +268,7 @@
this.form.number = data.number
this.form.name = data.name
this.json = data
+ this.itemList = JSON.parse(data.itemList)
}).catch(e => {
})
})
From 2d933ec9fef7ac28c3a60abc6d9766b4b2e0bb40 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Thu, 15 Jul 2021 19:52:48 +0800
Subject: [PATCH 04/13] commit
---
.../processCenter/pages/creatProcess/bzjd/step2.vue | 9 +++++++++
.../processCenter/pages/creatProcess/bzjd/step3.vue | 6 ------
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 52ddae196..0e2f2b4f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -269,6 +269,15 @@
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
+ let b = 0
+ for (let a = 0; a < this.itemList.length; a++) {
+ if (!this.itemList[a].zxUserId) {
+ b++
+ }
+ }
+ if (b > 0) {
+ this.$message.warning('请选择执行人')
+ }
var json = this.json
json.itemList = this.itemList
json.commentText = this.commentText
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 1a0e8ddb8..cbc3b1ac8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -85,12 +85,6 @@
prop="zrUserIdName"
align="center">
-
-
数据获取中
From 30dd40378ffd9ec8886bcc9689339761ed0fd604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 16 Jul 2021 09:05:49 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzqdfb/step1.vue | 203 ++++++++++++++----
.../pages/creatProcess/bzqdfb/step2.vue | 9 +-
.../pages/creatProcess/bzqdfb/step3.vue | 8 +-
.../pages/creatProcess/bzqdfb/step4.vue | 9 +-
.../pages/details.vue | 8 +-
.../pages/rectificationDatabase.vue | 9 +-
6 files changed, 192 insertions(+), 54 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 06705c639..b356531af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -39,7 +39,7 @@
clearable
>
-
+
@@ -48,7 +48,7 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
是
@@ -182,7 +202,7 @@
-
+
+
+
+
+
+
+
@@ -598,6 +631,24 @@
取消
+
+ {{ listForm.modelName }}
+
+
+
点击上传
-
-
会签人
@@ -195,6 +215,19 @@会签人
+
+
+
+
+
+
+
+
+ 点击或拖拽上传文件
+
+
基础信息
@@ -53,15 +53,15 @@
clearable
>
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index eb8d88b53..2b362a5af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -9,7 +9,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -148,36 +205,21 @@
name: "bzjdStep3",
data() {
return {
+ sarType: '',
itemList: [],
loading: false,
commentText: '',
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
- roleRow: {},
- nodeList: [],
- type: '',
- defaultProps: {
- children: 'children',
- label: 'name'
- },
- treeData: [], // 人员数据
- modalshowflag: false, // drawer开关
- drawerTitle: '', //drawer标题
textarea: '', // 意见
- ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
form: {
- number: '', // 编号
- name: '', // 结束日期
- zxUserId: '',
- zxUserIdName: ''
- },
- formRules: {
- zxUserId: [
- { required: true, message: '请选择执行人', trigger: 'change' },
- ]
+ number: '',
+ name: '',
+ number1: '',
+ name1: ''
},
json: {}
}
@@ -189,36 +231,6 @@
},
methods: {
handleSelectionChange () {},
- saveUserInfo () {
- var idList = ''
- var nameList = ''
- this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()).forEach( item => {
- if (nameList.length > 0) {
- nameList += ','
- idList += ','
- }
- idList += item.id
- nameList += item.name
- })
- this.form.zxUserId = idList
- this.form.zxUserIdName = nameList
- this.modalshowflag = false
- },
- cancleUserInfo () {
- this.modalshowflag = false
- },
- choiceZRR () {
- this.nodeList = []
- if (this.form.zxUserId.length > 0) {
- this.nodeList = this.form.zxUserId.split(',')
- }
- this.modalshowflag = true
- },
- getTree () {
- this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
- this.treeData = res.data
- })
- },
handleTabs(name) {
this.active = name
},
@@ -261,15 +273,20 @@
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
+ this.form.number1 = data.number1
+ this.form.name1 = data.name1
+ this.sarType = data.standInData
this.json = data
this.itemList = JSON.parse(data.itemList)
+ this.itemList.forEach( item => {
+ item.deptName = this.$store.getters.userInfo.orgName
+ })
}).catch(e => {
})
})
},
},
mounted () {
- this.getTree()
this.getData()
}
}
From 1f05451a701130d24cb07da3d45f95007677ab45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 16 Jul 2021 14:02:04 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=85=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzqdfb/step1.vue | 114 ++++++++++++++++--
.../pages/creatProcess/xmpg/step1.vue | 14 ++-
.../page/listOfCountries.vue | 1 -
src/sysConfig/index.js | 2 +-
4 files changed, 116 insertions(+), 15 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index b356531af..a3b48f73e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -145,6 +145,7 @@
prop="code"
fixed="left"
width="180px"
+ align="center"
label="标准号">
@@ -266,6 +271,50 @@
基础信息
审批历史
+
基础信息
@@ -51,9 +51,9 @@
clearable
>
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index e9cadf774..ac9bbeee9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -9,7 +9,7 @@
-
+
{
- this.tableHeight = $('.content').height() - 44
- }
- },
methods: {
addZqyjList() {
this.title = '标准拆分数据库'
@@ -412,6 +499,16 @@
}, e => {
})
},
+ sarStandCompareHis2 () {
+ var form = this.standCommonlySearch2
+ this.$http.get('lawss/sarFileSplitInfo/getSarFileSplitInfoEOPage', form, {
+ _this: this
+ }, res => {
+ this.standInfoList2 = res.data.list
+ this.total2 = res.data.total
+ }, e => {
+ })
+ },
pageChange (page) {
this.standCommonlySearch.page = page
this.sarStandCompareHis()
@@ -419,9 +516,19 @@
// 分页每页显示数改变后方法
pageSizeChange (pageSize) {
this.$store.getters.userInfo.configContent = pageSize
- this.standCommonlySearch.size = pageSize
+ this.standCommonlySearch.pageSize = pageSize
this.sarStandCompareHis()
},
+ pageChange2 (page) {
+ this.standCommonlySearch2.page = page
+ this.sarStandCompareHis2()
+ },
+ // 分页每页显示数改变后方法
+ pageSizeChange2 (pageSize) {
+ this.$store.getters.userInfo.configContent = pageSize
+ this.standCommonlySearch2.pageSize = pageSize
+ this.sarStandCompareHis2()
+ },
/** 选择带入数据的方法操作
* */
handleSelection(data) {
@@ -430,6 +537,12 @@
this.selectedList.push(data[i].id);
}
},
+ handleSelection2 (data) {
+ this.selectedList2 = [];
+ for (let i = 0; i < data.length; i++) {
+ this.selectedList2.push(data[i].id);
+ }
+ },
closeDrawer() {
this.listModel = false
},
@@ -452,8 +565,10 @@
this.form.name = bringData[0].standName
}
this.form.id = bringData[0].id
+ this.sarType = bringData[0].sarType
this.standId = bringData[0].standId
this.listModel = false;
+ this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: this.form.id,
page: 1,
@@ -476,6 +591,34 @@
this.$message.warning("请选择一条数据进行带入");
}
},
+ closeDrawer2() {
+ this.listModel2 = false
+ },
+ enterDrawer2() {
+ if (this.selectedList2.length === 1) {
+ let deposit = new Map();
+ this.standInfoList2.forEach(item => {
+ deposit.set(item.id, item);
+ });
+ let bringData = [];
+ for (let i = 0; i < this.selectedList2.length; i++) {
+ bringData.push(deposit.get(this.selectedList2[i]));
+ }
+ if (bringData[0].splitStatus === '0') {
+ this.form.number1 = bringData[0].standNumSplit
+ this.form.name1 = bringData[0].standNameSplit
+ } else {
+ this.form.number1 = bringData[0].showNumber
+ this.form.name1 = bringData[0].standName
+ }
+ this.form.id1 = bringData[0].id
+ this.listModel2 = false
+ } else if (this.selectedList2.length > 1) {
+ this.$message.warning("只能选择一条数据进行带入");
+ } else {
+ this.$message.warning("请选择一条数据进行带入");
+ }
+ },
/*** **********************************************/
/** 流程节点负责人的选择 *****************************/
choiceZRR (type, title, id) {
@@ -595,7 +738,7 @@
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
- json.standInData = this.standId
+ json.standInData = this.sarType
json.itemList = this.itemList
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -621,7 +764,16 @@
}
})
}
- }
+ },
+ mounted () {
+ this.getTree()
+ this.sarStandCompareHis()
+ this.sarStandCompareHis2()
+ this.tableHeight = $('.content').height() - 44
+ window.onresize = () => {
+ this.tableHeight = $('.content').height() - 44
+ }
+ },
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 0e2f2b4f2..2b4f133eb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -13,7 +13,6 @@
@@ -39,6 +38,34 @@
clearable
>
+
+
+
+
+
+
+
+
@@ -158,6 +185,7 @@
name: "bzjdStep2",
data() {
return {
+ sarType: '',
zxIndex: '',
zxType: '',
zxIdList: [],
@@ -181,15 +209,8 @@
isSubmit: false,
saveLoading: false,
form: {
- number: '', // 编号
- name: '', // 结束日期
- zxUserId: '',
- zxUserIdName: ''
- },
- formRules: {
- zxUserId: [
- { required: true, message: '请选择执行人', trigger: 'change' },
- ]
+ number: '',
+ name: '',
},
json: {},
itemList: []
@@ -311,6 +332,9 @@
let data = JSON.parse(res.mesg)
this.form.number = data.number
this.form.name = data.name
+ this.form.number1 = data.number1
+ this.form.name1 = data.name1
+ this.sarType = data.standInData
this.json = data
var arr = []
arr = JSON.parse(data.itemList)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index cbc3b1ac8..ba0238f65 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -13,7 +13,6 @@
@@ -39,6 +38,34 @@
clearable
>
+
+
+
+
+
+
+
+
@@ -48,7 +75,7 @@
拆分信息
基础信息
审批历史
+
基础信息
@@ -53,16 +53,16 @@
clearable
>
-
+
From f3549f3a133e761b41d33efea33a4a7556b432e4 Mon Sep 17 00:00:00 2001
From: zhutianqi
Date: Fri, 16 Jul 2021 11:29:09 +0800
Subject: [PATCH 07/13] commit
---
.../pages/creatProcess/bzjd/step1.vue | 176 +++++++++++++++--
.../pages/creatProcess/bzjd/step2.vue | 44 ++++-
.../pages/creatProcess/bzjd/step3.vue | 177 ++++++++++--------
3 files changed, 295 insertions(+), 102 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index b6d86c38e..761ad3913 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -44,6 +44,34 @@
clearable
>
+
+
+
+
+
+
+
+
@@ -232,6 +260,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.standNameSplit }}
+ {{ scope.row.standName }}
+
+
+
+
+ {{ scope.row.standNumSplit }}
+ {{ scope.row.showNumber }}
+
+
+
- 未发布
- 已发布
+ 未发布
+ 已发布
+ 审核中
- 未发布
- 已发布
+ 未发布
+ 已发布
+ 审核中
- 未发布
- 已发布
+ 未发布
+ 已发布
+ 审核中
@@ -670,6 +728,14 @@ export default {
return {
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
+ searching: false,
+ // 查询相关参数
+ sarSarAccessEOSearch: {
+ countryArea: "",
+ detailedListName: "",
+ page: 1,
+ pageSize: this.$store.getters.userInfo.configContent
+ },
standList: [], //新添加的标准
modalshowflag: false, // drawer开关
drawerTitle: "", //drawer标题
@@ -811,10 +877,13 @@ export default {
},
// //判断当前选中的是哪个清单
selectionList(type) {
+ type = this.listType
+ console.log(type);
if (type === "project") {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
pageSize: this.pageSize,
+ ...this.sarSarAccessEOSearch,
sortKey: 2
}, {
_this: this
@@ -827,6 +896,7 @@ export default {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
pageSize: this.pageSize,
+ ...this.sarSarAccessEOSearch,
sortKey: 3
}, {
_this: this
@@ -835,10 +905,11 @@ export default {
this.total = res.data.total;
}, e => {
});
- } else {
+ } else if(type === 'country') {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page,
pageSize: this.pageSize,
+ ...this.sarSarAccessEOSearch,
sortKey: 1
}, {
_this: this
@@ -849,13 +920,23 @@ export default {
});
}
},
+ clearSearch() {
+ this.sarSarAccessEOSearch = {
+ countryArea: "",
+ detailedListName: ""
+ };
+ this.selectionList();
+ },
//点击添加事件
addList() {
- this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+ this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+ page: this.pageNo,
+ pageSize: this.pageSizeNo
+ }, {
_this: this
}, res => {
this.standardData = res.data.list;
- this.totalNo = res.data.pageCount
+ this.totalNo = res.data.count
}, e => {
});
this.standModel = true;
@@ -960,6 +1041,17 @@ export default {
fileUpload () {
this.fileMadel = true
},
+ // 点击查看
+ handlePreview (item) {
+ let routeUrl = this.$router.resolve({
+ name: 'OtherStandardDetails',
+ params: {
+ id: item.id,
+ pageType: 'INLAND_STAND'
+ }
+ })
+ window.open(routeUrl.href, '_blank')
+ },
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
@@ -1139,7 +1231,7 @@ export default {
this.selectionList();
},
pageChangeNo(page){
- this.page = page
+ this.pageNo = page
this.addList()
},
pageSizeChangeNo(pageSize){
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 4060b6cbf..9fc9873bc 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -633,15 +633,19 @@ export default {
},
pageChange(page) {
this.page = page;
+ this.getStandData()
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
+ this.getStandData()
},
pageChangeNo(page) {
this.pageNO = page;
+ this.getProductData()
},
pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent;
+ this.getProductData()
},
//获取产品线数据
getProductData() {
@@ -659,11 +663,17 @@ export default {
},
//获取标准数据
getStandData() {
- this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
+ console.log(this.page);
+ console.log(this.pageSize);
+ this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+ page: this.page,
+ pageSize: this.pageSize,
+ }, {
_this: this
}, res => {
+ console.log(res.data);
this.sarAccessListDatas = res.data.list;
- this.total = res.pageCount;
+ this.total = res.data.count;
}, e => {
});
}
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 98aed73cb..138c08178 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -285,7 +285,6 @@ export default {
detailedListName: ""
};
this.searchSarAccess();
-
},
// 新增相关
openModal(row, optType) {
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 38c17d419..192b22819 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.248'
-const devIp = '192.168.10.252'
+const devIp = '192.168.10.254'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
From a795039c87ac7a194bcb553022ddd22f7697582a Mon Sep 17 00:00:00 2001
From: Jaunty <15613469426@163.com>
Date: Fri, 16 Jul 2021 14:12:01 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E7=95=8C=E9=9D=A2?=
=?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/details.vue | 306 ++++++++++--------
1 file changed, 177 insertions(+), 129 deletions(-)
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index 3ec0cdcb2..221351fb2 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -33,7 +33,7 @@
添加
批量删除
导出
@@ -42,14 +42,15 @@
+
+
-
-
-
-
-
-
-
+
+
-
- {{ scope.row.eopPutTime !== null && scope.row.eopPutTime !== 'N/A' && scope.row.eopPutTime !== 'TBD'
- && scope.row.eopPutTime !== '已实施' ? $moment(scope.row.eopPutTime).format('YYYY-MM-DD') : scope.row.eopPutTime }}
-
+ prop="ZRBM"
+ label="责任部门"
+ width="180px"
+ >
+ prop="KCCVPPSBM"
+ width="180px"
+ label="卡车VPPS编码">
+ prop="KCCVPPSCN"
+ width="180px"
+ label="卡车vpps中文名称">
+ prop="CYCVPPSBM"
+ width="180px"
+ label="乘车VPPS编码">
-
-
-
-
+ prop="CYCVPPSBM"
+ width="180px"
+ label="乘车vpps中文名称">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 导出
+ 导出
取消
@@ -287,6 +225,7 @@
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index e5703d7c0..72c8cca77 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -1,13 +1,364 @@
-
+
+
+
+ 标准解读流程
+ 工程师审核
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 15b0a36dd..93d7edd9b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -1,13 +1,365 @@
-
+
+
+ 基础信息
+
+
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+ {{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}
+
+ {{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}
+
+
+
+
+
+
+
+
+ 标准解读流程
+ 部长审批
+
+
+
+
-
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 635db2de4..81daee6cb 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -613,7 +613,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '4') {
+ } else if (row.taskInfo === '责任人审核') {
this.$router.push({
name: 'bzjdStep4',
query: {
@@ -624,7 +624,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '5') {
+ } else if (row.taskInfo === '工程师审核') {
this.$router.push({
name: 'bzjdStep5',
query: {
@@ -635,7 +635,7 @@ export default {
prcType: row.prcType
}
})
- } else if (row.taskInfo === '6') {
+ } else if (row.taskInfo === '部长审批') {
this.$router.push({
name: 'bzjdStep6',
query: {
+
+ 基础信息
+
+
+ 拆分信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 符合
+ 不符合
+
+ {{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD') : scope.row.newData }}
+
+ {{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD') : scope.row.onlineData }}
+
+
+
+
+
+