Skip to content

V
vue-gjjs
Commit dabaf144 by 潘际乾
Options

Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

parents 2a693441 79057253
Showing with 83 additions and 19 deletions
src/assets/css/common.css
...@@ -292,3 +292,16 @@ ...@@ -292,3 +292,16 @@
height: 100% !important; height: 100% !important;
bottom:17px; bottom:17px;
} }
/* medium_button_change_small */
.medium_bcs{
padding: 8px 15px;
margin-top: 5px;
margin-left: 7px;
}
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:7px;
padding-left: 3px;
}
\ No newline at end of file
src/config/CodeTable/index.js
...@@ -5902,6 +5902,22 @@ const CodeTable = { ...@@ -5902,6 +5902,22 @@ const CodeTable = {
{label:'To Correct',value:'CTR'}, {label:'To Correct',value:'CTR'},
{label:'Done',value:'CAN'}, {label:'Done',value:'CAN'},
{label:'E Trade',value:'EJS'}, {label:'E Trade',value:'EJS'},
] ],
relstaEN:[
{label:'Closed',value:'M'},
{label:'Correct',value:'C'},
{label:'Entered',value:'E'},
{label:'External',value:'X'},
{label:'Final',value:'F'},
{label:'Picked up',value:'P'},
{label:'Rejected',value:'N'},
{label:'Released',value:'R'},
{label:'Waiting',value:'W'},
],
usgtxt:[
{label:'Custom manager',value:'CMT'},
{label:'Team 1',value:'TEA1'},
{label:'Team 2',value:'TEA2'},
],
} }
export default CodeTable; export default CodeTable;
\ No newline at end of file
src/views/Business/Infbdd/BusNavbar.vue
<template> <template>
<div class="busnavbar"> <div class="busnavbar">
<div class="busnavbar-items"> <div class="busnavbar-items">
<c-button class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button> <c-button style="margin-left:7px;" class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -113,8 +113,5 @@ export default { ...@@ -113,8 +113,5 @@ export default {
} }
</script> </script>
<style> <style>
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:-10px;
}
</style> </style>
src/views/Business/Infdid/BusNavbar.vue
<template> <template>
<div class="busnavbar"> <div class="busnavbar">
<div class="busnavbar-items"> <div class="busnavbar-items">
<c-button class="medium_bcs" size="medium" type="primary" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button> <c-button style="margin-left:7px;" size="medium" type="primary" class="medium_bcs" v-for="(item,index) in codeList" v-bind:key="index" @click.native="onNarBtnClick(item.code,index)" :title="item.title" :disabled="item.isDis==='N'">{{item.label}}</c-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -110,8 +110,6 @@ export default { ...@@ -110,8 +110,6 @@ export default {
} }
</script> </script>
<style> <style>
.busnavbar-items{
/*TODO完善按钮间隔等样式 */
margin-left:8px;
}
</style> </style>
src/views/Business/Trnrel/InftrnpsDetail.vue
...@@ -101,7 +101,15 @@ ...@@ -101,7 +101,15 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label-width="35%" label="Group"> <el-form-item label-width="35%" label="Group">
<c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> <!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> -->
<el-select v-model="model.trn.usg" style="width: 100%" disabled>
<el-option
v-for="item in codes.usgtxt"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -193,9 +201,18 @@ ...@@ -193,9 +201,18 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Release Status"> <el-form-item label="Release Status">
<c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction"> <!-- <c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
</c-input> </c-input> -->
<el-select v-model="model.trn.relflg" style="width: 100%" disabled>
<el-option
v-for="item in codes.relstaEN"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="24"> <!-- <c-col :span="24">
...@@ -444,7 +461,9 @@ export default { ...@@ -444,7 +461,9 @@ export default {
}, },
codes: { infdsp: CodeTable.infdsp, codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg, flg : CodeTable.flg,
atptxt : CodeTable.atptxt }, atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt },
action:[], action:[],
} }
}, },
......
src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue
...@@ -101,7 +101,15 @@ ...@@ -101,7 +101,15 @@
<c-col :span="12"> <c-col :span="12">
<el-form-item label-width="35%" label="Group"> <el-form-item label-width="35%" label="Group">
<c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> <!-- <c-input v-model="model.trn.usg" maxlength="6" disabled placeholder="请输入Responsible Group"></c-input> -->
<el-select v-model="model.trn.usg" style="width: 100%" disabled>
<el-option
v-for="item in codes.usgtxt"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
</c-col> </c-col>
...@@ -193,9 +201,18 @@ ...@@ -193,9 +201,18 @@
<c-col :span="24"> <c-col :span="24">
<el-form-item label="Release Status"> <el-form-item label="Release Status">
<c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction"> <!-- <c-input v-model="model.trn.relflg" style="width:100%" disabled placeholder="请选择Release Status of Transaction">
</c-input> </c-input> -->
<el-select v-model="model.trn.relflg" style="width: 100%" disabled>
<el-option
v-for="item in codes.relstaEN"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> </el-form-item>
</c-col> </c-col>
<!-- <c-col :span="24"> <!-- <c-col :span="24">
...@@ -444,7 +461,9 @@ export default { ...@@ -444,7 +461,9 @@ export default {
}, },
codes: { infdsp: CodeTable.infdsp, codes: { infdsp: CodeTable.infdsp,
flg : CodeTable.flg, flg : CodeTable.flg,
atptxt : CodeTable.atptxt }, atptxt : CodeTable.atptxt,
relstaEN : CodeTable.relstaEN,
usgtxt : CodeTable.usgtxt },
action:[], action:[],
} }
}, },
......
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