Skip to content

R
rbc-demo
Commit e8effeaf by Joey
Options

Merge branch 'develop' into develop-zhouyi

parents fd221fe5 e71d47a3
Showing with 241 additions and 56 deletions
develop/@gms/gms-plugin-billexpand/src/actions/cacheSaveAction.js
......@@ -66,15 +66,19 @@ export default {
}
}else{
if(msg[0]== 1 ){
GAMS.Common.messagePrompt(msg[1]);
GAMS.Common.messagePrompt(msg[1]);
this.bill.setControlsSate(param["_control_name_"], 'enable',true)
}else{
GMS.$hideContainer.$Modal.confirm({
title: '信息提示',
content: msg[1],
onOk: () => {
this.bill.setControlsSate(param["_control_name_"], 'enable',true)
GMS.vbus.$emit('cacheEcho', buidData);//正常情况回去给子表赋值
},
onCancel: () => {}
onCancel: () => {
this.bill.setControlsSate(param["_control_name_"], 'enable',true)
}
});
}
}
......@@ -82,7 +86,8 @@ export default {
}).catch(resp=>{
// bill.setControlsSate(param["_control_name_"], 'enable',true);
console.error("cacheSaveAction:接口调用失败 resp:"+ resp)
GAMS.Common.messagePrompt('单据保存失败..');
this.bill.setControlsSate(param["_control_name_"], 'enable',true)
GAMS.Common.messagePrompt('单据保存失败。');
})
}
}
develop/@gms/gms-plugin-billexpand/src/actions/submitAction.js
......@@ -5,6 +5,73 @@ import errorMessageUtil from "./util/errorMessageUtil";
import { getUUID } from "../query-actions/util/lib";
export default {
execute: function (bill, param) {
if (param && param.param && param.param.budgetcontrol) {
let res = this.getBudgetControl(bill, true, param);
res.then((data) => {
if (data.code == 0) {
let result = this.getBudgetControl(bill, false, param);
result.then((data1) => {
if (data1.code == 0) {
this.submitExecute(bill, param);
} else if (data1.code == 1) {
GAMS.Common.messagePrompt(data1.msg);
}
});
} else if (data.code == 1) {
setTimeout(() => {
GAMS.Common.messagePrompt(data.msg);
}, 500);
} else if (data.code == 2) {
setTimeout(() => {
this.getModal(bill, param, data);
}, 500);
}
});
} else {
this.submitExecute(bill, param);
}
},
getModal(bill, param, data) {
GMS.$hideContainer.$Modal.confirm({
title: "信息提示",
content: data.msg,
onOk: () => {
let result = this.getBudgetControl(bill, false, param);
result.then((data1) => {
if (data1.code == 0) {
this.submitExecute(bill, param);
} else if (data1.code == 1) {
GAMS.Common.messagePrompt(data1.msg);
}
});
},
onCancel: () => {
GMS.$hideContainer.$Message["error"]({
content: "已取消",
});
},
});
},
getBudgetControl(bill, check, param) {
let postData = {
data: bill.getBuillData(),
};
let url = `/v1/budget/control/${param.define}/${check}`;
return new Promise((resolve, reject) => {
GMS.$http
.post(url, postData, {
headers: {
post: {
"Content-Type": "application/json",
},
},
})
.then((res) => {
resolve(res.data);
});
});
},
submitExecute(bill, param){
let postData = {
updatebillState: "2",
actions: "workflow.submitToFlow"
......@@ -14,39 +81,12 @@ export default {
bill.executeServerAction(postData, function (code, data) {
bill.setControlsSate(param["_control_name_"], 'enable', true)
if (code === 200) {
const id = data.content.billData.id
const id = data.content.billData.id;
if(GMS.queryObject){
GMS.queryObject.index = GMS.queryObject.index*1 - 1;//上张下张用
}
GMS.$hideContainer.$Message.success('提交成功');
GMS.vbus.$emit("workflow-state-change", 90)
// if (
// window.osConfig.appOpenMode &&
// window.osConfig.appOpenMode == "apploader"
// ) {
// GMS.$hideContainer.$portalAPI.emit('nros-tag-close')
// GMS.$hideContainer.$portalAPI.emit(
// "open-new-page", //打开一个新的页签
// getUUID(),
// "runner-bill-form",
// {
// templateName: param.param.viewName,
// id,
// state:'readOnly'
// },
// {
// openWay: "FUNCTAB",
// title: "单据详情",
// }
// );
// }
// else {
// Bridge.vm.modal_visible = false
// GMS.$hideContainer.addComponent(typesBill, {}, function (c) {
// c.templateName = param.param.viewName;
// c.billId = id;
// c.init = true;
// c.modal_visible = true;
// c.isReadOnly = true
// })
// }
} else if (code === 201) {
GMS.$hideContainer.$Spin.hide()
data.message && GMS.$hideContainer.$Message.error({
......
develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/index.vue
......@@ -7,7 +7,6 @@
<Icon type="ios-more" class="more-select" slot="suffix" @click="handleInputSelect" />
</Input>
</div>
<!-- <div class="api" slot="content"> -->
<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)">
<span class="acct-search-label">{{ item.code + ' ' + item.name }}</span>
......@@ -16,7 +15,6 @@
<span class="list-empty">无匹配数据</span>
</li>
</ul>
<!-- </div> -->
</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" />
......@@ -27,7 +25,7 @@ import EditModal from './edit-modal.vue'
import baseDataMixin from './baseDataMixin'
import indexMixin from './indexMixin'
import './index.less'
import { addResizeListener, removeResizeListener } from 'element-ui/src/utils/resize-event'
import { addResizeListener } from 'element-ui/src/utils/resize-event'
export default {
mixins: [indexMixin, baseDataMixin],
......
develop/@gms/gms-plugin-billexpand/src/control/baseDataSelect/select-table.vue
......@@ -178,7 +178,7 @@ export default {
GMS.$http
.post('/org/data/list', param)
.then((res) => {
const { rows, rs, total } = res.data
const { rows, total } = res.data
this.pageTotal = total
let _tabledatas = rows
this.refreshRowsCheckStatus(this.selection, _tabledatas)
......@@ -190,7 +190,6 @@ export default {
console.log('error', err)
})
} else {
let that = this
this.loading = true
// 更新右侧table
let postData = {}
......@@ -248,7 +247,7 @@ export default {
this.tableDatas = []
return
}
const { rows, rs, total } = response.data
const { rows, total } = response.data
this.pageTotal = total
let _tabledatas = rows
......
develop/@gms/gms-plugin-billexpand/src/control/buttonGrouop.vue
......@@ -106,6 +106,7 @@ export default {
layout: {},
name: 'ButtonControl_1',
title: '关闭',
except: true
},
billStateDisable: false
}
......
develop/@gms/gms-plugin-billexpand/src/control/draftName.vue
......@@ -53,13 +53,13 @@ export default {
})
.then(
function (data, textStatus, response) {
this.loading = false;
if(data.code == 0){
this.$Message.info("保存成功");
this.draftModal = false;
}else{
data.msg && this.$Message.error(data.msg);
}
this.loading = false;
}.bind(this)
)
.catch((XMLHttpRequest, textStatus, errorThrown) => {
......
develop/@gms/gms-plugin-billexpand/src/control/integerControl.vue 0 → 100644
<template>
<div>
<Input v-model="value" type='number' :disabled="state=='readOnly'" @on-blur="onBlur" />
</div>
</template>
<script>
import Input from './util/bc_input'
export default {
mixins: [Input],
data() {
return {}
},
methods: {}
}
</script>
<style lang='less' scoped>
</style>
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/control/userSelect.vue 0 → 100644
<template>
<div>
<Select
v-model="value"
clearable
:disabled="state=='readOnly'"
@on-change="onBlur"
>
<Option
v-for="item in userList"
:value="item.id"
:key="item.id"
:disabled="!item.enabled"
>{{item.fullname}}</Option>
</Select>
</div>
</template>
<script>
import input from './util/bc_input'
export default {
mixins: [input],
data() {
return {
userList: []
}
},
mounted() {
this.getUserList()
},
methods: {
getUserList() {
// 获取当前单位下的用户
let orgCode = ''
try {
orgCode = nros.userContext.userInfo.loginUnit
} catch (error) {
this.$Message.error(error)
}
GMS.$http.get(`/nvwa-user/v1/user/orgCode/${orgCode}`)
.then((res) => {
const { data } = res
this.userList = data
})
.catch((err) => {
console.log('error', err)
})
}
}
}
</script>
<style lang='less' scoped>
</style>
\ No newline at end of file
develop/@gms/gms-plugin-billexpand/src/control/util/bc_input.js
......@@ -200,7 +200,7 @@ export default {
if(config.formulas[key] === "false"){
this[`setControl${key}`]&&this[`setControl${key}`]();
}else{
this.context.bill.getControlState(key,this.define.name);
this.context.bill.getControlState(key,this.define.name,this.define.config.field);
}
}
}
......@@ -260,18 +260,25 @@ export default {
this.addControlStateListener();
}
if(!this.context.bill.getGlobalParam('_old_action_status')){
if(this.context.controlState === 'readOnly'){
this.state = 'readOnly';
}else if(!this.context.bill.getGlobalParam('_old_action_status')){
this.getControlState(this.define.config);
}
}
}.bind(this));
if(this.define.config.field == 'gams_inspectionentry.inspector'){
console.log(this.define,'this.define')
}
},
created(){
this.getContentStatus();
if(this.define.config.formulas){
let _fieldNameRelation = this.context.bill.getGlobalParam('_field_name_relation_')||{};
_fieldNameRelation[this.define.config.field] = {name:this.define.name,editable:this.define.config.formulas.editable};
this.context.bill.setGlobalParam('_field_name_relation_',_fieldNameRelation);
}else{
let _fieldNameRelation = this.context.bill.getGlobalParam('_field_name_relation_')||{};
_fieldNameRelation[this.define.config.field] = {name:this.define.name,editable:true};
this.context.bill.setGlobalParam('_field_name_relation_',_fieldNameRelation);
}
this.getContentStatus();
},
props: {
define: {
......
develop/@gms/gms-plugin-billexpand/src/emcon.js
......@@ -46,6 +46,60 @@ export default {
"path": "单据/通用"
},
{
"title": "用户选择",
"description": "",
"discard": false,
"dynamicComponent": 'billForm',
"extends": {
"config": [
{
"key": "formulas.editable",
"type": "formula",
"title": "是否可编辑",
"configFormula": true,
"disableSwitch": false,
"formulas.editable": true
},
{
"key": "field",
"type": "field",
"ref": "BillClassVO.attributes",
"disableReload": false,
"title": "关联字段"
},
]
},
"value": "userSelectControl",
"path": "资产/通用"
},
{
"title": "整数输入",
"description": "",
"discard": false,
"dynamicComponent": 'billForm',
"extends": {
"config": [
{
"key": "formulas.editable",
"type": "formula",
"title": "是否可编辑",
"configFormula": true,
"disableSwitch": false,
"formulas.editable": true
},
{
"key": "field",
"type": "field",
"ref": "BillClassVO.attributes",
"disableReload": false,
"title": "关联字段"
},
]
},
"value": "integerControl",
"path": "资产/通用"
},
{
"value": "ButtonControl",
"discard": false,
"path": "资产/通用",
......@@ -1299,7 +1353,6 @@ export default {
"description": "",
"title": "财务_查询草稿[CW_draftSearchAction]",
"value": "draftSearchAction",
"btnDisable": "false",
"btnDisable": "billReadOnly;1;90;91;92"
}, {
"discard": false,
......@@ -1611,12 +1664,12 @@ export default {
"path": "资产/通用",
"extends": {
"param": [
// {
// "ref": "bill",
// "type": "metaData",
// "title": "成功跳转页面",
// "key": "viewName"
// }
{
"budgetcontrol": false,
"type": "Boolean",
"title": "启用预算控制",
"key": "budgetcontrol"
}
]
},
"description": "",
......
develop/@gms/gms-plugin-billexpand/src/mcon.js
......@@ -69,6 +69,8 @@ import buttonGroupControl from './control/buttonGrouop'
import rbcBasedataTree from './control/baseDataSelect/index.vue'
import newsDetail from './components-control/news-detail.vue'
import queryDate from './control/query-date.vue'
import userSelectControl from './control/userSelect.vue'
import integerControl from './control/integerControl.vue'
//formula
import GetMdByFormerCode from './formula/GetMdByFormerCode'
import GetBrowserVersion from './formula/GetBrowserVersion'
......@@ -257,7 +259,9 @@ export default {
buttonGroupControl,
ApprovalUserControl,
WorkflowTrack,
rbcBasedataTree
rbcBasedataTree,
userSelectControl,
integerControl
},
formula: {
SubTableSetBaseData,
......
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