diff --git a/src/components/checkPhoto/index.vue b/src/components/checkPhoto/index.vue
index f8f744e..0836390 100644
--- a/src/components/checkPhoto/index.vue
+++ b/src/components/checkPhoto/index.vue
@@ -1,8 +1,12 @@
 <template>
     <div class="relative -translate-y-2/4 overflow-hidden" style="margin-top: 10px;color: black;" id="checkPhoto" v-drag>
         <!-- <div class="bg-gray-400" @click="closeIt">关闭</div> -->
-        <img class="absolute cursor-pointer hover:bg-red-700" src="@/assets/svg/close.svg" alt="" @click="closeIt"  style="right: 50px; top: 30px;" />
-
+        <template v-if="imgSrcId==413">
+            <img class="absolute cursor-pointer hover:bg-red-700" src="@/assets/svg/close.svg" alt="" @click="closeIt"  style="right: 20px; top: 10px;" />
+        </template>
+        <template v-else>
+            <img class="absolute cursor-pointer hover:bg-red-700" src="@/assets/svg/close.svg" alt="" @click="closeIt"  style="right: 50px; top: 30px;" />
+        </template>
         <template v-if="imgSrcId==14">
             <h3 class="text-xl" style="left: 105px;top: 120px;">{{ dataFlow.userName }}</h3>
             <h3 class="text-xl" v-if="dataFlow.sex==1" style="left: 446px;top: 110px;">√</h3>
@@ -83,7 +87,51 @@
             <h3 class="text-xs" style="left: 640px;top: 145px;">12802851701099</h3>
             <h3 class="text-xl" style="left: 340px;top: 195px;">{{ transMoney(dataFlow.transMoney) }}</h3>
             <h3 class="text-lg" style="left: 607px;top: 205px;letter-spacing: 4.8px">{{ ('' + dataFlow.transMoney).padStart(9, 0).padEnd(11, 0) }}</h3>
-        </template>   
+        </template>
+        <template v-else-if="imgSrcId==407" >
+            <h3 class="text-lg" style="left: 200px;top: 95px;">{{ dataFlow.userName }}</h3>
+            <h3 class="text-lg" style="left: 500px;top: 95px;">{{ dataFlow.voucherNumber }}</h3>
+            <h3 class="text-lg" style="left: 170px;top: 137px;">{{ dataFlow.idNumber }}</h3>
+            <h3 class="text-lg" style="left: 170px;top: 158px;">{{ dataFlow.phone }}</h3>
+            <h3 class="text-lg" style="left: 450px;top: 158px;">{{ dataFlow.mailbox }}</h3>
+        </template> 
+        <template v-else-if="imgSrcId==406" >
+            <h3 class="text-xl" style="left: 325px;top: 103px;">√</h3>
+            <h3 class="text-lg" style="left: 160px;top: 175px;">{{ dataFlow.userName }}</h3>
+            <h3 class="text-lg" style="left: 490px;top: 175px;">{{ dataFlow.idNumber }}</h3>
+            <h3 class="text-md" style="left: 160px;top: 205px;">{{ dataFlow.phone }}</h3>
+            <h3 class="text-md" style="left: 450px;top: 205px;">{{ dataFlow.mailbox }}</h3>
+            <h3 class="text-md" style="left: 120px;top: 370px;">人民币</h3>
+            <h3 class="text-md" style="left: 260px;top: 370px;">{{ dataFlow.voucherNumber }}</h3>
+        </template>  
+        <template v-else-if="imgSrcId==468" >
+            <h3 class="text-xl" style="left: 325px;top: 103px;">√</h3>
+            <h3 class="text-lg" style="left: 160px;top: 175px;">{{ dataFlow.userName }}</h3>
+            <h3 class="text-lg" style="left: 490px;top: 175px;">{{ dataFlow.idNumber }}</h3>
+            <h3 class="text-md" style="left: 160px;top: 205px;">{{ dataFlow.phone }}</h3>
+            <h3 class="text-md" style="left: 450px;top: 205px;">{{ dataFlow.mailbox }}</h3>
+            <h3 class="text-md" style="left: 120px;top: 370px;">人民币</h3>
+            <h3 class="text-md" style="left: 260px;top: 370px;">{{ dataFlow.voucherNumber }}</h3>
+            <h3 class="text-md" style="left: 700px;top: 370px;">{{ nowDate }}</h3>
+            <h3 class="text-lg" style="left: 560px;top: 405px;">{{ dataFlow.userName }}</h3>
+        </template>  
+        <template v-else-if="imgSrcId==413" >
+            <h3 class="text-lg" style="left: 690px;top: 21px;">{{ getNowYear(0) }}</h3>
+            <h3 class="text-lg" style="left: 755px;top: 21px;">{{ getNowYear(1) }}</h3>
+            <h3 class="text-lg" style="left: 280px;top: 75px;">{{ dataFlow.collectingCompany }}</h3>
+            <h3 class="text-lg" style="left: 620px;top: 75px;">12802851701099</h3>
+            <h3 class="text-lg" style="left: 620px;top: 75px;">12802851701099</h3>
+            <h3 class="text-lg" style="left: 330px;top: 115px;">10</h3>
+            <h3 class="text-lg" style="left: 540px;top: 111px;">00242986</h3>
+            <h3 class="text-lg" style="left: 690px;top: 111px;">00242996</h3>
+        </template>
+        <template v-else-if="imgSrcId==426" >
+            <h3 class="text-md" style="left: 180px;top: 205px;">{{ dataFlow.voucherNumber }}</h3>
+            <h3 class="text-md" style="left: 450px;top: 205px;">{{ dataFlow.userName }}</h3>
+            <h3 class="text-md" style="left: 180px;top: 235px;">6227007200580123</h3>
+            <h3 class="text-md" style="left: 450px;top: 235px;">郭平安</h3>
+            <h3 class="text-md" style="left: 116px;top: 306px;letter-spacing: 3.3px">{{ ('' + dataFlow.transMoney).padStart(8, 0).padEnd(10, 0) }}</h3>
+        </template>
         <img :src="imgSrc" class="imgPop imgIndex min-w-full dia-header" :alt="imgSrcName" :title="imgSrcName" ref="showPage">
         <slot />
     </div>
@@ -154,7 +202,7 @@ export default {
     methods: {
         closeIt() {
             this.$emit('update:showImg', false)
-        }
+        },
     },
     
     computed: {
diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue
index 316b908..3257a1e 100644
--- a/src/components/dialogTwo/index.vue
+++ b/src/components/dialogTwo/index.vue
@@ -88,7 +88,9 @@ const obj = {
     'tallerCash': '柜员现金轧账',
     'tellerCertificate': '柜员凭证轧账',
     'branchDayEnd': '网点日终轧帐',
-    'spacial': '提交'
+    'spacial': '提交',
+    "cityWide/cityWideOut": '同城提出',
+    "cityWide/cityWideIn": '同城提入',
 }
 const nameMap = {
     sex: {
@@ -226,6 +228,14 @@ const nameMap = {
         112: '按月',
         113: '满页'
     },
+    billType: {
+        119: '银行本票',
+        120: '银行承兑汇票',
+        136: '银行支票',
+        137: '银行汇票',
+        138: '商业承兑汇票',
+        139: '其他'
+    }
 }
 
 export default {
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index bb3fe9d..832a51f 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -399,7 +399,6 @@
         <div  v-show="showImg" style="z-index: 9999;" >
             <!-- <div class="relative w-screen h-screen" v-drag> -->
                 <!-- <div class="dia-header absolute text-center hover:bg-gray-400" style="top: -27px;z-index: 9991;width: 100%;height: 50px;line-height: 50px;" ref="imgCheckDrag">--单击此处可拖拽--</div> -->
-     
                 <check-photo  :imgSrc="imgSrc" :imgSrcId='imgSrcId' :imgSrcName="imgSrcName" :showImg.sync="showImg"  style="width: 850px;z-index: 9990; margin-top: 100px;" >
                     <div class="absolute flex justify-end w-full flex-wrap" style="bottom:7vh; right: 4vw">
                         <seal-name v-for="item in isSeal(imgSrcId)" :key="item.id" :item="item">
@@ -475,7 +474,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations, mapGetters } from 'vuex';
+import { mapState, mapMutations, mapGetters, mapActions } from 'vuex';
 import Sortable from 'sortablejs'
 import manage from '../../manage/index';
 import { addOperation, getOperation } from '@/api/http';
@@ -678,9 +677,9 @@ export default {
                 {name:'密码挂失申请书凭证联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:466},
                 {name:'密码挂失申请书回单',src:require('@/assets/img/goods/businessReportMissUser.png'),id:468},
                 {name:'密码挂失申请书银行留存联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:467},
-                {name:'支票领购单',src:require('@/assets/img/goods/businessReportMissUser.png'),id:413},
-                {name:'支票领购单回单',src:require('@/assets/img/goods/businessReportMissUser.png'),id:480},
-                {name:'支票领购单凭证联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:488},
+                {name:'支票领购单',src:require('@/assets/img/goods/CheckCoupons.png'),id:413},
+                {name:'支票领购单回单',src:require('@/assets/img/goods/CheckCoupons.png'),id:480},
+                {name:'支票领购单凭证联',src:require('@/assets/img/goods/CheckCoupons.png'),id:488},
                 {name:'业务收费凭证回单',src:require('@/assets/img/goods/ywsfpz.png'),id:481},
                 {name:'业务收费凭证凭证联',src:require('@/assets/img/goods/ywsfpz.png'),id:482},
             ],
@@ -951,6 +950,9 @@ export default {
             getSelectList: 'system/getSelectList',
             needBackMoney: 'system/needBackMoney',
         }),
+
+        
+
         ...mapState({
             businessKey: state => state.system.businessKey
         })
@@ -1090,6 +1092,7 @@ export default {
         this.startPlay()
 
         // this.getThingsCache();
+        // 或许电脑中的其中一个选项栏
         
     },
     mounted(){
@@ -1533,7 +1536,7 @@ export default {
                     this.controlGoodsDblClickFn = null
                 }
                 
-                const judge = item.name.includes('本联') || item.name.includes('凭证联') || item.name.includes('回单') || (item.name.includes('复印件') && !item.name.includes('身份证复印件'))
+                const judge = item.name.includes('本联') || item.name.includes('凭证联') || (item.name.includes('回单') && !item.name.includes('密码挂失申请书回单')) || (item.name.includes('复印件') && !item.name.includes('身份证复印件'))
                 if(!(judge)) {
                     this.clickNum2 = 0;  
                     this.showImg = true
diff --git a/src/pages/manage/index/index.vue b/src/pages/manage/index/index.vue
index ce74365..3de0b28 100644
--- a/src/pages/manage/index/index.vue
+++ b/src/pages/manage/index/index.vue
@@ -31,7 +31,7 @@
 
 <script>
 import navbar from '../navbar'
-import { mapState } from 'vuex'
+
 export default {
     name: 'index',
     data() {
@@ -42,11 +42,6 @@ export default {
     components: {
         navbar
     },
-    computed:{
-        full:function(){
-            return this.$store.state.system.fullScreen
-        }
-    },
     // beforeMount() {
     //     const path = sessionStorage.getItem('computerPath')
     //     console.log('router-view')
@@ -66,7 +61,13 @@ export default {
             this.fullscreen = false
             this.$store.commit('system/changeFullscreen',false)
         },
+        
     },
+    computed: {
+        full:function(){
+            return this.$store.state.system.fullScreen
+        }
+    }
 };
 </script>
 
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
index 12b19d6..69b8ddc 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashOut.vue
@@ -124,7 +124,7 @@
                 </el-col>
                 <el-col :span="10">
                     <el-form-item label="接收柜员" prop="receiveCounter">
-                        <el-input :value="form.receiveCounter" ref='receiveCounter' maxlength="20" @input="(val) => inputListen(val, form, 'receiveCounter')"></el-input>
+                        <el-input :value="form.receiveCounter" disabled ref='receiveCounter' maxlength="20" @input="(val) => inputListen(val, form, 'receiveCounter')"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -164,7 +164,7 @@ export default {
                 currency: 12,
                 state: '正常',
                 moneyTotal: '0',
-                receiveCounter: '',
+                receiveCounter: '002288',
             },
             formName:{
                 currency: '币种',
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
index 903dd0f..bd65ce1 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashPaid.vue
@@ -154,17 +154,55 @@ export default {
         tableRowClassName: tableRowClassName,
         sure(row) {
             if(this.form.clickIt2 === '确认退回') {
-                this.setTipsOperate('您已选择退回')
+                this.$confirm('该项目只能选择将现金调入或退回现金，请问是否改为现金调入?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt1 = '确认调入'
+                    this.form.clickIt2 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为现金调入!'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消调入'
+                    });          
+                });
                 return
+            }else {
+                this.form.clickIt1 = '确认调入'
             }
-            this.form.clickIt1 = '确认调入'
+            
         },
         back(row) {
             if(this.form.clickIt1 === '确认调入') {
-                this.setTipsOperate('您已选择调入')
+                this.$confirm('该项目只能选择将现金调入或退回现金，请问是否改为退回现金?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt2 = '确认退回'
+                    this.form.clickIt1 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为现金退回'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消退回'
+                    });          
+                });
                 return
+            }else {
+                this.form.clickIt2 = '确认退回'
             }
-            this.form.clickIt2 = '确认退回'
+            
         },
         submitClick() {
             this.visible = true
diff --git a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
index 92227eb..5e0f437 100644
--- a/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash/cashRecipients.vue
@@ -166,17 +166,55 @@ export default {
         }),
         sure(row) {
             if(this.form.clickIt2 === '已退回') {
-                this.setTipsOperate('您已选择退回')
+                this.$confirm('该项目只能选择将现金领用或退回现金，请问是否改为现金领用?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt1 = '已领用'
+                    this.form.clickIt2 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为现金领用!'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消现金领用'
+                    });          
+                });
                 return
+            }else {
+                this.form.clickIt1 = '已领用'
             }
-            this.form.clickIt1 = '已领用'
+            
         },
         back(row) {
             if(this.form.clickIt1 === '已领用') {
-                this.setTipsOperate('您已选择领用')
+                this.$confirm('该项目只能选择将现金领用或退回现金，请问是否改为现金退回?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt2 = '已退回'
+                    this.form.clickIt1 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为退回现金!'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消退回现金'
+                    });          
+                });
                 return
+            }else {
+                this.form.clickIt2 = '已退回'
             }
-            this.form.clickIt2 = '已退回'
+            
         },
         submitClick() {
             this.visible = true
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
index dec61b5..38eccc9 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
@@ -37,7 +37,7 @@
                     </el-col>
                     <el-col :span="10"  :offset="1">
                         <el-form-item label="接收柜员" prop="receiveCounter">
-                            <el-input :value="form.receiveCounter" @input="(val) => checkName(val, form, 'receiveCounter')"  maxlength="20" ref='receiveCounter'></el-input>
+                            <el-input disabled :value="form.receiveCounter" @input="(val) => checkName(val, form, 'receiveCounter')"  maxlength="20" ref='receiveCounter'></el-input>
                         </el-form-item>
                         <el-form-item label="结束号码" prop="endNumber">
                             <el-input @blur="getBlur" :value="form.endNumber" @input="(val) => {inputListen2(val, form, 'endNumber'); getBlur()}"  maxlength="20" ref='endNumber'></el-input>
@@ -77,7 +77,7 @@ export default {
             needBefore: '',
             form:{
                 voucherType: '',
-                receiveCounter: '',
+                receiveCounter: '002288',
                 endNumber: '',
                 startNumber: '',
                 number: '',
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
index b8ac6a6..39e7260 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashPaid.vue
@@ -153,10 +153,54 @@ export default {
     },
     methods: {
         sure(row) {
-            this.form.clickIt1 = '已领用'
+            if(this.form.clickIt2 === '已退回') {
+                this.$confirm('该项目只能选择将凭证调入或退回凭证，请问是否改为凭证领用?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt1 = '已领用'
+                    this.form.clickIt2 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为凭证领用!'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消凭证领用'
+                    });          
+                });
+                return
+            }else {
+                this.form.clickIt1 = '已领用'
+            }
         },
         back(row) {
-            this.form.clickIt2 = '已退回'
+            if(this.form.clickIt1 === '已领用') {
+                this.$confirm('该项目只能选择将凭证调入或退回凭证，请问是否改为凭证退回?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt2 = '已退回'
+                    this.form.clickIt1 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为退回凭证!'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消退回凭证'
+                    });          
+                });
+                return
+            }else {
+                this.form.clickIt2 = '已退回'
+            }
         },
         submitClick() {
             this.visible = true
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
index d7ed87a..2b8d7c8 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashRecipients.vue
@@ -91,7 +91,7 @@ export default {
         return {
             moduleName,
             headerCellStyle: headerCellStyle,
-            text:'柜员现金轧账',/* 顶部文字 */
+            text:'柜员凭证轧账',/* 顶部文字 */
             visible: false,
             unNeed: false,
             isNeedBefore: '',
@@ -143,10 +143,55 @@ export default {
     },
     methods: {
         sure(row) {
-            this.form.clickIt1 = '已领用'
+            if(this.form.clickIt2 === '已退回') {
+                this.$confirm('该项目只能选择将凭证调入或退回凭证，请问是否改为凭证领用?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt1 = '已领用'
+                    this.form.clickIt2 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为凭证领用!'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消凭证领用'
+                    });          
+                });
+                return
+            }else {
+                this.form.clickIt1 = '已领用'
+            }
+            
         },
         back(row) {
-            this.form.clickIt2 = '已退回'
+            if(this.form.clickIt1 === '已领用') {
+                this.$confirm('该项目只能选择将凭证调入或退回凭证，请问是否改为凭证退回?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                    center: true
+                }).then(() => {
+                    this.form.clickIt2 = '已退回'
+                    this.form.clickIt1 = ''
+                    this.$message({
+                        type: 'success',
+                        message: '当前选择为退回凭证!'
+                    });
+                    }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消退回凭证'
+                    });          
+                });
+                return
+            }else {
+                this.form.clickIt2 = '已退回'
+            }
         },
         submitClick() {
             this.visible = true
diff --git a/src/pages/manage/list/cityWide/cityWideIn.vue b/src/pages/manage/list/cityWide/cityWideIn.vue
index f999fa3..191aff0 100644
--- a/src/pages/manage/list/cityWide/cityWideIn.vue
+++ b/src/pages/manage/list/cityWide/cityWideIn.vue
@@ -1,7 +1,7 @@
 // 存款
 <template>
     <div class="wrap wrap2">
-        <MyTitle :titleArr="['同城交换', '同城提入']"/>
+        <MyTitle :titleArr="['同城交互', '同城提入']"/>
         
         <!-- 存款 -->
         <div class="body">
@@ -13,7 +13,8 @@
                         </el-form-item>
                         <el-form-item label="币种" prop="currency">
                             <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                                <el-option value="CNY人民币">CNY人民币</el-option>
+                                <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId + ''"  :key="item.itemId"> </el-option>
+                                <!-- <el-option value="CNY人民币">CNY人民币</el-option> -->
                             </el-select>
                         </el-form-item>
                         <el-form-item label="提出场次" prop="proposeTime">
@@ -24,7 +25,7 @@
                         </el-form-item>
                         <el-form-item label="票据类型" prop="billType">
                             <el-select v-model="form.billType" placeholder="请选择" ref="billType">
-                                <el-option v-for="item in billTypeSelect" :label="item.itemId" :key="item.itemId" >{{ item.description }}</el-option>
+                                <el-option v-for="item in getSelectList.billTypeSelect" :label="item.options" :value="item.itemId + ''" :key="item.itemId" ></el-option>
                                 <!-- <el-option :label="119">银行本票</el-option>
                                 <el-option :label="120">银行承兑汇票</el-option>
                                 <el-option :label="136">银行汇票</el-option>
@@ -65,7 +66,7 @@
                             <el-input :value="form.voucherNumber" @input="val => checkHanzi(val, form, 'voucherNumber')" ref="voucherNumber"></el-input>
                         </el-form-item>
                         <el-form-item label="交换行名" prop="exchangeName">
-                            <el-input :value="form.exchangeName" disabled @input="val => checkHanzi(val, form, 'exchangeName')" ref="exchangeName"></el-input>
+                            <el-input :value="form.exchangeName" @input="val => checkHanzi(val, form, 'exchangeName')" ref="exchangeName"></el-input>
                         </el-form-item>
                         <el-form-item label="摘要" prop="abstract">
                             <el-input v-model="form.abstract" ref="abstract"></el-input>
@@ -74,55 +75,37 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
         </div>
-
-        <el-dialog
-            style="margin-top:10vh"
-            :visible.sync="visible"
-            :modal="false"
-            width="40%"
-            :close-on-click-modal="false" 
-            :show-close="false" 
-            custom-class="data-dia"
-        >
-            <div slot="title" class="dia-header">
-                <div class="data-title">提交</div>
-            </div>
-            <div class="popBody">
-                <h2>本业务需要授权</h2>
-            </div>
-            <div class="popBtns">
-                <el-button class="close btn" @click="visible = false">取 消</el-button>
-                <el-button class="sure btn" type="primary" @click="visible = false">确 定</el-button>
-            </div>
-        </el-dialog>
     </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
 import { myValidate, ismoney, inputListen, checkHanzi, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
-import { getSubjectInfo } from '@/api/http.js'
 import MyTitle from '@/components/myTitle'
+import MyDialog from '@/components/dialogTwo'
+const moduleName = "cityWide/cityWideIn"
 export default {
     name: 'index',
     components:{
-        MyTitle
+        MyTitle,
+        MyDialog
     },
     data() {
         return {
             text:'存款',/* 顶部文字 */
-            billTypeSelect: [],
+            moduleName,
             form:{
                 // 必填项
                 shroffAccountNumber: '', // 本行收款账号
                 money: '', // 金额
                 accountUsername: '', // 收款户名
-                billType: '银行本票', // 票据类型
+                billType: '', // 票据类型
                 otherAccountNumber: '', // 他行收款账号
                 voucherNumber: '', // 凭证号码
                 // 非必填项
-                currency: 'CNY人民币', // 币种
+                currency: '12', // 币种
                 proposeTime: 1, // 提出场次
                 insertDate: '', // 提入日期
                 otherAccountUsername: '', // 他行收款户名
@@ -131,6 +114,23 @@ export default {
                 customsNumber: '', // 报单号
                 exchangeName: '' // 交换行名
             },
+            formName: {
+                shroffAccountNumber: '本行收款账号', // 
+                money: '金额', // 
+                accountUsername: '收款户名', // 
+                billType: '票据类型', // 
+                otherAccountNumber: '他行收款账号', // 
+                voucherNumber: '凭证号码', // 
+                // 非必填项
+                currency: '币种', // 
+                proposeTime: '提出场次', // 
+                insertDate: '提入日期', // 
+                otherAccountUsername: '他行收款户名', // 
+                exchangeNumber: '交换行号', // 
+                abstract: '摘要', // 
+                customsNumber: '报单号', // 
+                exchangeName: '交换行名' // 
+            },
             rules: {
                 customsNumber: [
                     { 
@@ -304,8 +304,7 @@ export default {
         }
         this.form.insertDate = tmpFunc()
         this.form.exchangeNumber = 20082289056288
-        this.form.exchangeName = '交换行名'
-        this.getSubjectInfo()
+        // this.form.exchangeName = '交换行名'
     },
     mounted() {
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,359'
@@ -316,19 +315,13 @@ export default {
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
-                const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,359'
-                autoPlay(parentId, this.form,  this.myTable2, this.myTable)
+                this.visible = true
             }, this.$refs));
         },
-        async getSubjectInfo() {
-            const { data: { items } } = await getSubjectInfo({
-                subject_id: 57
-            })
-            this.billTypeSelect.push(...items)
+        submitForm2() {
+            const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,359'
+            autoPlay(parentId, this.form,  this.myTable2, this.myTable)
         },
-//         export const getSubjectInfo= (params) => {
-//     return get( '/judgment/lcSubject/getSubjectInfo',params)
-// }
         getFocus() {
             if(!this.form.shroffAccountNumber) {
                 this.$message({
@@ -347,6 +340,11 @@ export default {
         inputListen: inputListen,
         checkHanzi: checkHanzi,
         checkName: checkName
+    },
+    computed: {
+        ...mapGetters({
+            getSelectList: 'system/getSelectList'
+        })
     }
 };
 </script>
diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue
index 5b1b023..d9e4f49 100644
--- a/src/pages/manage/list/cityWide/cityWideOut.vue
+++ b/src/pages/manage/list/cityWide/cityWideOut.vue
@@ -1,7 +1,7 @@
 // 存款
 <template>
     <div class="wrap wrap2">
-        <MyTitle :titleArr="['同城交换', '同城提出']"/>
+        <MyTitle :titleArr="['同城交互', '同城提出']"/>
         
         <!-- 存款 -->
         <div class="body">
@@ -13,7 +13,8 @@
                         </el-form-item>
                         <el-form-item label="币种" prop="currency">
                             <el-select v-model="form.currency" placeholder="请选择" ref="currency">
-                                <el-option value="CNY人民币">CNY人民币</el-option>
+                                <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId + ''"  :key="item.itemId"> </el-option>
+                                <!-- <el-option label="CNY人民币" value="12"></el-option> -->
                             </el-select>
                         </el-form-item>
                         <el-form-item label="提出场次" prop="proposeTime">
@@ -24,15 +25,20 @@
                         </el-form-item>
                         <el-form-item label="票据类型" prop="billType">
                             <el-select v-model="form.billType" placeholder="请选择" ref="billType">
-                                 <el-option v-for="item in billTypeSelect" :label="item.itemId" :key="item.itemId" >{{ item.description }}</el-option>
+                                <el-option v-for="item in getSelectList.billTypeSelect" :label="item.options" :key="item.itemId" :value="item.itemId + ''" ></el-option>
+                                <!-- <el-option :label="119" :key="item.itemId" :value="item.itemId" ></el-option> -->
                             </el-select>
                         </el-form-item>
                         <el-form-item label="出票日期" prop="drawBillDate">
+
                             <el-date-picker
                                 v-model="form.drawBillDate"
                                 type="date"
                                 placeholder="选择日期"
-                                ref="drawBillDate">
+                                ref="drawBillDate"
+                                format="yyyy-MM-dd"
+                                value-format="yyyy-MM-dd"
+                                >
                             </el-date-picker>
                         </el-form-item>
                         
@@ -67,61 +73,61 @@
                 </el-form>
             </el-row>
             <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
         </div>
-
-        <el-dialog
-            style="margin-top:10vh"
-            :visible.sync="visible"
-            :modal="false"
-            width="40%"
-            :close-on-click-modal="false" 
-            :show-close="false" 
-            custom-class="data-dia"
-        >
-            <div slot="title" class="dia-header">
-                <div class="data-title">提交</div>
-            </div>
-            <div class="popBody">
-                <h2>本业务需要授权</h2>
-            </div>
-            <div class="popBtns">
-                <el-button class="close btn" @click="visible = false">取 消</el-button>
-                <el-button class="sure btn" type="primary" @click="visible = false">确 定</el-button>
-            </div>
-        </el-dialog>
     </div>
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 import { myValidate, ismoney, inputListen, checkHanzi, checkName, autoPlay, autoPlay2 } from '@/utils/utilFunction.js'
 import MyTitle from '@/components/myTitle'
+import MyDialog from '@/components/dialogTwo'
+const moduleName = "cityWide/cityWideOut"
+import { getSubjectInfo, addOperation, getOperation } from '@/api/http';
 export default {
     name: 'index',
     components:{
-        MyTitle
+        MyTitle,
+        MyDialog
     },
     data() {
         return {
             text:'存款',/* 顶部文字 */
             visible: false,
-            billTypeSelect: [],
+            // billTypeSelect: [],
+            moduleName,
             form:{
                 // 必填项
                 shroffAccountNumber: '', // 本行收款账号
                 money: '', // 金额
                 shroffAccountUsername: '', // 本行收款户名
-                billType: '银行本票', // 票据类型
+                billType: '', // 票据类型
                 otherAccountNumber: '', // 他行收款账号
                 voucherNumber: '', // 凭证号码
                 // 非必填项
-                currency: 'CNY人民币', // 币种
+                currency: '12', // 币种
                 proposeTime: 1, // 提出场次
                 proposeDate: '', // 提出日期
                 otherAccountUsername: '', // 其他收款户名
                 drawBillDate: '', // 出票日期
                 abstract: '', // 摘要
             },
+            formName: {
+                shroffAccountNumber: '本行收款账号', // 
+                money: '金额', // 
+                shroffAccountUsername: '本行收款户名', // 
+                billType: '票据类型', // 
+                otherAccountNumber: '他行收款账号', // 
+                voucherNumber: '凭证号码', // 
+                // 非必填项
+                currency: '币种', // 
+                proposeTime: '提出场次', // 
+                proposeDate: '提出日期', // 
+                otherAccountUsername: '其他收款户名', // 
+                drawBillDate: '出票日期', // 
+                abstract: '摘要', // 
+            },
             rules: {
                 drawBillDate: [
                     { 
@@ -289,27 +295,60 @@ export default {
             return y + '-' + m + '-' + d; 
         }
         this.form.proposeDate = tmpFunc()
-        this.getSubjectInfo()
+        
+        // this.form.billType = this.billTypeSelect[0].itemId;
     },
     mounted() {
-         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,346'
-         autoPlay2(parentId, this.form, this.myTable2, this.myTable)
-         this.$refs.shroffAccountNumber.focus()
+         
+        this.$refs.shroffAccountNumber.focus()
+        const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,346'
+        autoPlay2(parentId, this.form, this.myTable2, this.myTable)
     },
     methods: {
-        async getSubjectInfo() {
-            const { data: { items } } = await getSubjectInfo({
-                subject_id: 57
-            })
-            this.billTypeSelect.push(...items)
-        },
         submitForm() {
             this.$refs.form.validate(myValidate(() => {
                 // 验证通过逻辑写在这
-                const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,346'
-                autoPlay(parentId, this.form,  this.myTable2, this.myTable)
+                // const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,346'
+                this.visible = true;
             }, this.$refs));
         },
+        submitForm2() {
+            let projectId = sessionStorage.getItem('projectId')
+            let startTime = sessionStorage.getItem('startTime')
+            const formList = []
+            formList.push({"answerId":'347',"emptyOne": 54, "emptyTwo": this.form.shroffAccountNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'348',"emptyOne": 8, "emptyTwo": this.form.currency, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+
+            formList.push({"answerId":'349',"emptyOne": 14, "emptyTwo": this.form.money, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'350',"emptyOne": 55, "emptyTwo": this.form.proposeTime, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'351',"emptyOne": 56, "emptyTwo": this.form.proposeDate, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'352',"emptyOne": 57, "emptyTwo": this.form.billType, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'353',"emptyOne": 58, "emptyTwo": this.form.shroffAccountUsername, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'354',"emptyOne": 59, "emptyTwo": this.form.otherAccountNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+
+            formList.push({"answerId":'355',"emptyOne": 60, "emptyTwo": this.form.drawBillDate, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'356',"emptyOne": 44, "emptyTwo": this.form.voucherNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'357',"emptyOne": 61, "emptyTwo": this.form.shroffAccountUsername, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+            formList.push({"answerId":'358',"emptyOne": 16, "emptyTwo": this.form.abstract, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346","type": "3"})
+
+           
+            let params= {
+                parentId: "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +",287,5,29,345,346",
+                lcJudgmentRuleReq:formList,
+                projectId:+projectId,
+                startTime:startTime,
+            }
+            
+            addOperation(params).then((data)=>{
+                //   this.$message({
+                //       message: '提交成功',
+                //       type: 'success'
+                //   });
+                // this.setNeedsModule(moduleName)
+                // this.setDataFlow({ ...this.form })
+            }).catch((error)=>{
+            })
+        },
         getFocus() {
             // console.log('test')
             if(!this.form.shroffAccountNumber) {
@@ -331,6 +370,14 @@ export default {
         inputListen: inputListen,
         checkHanzi: checkHanzi,
         checkName: checkName
+    },
+    computed: {
+        // ...mapState({
+        //     billTypeSelect: state => state.select.billTypeSelect
+        // }),
+        ...mapGetters({
+            getSelectList: 'system/getSelectList'
+        })
     }
 };
 </script>
diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue
index 83a0096..aa837c8 100644
--- a/src/pages/manage/list/dayEnd/branchDayEnd.vue
+++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue
@@ -26,6 +26,7 @@ import { myValidate, checkHanzi } from '@/utils/utilFunction.js'
 import { mapState, mapMutations, mapGetters } from 'vuex'
 import MyTitle from '@/components/myTitle'
 import MyDialog from '@/components/dialogTwo'
+import { addOperation, getOperation } from '@/api/http';
 export default {
     name: 'index',
     components:{
diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue
index 748ea32..3a56834 100644
--- a/src/pages/manage/list/dayEnd/tellerCash.vue
+++ b/src/pages/manage/list/dayEnd/tellerCash.vue
@@ -14,7 +14,7 @@
                     </el-col>
                     <el-col :span="10" :offset="1">
                         <el-form-item label="柜员号" prop="counterNumber">
-                            <el-input :value="form.counterNumber" @input="(val) => inputListen(val, form, 'counterNumber')" ref="counterNumber"></el-input>
+                            <el-input disabled :value="form.counterNumber" @input="(val) => inputListen(val, form, 'counterNumber')" ref="counterNumber"></el-input>
                         </el-form-item>
                     </el-col>
                     <!-- <el-col :span="20" :offset="2">
@@ -80,7 +80,7 @@ export default {
             visible: false,
             form:{
                 date: '',
-                counterNumber: ''
+                counterNumber: '002288'
             },
             formName: {
                 date: '日期',
diff --git a/src/pages/manage/list/dayEnd/tellerCertificate.vue b/src/pages/manage/list/dayEnd/tellerCertificate.vue
index d544da4..800ea8c 100644
--- a/src/pages/manage/list/dayEnd/tellerCertificate.vue
+++ b/src/pages/manage/list/dayEnd/tellerCertificate.vue
@@ -15,7 +15,7 @@
                     </el-col>
                     <el-col :span="10" :offset="1">
                         <el-form-item label="柜员号" prop="counterNumber">
-                            <el-input :value="form.counterNumber" @input="(val) => checkHanzi(val, form, 'counterNumber')"></el-input>
+                            <el-input disabled :value="form.counterNumber" @input="(val) => checkHanzi(val, form, 'counterNumber')"></el-input>
                         </el-form-item>
                     </el-col>
                     <!-- <el-col :span="20" :offset="2">
@@ -96,7 +96,7 @@ export default {
             visible: false,
             form:{
                 date: '',
-                counterNumber: '',
+                counterNumber: '002288',
 
             },
             formName:{
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index b822f62..3d0ad0f 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -71,9 +71,9 @@ const allGoods = {
     466: {name:'密码挂失申请书凭证联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:466},
     468: {name:'密码挂失申请书回单',src:require('@/assets/img/goods/businessReportMissUser.png'),id:468},
     467: {name:'密码挂失申请书银行留存联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:467},
-    413: {name:'支票领购单',src:require('@/assets/img/goods/businessReportMissUser.png'),id:413},
-    480: {name:'支票领购单回单',src:require('@/assets/img/goods/businessReportMissUser.png'),id:480},
-    488: {name:'支票领购单凭证联',src:require('@/assets/img/goods/businessReportMissUser.png'),id:488},
+    413: {name:'支票领购单',src:require('@/assets/img/goods/CheckCoupons.png'),id:413},
+    480: {name:'支票领购单回单',src:require('@/assets/img/goods/CheckCoupons.png'),id:480},
+    488: {name:'支票领购单凭证联',src:require('@/assets/img/goods/CheckCoupons.png'),id:488},
     481: {name:'业务收费凭证回单',src:require('@/assets/img/goods/ywsfpz.png'),id:481},
     482: {name:'业务收费凭证凭证联',src:require('@/assets/img/goods/ywsfpz.png'),id:482},
 
@@ -103,7 +103,7 @@ const voucherNumber = (() => {
     const $chars = '1234567890';
     const maxPos = $chars.length;
     let str = '';
-    for (let i = 0; i < 8; i++) {
+    for (let i = 0; i < 12; i++) {
         str += $chars.charAt(Math.floor(Math.random() * maxPos));
     }
     return '6227' + str;
@@ -259,6 +259,7 @@ const myInitState =  {
             interest: '0.1',
             balance: 666,
             totalMoney: '',
+            transMoney: 5000
         }
     },
     '业务三': {
@@ -2376,6 +2377,14 @@ export default {
                     }).catch((error)=>{})
                 }
             }
+
+            getSubjectInfo({
+                subject_id: 57
+            }).then((data) => {
+                if(data.status == 200){
+                    state.selectList.billTypeSelect = data.data.items;
+                }
+            })
         },
         setPopId(state, id) {
             state.id = id