diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 1c84428e5..aa5ffa79c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -49,11 +49,12 @@
{{ scope.row.standSort }} {{ scope.row.standNumber
+ @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{
+ scope.row.standNumber
}}-{{ scope.row.standYear }}
{{ scope.row.standSort }}
{{ scope.row.standNumber }}
@@ -243,18 +245,26 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -353,77 +363,80 @@
+ title="批量填写"
+ :visible.sync="modalshowflag"
+ :wrapperClosable="false"
+ size="800px">
在研产品
-
+
-
+
-
+
-
+
+ v-model="batchEditForm.completionTime"
+ type="date"
+ placeholder="选择日期">
在产产品
-
+
-
+
-
+
-
+
+ v-model="batchEditForm.zcCompletionTime"
+ type="date"
+ placeholder="选择日期">
@@ -433,7 +446,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
-import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew } from "api/process";
+import {inboundLiaisonDetail, saveTaskForPub, changeAssigneeNew} from "api/process";
export default {
name: "xmpg2Step6",
@@ -444,30 +457,33 @@ export default {
},
data() {
return {
- nodeList:[],
+ total: 0,
+ currentPage: 1,
+ pageSize: 20,
+ nodeList: [],
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
batchEditForm: {
// 在研产品
// 合规
- complianceReasons :'',
+ complianceReasons: '',
// 不合规
- noCompliance :'',
+ noCompliance: '',
// 应对措施
- countermeasures :'',
+ countermeasures: '',
// 完成时间
- completionTime :'',
+ completionTime: '',
// 在产产品
// 合规
- zcComplianceReasons :'',
+ zcComplianceReasons: '',
// 不合规
- zcNoCompliance:'',
+ zcNoCompliance: '',
// 应对措施
- zcCountermeasures:'',
+ zcCountermeasures: '',
// 完成时间
- zcCompletionTime:''
+ zcCompletionTime: ''
},
hasChildren: true,
active: "1",
@@ -519,7 +535,7 @@ export default {
},
methods: {
//确认转办
- checkedTransferRole (data) {
+ checkedTransferRole(data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
@@ -539,7 +555,7 @@ export default {
})
},
// 请求转换流程图
- processNum (row) {
+ processNum(row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
@@ -554,7 +570,7 @@ export default {
})
},
//转办事件
- handleTransfer(){
+ handleTransfer() {
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
@@ -563,8 +579,8 @@ export default {
saveBatchEditForm() {
// console.log(this.selectList)
- for( let a = 0; a < this.dataList.length; a++) {
- for ( let b = 0; b < this.selectList.length; b++) {
+ for (let a = 0; a < this.dataList.length; a++) {
+ for (let b = 0; b < this.selectList.length; b++) {
if (this.dataList[a].id === this.selectList[b]) {
//合规
this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
@@ -582,9 +598,9 @@ export default {
this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
//完成时间
this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
- }else {
- for (let i=0;i {
if (res) {
- console.log(res.mesg);
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
@@ -713,15 +728,27 @@ export default {
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList;
- this.dataList = this.listForm.dataList;
- console.log(this.dataList);
+ this.dataList = this.listForm.dataList[0].children
+ this.dataList.map(item => {
+ this.$set(item, 'standName', this.listForm.dataList[0].standName)
+ this.$set(item, 'standEnName', this.listForm.dataList[0].standEnName)
+ this.$set(item, 'standYear', this.listForm.dataList[0].standYear)
+ this.$set(item, 'standSort', this.listForm.dataList[0].standSort)
+ this.$set(item, 'standNumber', this.listForm.dataList[0].standNumber)
+ })
+ this.total = this.listForm.dataList[0].children.length;
} else {
this.listForm = item.form;
- this.dataList = item.form.dataList;
+ this.dataList = item.form.dataList[0].children
+ this.total = item.form.dataList[0].children.length;
}
});
},
+ // 分页
+ handleCurrentChange(currentPage) {
+ this.currentPage = currentPage;
+ },
//保存事件
handleSave() {
this.saveLoading = true;
@@ -874,10 +901,12 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
- /deep/.el-table th > .cell{
+
+ /deep/ .el-table th > .cell {
font-size: 12px;
}
- /deep/.el-table thead.is-group th{
+
+ /deep/ .el-table thead.is-group th {
padding: 0px;
}
}