Qukatie il y a 8 mois
Parent
commit
61923d8407

+ 8 - 7
src/views/serviceConfiguration/modifyData/detailsPage.vue

@@ -10,7 +10,7 @@
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" size="small" @click="submit">提 交
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
-                    @click="save" :disabled="form.approvalStatus == '审核提交'">保 存
+                    @click="save" :disabled="form.approvalStatus != '录入'">保 存
                 </el-button>
             </div>
         </div>
@@ -19,10 +19,10 @@
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <template slot="menuForm">
                         <el-button icon="el-icon-search" type="primary"
-                            :disabled="data.length > 0 || form.approvalStatus == '审核提交'"
+                            :disabled="data.length > 0 || form.approvalStatus != '录入'"
                             @click="searchChange">获取配置信息</el-button>
                         <el-button icon="el-icon-search" type="success"
-                            :disabled="data.length == 0 || form.approvalStatus == '审核提交'"
+                            :disabled="data.length == 0 || form.approvalStatus != '录入'"
                             @click="getData">获取原始信息</el-button>
                     </template>
                 </avue-form>
@@ -34,10 +34,10 @@
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 415)">
                     <template slot-scope="{type,size,row,index}" slot="menu">
                         <el-button size="small" type="text" icon="el-icon-edit"
-                            @click.stop="$refs.crud.rowEdit(row, index)" :disabled="form.approvalStatus == '审核提交'">编 辑
+                            @click.stop="$refs.crud.rowEdit(row, index)" :disabled="form.approvalStatus != '录入'">编 辑
                         </el-button>
                         <el-button size="small" icon="el-icon-delete" type="text" @click.stop="rowDel(row, index)"
-                            :disabled="form.approvalStatus == '审核提交'">删
+                            :disabled="form.approvalStatus != '录入'">删
                             除</el-button>
                     </template>
                     <template slot-scope="{type,disabled}" slot="fieldValueNewNameForm">
@@ -76,6 +76,7 @@ export default {
             selectionList: [],
             form: {
                 type: 2,
+                approvalStatus: "录入",
                 updateItemList: []
             },
             rowFrom: {
@@ -289,7 +290,7 @@ export default {
             });
         },
         dicChange(name, row) {
-            if (name!='字典') {
+            if (name != '字典') {
                 if (row) {
                     this.rowFrom.fieldValueNew = row.id
                     this.rowFrom.fieldValueNewName = row.cnName
@@ -335,7 +336,7 @@ export default {
             getDetail({ id: id }).then(res => {
                 this.form = res.data.data
                 this.data = res.data.data.updateItemList
-                if (res.data.data.approvalStatus == "审核提交") {
+                if (res.data.data.approvalStatus != '录入') {
                     this.optionForm.disabled = true
                 }
             }).finally(() => {

+ 5 - 4
src/views/serviceConfiguration/modifyData/index.vue

@@ -9,9 +9,9 @@
                 @saveColumn="saveColumn('crud', 'option', 'optionBack', 414)" @on-load="onLoad">
                 <template slot="menuLeft">
                     <div style="margin-top: 10px">
-                        <el-tabs type="card" v-model="query.billStatus" @tab-click="handleClick">
-                            <el-tab-pane label="处理中" name="处理中"></el-tab-pane>
-                            <el-tab-pane label="已完成" name="已完成"></el-tab-pane>
+                        <el-tabs type="card" v-model="query.approvalStatus" @tab-click="handleClick">
+                            <el-tab-pane label="处理中" name="0"></el-tab-pane>
+                            <el-tab-pane label="已完成" name="审核通过"></el-tab-pane>
                         </el-tabs>
                     </div>
                 </template>
@@ -42,7 +42,7 @@ export default {
             isShow: true,
             form: {},
             query: {
-                billStatus: '处理中',
+                approvalStatus: '0',
                 type: 2
             },
             loading: false,
@@ -183,6 +183,7 @@ export default {
             let obj = {}
             obj = {
                 ...Object.assign(params, this.query),
+                approvalStatus:this.query.approvalStatus=='审核通过'?'审核通过':null
             }
             this.loading = true;
             getList(page.currentPage, page.pageSize, obj).then(res => {