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:
11528
2022-03-25 00:51:32 +08:00
parent 282e6990d7 9f1e1f5ef9
commit da4974199e
10 changed files with 126 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+1
View File
@@ -1259,6 +1259,7 @@ export default {
this.form.zrgcs = "";
}
this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+13 -16
View File
@@ -143,19 +143,19 @@
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="审批意见">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
</div>
</div>
<div class="content" v-show="active === '3'">
@@ -277,9 +277,6 @@ export default {
nextStatus: ""
},
formRules: {
nextStatus: [
{ required: true, message: "", trigger: "change" }
]
},
associationOptions: [{
value: "修订",
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
-7
View File
@@ -216,13 +216,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
-7
View File
@@ -232,13 +232,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+10 -2
View File
@@ -206,7 +206,7 @@
type="primary"
size="mini"
class="common-button-primary"
@click="QYBZget">查询
@click="QYBZgetBtn">查询
</el-button>
<el-button
class="common-button-default"
@@ -223,7 +223,7 @@
:data="QYBZList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
class="table-height"
border
@selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -753,6 +753,10 @@ export default {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
QYBZgetBtn(){
this.QYBZform.page = 1
this.QYBZget()
},
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
@@ -958,5 +962,9 @@ export default {
}
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+12 -16
View File
@@ -228,19 +228,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="rqbName" v-if="qbfsForm.reviseStatus === '修订'" 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 class="search-item btn-box">
<el-button
type="primary"
@@ -372,7 +359,7 @@
type="primary"
size="mini"
class="common-button-primary"
@click="QYBZget">查询
@click="QYBZgetBtn">查询
</el-button>
<el-button
class="common-button-default"
@@ -389,7 +376,7 @@
:data="QYBZList"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
class="table-height"
border
@selection-change="handleSelectionQYBZ"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
@@ -858,7 +845,7 @@ export default {
},
QYBZenterDrawer () {
if (this.QYBZformSelect.length > 1) {
this.$message.warning('请选择一条标准')
this.$message.warning('您只能选择一条标准进行带入')
} else if (this.QYBZformSelect.length < 1){
this.$message.warning('请选择要带入的标准')
} else {
@@ -879,6 +866,11 @@ export default {
this.QYBZform.pageSize = pageSize
this.QYBZget()
},
//企业标准查询
QYBZgetBtn(){
this.QYBZform.page = 1
this.QYBZget()
},
QYBZget () {
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.QYBZform, {
_this: this, loading: 'QYBZShow'
@@ -1170,5 +1162,9 @@ export default {
}
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
-7
View File
@@ -223,13 +223,6 @@
<el-option label="修订" value="修订"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="qbfsForm.reviseStatus === '修订'" label="代替企标编号" style="width: 100%; margin-right:10px" prop="rqbName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.rqbName"
placeholder="请输入代替企标编号"
:maxlength="500"/>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
type="primary"