From 904710d226d8dd5253937cbd572ca208be804ea5 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 17:10:28 +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/Step1.vue | 393 +++++++++++++++++++++++++++----------------------------
1 files changed, 195 insertions(+), 198 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/Step1.vue b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/Step1.vue
index c1f26ad..967c41b 100644
--- a/src/views/CNAS/resourceDemand/standardMaterialAccept/component/Step1.vue
+++ b/src/views/CNAS/resourceDemand/standardMaterialAccept/component/Step1.vue
@@ -1,201 +1,198 @@
-<!--<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>-->
-<!-- <ZTTable-->
-<!-- style="margin-bottom: 20px;"-->
-<!-- :column="spareColumns"-->
-<!-- :table-data="model.list"-->
-<!-- >-->
-<!-- <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>-->
-<!-- </ZTTable>-->
-<!-- </el-form-item>-->
-<!-- </el-col>-->
-<!-- </el-card>-->
-<!--</template>-->
+<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 ZTTable from '@/components/caorui/ZTTable/index.vue';-->
-<!--import { getStandardSubstanceAll } from "@/assets/api/api";-->
-<!--import axios from 'axios';-->
+<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: {-->
-<!-- ZTTable-->
-<!-- },-->
-<!-- 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}/${this.$api.personnel.saveCNASFile}`-->
-<!-- }-->
-<!-- },-->
-<!-- mounted() {-->
-<!-- this.getStand()-->
-<!-- },-->
-<!-- methods: {-->
-<!-- async getStand() {-->
-<!-- const { code, data } = await axios({-->
-<!-- url: getStandardSubstanceAll,-->
-<!-- method: 'get'-->
-<!-- })-->
-<!-- this.options = 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>-->
+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>-->
+<style scoped>
+.card {
+ margin-top: 1em;
+ height: 56vh;
+ overflow-y: scroll;
+}
+.table-between {
+ display: flex;
+ justify-content: space-between;
+}
+</style>
--
Gitblit v1.9.3