From 843d421107006d38c9af61c956a3ed30275a5657 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 25 四月 2024 09:13:37 +0800
Subject: [PATCH] 修改报告按钮逻辑
---
src/components/do/b1-ins-order/add.vue | 2
src/components/view/b1-report-preparation.vue | 8 ++--
src/main.js | 4 +-
src/components/view/a6-device-management.vue | 32 ++++++++++++++--
src/components/view/index-index.vue | 15 +++++++
src/components/view/notice-detail.vue | 5 +-
6 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 6a358af..d12a168 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -108,7 +108,7 @@
</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
- <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3">涓嶉�氳繃</el-button>
+ <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3" :disabled="saveLoad">涓嶉�氳繃</el-button>
<el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad"
v-show="active==3">閫氳繃</el-button>
<el-button size="medium" @click="$parent.playOrder(0)">
diff --git a/src/components/view/a6-device-management.vue b/src/components/view/a6-device-management.vue
index bec5b90..d786e95 100644
--- a/src/components/view/a6-device-management.vue
+++ b/src/components/view/a6-device-management.vue
@@ -288,7 +288,11 @@
<el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
<el-form-item label="鐢熶骇鍘傚:">
- <el-input v-model="formData2.deviceName" size="small"></el-input>
+ <el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
+ <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
</el-form-item>
<!-- <el-form-item label="璁惧璐熻矗浜�:">
<el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
@@ -323,9 +327,9 @@
<!-- 涓棿甯冨眬 -->
<el-col :span="7">
<el-form :label-position="labelPosition" :model="formData2" label-width="110px">
- <el-form-item label="鐢熶骇鍘傚EN:">
+ <!-- <el-form-item label="鐢熶骇鍘傚EN:">
<el-input v-model="formData2.deviceName" size="small"></el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="鍑哄巶缂栧彿:">
<el-input v-model="formData2.deviceName" size="small"></el-input>
</el-form-item>
@@ -363,7 +367,7 @@
<!-- 瀹為獙瀹ゅ垪琛� -->
<el-form-item label="鎵�灞為儴闂�:">
<el-select v-model="formData2.equipmentManager" placeholder="璇烽�夋嫨" size="small" style="width:100%">
- <el-option v-for="item in responsiblePersonList" :key="item.value" :label="item.label"
+ <el-option v-for="item in componentData.selectField.laboratory.select" :key="item.value" :label="item.label"
:value="item.value">
</el-option>
</el-select>
@@ -507,6 +511,9 @@
},
insProductIds:{
select:[]
+ },
+ laboratory:{
+ select:[]
}
},
linkEvent: {
@@ -525,6 +532,9 @@
insProductIds:{
select:[],
choose: true
+ },
+ laboratory:{
+ select:[]
}
},
requiredAdd: [],
@@ -563,6 +573,7 @@
this.selectEnumByCategory()
this.selectDevicePrincipal()
this.getInsProductIds()
+ this.obtainItemParameterList()
},
methods: {
refreshTable() {
@@ -643,6 +654,19 @@
})
})
},
+ obtainItemParameterList() {
+ this.$axios.get(this.$api.laboratoryScope.obtainItemParameterList).then(res => {
+ let data = []
+ res.data.forEach(a=>{
+ data.push({
+ label: a.laboratoryName,
+ value: a.id
+ })
+ })
+ this.componentData.selectField.laboratory.select = data
+ this.componentData.tagField.laboratory.select = data
+ })
+ },
handleClose() {
this.dialogVisible = false;
this.upLoad = false;
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index f35498b..e96230b 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -109,7 +109,7 @@
<el-button size="small">涓嶉�氳繃</el-button>
</div> -->
<span slot="footer" class="dialog-footer">
- <el-button @click="issuedReasonVisible=true">涓嶉�氳繃</el-button>
+ <el-button @click="issuedReasonVisible=true" :disabled="loadingIssued">涓嶉�氳繃</el-button>
<el-button type="primary" @click="subIssued" :loading="loadingIssued">閫� 杩�</el-button>
</span>
</el-dialog>
@@ -120,7 +120,7 @@
v-model="reason"></el-input></div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="issuedReasonVisible=false">鍙栨秷</el-button>
+ <el-button @click="issuedReasonVisible=false" :disabled="loadingIssuedReason">鍙栨秷</el-button>
<el-button type="primary" @click="handleIssuedReason" :loading="loadingIssuedReason">纭畾</el-button>
</span>
</el-dialog>
@@ -134,7 +134,7 @@
<el-button size="small">涓嶆壒鍑�</el-button>
</div> -->
<span slot="footer" class="dialog-footer">
- <el-button @click="approveReasonVisible=true">涓嶆壒鍑�</el-button>
+ <el-button @click="approveReasonVisible=true" :disabled="loadingApprove">涓嶆壒鍑�</el-button>
<el-button type="primary" @click="subApprove" :loading="loadingApprove">鎵� 鍑�</el-button>
</span>
</el-dialog>
@@ -145,7 +145,7 @@
v-model="reason"></el-input></div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="approveReasonVisible=false">鍙栨秷</el-button>
+ <el-button @click="approveReasonVisible=false" :disabled="loadingApproveReason">鍙栨秷</el-button>
<el-button type="primary" @click="handleApproveReason" :loading="loadingApproveReason">纭畾</el-button>
</span>
</el-dialog>
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index f74e1ec..9c462d6 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -361,7 +361,7 @@
<p>{{ m.theme }}</p>
</div>
<div class="list3-item-info">
- <p style="width: 73%;-webkit-line-clamp: 1;" class="ellipsis-multiline">
+ <p style="width: 73%;-webkit-line-clamp: 1;cursor: pointer;" class="ellipsis-multiline" @click="goNoticeDetail(m)">
<!-- 缂栧彿<span style="color:#3A7BFA;"> SB20240101-001 </span>鐨勮澶囧皢浜�2023-09-09 11:11:11杩囨湡 -->
{{ m.content }}
</p>
@@ -677,6 +677,19 @@
})
})
},
+ goNoticeDetail(row){
+ this.$axios.put(this.$api.informationNotification.triggerModificationStatusToRead+'/'+row.id).then(res => {
+ row.num = Math.random(100);
+ this.$bus.$emit("change", JSON.stringify(row));
+ this.$parent.addTab({
+ v: "娑堟伅璇︽儏",
+ i: "el-icon-s-tools",
+ u: "notice-detail",
+ k:35,
+ p: "abcd"
+ },29);
+ })
+ },
},
}
</script>
diff --git a/src/components/view/notice-detail.vue b/src/components/view/notice-detail.vue
index 65e5518..bcea964 100644
--- a/src/components/view/notice-detail.vue
+++ b/src/components/view/notice-detail.vue
@@ -16,8 +16,8 @@
</div>
</div>
<div class="info-box" v-if="noticeInfo.jumpPath">
- <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
- </component>
+ <!-- <component class="notice-content" :is="noticeInfo.jumpPath" style="height: 500px;" >
+ </component> -->
</div>
</div>
</template>
@@ -47,6 +47,7 @@
this.noticeInfo = JSON.parse(sessionStorage.getItem("noticeInfo"));
this.$bus.$on("change", (msg) => {
this.noticeInfo = JSON.parse(msg);
+ console.log(this.noticeInfo);
sessionStorage.setItem("noticeInfo", msg);
});
},
diff --git a/src/main.js b/src/main.js
index 43d09d1..4d5253b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,9 +13,9 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://192.168.11.200:8001';//鏉�
+const javaApi = 'http://192.168.11.200:8001';//鏉�
// const javaApi = 'http://192.168.11.249:8001';//寮�
-const javaApi = 'http://192.168.11.50:8001';//濮�
+// const javaApi = 'http://192.168.11.50:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
// const javaApi = 'http://114.132.189.42:9006';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
--
Gitblit v1.9.3