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
2021-12-13 15:15:26 +08:00
parent ef015e9efe f76ea7f534
commit 940116effd
57 changed files with 1066 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+2 -2
View File
@@ -564,12 +564,12 @@ export default {
this.newDataList = this.fileTextList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
}
this.fileListData.fileText = this.newDataList
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+2 -2
View File
@@ -535,12 +535,12 @@ export default {
this.newDataList = this.fillFileList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
}
this.rh_pageData.fillFile = this.newDataList
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue
+1 -1
View File
@@ -460,7 +460,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
height: calc(~'100% - 100px');
overflow: auto;
.tableTitle {
src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue
+6 -6
View File
@@ -375,12 +375,12 @@ export default {
this.newDataList = this.reData
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
}
@@ -449,12 +449,12 @@ export default {
this.newThemeFile = this.themeData
this.newThemeFile.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
}
this.themeDataList.meetingFile = this.newThemeFile
@@ -510,12 +510,12 @@ export default {
this.newOtherFile = this.hh_pageData.otherFileList
this.newOtherFile.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
} else {
this.newOtherFile.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
}
this.hh_pageData.otherFileList = this.newOtherFile
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+2 -2
View File
@@ -487,12 +487,12 @@ export default {
this.newDataList = this.ch_pageData.fileTextList
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.standName
name: res.data.name
})
}
this.ch_pageData.fileTextList = this.newDataList
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+20 -28
View File
@@ -391,20 +391,16 @@
maxlength="500"
></el-input>
</el-form-item>
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
<custom-date-pick-group
class="myDataPick"
:config="plForm"
v-model="plForm.newData"
></custom-date-pick-group>
</el-form-item>
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
<custom-date-pick-group
class="myDataPick"
:config="plForm"
v-model="plForm.onlineData"
></custom-date-pick-group>
</el-form-item>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '新车型实施日期'}"
v-model="plForm.newData"
></custom-date-pick-group>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '在产车实施日期'}"
v-model="plForm.onlineData"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select multiple v-model="plForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
@@ -460,20 +456,16 @@
maxlength="500"
></el-input>
</el-form-item>
<el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
<custom-date-pick-group
class="myDataPick"
:config="editForm"
v-model="editForm.newData"
></custom-date-pick-group>
</el-form-item>
<el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
<custom-date-pick-group
class="myDataPick"
:config="editForm"
v-model="editForm.onlineData"
></custom-date-pick-group>
</el-form-item>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '新车型实施日期'}"
v-model="editForm.newData"
></custom-date-pick-group>
<custom-date-pick-group
class="myDataPick"
:config="{attrName: '在产车实施日期'}"
v-model="editForm.onlineData"
></custom-date-pick-group>
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
<el-select multiple v-model="editForm.applyArctic">
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+10 -5
View File
@@ -593,7 +593,7 @@
style="width: 100%"
border
ref="table"
height="100%"
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
@@ -796,7 +796,7 @@ export default {
ListModel: false, //选择清单抽屉状态
standModel: false, // 选择标准抽屉状态
active: "1",
signFlag: "1", //是否会签 1为会签 2为不会签
signFlag: "", //是否会签 1为会签 2为不会签
listType: "country", //选择的清单类型
isSubmit: false,
saveLoading: false,
@@ -818,7 +818,7 @@ export default {
model: "", // 上传模板
modelName: "",
standId: "", //选择的清单的id
signFlag: "1", //是否会签 1为会签 2为不会签
signFlag: "", //是否会签 1为会签 2为不会签
inforlist: " ", //用来存放标准列表的标准id
dataList: [{
code: "", //标准号
@@ -865,6 +865,7 @@ export default {
this.fileInfoList.push(itemId)
this.getFileInfo();
});
this.signFlag = mes.form.signFlag
this.listForm = mes.form;
this.dataList = mes.form.dataList;
this.roleForm = mes.roleForm;
@@ -938,9 +939,9 @@ export default {
//判断当前是否会签
selectSign(type) {
if (type === "1") {
this.listForm.signFlag = 1;
this.listForm.signFlag = '1';
} else if (type == "2") {
this.listForm.signFlag = 2;
this.listForm.signFlag = '2';
}
},
queryDetailsData() {
@@ -1595,5 +1596,9 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+5 -23
View File
@@ -101,25 +101,19 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -181,7 +175,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -319,18 +312,12 @@
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -527,13 +514,8 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
if(item.attrInfoMap === null){
this.$set(item, "ZCCSSRQ", '');
this.$set(item, "XCXSSRQ", '');
}else{
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
this.$set(item, "ZCCSSRQ", item.zccssrq);
this.$set(item, "XCXSSRQ", item.xcxssrq);
})
this.totalNo = res.data.count;
}, e => {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+3 -10
View File
@@ -97,25 +97,19 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -177,7 +171,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+7 -3
View File
@@ -563,7 +563,7 @@
style="width: 100%"
border
ref="table"
height="90%"
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
@@ -870,9 +870,9 @@ export default {
//判断当前是否会签
selectSign(type) {
if (type === "1") {
this.listForm.signFlag = 1;
this.listForm.signFlag = '1';
} else if (type == "2") {
this.listForm.signFlag = 2;
this.listForm.signFlag = '2';
}
},
queryDetailsData() {
@@ -1528,5 +1528,9 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+3 -10
View File
@@ -97,25 +97,19 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -177,7 +171,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+10 -24
View File
@@ -116,25 +116,19 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -196,7 +190,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -293,7 +286,7 @@
style="width: 100%"
border
ref="table"
height="100%"
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
@@ -338,18 +331,12 @@
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -595,13 +582,8 @@ export default {
this.standardData = res.data.list;
this.loading = false
this.standardData.forEach(item => {
if(item.attrInfoMap === null){
this.$set(item, "ZCCSSRQ", '');
this.$set(item, "XCXSSRQ", '');
}else{
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
this.$set(item, "ZCCSSRQ", item.zccssrq);
this.$set(item, "XCXSSRQ", item.xcxssrq);
})
this.totalNo = res.data.count;
}, e => {
@@ -994,6 +976,10 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+3 -10
View File
@@ -98,25 +98,19 @@
</el-table-column>
<el-table-column
prop="issueTime"
sortable
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -178,7 +172,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+8 -2
View File
@@ -188,11 +188,17 @@
prop="planStatus"
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="reviseStatus"
align="center"
label="制修订状态">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="drafterName"
@@ -354,10 +360,10 @@ export default {
this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus
this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+8 -2
View File
@@ -204,11 +204,17 @@
prop="planStatus"
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="reviseStatus"
align="center"
label="制修订状态">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="drafterName"
@@ -376,10 +382,10 @@ export default {
this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus
this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+12 -6
View File
@@ -23,7 +23,7 @@
<el-form-item label="计划状态" prop="planStatus1" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.planStatus1" placeholder="请输入计划状态" clearable></el-input>
</el-form-item>
<el-form-item v-show="standShow" label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
<el-form-item label="制修订状态" prop="reviseStatus1" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.reviseStatus1" placeholder="请输入制修订状态" clearable></el-input>
</el-form-item>
</el-col>
@@ -37,7 +37,7 @@
<el-form-item label="计划状态" prop="planStatus2" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.planStatus2" placeholder="请输入计划状态" clearable></el-input>
</el-form-item>
<el-form-item v-show="standShow2" label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
<el-form-item label="制修订状态" prop="reviseStatus2" class="add-form-item form-item-disabled">
<el-input readonly v-model="qbfsForm.reviseStatus2" placeholder="请输入制修订状态" clearable></el-input>
</el-form-item>
</el-col>
@@ -216,11 +216,17 @@
prop="planStatus"
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="reviseStatus"
align="center"
label="制修订状态">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="drafterName"
@@ -548,8 +554,8 @@ export default {
if(this.showType === 'one'){
this.qbfsForm.esId1 = this.selectList[0].id || '--'
this.qbfsForm.esName1 = this.selectList[0].esName || '--'
this.qbfsForm.planStatus1 = this.selectList[0].planStatus || '--'
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus || '--'
this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.standShow = true
}else{
if(this.qbfsForm.esName1 === this.selectList[0].esName ){
@@ -557,8 +563,8 @@ export default {
}else{
this.qbfsForm.esId2 = this.selectList[0].id || '--'
this.qbfsForm.esName2 = this.selectList[0].esName || '--'
this.qbfsForm.planStatus2 = this.selectList[0].planStatus || '--'
this.qbfsForm.reviseStatus2= this.selectList[0].reviseStatus || '--'
this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.standShow2 = true
}
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+8 -2
View File
@@ -195,11 +195,17 @@
prop="planStatus"
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="reviseStatus"
align="center"
label="制修订状态">
<template slot-scope="scope">
<div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
</template>
</el-table-column>
<el-table-column
prop="drafterName"
@@ -364,10 +370,10 @@ export default {
this.qbfsForm.esName = this.selectList[0].esName
this.qbfsForm.draftTime = this.selectList[0].draftTime
this.qbfsForm.drafterName = this.selectList[0].drafterName
this.qbfsForm.planStatus = this.selectList[0].planStatus
this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+6
View File
@@ -92,6 +92,7 @@
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.mergeReason"
placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqDraftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqReleaseTime"
type="date"
value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.delayReason"
placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
</el-form-item>
<el-form-item v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.cancelReason"
placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
</el-form-item>
<el-form-item v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.renameReason"
placeholder="请输入更名原因"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+7 -1
View File
@@ -92,6 +92,7 @@
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.mergeReason"
placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqDraftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqReleaseTime"
type="date"
value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.delayReason"
placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
</el-form-item>
<el-form-item v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.cancelReason"
placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
</el-form-item>
<el-form-item v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.renameReason"
placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+66 -62
View File
@@ -92,6 +92,7 @@
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.mergeReason"
placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqDraftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqReleaseTime"
type="date"
value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.delayReason"
placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
</el-form-item>
<el-form-item v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.cancelReason"
placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
</el-form-item>
<el-form-item v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.renameReason"
placeholder="请输入更名原因"
@@ -163,70 +169,68 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
show-back
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+7 -1
View File
@@ -92,6 +92,7 @@
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.mergeReason"
placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqDraftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqReleaseTime"
type="date"
value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.delayReason"
placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
</el-form-item>
<el-form-item v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.cancelReason"
placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
</el-form-item>
<el-form-item v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.renameReason"
placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+7 -1
View File
@@ -92,6 +92,7 @@
</el-form-item>
<el-form-item v-if="type === '1'" label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.mergeReason"
placeholder="请输入合并原因"
@@ -100,6 +101,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后初稿完成时间" prop="yqDraftTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqDraftTime"
type="date"
value-format="yyyy-MM-dd"
@@ -108,6 +110,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
v-model="qbfsForm.yqReleaseTime"
type="date"
value-format="yyyy-MM-dd"
@@ -116,6 +119,7 @@
</el-form-item>
<el-form-item v-if="type === '2'" label="延期原因" prop="delayReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.delayReason"
placeholder="请输入延期原因"
@@ -124,6 +128,7 @@
</el-form-item>
<el-form-item v-if="type === '3'" label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.cancelReason"
placeholder="请输入取消原因"
@@ -132,6 +137,7 @@
</el-form-item>
<el-form-item v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
<el-input
disabled
type="textarea"
v-model="qbfsForm.renameReason"
placeholder="请输入更名原因"
@@ -163,7 +169,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+1
View File
@@ -365,6 +365,7 @@ export default {
this.rowDutyPeople = val
this.nodeList = []
this.nodeList.push(id)
this.drawerTitle = '选择分发责任人'
this.modalshowflag = true
},
// 选择勾选项的集合
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+1 -47
View File
@@ -6,6 +6,7 @@
<template slot="proNode">标准法规部领导审批</template>
</ProcessHeader>
<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>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
@@ -198,23 +199,13 @@
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
@@ -248,43 +239,6 @@
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+43 -28
View File
@@ -142,12 +142,12 @@
</div>
<el-table
ref="multipleTable"
:data="listForm.breakdownList"
tooltip-effect="dark"
style="width: 100%"
:data="listForm.breakdownList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="48%"
border
highlight-current-row
@selection-change="selectStandChange"
:height="sarProStateTableHeight"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
@@ -158,53 +158,56 @@
<el-table-column
prop="productLine"
align="center"
width="150"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="160px"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
min-width="300"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="100px"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
align="center"
width="160px"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="160px"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
align="center"
width="160px"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrq"
align="center"
width="120px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrq"
align="center"
width="120px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
label="落实人"
@@ -217,7 +220,14 @@
</template>
</el-table-column>
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
background
:page-sizes="[20, 40, 60]"
:total="total"
@current-change="handleCurrentChange"
>
</el-pagination>
<!-- 选择责任人-->
<Role-tree
is-title="选择落实人"
@@ -336,6 +346,7 @@ export default {
return {
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
currentPage: 1,
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
@@ -366,6 +377,7 @@ export default {
tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
selectStandList: [], //点开批量弹窗选择数据丢失
lsIndex: "",
lsType: "",
bringData: [],
@@ -504,6 +516,10 @@ export default {
});
window.open(routeUrl.href, "_blank");
},
// 分页
handleCurrentChange(currentPage) {
this.currentPage = currentPage;
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -532,11 +548,11 @@ export default {
this.listForm.breakdownList = [];
for (let i = 0; i < item.pepdtos.length; i++) {
for (let j = 0; j < item.pepdtos[i].breakdownList.length; j++) {
if (item.pepdtos[i].xCXSSRQ === null) {
item.pepdtos[i].xCXSSRQ = "";
if (item.pepdtos[i].xcxssrq === null) {
item.pepdtos[i].xcxssrq = "";
}
if (item.pepdtos[i].zCCSSRQ === null) {
item.pepdtos[i].zCCSSRQ = "";
if (item.pepdtos[i].zccssrq === null) {
item.pepdtos[i].zccssrq = "";
}
this.listForm.breakdownList.push({
itemsName: item.pepdtos[i].breakdownList[j].itemsName,
@@ -558,9 +574,10 @@ export default {
standNumber: item.pepdtos[i].standNumber,
standName: item.pepdtos[i].standName,
id: item.pepdtos[0].id,
xCXSSRQ: item.pepdtos[i].XCXSSRQ,
zCCSSRQ: item.pepdtos[i].ZCCSSRQ
xcxssrq: item.pepdtos[i].XCXSSRQ,
zccssrq: item.pepdtos[i].ZCCSSRQ
});
this.total = this.listForm.breakdownList.length
}
}
} else {
@@ -585,7 +602,7 @@ export default {
this.listForm.breakdownList[this.lsIndex].implementer = nameList;
} else if (this.type === 2) {
this.listForm.breakdownList.forEach(item => {
this.selectList.forEach(items => {
this.selectStandList.forEach(items => {
if (item === items) {
item.implementerId = idList;
item.implementer = nameList;
@@ -600,6 +617,7 @@ export default {
this.modalshowflag = false;
},
choiceZRRS(row, type, index) {
this.selectStandList = this.selectList
this.type = type;
if (type === 1) {
this.drawerTitle = "选择责任人";
@@ -659,14 +677,13 @@ export default {
},
//提交事件
handleSubmit() {
let standList = []
this.listForm.breakdownList.forEach(item => {
if (item.implementer === null || item.implementer === "" || item.implementer === undefined) {
this.sarFlag = false;
} else {
this.sarFlag = true;
if (item.implementer) {
standList.push(item)
}
});
if (this.sarFlag === true) {
this.listForm.breakdownList = standList
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -690,9 +707,6 @@ export default {
this.isSubmit = false;
}, e => {
});
} else {
this.$message.warning("请选择落实人");
}
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
@@ -705,6 +719,7 @@ export default {
},
//标准表格选择框改变
selectStandChange(data) {
console.log(data);
this.selectList = data;
},
selectThree() {
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
-6
View File
@@ -203,18 +203,12 @@
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="researchCompliance"
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
-47
View File
@@ -198,23 +198,13 @@
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
<!-- align="center"-->
<!-- label="在研产品">-->
<el-table-column
prop="complianceReasons"
align="center"
@@ -248,43 +238,6 @@
</template>
</el-table-column>
</el-table-column>
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- label="在产产品">-->
<!-- <el-table-column-->
<!-- prop="zcComplianceReasons"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="合规(具体情况)">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="不合规">-->
<!-- <el-table-column-->
<!-- prop="zcNoCompliance"-->
<!-- align="center"-->
<!-- width="170"-->
<!-- label="不合规项目">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zcCountermeasures"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="应对措施">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zcCompletionTime"-->
<!-- align="center"-->
<!-- width="120"-->
<!-- label="完成时间">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
fixed="right"
align="center"
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
-47
View File
@@ -198,23 +198,13 @@
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
<!-- align="center"-->
<!-- label="在研产品">-->
<el-table-column
prop="complianceReasons"
align="center"
@@ -248,43 +238,6 @@
</template>
</el-table-column>
</el-table-column>
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- label="在产产品">-->
<!-- <el-table-column-->
<!-- prop="zcComplianceReasons"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="合规(具体情况)">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="不合规">-->
<!-- <el-table-column-->
<!-- prop="zcNoCompliance"-->
<!-- align="center"-->
<!-- width="170"-->
<!-- label="不合规项目">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zcCountermeasures"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="应对措施">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zcCompletionTime"-->
<!-- align="center"-->
<!-- width="120"-->
<!-- label="完成时间">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
fixed="right"
align="center"
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
-47
View File
@@ -198,23 +198,13 @@
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
<!-- align="center"-->
<!-- label="在研产品">-->
<el-table-column
prop="complianceReasons"
align="center"
@@ -248,43 +238,6 @@
</template>
</el-table-column>
</el-table-column>
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- label="在产产品">-->
<!-- <el-table-column-->
<!-- prop="zcComplianceReasons"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="合规(具体情况)">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="不合规">-->
<!-- <el-table-column-->
<!-- prop="zcNoCompliance"-->
<!-- align="center"-->
<!-- width="170"-->
<!-- label="不合规项目">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zcCountermeasures"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="应对措施">-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="zcCompletionTime"-->
<!-- align="center"-->
<!-- width="120"-->
<!-- label="完成时间">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<el-table-column
fixed="right"
align="center"
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+41 -42
View File
@@ -116,7 +116,6 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
</el-table-column>
<el-table-column
@@ -128,7 +127,6 @@
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
</el-table-column>
@@ -600,47 +598,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
}else{
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.userName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_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.isSubmit = false;
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.userName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_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.isSubmit = false;
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
choiceZRR(type, title, id) {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+8 -9
View File
@@ -93,22 +93,22 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrqgj"
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="complianceReasons"
@@ -208,7 +208,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step1-2.vue
-3
View File
@@ -86,7 +86,6 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
@@ -104,7 +103,6 @@
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
@@ -169,7 +167,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+41 -42
View File
@@ -126,7 +126,6 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
</el-table-column>
<el-table-column
@@ -138,7 +137,6 @@
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
</el-table-column>
@@ -617,47 +615,48 @@ export default {
})
if(!fileFlag){
this.$message.warning('请选择分解单来源')
}else{
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.userName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_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.isSubmit = false;
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
if (this.listForm.dataList.length < 1) {
this.$message.warning("请选择带标准的项目");
} else {
this.listForm.commentText = this.commentText;
var json = Object.assign(this.listForm, this.roleForm);
json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.userName;
json.standId = this.listForm.standId;
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
this.$http.get("lawss/activiti/startProcess", { type: "6" }, {
_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.isSubmit = false;
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
// 点击查看
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+10 -10
View File
@@ -45,7 +45,6 @@
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@@ -95,23 +94,23 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
@@ -477,9 +476,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+11 -12
View File
@@ -45,7 +45,6 @@
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@@ -95,23 +94,23 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrqgj"
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
@@ -456,7 +455,6 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg);
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
@@ -476,9 +474,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -486,6 +482,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+10 -10
View File
@@ -45,7 +45,6 @@
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@@ -95,23 +94,23 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
@@ -477,9 +476,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
-12
View File
@@ -86,30 +86,19 @@
prop="ssrq"
width="190px"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
width="190px"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
align="center"
sortable
width="190px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zrbm"
@@ -169,7 +158,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step3.vue
+12 -5
View File
@@ -98,11 +98,19 @@
<el-table-column
prop="ssrq"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
width="190px"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
align="center"
width="190px"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="zrbm"
@@ -161,7 +169,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+12 -6
View File
@@ -96,11 +96,19 @@
<el-table-column
prop="ssrq"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
width="190px"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
align="center"
width="190px"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="zrbm"
@@ -169,7 +177,6 @@
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
@@ -448,7 +455,6 @@ export default {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+11 -122
View File
@@ -52,7 +52,6 @@
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@@ -104,28 +103,24 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrqgj"
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
<!-- align="center"-->
<!-- label="在研产品">-->
<el-table-column
prop="researchCompliance"
align="center"
@@ -225,115 +220,6 @@
</template>
</el-table-column>
</el-table-column>
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- label="在产产品">-->
<!-- <el-table-column-->
<!-- prop="productionCompliance"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="合规(具体情况)">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="scope.row.zcNoCompliance && scope.row.zcNoCompliance.length>0-->
<!-- || scope.row.zcCountermeasures && scope.row.zcCountermeasures>0-->
<!-- || scope.row.zcCompletionTime && scope.row.zcCompletionTime !== null"-->
<!-- disabled-->
<!-- v-model="scope.row.zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="scope.row.zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="不合规">-->
<!-- <el-table-column-->
<!-- prop="productionNonCompliance"-->
<!-- align="center"-->
<!-- width="170"-->
<!-- label="不合规项目">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="scope.row.zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="scope.row.zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="productionCountermeasures"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="应对措施">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="scope.row.zcCountermeasures"-->
<!-- placeholder="请输入应对措施"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="scope.row.zcCountermeasures"-->
<!-- placeholder="请输入应对措施"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="productionCompletionTime"-->
<!-- align="center"-->
<!-- width="140"-->
<!-- label="完成时间">-->
<!-- <template slot-scope="scope">-->
<!-- <el-date-picker-->
<!-- v-if="scope.row.zcComplianceReasons && scope.row.zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="scope.row.zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="请选择日期">-->
<!-- </el-date-picker>-->
<!-- <el-date-picker-->
<!-- v-else-->
<!-- class="datePickLen"-->
<!-- clearable-->
<!-- v-model="scope.row.zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="请选择日期">-->
<!-- </el-date-picker>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- 以后全选可能用-->
<!-- <el-table-column-->
<!-- prop="productionCompletionTime"-->
<!-- align="center"-->
<!-- fixed="right"-->
<!-- width="160"-->
<!-- label="操作">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button style="width: 98%" size="small" type="primary" @click="">{{ "批量编辑" }}</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<el-pagination
layout="total,sizes, prev, pager, next"
@@ -804,7 +690,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
if(item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
@@ -814,6 +700,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+10 -10
View File
@@ -45,7 +45,6 @@
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@@ -95,23 +94,23 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="complianceReasons"
@@ -436,9 +435,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -446,6 +443,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+10 -10
View File
@@ -45,7 +45,6 @@
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@@ -95,23 +94,23 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
@@ -475,9 +474,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -485,6 +482,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+10 -10
View File
@@ -45,7 +45,6 @@
<el-table
:data="dataList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
style="width: 100%; border: 1px solid #cccccc;height: 400px"
row-key="standId"
height="70%"
border
highlight-current-row
@@ -95,23 +94,23 @@
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="ssrq"
width="200"
align="center"
label="实施日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
@@ -477,9 +476,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -487,6 +484,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})