diff --git a/pages/index/orderdetails.vue b/pages/index/orderdetails.vue index 2e21c52..e2258f2 100644 --- a/pages/index/orderdetails.vue +++ b/pages/index/orderdetails.vue @@ -227,6 +227,7 @@ geindex: 0, detailData: {}, inspectionInfoId: '', + workNodeId:'', stepInfo: { isPass: "0" }, @@ -260,6 +261,7 @@ }, onLoad(option) { this.inspectionInfoId = option.inspectionInfoId + this.workNodeId = option.workNodeId }, onShow() { @@ -339,14 +341,28 @@ }); }, async submit() { + console.log('isPass',this.isPass); + console.log('geindex',this.geindex) + let status = 0 + if (this.isPass == '1') { + status = 3 + }else{ + if (this.geindex == 1) { + status = 2 + }else{ + status = 1 + } + } let inspectionInfo = { - id: this.inspectionInfoId, + inspectionInfoId: this.inspectionInfoId, isPass: this.isPass, - isRetrial: this.isRetrial, + id: this.workNodeId, + selectType: status, remark: this.remark } let res = await request({ - url: '/partnerOwn/partner/stopInspection', + // url: '/partnerOwn/partner/stopInspection', + url: '/system/info/controls', method: 'post', data: inspectionInfo }) @@ -452,10 +468,14 @@ Nnimamadewen(value, index) { this.isPass = value this.geindex = index + console.log('this.isPass', this.isPass) + console.log('this.geindex', this.geindex) }, shenmowanyi(value, index) { this.tbindex = value this.isRetrial = value + console.log('this.tbindex', this.tbindex) + console.log('this.isRetrial', this.isRetrial) }, closexl(e) { this.xling = false @@ -924,4 +944,4 @@ align-items: center; justify-content: center; } - \ No newline at end of file + diff --git a/pages/staff/staff.vue b/pages/staff/staff.vue index eea04e7..07e8ad6 100644 --- a/pages/staff/staff.vue +++ b/pages/staff/staff.vue @@ -1,376 +1,431 @@ - \ No newline at end of file +.sshi { + position: absolute; + bottom: 20px; + right: 20px; + width: 115px; + height: 115px; + box-sizing: border-box; + padding: 10px; + + image { + width: 100%; + height: 100%; + } +} + +.top-heder { + width: 100%; + height: 46px; + background: white; + display: flex; + justify-content: space-between; + align-items: center; + box-sizing: border-box; + padding: 5px 15px; +} + +.t-left { + width: 10%; +} + +.t-input { + width: 75%; + height: 36px; + background: #F0F0F0; + border-radius: 50px; + box-sizing: border-box; + padding: 0 15px; + display: flex; + align-items: center; + +} + +.top-ail { + width: 100%; + box-sizing: border-box; + padding: 15px; + background-color: #F4F4F4; + +} + +.mub { + background-color: #F4F4F4; + height: calc(100vh); +} + +.tap { + width: 100%; + height: 44px; + background: #FFFFFF; + display: flex; + align-items: center; + justify-content: space-between; +} + +.tap-box { + width: 50%; + +} + +.xhuihui { + width: 100%; + text-align: center; + font-size: 16px; + font-family: Source Han Sans CN-Regular, Source Han Sans CN; + font-weight: 400; + color: #666666; +} + +.gang { + width: 24px; + height: 4px; + background: #0D2E8D; + border-radius: 4px; + margin: 2px auto; +} + +.xzhei { + + font-weight: bold !important; + color: #333333 !important; +} + +.m-box { + position: relative; + background: #FFFFFF; + border-radius: 8px; + box-sizing: border-box; + padding: 15px 10px; + margin: 10px auto; + +} + +.m-top { + width: 100%; + box-sizing: border-box; + padding-bottom: 15px; + border-bottom: 1px solid #EEEEEE; + display: flex; + align-items: center; + justify-content: space-between; +} + +.top-left { + +} + +.top-right { + z-index: 9999; + width: 33px; + height: 33px; + border-radius: 50%; + overflow: hidden; + + image { + width: 100%; + height: 100%; + } + +} + +.dhei { + font-size: 16px; + font-weight: bold; + color: #333333; + margin-bottom: 5px; +} + +.xhui { + font-size: 15px; + font-weight: 400; + color: #999999; +} + +.on-input { + width: 100%; + display: flex; + align-items: center; + font-size: 15px; + font-family: Source Han Sans CN-Regular, Source Han Sans CN; + font-weight: 400; + color: #999999; + margin-bottom: 10px; + margin-top: 10px; + // justify-content: space-between; +} + +.bottom-di { + display: flex; + justify-content: center; + align-items: center; + padding: 20px; +} + +.button-container { + display: flex; + justify-content: space-between; + width: 100%; +} + +.button { + flex: 1; + margin: 0 10px; +} + +.ju { + font-size: 24px; + + font-weight: 600; + color: #FF571A; +} + +.lanniu { + width: 90%; + position: fixed; + bottom: 60px; + display: flex; + align-items: center; + justify-content: center; + background: #0D2E8D; + color: white; + height: 44px; + border-radius: 8px; + font-weight: bold; + transform: translate(-50%); + left: 50%; + z-index: 9999999999999999999999999999999999999999999999999999999; +} + +.csz { + font-size: 20px; + font-weight: bold; + color: #FF571A; +} +