Commit ede254bb by 袁成

fix

parent 5b20c91c
import { getUUID } from "../query-actions/util/lib";
import Bridge from '../components-control/util/bridge' import Bridge from '../components-control/util/bridge'
import SelectApprovers from '../components-control/select-approvers.vue' import SelectApprovers from '../components-control/select-approvers.vue'
export default { export default {
...@@ -90,7 +89,6 @@ export default { ...@@ -90,7 +89,6 @@ export default {
} }
}, },
approval: function (bill, param) { approval: function (bill, param) {
let billId = bill.getMasterData().getValue('id');
let taskId = bill.getGlobalParam('reviewParam').taskId; let taskId = bill.getGlobalParam('reviewParam').taskId;
let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions : ""; let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions : "";
GMS.$http.post('/gms/workflow/task/completed/' + taskId + '?result=1&comments=' + comments).then( GMS.$http.post('/gms/workflow/task/completed/' + taskId + '?result=1&comments=' + comments).then(
......
import { getUUID } from "../query-actions/util/lib";
import Bridge from '../components-control/util/bridge' import Bridge from '../components-control/util/bridge'
export default { export default {
execute: function (bill, param) { execute: function (bill, param) {
...@@ -32,7 +31,6 @@ export default { ...@@ -32,7 +31,6 @@ export default {
} }
}, },
approval: function(bill, param){ approval: function(bill, param){
let billId = bill.getMasterData().getValue('id');
let taskId = bill.getGlobalParam('reviewParam').taskId; let taskId = bill.getGlobalParam('reviewParam').taskId;
let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions:""; let comments = bill.getGlobalParam('reviewParam').suggestions ? bill.getGlobalParam('reviewParam').suggestions:"";
GMS.$http.post('/gms/workflow/task/completed/' + taskId + '?result=3&comments='+comments).then( GMS.$http.post('/gms/workflow/task/completed/' + taskId + '?result=3&comments='+comments).then(
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<Icon type="ios-more" class="more-select" slot="suffix" @click="handleInputSelect" /> <Icon type="ios-more" class="more-select" slot="suffix" @click="handleInputSelect" />
</Input> </Input>
</div> </div>
<!-- <div class="api" slot="content"> -->
<ul ref="searchList" class="acct-search-list" :class="{'is-focus': hasFocus}" @mouseleave="onResultList = false" @mouseenter="onResultList = true"> <ul ref="searchList" class="acct-search-list" :class="{'is-focus': hasFocus}" @mouseleave="onResultList = false" @mouseenter="onResultList = true">
<li :class="['acct-search-item',selectIndex === index ? 'selected' : '',{active: activeName == item.name}]" v-for="(item,index) in baseDataList" :key="item.code" :value="item.code" @click="handleMainSearchSelectClick(item)"> <li :class="['acct-search-item',selectIndex === index ? 'selected' : '',{active: activeName == item.name}]" v-for="(item,index) in baseDataList" :key="item.code" :value="item.code" @click="handleMainSearchSelectClick(item)">
<span class="acct-search-label">{{ item.code + ' ' + item.name }}</span> <span class="acct-search-label">{{ item.code + ' ' + item.name }}</span>
...@@ -16,7 +15,6 @@ ...@@ -16,7 +15,6 @@
<span class="list-empty">无匹配数据</span> <span class="list-empty">无匹配数据</span>
</li> </li>
</ul> </ul>
<!-- </div> -->
</el-popover> </el-popover>
<!-- 弹框 --> <!-- 弹框 -->
<EditModal v-if="showModal" v-model="showModal" :title="title" :selection="selection" :table-name="tableName" :multiple="multiple" :tableKey="tableKey" :treeKey="treeKey" :tableColumns="tableColumns" :searchPlaceholder="searchPlaceholder" :authType="authType" :versionDate="versionDate" :modalWidth="modalWidth" :isLeaf="isLeaf" :hideSelected="hideSelected" :structtype="structtype" :groupTableName="groupTableName" :treeTableName="treeTableName" :filterFormular="filterFormular" :filterFormularSP="filterFormularSP" :billdefineName="billdefineName" :billId="billId" :bill="bill" :isFilter="isFilter" :rowIndex="rowIndex" @on-ok="onSelectOk" /> <EditModal v-if="showModal" v-model="showModal" :title="title" :selection="selection" :table-name="tableName" :multiple="multiple" :tableKey="tableKey" :treeKey="treeKey" :tableColumns="tableColumns" :searchPlaceholder="searchPlaceholder" :authType="authType" :versionDate="versionDate" :modalWidth="modalWidth" :isLeaf="isLeaf" :hideSelected="hideSelected" :structtype="structtype" :groupTableName="groupTableName" :treeTableName="treeTableName" :filterFormular="filterFormular" :filterFormularSP="filterFormularSP" :billdefineName="billdefineName" :billId="billId" :bill="bill" :isFilter="isFilter" :rowIndex="rowIndex" @on-ok="onSelectOk" />
...@@ -26,7 +24,7 @@ ...@@ -26,7 +24,7 @@
import EditModal from './edit-modal.vue' import EditModal from './edit-modal.vue'
import baseDataMixin from './baseDataMixin' import baseDataMixin from './baseDataMixin'
import indexMixin from './indexMixin' import indexMixin from './indexMixin'
import { addResizeListener, removeResizeListener } from 'element-ui/src/utils/resize-event' import { addResizeListener } from 'element-ui/src/utils/resize-event'
export default { export default {
mixins: [indexMixin, baseDataMixin], mixins: [indexMixin, baseDataMixin],
......
...@@ -178,7 +178,7 @@ export default { ...@@ -178,7 +178,7 @@ export default {
GMS.$http GMS.$http
.post('/org/data/list', param) .post('/org/data/list', param)
.then((res) => { .then((res) => {
const { rows, rs, total } = res.data const { rows, total } = res.data
this.pageTotal = total this.pageTotal = total
let _tabledatas = rows let _tabledatas = rows
this.refreshRowsCheckStatus(this.selection, _tabledatas) this.refreshRowsCheckStatus(this.selection, _tabledatas)
...@@ -190,7 +190,6 @@ export default { ...@@ -190,7 +190,6 @@ export default {
console.log('error', err) console.log('error', err)
}) })
} else { } else {
let that = this
this.loading = true this.loading = true
// 更新右侧table // 更新右侧table
let postData = {} let postData = {}
...@@ -248,7 +247,7 @@ export default { ...@@ -248,7 +247,7 @@ export default {
this.tableDatas = [] this.tableDatas = []
return return
} }
const { rows, rs, total } = response.data const { rows, total } = response.data
this.pageTotal = total this.pageTotal = total
let _tabledatas = rows let _tabledatas = rows
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment