Merge remote-tracking branch 'origin/dev' into dev
| | |
| | | Vue.prototype.HaveJson = (val) => { |
| | | return JSON.parse(JSON.stringify(val)); |
| | | }; |
| | | Vue.prototype.javaApi = "http://114.132.189.42:7012"; |
| | | Vue.prototype.javaApi = "http://192.168.21.53:8001/lims"; |
| | | Vue.prototype.checkPermi = checkPermi; |
| | | Vue.prototype.uploadHeader = { |
| | | Authorization: "Bearer " + getToken(), |
| | |
| | | <el-table-column fixed="right" label="操作" min-width="180" align="center"> |
| | | <template v-slot="scope"> |
| | | <el-button size="small" type="text" @click="downLoadPost(scope.row)">导出</el-button> |
| | | <el-button size="small" type="text" @click="edit(scope.row)">编辑</el-button> |
| | | <!-- <el-button size="small" type="text" @click="edit(scope.row)">编辑</el-button>--> |
| | | <el-button :disabled="scope.row.isAffirm === '1'" size="small" type="text" |
| | | @click="openApprovalDialog(scope.row)">确认</el-button> |
| | | <el-button size="small" type="text" @click="deleteRowFun(scope.row)">删除</el-button> |
| | |
| | | this.$set(this.addObj, 'buyUnitMeas', res.data.insOrderTemplate.buyUnitMeas) |
| | | this.$set(this.addObj, 'updateBatchNo', res.data.insOrderTemplate.updateBatchNo) |
| | | this.$set(this.addObj, 'supplierName', res.data.insOrderTemplate.supplierName) |
| | | this.$set(this.addObj, 'declareDate', res.data.insOrderTemplate.declareDate) |
| | | this.addObj.type = String(this.addObj.type) |
| | | this.sampleList = this.HaveJson(res.data.sampleProduct); |
| | | this.getProNum() |
| | |
| | | tableLoading: false, |
| | | column: [ |
| | | { label: '样品编号', prop: 'sampleCode',width: 150 }, |
| | | { label: '样品名称', prop: 'sampleName',width: 150 }, |
| | | { label: '型号', prop: 'sampleModel' }, |
| | | { label: '样品名称', prop: 'sampleName'}, |
| | | { label: '型号', prop: 'sampleModel',width: 150 }, |
| | | { label: '供应商名称', prop: 'supplierName',width: 150 }, |
| | | { label: '检验项名称', prop: 'inspectionItemName',width: 150 }, |
| | | { label: '供应商名称', prop: 'supplierName',width: 150 }, |
| | | { label: '检验项名称', prop: 'inspectionItemName'}, |
| | | { |
| | | label: "偏差值", |
| | | label: "偏差值%", |
| | | prop: "deviationValue", |
| | | width: 150, |
| | | dataType: "tag", |
| | |
| | | column1: [ |
| | | { label: '样品编号', prop: 'sampleCode'}, |
| | | { label: '供应商名称', prop: 'supplierName'}, |
| | | { label: '供应商名称', prop: 'supplierName'}, |
| | | { |
| | | label: "检测值", |
| | | prop: "testValue", |
| | |
| | | echartsOptions: {}, |
| | | echartsSeries: [ |
| | | { |
| | | name: '偏差值', |
| | | name: '检测值', |
| | | type: 'line', |
| | | smooth: true, |
| | | tooltip: { |