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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!234
This commit is contained in:
王夏晖
2021-12-15 16:32:27 +08:00
parent 3330111e74 732a420470
commit b32715324d
8 changed files with 145 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -653,7 +653,7 @@ export default {
sarStandCompareHis() { sarStandCompareHis() {
this.spinShow = true this.spinShow = true
var formData = this.standCommonlySearch var formData = this.standCommonlySearch
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, {
_this: this _this: this
}, res => { }, res => {
this.standInfoList = res.data.list this.standInfoList = res.data.list
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+7 -1
View File
@@ -97,7 +97,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit.length > 0"> <div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start"> <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-input <el-input
readonly readonly
@@ -306,6 +306,12 @@ export default {
} }
} }
}, },
mounted(){
console.log(this.qbfsForm);
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
},
methods: { methods: {
validateForm () { validateForm () {
let flag = null let flag = null
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+6 -1
View File
@@ -105,7 +105,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit.length > 0"> <div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start"> <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-input <el-input
readonly readonly
@@ -328,6 +328,11 @@ export default {
} }
} }
}, },
mounted(){
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
},
methods: { methods: {
validateForm () { validateForm () {
let flag = null let flag = null
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+42 -65
View File
@@ -64,32 +64,11 @@
placeholder="请选择计划标准发布时间"> placeholder="请选择计划标准发布时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
<!-- <div style="display: flex;justify-content: space-between;align-items: center;">-->
<!-- <el-input-->
<!-- clearable-->
<!-- v-model="qbfsForm.unit"-->
<!-- placeholder="选择或输入起草单位">-->
<!-- </el-input>-->
<!-- <div>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="QCDWClick"-->
<!-- class="common-button-primary">手动查找</el-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.unit" filterable multiple clearable> <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
<el-option <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
v-for="item in qcdwOptions" @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
placeholder="请选择起草责任单位" </el-input>
:key="item.value"
:value="item.label"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled"> <el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -119,45 +98,30 @@
@checkedRole="checkedRole" @checkedRole="checkedRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<el-dialog <Mechanism-tree
:visible.sync="QCDWmodal" is-title="选择起草责任单位"
width="500px" :is-visible.sync="modalshowflagZRBM"
title="选择起草部门" :nodeList="nodeListZRBM"
destroy-on-close @checkedRole="drawerCheckZRBM"
:close-on-click-modal="false" />
@closed="QCDWmodal = false">
<el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
<el-option
v-for="item in qcdwOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
<div slot="footer" class="demo-drawer-footer">
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
@click="QCDWOK">确认
</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import ProcessTitle from "process/components/ProcessTitle"; import ProcessTitle from "process/components/ProcessTitle";
import MechanismTree from '@/components/mechanismTree'
export default { export default {
name: "establish", name: "establish",
components: { components: {
ProcessTitle ProcessTitle,
MechanismTree
}, },
props: ['message'], props: ['message'],
data(){ data(){
return { return {
QCDWmodal: false, modalshowflagZRBM: false,
QCDWValue: [], nodeListZRBM: [],
QCDWList: [],
drawerTitle2: '', drawerTitle2: '',
drawerTitle: '', drawerTitle: '',
roleType: '', roleType: '',
@@ -169,6 +133,7 @@ export default {
qbfsForm: { qbfsForm: {
type: '5', type: '5',
unit: '', // 单位 unit: '', // 单位
unitId: '',
esName: '', // 企标名称 esName: '', // 企标名称
planStatus: '', // 计划状态 planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态 reviseStatus: '', // 制修订状态
@@ -224,10 +189,13 @@ export default {
deep: true, deep: true,
handler(val) { handler(val) {
this.qbfsForm = val this.qbfsForm = val
} },
} },
}, },
mounted(){ mounted(){
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据 //查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{ this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this _this: this
@@ -237,19 +205,28 @@ export default {
}) })
}, },
methods: { methods: {
QCDWOK () { choiceZRBM(type, title, id) {
let arr1 = [] this.nodeListZRBM = []
if (this.qbfsForm.unit.length > 0) { this.nodeListZRBM.push(id)
let str = this.qbfsForm.unit.replace(/，/g, ',') this.drawerTitle = title
arr1 = str.split(',') this.modalshowflagZRBM = true
}
let arr2 = arr1.concat(this.QCDWValue)
this.qbfsForm.unit = Array.from(new Set(arr2)).join(',')
this.QCDWmodal = false
}, },
QCDWClick () { drawerCheckZRBM(data) {
this.QCDWValue = [] let idList = ''
this.QCDWmodal = true let nameList = ''
data.forEach(item => {
if (nameList.length) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.$set(this.qbfsForm, 'unitId', idList)
this.$set(this.qbfsForm, 'unit', nameList)
if(this.qbfsForm.unit){
this.$refs.qbfsForm.validateField('unit')
}
}, },
choiceZRR() { choiceZRR() {
this.nodeList = []; this.nodeList = [];
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+48 -62
View File
@@ -82,32 +82,20 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.unit" filterable multiple clearable> <el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
<el-option <el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
v-for="item in qcdwOptions" @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
placeholder="请选择起草责任单位" </el-input>
:key="item.value" <!-- <el-select v-model="qbfsForm.unit" filterable multiple clearable>-->
:value="item.label" <!-- <el-option-->
:label="item.label" <!-- v-for="item in qcdwOptions"-->
></el-option> <!-- placeholder="请选择起草责任单位"-->
</el-select> <!-- :key="item.value"-->
<!-- :value="item.label"-->
<!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<!-- <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" class="add-form-item" prop="unit" >-->
<!-- <div style="display: flex;justify-content: space-between;align-items: center;">-->
<!-- <el-input-->
<!-- clearable-->
<!-- v-model="qbfsForm.unit"-->
<!-- placeholder="选择或输入起草单位">-->
<!-- </el-input>-->
<!-- <div>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="primary"-->
<!-- @click="QCDWClick"-->
<!-- class="common-button-primary">手动查找</el-button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled"> <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
@@ -287,6 +275,12 @@
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
></Role-tree> ></Role-tree>
<Mechanism-tree
is-title="选择起草责任单位"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<Role-tree <Role-tree
check-box check-box
:is-title="drawerTitle" :is-title="drawerTitle"
@@ -294,44 +288,24 @@
@checkedRole="checkedRole" @checkedRole="checkedRole"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<el-dialog
:visible.sync="QCDWmodal"
width="500px"
title="选择起草部门"
destroy-on-close
:close-on-click-modal="false"
@closed="QCDWmodal = false">
<el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
<el-option
v-for="item in qcdwOptions"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
<div slot="footer" class="demo-drawer-footer">
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
@click="QCDWOK">确认
</el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import ProcessTitle from "process/components/ProcessTitle"; import ProcessTitle from "process/components/ProcessTitle";
import MechanismTree from '@/components/mechanismTree'
export default { export default {
name: "merge", name: "merge",
components: { components: {
ProcessTitle ProcessTitle,
MechanismTree
}, },
props: ['message'], props: ['message'],
data(){ data(){
return { return {
QCDWmodal: false, modalshowflagZRBM: false,
QCDWValue: [], nodeListZRBM: [],
QCDWList: [],
drawerTitle2: '', drawerTitle2: '',
drawerTitle: '', drawerTitle: '',
type: '', type: '',
@@ -430,6 +404,9 @@ export default {
} }
}, },
mounted() { mounted() {
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
//查询下拉框数据 //查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{ this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this _this: this
@@ -450,19 +427,28 @@ export default {
} }
}, },
methods: { methods: {
QCDWOK () { choiceZRBM(type, title, id) {
let arr1 = [] this.nodeListZRBM = []
if (this.qbfsForm.unit !== undefined) { this.nodeListZRBM.push(id)
let str = this.qbfsForm.unit.replace(/，/g, ',') this.drawerTitle = title
arr1 = str.split(',') this.modalshowflagZRBM = true
}
let arr2 = arr1.concat(this.QCDWValue)
this.qbfsForm.unit = Array.from(new Set(arr2)).join(',')
this.QCDWmodal = false
}, },
QCDWClick () { drawerCheckZRBM(data) {
this.QCDWValue = [] let idList = ''
this.QCDWmodal = true let nameList = ''
data.forEach(item => {
if (nameList.length) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.$set(this.qbfsForm, 'unitId', idList)
this.$set(this.qbfsForm, 'unit', nameList)
if(this.qbfsForm.unit){
this.$refs.qbfsForm.validateField('unit')
}
}, },
choiceZRR() { choiceZRR() {
this.nodeList = []; this.nodeList = [];
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+6 -1
View File
@@ -96,7 +96,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled"> <el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit.length > 0"> <div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start"> <el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-input <el-input
readonly readonly
@@ -316,6 +316,11 @@ export default {
} }
} }
}, },
mounted(){
if(!this.qbfsForm.passFlag){
this.qbfsForm = {}
}
},
methods: { methods: {
validateForm () { validateForm () {
let flag = null let flag = null
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+32 -27
View File
@@ -270,7 +270,8 @@ export default {
}, },
data() { data() {
return { return {
comFlag: 0, toggleType: '1',
comFlag: 1,
active: "1", active: "1",
commentText: "", commentText: "",
comName: "merge", comName: "merge",
@@ -405,15 +406,15 @@ export default {
toggleComName(name) { toggleComName(name) {
this.comName = name; this.comName = name;
if(this.comName === 'merge'){ if(this.comName === 'merge'){
this.$refs["childForm"].qbfsForm.type = '1' this.toggleType = '1'
}else if(this.comName === 'delay'){ }else if(this.comName === 'delay'){
this.$refs["childForm"].qbfsForm.type = '2' this.toggleType = '2'
}else if(this.comName === 'cancel'){ }else if(this.comName === 'cancel'){
this.$refs["childForm"].qbfsForm.type = '3' this.toggleType = '3'
}else if(this.comName === 'rename'){ }else if(this.comName === 'rename'){
this.$refs["childForm"].qbfsForm.type = '4' this.toggleType = '4'
}else if(this.comName === 'establish'){ }else if(this.comName === 'establish'){
this.$refs["childForm"].qbfsForm.type = '5' this.toggleType = '5'
} }
}, },
//流程保存 //流程保存
@@ -438,29 +439,32 @@ export default {
this.saveLoading = false this.saveLoading = false
}) })
}, },
repeatName(){ // repeatName(){
let qbzxdFrom = this.$refs["childForm"].qbfsForm; // let qbzxdFrom = this.$refs["childForm"].qbfsForm;
this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, { // this.$http.get('esRevisePlan/es-revise-plan/getDataByName', {esName: qbzxdFrom.esName, id : qbzxdFrom.esId}, {
_this: this // _this: this
}, res => { // }, res => {
let dataList = res.data // if(qbzxdFrom.type === '1'){
dataList.forEach(item => { // let dataList = res.data
if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){ // dataList.forEach(item => {
this.comFlag++ // if(item.esName === qbzxdFrom.esName1 || item.esName === qbzxdFrom.esName2){
}else{ // this.comFlag = 1
this.comFlag = 0 // }
} // })
}) // }else if(qbzxdFrom.type === '5'){
}) // if(!res.data.length){
}, // this.comFlag = 1
// }
// }
// })
// },
//流程提交 //流程提交
handleSubmit() { handleSubmit() {
if(this.$refs["childForm"].qbfsForm.type === undefined){ if(!this.$refs["childForm"].qbfsForm.type){
this.$refs["childForm"].qbfsForm.type = '1' this.$refs["childForm"].qbfsForm.type = this.toggleType
} }
this.repeatName() if(this.comFlag === 0){
if(this.comFlag === '0'){ this.$message.warning('企标名称已存在,请更改!')
this.$message.warning('请更改企标名称')
}else { }else {
if (this.$route.query.prcNum === undefined) { if (this.$route.query.prcNum === undefined) {
let flag = this.$refs["childForm"].validateForm(); let flag = this.$refs["childForm"].validateForm();
@@ -468,9 +472,10 @@ export default {
if (flag) { if (flag) {
this.$refs["roleForm"].validate((valid) => { this.$refs["roleForm"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true; // this.isSubmit = true;
var json = Object.assign(qbzxdFrom, this.roleForm); var json = Object.assign(qbzxdFrom, this.roleForm);
console.log(json); console.log(json);
return
this.$http.get("lawss/activiti/startProcess", { type: "25" }, { this.$http.get("lawss/activiti/startProcess", { type: "25" }, {
_this: this _this: this
}, res => { }, res => {
src/pages/processCenter/pages/newProcess/index.vue
+3 -3
View File
@@ -650,9 +650,9 @@
justify-content: space-between; justify-content: space-between;
.card-top-left { .card-top-left {
img { img {
margin: 10px; margin: 30px;
width: 80px; width: 40px;
height: 80px; height: 40px;
} }
} }
.card-top-right { .card-top-right {