From 64253c1ee691739bb4eab685f61e91da84b69938 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 27 二月 2025 10:11:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev
---
src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue | 336 ++++++++++++++++-----
/dev/null | 198 -------------
src/api/cnas/personnel/personnelOverview.js | 9
src/assets/images/renyuan-title.svg | 11
src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue | 71 +---
src/views/CNAS/personnel/personnelOverview/index.vue | 201 +++++++++++++
src/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept.js | 27 +
7 files changed, 520 insertions(+), 333 deletions(-)
diff --git a/src/api/cnas/personnel/personnelOverview.js b/src/api/cnas/personnel/personnelOverview.js
new file mode 100644
index 0000000..6afa9a1
--- /dev/null
+++ b/src/api/cnas/personnel/personnelOverview.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function selectPersonnelOverview(query) {
+ return request({
+ url: '/user/selectPersonnelOverview',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/src/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept.js b/src/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept.js
index 010c461..e9a0a7a 100644
--- a/src/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept.js
+++ b/src/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept.js
@@ -15,10 +15,18 @@
data: query
})
}
-
+// 鏂板楠屾敹
export function addAcceptance(query) {
return request({
url: '/feStandardSubstanceAcceptance/addAcceptance',
+ method: 'post',
+ data: query
+ })
+}
+// 淇敼楠屾敹
+export function updateAcceptance(query) {
+ return request({
+ url: '/feStandardSubstanceAcceptance/updateAcceptance',
method: 'post',
data: query
})
@@ -34,6 +42,23 @@
params: query
})
}
+// 鏍囧噯鐗╄川楠屾敹鏌ョ湅璇︽儏
+export function getAcceptanceDetails(query) {
+ return request({
+ url: '/feStandardSubstanceAcceptance/getAcceptanceDetails',
+ method: 'get',
+ params: query
+ })
+}
+// 鏍囧噯鐗╄川楠屾敹瀵煎嚭
+export function exportFeStandardSubstanceAcceptance(query) {
+ return request({
+ url: '/feStandardSubstanceAcceptance/exportFeStandardSubstanceAcceptance',
+ method: 'get',
+ params: query,
+ responseType: "blob"
+ })
+}
diff --git a/src/assets/images/renyuan-title.svg b/src/assets/images/renyuan-title.svg
new file mode 100644
index 0000000..c69691f
--- /dev/null
+++ b/src/assets/images/renyuan-title.svg
@@ -0,0 +1,11 @@
+<svg width="148" height="21" viewBox="0 0 148 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.00437 5.75531V0.0625L0.772461 5.75531H7.00437Z" fill="#B26F00"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M141.709 5.75531V0.0625L147.941 5.75531H141.709Z" fill="#B26F00"/>
+<path d="M6.97192 2.0625C6.97192 0.957931 7.86735 0.0625 8.97192 0.0625H139.676C140.781 0.0625 141.676 0.957931 141.676 2.0625V12.0625C141.676 16.4808 138.095 20.0625 133.676 20.0625H14.9719C10.5537 20.0625 6.97192 16.4808 6.97192 12.0625V2.0625Z" fill="url(#paint0_linear_2026_4)"/>
+<defs>
+<linearGradient id="paint0_linear_2026_4" x1="6.97192" y1="0.0625" x2="6.97192" y2="20.0625" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F9C76F"/>
+<stop offset="1" stop-color="#FEB42F"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/views/CNAS/personnel/personnelOverview/index.vue b/src/views/CNAS/personnel/personnelOverview/index.vue
new file mode 100644
index 0000000..c5c8da2
--- /dev/null
+++ b/src/views/CNAS/personnel/personnelOverview/index.vue
@@ -0,0 +1,201 @@
+<template>
+ <div class="capacity-scope">
+ <div>
+ <el-form :model="entity" ref="entity" size="small" :inline="true">
+ <el-form-item label="浜哄憳鍚嶇О">
+ <el-input v-model="entity.name" clearable></el-input>
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="refresh">閲� 缃�</el-button>
+ <el-button type="primary" @click="currentPage= 1,list=[],finishLoding = false,keyMap = {},refreshTable()">鏌� 璇�</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div class="table" v-loading="loading">
+ <scroll-pagination @load="refreshTable" :finishLoding="finishLoding" :list="list" v-if="list.length>0||loading">
+ <ul class="card">
+ <li v-for="(m,i) in list" :key="i">
+ <el-image style="width: 80px;height: 112px;" :src="javaApi+'/img/'+m.pictureUrl">
+ <div slot="error" class="image-error" style="width: 79px;
+ height: 110px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid #EEEEEE;">
+ <i class="el-icon-picture-outline" style="font-size:30px;color:#666666;"></i>
+ </div>
+ </el-image>
+ <el-image style="width: 195px;
+ height: 112px;" :src="javaApi+'/img/'+m.signatureUrl">
+ <div slot="error" class="image-error" style="width: 194px;
+ height: 110px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border: 1px solid #EEEEEE;">
+ <i class="el-icon-picture-outline" style="font-size:30px;color:#666666;"></i>
+ </div>
+ </el-image>
+ <div class="title">{{ m.name }}</div>
+ </li>
+ </ul>
+ </scroll-pagination>
+ <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >鏆傛棤鏁版嵁</div>
+ </div>
+ </div>
+</template>
+
+<script>
+import ScrollPagination from '@/components/index/scroll-paging.vue'
+import {selectUserCondition} from "@/api/business/inspectionTask";
+export default {
+ components: {
+ ScrollPagination
+ },
+ data() {
+ return {
+ entity:{
+ name: null,
+ status: 0,
+ },
+ list:[],
+ currentPage: 1, // 褰撳墠椤�
+ pageSize: 16, // 涓�椤�16鏉�
+ total: '',
+ loading: true, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue
+ finishLoding: false, // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡
+ keyMap: {}
+ }
+ },
+ created() {
+ this.keyMap = {};
+ this.currentPage = 1;
+ this.list = [];
+ this.refreshTable();
+ },
+ methods: {
+ refreshTable() {
+ const key = `_${this.currentPage}`
+ const value = this.keyMap[key]
+ // 濡傛灉value瀛樺湪锛岃〃绀虹紦瀛樻湁鍊硷紝閭ｄ箞闃绘璇锋眰
+ if(value) {
+ return
+ }
+ // value涓嶅瓨鍦紝琛ㄧず绗竴娆¤姹�,璁剧疆鍗犱綅
+ this.keyMap[key] = 'temp'
+ if(this.currentPage==1){
+ this.loading = true
+ }
+ selectUserCondition({...this.entity}).then(res => {
+ this.total = res.data.length
+ let list = res.data
+ if(list.length==0){
+ this.finishLoding = true;
+ }else{
+ if(list.length<this.pageSize){
+ this.finishLoding = true;
+ }
+ this.list = this.list.concat(list)
+ if(this.total==this.list.length){
+ this.finishLoding = true;
+ }
+ this.currentPage++;
+ }
+ this.loading = false
+ }).catch(err => {
+ this.loading = false
+ })
+ },
+ refresh() {
+ this.keyMap = {};
+ this.currentPage= 1;
+ this.list=[];
+ this.finishLoding = false;
+ this.entity={
+ name: null,
+ state:1,
+ orderBy: {field: "id", order: "asc"}
+ };
+ this.refreshTable()
+ },
+ // 婊氬姩瑙﹀簳鍔犺浇
+ scrollFn() {
+ let clientHeight = document.documentElement.clientHeight - 18; //鍙鍖哄煙
+ let scrollHeight = document.body.scrollHeight; // 婊氬姩鏂囨。楂樺害
+ let scrollTop = parseInt(document.documentElement.scrollTop); // 宸叉粴鍔ㄧ殑楂樺害
+ let height = 300;
+ if (
+ scrollTop + clientHeight >= scrollHeight - height &&
+ scrollHeight != 0
+ ) {
+ if (!this.finishLoding&&this.currentPage*this.pageSize<this.total) {
+ this.currentPage = this.currentPage + 1;
+ this.refreshTable();
+ }
+ } else {
+ return false;
+ }
+ },
+ throttle(fn, wait) {
+ // 灏佽鍑芥暟杩涜鑺傛祦
+ var timer = null;
+ return function () {
+ var context = this;
+ var args = arguments;
+ if (!timer) {
+ timer = setTimeout(function () {
+ fn.apply(context, args);
+ timer = null;
+ }, wait);
+ }
+ };
+ },
+ },
+ destroyed() {
+ window.removeEventListener("scroll", this.throttle(), false);
+ },
+}
+</script>
+<style scoped>
+.table {
+ width: 100%;
+ height: calc(100% - 60px - 80px - 10px - 40px);
+ overflow-y: auto;
+}
+
+.card {
+ list-style-type: none;
+ display: grid;
+ grid-template-columns: repeat(auto-fit, 314px);
+ /* justify-content: center; */
+ grid-gap: 16px;
+ min-height: 200px;
+ padding-left: 0 !important;
+}
+.card li{
+ width: 320px;
+ border-radius: 8px 8px 8px 8px;
+ box-shadow: 4px 4px 8px 0px rgba(51,51,51,0.04);
+ border: 1px solid #EEEEEE;
+ margin: 0 !important;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ box-sizing: border-box;
+ padding: 26px 16px 16px;
+ font-size: 14px;
+ position: relative;
+}
+li .title{
+ width: 147px;
+ height: 20px;
+ background: url(~@/assets/images/renyuan-title.svg) no-repeat;
+ position: absolute;
+ top: -6px;
+ left: 50%;
+ transform: translateX(-50%);
+ text-align: center;
+ line-height: 20px;
+ color: #fff;
+}
+</style>
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
index bd776c7..dc48446 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/AddRecord.vue
@@ -1,103 +1,261 @@
<template>
- <el-dialog :visible.sync="dialogVisible" title="鏍囧噯鐗╄川楠屾敹璁板綍" width="70%">
- <el-steps :active="currentStep" finish-status="success">
- <el-step class="cursor-pointer" v-for="(item, index) in steps" :key="index" :title="item">
- </el-step>
- </el-steps>
- <el-form :model="model" label-width="140px" size="small">
- <Step1 :model.sync="model"></Step1>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="submit">淇� 瀛�</el-button>
- </span>
- </el-dialog>
+ <el-dialog :visible.sync="dialogVisible" title="鏍囧噯鐗╄川楠屾敹璁板綍" width="72%" v-loading="loading">
+ <el-form :model="acceptance" ref="acceptance" label-width="140px" size="small">
+ <el-col :span="12">
+ <el-form-item label="鍘傚浠ｈ〃" prop="producer">
+ <el-input v-model="acceptance.producer"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鐩稿叧闄勪欢" prop="file">
+ <div class="table-between">
+ <el-input v-model="acceptance.file" style="width: 80%;" disabled></el-input>
+ <el-upload
+ ref="upload"
+ style="float: right;"
+ :headers="uploadHeader"
+ :action="action"
+ :show-file-list="false"
+ :on-success="onSuccess"
+ >
+ <el-button type="primary">
+ 闄勪欢涓婁紶
+ </el-button>
+ </el-upload>
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺ユ敹浜�" prop="recipient">
+ <el-input v-model="acceptance.recipient"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎺ュ彈绛惧瓧" prop="signature">
+ <el-input v-model="acceptance.signature"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="楠屾敹鎯呭喌" prop="situation">
+ <el-input v-model="acceptance.situation"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="瀹夎璋冭瘯鎯呭喌" prop="installation">
+ <el-input v-model="acceptance.installation"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="娓呭崟" prop="substanceId"
+ :rule="[{ required: true, message: '璇烽�夋嫨娓呭崟', trigger: 'change' }]">
+ <el-select v-model="acceptance.substanceId" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option
+ v-for="item in options"
+ :key="item.value"
+ :label="item.name"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍒拌揣鏃ユ湡" prop="arriveDate">
+ <el-date-picker
+ v-model="acceptance.arriveDate"
+ align="right"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ style="width: 100%"
+ value-format="yyyy-MM-dd"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="缁翠慨鍗曚綅" prop="maintenanceUnit">
+ <el-input v-model="acceptance.maintenanceUnit"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="澶囦欢纭">
+ <el-button type="primary" style="float: right;" @click="addSpareTable">澧炲姞琛�</el-button>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <lims-table :tableData="list" :column="spareColumns" height="300">
+ <template slot="name" slot-scope="{ row, index }">
+ <el-input v-if="row.isEdit" size="small" v-model="row.name"></el-input>
+ <span v-else>{{ row.name }}</span>
+ </template>
+ <template slot="number" slot-scope="{ row, index }">
+ <el-input v-if="row.isEdit" size="small" v-model="row.number"></el-input>
+ <span v-else>{{ row.number }}</span>
+ </template>
+ <template slot="action" slot-scope="{ row, index }">
+ <div v-if="row.isEdit">
+ <el-button type="text" @click="save(index)">淇濆瓨</el-button>
+ <el-button type="text">鍙栨秷</el-button>
+ </div>
+ <div v-else>
+ <el-button type="text" @click="edit(index)">淇敼</el-button>
+ </div>
+ </template>
+ </lims-table>
+ </el-col>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="closeDialog">鍙� 娑�</el-button>
+ <el-button type="primary" :loading="submitLoading" @click="submit">淇� 瀛�</el-button>
+ </span>
+ </el-dialog>
</template>
<script>
-import Step1 from './Step1.vue'
+import limsTable from "@/components/Table/lims-table.vue";
+import {
+ addAcceptance, getAcceptanceDetails,
+ getStandardSubstanceAll,
+ updateAcceptance
+} from "@/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept";
export default {
- components: {
- Step1
- },
- data() {
- return {
- dialogVisible: false,
- currentStep: 0, // 姝ラ鏉℃樉绀虹鍑犳
- steps: ['鎻愪氦', '寮�绠遍獙鏀跺鏍�', '瀹夎楠屾敹妫�鏌�', '瀹夎楠屾敹澶嶆牳', '楠屾敹鏍告煡', '楠屾敹鏍告煡瀹℃牳'],
- model: {
- acceptance: {
- id: undefined,
- producer: undefined, // 鍘傚浠ｈ〃
- file: undefined, // 鐩稿叧闄勪欢
- recipient: undefined, // 鎺ユ敹浜�
- signature: undefined, // 鎺ュ彈绛惧瓧
- situation: undefined, // 楠屾敹鎯呭喌
- installation: undefined, // 瀹夎璋冭瘯鎯呭喌
- substanceId: undefined, // 娓呭崟
- arriveDate: undefined, // 鍒拌揣鏃ユ湡
- maintenanceUnit: undefined, // 缁翠慨鍗曚綅
- },
- list: []
- }
+ components: {
+ limsTable,
+ },
+ data() {
+ return {
+ dialogVisible: false,
+ loading: false,
+ submitLoading: false,
+ acceptance: {
+ id: undefined,
+ producer: undefined, // 鍘傚浠ｈ〃
+ file: undefined, // 鐩稿叧闄勪欢
+ recipient: undefined, // 鎺ユ敹浜�
+ signature: undefined, // 鎺ュ彈绛惧瓧
+ situation: undefined, // 楠屾敹鎯呭喌
+ installation: undefined, // 瀹夎璋冭瘯鎯呭喌
+ substanceId: undefined, // 娓呭崟
+ arriveDate: undefined, // 鍒拌揣鏃ユ湡
+ maintenanceUnit: undefined, // 缁翠慨鍗曚綅
+ list: [],
+ },
+ list: [],
+ spareColumns: [
+ {
+ label: "鍚嶇О",
+ prop: "name",
+ align: "center",
+ dataType: "slot",
+ slot: "name",
+ }, {
+ label: "鏁伴噺",
+ prop: "number",
+ align: "center",
+ dataType: "slot",
+ slot: "number",
+ }, {
+ label: "鎿嶄綔",
+ align: "center",
+ dataType: "slot",
+ slot: "action",
+ width: 150
}
- },
- watch: {
- model(newVal) {
- this.model = newVal
- }
- },
- methods: {
- clearForm() {
- this.model.acceptance.id = undefined
- this.model.acceptance.producer = undefined
- this.model.acceptance.file = undefined
- this.model.acceptance.recipient = undefined
- this.model.acceptance.signature = undefined
- this.model.acceptance.situation = undefined
- this.model.acceptance.installation = undefined
- this.model.acceptance.substanceId = undefined
- this.model.acceptance.arriveDate = undefined
- this.model.acceptance.maintenanceUnit = undefined
- this.model.list = []
- },
- openDialog(form) {
- console.log(form)
- if(form) {
- this.model.acceptance.id = form.acceptance.id
- this.model.acceptance.producer = form.acceptance.producer
- this.model.acceptance.file = form.acceptance.file
- this.model.acceptance.recipient = form.acceptance.recipient
- this.model.acceptance.signature = form.acceptance.signature
- this.model.acceptance.situation = form.acceptance.situation
- this.model.acceptance.installation = form.acceptance.installation
- this.model.acceptance.substanceId = form.acceptance.substanceId
- this.model.acceptance.arriveDate = form.acceptance.arriveDate
- this.model.acceptance.maintenanceUnit = form.acceptance.maintenanceUnit
- this.model.list = form.list
- } else {
- this.clearForm()
- }
- this.dialogVisible = true
- },
- closeDialog() {
- this.dialogVisible = false
- },
- submit() {
- if (!this.model.acceptance.substanceId) {
- this.$message.warning('璇烽�夋嫨娓呭崟')
- return
- }
- this.$emit('submit', this.model)
- this.closeDialog()
- }
+ ],
+ options: []
}
+ },
+ mounted() {
+ this.getStand()
+ },
+ methods: {
+ openDialog(id) {
+ if(id) {
+ this.getDetail(id)
+ } else {
+ this.clearForm()
+ }
+ this.dialogVisible = true
+ },
+ getDetail(id) {
+ this.loading = true
+ getAcceptanceDetails({id: id}).then(res => {
+ this.acceptance = res.data.acceptance
+ this.list = res.data.list
+ this.loading = false
+ }).catch(err => {
+ this.loading = false
+ })
+ },
+ getStand() {
+ getStandardSubstanceAll().then(res => {
+ this.options = res.data
+ })
+ },
+ addSpareTable() {
+ this.list.push({
+ acceptanceId: this.acceptance.id,
+ name: '',
+ number: '',
+ isEdit: true
+ })
+ },
+ onSuccess(response) {
+ this.acceptance.file = response.data
+ },
+ save(index) {
+ this.$set(this.list[index], 'isEdit', false)
+ },
+ edit(index) {
+ this.$set(this.list[index], 'isEdit', true)
+ },
+ clearForm() {
+ this.list = []
+ this.resetForm('acceptance')
+ },
+ closeDialog() {
+ this.clearForm()
+ this.resetForm('acceptance')
+ this.dialogVisible = false
+ },
+ submit() {
+ if (!this.acceptance.substanceId) {
+ this.$message.warning('璇烽�夋嫨娓呭崟')
+ return
+ }
+ this.acceptance.list = this.HaveJson(this.list)
+ this.submitLoading = true
+ if(this.acceptance.id) {
+ updateAcceptance({acceptance: this.acceptance, list: this.list}).then(res => {
+ this.$message.success('缂栬緫鎴愬姛')
+ this.submitLoading = false
+ this.closeDialog()
+ this.$emit('submit')
+ }).catch((e) => {
+ this.submitLoading = false
+ })
+ } else {
+ addAcceptance({acceptance: this.acceptance, list: this.list}).then(res => {
+ this.$message.success('鏂板鎴愬姛')
+ this.closeDialog()
+ this.$emit('submit')
+ }).catch((e) => {
+ this.submitLoading = false
+ })
+ }
+ },
+ },
+ computed: {
+ action() {
+ return this.javaApi + '/personBasicInfo/saveCNASFile'
+ }
+ },
}
</script>
<style scoped>
-.cursor-pointer {
- cursor: pointer;
+>>>.el-dialog__body {
+ height: 580px;
+ overflow-y: auto;
}
</style>
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/Step1.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/Step1.vue
deleted file mode 100644
index 967c41b..0000000
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/Step1.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
- <el-card class="card">
- <el-col :span="12">
- <el-form-item label="鍘傚浠ｈ〃">
- <el-input v-model="model.acceptance.producer"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐩稿叧闄勪欢">
- <div class="table-between">
- <el-input v-model="model.acceptance.file" style="width: 82%;"></el-input>
- <el-upload
- ref="upload"
- style="float: left; margin: 0 12px 0 20px;"
- :action="action"
- :show-file-list="false"
- :on-success="onSuccess"
- >
- <el-button type="primary">
- 闄勪欢涓婁紶
- </el-button>
- </el-upload>
- </div>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎺ユ敹浜�">
- <el-input v-model="model.acceptance.recipient"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鎺ュ彈绛惧瓧">
- <el-input v-model="model.acceptance.signature"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="楠屾敹鎯呭喌">
- <el-input v-model="model.acceptance.situation"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="瀹夎璋冭瘯鎯呭喌">
- <el-input v-model="model.acceptance.installation"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="娓呭崟" prop="substanceId" required>
- <el-select v-model="model.acceptance.substanceId" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.name"
- :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍒拌揣鏃ユ湡">
- <el-date-picker
- v-model="model.acceptance.arriveDate"
- align="right"
- type="date"
- placeholder="閫夋嫨鏃ユ湡"
- style="width: 100%"
- value-format="yyyy-MM-dd"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="缁翠慨鍗曚綅">
- <el-input v-model="model.acceptance.maintenanceUnit"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="澶囦欢纭">
- <el-button type="primary" style="float: right;" @click="addSpareTable">澧炲姞琛�</el-button>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item>
- <lims-table :tableData="model.list" :column="spareColumns" :height="'calc(100vh - 250px)'">
- <template slot="name" slot-scope="{ row, index }">
- <el-input v-if="row.isEdit" size="small" v-model="row.name"></el-input>
- <span v-else>{{ row.name }}</span>
- </template>
- <template slot="number" slot-scope="{ row, index }">
- <el-input v-if="row.isEdit" size="small" v-model="row.number"></el-input>
- <span v-else>{{ row.number }}</span>
- </template>
- <template slot="action" slot-scope="{ row, index }">
- <div v-if="row.isEdit">
- <el-button type="text" @click="save(index)">淇濆瓨</el-button>
- <el-button type="text">鍙栨秷</el-button>
- </div>
- <div v-else>
- <el-button type="text" @click="edit(index)">淇敼</el-button>
- </div>
- </template>
- </lims-table>
- </el-form-item>
- </el-col>
- </el-card>
-</template>
-
-<script>
-// import { getStandardSubstanceAll } from "@/assets/api/api";
-import axios from 'axios';
-import limsTable from '@/components/Table/lims-table.vue'
-import {
- getStandardSubstanceAll
-} from '@/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept'
-
-export default {
- components: {
- limsTable
- },
- props: {
- model: {
- type: Object,
- default: () => {}
- }
- },
- data() {
- return {
- spareColumns: [
- {
- label: "鍚嶇О",
- prop: "name",
- align: "center",
- dataType: "slot",
- slot: "name",
- }, {
- label: "鏁伴噺",
- prop: "number",
- align: "center",
- dataType: "slot",
- slot: "number",
- }, {
- label: "鎿嶄綔",
- align: "center",
- dataType: "slot",
- slot: "action",
- width: 150
- }
- ],
- options: []
- }
- },
- computed: {
- action() {
- return `${this.javaApi}/personBasicInfo/saveCNASFile`
- }
- },
- mounted() {
- this.getStand()
- },
- methods: {
- async getStand() {
- getStandardSubstanceAll().then(res => {
- this.options = res.data
- })
- },
- addSpareTable() {
- this.model.list.push({
- acceptanceId: this.model.acceptance.id,
- name: '',
- number: '',
- isEdit: true
- })
- },
- onSuccess(response) {
- this.model.acceptance.file = response.data
- this.$emit('update:model', this.model)
- },
- save(index) {
- this.model.list[index].isEdit = false
- this.$emit('update:model', this.model)
- },
- edit(index) {
- this.model.list[index].isEdit = true
- }
- }
-}
-</script>
-
-<style scoped>
-.card {
- margin-top: 1em;
- height: 56vh;
- overflow-y: scroll;
-}
-.table-between {
- display: flex;
- justify-content: space-between;
-}
-</style>
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
index 241a3c0..fe9ee04 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/index.vue
@@ -19,24 +19,21 @@
</div>
<div class="table">
<lims-table :tableData="tableData" :column="columns" :height="'calc(100vh - 250px)'" @pagination="pagination"
- :page="page" :tableLoading="tableLoading"></lims-table>
+ :page="page" :tableLoading="tableLoading">
+ <template slot="action" slot-scope="{ row }">
+ <el-button type="text" @click="edit(row)">缂栬緫</el-button>
+ </template>
+ </lims-table>
</div>
- <AddRecord ref="addRecordRef" @submit="submit"></AddRecord>
+ <AddRecord ref="addRecordRef" v-if="addRecordRef" @submit="submit"></AddRecord>
</div>
</template>
<script>
-// import axios from "axios";
-// import { getPageAcceptance, addAcceptance, updateAcceptance, getAcceptanceDetails, exportAcceptance } from "@/assets/api/api";
-// import ZTTable from '@/components/caorui/ZTTable/index.vue';
-// import AddRecord from './components/AddRecord.vue';
-
import limsTable from '@/components/Table/lims-table.vue'
import AddRecord from './component/AddRecord.vue';
import {
- getPageAcceptance,
- updateAcceptanc,
- addAcceptance
+ getPageAcceptance, getAcceptanceDetails, exportFeStandardSubstanceAcceptance, updateAcceptance, addAcceptance
} from '@/api/cnas/resourceDemand/standardMaterialAccept/standardMaterialAccept'
export default {
components: {
@@ -48,6 +45,7 @@
form: {
search: undefined
},
+ addRecordRef: false,
columns: [
{
label: "鍑哄満缂栧彿",
@@ -114,56 +112,39 @@
this.getTableData()
},
methods: {
- async getTableData() {
- const res = await getPageAcceptance(this.form);
- if (res.code === 200) {
+ getTableData() {
+ getPageAcceptance(this.form).then(res => {
this.tableData = res.data.records;
this.page.total = res.data.total;
- }
-
+ })
},
openDialog() {
- this.$refs.addRecordRef.openDialog()
- },
- async submit(form) {
-
- const { code } = await form.acceptance.id ? updateAcceptanc(this.form) : addAcceptance((this.form));
- if (code == 200) {
- this.$message.success(`${form.acceptance.id ? '缂栬緫' : '娣诲姞'}鎴愬姛`)
- this.getTableData()
- }
- },
- async edit(row) {
- const res = await this.getDetail(row.id)
- this.$refs.addRecordRef.openDialog({
- acceptance: res.acceptance,
- list: res.list
+ this.addRecordRef = true;
+ this.$nextTick(() => {
+ this.$refs.addRecordRef.openDialog()
})
},
- async getDetail(id) {
- const { code, data } = await axios({
- method: 'get',
- url: getAcceptanceDetails,
- params: { id }
+ submit() {
+ this.addRecordRef = false;
+ this.getTableData()
+ },
+ edit(row) {
+ this.addRecordRef = true;
+ this.$nextTick(() => {
+ this.$refs.addRecordRef.openDialog(row.id)
})
- if (code == 200) {
- return data;
- }
},
reset() {
this.form.search = undefined
this.getTableData()
},
async exportExcel() {
- const res = await axios({
- method: "get",
- url: `${exportAcceptance}`,
- responseType: "blob"
+ exportFeStandardSubstanceAcceptance().then(res => {
+ const blob = new Blob([res], { type: 'application/octet-stream' });
+ this.$download.saveAs(blob, '鏍囧噯鐗╄川楠屾敹.xlsx');
+ this.$message.success('瀵煎嚭鎴愬姛')
})
- const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '鏍囧噯鐗╄川楠屾敹.xlsx');
},
-
// 鍒嗛〉鍒囨崲
pagination(page) {
this.page.size = page.limit
--
Gitblit v1.9.3