FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-04-11 15:31:07 +08:00
parent ded81573f5 0d64a64ed6
commit 21f33dd11b
19 changed files with 841 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+4
View File
@@ -120,6 +120,10 @@
default: () => { default: () => {
return [] return []
} }
},
type: {
type: Number,
default: 0
} }
}, },
data () { data () {
src/main.js
+29 -3
View File
@@ -113,7 +113,20 @@ router.beforeEach(function (to, from, next) {
/** 判断是不是在手机端操作 */ /** 判断是不是在手机端操作 */
if (isMobile()) { if (isMobile()) {
if(toName === 'processCenter'){ if(toName === 'processCenter'){
hwh5.close(); // hwh5.close();
//关闭当前窗口
let userAgent = navigator.userAgent;
if (userAgent.indexOf("Firefox") !== -1 || userAgent.indexOf("Chrome") !==-1) {
window.location.href="about:blank";
}else if(userAgent.indexOf('Android') > -1 || userAgent.indexOf('Linux') > -1){
window.opener=null;window.open('about:blank','_self','').close();
}else {
window.opener = null;
window.open("about:blank", "_self");
window.close();
}
//如果是微信打开，关闭当前微信窗口
weixinClosePage()
}else { }else {
if ((token === null || token === '' ) && toName !== 'Login') { if ((token === null || token === '' ) && toName !== 'Login') {
if(toName !== 'phoneIndex'){ if(toName !== 'phoneIndex'){
@@ -177,7 +190,21 @@ router.beforeEach(function (to, from, next) {
extractedVerify(token) extractedVerify(token)
} }
} }
function weixinClosePage() {
if (typeof WeixinJSBridge == "undefined") {
if (document.addEventListener) {
document.addEventListener('WeixinJSBridgeReady', weixin_ClosePage, false);
} else if (document.attachEvent) {
document.attachEvent('WeixinJSBridgeReady', weixin_ClosePage);
document.attachEvent('onWeixinJSBridgeReady', weixin_ClosePage);
}
} else {
weixin_ClosePage();
}
}
function weixin_ClosePage() {
WeixinJSBridge.call('closeWindow');
}
function extractedVerify() { function extractedVerify() {
if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) { if (taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null) {
get_verify_by_instance({ get_verify_by_instance({
@@ -187,7 +214,6 @@ router.beforeEach(function (to, from, next) {
let hisCount = res.hisCount === undefined ? 0 : res.hisCount; let hisCount = res.hisCount === undefined ? 0 : res.hisCount;
let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus; let commitStatus = res.commitStatus === undefined ? 0 : res.commitStatus;
let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished; let isNotFinished = res.isNotFinished === undefined ? 0 : res.isNotFinished;
if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成 if ((hisCount && hisCount > 0)) { // 业务系统 当前节点已完成
if(isMobile()){ if(isMobile()){
next('/processedPage') next('/processedPage')
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+39 -3
View File
@@ -162,9 +162,11 @@
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input <el-input
:config="zrbmOptions"
clearable
v-model="queryUnqualidiedData.responsibleUnit" v-model="queryUnqualidiedData.responsibleUnit"
placeholder="请输入" placeholder="查询责任部门"
> @click.native="choiceZRBM('ZRBMId', '查询责任部门', queryUnqualidiedData.responsibleUnit)">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
@@ -317,6 +319,12 @@
:nodeList="nodeList" :nodeList="nodeList"
@checkedRole="drawerCheck" @checkedRole="drawerCheck"
/> />
<Mechanism-tree
is-title="选择部门信息"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
</div> </div>
</template> </template>
@@ -339,6 +347,8 @@ export default {
name: "wfhxzgStep1", name: "wfhxzgStep1",
data() { data() {
return { return {
modalshowflagZRBM: false,
nodeListZRBM: [],
loading: false, loading: false,
submitFlag: '', //是否是修改节点 submitFlag: '', //是否是修改节点
commentText: '', // 意见 commentText: '', // 意见
@@ -404,6 +414,32 @@ export default {
} }
}, },
methods: { methods: {
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
data.forEach(item => {
// if (item.hasChild === '0') {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
// }
})
if (this.drawerTitle === '责任部门') {
this.sarStandardsInfoEO.ZRBMId = idList;
this.queryUnqualidiedData.responsibleUnit = nameList;
} else if (this.drawerTitle === '查询责任部门') {
this.queryUnqualidiedData.responsibleUnit = nameList
}
},
choiceZRBM(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
this.drawerTitle = title
this.modalshowflagZRBM = true
},
getHistoryData() { getHistoryData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
@@ -808,7 +844,7 @@ export default {
<style lang="less"> <style lang="less">
.wfhxzgStep1 { .wfhxzgStep1 {
.el-drawer__container { .el-drawer__container {
} }
/*.el-table{*/ /*.el-table{*/
/* overflow: auto;*/ /* overflow: auto;*/
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step4.vue
+3 -2
View File
@@ -178,6 +178,7 @@
:is-visible.sync="modalshowflag" :is-visible.sync="modalshowflag"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList" :nodeList="nodeList"
:type="1"
></Role-tree> ></Role-tree>
</div> </div>
</template> </template>
@@ -307,7 +308,7 @@ export default {
institutionIdList += ","; institutionIdList += ",";
institutionNameList += ","; institutionNameList += ",";
} }
institutionIdList += item.institutionId; institutionIdList += item.idList;
institutionNameList += item.institutionName; institutionNameList += item.institutionName;
}); });
//蛀掉的 //蛀掉的
@@ -326,7 +327,7 @@ export default {
this.form.responUserList = idList; this.form.responUserList = idList;
this.form.responUserListName = nameList; this.form.responUserListName = nameList;
console.log(institutionNameList, '???')
this.form.institutionNameValid = institutionNameList.split(','); this.form.institutionNameValid = institutionNameList.split(',');
}, },
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
+32
View File
@@ -953,6 +953,7 @@ export default {
addFormItem() { addFormItem() {
this.$refs.multipleTableItemRef.validate(valid => { this.$refs.multipleTableItemRef.validate(valid => {
if (valid) { if (valid) {
console.log( this.ruleForm.multipleTableData, ' this.ruleForm.multipleTableData')
this.multipleTableItemForm.id = Date.parse(new Date()) this.multipleTableItemForm.id = Date.parse(new Date())
var dataItem = JSON.parse(JSON.stringify(this.multipleTableItemForm)) var dataItem = JSON.parse(JSON.stringify(this.multipleTableItemForm))
this.ruleForm.multipleTableData.push(dataItem) this.ruleForm.multipleTableData.push(dataItem)
@@ -1133,6 +1134,24 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
// 验证表格
validateTableData() {
let flag = false
this.ruleForm.multipleTableData.forEach((item1, index1) => {
for (let item in item1) {
if (item === 'xiangmumiaoshu' || item === 'dangqianjiedian' || item === 'qitashuoming') {
continue
} else {
if (item1[item] === '' || item1[item] === undefined || item1[item] === null) {
flag = true
this.$message.warning('请完善表格')
break
}
}
}
})
return flag
},
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true; this.saveLoading = true;
@@ -1141,6 +1160,8 @@ export default {
_formData.append("prcType", "3"); _formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds); _formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
...this.json,
table: this.ruleForm.multipleTableData,
form: this.form, form: this.form,
commentText: this.commentText commentText: this.commentText
})); }));
@@ -1153,6 +1174,13 @@ export default {
}); });
}, },
handleSubmit() { handleSubmit() {
if (this.ruleForm.multipleTableData.length === 0) {
this.$message.warning('请至少填写一条数据')
return
}
if (this.validateTableData() && this.feedbackDept === '2') {
return
}
this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => { this.$refs["zdrzbzORzchgxxmscForm"].validate((valid) => {
if (valid) { if (valid) {
let infoTableDatas = [] let infoTableDatas = []
@@ -1161,6 +1189,7 @@ export default {
localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas))
var json = this.json; var json = this.json;
json.infoTableDatas = infoTableDatas json.infoTableDatas = infoTableDatas
json.table = this.ruleForm.multipleTableData
json.commentText = this.commentText; json.commentText = this.commentText;
json.responUserList = this.form.responUserList; json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName; json.responUserListName = this.form.responUserListName;
@@ -1221,6 +1250,9 @@ export default {
this.form.fjList = data.fjList this.form.fjList = data.fjList
this.form.fjListId = data.fjListId this.form.fjListId = data.fjListId
this.json = data this.json = data
if (typeof Array(data.table) && data.feedbackDept === '2') {
this.ruleForm.multipleTableData = data.table || []
}
this.feedbackDept = this.json.feedbackDept this.feedbackDept = this.json.feedbackDept
}).catch(e => { }).catch(e => {
}); });
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step6.vue
+180 -55
View File
@@ -104,87 +104,206 @@
<!--这个div是产品规划部信息--> <!--这个div是产品规划部信息-->
<div style="height: 430px" v-else-if="feedbackDept === '2'"> <div style="height: 430px" v-else-if="feedbackDept === '2'">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
tooltip-effect="dark" tooltip-effect="dark"
border :data="ruleForm.multipleTableData"
style="width: 100%;" border
height="100%" style="width: 100%;"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', height="100%"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
type="selection" type="index"
width="55" label="序号"
align="center"> width="55"
align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
type="index" show-overflow-tooltip
label="序号" label="业务"
width="55" prop="yewu"
align="center"> align="center"
</el-table-column> width="150"
<el-table-column
label="业务"
align="center"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="pingtai"
label="平台" label="平台"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmu"
label="项目" label="项目"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmumiaoshu"
label="项目描述" label="项目描述"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="dangqianjiedian"
label="当前节点" label="当前节点"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-for="(item, index) in infoTableDatas"
prop="standName" show-overflow-tooltip
label="概念状态" :prop="'infoTableData' + index"
min-width="150" :label="item.lawName"
align="center" min-width="150"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G0"
width="150" label="G0"
label="概念计划下发时间"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G1"
width="120" label="G1"
label="概念修订计划"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G2"
width="400" label="G2"
label="其他说明"> min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G3"
label="G3"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G4"
label="G4"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G5"
label="G5"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G6"
label="G6"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G7"
label="G7"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G8"
label="G8"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G9"
label="G9"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G10"
label="G10"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G11"
label="G11"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G12"
label="G12"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G13"
label="G13"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="gainianzhuangtai"
label="概念状态"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
prop="gainianzhuangtaiDate"
align="center"
width="150"
label="概念计划下发时间">
</el-table-column>
<el-table-column
prop="gainianxiudingjihua"
align="center"
width="150"
label="概念修订计划">
</el-table-column>
<el-table-column
prop="qitashuoming"
align="center"
width="400"
label="其他说明">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -294,6 +413,9 @@ export default {
name: "zdrzbzORzchgxxmscStep6", name: "zdrzbzORzchgxxmscStep6",
data() { data() {
return { return {
ruleForm: {
multipleTableData: [],
},
infoTableDatas: [], infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门 //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "", feedbackDept: "",
@@ -482,6 +604,9 @@ export default {
this.form.fjList = data.fjList this.form.fjList = data.fjList
this.form.fjListId = data.fjListId this.form.fjListId = data.fjListId
this.json = data this.json = data
if (typeof Array(data.table) && data.feedbackDept === '2') {
this.ruleForm.multipleTableData = data.table
}
this.feedbackDept = this.json.feedbackDept this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept) console.log('485',this.feedbackDept)
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step7.vue
+180 -55
View File
@@ -116,87 +116,206 @@
<!--这个div是产品规划部信息--> <!--这个div是产品规划部信息-->
<div style="height: 430px" v-else-if="feedbackDept === '2'"> <div style="height: 430px" v-else-if="feedbackDept === '2'">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
tooltip-effect="dark" tooltip-effect="dark"
border :data="ruleForm.multipleTableData"
style="width: 100%;" border
height="100%" style="width: 100%;"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', height="100%"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
type="selection" type="index"
width="55" label="序号"
align="center"> width="55"
align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
type="index" show-overflow-tooltip
label="序号" label="业务"
width="55" prop="yewu"
align="center"> align="center"
</el-table-column> width="150"
<el-table-column
label="业务"
align="center"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="pingtai"
label="平台" label="平台"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmu"
label="项目" label="项目"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmumiaoshu"
label="项目描述" label="项目描述"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="dangqianjiedian"
label="当前节点" label="当前节点"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-for="(item, index) in infoTableDatas"
prop="standName" show-overflow-tooltip
label="概念状态" :prop="'infoTableData' + index"
min-width="150" :label="item.lawName"
align="center" min-width="150"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G0"
width="150" label="G0"
label="概念计划下发时间"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G1"
width="120" label="G1"
label="概念修订计划"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G2"
width="400" label="G2"
label="其他说明"> min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G3"
label="G3"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G4"
label="G4"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G5"
label="G5"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G6"
label="G6"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G7"
label="G7"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G8"
label="G8"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G9"
label="G9"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G10"
label="G10"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G11"
label="G11"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G12"
label="G12"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G13"
label="G13"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="gainianzhuangtai"
label="概念状态"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
prop="gainianzhuangtaiDate"
align="center"
width="150"
label="概念计划下发时间">
</el-table-column>
<el-table-column
prop="gainianxiudingjihua"
align="center"
width="150"
label="概念修订计划">
</el-table-column>
<el-table-column
prop="qitashuoming"
align="center"
width="400"
label="其他说明">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -304,6 +423,9 @@ export default {
name: "zdrzbzORzchgxxmscStep7", name: "zdrzbzORzchgxxmscStep7",
data() { data() {
return { return {
ruleForm: {
multipleTableData: [],
},
infoTableDatas: [], infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门 //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "", feedbackDept: "",
@@ -492,6 +614,9 @@ export default {
this.form.fjList = data.fjList this.form.fjList = data.fjList
this.form.fjListId = data.fjListId this.form.fjListId = data.fjListId
this.json = data this.json = data
if (typeof Array(data.table) && data.feedbackDept === '2') {
this.ruleForm.multipleTableData = data.table
}
this.feedbackDept = this.json.feedbackDept this.feedbackDept = this.json.feedbackDept
}).catch(e => { }).catch(e => {
}); });
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step8.vue
+180 -55
View File
@@ -110,87 +110,206 @@
<!--这个div是产品规划部信息--> <!--这个div是产品规划部信息-->
<div style="height: 430px" v-else-if="feedbackDept === '2'"> <div style="height: 430px" v-else-if="feedbackDept === '2'">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
tooltip-effect="dark" tooltip-effect="dark"
border :data="ruleForm.multipleTableData"
style="width: 100%;" border
height="100%" style="width: 100%;"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', height="100%"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
type="selection" type="index"
width="55" label="序号"
align="center"> width="55"
align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
type="index" show-overflow-tooltip
label="序号" label="业务"
width="55" prop="yewu"
align="center"> align="center"
</el-table-column> width="150"
<el-table-column
label="业务"
align="center"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="pingtai"
label="平台" label="平台"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmu"
label="项目" label="项目"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmumiaoshu"
label="项目描述" label="项目描述"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="dangqianjiedian"
label="当前节点" label="当前节点"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-for="(item, index) in infoTableDatas"
prop="standName" show-overflow-tooltip
label="概念状态" :prop="'infoTableData' + index"
min-width="150" :label="item.lawName"
align="center" min-width="150"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G0"
width="150" label="G0"
label="概念计划下发时间"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G1"
width="120" label="G1"
label="概念修订计划"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G2"
width="400" label="G2"
label="其他说明"> min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G3"
label="G3"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G4"
label="G4"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G5"
label="G5"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G6"
label="G6"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G7"
label="G7"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G8"
label="G8"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G9"
label="G9"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G10"
label="G10"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G11"
label="G11"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G12"
label="G12"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G13"
label="G13"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="gainianzhuangtai"
label="概念状态"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
prop="gainianzhuangtaiDate"
align="center"
width="150"
label="概念计划下发时间">
</el-table-column>
<el-table-column
prop="gainianxiudingjihua"
align="center"
width="150"
label="概念修订计划">
</el-table-column>
<el-table-column
prop="qitashuoming"
align="center"
width="400"
label="其他说明">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -300,6 +419,9 @@ export default {
name: "zdrzbzORzchgxxmscStep8", name: "zdrzbzORzchgxxmscStep8",
data() { data() {
return { return {
ruleForm: {
multipleTableData: [],
},
infoTableDatas: [], infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门 //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "", feedbackDept: "",
@@ -495,6 +617,9 @@ export default {
this.form.fjList = data.fjList this.form.fjList = data.fjList
this.form.fjListId = data.fjListId this.form.fjListId = data.fjListId
this.json = data this.json = data
if (typeof Array(data.table) && data.feedbackDept === '2') {
this.ruleForm.multipleTableData = data.table
}
this.feedbackDept = this.json.feedbackDept this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept) console.log('485',this.feedbackDept)
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step9.vue
+180 -55
View File
@@ -110,87 +110,206 @@
<!--这个div是产品规划部信息--> <!--这个div是产品规划部信息-->
<div style="height: 430px" v-else-if="feedbackDept === '2'"> <div style="height: 430px" v-else-if="feedbackDept === '2'">
<el-table <el-table
ref="multipleTable" ref="multipleTable"
tooltip-effect="dark" tooltip-effect="dark"
border :data="ruleForm.multipleTableData"
style="width: 100%;" border
height="100%" style="width: 100%;"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px', height="100%"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
type="selection" type="index"
width="55" label="序号"
align="center"> width="55"
align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
type="index" show-overflow-tooltip
label="序号" label="业务"
width="55" prop="yewu"
align="center"> align="center"
</el-table-column> width="150"
<el-table-column
label="业务"
align="center"
width="150"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="pingtai"
label="平台" label="平台"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmu"
label="项目" label="项目"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="xiangmumiaoshu"
label="项目描述" label="项目描述"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="standName" prop="dangqianjiedian"
label="当前节点" label="当前节点"
min-width="150" min-width="150"
align="center" align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip v-for="(item, index) in infoTableDatas"
prop="standName" show-overflow-tooltip
label="概念状态" :prop="'infoTableData' + index"
min-width="150" :label="item.lawName"
align="center" min-width="150"
align="center"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G0"
width="150" label="G0"
label="概念计划下发时间"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G1"
width="120" label="G1"
label="概念修订计划"> min-width="150"
align="center"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="SSRQ" show-overflow-tooltip
align="center" prop="G2"
width="400" label="G2"
label="其他说明"> min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G3"
label="G3"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G4"
label="G4"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G5"
label="G5"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G6"
label="G6"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G7"
label="G7"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G8"
label="G8"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G9"
label="G9"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G10"
label="G10"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G11"
label="G11"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G12"
label="G12"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="G13"
label="G13"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="gainianzhuangtai"
label="概念状态"
min-width="150"
align="center"
>
</el-table-column>
<el-table-column
prop="gainianzhuangtaiDate"
align="center"
width="150"
label="概念计划下发时间">
</el-table-column>
<el-table-column
prop="gainianxiudingjihua"
align="center"
width="150"
label="概念修订计划">
</el-table-column>
<el-table-column
prop="qitashuoming"
align="center"
width="400"
label="其他说明">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@@ -300,6 +419,9 @@ export default {
name: "zdrzbzORzchgxxmscStep9", name: "zdrzbzORzchgxxmscStep9",
data() { data() {
return { return {
ruleForm: {
multipleTableData: [],
},
infoTableDatas: [], infoTableDatas: [],
//用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门 //用来判断反馈情况的是哪个部门，1代表各事业部，2代表产品规划部，0代表其他部门
feedbackDept: "", feedbackDept: "",
@@ -509,6 +631,9 @@ export default {
this.form.fjList = data.fjList this.form.fjList = data.fjList
this.form.fjListId = data.fjListId this.form.fjListId = data.fjListId
this.json = data this.json = data
if (typeof Array(data.table) && data.feedbackDept === '2') {
this.ruleForm.multipleTableData = data.table
}
this.feedbackDept = this.json.feedbackDept this.feedbackDept = this.json.feedbackDept
console.log('485',this.feedbackDept) console.log('485',this.feedbackDept)
}).catch(e => { }).catch(e => {
src/pages/processCenter/pages/phone/bzdy/step2.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">对接人选择责任人</template> <template slot="proNode">任务分发</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/phone/bzdy/step4.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">责任对接人审批</template> <template slot="proNode">调研结果审批</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/phone/bzdy/step6.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">责任人会签</template> <template slot="proNode">会签</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/phone/bzdy/step7.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="phoneBzdyStep7 phoneBox"> <div class="phoneBzdyStep7 phoneBox">
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">责任部门对接人及标准法规部部长审核</template> <template slot="proNode">审核</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/phone/bzdy/step8.vue
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="phoneBzdyStep8 phoneBox"> <div class="phoneBzdyStep8 phoneBox">
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准调研流程</template> <template slot="proName">标准调研流程</template>
<template slot="proNode">技术管理中心主任审批</template> <template slot="proNode">审定</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/phone/bzrk/step2.vue
+2 -2
View File
@@ -3,7 +3,7 @@
<!-- 标准入库流程--> <!-- 标准入库流程-->
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准入库流程</template> <template slot="proName">标准入库流程</template>
<template slot="proNode">经理人审批</template> <template slot="proNode">批准</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -966,7 +966,7 @@ export default {
this.$message.warning("驳回成功") this.$message.warning("驳回成功")
this.isSubmit = false this.isSubmit = false
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'}) this.$router.push("/processCenter");
} else { } else {
console.log("hello"); console.log("hello");
this.processCreateStand(json) this.processCreateStand(json)
src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">对接人选择责任人</template> <template slot="proNode">任务分发</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+3 -4
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; ">
<el-form <el-form
ref="bzzqyjForm" ref="bzzqyjForm"
:model="form" :model="form"
@@ -87,15 +87,14 @@
<el-table-column <el-table-column
prop="chapterNumber" prop="chapterNumber"
align="center" align="center"
sortable
label="章条编号" label="章条编号"
width="101px"> width="70px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
align="center" align="center"
label="章节名称" label="章节名称"
width="200px"> width="180px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeaderPhone toggle> <ProcessHeaderPhone toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">标准法规工程师分线审核</template> <template slot="proNode">管理员</template>
</ProcessHeaderPhone> </ProcessHeaderPhone>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+2 -2
View File
@@ -1457,7 +1457,7 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
} else if(row.taskInfo === '法规认证部副总监批准'){ } else if(row.taskInfo === '法规认证部副总监审核'){
this.$router.push({ this.$router.push({
name: 'zdrzbzORzchgxxmscStep3', name: 'zdrzbzORzchgxxmscStep3',
query: { query: {
@@ -1529,7 +1529,7 @@ export default {
} }
}) })
} }
else if(row.taskInfo === '法规认证部副总监审定'){ else if(row.taskInfo === '法规认证部副总监批准'){
this.$router.push({ this.$router.push({
name: 'zdrzbzORzchgxxmscStep9', name: 'zdrzbzORzchgxxmscStep9',
query: { query: {