t pushMerge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_bankTeaching

20240205
yujialong 3 years ago
commit a845063a29
  1. 86
      src/components/checkPhoto/index.vue
  2. 8
      src/components/dialog/index.vue
  3. 68
      src/pages/counter/list/index.vue
  4. 29
      src/pages/manage/list/ImportantCash/controlCash3/index.vue
  5. 3
      src/pages/manage/list/servicesAccount/passwordChange.vue
  6. 2
      src/plugins/drag/index.js

@ -1,5 +1,5 @@
<template> <template>
<div class="relative -translate-y-2/4" style="margin-top: 10px;color: black;" id="checkPhoto"> <div class="relative -translate-y-2/4" style="margin-top: 10px;color: black;" id="checkPhoto" v-drag>
<!-- <div class="bg-gray-400" @click="closeIt">关闭</div> --> <!-- <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;" /> <img class="absolute cursor-pointer hover:bg-red-700" src="@/assets/svg/close.svg" alt="" @click="closeIt" style="right: 50px; top: 30px;" />
@ -14,26 +14,24 @@
<h3 class="subpixel-antialiased text-xl text-center absolute" style="left: 340px;top: 230px;">{{ dataFlow.phone }}</h3> <h3 class="subpixel-antialiased text-xl text-center absolute" style="left: 340px;top: 230px;">{{ dataFlow.phone }}</h3>
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 76px;top: 250px;"></h3> <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 76px;top: 250px;"></h3>
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 169px;top: 432px;"></h3> <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 169px;top: 432px;"></h3>
<img :src="imgSrc" class="imgPop imgIndex min-w-full " :alt="imgSrcName" :title="imgSrcName"> <!-- <img :src="imgSrc" class="imgPop imgIndex min-w-full " :alt="imgSrcName" :title="imgSrcName"> -->
</template> </template>
<template v-else-if="imgSrcId==13 || imgSrcId==442 || imgSrcId==23 || imgSrcId==431"> <template v-else-if="imgSrcId==13 || imgSrcId==442 || imgSrcId==23 || imgSrcId==431">
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 100px;top: 82px;">姓名{{ dataFlow.userName }}</h3> <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 100px;top: 82px;">姓名{{ dataFlow.userName }}</h3>
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 100px;top: 160px;">性别{{ dataFlow.sex==1? '男': '女' }}</h3> <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 100px;top: 160px;">性别{{ dataFlow.sex==1? '男': '女' }}</h3>
<!-- <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 270px;top: 115px;"></h3> --> <!-- <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 270px;top: 115px;"></h3> -->
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 80px;top: 232px;">生日{{ dataFlow.birthday }}</h3> <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 98px;top: 232px;">生日{{ dataFlow.birthday }}</h3>
<!-- <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 220px;top: 177px;">{{ dataFlow.birthday.split('-')[1] }}</h3> <!-- <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 220px;top: 177px;">{{ dataFlow.birthday.split('-')[1] }}</h3>
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 290px;top: 187px;">{{ dataFlow.birthday.split('-')[2] }}</h3> --> <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 290px;top: 187px;">{{ dataFlow.birthday.split('-')[2] }}</h3> -->
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 90px;top: 277px;">地址{{ dataFlow.mailbox }}</h3> <h3 class="subpixel-antialiased text-xl text-center absolute" style="left: 105px;top: 282px;">地址{{ dataFlow.mailbox }}</h3>
<h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 90px;top: 353px;">身份证号码{{ dataFlow.idNumber }}</h3> <h3 class="subpixel-antialiased text-2xl text-center absolute" style="left: 99px;top: 353px;">NO.{{ dataFlow.idNumber }}</h3>
<img :src="imgSrc" class="imgPop imgIndex min-w-full " :alt="imgSrcName" :title="imgSrcName"> <!-- <img :src="imgSrc" class="imgPop imgIndex min-w-full dia-header" :alt="imgSrcName" :title="imgSrcName"> -->
</template> </template>
<template v-else-if="imgSrcId==412"> <template v-else-if="imgSrcId==412">
<h3 class="subpixel-antialiased text-xs text-center absolute" style="left: 820px;top: 123px;">12802851701099</h3> <h3 class="subpixel-antialiased text-xs text-center absolute" style="left: 820px;top: 123px;">12802851701099</h3>
<h3 class="subpixel-antialiased text-xs text-center absolute" style="left: 357px;top: 123px;">袋鼠互联网科技有限公司</h3> <h3 class="subpixel-antialiased text-xs text-center absolute" style="left: 357px;top: 123px;">袋鼠互联网科技有限公司</h3>
<img :src="imgSrc" class="imgPop imgIndex min-w-full " style="min-width: 1000px;" :alt="imgSrcName" :title="imgSrcName" >
</template> </template>
<img :src="imgSrc" class="imgPop imgIndex min-w-full dia-header" :alt="imgSrcName" :title="imgSrcName" ref="showPage">
<slot /> <slot />
</div> </div>
@ -42,6 +40,7 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { getOperation } from '@/api/http'; import { getOperation } from '@/api/http';
import Sortable from 'sortablejs'
export default { export default {
props: { props: {
@ -55,10 +54,10 @@ export default {
imgSrcName: { imgSrcName: {
require: true require: true
}, },
// showImg: { showImg: {
// type: Boolean, type: Boolean,
// default: false default: false
// } }
// requireTalk: { // requireTalk: {
// type: String, // type: String,
// default: '' // default: ''
@ -72,67 +71,30 @@ export default {
// } // }
}, },
mounted() { mounted() {
// console.log('---showImg') // new Sortable(this.$refs.showPage, {
// console.log(this.showImg) // animation: 150,
const allH3 = document.querySelectorAll('h3'); // group: {
for(let i=0; i<allH3.length; i++) { // name:'shared',
allH3[i].addEventListener('click', (e) => { // pull:'clone',//
console.log(e) // put:false//
e.stopPropagation(); // },
})
}
// document.getElementById('checkPhoto').addEventListener('click',(e) => {
// console.log(e)
// }) // })
console.log(this.$refs.showPage)
}, },
watch: { watch: {
showImg: { showImg: {
handler(newVal) { handler(newVal) {
console.log(newVal) if(newVal) {
}
}, },
immediate: true immediate: true
} }
//
// imgSrc: {
// handler(newVal) {
// if(newVal) {
// getOperation({
// parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,8'
// }).then((data)=>{
// const stampJudge = {
// 18: {add:[24, 21], delete: [14]},
// 452:{ add: [432, 433] },
// 458:{ add: [419, 418], delete: [426]},
// 459:{ add: [478, 477], delete: [407]},
// 460:{ add: [466,468,467], delete: [406]},
// 463:{ add: [480, 488], delete: [413]},
// 464:{ add: [482, 481], delete: [479]},
// 444:{ add: [420, 421], delete: [425]},
// 445:{ add: [422, 424], delete: [427]},
// 446:{ add: [419, 418], delete: [426]},
// 447:{ add: [269, 22], delete: [17]},
// 455:{ add: [487, 441], delete: [409]},
// 456:{ add: [473, 472], delete: [411]},
// 457:{ add: [476, 474], delete: [412]}
// }
// if(data.status == 200 && data.data.judgmentRuleReqs) {
// // const list = data.data.judgmentRuleReqs.map(item => item.answerId)
// console.log(data.data.judgmentRuleReqs)
// }
// })
// }
// },
// immediate: true
// }
}, },
methods: { methods: {
test() {
console.log('xxxx')
},
closeIt() { closeIt() {
this.$emit('update:showImg', false) this.$emit('update:showImg', false)
}, }
}, },
computed: { computed: {

@ -366,16 +366,24 @@ export default {
if(num%2 === 0) { if(num%2 === 0) {
if(nameMap[key]) { if(nameMap[key]) {
this.leftObj[this.formName[key]] = nameMap[key][this.showForm[key]] this.leftObj[this.formName[key]] = nameMap[key][this.showForm[key]]
}else {
if(this.formName[key].indexOf('密码') !== -1) {
this.leftObj[this.formName[key]] = '******'
}else { }else {
this.leftObj[this.formName[key]] = this.showForm[key] this.leftObj[this.formName[key]] = this.showForm[key]
} }
}
}else { }else {
if(nameMap[key]) { if(nameMap[key]) {
this.rightObj[this.formName[key]] = nameMap[key][this.showForm[key]] this.rightObj[this.formName[key]] = nameMap[key][this.showForm[key]]
}else {
if(this.formName[key].indexOf('密码') !== -1) {
this.rightObj[this.formName[key]] = '******'
}else { }else {
this.rightObj[this.formName[key]] = this.showForm[key] this.rightObj[this.formName[key]] = this.showForm[key]
} }
} }
}
num++; num++;
} }
// A1000000019 // A1000000019

@ -27,7 +27,7 @@
<div class="sth summons cp" @click="showData('传票栏',1)"> <div class="sth summons cp" @click="showData('传票栏',1)">
<img v-lazy="lazyImg[6]" alt="" /> <img v-lazy="lazyImg[6]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0" alt="" v-if="finishGoods.cultureIn"> <!-- <img v-lazy="finishPng" class="absolute" style="top: 0" alt="" v-if="finishGoods.cultureIn"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -38,7 +38,7 @@
</div> </div>
<div class="sth voucher-box cp" @click="showData('普通凭证箱',2)"> <div class="sth voucher-box cp" @click="showData('普通凭证箱',2)">
<img class="" v-lazy="lazyImg[8]" alt="" /> <img class="" v-lazy="lazyImg[8]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0" alt="" v-if="finishGoods.proofBox"> <!-- <img v-lazy="finishPng" class="absolute" style="top: 0" alt="" v-if="finishGoods.proofBox"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -49,7 +49,7 @@
</div> </div>
<div class="sth important cp" @click="showData('重要空白凭证箱',3)"> <div class="sth important cp" @click="showData('重要空白凭证箱',3)">
<img v-lazy="lazyImg[10]" alt="" /> <img v-lazy="lazyImg[10]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: -40px;" alt="" v-if="finishGoods.proofImportantBox"> <!-- <img v-lazy="finishPng" class="absolute" style="top: -40px;" alt="" v-if="finishGoods.proofImportantBox"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -60,7 +60,7 @@
</div> </div>
<div class="sth money-box cp" @click="showData('钱箱',4)"> <div class="sth money-box cp" @click="showData('钱箱',4)">
<img v-lazy="lazyImg[12]" alt="" /> <img v-lazy="lazyImg[12]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" title="钱箱已操作" v-if="finishGoods.moneyBox"> <!-- <img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" title="钱箱已操作" v-if="finishGoods.moneyBox"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -71,7 +71,7 @@
</div> </div>
<div class="sth seal-box cp" @click="showData('印章盒',5)"> <div class="sth seal-box cp" @click="showData('印章盒',5)">
<img v-lazy="lazyImg[14]" alt="" /> <img v-lazy="lazyImg[14]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.sealBox"> <!-- <img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.sealBox"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -82,7 +82,7 @@
</div> </div>
<div class="sth currency-detector cp" @click="showData('验钞机',6)"> <div class="sth currency-detector cp" @click="showData('验钞机',6)">
<img v-lazy="lazyImg[16]" alt="" /> <img v-lazy="lazyImg[16]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.currencyDetector"> <!-- <img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.currencyDetector"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -93,7 +93,7 @@
</div> </div>
<div class="sth printer cp" @click="showData('打印机',7)"> <div class="sth printer cp" @click="showData('打印机',7)">
<img v-lazy="lazyImg[18]" alt="" /> <img v-lazy="lazyImg[18]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.printer"> <!-- <img v-lazy="finishPng" class="absolute" style="top: 0px;left: 0px;" v-if="finishGoods.printer"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -127,7 +127,7 @@
</div> </div>
<div class="sth card-machine cp" @click="showData('刷卡器',10)"> <div class="sth card-machine cp" @click="showData('刷卡器',10)">
<img v-lazy="lazyImg[24]" alt="" /> <img v-lazy="lazyImg[24]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: -20px;left: 0px;" v-if="finishGoods.swipingCard"> <!-- <img v-lazy="finishPng" class="absolute" style="top: -20px;left: 0px;" v-if="finishGoods.swipingCard"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -138,7 +138,7 @@
</div> </div>
<div class="sth idCard-scanner cp" @click="showData('身份证扫描仪',11)"> <div class="sth idCard-scanner cp" @click="showData('身份证扫描仪',11)">
<img v-lazy="lazyImg[26]" alt="" /> <img v-lazy="lazyImg[26]" alt="" />
<img v-lazy="finishPng" class="absolute" style="top: -20px;left: 0px;" v-if="finishGoods.idCard"> <!-- <img v-lazy="finishPng" class="absolute" style="top: -20px;left: 0px;" v-if="finishGoods.idCard"> -->
</div> </div>
</el-tooltip> </el-tooltip>
@ -397,15 +397,16 @@
</div> </div>
<div v-show="showImg" style="z-index: 9999;" > <div v-show="showImg" style="z-index: 9999;" >
<div v-drag class="relative w-screen h-screen"> <!-- <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: 850px;height: 50px;line-height: 50px;" ref="imgCheckDrag">--单击此处可拖拽--</div> --> <!-- <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" class="dia-header" style="width: 850px;z-index: 9990;" ref="imgCheckDrag">
<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"> <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"> <seal-name v-for="item in isSeal(imgSrcId)" :key="item.id" :item="item">
</seal-name> </seal-name>
</div> </div>
</check-photo> </check-photo>
</div> <!-- </div> -->
</div> </div>
@ -961,17 +962,7 @@ export default {
this.imgSrcId = '' this.imgSrcId = ''
this.imgSrcName = '' this.imgSrcName = ''
}else { }else {
this.$nextTick(() => {
console.log(this.$refs.imgCheckDrag)
new Sortable(this.$refs.imgCheckDrag, {
animation: 150,
group: {
name:'shared',
pull:'clone',//
put:false//
},
})
})
} }
@ -1042,12 +1033,14 @@ export default {
}, },
id(newVal) { id(newVal) {
}, },
businessKey: { // businessKey: {
handler(newVal) { // handler(newVal) {
this.getThingsCache() // this.getThingsCache()
}, // },
immediate: true // immediate: true
}, // },
// 'passwordForm.password'(newVal) { // 'passwordForm.password'(newVal) {
// // passwordForm:{ // // passwordForm:{
// // password:'', // // password:'',
@ -1096,7 +1089,7 @@ export default {
}) })
this.startPlay() this.startPlay()
this.getThingsCache(); // this.getThingsCache();
}, },
mounted(){ mounted(){
@ -1104,7 +1097,18 @@ export default {
let that = this let that = this
// //
this.$nextTick(() => {
// console.log('wokao')
// console.log(this.$refs.imgCheckDrag)
// new Sortable(this.$refs.imgCheckDrag, {
// animation: 150,
// group: {
// name:'shared',
// pull:'clone',//
// put:false//
// },
// })
})
// - // -
new Sortable(this.$refs.goods, { new Sortable(this.$refs.goods, {
animation: 150, animation: 150,

@ -30,9 +30,10 @@
<el-option label="银行" :value="127"> </el-option> <el-option label="银行" :value="127"> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="凭证起始号" prop="startNumber"> <el-form-item label="凭证终止号" prop="endNumber">
<el-input :value="form.startNumber" @input="val => inputListen(val, form, 'startNumber')" ref="startNumber"></el-input> <el-input :value="form.endNumber" @blur="getBlur()" @input="val => inputListen(val, form, 'endNumber')" ref="endNumber"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="收费类型" prop="chargeWay2"> <el-form-item label="收费类型" prop="chargeWay2">
<el-select v-model="form.chargeWay2" placeholder="请选择" ref="chargeWay2"> <el-select v-model="form.chargeWay2" placeholder="请选择" ref="chargeWay2">
<el-option label="现金" :value="135"> </el-option> <el-option label="现金" :value="135"> </el-option>
@ -46,8 +47,8 @@
<el-form-item label="客户名称" prop="customerName"> <el-form-item label="客户名称" prop="customerName">
<el-input :value="form.customerName" disabled @input="(val) => checkHanzi(val, form, 'customerName')" ref="customerName" ></el-input> <el-input :value="form.customerName" disabled @input="(val) => checkHanzi(val, form, 'customerName')" ref="customerName" ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="凭证终止号" prop="endNumber"> <el-form-item label="凭证起始号" prop="startNumber">
<el-input :value="form.endNumber" @blur="getBlur()" @input="val => inputListen(val, form, 'endNumber')" ref="endNumber"></el-input> <el-input :value="form.startNumber" @input="val => inputListen(val, form, 'startNumber')" ref="startNumber"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="数量" prop="number"> <el-form-item label="数量" prop="number">
<el-input :value="form.number" disabled @input="val => inputListen(val, form, 'number')" ref="number" ></el-input> <el-input :value="form.number" disabled @input="val => inputListen(val, form, 'number')" ref="number" ></el-input>
@ -192,7 +193,14 @@ export default {
message: '请输入凭证起始号', message: '请输入凭证起始号',
trigger: 'blur' trigger: 'blur'
} }
] ],
endNumber: [
{
required: true,
message: '请输入凭证起始号',
trigger: 'blur'
}
],
} }
} }
}, },
@ -218,7 +226,13 @@ export default {
setTipsOperate: 'system/setTipsOperate' setTipsOperate: 'system/setTipsOperate'
}), }),
onBlur() { onBlur() {
this.form.customerName = '小白' if(this.form.username) {
const { userName } = this.dataFlow
this.form.customerName = userName
}else {
this.form.customerName = ''
}
}, },
getBlur() { getBlur() {
const number = Number(this.form.endNumber) - Number(this.form.startNumber) const number = Number(this.form.endNumber) - Number(this.form.startNumber)
@ -260,7 +274,8 @@ export default {
...mapGetters({ ...mapGetters({
needsModule: 'system/needsModule', needsModule: 'system/needsModule',
inMyWork: 'system/inMyWork', inMyWork: 'system/inMyWork',
}), dataFlow: 'system/dataFlow',
})
} }
}; };

@ -182,8 +182,9 @@ export default{
// } // }
if(sessionStorage.getItem('servicesPasswordChange')) { if(sessionStorage.getItem('servicesPasswordChange')) {
this.idNumberJudge = true this.idNumberJudge = true
const { idNumber } = this.dataFlow const { idNumber, userName } = this.dataFlow
this.form.idNumber = idNumber this.form.idNumber = idNumber
this.form.customerName = userName
} }
if(sessionStorage.getItem('servicesPasswordChange2')) { if(sessionStorage.getItem('servicesPasswordChange2')) {
this.cardNumberJudge = true this.cardNumberJudge = true

@ -5,6 +5,8 @@
* */ * */
export default { export default {
bind(el, binding, vnode, oldVnode) { bind(el, binding, vnode, oldVnode) {
console.log('---binding')
console.log(binding)
const dialogHeaderEl = el.querySelector('.dia-header') const dialogHeaderEl = el.querySelector('.dia-header')
const dragDom = el const dragDom = el
dialogHeaderEl.style.cursor = 'move' dialogHeaderEl.style.cursor = 'move'

Loading…
Cancel
Save