-
+
@@ -429,22 +459,29 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('xgd')">
-
+ @click="fileUpload('xgd')"
+ >
+
{{ item.name }}
-
+
@@ -454,15 +491,16 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('fbgbjbd')">
-
+ @click="fileUpload('fbgbjbd')"
+ >
+
{{ item.name }}
- {{ value.name }}
+
+ v-model="commentText"
+ title="回执说明"
+ />
@@ -1295,14 +1417,14 @@
+ {{ value.name }}
- -
@@ -470,14 +508,20 @@
+ />
+ />
+ />
@@ -658,17 +717,22 @@
-
+ />
+ />
@@ -713,14 +785,20 @@
+ />
@@ -739,14 +818,20 @@
+ />
+ />
@@ -818,18 +911,18 @@
+ />
+ />
@@ -854,87 +947,107 @@
-
+
+ :defaultProps="defaultCodeProps"
+ :checkedKeys="defaultCheckedKeys1"
+ :nodeKey="nodeKeyCode"
+ @popoverHide="popoverHideBusVs"
+ @popoverHideCancel="popoverHideBusVsCancel"
+ />
-
+
+ :defaultProps="defaultCodeProps"
+ :checkedKeys="defaultCheckedKeys2"
+ :nodeKey="nodeKeyCode"
+ @popoverHide="popoverHideCarVs"
+ @popoverHideCancel="popoverHideCarVsCancel"
+ />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
+ />
+ />
@@ -972,10 +1085,10 @@
+ />
@@ -1013,13 +1126,13 @@
v-model="form.cycvppscn = ''"
disabled
clearable
- >
+ />
+ />
+ />
+ />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+ />
-
+
+ />
@@ -1099,33 +1211,34 @@
-
+
+ v-model="form.dtbjh"
+ type="textarea"
+ placeholder="请输入代替标准号"
+ clearable
+ />
+ v-else
+ v-model="form.dtbjh"
+ type="textarea"
+ placeholder="请输入代替标准号"
+ clearable
+ />
{{ '手动查找' }}
+ >
+ {{ '手动查找' }}
-
+
@@ -1137,14 +1250,20 @@
+ />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ v-model="form.cbbh"
+ type="textarea"
+ placeholder="请输入采标编号"
+ clearable
+ />
+ v-else
+ v-model="form.cbbh"
+ type="textarea"
+ placeholder="请输入采标编号"
+ clearable
+ />
{{ '手动查找' }}
+ >
+ {{ '手动查找' }}
@@ -1242,37 +1363,38 @@
-
+
+ />
+ />
{{ '手动查找' }}
+ >
+ {{ '手动查找' }}
-
+
@@ -487,22 +531,29 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('ssg')">
-
+ @click="fileUpload('ssg')"
+ >
+
{{ item.name }}
-
+
@@ -512,22 +563,29 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('ca')">
-
+ @click="fileUpload('ca')"
+ >
+
{{ item.name }}
-
+
@@ -537,8 +595,9 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('zbjbd')">
-
+ @click="fileUpload('zbjbd')"
+ >
+
{{ item.name }}
-
+
@@ -678,22 +742,29 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('kwj')">
-
+ @click="fileUpload('kwj')"
+ >
+
{{ item.name }}
-
+
@@ -703,8 +774,9 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('xdb')">
-
+ @click="fileUpload('xdb')"
+ >
+
{{ item.name }}
-
+
@@ -730,8 +808,9 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('jdwj')">
-
+ @click="fileUpload('jdwj')"
+ >
+
{{ item.name }}
-
+
@@ -756,22 +841,29 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('bpg')">
-
+ @click="fileUpload('bpg')"
+ >
+
{{ item.name }}
-
+
@@ -781,8 +873,9 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('zqyjg')">
-
+ @click="fileUpload('zqyjg')"
+ >
+
{{ item.name }}
-
+
@@ -1154,68 +1273,70 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
- @click="fileUpload('glwj')">
-
+ @click="fileUpload('glwj')"
+ >
+
{{ item.name }}
+
@@ -1310,8 +1432,7 @@
@@ -1319,7 +1440,7 @@
@@ -1327,7 +1448,7 @@
@@ -1335,18 +1456,18 @@
-
流程发起人
-
+
责任人
-
-
+
责任人
-
+
标准法规工程师
-
+
责任对接人,标准法规部部门负责人
-
+
-
+
+
-
+ type="index"
+ width="55"
+ label="序号"
+ align="center"
+ />
-
+ />
-
+ />
+ align="center"
+ >
{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
@@ -1384,7 +1504,8 @@
+ align="center"
+ >
{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
@@ -1392,7 +1513,8 @@
+ align="center"
+ >
{{ scope.row.commentText }}
@@ -1400,7 +1522,8 @@
+ align="center"
+ >
{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}
@@ -1417,49 +1540,100 @@
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
+ />
+
-
-
+
+
+
+
-
+
-
-
+ @change="dataSourceChange"
+ >
+
+
@@ -1467,21 +1641,24 @@
v-model="replaceLawsNumForm.standNumber"
placeholder="根据标准编号查找"
clearable
- :maxlength="100">
+ :maxlength="100"
+ />
+ :maxlength="100"
+ />
+ @click="getReplaceLawsNumRowFirst"
+ >
查询
@@ -1490,7 +1667,8 @@
class="common-button-default"
size="mini"
type="default"
- @click="getResetLawsNumRow">
+ @click="getResetLawsNumRow"
+ >
清空
@@ -1505,24 +1683,27 @@
border
:height="300"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
- fontWeight: 'bold', height: '48px'}"
- @selection-change="selectReplaceStandNumRowChange">
+ fontWeight: 'bold', height: '48px'}"
+ @selection-change="selectReplaceStandNumRowChange"
+ >
-
+ align="center"
+ />
+ type="index"
+ width="55"
+ label="序号"
+ align="center"
+ >
{{ ($index + 1) + (replacePage - 1) * replaceLawsNumForm.pageSize }}
+ label="标准编号"
+ >
{{ scope.row.standSort }}
{{ scope.row.standNumber }}-{{ scope.row.standYear }}
@@ -1532,13 +1713,15 @@
-
+ label="标准名称"
+ />
- {{
+ width="130"
+ >
+
+ {{
scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : ''
}}
@@ -1546,7 +1729,8 @@
+ width="130"
+ >
{{ textStatusMap[scope.row.textStatus] }}
@@ -1559,11 +1743,19 @@
:page="replacePage"
:total="replaceTotal"
@pageChange="pageChangeReplace"
- @pageSizeChange="pageSizeChangeReplace">
+ @pageSizeChange="pageSizeChangeReplace"
+ />
@@ -1573,15 +1765,15 @@
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
- @checkedRole="checkedRole"
:nodeList="nodeList"
- >
+ @checkedRole="checkedRole"
+ />
+ @checkedRole="checkedRole2"
+ />
加载数据
@@ -1601,14 +1793,14 @@ import {
} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
-import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
+import TreeSelectModule from '@/components/treeSelect/treeSelectModule.vue';
import CusTomDataPickerGroup
- from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
-import TreeSelectStand from "@/components/treeSelect/treeSelectStand";
+from '@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup';
+import TreeSelectStand from '@/components/treeSelect/treeSelectStand';
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
export default {
- name: "bzrkStep4",
+ name: 'BzrkStep4',
components: {
ReceiptDescription,
TreeSelectStand,
@@ -1621,8 +1813,14 @@ export default {
TreeSelect,
TreeSelectNew
},
- data() {
+ data () {
return {
+ openModifyFileNameDialog: false,
+ modifyFile: {
+ fileName: '',
+ fileId: ''
+ },
+ modifyFileNameLoading: false,
submitType: '',
bpnId: '',
ccc: false,
@@ -1639,7 +1837,7 @@ export default {
kwjFileList: [],
xdbFileList: [],
glwjFileList: [],
- textStatus: '',//标准状态
+ textStatus: '', // 标准状态
textStatusMap: {}, // 标准状态id与name对应
countryArr: '',
activeName: '1',
@@ -1691,7 +1889,7 @@ export default {
modalShowTree: false, // 归档位置drawer开关
url: '',
urlChild: '',
- drawerTitle: '', //drawer标题
+ drawerTitle: '', // drawer标题
treeStatus: false,
fileUrl: 'api/att/attFile/uploadNew',
fileMadel: false,
@@ -1726,38 +1924,38 @@ export default {
replacePage: 1,
rules: {
standSystem: [
- {required: true, message: '请选择标准体系', trigger: 'change'}
+ { required: true, message: '请选择标准体系', trigger: 'change' }
],
treeListName: [
- {required: true, message: '请选择归档位置', trigger: 'blur'}
+ { required: true, message: '请选择归档位置', trigger: 'blur' }
],
standSort: [
- {required: true, message: '请选择标准类别', trigger: 'change'}
+ { required: true, message: '请选择标准类别', trigger: 'change' }
],
standNumber: [
- {required: true, message: '请输入标准编号', trigger: 'blur'},
- {min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}
+ { required: true, message: '请输入标准编号', trigger: 'blur' },
+ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standYear: [
- {required: true, message: '请输入标准年份'},
+ { required: true, message: '请输入标准年份' },
// { type: 'number', message: '年标准年份必须为数字值'}
],
standName: [
- {required: true, message: '请输入标准名称', trigger: 'blur'},
- {min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur'}
+ { required: true, message: '请输入标准名称', trigger: 'blur' },
+ { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
/* standEnName: [
{ required: false, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
],*/
- /*standNature: [
+ /* standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],*/
textStatus: [
- {required: true, message: '请选择标准状态', trigger: 'change'}
+ { required: true, message: '请选择标准状态', trigger: 'change' }
],
issueTime: [
- {required: false, message: '请选择标准发布日期', trigger: 'change'}
+ { required: false, message: '请选择标准发布日期', trigger: 'change' }
],
// qcdw: [
// { required: true, message: '请选择起草单位', trigger: 'change' }
@@ -1779,8 +1977,8 @@ export default {
signFlag: '1', // 是否需要会签
issueTime: '', // 发布时间
isRelateAccess: '', // 是否纳入认证清单
- standSystem: '',// 标准体系
- standSystemName: '',// 标准体系
+ standSystem: '', // 标准体系
+ standSystemName: '', // 标准体系
gxhbq: '', // 标签
treeListName: '',
treeListId: '',
@@ -1821,10 +2019,10 @@ export default {
qcdw: '', // 起草单位
wssmr: '', // 我司署名人
cysd: '', // 我司参与深度
- cyzbpm: [],// 我司参与制标排名
+ cyzbpm: [], // 我司参与制标排名
cllx: '', // 适用车型
- nylx: '',// 能源类型
- sycpx: '',// 适用产品线
+ nylx: '', // 能源类型
+ sycpx: '', // 适用产品线
syrz: '', // 适用认证
zrbm: '', // 责任部门
zrgcs: '', // 责任工程师
@@ -1843,13 +2041,13 @@ export default {
glwj: '', // 关联文件
xglc: '', // 相关流程
chjl: '', // 参会记录
- //流程信息
+ // 流程信息
prcNum: '',
commentText: '',
prcName: '',
standType: '',
}, // 标准信息
- countryOptions: [],//国家地区
+ countryOptions: [], // 国家地区
standSortOptions: [], // 标准类别
standNatureOptions: [], // 标准性质
standStateOptions: [], // 标准状态
@@ -1905,17 +2103,93 @@ export default {
}
},
computed: {
- listNoDataText() {
+ listNoDataText () {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
},
},
+ watch: {
+ 'form.treeListName' (val) {
+ console.log(this.form.treeListName)
+ },
+ 'form.country': {
+ handler (val) {
+ if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+ if (val instanceof Array) {
+ this.countryArr = val.join(',');
+ } else {
+ this.countryArr = val
+ }
+ } else if (val === '') {
+ this.countryArr = []
+ }
+ }
+ },
+ 'form': {
+ handler: function () {
+ if (this.form.standInData === '1') {
+ this.rules.standYear[0].required = false;
+ this.rules.standName[0].required = false
+ } else {
+ this.rules.standYear[0].required = true;
+ this.rules.standName[0].required = true
+ }
+ }
+ },
+ },
+ created () {
+ },
+ mounted () {
+ this.bpnId = this.$route.query.bpnId
+ this.getData()
+ this.getDataAsync()
+ this.processTable()
+ this.busVsFunc()
+ this.modelFunc()
+ },
methods: {
- //限制上传文件个数
+ handleRemoveFile (file) {
+ const fileList = []
+ this.fileList.forEach(item => {
+ const fileId = file.id || file.response.data.id
+ const itemId = item.id || item.response.data.id
+ if (fileId !== itemId) {
+ fileList.push(item)
+ }
+ })
+ this.fileList = fileList
+ this.removeOneFile(file, fileList)
+ },
+ handleModifyName (file) {
+ this.modifyFile.fileName = file.name
+ this.modifyFile.fileId = file.id || file.response.data.id
+ this.openModifyFileNameDialog = true
+ },
+ handleModifyNameSubmite () {
+ this.modifyFileNameLoading = true
+ this.$http.get('att/attFile/updateFileName', this.modifyFile, {
+ _this: this
+ }, res => {
+ if(res.ok) {
+ this.modifyFileNameLoading = false
+ this.openModifyFileNameDialog = false
+ this.fileList.forEach(item => {
+ const id = item.id || item.response.data.id
+ if(id === this.modifyFile.fileId) {
+ item.name = this.modifyFile.fileName
+ }
+ })
+ this.removeOneFile('_', this.fileList)
+ }
+ }, e => {
+ this.modifyFileNameLoading = false
+ })
+ },
+ // 限制上传文件个数
handleExceed (files, fileList) {
this.$message.warning(`当前限制选择 8 个文件,本次选择了 ${files.length} 个文件,共选择了 ${files.length + fileList.length} 个文件`)
},
// 标准来源改变事件
- standInChange(val) {
+ standInChange (val) {
this.verifySarStandard = false
/** val === '1' (海外) val === '0'( 国内 )*/
@@ -1929,7 +2203,7 @@ export default {
}
this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN'
},
- getBusStandFileByAttId(attId) {
+ getBusStandFileByAttId (attId) {
return new Promise((resolve, reject) => {
getBusStandFileByAttId({
attId
@@ -1945,7 +2219,7 @@ export default {
})
},
// 文件预览
- filePreview(item) {
+ filePreview (item) {
const attId = item.response.data.id
this.getBusStandFileByAttId(attId)
.then(res => {
@@ -1975,11 +2249,11 @@ export default {
// break
// }
}).catch(e => {
- console.log(e)
- this.$message.warning('文件不存在,预览失败')
- })
+ console.log(e)
+ this.$message.warning('文件不存在,预览失败')
+ })
},
- checkedRole(data) {
+ checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -1993,13 +2267,13 @@ export default {
this.$message.success('调整成功')
this.processNum()
this.queryProcess()
- this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+ this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' })
} else {
this.$message.warning(res.message)
}
})
},
- checkedRole2(data) {
+ checkedRole2 (data) {
console.log('1712', this.drawerTitle)
let idList = ''
let nameList = ''
@@ -2022,61 +2296,61 @@ export default {
this.roleForm.wssmrName = nameList;
}
},
- choiceZRRS(type, title, id) {
+ choiceZRRS (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
- choiceZRR1(type, title, id) {
+ choiceZRR1 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag1 = true
this.key++
},
- choiceZRR2(type, title, id) {
+ choiceZRR2 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag2 = true
this.url = ''
this.urlChild = ''
- this.url = "sarVppsTree/list"
- this.urlChild = "sarVppsTree/childByList"
+ this.url = 'sarVppsTree/list'
+ this.urlChild = 'sarVppsTree/childByList'
this.key1++
},
- choiceZRR3(type, title, id) {
+ choiceZRR3 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag3 = true
this.url = ''
this.urlChild = ''
- this.url = "sarVppsTree/list"
- this.urlChild = "sarVppsTree/childByList"
+ this.url = 'sarVppsTree/list'
+ this.urlChild = 'sarVppsTree/childByList'
this.key2++
},
- choiceZRR4(type, title, id) {
+ choiceZRR4 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
- this.url = "sarModelTree/listByType"
- this.urlChild = "sarModelTree/childByList"
+ this.url = 'sarModelTree/listByType'
+ this.urlChild = 'sarModelTree/childByList'
this.key3++
},
- choiceZRR5(type, title, id) {
+ choiceZRR5 (type, title, id) {
this.drawerTitle = title
this.modalShowFlag5 = true
this.url = ''
this.urlChild = ''
- this.url = "sarModelTree/listByType"
- this.urlChild = "sarModelTree/childByList"
+ this.url = 'sarModelTree/listByType'
+ this.urlChild = 'sarModelTree/childByList'
this.key4++
},
- choiceTree(type, title, id) {
+ choiceTree (type, title, id) {
this.drawerTitle = title
this.getListTree(this.form)
this.modalShowTree = true
this.key++
},
- busVsFunc() {
+ busVsFunc () {
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
@@ -2085,7 +2359,7 @@ export default {
this.key2++
})
},
- modelFunc() {
+ modelFunc () {
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
@@ -2094,7 +2368,7 @@ export default {
})
},
// 代替政策号 请求数据
- getReplaceLawsNumRowFirst() {
+ getReplaceLawsNumRowFirst () {
if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
} else {
@@ -2121,9 +2395,9 @@ export default {
}, e => {
})
},
- dataSourceChange(val) {
+ dataSourceChange (val) {
},
- handleChange(event) {
+ handleChange (event) {
// const value = event.target.value
const value = event
this.$emit('input', value)
@@ -2135,27 +2409,27 @@ export default {
}
},
// 代替政策编号-取消
- replaceLawsNumModelCancel() {
+ replaceLawsNumModelCancel () {
// this.replaceLawsNumModel = false
this.$refs.selections.clearSelection()
},
// 代替政策号 table选择事件
- selectReplaceStandNumRowChange(row) {
+ selectReplaceStandNumRowChange (row) {
this.selectedListRep = row
},
// 代替政策分页
- pageChangeReplace(page) {
+ pageChangeReplace (page) {
this.replacePage = page
this.replaceLawsNumForm.page = page
this.getReplaceLawsNumRow()
},
- pageSizeChangeReplace(pageSize) {
+ pageSizeChangeReplace (pageSize) {
// this.replaceRows = pageSize
this.replaceLawsNumForm.pageSize = pageSize
this.getReplaceLawsNumRow()
},
// 代替政策编号确定
- replaceLawsNumModelBt() {
+ replaceLawsNumModelBt () {
let textArr = []
if (typeof this.value === 'string') {
@@ -2183,7 +2457,7 @@ export default {
texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
}
textArr.push(texts)
- textArr = [...new Set(textArr)]
+ textArr = [ ...new Set(textArr) ]
this.replaceLawsNumModel = false
})
// this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
@@ -2204,8 +2478,8 @@ export default {
this.$refs.selections.clearSelection()
},
// 点击查看
- handlePreview(item) {
- let routeUrl = this.$router.resolve({
+ handlePreview (item) {
+ const routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
@@ -2214,7 +2488,7 @@ export default {
})
window.open(routeUrl.href, '_blank')
},
- getResetLawsNumRow() {
+ getResetLawsNumRow () {
this.replaceLawsNumForm = {
standNumber: '', // 标准编号
page: 1,
@@ -2226,7 +2500,7 @@ export default {
}
this.getReplaceLawsNumRow()
},
- selectLaws(type) {
+ selectLaws (type) {
// if (this.standNumFlag === 1) {
// this.$refs.selections.selectAll(false)
// }
@@ -2244,7 +2518,7 @@ export default {
this.getReplaceLawsNumRow()
},
// 代替政策号 请求数据
- getReplaceLawsNumRow() {
+ getReplaceLawsNumRow () {
if (this.sarBussionessLawsEO.replaceLawsNum !== null && this.sarBussionessLawsEO.replaceLawsNum !== '') {
this.replaceLawsNumForm.quoteIdList = this.quoteIdList1.toString() === '' ? '' : this.quoteIdList1
} else {
@@ -2275,11 +2549,11 @@ export default {
}, e => {
})
},
- beginImportFile(file) {
- var filename = file.name
- var index1 = filename.lastIndexOf('.')
- var index2 = filename.length
- var fileSuffix = filename.substring(index1, index2)
+ beginImportFile (file) {
+ const filename = file.name
+ const index1 = filename.lastIndexOf('.')
+ const index2 = filename.length
+ const fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt' || fileSuffix === '.PPT' || fileSuffix === '.pptx' || fileSuffix === '.PPTX' || fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
@@ -2300,7 +2574,7 @@ export default {
return true
},
// 导入标准数据成功后执行
- importFileSuccess(response, file, fileList) {
+ importFileSuccess (response, file, fileList) {
if (response.ok) {
// this.fileMadel = false
// if(this.fileType === 'fbgbjbd'){
@@ -2335,7 +2609,6 @@ export default {
// this.form.caName = response.data.name;
// }
-
// if(this.fileType === 'fbgbjbd'){
// this.FBGBJBDFileList=fileList;
// this.form.fbgbjbd += response.data.id+',';
@@ -2396,7 +2669,7 @@ export default {
// this.form.caName += response.data.name+',';
// }
-
+ this.fileList = fileList
switch (this.fileType) {
case 'fbgbjbd':
this.FBGBJBDFileList = fileList;
@@ -2440,9 +2713,7 @@ export default {
type: 'success'
})
}
- }, removeOneFile(file, fileList) {
-
-
+ }, removeOneFile (file, fileList) {
switch (this.fileType) {
case 'fbgbjbd':
this.FBGBJBDFileList = fileList;
@@ -2478,10 +2749,9 @@ export default {
this.glwjFileList = fileList
break
default :
- ;
}
},
- fileUpload(type) {
+ fileUpload (type) {
if (type === 'ca') {
this.fileList = this.caFileList;
} else if (type === 'fbgbjbd') {
@@ -2508,8 +2778,7 @@ export default {
this.fileType = '';
this.fileType = type;
this.fileMadel = true
-
- }, fileChange(fileList) {
+ }, fileChange (fileList) {
// console.log("fileList",fileList);
},
// popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
@@ -2560,21 +2829,21 @@ export default {
// }
// this.modalShowFlag4 = false
// },
- async menu2(id,name){
- let res = await this.selectMenu2(id,name)
- if(res && res.data){
+ async menu2 (id, name) {
+ const res = await this.selectMenu2(id, name)
+ if(res && res.data) {
this.form.standSystem = res.data
this.modalShowFlag1 = false
this.ccc = false
}
},
- selectMenu2(id,name) {
+ selectMenu2 (id, name) {
const param = {}
- if(id && id !== ""){
+ if(id && id !== '') {
param.id = id
}
- if(name && name !== ""){
+ if(name && name !== '') {
param.menuName = name
}
return new Promise((resolve, reject) => {
@@ -2585,26 +2854,25 @@ export default {
})
})
},
- popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ popoverHide (checkedIds, checkedData, isShow, isLoadChild, topId) {
this.ccc = true
if (checkedData) {
- this.menu2(checkedIds,"")
+ this.menu2(checkedIds, '')
// if (checkedData.length > 0 && checkedData.length !== 0) {
// this.form.standSystem = checkedData.map(item => item.menuName).join(",")
// } else {
// this.form.standSystem = checkedData.menuName
// }
}
-
},
- popoverHideCancel() {
+ popoverHideCancel () {
this.modalShowFlag1 = false
},
- treeHide(checkedIds, checkedData) {
+ treeHide (checkedIds, checkedData) {
if (checkedData) {
if (checkedData.length > 0 && checkedData.length != 0) {
- this.form.treeListName = checkedData.map(item => item.menuName).join(",")
- this.form.treeListId = checkedData.map(item => item.id).join(",")
+ this.form.treeListName = checkedData.map(item => item.menuName).join(',')
+ this.form.treeListId = checkedData.map(item => item.id).join(',')
} else {
this.form.treeListName = checkedData.menuName
this.form.treeListId = checkedData.id
@@ -2614,61 +2882,57 @@ export default {
})
this.modalShowTree = false
}
-
},
- treeHideCancel() {
+ treeHideCancel () {
this.modalShowTree = false
},
- popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ popoverHideBusVs (checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0 && checkedData.length != 0) {
- this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
- this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+ this.form.cycvppsbm = checkedData.map(item => item.code).join(',')
+ this.form.cycvppscn = checkedData.map(item => item.chineseName).join(',')
} else {
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
this.modalShowFlag2 = false
}
-
},
- popoverHideBusVsCancel() {
+ popoverHideBusVsCancel () {
this.modalShowFlag2 = false
},
- popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ popoverHideCarVs (checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
- this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
- this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+ this.form.kccvppsbm = checkedData.map(item => item.code).join(',')
+ this.form.kccvppscn = checkedData.map(item => item.chineseName).join(',')
} else {
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
this.modalShowFlag3 = false
-
}
},
- popoverHideCarVsCancel() {
+ popoverHideCarVsCancel () {
this.modalShowFlag3 = false
},
- popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ popoverHideModel (checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
- this.form.dybxh = checkedData.map(item => item.model).join(",")
- this.form.dymc = checkedData.map(item => item.name).join(",")
+ this.form.dybxh = checkedData.map(item => item.model).join(',')
+ this.form.dymc = checkedData.map(item => item.name).join(',')
} else {
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
this.modalShowFlag4 = false
}
-
},
- popoverHideModel2(checkedIds, checkedData, isShow, isLoadChild, topId) {
+ popoverHideModel2 (checkedIds, checkedData, isShow, isLoadChild, topId) {
if (checkedData && checkedData.length != 0) {
if (checkedData.length > 0) {
- this.form.dybxhcar = checkedData.map(item => item.model).join(",")
- this.form.dymccar = checkedData.map(item => item.name).join(",")
+ this.form.dybxhcar = checkedData.map(item => item.model).join(',')
+ this.form.dymccar = checkedData.map(item => item.name).join(',')
} else {
this.form.dybxhcar = checkedData.model
this.form.dymccar = checkedData.name
@@ -2676,13 +2940,13 @@ export default {
this.modalShowFlag5 = false
}
},
- popoverHideModelCancel() {
+ popoverHideModelCancel () {
this.modalShowFlag4 = false
},
- popoverHideModelCancel2() {
+ popoverHideModelCancel2 () {
this.modalShowFlag5 = false
},
- processTable() {
+ processTable () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '',
@@ -2695,7 +2959,7 @@ export default {
}, e => {
})
},
- getData() {
+ getData () {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
@@ -2708,36 +2972,36 @@ export default {
if (processForm.form === undefined) {
this.getFormFieldList(processForm)
} else {
- //表单文件处理
+ // 表单文件处理
this.getFormFieldList(processForm.form)
this.commentText = processForm.form.commentText
}
}
}).catch(e => {
- console.log("错误")
+ console.log('错误')
})
})
},
- filterObj(obj){
- if(obj && obj !== ''){
- if(obj instanceof Array){
- return obj;
- }else {
- return obj.split(",")
- }
- }
- return "";
- },
+ filterObj (obj) {
+ if(obj && obj !== '') {
+ if(obj instanceof Array) {
+ return obj;
+ }else {
+ return obj.split(',')
+ }
+ }
+ return '';
+ },
/**
* @description: 动态表单读取
*/
- getFormFieldList(item) {
+ getFormFieldList (item) {
console.log(item);
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
// 遍历对象
for (const p in this.form) {
- if (typeof (this.form[p]) != "function") {
+ if (typeof (this.form[p]) != 'function') {
this.initializeFileList(p, this.form[p]);
}
}
@@ -2745,18 +3009,18 @@ export default {
this.form['nylx'] = this.filterObj(this.form['nylx'])
this.form['cllx'] = this.filterObj(this.form['cllx'])
this.form['syrz'] = this.filterObj(this.form['syrz'])
- this.defaultCheckedKeys = [this.form.standSystem];
- this.defaultCheckedKeys1 = [this.form.cycvppsbm];
- this.defaultCheckedKeys2 = [this.form.kccvppsbm];
- this.defaultCheckedKeys3 = [this.form.dybxh];
+ this.defaultCheckedKeys = [ this.form.standSystem ];
+ this.defaultCheckedKeys1 = [ this.form.cycvppsbm ];
+ this.defaultCheckedKeys2 = [ this.form.kccvppsbm ];
+ this.defaultCheckedKeys3 = [ this.form.dybxh ];
this.treeCheckedKeys = this.form.treeListId.split(',')
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? this.form.standYear : ''
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
- if (typeof this.form.country === "string") {
- this.form.country = this.form.country.split(",");
+ if (typeof this.form.country === 'string') {
+ this.form.country = this.form.country.split(',');
}
this.$forceUpdate()
})
@@ -2778,7 +3042,7 @@ export default {
// this.form['id'] = item.id
// })
// },
- initializeFileList(property, value) {
+ initializeFileList (property, value) {
console.log('执行文件方法');
switch (property) {
case 'xgd':
@@ -2815,9 +3079,8 @@ export default {
this.getFileList(value, this.glwjFileList);
break;
default:
- ;
}
- }, getFileList(fileIds, defaultFileList) {
+ }, getFileList (fileIds, defaultFileList) {
let fileList
this.$http.get('att/attFile/getMultiFileInfos', {
fileIds: fileIds
@@ -2827,12 +3090,11 @@ export default {
fileList = res.data
if (fileList != null && fileList.length > 0) {
for (let i = 0; i < fileList.length; i++) {
- let obj = {name: '', response: {}}
+ const obj = { name: '', response: {} }
obj.name = fileList[i].oldFileName
obj.response.data = fileList[i]
-
- //根据以‘,’分割的id查询到的文件信息,放入对应的文件list中
+ // 根据以‘,’分割的id查询到的文件信息,放入对应的文件list中
defaultFileList.push(obj)
}
}
@@ -2840,7 +3102,7 @@ export default {
})
},
/** 归档位置树结构查询 */
- getListTree(bringData) {
+ getListTree (bringData) {
this.$http.get('sarResource/ts-resource/getListStand', {
sorDivide: bringData.standInData === '0' ? 'INLAND_STAND' : 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId,
@@ -2851,31 +3113,31 @@ export default {
}
})
},
- closeDrawer() {
+ closeDrawer () {
this.ListModel = false
},
- OkDrawer() {
+ OkDrawer () {
this.ListModel = false
- var item = {
+ const item = {
remarks: '123'
}
this.data.push(item)
},
- addList() {
+ addList () {
this.title = '新增标准'
this.ListModel = true
},
- handleTabs(name) {
+ handleTabs (name) {
this.active = name
},
- handleSave() {
- //表单文件处理
+ handleSave () {
+ // 表单文件处理
this.fileInfoHandle();
this.form.commentText = this.commentText;
this.isSubmit = true
this.saveLoading = true
- let _formData = new FormData()
- _formData.append("id", this.bpnId || "");
+ const _formData = new FormData()
+ _formData.append('id', this.bpnId || '');
// _formData.append('createUser', this.$store.getters.userInfo.userId)
// _formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', '1')
@@ -2894,47 +3156,46 @@ export default {
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
- this.isSubmit = false
- this.saveLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
})
},
- fileInfoHandle() {
+ fileInfoHandle () {
+ // 拼接文件名和id 提交到流程Activity
+ this.form.fbgbjbd = this.FBGBJBDFileList.map(item => item.response.data.id).join(',')
+ this.form.fbgbjbdName = this.FBGBJBDFileList.map(item => item.name).join(',')
- //拼接文件名和id 提交到流程Activity
- this.form.fbgbjbd = this.FBGBJBDFileList.map(item => item.response.data.id).join(",")
- this.form.fbgbjbdName = this.FBGBJBDFileList.map(item => item.name).join(",")
+ this.form.xgd = this.xgdFileList.map(item => item.response.data.id).join(',')
+ this.form.xgdName = this.xgdFileList.map(item => item.name).join(',')
- this.form.xgd = this.xgdFileList.map(item => item.response.data.id).join(",")
- this.form.xgdName = this.xgdFileList.map(item => item.name).join(",")
+ this.form.bpg = this.bpgFileList.map(item => item.response.data.id).join(',')
+ this.form.bpgName = this.bpgFileList.map(item => item.name).join(',')
- this.form.bpg = this.bpgFileList.map(item => item.response.data.id).join(",")
- this.form.bpgName = this.bpgFileList.map(item => item.name).join(",")
+ this.form.ssg = this.ssgFileList.map(item => item.response.data.id).join(',')
+ this.form.ssgName = this.ssgFileList.map(item => item.name).join(',')
- this.form.ssg = this.ssgFileList.map(item => item.response.data.id).join(",")
- this.form.ssgName = this.ssgFileList.map(item => item.name).join(",")
+ this.form.zqyjg = this.zqyjgFileList.map(item => item.response.data.id).join(',')
+ this.form.zqyjgName = this.zqyjgFileList.map(item => item.name).join(',')
- this.form.zqyjg = this.zqyjgFileList.map(item => item.response.data.id).join(",")
- this.form.zqyjgName = this.zqyjgFileList.map(item => item.name).join(",")
+ this.form.jdwj = this.jdwjFileList.map(item => item.response.data.id).join(',')
+ this.form.jdwjName = this.jdwjFileList.map(item => item.name).join(',')
- this.form.jdwj = this.jdwjFileList.map(item => item.response.data.id).join(",")
- this.form.jdwjName = this.jdwjFileList.map(item => item.name).join(",")
+ this.form.kwj = this.kwjFileList.map(item => item.response.data.id).join(',')
+ this.form.kwjName = this.kwjFileList.map(item => item.name).join(',')
- this.form.kwj = this.kwjFileList.map(item => item.response.data.id).join(",")
- this.form.kwjName = this.kwjFileList.map(item => item.name).join(",")
+ this.form.kwj = this.xdbFileList.map(item => item.response.data.id).join(',')
+ this.form.kwjName = this.xdbFileList.map(item => item.name).join(',')
- this.form.kwj = this.xdbFileList.map(item => item.response.data.id).join(",")
- this.form.kwjName = this.xdbFileList.map(item => item.name).join(",")
+ this.form.ca = this.caFileList.map(item => item.response.data.id).join(',')
+ this.form.caName = this.caFileList.map(item => item.name).join(',')
- this.form.ca = this.caFileList.map(item => item.response.data.id).join(",")
- this.form.caName = this.caFileList.map(item => item.name).join(",")
+ this.form.zbjbd = this.zbjbdFileList.map(item => item.response.data.id).join(',')
+ this.form.zbjbdName = this.zbjbdFileList.map(item => item.name).join(',')
- this.form.zbjbd = this.zbjbdFileList.map(item => item.response.data.id).join(",")
- this.form.zbjbdName = this.zbjbdFileList.map(item => item.name).join(",")
-
- this.form.glwj = this.glwjFileList.map(item => item.response.data.id).join(",")
- this.form.glwjName = this.glwjFileList.map(item => item.name).join(",")
+ this.form.glwj = this.glwjFileList.map(item => item.response.data.id).join(',')
+ this.form.glwjName = this.glwjFileList.map(item => item.name).join(',')
},
- handleSubmit() {
+ handleSubmit () {
this.$refs['form'].validate((valid) => {
if (valid) {
if (this.submitType === 1) {
@@ -2947,7 +3208,7 @@ export default {
this.$http.get('sarStandardsInfo/sar-standards-info/checkIsOnly', {
standType: standType,
standSort: this.form.standSort,
- standName:this.form.standName,
+ standName: this.form.standName,
standNumber: this.form.standNumber,
standYear: this.form.standYear,
}, {
@@ -2971,12 +3232,12 @@ export default {
if (res.success) {
this.$message.success(res.message)
// 流程提交之后,应该流转至待办任务页面
- this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+ this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' })
} else {
this.$message.success(res.message)
}
- this.isSubmit = false
- this.saveLoading = false
+ this.isSubmit = false
+ this.saveLoading = false
})
} else {
this.$message.warning(res.message)
@@ -3001,7 +3262,7 @@ export default {
if (res.success) {
this.$message.success(res.message)
// 流程提交之后,应该流转至待办任务页面
- this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+ this.$router.push({ path: '/processCenter?tabsName=ProcessCenter' })
} else {
this.$message.success(res.message)
}
@@ -3018,7 +3279,7 @@ export default {
* @date: 2020-11-18 21:47:58
* @auth: chenxiaoxi
*/
- processCreateStand(json) {
+ processCreateStand (json) {
const _formData = new FormData()
_formData.append('infoJson', json)
processCreateStand(_formData).then(res => {
@@ -3034,13 +3295,13 @@ export default {
}
})
},
-// 将标准状态的id与name对应
- setMap(data) {
+ // 将标准状态的id与name对应
+ setMap (data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
- getDicTypeListCode(res,json) {
+ getDicTypeListCode (res, json) {
return new Promise((resolve, reject) => {
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -3050,11 +3311,11 @@ export default {
})
})
},
- async getDataAsync(){
+ async getDataAsync () {
this.ccc = true
- let res = await this.getDicTypeListCode()
- if(res && res.data){
- this.countryOptions = res.data.COUNTRY//国家地区
+ const res = await this.getDicTypeListCode()
+ if(res && res.data) {
+ this.countryOptions = res.data.COUNTRY// 国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 标准状态
@@ -3079,45 +3340,6 @@ export default {
this.ccc = false
}
},
- },
- created() {
- },
- mounted() {
- this.bpnId = this.$route.query.bpnId
- this.getData()
- this.getDataAsync()
- this.processTable()
- this.busVsFunc()
- this.modelFunc()
- },
- watch: {
- 'form.treeListName'(val) {
- console.log(this.form.treeListName)
- },
- 'form.country': {
- handler(val) {
- if (val !== '' && val !== null && typeof (val) !== 'undefined') {
- if (val instanceof Array) {
- this.countryArr = val.join(",");
- } else {
- this.countryArr = val
- }
- } else if (val === '') {
- this.countryArr = []
- }
- }
- },
- 'form': {
- handler: function () {
- if (this.form.standInData === '1') {
- this.rules.standYear[0].required = false;
- this.rules.standName[0].required = false
- } else {
- this.rules.standYear[0].required = true;
- this.rules.standName[0].required = true
- }
- }
- },
}
}
@@ -3215,4 +3437,12 @@ export default {
}
}
}
+.el-upload-list__item .el-icon-edit{
+ position: absolute;
+ top: 5px;
+ right: 25px;
+ cursor: pointer;
+ opacity: .75;
+ color: #606266;
+}
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index b64980b85..f83e818a0 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -436,12 +436,12 @@
prop="CYCVPPSCNBUSS"
class="add-form-item form-item-disabled"
>
-
+
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
index 246523891..24cbf8466 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
@@ -401,10 +401,10 @@
-
+
-
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index 78d5c7c3d..220e735cf 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -1,812 +1,910 @@
-
diff --git a/src/utils/login.js b/src/utils/login.js
index dcaa28f6e..52fdc1b46 100644
--- a/src/utils/login.js
+++ b/src/utils/login.js
@@ -35,7 +35,8 @@ function loginAgain () {
if (isMobile()) {
loginInPhone().then(() => {
Message.success('登录成功')
- router.go(0)
+ // router.go(0)
+ window.location.reload(false)
})
} else {
window.location.href = ssoLogout + encodeURIComponent(window.location.href)
@@ -99,7 +100,6 @@ function loginInPhone () {
})
hwh5.getAuthCode().then(data => {
console.log('获取到了welinkCode', data)
- Message.success('获取到了welinkCode')
if (data) {
const code = data.code
getTokenToWeLink({
-
+
点击或拖拽上传文件
-
+
- + + + {{ file.name }} + + + + + +