diff --git a/src/components/CustomFormComponents/DatePickerGroup.vue b/src/components/CustomFormComponents/DatePickerGroup.vue
index 78482a555..3cb38c8ea 100644
--- a/src/components/CustomFormComponents/DatePickerGroup.vue
+++ b/src/components/CustomFormComponents/DatePickerGroup.vue
@@ -144,7 +144,7 @@ export default {
},
watch: {
value (val) {
- this.tagList = val !== '' && val !== null ? val.split(',') : []
+ this.tagList = val !== '' && val !== null && val !== undefined? val.split(',') : []
// 把日期的时分秒去掉
this.tagList=this.tagList.map((item)=>item.substring(0,10))
},
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 54bb42167..1d3f00ea0 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -266,10 +266,9 @@
{{
sarStandardsInfoEO.issueTime || '-'
}}
-
-
-
-
+ {{
+ standMap[sarStandardsInfoEO.standNature] || '-'
+ }}
{{
sarStandardsInfoEO.standSystem || '-'
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 7b1301104..a026d304a 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -184,15 +184,15 @@
-
-
- 取消预警
-
-
-
+
基础信息
-
-
-
-
- 国内标准入库
- 海外标准入库
-
-
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
实施日期
-
-
-
-
-
-
-
-
-
+
+
+
文本信息
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{form.wssmr}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.wssmr }}
+
+
+
+
+
+
+
关联信息
-
-
-
-
-
-
-
-
-
-
-
-
- {{value.name}}
-
-
- - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ value.name }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
@@ -544,14 +502,19 @@
import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail,processCreateStand,changeAssigneeNew} from 'api/process'
+import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew} from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
+import Vue from 'vue';
+import { Form } from 'vant';
+import { Field } from 'vant';
+Vue.use(Form);
+Vue.use(Field);
export default {
name: "phoneBzrkStep2",
- data () {
+ data() {
return {
xgdFileMap: [],
fbgbjbdFileMap: [],
@@ -568,7 +531,7 @@ export default {
drawerModal: false,
drawerTitle: '',
nodeList: [],
- selectPeople:'',
+ selectPeople: '',
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
@@ -578,16 +541,16 @@ export default {
kwjFileId: '',
glwjFileId: '',
caFileId: '',
- zbjbdFileId:'',
+ zbjbdFileId: '',
rules: {
- commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
- approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }]
+ commentText: [{required: true, message: '请输入意见', trigger: 'blur'}],
+ approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}]
},
- activeName:'1',
+ activeName: '1',
// 当前流程类型(1待办/2已办)
processType: 1,
detailData: [],
- userId:this.$store.getters.userInfo.userId,
+ userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
formTongGuo: {
@@ -677,17 +640,17 @@ export default {
xglc: '', // 相关流程
chjl: '', // 参会记录
//流程信息
- prcNum:'',
- commentText:'',
- prcName:'',
+ prcNum: '',
+ commentText: '',
+ prcName: '',
standType: '',
}, // 标准信息
nodeKeyCode: 'code',
nodeKeyModel: 'model',
- key:1,
- key1:2,
- key2:3,
- key3:4,
+ key: 1,
+ key1: 2,
+ key2: 3,
+ key3: 4,
defaultCheckedKeys1: [],
defaultCheckedKeys2: [],
defaultCheckedKeys3: [],
@@ -699,7 +662,7 @@ export default {
children: 'children',
label: 'model'
},
- countryOptions:[],//国家地区
+ countryOptions: [],//国家地区
busVppsOptions: [], // 车系体系架构
modelOptions: [], // 模块体系架构
standSortOptions: [], // 标准类别
@@ -726,8 +689,8 @@ export default {
user4: '',
user5: '',
// 流程路由信息
- prcNum : this.$route.query.prcNum,
- prcName : this.$route.query.prcName,
+ prcNum: this.$route.query.prcNum,
+ prcName: this.$route.query.prcName,
}
},
components: {
@@ -738,11 +701,11 @@ export default {
TreeSelect
},
methods: {
- checkedRole (data) {
+ checkedRole(data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
- userId:this.$store.getters.userInfo.userId, // 委托人
+ userId: this.$store.getters.userInfo.userId, // 委托人
assignee: data[0].id, // 被委托人
pId: this.$route.query.prcId, // 流程实例
}).then(res => {
@@ -752,82 +715,82 @@ 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)
}
})
},
- downloadFile (fileType) {
+ downloadFile(fileType) {
//文件id中出现了','字符,去除掉
- if(fileType === 'fbgbjbd'){
- if(this.fbgbjbdFileId.search(',')){
- this.fbgbjbdFileId=this.fbgbjbdFileId.replace(",","");
+ if (fileType === 'fbgbjbd') {
+ if (this.fbgbjbdFileId.search(',')) {
+ this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
}
let attId = this.fbgbjbdFileId
this.$preview(attId)
- }else if(fileType === 'xgd'){
+ } else if (fileType === 'xgd') {
let attId = this.xgdFileId
this.$preview(attId)
- }else if(fileType === 'bpg'){
+ } else if (fileType === 'bpg') {
let attId = this.bpgFileId
this.$preview(attId)
- }else if(fileType === 'ssg'){
+ } else if (fileType === 'ssg') {
let attId = this.ssgFileId
this.$preview(attId)
- }else if(fileType === 'zqyjg'){
+ } else if (fileType === 'zqyjg') {
let attId = this.zqyjgFileId
this.$preview(attId)
- }else if(fileType === 'jdwj'){
+ } else if (fileType === 'jdwj') {
let attId = this.jdwjFileId
this.$preview(attId)
- }else if(fileType === 'kwj'){
+ } else if (fileType === 'kwj') {
let attId = this.kwjFileId
this.$preview(attId)
- }else if(fileType === 'glwj'){
+ } else if (fileType === 'glwj') {
let attId = this.glwjFileId
this.$preview(attId)
- }else if(fileType === 'ca'){
+ } else if (fileType === 'ca') {
let attId = this.caFileId
this.$preview(attId)
- }else if(fileType === 'zbjbd'){
+ } else if (fileType === 'zbjbd') {
let attId = this.zbjbdFileId
this.$preview(attId)
}
},
- getRule(){
+ getRule() {
if (this.formTongGuo.approvalOpinion === 0) {
this.rules.commentText[0].required = false;
this.$refs.formTongGuo.clearValidate('commentText')
- }else {
+ } else {
this.rules.commentText[0].required = true;
}
},
- popoverHide (checkedIds, checkedData) {
- if(checkedData) {
+ popoverHide(checkedIds, checkedData) {
+ if (checkedData) {
this.form.standSystem = checkedData.id
this.form.standSystemName = checkedData.menuName
}
},
- popoverHideBusVs (checkedIds, checkedData) {
- if(checkedData){
+ popoverHideBusVs(checkedIds, checkedData) {
+ if (checkedData) {
this.form.cycvppsbm = checkedData.code
this.form.cycvppscn = checkedData.chineseName
}
},
- popoverHideCarVs (checkedIds, checkedData) {
- if(checkedData){
+ popoverHideCarVs(checkedIds, checkedData) {
+ if (checkedData) {
this.form.kccvppsbm = checkedData.code
this.form.kccvppscn = checkedData.chineseName
}
},
- popoverHideModel (checkedIds, checkedData) {
- if(checkedData){
+ popoverHideModel(checkedIds, checkedData) {
+ if (checkedData) {
this.form.dybxh = checkedData.model
this.form.dymc = checkedData.name
}
},
- busVsFunc(){
+ busVsFunc() {
this.$http.get('sarVppsTree/list', '', {
_this: this
}, res => {
@@ -836,7 +799,7 @@ export default {
this.key2++
})
},
- modelFunc(){
+ modelFunc() {
this.$http.get('sarModelTree/list', '', {
_this: this
}, res => {
@@ -844,7 +807,7 @@ export default {
this.key3++
})
},
- processTable () {
+ processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '',
@@ -854,20 +817,21 @@ export default {
_this: this
}, res => {
this.detailData = res
- }, e => {})
+ }, e => {
+ })
},
- assemble(ids,names){
- let list= new Array();
+ assemble(ids, names) {
+ let list = new Array();
let idArray = []
let nameArray = []
- if(ids.length > 0) {
- idArray=ids.split(',');
+ if (ids.length > 0) {
+ idArray = ids.split(',');
}
if (names.length > 0) {
nameArray = names.split(',');
}
- for(var i=0;i {
this.form = JSON.parse(JSON.stringify(item))
+/* console.log(this.form)
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
- this.defaultCheckedKeys3 = [this.form.dybxh]
+ this.defaultCheckedKeys3 = [this.form.dybxh]*/
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
- if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){
- this.form.country=this.form.country.split(",");
+ if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+ this.form.country = this.form.country.split(",");
}
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
@@ -959,18 +924,19 @@ export default {
this.drawerModal = true
this.drawerTitle = '转办处理人'
},
- handleSave() {},
- handle1(){
+ handleSave() {
+ },
+ handle1() {
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
},
- handle2(){
+ handle2() {
this.formTongGuo.approvalOpinion = 0
this.handleSubmit()
},
handleSubmit() {
this.getRule()
- const val= this.form.country;
+ const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.form.country = val.join(",");
@@ -988,26 +954,27 @@ export default {
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
- userId : this.userId,
+ userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
- console.log("this.formTongGuo.approvalOpinion",this.formTongGuo.approvalOpinion);
- if(this.formTongGuo.approvalOpinion == '1'){
+ console.log("this.formTongGuo.approvalOpinion", this.formTongGuo.approvalOpinion);
+ if (this.formTongGuo.approvalOpinion == '1') {
console.log("shibai");
this.$message.warning("驳回成功")
this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面
- this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
- }else{
+ this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+ } else {
console.log("hello");
this.processCreateStand(json)
}
}
})
- }})
+ }
+ })
},
/**
@@ -1034,15 +1001,15 @@ export default {
})
},
},
- created(){
+ created() {
},
- mounted () {
+ mounted() {
this.getData()
this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
- this.countryOptions=res.data.COUNTRY//国家地区
+ this.countryOptions = res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
@@ -1069,30 +1036,37 @@ export default {