| src/components/do/b1-ins-order/add.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-ins-order/fiberoptic-config.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b3-work-time-management/work-time-management.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/tool/value-table.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/view/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/do/b1-ins-order/add.vue
@@ -734,6 +734,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> @@ -903,6 +925,8 @@ inspectionItem:null, inspectionItemSubclass:null, methodS:null, circulateShow:false, circulateForm:{} } }, watch: { @@ -1613,7 +1637,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) { @@ -1626,17 +1649,17 @@ } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) { row.bsm1 = false } if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && row.state === 1) { this.bsm2 = true this.bsm1Dia = true if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && row.state === 1) { 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) { } else if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && row.state === 1 && this.sampleList.length > 1) { this.bsm2 = false } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && this.sampleList.length < 2) { } else if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length < 2) { this.$message.error('样品数量不足够进行配对操作') row.state = row.state == 1 ? 0 : 1 this.$refs.productTable.toggleRowSelection(row, false) @@ -1662,6 +1685,10 @@ } return item }) if (row.inspectionItem === '温度循环') { this.circulateShow = true; return } this.getProNum() }, permute(nums) { @@ -1909,7 +1936,7 @@ } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) { p.bsm1 = false } if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && p.state === 1) { if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && p.state === 1) { this.bsm2 = true this.bsm1Dia = true if (this.bsm2Val2.length === 0) { @@ -1917,9 +1944,9 @@ this.computationalPairing(this.sampleList.length) this.bsm2Val2 = this.HaveJson(this.bsm2Val3) } } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1 && this.sampleList.length > 1) { } else if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && p.state === 1 && this.sampleList.length > 1) { this.bsm2 = false } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && this.sampleList.length < 2) { } else if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && this.sampleList.length < 2) { this.$message.error('样品数量不足够进行配对操作') this.$refs.productTable.clearSelection() return src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -753,7 +753,7 @@ } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) { this.bsm1 = false } if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && p.state === 1) { if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && p.state === 1) { this.bsm2 = true this.bsm1Dia = true if(this.bsm2Val2.length === 0){ @@ -761,7 +761,7 @@ this.computationalPairing(this.sampleList.length) this.bsm2Val2 = this.HaveJson(this.bsm2Val3) } } else if (p.bsm === '1' && p.inspectionItem === '熔接损耗' && p.state === 1) { } else if (p.bsm === '1' && p.inspectionItem === '光纤接头损耗' && p.state === 1) { this.bsm2 = false } } @@ -828,7 +828,7 @@ } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) { this.bsm1 = false } if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && this.sampleList.length > 1 && row.state === 1) { if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && this.sampleList.length > 1 && row.state === 1) { this.bsm2 = true this.bsm1Dia = true if(this.bsm2Val2.length === 0){ @@ -836,7 +836,7 @@ this.computationalPairing(this.sampleList.length) this.bsm2Val2 = this.HaveJson(this.bsm2Val3) } } else if (row.bsm === '1' && row.inspectionItem === '熔接损耗' && row.state === 1) { } else if (row.bsm === '1' && row.inspectionItem === '光纤接头损耗' && row.state === 1) { this.bsm2 = false } }else{ 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) { 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' 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) {
