From 80c915239301b1f0e3a732a6318e7743709e9489 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 31 三月 2025 16:01:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue | 2 +-
src/views/business/materialOrder/copperOrder.vue | 1 +
src/main.js | 2 +-
src/views/statisticalCharts/inspectionItemWarning/index.vue | 12 +++++-------
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main.js b/src/main.js
index aa78603..49f96a5 100644
--- a/src/main.js
+++ b/src/main.js
@@ -66,7 +66,7 @@
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(),
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
index a027454..c5019a7 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/temperature-humidity-record.vue
@@ -32,7 +32,7 @@
<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>
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index e15e00f..3e72596 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -741,6 +741,7 @@
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()
diff --git a/src/views/statisticalCharts/inspectionItemWarning/index.vue b/src/views/statisticalCharts/inspectionItemWarning/index.vue
index 1840d04..448aa29 100644
--- a/src/views/statisticalCharts/inspectionItemWarning/index.vue
+++ b/src/views/statisticalCharts/inspectionItemWarning/index.vue
@@ -50,13 +50,12 @@
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",
@@ -89,7 +88,6 @@
column1: [
{ label: '鏍峰搧缂栧彿', prop: 'sampleCode'},
{ label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName'},
- { label: '渚涘簲鍟嗗悕绉�', prop: 'supplierName'},
{
label: "妫�娴嬪��",
prop: "testValue",
@@ -119,7 +117,7 @@
echartsOptions: {},
echartsSeries: [
{
- name: '鍋忓樊鍊�',
+ name: '妫�娴嬪��',
type: 'line',
smooth: true,
tooltip: {
--
Gitblit v1.9.3