20240205
luoJunYong.123 3 years ago
parent b682f02f0c
commit 8d730ceb8e
  1. 13
      src/components/checkPhoto/index.vue
  2. 3
      src/components/selectBusiness/index.vue
  3. 2
      src/mixins/saveSystemModule/index.js
  4. 19
      src/mixins/tipsBefore/index.js
  5. 50
      src/pages/counter/list/index.vue
  6. 3
      src/pages/counter/list/myConfig.js
  7. 1
      src/pages/manage/list/acceptanceDraft/invoice.vue
  8. 2
      src/pages/manage/list/cityWide/cityWideIn.vue
  9. 3
      src/store/modules/system.js

@ -6,14 +6,17 @@
<!-- 这个部分调整关闭按钮的位置因为有些图片关闭按钮会覆盖到一些东西 -->
<template v-if="imgSrcId==413">
<img class="absolute cursor-pointer hover:bg-red-700 bg-red-50" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 20px; top: 10px;" />
<template v-if="imgSrcId==15">
<img class="absolute cursor-pointer hover:bg-red-700 bg-red-50" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 50px; top: 30px;width: 30px;height: 30px;" />
</template>
<template v-else-if="imgSrcId==14">
<img class="absolute cursor-pointer hover:bg-red-700 bg-red-50" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 3px; top: 3px;" />
<template v-else-if="imgSrcId==13">
<img class="absolute cursor-pointer hover:bg-red-700 bg-red-50" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 50px; top: 30px;width: 30px;height: 30px;" />
</template>
<template v-else-if="imgSrcId==23">
<img class="absolute cursor-pointer hover:bg-red-700 bg-red-50" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 50px; top: 30px;width: 30px;height: 30px;" />
</template>
<template v-else>
<img class="absolute cursor-pointer hover:bg-red-700 bg-red-300" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 50px; top: 30px;" />
<img class="absolute cursor-pointer hover:bg-red-700 bg-red-300" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 3px; top: 3px;width: 30px;height: 30px;" />
</template>

@ -100,6 +100,7 @@ export default {
// systemselectBusinessid
this.setBusinessKey(this.takeCheck)
// this.$store.dispatch('system/getJudgeData')
// id
if(!this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id) {
this.$message({
type: 'info',
@ -107,6 +108,8 @@ export default {
});
return
}
//
this.setShowBusiness(false)
// clearStore

@ -1,6 +1,6 @@
export default {
// 保存vuex中的数据
// 保存vuex中的数据 混入三大模块,让页面刷新的时候可以保存当前选择的业务。
created() {
if(sessionStorage.getItem('businessSelect')) {

@ -76,7 +76,7 @@ export default {
},
methods: {
// 暴露出外面的方法,可以提交后删存的数据
// 暴露出外面的方法,可以提交后删除调在sessionStorage中的的数据,因为有后端缓存了。
clearSaveData() {
sessionStorage.removeItem(this.moduleName)
}
@ -93,9 +93,13 @@ export default {
tmpForm[key] = this.form[key]
}
}
// 系统录入当前页面关闭或离开的时候,保存当前模块的数据。回来的时候这些数据还在(业务需求)。
sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
if(!this.unNeed) {
// 之前做的是当前页面如果不是项目需要则不保存数据。
// if(!this.unNeed) {
// let tmpForm = {}
// for(const key in this.form) {
// if(this.form[key] !== '') {
@ -103,12 +107,13 @@ export default {
// }
// }
// sessionStorage.setItem(this.moduleName, JSON.stringify(tmpForm))
}
// }
if(this.tipsNefore) {
clearInterval(this.tipsNefore)
this.tipsNefore = null
}
// if(this.tipsNefore) {
// clearInterval(this.tipsNefore)
// this.tipsNefore = null
// }
},
computed: {

@ -215,14 +215,14 @@
</div>
<div v-else-if="popText==='印章盒'" class=" seal 2xl:w-7/12 xl:w-9/12 lg:w-full h-5/6 max-h-full ">
<div class="left min-h-full">
<div class="left min-h-full sealLeft">
<!-- dblClickFn(item) -->
<div v-for="(item, index) in sealArr" :key="item.id" :class="{ checked: sealChecked.includes(item.id),file:true }" @click="checkSeal(item.id)">
<div v-for="(item, index) in sealArr" :key="item.id" :class="{ checked: sealChecked.includes(item.id),file:true, sealFile: true }" @click="checkSeal(item.id)">
<img :src="item.src" :alt="item.name" :title="item.name" />
<p>{{item.name}}</p>
</div>
</div>
<div class="bg-gray-400 box right min-h-full" ref="popUpSeal">
<div class="bg-gray-400 box right min-h-full sealRight" ref="popUpSeal">
<!-- receptionList -->
<div class="img-wrap2 relative" :class="{ checked: commonChecked.includes(item.id) }" v-for="(item, index) in goodState" @click='dislodgeItem(index)' :key="item.id" >
<img v-if="item.name.includes('复印件')" :src="item.src" class="fileSeal" :alt="item.name" :title="item.name" />
@ -2904,6 +2904,25 @@ export default {
background: url(../../../assets/img/data-frame.png) 0 0 / cover no-repeat;
cursor: pointer;
margin: 5px 7px;
&.sealFile {
width: 135px;
height: 135px;
img, .el-image {
width: 70px;
height: 70px;
top: 6px;
left: 50%;
}
&.checked {
background: url(../../../assets/img/data-frame-checked.png) 0 0 / cover no-repeat,
url(../../../assets/svg/checked.svg) 105px 7% / auto no-repeat;
p {
color: #fff;
}
}
}
&:last-child {
margin-right: 0;
@ -2949,6 +2968,7 @@ export default {
margin-right: 0;
}
}
}
.right{
margin-left: 5%;
@ -3034,7 +3054,7 @@ export default {
min-height: 65vh;
z-index: 9980;
.seal{
margin-top: -5vh;
margin-top: -3vh;
// max-height: 40vh;
//overflow: auto;
//display: flex;
@ -3057,8 +3077,30 @@ export default {
p {
line-height: 4vh;
}
&.sealFile {
width: 120px;
height: 120px;
img, .el-image {
width: 50px;
height: 50px;
top: 6px;
left: 50%;
}
&.checked {
background: url(../../../assets/img/data-frame-checked.png) 0 0 / cover no-repeat,
url(../../../assets/svg/checked.svg) 90px 7% / auto no-repeat;
p {
color: #fff;
}
}
}
}
}
//
.sealRight {
min-height: 42vh!important;
}
.box{
//background-color: red;
border: 2px solid #e6e6e6;

@ -1,3 +1,6 @@
// 刷卡的配置文件,map结构,避免写太多if,else,配置更方便。有很多地方刷银行卡和身份证的。
const myConfig = {
'99': {
nbm: 118,

@ -164,6 +164,7 @@ export default {
serviceCharge: '' //
},
//
rules: {
currencyType: [

@ -38,7 +38,7 @@
<el-input :value="form.exchangeNumber" disabled @input="val => checkHanzi(val, form, 'exchangeNumber')" ref="exchangeNumber"></el-input>
</el-form-item>
<el-form-item label="报单号" prop="customsNumber">
<el-input :value="form.customsNumber" maxlength="15" @input="val => checkHanzi(val, form, 'customsNumber')" ref="customsNumber"></el-input>
<el-input v-model="form.customsNumber" maxlength="15" ref="customsNumber"></el-input>
</el-form-item>
</el-col>

@ -122,9 +122,8 @@ const mailNumber = '518052'
const eMailAddress = '666@qq.com'
const drawerUsername = '12802851701099' // 出票人账号
// 银行卡号码随机
const voucherNumber = '6227007200582226'
// 业务一的卡二号码
const voucherNumber2 = '6227007200582345'
const sex = 2 // 1为男,2为女。

Loading…
Cancel
Save