From 25b9a349ae0df9d9e71f6d71414d5cf8e463bee7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 08 八月 2024 19:02:06 +0800
Subject: [PATCH] 检验下单调整
---
src/components/do/b1-ins-order/add.vue | 55 ++++++++++++++++++++++-----
src/view/enter.vue | 3 +
src/components/view/b1-inspect-order-plan.vue | 16 ++++----
3 files changed, 55 insertions(+), 19 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 033ba53..cb130d3 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -1585,13 +1585,14 @@
}
return true
})
- //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪
- const isTrue = this.checkRequiredValueAndRemark(filterProductList)
- if(!isTrue){
- this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
- return
+ //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪,浠呭鎵樿姹�
+ if(this.active==1&&this.isAskOnlyRead){
+ const isTrue = this.checkRequiredValueAndRemark(filterProductList)
+ if(!isTrue){
+ this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
+ return
+ }
}
-
console.log('isHaveBushing===', this.totalArr)
// inspectionItem
let spcialItem = null//this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
@@ -1635,28 +1636,57 @@
}
}
},
+ /**
+ * 鏍￠獙濮旀墭瑕佹眰鐨勬楠岄」鐨勮姹傛弿杩板拰瑕佹眰鍊�
+ *
+ */
checkRequiredValueAndRemark(data){
let isTrue = true
try{
data.forEach(ele=>{
+ //鍒ゆ柇锛堚墹,鈮�,>,<,=锛夎繖鍑犵鎯呭喌
+ //鍒ゆ柇瑕佹眰鍊间腑鐨勬暟瀛楁槸鍚﹀寘鍚湪瑕佹眰鎻忚堪涓�
if(['鈮�','鈮�','>','<','='].includes(ele.ask[0])){
const askVal = ele.ask.substring(1,ele.ask.length)
if(isNaN(askVal) || ele.tell.indexOf(askVal)<0){
isTrue = false
}
}
+ //鍒ゆ柇鑼冨洿(10-25),瑕佹眰鍊煎繀椤绘槸-
if(ele.ask.indexOf('-')>0 && ele.ask.length>1){
+ //瑕佹眰鎻忚堪鐨剘鍜岃姹傚�肩殑-锛岀瓑鏁�
let tell = ele.tell
if(ele.tell.indexOf('~')>0){
tell = ele.tell.replace('~','-')
}
const splits = ele.ask.split('-')
+ //婊¤冻鏍煎紡瑕佹眰锛屽苟涓斾袱涓兘鏄暟瀛�
if(splits.length==2 && !isNaN(splits[0]) && !isNaN(splits[1])){
- let min = Math.min(...splits)
- let max = Math.max(...splits)
- if(ele.tell.indexOf('卤')<0&&tell.indexOf(ele.ask)<0){
+ /**
+ * 鍒ゆ柇鎯呭喌
+ * 1.瑕佹眰鎻忚堪涓庤姹傛弿杩扮浉鍚�
+ * 2.瑕佹眰鎻忚堪鍖呭惈瑕佹眰鍊�
+ * 3.瑕佹眰鎻忚堪涓�3N-10N杩欑鎯呭喌
+ * 4.瑕佹眰鎻忚堪涓�10卤5杩欑鎯呭喌
+ * 5.
+ */
+ let min = Math.min(...splits)
+ let max = Math.max(...splits)
+ if(min==max){
isTrue = false
- }else if(ele.tell.indexOf('卤')>0&&ele.tell!=ele.ask){
+ }
+ //瑕佹眰鎻忚堪涓笉鍖呭惈卤浠ュ強鍖洪棿鐨勬暟瀛楋紝鍒欒繑鍥瀎alse
+ if((tell.indexOf('卤')<0&&tell.indexOf('-')<0)){
+ isTrue = false
+ }else if(ele.tell.indexOf('-')==0){
+ isTrue = false
+ }else if(tell.indexOf('-')>0){
+ const splitTells = tell.split('-')
+ if(splitTells[0].indexOf(min)<0 || splitTells[1].indexOf(max)<0){
+ isTrue = false
+ }
+ }else if(tell.indexOf('卤')>0&&tell!=ele.ask){
+ //鏍￠獙瑕佹眰鎻忚堪涓�10卤5杩欑鍐欐硶鐨勬儏鍐�
let splitNums = ele.tell.split('卤')
if(splitNums.length<2){
isTrue = false
@@ -2405,6 +2435,11 @@
this.$axios.post(this.$api.insOrder.selectInsOrderTemplateById + '?id=' + e).then(res => {
if (res.code == 201) return
let obj = JSON.parse(res.data)
+ console.log(obj);
+ //鍒跺崟浜鸿缃负褰撳墠鐧诲綍鐢ㄦ埛
+ let user = JSON.parse(localStorage.getItem('user'))
+ obj.addObj.custom = user.name
+ obj.addObj.userId = user.userId
this.addObj = obj.addObj;
this.sampleList = obj.sampleList;
this.selectTree = obj.selectTree
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 05c0f51..03204c7 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -303,14 +303,14 @@
font: '鏁版嵁鏌ョ湅',
type: 'text',
method: 'handleDataLook',
- disabFun: (row, index) => {
- const user = JSON.parse(localStorage.getItem('user'))
- let currentUserName = ''
- if(user){
- currentUserName = user.name
- }
- return row.userName!=currentUserName && row.checkName!=currentUserName
- }
+ //disabFun: (row, index) => {
+ //const user = JSON.parse(localStorage.getItem('user'))
+ // let currentUserName = ''
+ // if(user){
+ // currentUserName = user.name
+ //}
+ //return row.userName.indexOf(currentUserName)<0 && row.checkName.indexOf(currentUserName)<0
+ //}
},{
id: '',
font: '妫�楠�',
diff --git a/src/view/enter.vue b/src/view/enter.vue
index 169cd69..251298e 100644
--- a/src/view/enter.vue
+++ b/src/view/enter.vue
@@ -183,7 +183,8 @@
localStorage.setItem('user', JSON.stringify({
account: this.ruleForm.account,
password: this.ruleForm.pwd,
- name: res.data.name
+ name: res.data.name,
+ userId: res.data.userId
}))
sessionStorage.setItem('token', res.data.token)
sessionStorage.setItem('reToken', res.data.reToken)
--
Gitblit v1.9.3