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:
zhutianqi
2021-08-18 16:49:03 +08:00
parent ea6b9a83eb 131b49f3cc
commit b3980d49e4
28 changed files with 377 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+74 -31
View File
@@ -108,7 +108,8 @@
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
@@ -301,6 +302,8 @@
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
>
@@ -321,7 +324,8 @@
>
<template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a>
scope.row.detailedListName
}}</a>
</template>
</el-table-column>
<el-table-column
@@ -340,7 +344,8 @@
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span>
</template>
</el-table-column>
@@ -368,6 +373,8 @@
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
>
@@ -388,7 +395,8 @@
>
<template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a>
scope.row.detailedListName
}}</a>
</template>
</el-table-column>
<el-table-column
@@ -407,7 +415,8 @@
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span>
</template>
</el-table-column>
@@ -417,7 +426,8 @@
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
scope.row.applicationScope
}}</span>
</template>
</el-table-column>
@@ -428,7 +438,8 @@
align="center">
<template slot-scope="scope">
<div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
{{
scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
}}
</div>
</template>
@@ -448,6 +459,8 @@
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
>
@@ -468,7 +481,8 @@
>
<template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a>
scope.row.detailedListName
}}</a>
</template>
</el-table-column>
<el-table-column
@@ -487,7 +501,8 @@
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span>
</template>
</el-table-column>
@@ -497,7 +512,8 @@
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{
scope.row.applicationScope
}}</span>
</template>
</el-table-column>
@@ -508,7 +524,8 @@
align="center">
<template slot-scope="scope">
<div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
{{
scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
}}
</div>
</template>
@@ -616,7 +633,8 @@
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
@@ -728,7 +746,7 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst, queryTaskFirst } from "api/process";
import {saveTaskFirst, queryTaskFirst} from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default {
@@ -778,21 +796,21 @@ export default {
},
formRules: {
listType: [
{ required: true, message: "请选择清单类型", trigger: "change" }
{required: true, message: "请选择清单类型", trigger: "change"}
],
listName: [
{ required: true, message: "请填写清单名称", trigger: "change" }
{required: true, message: "请填写清单名称", trigger: "change"}
]
},
roleFormRules: {
dockUserName: [
{ required: true, message: "请选择会签责任人", trigger: "change" }
{required: true, message: "请选择会签责任人", trigger: "change"}
],
ministerUserName: [
{ required: true, message: "请选择修订责任人", trigger: "change" }
{required: true, message: "请选择修订责任人", trigger: "change"}
],
directorUserName: [
{ required: true, message: "请选择审批责任人", trigger: "change" }
{required: true, message: "请选择审批责任人", trigger: "change"}
]
},
dataList: [],//清单里的标准数据
@@ -947,14 +965,14 @@ export default {
_this: this
}, res => {
this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas.forEach(item =>{
this.sarAccessListDatas.forEach(item => {
// 适用车型转换
if (item.carType !== null) {
let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
k[m] = this.energyKindOptions[i].label
}
item.carType = k.join(',')
}
@@ -1097,7 +1115,7 @@ export default {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
_this: this
}, res => {
if (res.ok) {
@@ -1129,8 +1147,8 @@ export default {
// 删除上传的文件
delFileInfo(file, fileList) {
this.fileInfoList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id ) {
this.fileInfoList.splice(index,1)
if (item.name === file.name || item.id === file.id) {
this.fileInfoList.splice(index, 1)
}
})
},
@@ -1276,7 +1294,7 @@ export default {
this.listForm.listName = this.selectedList[0].detailedListName;
this.listForm.descriptionList = this.selectedList[0].remark;
// 将查询出的文件名字和id组合成数组
if(this.selectedList[0].fileName !== null) {
if (this.selectedList[0].fileName !== null) {
let textName = this.selectedList[0].fileName.split(',').map(item => {
return {
name: item
@@ -1290,7 +1308,7 @@ export default {
textName.forEach(item => {
this.$set(item, 'id', '')
})
for (let i = 0; i< textName.length; i++) {
for (let i = 0; i < textName.length; i++) {
textName[i].id = textId[i].id
}
this.fileInfoList = textName
@@ -1300,7 +1318,7 @@ export default {
this.ListModel = false;
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
{ id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
{id: this.selectedList[0].id, page: this.page, Size: this.pageSize}, {
_this: this
}, res => {
if (res.data === null) {
@@ -1308,10 +1326,10 @@ export default {
}
this.dataList = res.data.records;
this.dataList.forEach(item => {
if (item.xcxssrqgj === null){
if (item.xcxssrqgj === null) {
this.$set(item, "XCXSSRQ", '');
this.$set(item, "ZCCSSRQ", '');
}else{
} else {
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
}
@@ -1324,8 +1342,6 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
} else {
this.$message.warning("请选择一条数据进行带入");
}
@@ -1337,6 +1353,33 @@ export default {
this.selectedList.push(data[0]);
}
},
// 表格某一行的单击事件
rowClick(row, column) {
const selectData = this.selectList
this.$refs.selection.clearSelection()
if (selectData.length === 1) {
selectData.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item === row) {
this.$refs.selection.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.selection.toggleRowSelection(row, true);
}
})
} else {
this.$refs.selection.toggleRowSelection(row, true);
}
},
select(selection, row) {
// 清除 所有勾选项
this.$refs.selection.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if (selection.length === 0) return
this.$refs.selection.toggleRowSelection(row, true)
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = [];
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+34 -2
View File
@@ -302,6 +302,8 @@
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
>
@@ -371,6 +373,8 @@
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
>
@@ -440,6 +444,8 @@
height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@row-click="rowClick"
@select="select"
@selection-change="selectListChange"
ref="selection"
>
@@ -1301,8 +1307,6 @@ export default {
this.listForm.inforlist = formId.join(",");
}, e => {
});
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
} else {
this.$message.warning("请选择一条数据进行带入");
}
@@ -1321,10 +1325,38 @@ export default {
this.selectList.push(data[i].id);
}
},
select(selection, row) {
// 清除 所有勾选项
this.$refs.selection.clearSelection()
// 当表格数据都没有被勾选的时候 就返回
// 主要用于将当前勾选的表格状态清除
if(selection.length === 0) return
this.$refs.selection.toggleRowSelection(row, true)
},
//添加标准select的改变
selectThree(data) {
this.standList = data;
},
// 表格某一行的单击事件
rowClick(row, column) {
const selectData = this.selectList
this.$refs.selection.clearSelection()
if( selectData.length === 1 ) {
selectData.forEach(item => {
// 判断 如果当前的一行被勾选, 再次点击的时候就会取消选中
if (item === row) {
this.$refs.selection.toggleRowSelection(row, false);
}
// 不然就让当前的一行勾选
else {
this.$refs.selection.toggleRowSelection(row, true);
}
})
}
else {
this.$refs.selection.toggleRowSelection(row, true);
}
},
choiceZRR(type, title, id) {
this.nodeList = [];
this.nodeList.push(id);
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+39 -3
View File
@@ -80,15 +80,29 @@
<el-col :span="12">
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
<!-- <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">-->
<!-- <el-option-->
<!-- v-for="item in countryOptions"-->
<!-- placeholder="请选择"-->
<!-- :key="item.value"-->
<!-- :value="item.value"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData=='1'"label="国家/地区" prop="" label-width="150px" class="add-form-item">
<el-select v-model="form.country" multiple filterable clearable>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
>
</el-option>
</el-select>
</el-form-item>
@@ -892,6 +906,7 @@
</el-collapse-item>
</el-collapse>
</div>
<!-- 保存||提交-->
<ProcessFooter
v-show="verifySarStandard"
show-save
@@ -1354,6 +1369,7 @@
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
fileType: '',
countryArr:'',
form: {
// 基础信息
textStatus: '', // 文本状态
@@ -1509,6 +1525,20 @@
}
},
watch:{
'form.country': {
handler (val) {
console.log("val")
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.countryArr = val.join(",");
} else {
this.countryArr = val
}
} else if (val === '') {
this.countryArr = []
}
}
},
filterText(val) {
this.$refs.tree.filter(val);
},
@@ -2252,6 +2282,11 @@
},
//保存
handleSave() {
this.form.country=this.countryArr;
// if(item.country !== undefined && item.country !== null){
// this.sarStandardsInfoEO.country = item.country.split(",");
// }
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
@@ -2280,6 +2315,7 @@
})
},
handleSubmit() {
this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.$refs['userForm'].validate((valid) => {
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+15 -1
View File
@@ -33,7 +33,7 @@
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
@@ -680,6 +680,7 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 提交-->
<ProcessFooter
:show-save="false"
show-submit
@@ -1006,6 +1007,9 @@
this.defaultCheckedKeys3 = [this.form.dybxh]
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){
this.form.country=this.form.country.split(",");
}
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = item.id
@@ -1030,6 +1034,16 @@
},
handleSave() {},
handleSubmit() {
const val= this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.form.country = val.join(",");
} else {
this.form.country = val
}
} else if (val === '') {
this.form.country = []
}
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+7 -1
View File
@@ -33,7 +33,7 @@
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" disabled>
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
@@ -956,6 +956,8 @@ export default {
getFormFieldList (item) {
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
console.log("this.form");
console.log(this.form);
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -964,6 +966,10 @@ export default {
this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
if( this.form.country !== undefined && this.form.country !== null && this.form.country !== ''){
this.form.country=this.form.country.split(",");
}
this.form['id'] = item.id
this.$forceUpdate()
})
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+19 -1
View File
@@ -32,7 +32,7 @@
</el-radio-group>
</el-form-item>
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple>
<el-option
v-for="item in countryOptions"
placeholder="请选择"
@@ -912,6 +912,7 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 提交-->
<ProcessFooter
show-save
show-submit
@@ -1060,6 +1061,7 @@ export default {
},
data () {
return {
countryArr:'',
activeName:'1',
// 当前流程类型(1待办/2已办)
processType: 1,
@@ -1693,6 +1695,7 @@ export default {
this.active = name
},
handleSave() {
this.form.country=this.countryArr;
this.saveLoading = true
let _formData = new FormData()
// _formData.append('id', this.bpnId)
@@ -1714,6 +1717,7 @@ export default {
})
},
handleSubmit() {
this.form.country=this.countryArr;
this.$refs['form'].validate((valid) => {
if (valid) {
this.isSubmit = true
@@ -1795,6 +1799,20 @@ export default {
this.modelFunc()
},
watch:{
'form.country': {
handler (val) {
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val instanceof Array) {
this.countryArr = val.join(",");
} else {
this.countryArr = val
}
} else if (val === '') {
this.countryArr = []
}
}
},
form(val){
if(this.form){
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+4 -4
View File
@@ -31,7 +31,7 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -148,7 +148,7 @@
<el-form :modal="queryUnqualidiedData" inline class="label-input-form">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
v-model="queryUnqualidiedData.standId"
v-model="queryUnqualidiedData.standSerialNumber"
placeholder="请输入"
clearable
:maxlength="100"></el-input>
@@ -210,9 +210,9 @@
@selection-change="selectedChange"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+6 -4
View File
@@ -97,9 +97,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
@@ -248,6 +248,7 @@ export default {
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
nonSearch: {
standSerialNumber: '',
standId: '', // 标准号/名称
productName: '', // 项目名称
responsibleUnit: '' // 责任部门
@@ -457,7 +458,7 @@ export default {
this.modalshowflag = false
},
//查询按钮
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
/*getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => {
let matchId = true; // 标准号 筛选
let matchName = true; // 项目名称 筛选
@@ -479,7 +480,7 @@ export default {
return matchId && matchName && matchUnit;
})
this.dataList = this.realList
},
},*/
// 点击查看
handlePreview (item) {
let routeUrl = this.$router.resolve({
@@ -496,6 +497,7 @@ export default {
clearAllSearch () {
this.nonSearch = {
standId: '',
standSerialNumber: '',
productName: '',
responsibleUnit: ''
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+2 -2
View File
@@ -99,9 +99,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" show-overflow-tooltip label="标准号" align="center">
<el-table-column prop="standSerialNumber" show-overflow-tooltip label="标准号" align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+2 -2
View File
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+2 -2
View File
@@ -87,9 +87,9 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standId" align="center" show-overflow-tooltip label="标准号">
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standId }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+1
View File
@@ -480,6 +480,7 @@ export default {
this.projectId = this.selectedList[0].id;
this.listForm.projectNumber = this.selectedList[0].projectNumber;
this.listForm.projectName = this.selectedList[0].projectName;
this.listForm.productLine = this.selectedList[0].productLine;
this.getStandData();
this.projectModel = false;
}
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+1
View File
@@ -478,6 +478,7 @@ export default {
this.projectId = this.selectedList[0].id;
this.listForm.projectNumber = this.selectedList[0].projectNumber;
this.listForm.projectName = this.selectedList[0].projectName;
this.listForm.productLine = this.selectedList[0].productLine;
this.getStandData();
this.projectModel = false;
}
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+4 -4
View File
@@ -95,21 +95,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<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.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+3 -3
View File
@@ -95,12 +95,12 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -109,7 +109,7 @@
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+4 -4
View File
@@ -95,21 +95,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<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.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+1 -1
View File
@@ -335,7 +335,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);
@@ -394,6 +393,7 @@ 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/step5.vue
+4 -1
View File
@@ -352,9 +352,12 @@ export default {
standId: item.id,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
xcxssrq: item.xcxssrq,
zccssrq: item.zccssrq,
workPeople: "请选择责任人"
};
children.push(aa);
console.log(children);
}
);
this.dataList.forEach(key => {
@@ -373,7 +376,6 @@ export default {
this.listForm = item.form;
this.dataList = item.form.dataList;
}
});
},
//保存事件
@@ -400,6 +402,7 @@ 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
+4 -3
View File
@@ -96,12 +96,12 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.xcxssrq ? $moment(scope.row.xcxssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -110,7 +110,7 @@
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -476,6 +476,7 @@ export default {
this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
console.log(this.dataList);
} else {
this.listForm = item.form;
this.dataList = item.form.dataList;
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+4 -4
View File
@@ -95,21 +95,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<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.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+4 -4
View File
@@ -95,21 +95,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<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.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+4 -4
View File
@@ -95,21 +95,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="xcxssrq"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
<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.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrq ? $moment(scope.row.zccssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column