拆分
- 上传
- 导入拆分结果
删除
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index a4d847af7..d0a06cde7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -44,15 +44,16 @@
v-model="listForm.certifiedEngineer"
placeholder="请选择认证工程师"
clearable
- @click.native="choiceZRR('certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
+ @click.native="choiceZRR(null,'certifiedEngineer', '选择认证工程师', roleForm.certifiedEngineer)"
>
+
@@ -63,8 +64,8 @@
-
-
-
-
+
+
+
+ {{listForm.dataList[scope.$index].distributePerson==null?"请选择分发负责人":listForm.dataList[scope.$index].distributePerson}}
+
+
@@ -128,60 +131,12 @@
+ @click.native="choiceZRR(null,'dockUser', '选择业务经理', roleForm.dockUser)">
-
-
-
- 分发责任人
-
-
-
-
-
-
-
-
-
-
- 责任人
-
-
-
-
-
-
-
-
-
-
- 分发责任人
-
-
-
-
-
-
-
-
-
-
- 产品线责任人
-
-
-
-
-
-
-
-
@@ -189,7 +144,7 @@
+ @click.native="choiceZRR(null,'directorUser', '选择标准法规部领导', roleForm.directorUser)">
@@ -229,8 +184,11 @@
fixed="left"
label="标准号">
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+ {{ scope.row.standSortShow }} {{ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
+ {{ scope.row.standSortShow }}
+ {{ scope.row.standNumber }}
带入
-
+
{
+ this.showColumn = true
+ })
}
this.modalshowflag = false;
},
@@ -515,17 +490,17 @@ export default {
},
//取消添加事件
cancelStand() {
- this.standModel = false
+ this.standModel = false;
},
//确认添加事件
okStand() {
- if(this.standList.length >= 1){
- this.dataList = this.standList
- this.roleForm.directorUser = this.dataList[0].uname
- this.listForm.dataList = this.standList
- this.standModel = false
- }else{
- this.$message.warning('请选择一条数据进行添加')
+ if (this.standList.length >= 1) {
+ this.dataList = this.standList;
+ this.roleForm.directorUser = this.dataList[0].uname;
+ this.listForm.dataList = this.standList;
+ this.standModel = false;
+ } else {
+ this.$message.warning("请选择一条数据进行添加");
}
},
//保存事件
@@ -559,25 +534,27 @@ export default {
json.approvalOpinion = "";
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account;
+ json.prcCreateUser = this.$store.getters.userInfo.userId;
+ json.prcCreateUserName = this.$store.getters.userInfo.account;
json.standId = this.listForm.standId;
- this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post("lawss/activiti/completeTask", {
- taskIds: res.data,
- userId: this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- if (res.success) {
- this.$message.success(res.message);
- this.$router.push("/processCenter");
- }
- });
- }
- });
+ this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
+ _this: this
+ }, res => {
+ if (res.ok) {
+ this.$http.post("lawss/activiti/completeTask", {
+ taskIds: res.data,
+ userId: this.$store.getters.userInfo.userId,
+ json: JSON.stringify(json)
+ }, {
+ _this: this
+ }, res => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.$router.push("/processCenter");
+ }
+ });
+ }
+ });
},
//选择拆分标准取消事件
closeDrawer() {
@@ -586,25 +563,25 @@ export default {
//选择拆分标准确定事件
OkDrawer() {
- if(this.selectedList.length == 1){
- this.listForm.standNumber = this.selectedList[0].standNumber
- this.listForm.standName = this.selectedList[0].standName
- this.listForm.id = this.selectedList[0].id
- this.$http.get('SarStandItems/sar-stand-items/findAllItems',{
+ if (this.selectedList.length == 1) {
+ this.listForm.standNumber = this.selectedList[0].standNumber;
+ this.listForm.standName = this.selectedList[0].standName;
+ this.listForm.id = this.selectedList[0].id;
+ this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.listForm.id,
- type:'FBGBJBD',
+ type: "FBGBJBD"
}, {
- _this:this
+ _this: this
}, res => {
- this.listForm.breakdownList = res.data
- this.ListModel = false
+ this.listForm.breakdownList = res.data;
+ this.ListModel = false;
}, e => {
- this.$message.error('添加失败')
- })
- }else if(this.selectedList.length > 1){
- this.$message.warning('您只能选择一条数据进行带入')
- }else{
- this.$message.warning('请选择一条数据带入')
+ this.$message.error("添加失败");
+ });
+ } else if (this.selectedList.length > 1) {
+ this.$message.warning("您只能选择一条数据进行带入");
+ } else {
+ this.$message.warning("请选择一条数据带入");
}
},
//选择拆分标准选择框改变
@@ -622,7 +599,8 @@ export default {
selectThree(data) {
this.standList = data;
},
- choiceZRR(type, title, id) {
+ choiceZRR(scope,type, title, id) {
+ if(scope!=null)this.dsadadadsada=scope.$index;
this.nodeList = [];
this.nodeList.push(id);
this.type = type;
@@ -648,34 +626,35 @@ export default {
},
//获取产品线数据
getProductData() {
- this.$http.get('sarStandProjectLibrary/queryProjectManager',{
+ this.$http.get("sarStandProjectLibrary/queryProjectManager", {
current: this.pageNo,
- pageSize: this.pageSizeNo,
- },{
+ pageSize: this.pageSizeNo
+ }, {
_this: this
}, res => {
- this.productData = res.data.records
- this.totalNo = res.data.total
+ console.log(res.data.records);
+ this.productData = res.data.records;
+ this.totalNo = res.data.total;
}, e => {
- })
+ });
},
//获取标准数据
getStandData() {
- this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage','',{
+ this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
_this: this
}, res => {
- this. sarAccessListDatas = res.data.list
- this.total = res.pageCount
+ this.sarAccessListDatas = res.data.list;
+ this.total = res.pageCount;
}, e => {
- })
- },
+ });
+ }
},
computed: {},
mounted() {
this.getTree();
- this.getProductData()
- this.getStandData()
+ this.getProductData();
+ this.getStandData();
}
};
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 05d9c289e..5802df6c1 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -88,13 +88,8 @@
label="产品线责任人">
-
-
-
-
-
@@ -234,22 +229,44 @@ export default {
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
- listType: "", //区分是哪个清单
- listName: "", //清单名称
- applyRegion: "", //适用区域
- descriptionList: "", //清单说明
- enclosure: "", //附件
- inforlist: "",//用来存放标准的id
+ passFlag: "1", //1为审批通过 2 为驳回
+ standNumber: "", //标准编号
+ standName: "",//标准名称
+ certifiedEngineer: "", //认证工程师
+ qualityEngineer: "", //质量工程师
+ breakdownList: [{
+ applyArctic: "",
+ busStandCover: "",
+ claimType: "",
+ id: "",
+ itemsName: "",
+ itemsNum: "",
+ responsibleUnit: "",
+ standId: "",
+ svpps: ""
+ }],
dataList: [{
- standNumber: "", //标准号
- cnName: "", //中文名称
- enName: "", //英文名称
- isSubTime: "", //发布日期
- newCarTime: "", //新车型实施日期
- oldCarTime: "", //在产车实施日期
- applyCar: "", //适用车型
- textState: "", //文本状态
- id: ""
+ projectLine: "", //产品线
+ uname: "",//产品线责任人
+ projectManager:"",// 产品线责任人id
+ distributePerson: "", //分发责任人
+ distributePersonId: "", //分发责任人id
+ id: "",
+ sarStandProjectLibraries: [{
+ projectManager: '',
+ projectLevel: '',
+ projectNumber: '',
+ projectEndDate: '',
+ currentNode: '',
+ projectGroup: '',
+ productLine: '',
+ projectClassification: '',
+ projectStatus: '',
+ projectStartDate: '',
+ id: '',
+ projectName: '',
+ projectPlatfor: ''
+ }]
}]
},
choiceForm: {}, //选择标准清单列表
@@ -304,13 +321,14 @@ export default {
this.listForm['id'] = item.id
this.listForm.dataList = item.dataList
this.dataList = item.dataList
+ this.dataList.distributePerson = item.dataList[0].distributePerson
})
},
//驳回事件
beforeBack () {
- this.listForm.approvalOpinion = '1'
+ this.listForm.passFlag = '2'
this.handleSubmit()
},
//提交事件
@@ -320,8 +338,8 @@ export default {
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
- this.listForm.approvalOpinion = "";
this.listForm.standId = this.listForm.standId;
+ this.listForm.passFlag = '1';
this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
@@ -366,7 +384,6 @@ export default {
mounted() {
this.processTable()
this.getData()
- // console.log(this.$store.getters.getHandleInfo);
}
};
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 0acb94e5c..1f5b0c1a7 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -58,14 +58,15 @@