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

项目清单确认流程

Browse Source
This commit is contained in:
宋伟佳
2021-12-02 19:22:34 +08:00
parent 150aa7e56e
commit 6b39a40e20
5 changed files with 766 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+12 -1
View File
@@ -625,7 +625,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '标准法规部经理审批') {
} else if (row.taskInfo === '确认人确认') {
this.$router.push({
name: 'xmqdqrStep3',
query: {
@@ -636,6 +636,17 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '产品工程经理汇总清单'){
this.$router.push({
name: 'xmqdqrStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
case '14':
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+2 -28
View File
@@ -146,32 +146,6 @@
width="180px"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppsbm"
width="180px"
align="center"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppscn"
width="180px"
align="center"
label="卡车vpps中文名称">
</el-table-column>
<el-table-column
prop="cycvppsbm"
width="180px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
prop="cycvppscn"
width="180px"
align="center"
label="乘用车vpps中文名称">
</el-table-column>
</el-table>
</div>
<div>
@@ -653,8 +627,8 @@
@pageChange="handleSelectPageChange"
@pageSizeChange="handleSelectPageSizeChange"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
<el-button class="common-button-default" size="mini" @click="standModel = false">取消</el-button>
<el-button type="primary" size="mini" class="common-button-primary" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
</div>
</div>
</el-drawer>
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+75 -52
View File
@@ -2,7 +2,7 @@
<div class="xmqdqr-step2">
<ProcessHeader toggle>
<template slot="proName">项目清单确认流程</template>
<template slot="proNode">产品经理分发任务</template>
<template slot="proNode">确认人确认</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -60,7 +60,7 @@
:data="dataList"
border
ref="selection"
height="65%"
height="59%"
@selection-change="selectStandChange"
style="width: 100%; border:1px solid #ccc"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -139,31 +139,34 @@
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppsbm"
width="180px"
prop="involve"
width="160px"
align="center"
label="卡车VPPS编码">
label="标准是否涉及">
<template slot-scope="scope">
<el-select v-model="scope.row.involve"
placeholder="请选择涉不涉及"
max-length="30"
clearable>
<el-option value="involve" label="涉及"></el-option>
<el-option value="noInvolve" label="不涉及"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppscn"
width="180px"
prop="remarks"
align="center"
label="卡车vpps中文名称">
</el-table-column>
<el-table-column
prop="cycvppsbm"
width="180px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
prop="cycvppscn"
width="180px"
align="center"
label="乘用车vpps中文名称">
width="180"
label="备注">
<template slot-scope="scope">
<el-input
v-model.trim="dataList[scope.$index].remarks"
placeholder="请输入备注"
>
</el-input>
</template>
</el-table-column>
</el-table>
</div>
<div>
@@ -645,8 +648,8 @@
@pageChange="handleSelectPageChange"
@pageSizeChange="handleSelectPageSizeChange"></pagination>
<div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" round icon="el-icon-close" @click="standModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
<el-button class="common-button-default" size="mini" @click="standModel = false">取消</el-button>
<el-button type="primary" size="mini" class="common-button-primary" @click="handleSelectConfirm" v-show="lawInfoTableLoading === false">确定</el-button>
</div>
</div>
</el-drawer>
@@ -678,13 +681,6 @@
<!-- :approval="true"-->
<!-- >-->
<!-- </ProcessFooter>-->
<!-- 多选确认人-->
<Role-tree
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
></Role-tree>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
@@ -908,16 +904,22 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
if(item.form === undefined){
this.qdform = JSON.parse(JSON.stringify(item));
this.qdform.prcNum = this.prcNum;
this.qdform.prcName = this.prcName;
this.qdform["id"] = item.id;
this.projectId = item.projectId;
//获取清单id 查询对应清单下的标准
this.detailedId = item.detailedListId;
this.getStandData();
this.dataList = item.dataList
this.dataList.forEach(item => {
this.$set(item, 'involve', 'involve')
this.$set(item, 'remarks', '')
})
// this.projectId = item.projectId;
// //获取清单id 查询对应清单下的标准
// this.detailedId = item.detailedListId;
// this.getStandData();
}else{
this.qdform = item.form
this.dataList =item.form.dataList
@@ -985,26 +987,43 @@ export default {
this.saveLoading = false;
});
},
handleRemark(){
this.dataList.map(item => {
if(item.involve === 'noInvolve'){
comFlag
}
})
},
//提交事件
handleSubmit() {
this.isSubmit = true;
this.qdform.commentText = this.commentText;
this.qdform.dataList = this.dataList
const json = JSON.stringify(this.qdform);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
let comFlag = 0
this.dataList.map(item => {
if(item.involve === 'noInvolve' && item.remarks === ''){
comFlag++
}
this.isSubmit = false;
}, e => {
});
})
if(comFlag > 0){
this.$message.warning('请填写不涉及的备注信息')
}else{
this.isSubmit = true;
this.qdform.commentText = this.commentText;
this.qdform.dataList = this.dataList
const json = JSON.stringify(this.qdform);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
}
},
addList() {
this.searchLawBtn()
@@ -1181,6 +1200,10 @@ export default {
this.dataList.push(item)
}
})
this.dataList.forEach(item => {
this.$set(item, 'involve', 'involve')
this.$set(item, 'remarks', '')
})
this.standModel = false
}
},
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+665 -247
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+12 -1
View File
@@ -879,7 +879,7 @@ export default {
prcType: row.prcType
}
})
} else if(row.taskInfo === '标准法规部经理审批'){
} else if(row.taskInfo === '确认人确认'){
this.$router.push({
name: 'xmqdqrStep3',
query: {
@@ -890,6 +890,17 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '产品工程经理汇总清单'){
this.$router.push({
name: 'xmqdqrStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
}
break
case 'laws2':