diff --git a/pages/rawMaterialInfo/index.scss b/pages/rawMaterialInfo/index.scss index 59b98ac..042f8a9 100644 --- a/pages/rawMaterialInfo/index.scss +++ b/pages/rawMaterialInfo/index.scss @@ -123,4 +123,55 @@ } } } +} + +.cc-card{ + border: 1upx solid #C0C0C0; + width: 720upx; + margin: auto; + margin-top: 20upx; + padding-top: 10upx; + padding-bottom: 10upx; +} +.btitle-cc{ + width: 720upx; + margin: auto; + @include fonts(26upx,#666) +} +.pd-ul{ + @include flex(center,flex-start); + margin-top: 20upx; + .pd-title{ + @include fonts(24upx,#666) + } + .pd-list{ + @include flex(center,flex-start); + margin-left: 40upx; + image{ + @include wh(33upx,33upx); + + } + text{ + @include fonts(24upx,#666); + margin-left: 10upx; + } + } +} +.cc-input-ul{ + @include flex(center,flex-start); + flex-wrap: wrap; + .cc-input-list{ + @include flex(center,flex-start); + .title{ + @include fonts(24upx,#666) + } + .cc-input{ + input{ + width: 100upx; + border: 1upx solid #C0C0C0; + border-radius: 10upx; + font-size: 24upx; + } + } + } } \ No newline at end of file diff --git a/pages/rawMaterialInfo/rawMaterialInfo.vue b/pages/rawMaterialInfo/rawMaterialInfo.vue index f060f91..aaf5162 100644 --- a/pages/rawMaterialInfo/rawMaterialInfo.vue +++ b/pages/rawMaterialInfo/rawMaterialInfo.vue @@ -41,14 +41,32 @@ + - + 尺寸检测数据 + + + + + rule + + + + + + + 判定 + + + OK + + @@ -60,7 +78,7 @@ 检测工具: - + 抽样标准: @@ -96,7 +114,7 @@ - 检验结果: + 产品检验结果: {{result[resltIds]}} @@ -149,7 +167,10 @@ check_status: 0, jyxItem: {}, buttonState: true, + jurisdiction:[], standard: {}, + tooList:[], + power:[], froms: { result: 1, purchase_id: '', //采购数据ID @@ -181,32 +202,38 @@ this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo)); this.type = this.CyInfo.examine_status this.check_status = this.CyInfo.m_id + this.power = this.userInfo.power this.getitem() - this.isMenu(); this.getArr() - console.log('检验项', this.jyxItem) + this.isMenu(); + + console.log('检验项', this.userInfo) }, methods: { getArr() { - let newArr = this.power.map(item => { - if (item.children) { - - item.children.map(items => { - this.jurisdiction.push(items.title) - return items - }) - } - - }) + if(this.power.length>0){ + let newArr = this.power.map(item => { + if (item.children) { + + item.children.map(items => { + this.jurisdiction.push(items.title) + return items + }) + } + + }) + } + console.log("xinshuzu", this.jurisdiction) }, isMenu(title) { return this.jurisdiction.includes(title); }, getitem() { - materialItem().then(res => { + materialItem({name:this.CyInfo.purchase_number}).then(res => { this.itemList = res.item; this.standard = res.standard; + this.tooList=res.tool; for (let b in res.item) { this.item.push({ check_item: res.item[b], @@ -214,7 +241,7 @@ check_number: '', status: 0, check_result: '', - check_tool: '', + check_tool: res.tool[b], check: false }) }