From e0a71526e0138a89f2dae838c36eaf9e99994a51 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 01 七月 2024 16:27:46 +0800
Subject: [PATCH] 修改密码验证
---
src/components/do/b1-ins-order/add.vue | 33 +++++++++++++++-
src/components/tool/value-table.vue | 25 ++++++++----
src/components/do/b3-work-time-management/work-time-management.vue | 4 +
src/view/index.vue | 8 ++++
4 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 7836aad..75c755a 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -712,6 +712,28 @@
</el-row>
</span>
</el-dialog>
+ <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="800px" :show-close="false">
+ <div class="search" style="display: flex;background: transparent;">
+ <div class="search_thing">
+ <div class="search_label">淇濇俯鏃堕棿锛�</div>
+ <div class="search_input">
+ <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">寰幆娆℃暟锛�</div>
+ <div class="search_input">
+ <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">娓╁害鐐癸細</div>
+ <div class="search_input">
+ <el-input v-model="circulateForm.entrustCode" size="small" placeholder=""></el-input>
+ </div>
+ </div>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -877,6 +899,8 @@
symbolList:[
'RTS','A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'],
inspectionItem:null,
+ circulateShow:false,
+ circulateForm:{}
}
},
watch: {
@@ -1565,7 +1589,6 @@
this.$refs.productTable.toggleRowSelection(row, true);
},
upProductSelect(selection, row) {
- console.log('danxuan', row)
this.bsm1DiaList = []
row.state = row.state == 1 ? 0 : 1
if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
@@ -1579,12 +1602,12 @@
row.bsm1 = false
}
if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
- this.bsm2 = true
- this.bsm1Dia = true
if (this.bsm2Val2.length === 0) {
this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
+ this.bsm2 = true
+ this.bsm1Dia = true
}
} else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1 && this.sampleList.length > 1) {
this.bsm2 = false
@@ -1614,6 +1637,10 @@
}
return item
})
+ if (row.inspectionItem === '娓╁害寰幆') {
+ this.circulateShow = true;
+ return
+ }
this.getProNum()
},
permute(nums) {
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index 1ebdf62..fa6f726 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -463,6 +463,7 @@
this.entityCopy1 = this.HaveJson(this.componentData1.entity);
this.componentData.tagField.weekDay.select = this.weekList
this.componentData.selectField.weekDay.select = this.weekList
+ this.getPower()
},
methods:{
getPower(){
@@ -483,6 +484,7 @@
if (power[i].menuMethod == 'insertAuxiliaryWorkingHoursDay') {
add = true
}
+ console.log(add)
if (power[i].menuMethod == 'updateAuxiliaryWorkingHoursDay') {
up = true
}
@@ -493,7 +495,7 @@
ratify = true
}
}
- if (!approve) {
+ if (!ratify) {
this.componentData.do.splice(3, 1)
}
if (!check) {
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 915b452..0f74844 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -793,21 +793,30 @@
return
}
}
- this.upLoad = true
for (var a in this.data.selectField) {
if (this.data.selectField[a].choose == true) {
this.upData[a] = JSON.stringify(this.upData[a])
}
}
- this.upHead.forEach((item, index) => {
- if (this.data.cascaderField && this.data.cascaderField[item.label]) {
- if (this.upData[item.label]) {
- this.upData[item.label] = JSON.stringify(this.upData[item.label])
- } else {
- this.upData[item.label] = ''
+ for (var i = 0; i < this.upHead.length; i++) {
+ if(this.upHead[i].label == 'password'){
+ if(this.upData[this.upHead[i].label]){
+ const reg2 =/^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?])[a-zA-Z\d~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?]*$/;
+ if (!reg2.test(this.upData[this.upHead[i].label])) {
+ this.$message.error('瀵嗙爜蹇呴』鍖呮嫭鏁板瓧銆佸ぇ灏忓啓瀛楁瘝浠ュ強鐗规畩瀛楃')
+ return
+ }
}
}
- })
+ if (this.data.cascaderField && this.data.cascaderField[this.upHead[i].label]) {
+ if (this.upData[this.upHead[i].label]) {
+ this.upData[this.upHead[i].label] = JSON.stringify(this.upData[this.upHead[i].label])
+ } else {
+ this.upData[this.upHead[i].label] = ''
+ }
+ }
+ }
+ this.upLoad = true
this.$axios.post(this.upUrl, this.upData, {
headers: {
'Content-Type': 'application/json'
diff --git a/src/view/index.vue b/src/view/index.vue
index b9ff928..04edcb4 100644
--- a/src/view/index.vue
+++ b/src/view/index.vue
@@ -600,13 +600,21 @@
this.editVisible = true;
},
handleEdit(){
+ const reg2 =
+ /^(?=.*?[a-z])(?=.*?[A-Z])(?=.*?\d)(?=.*?[~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?])[a-zA-Z\d~!#@$%^*&()_+{}\[\]|\\;:'",<.>\/?]*$/;
if (!this.query.oldPassword) {
this.$message.error('璇峰～鍐欐棫瀵嗙爜')
return
+ }else if (!reg2.test(this.query.oldPassword)) {
+ this.$message.error('瀵嗙爜蹇呴』鍖呮嫭鏁板瓧銆佸ぇ灏忓啓瀛楁瘝浠ュ強鐗规畩瀛楃')
+ return
}
if (!this.query.newPassWord) {
this.$message.error('璇峰～鍐欐棫瀵嗙爜')
return
+ }else if (!reg2.test(this.query.newPassWord)) {
+ this.$message.error('瀵嗙爜蹇呴』鍖呮嫭鏁板瓧銆佸ぇ灏忓啓瀛楁瘝浠ュ強鐗规畩瀛楃')
+ return
}
this.$axios.post(this.$api.user.upUserPassword, {...this.query}).then(res => {
if (res.code == 201) {
--
Gitblit v1.9.3