Merge branch 'develop' into FOTON

This commit is contained in:
Superman_Main
2021-11-23 21:16:05 +08:00
31 changed files with 6215 additions and 5978 deletions
@@ -26,7 +26,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button>
<el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -84,7 +84,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button>
<el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -329,7 +329,7 @@
<loading :loading="spinShow">数据加载中……</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
<el-button type="primary" size="mini" @click="enterDrawer">导入</el-button>
</div>
</div>
</el-drawer>
@@ -649,7 +649,7 @@
this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2()
},
/** 选择带入数据的方法操作
/** 选择导入数据的方法操作
* */
handleSelection(data) {
this.selectedList = [];
@@ -710,9 +710,9 @@
this.loading = false
})
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行带入");
this.$message.warning("请选择一条数据进行导入");
}
},
closeDrawer2() {
@@ -744,9 +744,9 @@
this.form.oldNumber = bringData[0].id
this.listModel2 = false
} else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行带入");
this.$message.warning("请选择一条数据进行导入");
}
},
/*** **********************************************/
@@ -27,7 +27,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button>
<el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -94,7 +94,7 @@
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">带入</el-button>
<el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
@@ -345,7 +345,7 @@
<loading :loading="spinShow">数据加载中……</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer">带入</el-button>
<el-button type="primary" size="mini" @click="enterDrawer">导入</el-button>
</div>
</div>
</el-drawer>
@@ -680,7 +680,7 @@ export default {
this.standCommonlySearch2.pageSize = pageSize
this.sarStandCompareHis2()
},
/** 选择带入数据的方法操作
/** 选择导入数据的方法操作
* */
handleSelection(data) {
this.selectedList = [];
@@ -747,9 +747,9 @@ export default {
this.loading = false
})
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行带入");
this.$message.warning("请选择一条数据进行导入");
}
},
closeDrawer2() {
@@ -781,9 +781,9 @@ export default {
this.form.oldNumber = bringData[0].id
this.listModel2 = false
} else if (this.selectedList2.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行带入");
this.$message.warning("请选择一条数据进行导入");
}
},
/*** **********************************************/
@@ -1478,9 +1478,9 @@
],
},
rules:{
standSort: [
/*standSort: [
{ required: true, message: '请选择标准类别', trigger: 'change' }
],
],*/
standNumber: [
{ required: true, message: '请输入标准编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
@@ -1497,9 +1497,9 @@
{ required: false, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
/*standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],
],*/
textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' }
]
@@ -44,7 +44,7 @@
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item label="标准类别" v-show="form.standInData === '0'" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
@@ -95,7 +95,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
@@ -382,7 +382,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -392,7 +392,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option
@@ -475,7 +475,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -485,7 +485,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
@@ -44,7 +44,7 @@
</el-select>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
@@ -95,7 +95,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
@@ -296,7 +296,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -306,7 +306,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option
@@ -389,7 +389,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -399,7 +399,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
@@ -44,7 +44,7 @@
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
<el-option
v-for="item in standSortOptions"
@@ -91,7 +91,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质">
<el-option
v-for="item in standNatureOptions"
@@ -748,7 +748,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-option
v-for="item in zrbmOptions"
@@ -758,7 +758,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple>
<el-option
@@ -874,7 +874,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-option
v-for="item in zrgcsOptions"
@@ -884,7 +884,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
disabled
@@ -1456,9 +1456,9 @@ export default {
replaceLoading: true,
replacePage: 1,
rules:{
standSort: [
/* standSort: [
{ required: true, message: '请选择标准类别', trigger: 'change' }
],
],*/
standNumber: [
{ required: true, message: '请输入标准编号', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
@@ -1475,9 +1475,9 @@ export default {
{ required: true, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
],
standNature: [
/*standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' }
],
],*/
textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' }
],
@@ -30,7 +30,7 @@
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
v-for="item in standSortOptions"
@@ -80,7 +80,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
v-for="item in standNatureOptions"
@@ -289,7 +289,7 @@
<div class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple disabled>
<el-option
v-for="item in zrbmOptions"
@@ -299,7 +299,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple disabled>
<el-option
@@ -397,7 +397,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<!-- <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple disabled>
<el-option
v-for="item in zrgcsOptions"
@@ -407,7 +407,7 @@
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-form-item>-->
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
@@ -97,12 +97,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>责任部门对接人</h4>
<h4>责任领导</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人"
placeholder="选择责任领导"
@click.native="choiceZRRS">
</el-input>
</div>
@@ -253,7 +253,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
is-title="选择责任领导"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -342,9 +342,9 @@ export default {
cname: [
{required: true, message: '请输入标准名称', trigger: 'change'},
],
fjListId: [
{required: true, message: '请选择附件', trigger: 'change'},
]
// fjListId: [
// {required: true, message: '请选择附件', trigger: 'change'},
// ]
},
// 标准征求意见数据可库
standCommonlySearch: {
@@ -97,12 +97,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>责任部门对接人</h4>
<h4>责任领导</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任部门对接人"
placeholder="选择责任领导"
@click.native="choiceZRRS">
</el-input>
</div>
@@ -254,7 +254,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任部门对接人"
is-title="选择责任领导"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -341,9 +341,9 @@ export default {
endTime: [
{required: true, message: '请输入标准结束日期', trigger: 'change'},
],
fjListId: [
{required: true, message: '请选择附件', trigger: 'change'},
]
// fjListId: [
// {required: true, message: '请选择附件', trigger: 'change'},
// ]
},
// 标准征求意见数据可库
standCommonlySearch: {
@@ -340,6 +340,11 @@ export default {
this.form.cname = data.cname
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.json = data
}).catch(e => {
});
@@ -485,7 +485,8 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
let commitStatus = res.commitStatus
console.log(data);
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
@@ -493,12 +494,16 @@ export default {
this.acceptShow = false
this.submitShow = true
}
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.fjList = data.fjList || data.form.fjList || []
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.todoId = res.id
this.json = data
this.json = data
this.data = data.info || data.data || data.form.data || []
}).catch(e => {
})
@@ -373,7 +373,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
@@ -420,7 +420,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -437,7 +437,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -434,7 +434,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -434,7 +434,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -434,7 +434,11 @@ export default {
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
@@ -247,7 +247,7 @@ export default {
this.queryProcess()
},
queryProcess () { // 查询待办流程
this.$http.postData('lawss/activiti/todoTaskList', {
this.$http.postData('lawss/activiti/todoTaskListNew', {
current: this.pageNo,
size: parseInt(this.$store.getters.userInfo.configContent),
userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,