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
2022-03-23 17:32:23 +08:00
parent d1c07b5727 0aed7f5307
commit 70e6fee262
7 changed files with 90 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+18 -6
View File
@@ -42,11 +42,23 @@
</el-form-item>
<el-form-item prop="reviseStatus" label="制修订类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订类型">
<el-option label="制定完成" value="制定完成"></el-option>
<el-option label="制定中" value="制定中"></el-option>
<el-option label="未制定" value="未制定"></el-option>
<el-option label="制定" value="制定"></el-option>
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -380,9 +392,9 @@ export default {
}
},
mounted(){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
// if(this.qbfsForm.passFlag){
// this.qbfsForm = {}
// }
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+16 -3
View File
@@ -46,6 +46,19 @@
<el-option label="修订" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -401,9 +414,9 @@ export default {
}
},
mounted(){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
// if(this.qbfsForm.passFlag){
// this.qbfsForm = {}
// }
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+3 -3
View File
@@ -550,9 +550,9 @@ export default {
},
mounted(){
this.getWorkData()
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
// if(this.qbfsForm.passFlag){
// this.qbfsForm = {}
// }
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+24 -4
View File
@@ -70,6 +70,19 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -101,7 +114,7 @@
:enterpriseStandard="true"
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:config="{attrName: '引用标准'}"
:labelWidth="'180px'"
:labelWidth="'150px'"
v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2>
</template>
@@ -712,9 +725,9 @@ export default {
}
},
mounted() {
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
// if(this.qbfsForm.passFlag){
// this.qbfsForm = {}
// }
//查询下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
@@ -801,6 +814,13 @@ export default {
},
TXJGenterDrawer () {
let list = this.$refs.TXJGTree.getCheckedNodes()
if(list.length > 0){
let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
if (parenList.length > 0) {
this.$message.error('请选择二级及以下目录')
return
}
}
let id = ''
let name = ''
list.map(item => {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+16 -3
View File
@@ -46,6 +46,19 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" prop="rqbName" label="代替企标编号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
<el-input
style="display: none;"
v-model="qbfsForm.rqbJson">
</el-input>
<el-input
clearable
v-model="qbfsForm.rqbName"
placeholder="请选择代替企标编号"
readonly
@click.native="choiceQYBZ">
</el-input>
</el-form-item>
<el-form-item prop="area" label="适用车型" style="width: 100%; margin-right:10px"
class="add-form-item form-item-disabled">
<el-select disabled v-model="qbfsForm.area" multiple filterable placeholder="请选择适用车型" style="width: 100%;">
@@ -389,9 +402,9 @@ export default {
}
},
mounted(){
if(this.qbfsForm.passFlag){
this.qbfsForm = {}
}
// if(this.qbfsForm.passFlag){
// this.qbfsForm = {}
// }
this.$http.get('sys/dictype/getDicTypeListCode', '',{
_this: this
}, res => {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+12 -3
View File
@@ -229,6 +229,7 @@
title="选择工作组组长"
:visible.sync="workModel"
size="900px"
@close="closeWorkDrawer"
custom-class="demo-drawer"
>
<div class="demo-drawer-content">
@@ -261,14 +262,14 @@
</el-form-item>
</el-form>
</div>
<loading :loading="tableLoading">数据加载中...</loading>
<el-table
ref="workGroup"
:data="workData"
tooltip-effect="dark"
border
style="width: 100%; flex: auto;"
class="drag-table"
height="100%"
class="table-height"
@selection-change="workChange"
:header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
@@ -351,7 +352,7 @@
:before-upload="beforeUpload"
:action="importExcelUrl"
:file-list="defaultFileList"
accept=".xlsx"
accept=".xls"
name="file"
ref="importFileAboutStand">
<div style="padding: 20px 0">
@@ -380,6 +381,7 @@ export default {
name: "qbzxdlxStep1",
data() {
return {
tableLoading: false,
importModalshowflag: false, //导入弹窗
showUploadlist: true, // 导入过程中新增数据时，如果数据错误，不出现导入列表
importExcelUrl: 'api/att/attFile/upload', // 导入EXCEL文档
@@ -594,6 +596,7 @@ export default {
closeWorkDrawer(){
this.workModel = false
this.workSearch.workGroupName = ''
this.getWorkData()
this.$refs.workGroup.clearSelection()
},
OkWork(){
@@ -622,10 +625,12 @@ export default {
}, res => {
this.workData = res.data.records;
this.total = res.data.total;
this.tableLoading = false
}, e => {
});
},
choiceLeader(){
this.getWorkData()
this.workModel = true
},
choiceZRBM(type, title, id) {
@@ -1114,6 +1119,10 @@ export default {
border: 0;
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+1 -1
View File
@@ -174,7 +174,7 @@
<custom-input-for-all-standards2
class="classDisplay"
:config="{attrName: '采用标准'}"
:labelWidth="'180px'"
:labelWidth="'150px'"
v-model="qbfsForm.esStandRelations"
></custom-input-for-all-standards2>
</template>