|
|
@@ -508,14 +508,13 @@
|
|
|
dictName="质检结果"
|
|
|
clearable
|
|
|
v-model="row.result"
|
|
|
- v-if="!row.isMeta"
|
|
|
/>
|
|
|
- <span v-else>
|
|
|
+ <!-- <span v-else>
|
|
|
<span v-if="!row.result"></span>
|
|
|
<span v-if="row.result == 0">合格</span>
|
|
|
<span v-else-if="row.result == 1">不合格</span>
|
|
|
<span v-else>让步接收</span>
|
|
|
- </span>
|
|
|
+ </span> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="质检状态" prop="status" width="120">
|
|
|
@@ -679,6 +678,7 @@
|
|
|
return this.$message.error('请选择质检结果!');
|
|
|
}
|
|
|
data.status = 1;
|
|
|
+ data.result=Number(data.result)
|
|
|
await updateMaterialById(data);
|
|
|
this._getInfo();
|
|
|
},
|
|
|
@@ -760,8 +760,10 @@
|
|
|
iArr.push({ ...ele });
|
|
|
});
|
|
|
});
|
|
|
- console.log('==',iArr)
|
|
|
- this.metailList = iArr.map(item=>{return {...item,result:item.result.toString()}})
|
|
|
+
|
|
|
+ this.metailList = iArr.map(item=>{return {...item,result:item.result==0?'0':item.result!=null?item.result.toString():''}})
|
|
|
+
|
|
|
+ console.log('==',this.metailList)
|
|
|
}
|
|
|
const { data } = await getTreeByPid(0);
|
|
|
this.codeList = data.map((item) => {
|