From c67a8c5b44524e06cd58d9751e4b72aa62954412 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 13:48:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/api/system/user.js | 7 +
src/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment.js | 57 +++++++++
src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue | 46 +++----
src/api/cnas/process/ensureResultsValidity/qualityMonitor.js | 66 ++++++++++
src/views/business/productOrder/components/add.vue | 3
src/views/business/inspectionTask/inspection.vue | 5
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue | 47 +++++--
src/api/business/productOrder.js | 6
src/views/CNAS/process/complaint/index.vue | 2
src/views/system/user/index.vue | 5
src/views/CNAS/process/ensureResultsValidity/components/detailFormDialog.vue | 19 +--
src/views/business/materialOrder/copperOrder.vue | 3
src/views/business/materialOrder/customsInspection.vue | 3
src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue | 44 +++----
src/views/CNAS/process/ensureResultsValidity/index.vue | 35 ++---
15 files changed, 235 insertions(+), 113 deletions(-)
diff --git a/src/api/business/productOrder.js b/src/api/business/productOrder.js
index 00862c6..e0c49ef 100644
--- a/src/api/business/productOrder.js
+++ b/src/api/business/productOrder.js
@@ -54,8 +54,8 @@
export function upPlanUser2(query) {
return request({
url: '/insOrderPlan/upPlanUser2',
- method: 'post',
- data: query
+ method: 'get',
+ params: query
})
}
// 妫�楠屼笅鍙�
@@ -63,7 +63,7 @@
return request({
url: '/insOrder/upInsOrder',
method: 'post',
- data: query
+ params: query
})
}
// 灏嗗緟瀹℃牳鏇存柊鎴愭挙閿�鐘舵��
diff --git a/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js b/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js
index 0115f0b..221c369 100644
--- a/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js
+++ b/src/api/cnas/process/ensureResultsValidity/qualityMonitor.js
@@ -42,7 +42,7 @@
responseType: "blob"
})
}
-// 鍒犻櫎鐩戠潱璁″垝
+// 鍒犻櫎鐩戞帶璁″垝
export function delQualitySupervise(query) {
return request({
url: '/qualityMonitor/delQualitySupervise',
@@ -84,3 +84,67 @@
params: query
})
}
+// 鏂板鐩戞帶璁″垝璇︽儏
+export function addQualityMonitorDetail(query) {
+ return request({
+ url: '/qualityMonitor/addQualityMonitorDetail',
+ method: 'post',
+ data: query
+ })
+}
+// 淇敼鐩戞帶璁″垝璇︽儏
+export function updateQualityMonitorDetail(query) {
+ return request({
+ url: '/qualityMonitor/updateQualityMonitorDetail',
+ method: 'post',
+ data: query
+ })
+}
+// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
+export function getQualityMonitorRatify(query) {
+ return request({
+ url: '/qualityMonitor/getQualityMonitorRatify',
+ method: 'get',
+ params: query
+ })
+}
+// 鏂板鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
+export function addQualityMonitorRatify(query) {
+ return request({
+ url: '/qualityMonitor/addQualityMonitorRatify',
+ method: 'post',
+ data: query
+ })
+}
+// 鎻愪氦鐩戞帶璁″垝璇︽儏鎵瑰噯鎰忚
+export function addQualityMonitorRatifyOpinion(query) {
+ return request({
+ url: '/qualityMonitor/addQualityMonitorRatifyOpinion',
+ method: 'post',
+ data: query
+ })
+}
+// 鏌ヨ鐩戞帶璇勪环
+export function getQualityMonitorEvaluate(query) {
+ return request({
+ url: '/qualityMonitor/getQualityMonitorEvaluate',
+ method: 'get',
+ params: query
+ })
+}
+// 鏂板鐩戞帶璇勪环鎵瑰噯
+export function addMonitorEvaluateOpinion(query) {
+ return request({
+ url: '/qualityMonitor/addMonitorEvaluateOpinion',
+ method: 'post',
+ data: query
+ })
+}
+// 鏂板鐩戞帶璇勪环
+export function addQualityMonitorEvaluate(query) {
+ return request({
+ url: '/qualityMonitor/addQualityMonitorEvaluate',
+ method: 'post',
+ data: query
+ })
+}
diff --git a/src/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment.js b/src/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment.js
new file mode 100644
index 0000000..2d0d1ee
--- /dev/null
+++ b/src/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+// 璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬ф煡璇�
+export function getLaboratoryFacilityPowerStablePage(query) {
+ return request({
+ url: '/fePowerStable/getLaboratoryFacilityPowerStablePage',
+ method: 'get',
+ params: query
+ })
+}
+
+// 閫氳繃璁惧鍒嗙被鑾峰彇璁惧鍒楄〃
+export function deviceScopeSearch(query) {
+ return request({
+ url: '/deviceScope/search',
+ method: 'get',
+ params: query
+ })
+}
+
+// 璁惧鏍戝舰
+export function treeDevice(query) {
+ return request({
+ url: '/deviceScope/treeDevice',
+ method: 'get',
+ params: query
+ })
+}
+
+//鑾峰彇鐢ㄦ埛鍒楄〃
+export function selectUserCondition(query) {
+ return request({
+ url: "/system/newUser/selectUserCondition",
+ method: "get",
+ params: query,
+ });
+}
+
+// 璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬ф柊澧�/淇敼
+export function addLaboratoryFacilityPowerStable(query) {
+ return request({
+ url: '/fePowerStable/addLaboratoryFacilityPowerStable',
+ method: 'post',
+ data: query
+ })
+}
+
+// 璁炬柦鍜岀幆澧冩潯浠�-璁炬柦鍜岀幆澧冩潯浠惰姹�-鐢垫簮绋冲畾鎬�-娴嬪畾閲� 鍒犻櫎
+export function deleteFeMeasuredQuantity(query) {
+ return request({
+ url: '/fePowerStable/deleteFeMeasuredQuantity',
+ method: 'delete',
+ params: query
+ })
+}
+
+
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 403ace7..14b4c2b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -180,3 +180,10 @@
params: params
})
}
+// 鑾峰彇褰撳墠鐧诲綍浜哄憳閮ㄩ棬
+export function selectUserDepartmentLimsName(query) {
+ return request({
+ url: '/system/newUser/selectUserDepartmentLimsName',
+ method: 'get'
+ })
+}
diff --git a/src/views/CNAS/process/complaint/index.vue b/src/views/CNAS/process/complaint/index.vue
index db76ec4..5a998b3 100644
--- a/src/views/CNAS/process/complaint/index.vue
+++ b/src/views/CNAS/process/complaint/index.vue
@@ -610,7 +610,7 @@
.user-info {
display: flex;
align-items: center;
- justify-content: end;
+ justify-content: flex-end;
}
.user-content {
diff --git a/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue b/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue
index 22a138b..205ec80 100644
--- a/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/components/carryOutDialog.vue
@@ -8,7 +8,7 @@
<el-step title="瀹炴柦"></el-step>
<el-step title="鎵瑰噯"></el-step>
</el-steps>
- <div style="height: 620px;overflow-y: auto">
+ <div style="height: 520px;overflow-y: auto">
<table border="1" cellspacing="10" class="tables">
<tr>
<td class="td-title">
@@ -181,6 +181,12 @@
<script>
+import {
+ addQualityMonitorRatify, addQualityMonitorRatifyOpinion,
+ getQualityMonitorRatify
+} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
+import {selectUserCondition} from "@/api/business/inspectionTask";
+
export default {
name: 'carryOutDialog',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -219,8 +225,7 @@
},
// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
searchInfo (row) {
- this.$axios.get(this.$api.qualityMonitor.getQualityMonitorRatify + '?qualityMonitorDetailsId=' + row.qualityMonitorDetailsId).then(res => {
- if (res.code === 201) return
+ getQualityMonitorRatify({qualityMonitorDetailsId: row.qualityMonitorDetailsId}).then(res => {
// 鏈塪etailsRatifyId鍒欒鏄庢彁浜よ繃瀹炴柦淇℃伅
if (res.data.detailsRatifyId) {
// 鏄惁缁撴潫0:鏈粨鏉�, 1:宸茬粨鏉�
@@ -252,12 +257,7 @@
},
// 鎻愪氦瀹炴柦
addInfo () {
- this.$axios.post(this.$api.qualityMonitor.addQualityMonitorRatify, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addQualityMonitorRatify(this.form).then(res => {
this.editLoad = false
if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
@@ -269,12 +269,7 @@
},
// 鎻愪氦鎵瑰噯
editInfo () {
- this.$axios.post(this.$api.qualityMonitor.addQualityMonitorRatifyOpinion, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addQualityMonitorRatifyOpinion(this.form).then(res => {
this.editLoad = false
if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
@@ -290,25 +285,22 @@
this.$emit('closeCarryOutDia')
},
getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getUserMenu).then(res => {
- let data = []
- res.data.forEach(a => {
+ selectUserCondition({ type: 1 }).then((res) => {
+ let data = [];
+ res.data.forEach((a) => {
data.push({
label: a.name,
- value: a.id
- })
- })
- this.personList = data
- })
+ value: a.id,
+ });
+ });
+ this.personList = data;
+ });
},
}
};
</script>
<style scoped>
->>>.el-dialog {
- margin: 20px auto 50px !important;
-}
.tables {
table-layout: fixed;
width: 100%;
diff --git a/src/views/CNAS/process/ensureResultsValidity/components/detailFormDialog.vue b/src/views/CNAS/process/ensureResultsValidity/components/detailFormDialog.vue
index 8225f29..66aa2b8 100644
--- a/src/views/CNAS/process/ensureResultsValidity/components/detailFormDialog.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/components/detailFormDialog.vue
@@ -50,6 +50,11 @@
</template>
<script>
+import {
+ addQualityMonitorDetail,
+ updateQualityMonitorDetail
+} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
+
export default {
name: 'detailFormDialog',
// import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
@@ -106,12 +111,7 @@
let entity = this.HaveJson(this.form)
entity.qualityMonitorId = this.qualityMonitorId
this.upLoad = true
- this.$axios.post(this.$api.qualityMonitor.addQualityMonitorDetail, entity, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ addQualityMonitorDetail(entity).then(res => {
this.upLoad = false
if (res.code === 201) return
this.$message.success('鏂板鎴愬姛')
@@ -125,12 +125,7 @@
handleEdit () {
const entity = this.HaveJson(this.form)
this.upLoad = true
- this.$axios.post(this.$api.qualityMonitor.updateQualityMonitorDetail, entity, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ updateQualityMonitorDetail(entity).then(res => {
this.upLoad = false
if (res.code === 201) return
this.$message.success('淇敼鎴愬姛')
diff --git a/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue b/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
index d63fc50..06a9db4 100644
--- a/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/components/evaluateDialog.vue
@@ -159,6 +159,12 @@
<script>
import ViewRecord from './ViewRecord.vue';
+import {
+ addMonitorEvaluateOpinion, addQualityMonitorEvaluate,
+ getQualityMonitorEvaluate
+} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
+import {selectUserCondition} from "@/api/business/inspectionTask";
+import {selectUserDepartmentLimsName} from "@/api/system/user";
export default {
name: 'evaluateDialog',
@@ -202,8 +208,7 @@
// 鏌ヨ鐩戞帶璁″垝璇︽儏瀹炴柦淇℃伅
searchInfo (row) {
this.form.qualityMonitorDetailsId = row.qualityMonitorDetailsId
- this.$axios.get(this.$api.qualityMonitor.getQualityMonitorEvaluate + '?qualityMonitorDetailsId=' + row.qualityMonitorDetailsId).then(res => {
- if (res.code === 201) return
+ getQualityMonitorEvaluate({qualityMonitorDetailsId: row.qualityMonitorDetailsId}).then(res => {
if (res.data === null) {
this.showStep = 0
this.currentStep = 0
@@ -229,14 +234,9 @@
// 鎻愪氦
handleEdit () {
if (this.currentStep === 2) {
- this.$axios.post(this.$api.qualityMonitor.addMonitorEvaluateOpinion, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ this.editLoad = true
+ addMonitorEvaluateOpinion(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeEvaDia()
}).catch(err => {
@@ -270,14 +270,9 @@
return
}
}
- this.$axios.post(this.$api.qualityMonitor.addQualityMonitorEvaluate, this.form, {
- headers: {
- "Content-Type": "application/json"
- },
- noQs: true
- }).then(res => {
+ this.editLoad = true
+ addQualityMonitorEvaluate(this.form).then(res => {
this.editLoad = false
- if (res.code === 201) return
this.$message.success('鎿嶄綔鎴愬姛')
this.closeEvaDia()
}).catch(err => {
@@ -301,20 +296,19 @@
})
},
getAuthorizedPerson() {
- this.$axios.get(this.$api.user.getUserMenu).then(res => {
- let data = []
- res.data.forEach(a => {
+ selectUserCondition({ type: 1 }).then((res) => {
+ let data = [];
+ res.data.forEach((a) => {
data.push({
label: a.name,
- value: a.id
- })
- })
- this.personList = data
- })
+ value: a.id,
+ });
+ });
+ this.personList = data;
+ });
},
getDepartment() {
- this.$axios.get(this.$api.user.selectUserDepartmentLimsName).then(res => {
- if (res.code === 201) return
+ selectUserDepartmentLimsName().then(res => {
this.form.implementDepartment = res.data
})
},
diff --git a/src/views/CNAS/process/ensureResultsValidity/index.vue b/src/views/CNAS/process/ensureResultsValidity/index.vue
index 04828cc..c7f1316 100644
--- a/src/views/CNAS/process/ensureResultsValidity/index.vue
+++ b/src/views/CNAS/process/ensureResultsValidity/index.vue
@@ -92,7 +92,7 @@
</div>
<div>
鎵瑰噯鎰忚锛�
- <el-input v-model="approvalRemarks" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
+ <el-input v-model="ratifyRemark" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
</div>
<span v-if="this.ratifyStatus !== 1" slot="footer" class="dialog-footer">
<el-button :loading="lookDialogLoading" @click="handleApproval(0)">涓嶆壒鍑�</el-button>
@@ -101,8 +101,8 @@
</el-dialog>
<el-dialog :visible.sync="downloadDialog" title="瀵煎嚭" width="600px">
<span>
- <el-button plain type="primary" @click="controlDown">瀹炴柦璁″垝瀵煎嚭</el-button>
- <el-button plain type="primary" @click="processingDown">璇勪环瀵煎嚭</el-button>
+ <el-button plain type="primary" :disabled="!download.qualityMonitorDetailsId" @click="controlDown">瀹炴柦璁″垝瀵煎嚭</el-button>
+ <el-button plain type="primary" :disabled="!download.qualityMonitorDetailsId" @click="processingDown">璇勪环瀵煎嚭</el-button>
</span>
<span slot="footer" class="dialog-footer">
<el-button @click="downloadDialog = false">鍙� 娑�</el-button>
@@ -132,7 +132,7 @@
</div>
<div style="margin: 0 auto;">
<el-upload ref="upload" :action="action" :auto-upload="false" :file-list="fileList"
- :headers="headers" :limit="1"
+ :headers="uploadHeader" :limit="1"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'
:on-change="beforeUpload" :on-error="onError" :on-success="handleSuccessUp" drag
:data="{planYear: planYear, examineUserId: examineUserId}"
@@ -148,13 +148,12 @@
</el-dialog>
<!--鐢熸垚鎶ュ憡寮规-->
<el-dialog :visible.sync="uploadDia1" title="鐢熸垚鎶ュ憡" width="500px">
- <div v-if="approvalRemarks">
+ <div v-if="ratifyRemark">
鎵瑰噯鎰忚锛�
- <el-input v-model="approvalRemarks" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
+ <el-input v-model="ratifyRemark" :disabled="this.ratifyStatus === 1" type="textarea"></el-input>
</div>
<div style="margin: 0 auto;">
- <el-upload ref="upload1" :action="action1" :auto-upload="false"
- :data="{qualityMonitorDetailsId: qualityMonitorDetailsId}" :file-list="fileList1" :headers="headers"
+ <el-upload ref="upload1" :action="action1" :auto-upload="false" :data="{qualityMonitorDetailsId: qualityMonitorDetailsId}" :file-list="fileList1" :headers="uploadHeader"
:limit="1"
:on-change="beforeUpload1" :on-error="onError1" :on-success="onSuccess1" accept='.doc,.docx'
drag
@@ -185,7 +184,7 @@
ratifyQualityMonitor
} from "@/api/cnas/process/ensureResultsValidity/qualityMonitor";
import {selectUserCondition} from "@/api/performance/class";
-import {getToken} from "@/utils/auth";
+import {mapGetters} from "vuex";
export default {
name: 'a7-Ensure-results-validity',
@@ -297,7 +296,7 @@
name: '瀹℃牳',
type: 'text',
disabled: (row) => {
- if (row.examineStatus === 1 || JSON.parse(localStorage.getItem("user")).userId != row.examineUserId) {
+ if (row.examineStatus === 1 || this.userId != row.examineUserId) {
return true
} else {
return false
@@ -311,7 +310,7 @@
name: '鎵瑰噯',
type: 'text',
disabled: (row) => {
- if (row.ratifyStatus === 1 || row.examineStatus !== 1 || JSON.parse(localStorage.getItem("user")).userId != row.ratifyUserId) {
+ if (row.ratifyStatus === 1 || row.examineStatus !== 1 || this.userId != row.ratifyUserId) {
return true
} else {
return false
@@ -469,13 +468,10 @@
currentInfo: {},
qualityMonitorDetailsId: '',
ratifyStatus: '',
- approvalRemarks: '',
+ ratifyRemark: '',
downloadDialog: false,
download: {},
- planYear: '',
- headers: {
- Authorization: "Bearer " + getToken(),
- },
+ planYear: ''
};
},
mounted() {
@@ -612,7 +608,7 @@
handleApproval (status) {
const personTrainingUpdateDto = {
qualityMonitorDetailsId: this.currentInfo.qualityMonitorDetailsId,
- ratifyRemark: this.approvalRemarks,
+ ratifyRemark: this.ratifyRemark,
ratifyStatus: status
}
this.lookDialogLoading = true
@@ -701,10 +697,10 @@
this.carryOutDia = false
this.getYearDetailPlanList()
},
- // 鎵撳紑鎶ュ憡寮规
+ // 鎵撳紑瀹屾垚鎶ュ憡寮规
record (row) {
this.qualityMonitorDetailsId = row.qualityMonitorDetailsId
- this.approvalRemarks = row.approvalRemarks
+ this.ratifyRemark = row.ratifyRemark
if (row.finishReportUrl) {
this.currentInfo = row
this.ratifyStatus = row.ratifyStatus
@@ -819,6 +815,7 @@
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
computed: {
+ ...mapGetters(["userId"]),
action() {
return this.javaApi + '/qualityMonitor/importQualityMonitor'
},
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
index 0cd9c6d..b17f95d 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/facilities-environmental-conditions/power-supply-stability.vue
@@ -191,11 +191,20 @@
</template>
<script>
+import {
+ getLaboratoryFacilityPowerStablePage,
+ deviceScopeSearch,
+ treeDevice,
+ selectUserCondition,
+ addLaboratoryFacilityPowerStable,
+ deleteFeMeasuredQuantity
+} from '@/api/cnas/resourceDemand/facilitiesEnvironment/facilitiesAndEnvironment'
+
export default {
data() {
return {
search: {
- size: 20,
+ size: 10,
current: 1,
total: 0
},
@@ -235,11 +244,14 @@
methods: {
// 鍒濆鍖栬皟鐢�
initData() {
- this.$axios.get(this.$api.facilitiesAndEnvironment.getLaboratoryFacilityPowerStablePage + '?size=' + this.search.size + '¤t=' + this.search.current).then(res => {
- if (res.code === 201) return;
- this.tableData = res.data.records;
- this.search.total = res.data.total;
- });
+ getLaboratoryFacilityPowerStablePage({
+ ...this.search
+ }).then(res => {
+ if (res.code === 200){
+ this.tableData = res.data.records;
+ this.search.total = res.data.total;
+ }
+ })
},
handleSizeChange(val) {
this.search.size = val;
@@ -269,7 +281,7 @@
// 鑾峰彇鎵�鏈夎澶�
getEquipOptions() {
this.equipOptions = []
- this.$axios.get(this.$api.deviceScope.deviceScopeSearch+'?status=0').then(res => {
+ deviceScopeSearch({status:'0'}).then(res => {
if (res.code === 200 && res.data) {
this.equipOptions = res.data
}
@@ -279,9 +291,9 @@
},
// 鐢垫簮绋冲畾鎬�-鎵撳紑寮规璋冪敤璁惧鎺ュ彛锛屾煡璇娇鐢ㄧ殑璁惧
openDialog() {
- this.$axios.get(this.$api.deviceScope.treeDevice).then(res => {
+ treeDevice().then(res => {
this.cascaderList = res.data;
- });
+ })
this.$nextTick(() => {
this.$refs['form'].clearValidate()
})
@@ -324,11 +336,7 @@
this.submitLoading = true
this.$refs.form.validate((valid) => {
if (valid) {
- this.$axios.post(this.$api.facilitiesAndEnvironment.addLaboratoryFacilityPowerStable, this.form, {
- headers: {
- 'Content-Type': 'application/json'
- }
- }).then(res => {
+ addLaboratoryFacilityPowerStable(this.form).then(res => {
this.submitLoading = false
if (res.code === 200) {
this.initData()
@@ -383,9 +391,16 @@
},
// 鑾峰彇璐熻矗浜轰俊鎭帴鍙�
getUserList() {
- this.$axios.get(this.$api.deviceScope.selectUserList).then(res => {
+ selectUserCondition().then(res => {
if (res.code == 200) {
- this.responsibleOptions = res.data
+ let data = []
+ res.data.forEach(a => {
+ data.push({
+ id: a.id,
+ name: a.name
+ })
+ })
+ this.responsibleOptions = data
}
})
},
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 58accdd..697a551 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -21,7 +21,7 @@
<el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">杩涜揣楠岃瘉</el-button>
<el-button v-if="state == 1 && typeSource == 1" size="small" type="primary" @click="openUnPassDialog('add')">涓嶅悎鏍煎鐞�</el-button>
<el-button size="small" type="primary" @click="sampleVisible = true;uploadSample();">鏍峰搧鍒囨崲</el-button>
- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>
+<!-- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>-->
<el-button v-if="state == 1" size="small" type="primary" @click="addVerifyDia = true">鎻愪氦</el-button>
<!-- 澶嶆牳 -->
<el-button v-if="state == 2" size="medium" type="primary" @click="openAddCheck">閫氳繃</el-button>
@@ -355,7 +355,6 @@
size="medium" style="margin-right: 5px">{{ item.label }}</el-tag>
</template>
</el-table-column>
- <el-table-column label="妫�楠屼汉" min-width="80px" prop="checkName" show-overflow-tooltip></el-table-column>
<el-table-column align="center" label="鏄惁鐣欐牱" prop="isLeave" show-overflow-tooltip width="95px">
<template slot-scope="scope">
<span>{{ scope.row.isLeave == 0 ? "鍚�" : "鏄�" }}</span>
@@ -786,7 +785,7 @@
this.getAuthorizedPerson();
// this.getPower();
this.startWorker();
- this.getList0()
+ // this.getList0() // 浠诲姟鍒囨崲
this.scrollInit();
},
watch: {
diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 18783ad..47ef83b 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -1781,8 +1781,7 @@
},
goBack () {
- const obj = { path: "/business/materialOrder" };
- this.$tab.closeOpenPage(obj);
+ this.$router.go(-1)
}
}
}
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index d303dc9..79fc1b1 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -1832,8 +1832,7 @@
return row[property] === value;
},
goBack () {
- const obj = { path: "/business/materialOrder" };
- this.$tab.closeOpenPage(obj);
+ this.$router.go(-1)
}
}
}
diff --git a/src/views/business/productOrder/components/add.vue b/src/views/business/productOrder/components/add.vue
index 1b32e91..543f32d 100644
--- a/src/views/business/productOrder/components/add.vue
+++ b/src/views/business/productOrder/components/add.vue
@@ -2143,8 +2143,7 @@
this.productList0.splice(index,1)
},
goBack () {
- const obj = { path: "/business/productOrder" };
- this.$tab.closeOpenPage(obj);
+ this.$router.go(-1)
}
}
}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2b823cb..95dc281 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -147,6 +147,11 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="12">
+ <el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
+ <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="12">
--
Gitblit v1.9.3