Skip to content

V
vue-gjjs
Commit 85a6684c by lianyang
Options

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… 

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
parents 995797df 802557b8
Showing with 56 additions and 32 deletions
src/model/Switsk/Pattern.js
......@@ -8,14 +8,14 @@ export default {
"filtsk.tsklist.jobstrdat":[
{type: "date", required: false, message: "输入正确的日期"}
],
"filtsk.tsklist.jobstrtimhh":[
{type: "string", required: false, message: "必输项"},
{max: 2,message:"长度不能超过2"}
],
"filtsk.tsklist.jobstrtimmm":[
{type: "string", required: false, message: "必输项"},
{max: 2,message:"长度不能超过2"}
],
// "filtsk.tsklist.jobstrtimhh":[
// {type: "string", required: false, message: ""},
// {max: 2,message:"长度不能超过2"}
// ],
// "filtsk.tsklist.jobstrtimmm":[
// {type: "string", required: false, message: ""},
// {max: 2,message:"长度不能超过2"}
// ],
......
src/views/Business/Ditdla/index.vue
......@@ -136,6 +136,12 @@
</el-tab-pane>
</c-tabs>
</el-form>
<c-grid-ety-prompt-dialog
ref="etyDialog"
:promptData="promptData"
v-on:select-ety="selectEty"
>
</c-grid-ety-prompt-dialog>
</div>
</template>
<script>
......
src/views/Business/Infdid/BusNavbar.vue
......@@ -85,10 +85,10 @@ export default {
let btnStr = this.model.cfgfil.btnstm.rows
let j = 0;
let m = 0;
const buttonIndex = ['信用证修改','减额修改接受','到单','修改通知行']
const buttonIndex = ['保证金收取','保证金注销','保证金调整','开立信用证','信用证修改','减额修改接受','修改通知行','到单']
for(let i=0; i < length; i++){
//获取数组中每行的数据
if(!( btnStr[i].indexOf("保证金") >= 0) && !(btnStr[i].indexOf("开立信用证") >= 0)){
// if(!( btnStr[i].indexOf("保证金") >= 0) && !(btnStr[i].indexOf("开立信用证") >= 0)){
let arr = btnStr[i].split("\t");
let newList = {
code:arr[0],
......@@ -103,7 +103,7 @@ export default {
}
//添加到navcode数组中
this.navcode.splice(j,0,newList)
}
// }
}
......
src/views/Business/Switsk/Srvdta.vue
......@@ -2,7 +2,7 @@
<div class="eibs-tab">
<c-col :span="24" style="margin-top: 10px">
<!-- -------------左 ------------->
<c-col :span="11">
<c-col :span="12">
<el-form-item label="">
<c-col :span="12">
<c-checkbox v-model="model.srvdta.exeflg"
......@@ -85,7 +85,7 @@
</c-col>
</c-col>
<!-- -------右 -->
<c-col :span="11" :offset="1">
<c-col :span="12">
<c-col :span="24">
<el-form-item label="Text for Header" prop="srvdta.parheatxt">
<c-input
......
src/views/Business/Switsk/Srvdte.vue
......@@ -5,7 +5,7 @@
<c-col :span="24" style="margin-top: 10px">
<!-- ================左=============== -->
<c-col :span="11">
<c-col :span="12">
<el-form-item label="">
<c-col :span="12">
<c-checkbox v-model="model.srvdte.exeflg">DTA Export L/C</c-checkbox>
......@@ -81,7 +81,7 @@
</c-col>
</c-col>
<!---------------- 右 ----------------------->
<c-col :span="11" :offset="1">
<c-col :span="12">
<c-col :span="24">
<el-form-item label="Type of Print" prop="srvdte.swtprttyp">
<c-select
......
src/views/Business/Switsk/Srveli.vue
<template>
<div class="eibs-tab">
<c-col :span="12">
<c-col :span="12" style="margin-top: 10px">
<el-form-item>
<c-checkbox v-model="model.srveli.exeflg">Incoming Elc</c-checkbox>
</el-form-item>
......
src/views/Business/Switsk/Srvswi.vue
......@@ -6,7 +6,7 @@
<!-- 先用一个span 24页面铺开 -->
<c-col :span="24" style="margin-top: 10px">
<!-- 左加右加：offset=23 -->
<c-col :span="11">
<c-col :span="12">
<el-form-item label="">
<c-col :span="24">
<c-checkbox v-model="model.srvswi.etydirflg"
......@@ -84,7 +84,7 @@
</c-col>
<!-- 右 -->
<c-col :span="11" :offset="1">
<c-col :span="12">
<c-col :span="24">
<el-form-item label="Type of Print" prop="srvswi.swtprttyp">
<c-select
......
src/views/Business/Switsk/Srvtci.vue
......@@ -5,7 +5,7 @@
</c-col> -->
<c-col :span="24" style="margin-top: 10px">
<!-- 左 -->
<c-col :span="11">
<c-col :span="12">
<el-form-item label="">
<c-col :span="24">
<c-checkbox v-model="model.srvtci.etydirflg"
......@@ -88,7 +88,7 @@
</c-col>
<!-- 右 -->
<c-col :span="11" :offset="1">
<c-col :span="12">
<c-col :span="24">
<el-form-item label="Type of Print" prop="srvtci.swtprttyp">
<c-select
......
src/views/Business/Switsk/Srvtli.vue
<template>
<div class="eibs-tab">
<el-form-item label="">
<c-col :span="24">
<c-col :span="24" style="margin-top: 10px">
<c-checkbox v-model="model.srvtli.exeflg">Incoming Telex</c-checkbox>
</c-col>
</el-form-item>
......
src/views/Business/Switsk/Tskmgr.vue
......@@ -2,8 +2,8 @@
<div class="eibs-tab">
<!-- ============左========= -->
<c-col :span="11">
<c-col :span="24">
<c-col :span="12">
<c-col :span="24" style="margin-top: 10px">
<el-form-item label="Service Types to be handled:">
<c-fullbox>
<c-col :span="6">
......@@ -73,7 +73,7 @@
</c-col>
<!-- ============右========= -->
<c-col :span="11" :offset="1">
<c-col :span="12" >
<!-- <c-col :span="24">
<el-form-item
label="Automatic Start Flag"
......@@ -120,7 +120,12 @@
prop="filtsk.tsklist.jobstrtimhh"
label-width="20px"
>
<el-time-picker
<c-input
v-model="model.filtsk.tsklist.jobstrtimhh"
placeholder=""
disabled
></c-input>
<!-- <el-time-picker
type="time"
v-model="model.filtsk.tsklist.jobstrtimhh"
......@@ -129,7 +134,7 @@
:defaultValue="moment('01:00:00', 'HH')"
style="width: 100%"
placeholder="请选择"
></el-time-picker>
></el-time-picker> -->
<!-- <c-input
v-model="model.filtsk.tsklist.jobstrtimhh"
placeholder="请输入"
......@@ -142,7 +147,7 @@
v-model="model.filtsk.tsklist.jobstrtimmm"
placeholder="请输入"
></c-input> -->
<el-time-picker
<!-- <el-time-picker
type="time"
:defaultValue="moment('01:00:00', 'mm')"
v-model="model.filtsk.tsklist.jobstrtimmm"
......@@ -150,7 +155,12 @@
value-format="mm"
style="width: 100%"
placeholder="请选择"
></el-time-picker>
></el-time-picker> -->
<c-input
v-model="model.filtsk.tsklist.jobstrtimmm"
placeholder=""
disabled
></c-input>
</el-form-item>
</c-col>
......@@ -181,27 +191,35 @@
v-model="model.filtsk.tsklist.downtimehh"
placeholder="请输入"
></c-input> -->
<el-time-picker
<!-- <el-time-picker
type="time"
v-model="model.filtsk.tsklist.downtimehh"
format="HH"
value-format="HH"
style="width: 100%"
placeholder="请选择"
></el-time-picker>
></el-time-picker> -->
<c-input
v-model="model.filtsk.tsklist.downtimehh"
placeholder=""
></c-input>
</el-form-item>
</c-col>
<c-col :span="4">
<el-form-item label="min" prop="filtsk.tsklist.downtimemm" label-width="20px">
<el-time-picker
<!-- <el-time-picker
type="time"
v-model="model.filtsk.tsklist.downtimemm"
format="mm"
value-format="mm"
style="width: 100%"
placeholder="请选择"
></el-time-picker>
></el-time-picker> -->
<c-input
v-model="model.filtsk.tsklist.downtimemm"
placeholder=""
></c-input>
</el-form-item>
</c-col>
<c-col :span="24">
......
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