From 2c38eea08bc6060c3371885e9f7fe79473968223 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 08 九月 2023 17:28:57 +0800
Subject: [PATCH] modified: .env.development modified: src/api/experiment/planAssignments.js deleted: src/styles/fonts/element-icons.ttf deleted: src/styles/fonts/element-icons.woff deleted: src/styles/icon.css modified: src/views/experiment/checkTheReport/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/inspectionManagement/commissionInspection/addCommision.vue modified: src/views/laboratory/ledger/index.vue
---
.env.development | 2
/dev/null | 1
src/views/experiment/reportAuditing/index.vue | 2
src/views/experiment/inspectionApplication/index.vue | 160 ++++++++++++++++++--------
src/views/laboratory/ledger/index.vue | 4
src/views/experiment/checkTheReport/index.vue | 2
src/views/inspectionManagement/commissionInspection/addCommision.vue | 117 +++++++++++--------
src/api/experiment/planAssignments.js | 17 ++
8 files changed, 200 insertions(+), 105 deletions(-)
diff --git a/.env.development b/.env.development
index ed06cde..c970d5a 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = 'http://192.168.218.96:1234/'
+VUE_APP_BASE_API = 'http://192.168.0.15:1234/'
diff --git a/src/api/experiment/planAssignments.js b/src/api/experiment/planAssignments.js
index bb475f4..516dd72 100644
--- a/src/api/experiment/planAssignments.js
+++ b/src/api/experiment/planAssignments.js
@@ -1,5 +1,22 @@
import request from '@/utils/request'
+//鑾峰彇鎴愬搧淇℃伅
+export function getMaterielList() {
+ return request({
+ url: '/inspection/getMaterielTypeIsOne',
+ method: 'post',
+ })
+}
+
+//鏍规嵁鎴愬搧鑾峰彇瑙勬牸鍨嬪彿
+export function getSpecificationByMaterielId(params) {
+ return request({
+ url: '/inspection/getSpecificationByMaterielId',
+ method: 'post',
+ params
+ })
+}
+
export function selectAllPlan(params) {
return request({
url: '/plan/selectAllPlan',
diff --git a/src/styles/fonts/element-icons.ttf b/src/styles/fonts/element-icons.ttf
deleted file mode 100644
index 91b74de..0000000
--- a/src/styles/fonts/element-icons.ttf
+++ /dev/null
Binary files differ
diff --git a/src/styles/fonts/element-icons.woff b/src/styles/fonts/element-icons.woff
deleted file mode 100644
index 02b9a25..0000000
--- a/src/styles/fonts/element-icons.woff
+++ /dev/null
Binary files differ
diff --git a/src/styles/icon.css b/src/styles/icon.css
deleted file mode 100644
index bf3ae3e..0000000
--- a/src/styles/icon.css
+++ /dev/null
@@ -1 +0,0 @@
-@font-face{font-family:element-icons;src:url(fonts/element-icons.woff) format("woff"),url(fonts/element-icons.ttf) format("truetype");font-weight:400;font-display:"auto";font-style:normal}[class*=" el-icon-"],[class^=el-icon-]{font-family:element-icons!important;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;vertical-align:baseline;display:inline-block;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.el-icon-ice-cream-round:before{content:"\e6a0"}.el-icon-ice-cream-square:before{content:"\e6a3"}.el-icon-lollipop:before{content:"\e6a4"}.el-icon-potato-strips:before{content:"\e6a5"}.el-icon-milk-tea:before{content:"\e6a6"}.el-icon-ice-drink:before{content:"\e6a7"}.el-icon-ice-tea:before{content:"\e6a9"}.el-icon-coffee:before{content:"\e6aa"}.el-icon-orange:before{content:"\e6ab"}.el-icon-pear:before{content:"\e6ac"}.el-icon-apple:before{content:"\e6ad"}.el-icon-cherry:before{content:"\e6ae"}.el-icon-watermelon:before{content:"\e6af"}.el-icon-grape:before{content:"\e6b0"}.el-icon-refrigerator:before{content:"\e6b1"}.el-icon-goblet-square-full:before{content:"\e6b2"}.el-icon-goblet-square:before{content:"\e6b3"}.el-icon-goblet-full:before{content:"\e6b4"}.el-icon-goblet:before{content:"\e6b5"}.el-icon-cold-drink:before{content:"\e6b6"}.el-icon-coffee-cup:before{content:"\e6b8"}.el-icon-water-cup:before{content:"\e6b9"}.el-icon-hot-water:before{content:"\e6ba"}.el-icon-ice-cream:before{content:"\e6bb"}.el-icon-dessert:before{content:"\e6bc"}.el-icon-sugar:before{content:"\e6bd"}.el-icon-tableware:before{content:"\e6be"}.el-icon-burger:before{content:"\e6bf"}.el-icon-knife-fork:before{content:"\e6c1"}.el-icon-fork-spoon:before{content:"\e6c2"}.el-icon-chicken:before{content:"\e6c3"}.el-icon-food:before{content:"\e6c4"}.el-icon-dish-1:before{content:"\e6c5"}.el-icon-dish:before{content:"\e6c6"}.el-icon-moon-night:before{content:"\e6ee"}.el-icon-moon:before{content:"\e6f0"}.el-icon-cloudy-and-sunny:before{content:"\e6f1"}.el-icon-partly-cloudy:before{content:"\e6f2"}.el-icon-cloudy:before{content:"\e6f3"}.el-icon-sunny:before{content:"\e6f6"}.el-icon-sunset:before{content:"\e6f7"}.el-icon-sunrise-1:before{content:"\e6f8"}.el-icon-sunrise:before{content:"\e6f9"}.el-icon-heavy-rain:before{content:"\e6fa"}.el-icon-lightning:before{content:"\e6fb"}.el-icon-light-rain:before{content:"\e6fc"}.el-icon-wind-power:before{content:"\e6fd"}.el-icon-baseball:before{content:"\e712"}.el-icon-soccer:before{content:"\e713"}.el-icon-football:before{content:"\e715"}.el-icon-basketball:before{content:"\e716"}.el-icon-ship:before{content:"\e73f"}.el-icon-truck:before{content:"\e740"}.el-icon-bicycle:before{content:"\e741"}.el-icon-mobile-phone:before{content:"\e6d3"}.el-icon-service:before{content:"\e6d4"}.el-icon-key:before{content:"\e6e2"}.el-icon-unlock:before{content:"\e6e4"}.el-icon-lock:before{content:"\e6e5"}.el-icon-watch:before{content:"\e6fe"}.el-icon-watch-1:before{content:"\e6ff"}.el-icon-timer:before{content:"\e702"}.el-icon-alarm-clock:before{content:"\e703"}.el-icon-map-location:before{content:"\e704"}.el-icon-delete-location:before{content:"\e705"}.el-icon-add-location:before{content:"\e706"}.el-icon-location-information:before{content:"\e707"}.el-icon-location-outline:before{content:"\e708"}.el-icon-location:before{content:"\e79e"}.el-icon-place:before{content:"\e709"}.el-icon-discover:before{content:"\e70a"}.el-icon-first-aid-kit:before{content:"\e70b"}.el-icon-trophy-1:before{content:"\e70c"}.el-icon-trophy:before{content:"\e70d"}.el-icon-medal:before{content:"\e70e"}.el-icon-medal-1:before{content:"\e70f"}.el-icon-stopwatch:before{content:"\e710"}.el-icon-mic:before{content:"\e711"}.el-icon-copy-document:before{content:"\e718"}.el-icon-full-screen:before{content:"\e719"}.el-icon-switch-button:before{content:"\e71b"}.el-icon-aim:before{content:"\e71c"}.el-icon-crop:before{content:"\e71d"}.el-icon-odometer:before{content:"\e71e"}.el-icon-time:before{content:"\e71f"}.el-icon-bangzhu:before{content:"\e724"}.el-icon-close-notification:before{content:"\e726"}.el-icon-microphone:before{content:"\e727"}.el-icon-turn-off-microphone:before{content:"\e728"}.el-icon-position:before{content:"\e729"}.el-icon-postcard:before{content:"\e72a"}.el-icon-message:before{content:"\e72b"}.el-icon-chat-line-square:before{content:"\e72d"}.el-icon-chat-dot-square:before{content:"\e72e"}.el-icon-chat-dot-round:before{content:"\e72f"}.el-icon-chat-square:before{content:"\e730"}.el-icon-chat-line-round:before{content:"\e731"}.el-icon-chat-round:before{content:"\e732"}.el-icon-set-up:before{content:"\e733"}.el-icon-turn-off:before{content:"\e734"}.el-icon-open:before{content:"\e735"}.el-icon-connection:before{content:"\e736"}.el-icon-link:before{content:"\e737"}.el-icon-cpu:before{content:"\e738"}.el-icon-thumb:before{content:"\e739"}.el-icon-female:before{content:"\e73a"}.el-icon-male:before{content:"\e73b"}.el-icon-guide:before{content:"\e73c"}.el-icon-news:before{content:"\e73e"}.el-icon-price-tag:before{content:"\e744"}.el-icon-discount:before{content:"\e745"}.el-icon-wallet:before{content:"\e747"}.el-icon-coin:before{content:"\e748"}.el-icon-money:before{content:"\e749"}.el-icon-bank-card:before{content:"\e74a"}.el-icon-box:before{content:"\e74b"}.el-icon-present:before{content:"\e74c"}.el-icon-sell:before{content:"\e6d5"}.el-icon-sold-out:before{content:"\e6d6"}.el-icon-shopping-bag-2:before{content:"\e74d"}.el-icon-shopping-bag-1:before{content:"\e74e"}.el-icon-shopping-cart-2:before{content:"\e74f"}.el-icon-shopping-cart-1:before{content:"\e750"}.el-icon-shopping-cart-full:before{content:"\e751"}.el-icon-smoking:before{content:"\e752"}.el-icon-no-smoking:before{content:"\e753"}.el-icon-house:before{content:"\e754"}.el-icon-table-lamp:before{content:"\e755"}.el-icon-school:before{content:"\e756"}.el-icon-office-building:before{content:"\e757"}.el-icon-toilet-paper:before{content:"\e758"}.el-icon-notebook-2:before{content:"\e759"}.el-icon-notebook-1:before{content:"\e75a"}.el-icon-files:before{content:"\e75b"}.el-icon-collection:before{content:"\e75c"}.el-icon-receiving:before{content:"\e75d"}.el-icon-suitcase-1:before{content:"\e760"}.el-icon-suitcase:before{content:"\e761"}.el-icon-film:before{content:"\e763"}.el-icon-collection-tag:before{content:"\e765"}.el-icon-data-analysis:before{content:"\e766"}.el-icon-pie-chart:before{content:"\e767"}.el-icon-data-board:before{content:"\e768"}.el-icon-data-line:before{content:"\e76d"}.el-icon-reading:before{content:"\e769"}.el-icon-magic-stick:before{content:"\e76a"}.el-icon-coordinate:before{content:"\e76b"}.el-icon-mouse:before{content:"\e76c"}.el-icon-brush:before{content:"\e76e"}.el-icon-headset:before{content:"\e76f"}.el-icon-umbrella:before{content:"\e770"}.el-icon-scissors:before{content:"\e771"}.el-icon-mobile:before{content:"\e773"}.el-icon-attract:before{content:"\e774"}.el-icon-monitor:before{content:"\e775"}.el-icon-search:before{content:"\e778"}.el-icon-takeaway-box:before{content:"\e77a"}.el-icon-paperclip:before{content:"\e77d"}.el-icon-printer:before{content:"\e77e"}.el-icon-document-add:before{content:"\e782"}.el-icon-document:before{content:"\e785"}.el-icon-document-checked:before{content:"\e786"}.el-icon-document-copy:before{content:"\e787"}.el-icon-document-delete:before{content:"\e788"}.el-icon-document-remove:before{content:"\e789"}.el-icon-tickets:before{content:"\e78b"}.el-icon-folder-checked:before{content:"\e77f"}.el-icon-folder-delete:before{content:"\e780"}.el-icon-folder-remove:before{content:"\e781"}.el-icon-folder-add:before{content:"\e783"}.el-icon-folder-opened:before{content:"\e784"}.el-icon-folder:before{content:"\e78a"}.el-icon-edit-outline:before{content:"\e764"}.el-icon-edit:before{content:"\e78c"}.el-icon-date:before{content:"\e78e"}.el-icon-c-scale-to-original:before{content:"\e7c6"}.el-icon-view:before{content:"\e6ce"}.el-icon-loading:before{content:"\e6cf"}.el-icon-rank:before{content:"\e6d1"}.el-icon-sort-down:before{content:"\e7c4"}.el-icon-sort-up:before{content:"\e7c5"}.el-icon-sort:before{content:"\e6d2"}.el-icon-finished:before{content:"\e6cd"}.el-icon-refresh-left:before{content:"\e6c7"}.el-icon-refresh-right:before{content:"\e6c8"}.el-icon-refresh:before{content:"\e6d0"}.el-icon-video-play:before{content:"\e7c0"}.el-icon-video-pause:before{content:"\e7c1"}.el-icon-d-arrow-right:before{content:"\e6dc"}.el-icon-d-arrow-left:before{content:"\e6dd"}.el-icon-arrow-up:before{content:"\e6e1"}.el-icon-arrow-down:before{content:"\e6df"}.el-icon-arrow-right:before{content:"\e6e0"}.el-icon-arrow-left:before{content:"\e6de"}.el-icon-top-right:before{content:"\e6e7"}.el-icon-top-left:before{content:"\e6e8"}.el-icon-top:before{content:"\e6e6"}.el-icon-bottom:before{content:"\e6eb"}.el-icon-right:before{content:"\e6e9"}.el-icon-back:before{content:"\e6ea"}.el-icon-bottom-right:before{content:"\e6ec"}.el-icon-bottom-left:before{content:"\e6ed"}.el-icon-caret-top:before{content:"\e78f"}.el-icon-caret-bottom:before{content:"\e790"}.el-icon-caret-right:before{content:"\e791"}.el-icon-caret-left:before{content:"\e792"}.el-icon-d-caret:before{content:"\e79a"}.el-icon-share:before{content:"\e793"}.el-icon-menu:before{content:"\e798"}.el-icon-s-grid:before{content:"\e7a6"}.el-icon-s-check:before{content:"\e7a7"}.el-icon-s-data:before{content:"\e7a8"}.el-icon-s-opportunity:before{content:"\e7aa"}.el-icon-s-custom:before{content:"\e7ab"}.el-icon-s-claim:before{content:"\e7ad"}.el-icon-s-finance:before{content:"\e7ae"}.el-icon-s-comment:before{content:"\e7af"}.el-icon-s-flag:before{content:"\e7b0"}.el-icon-s-marketing:before{content:"\e7b1"}.el-icon-s-shop:before{content:"\e7b4"}.el-icon-s-open:before{content:"\e7b5"}.el-icon-s-management:before{content:"\e7b6"}.el-icon-s-ticket:before{content:"\e7b7"}.el-icon-s-release:before{content:"\e7b8"}.el-icon-s-home:before{content:"\e7b9"}.el-icon-s-promotion:before{content:"\e7ba"}.el-icon-s-operation:before{content:"\e7bb"}.el-icon-s-unfold:before{content:"\e7bc"}.el-icon-s-fold:before{content:"\e7a9"}.el-icon-s-platform:before{content:"\e7bd"}.el-icon-s-order:before{content:"\e7be"}.el-icon-s-cooperation:before{content:"\e7bf"}.el-icon-bell:before{content:"\e725"}.el-icon-message-solid:before{content:"\e799"}.el-icon-video-camera:before{content:"\e772"}.el-icon-video-camera-solid:before{content:"\e796"}.el-icon-camera:before{content:"\e779"}.el-icon-camera-solid:before{content:"\e79b"}.el-icon-download:before{content:"\e77c"}.el-icon-upload2:before{content:"\e77b"}.el-icon-upload:before{content:"\e7c3"}.el-icon-picture-outline-round:before{content:"\e75f"}.el-icon-picture-outline:before{content:"\e75e"}.el-icon-picture:before{content:"\e79f"}.el-icon-close:before{content:"\e6db"}.el-icon-check:before{content:"\e6da"}.el-icon-plus:before{content:"\e6d9"}.el-icon-minus:before{content:"\e6d8"}.el-icon-help:before{content:"\e73d"}.el-icon-s-help:before{content:"\e7b3"}.el-icon-circle-close:before{content:"\e78d"}.el-icon-circle-check:before{content:"\e720"}.el-icon-circle-plus-outline:before{content:"\e723"}.el-icon-remove-outline:before{content:"\e722"}.el-icon-zoom-out:before{content:"\e776"}.el-icon-zoom-in:before{content:"\e777"}.el-icon-error:before{content:"\e79d"}.el-icon-success:before{content:"\e79c"}.el-icon-circle-plus:before{content:"\e7a0"}.el-icon-remove:before{content:"\e7a2"}.el-icon-info:before{content:"\e7a1"}.el-icon-question:before{content:"\e7a4"}.el-icon-warning-outline:before{content:"\e6c9"}.el-icon-warning:before{content:"\e7a3"}.el-icon-goods:before{content:"\e7c2"}.el-icon-s-goods:before{content:"\e7b2"}.el-icon-star-off:before{content:"\e717"}.el-icon-star-on:before{content:"\e797"}.el-icon-more-outline:before{content:"\e6cc"}.el-icon-more:before{content:"\e794"}.el-icon-phone-outline:before{content:"\e6cb"}.el-icon-phone:before{content:"\e795"}.el-icon-user:before{content:"\e6e3"}.el-icon-user-solid:before{content:"\e7a5"}.el-icon-setting:before{content:"\e6ca"}.el-icon-s-tools:before{content:"\e7ac"}.el-icon-delete:before{content:"\e6d7"}.el-icon-delete-solid:before{content:"\e7c9"}.el-icon-eleme:before{content:"\e7c7"}.el-icon-platform-eleme:before{content:"\e7ca"}.el-icon-loading{-webkit-animation:rotating 2s linear infinite;animation:rotating 2s linear infinite}.el-icon--right{margin-left:5px}.el-icon--left{margin-right:5px}@-webkit-keyframes rotating{0%{-webkit-transform:rotateZ(0);transform:rotateZ(0)}100%{-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg)}}@keyframes rotating{0%{-webkit-transform:rotateZ(0);transform:rotateZ(0)}100%{-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg)}}
\ No newline at end of file
diff --git a/src/views/experiment/checkTheReport/index.vue b/src/views/experiment/checkTheReport/index.vue
index f384a5f..3b33109 100644
--- a/src/views/experiment/checkTheReport/index.vue
+++ b/src/views/experiment/checkTheReport/index.vue
@@ -90,7 +90,7 @@
scope.row.status == 0
? "寰呭鏍�"
: scope.row.status == 1
- ? "浠ｇ瀛�" : "宸插畬鎴�"
+ ? "寰呯瀛�" : "宸插畬鎴�"
}}
</el-tag>
</span>
diff --git a/src/views/experiment/inspectionApplication/index.vue b/src/views/experiment/inspectionApplication/index.vue
index 31f2a90..b1ad99c 100644
--- a/src/views/experiment/inspectionApplication/index.vue
+++ b/src/views/experiment/inspectionApplication/index.vue
@@ -29,7 +29,7 @@
</el-form>
<el-form class="rightBtn">
<el-form-item class="createBtn">
- <el-button size="small" type="primary" icon="el-icon-plus" @click="checkTypeVisible = true"
+ <el-button size="small" type="primary" icon="el-icon-plus" @click="showAddDialog"
style="background-color: rgb(1, 102, 226);">鏂板妫�楠屽崟</el-button>
</el-form-item>
<el-form-item class="getDataBtn">
@@ -63,10 +63,10 @@
<el-table-column prop="createTime" label="鐧昏鏃ユ湡" min-width="90px" />
<el-table-column prop="inspection_status" label="妫�楠岀粨鏋�" min-width="95px">
<template slot-scope="scope">
- <el-tag class="tag" effect="dark" type="danger" disable-transitions
- v-if="scope.row.inspection_status == 0">涓嶅悎鏍�</el-tag>
<el-tag class="tag" effect="dark" type="success" disable-transitions
- v-else-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
+ v-if="scope.row.inspection_status == 1">鍚堟牸</el-tag>
+ <el-tag class="tag" effect="dark" type="danger" disable-transitions
+ v-else>涓嶅悎鏍�</el-tag>
</template>
</el-table-column>
<el-table-column prop="userName" label="鐧昏浜�" min-width="80px" />
@@ -93,10 +93,10 @@
<el-radio-group v-model="type" @click.native="handleRadioChange">
<el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`"
:label="0" border>鍘熸潗鏂欐楠�</el-radio>
- <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`"
- :label="1" border>濮旀墭妫�楠�</el-radio>
<el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`"
- :label="2" border>鎴愬搧妫�楠�</el-radio>
+ :label="2" border>濮旀墭妫�楠�</el-radio>
+ <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`"
+ :label="1" border>鎴愬搧妫�楠�</el-radio>
</el-radio-group>
</div>
<div v-if="type === 0">
@@ -154,14 +154,14 @@
<el-col :span="10">
<el-form-item label="妫�楠屾椂闂达細">
<el-date-picker v-model="infoForm.checkdate" type="daterange" range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" style="width: 300px;">
+ start-placeholder="寮�濮嬫棩鏈�" value-format="yyyy-MM-dd" end-placeholder="缁撴潫鏃ユ湡" style="width: 300px;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
- <div v-if="type === 1">
+ <div v-if="type === 2">
<el-form :model="commisionSelection" ref="commisionSelection" class="checkTypeForm" label-position="top"
label-width="200px" size="mini">
<el-row :gutter="100">
@@ -210,55 +210,43 @@
<el-col :span="10">
<el-form-item label="瀹屾垚鏈熼檺">
<el-input style="width: 300px" type="text" disabled :value="commisionSelection.completionDeadline"
- placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
+ placeholder="璇疯緭鍏ュ畬鎴愭湡闄�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="妫�楠屾棩鏈燂細">
<el-date-picker v-model="commisionSelection.checkdate" type="daterange" range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" style="width: 300px;">
+ start-placeholder="寮�濮嬫棩鏈�" value-format="yyyy-MM-dd" end-placeholder="缁撴潫鏃ユ湡" style="width: 300px;">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
- <div v-if="type === 2">
+ <div v-if="type === 1">
<el-form :model="finishedTable" ref="finishedTable" class="checkTypeForm" label-position="top"
label-width="200px" size="mini">
<el-row :gutter="100">
<el-col :span="10">
- <el-form-item label="鏉ユ枡鏃ユ湡锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
- placeholder="璇疯緭鍏ユ潵鏂欐棩鏈�" autocomplete="off" />
- </el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item label="渚涘簲鍟嗗悕绉帮細">
- <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
- autocomplete="off" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="100">
- <el-col :span="10">
<el-form-item label="鎴愬搧缂栫爜锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
+ <el-input style="width: 300px" type="text" disabled v-model="finishedTable.code" placeholder="璇疯緭鍏ユ垚鍝佺紪鐮�"
autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鎴愬搧鍚嶇О锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="璇疯緭鍏ユ垚鍝佸悕绉�"
- autocomplete="off" />
+ <el-select style="width: 300px" v-model="finishedTable.name" @change="getSpecifications">
+ <el-option v-for="(item,index) in mList" :key="index" :label="item.name" :value="item.id"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="瑙勬牸鍨嬪彿锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
- placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" autocomplete="off" />
+ <el-cascader style="width: 300px" v-model="finishedTable.modelandspecification"
+ :options="specificationList" :show-all-levels="false" @change="changeSpe"
+ :props="{label:'name',value:'id',children:'children'}"></el-cascader>
</el-form-item>
</el-col>
<el-col :span="10">
@@ -271,14 +259,14 @@
<el-row :gutter="100">
<el-col :span="10">
<el-form-item label="鏁伴噺锛�">
- <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
+ <el-input style="width: 300px" min="0" type="number" v-model="finishedTable.amount" placeholder="璇疯緭鍏ユ暟閲�"
autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="妫�楠屾椂闂达細">
<el-date-picker v-model="finishedTable.checkdate" type="daterange" range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" style="width: 300px;">
+ start-placeholder="寮�濮嬫棩鏈�" value-format="yyyy-MM-dd" end-placeholder="缁撴潫鏃ユ湡" style="width: 300px;">
</el-date-picker>
</el-form-item>
</el-col>
@@ -356,13 +344,13 @@
:data="commisionTable" @selection-change="handleSelectionChange" style="width: 100%">
<el-table-column type="selection" min-width="10%" />
<el-table-column type="index" label="搴忓彿" min-width="10%" />
- <el-table-column prop="entrust_coding" label="濮旀墭缂栧彿" min-width="10%" />
+ <el-table-column prop="entrustCoding" label="濮旀墭缂栧彿" min-width="10%" />
<el-table-column prop="supplier" label="濮旀墭鍗曚綅" min-width="12%" />
<el-table-column prop="mcode" label="鏍峰搧缂栧彿" min-width="8%" />
<el-table-column prop="name" label="鏍峰搧鍚嶇О" min-width="8%" />
<el-table-column prop="specifications" label="瑙勬牸鍨嬪彿" min-width="12%" />
- <el-table-column prop="endTime" label="閫佽揪鏃堕棿" min-width="8%" />
- <el-table-column prop="formTime" label="瀹屾垚鏈熼檺" min-width="8%" />
+ <el-table-column prop="formTime" label="閫佽揪鏃堕棿" min-width="8%" />
+ <el-table-column prop="endTime" label="瀹屾垚鏈熼檺" min-width="8%" />
<el-table-column prop="contacts" label="濮旀墭缂栧埗浜�" min-width="8%" />
<el-table-column prop="endTime" label="妫�楠屾棩鏈�" min-width="8%" />
<el-table-column prop="inspection_status" label="鐘舵��" min-width="8%">
@@ -401,11 +389,16 @@
addInspect,
chooseVer,
lookProByVer,
- delInspect
+ delInspect,
+ getSpecificationByMaterielId,
+ getMaterielList
} from '@/api/experiment/planAssignments'
export default {
data() {
return {
+ speName:"",
+ specificationList: [],
+ mList:[],
showDetail: false,
searchData: {
applicationnumber: '',
@@ -419,8 +412,6 @@
rawMaterialTable: [],
commisionTable: [],
finishedTable: {
- deliverydate: '',
- supplier: '',
code: '',
name: '',
modelandspecification: '',
@@ -470,7 +461,7 @@
pageSize: 10, // 姣忛〉鐨勬暟鎹潯鏁�
radioValue: '鍏ㄩ儴',
checkTypeVisible: false,
- type: 2, // 榛樿涓嶉�変腑鐨勭姸鎬�
+ type: 1, // 榛樿涓嶉�変腑鐨勭姸鎬�
rawmaterialVisible: false,
commisionVisible: false,
tmp: {},
@@ -488,6 +479,30 @@
handler(val, oldval) {},
// 娣卞害瑙傚療鐩戝惉
deep: true
+ },
+ checkTypeVisible(newVal){
+ if(newVal == false){
+ this.finishedTable = {
+ code: '',
+ name: '',
+ modelandspecification: '',
+ unit: '',
+ amount: '',
+ checkdate: []
+ };
+ this.infoForm = {};
+ this.commisionSelection = {
+ entrust_coding: '',
+ entrusted: '',
+ samples_number: '',
+ sample_name: '',
+ specifications_models: '',
+ dateSurvey: '',
+ completionDeadline: '',
+ contacts: '',
+ inspectionTime: ''
+ };
+ }
}
},
created() {
@@ -497,7 +512,51 @@
if (this.$route.name === 'ForInspectionDetail') this.showDetail = true
},
methods: {
+ changeSpe(val){
+ this.tmp.specificationsId = val[val.length-1];
+ let arr1 = this.specificationList[0].children.filter(item=>{
+ return item.id==val[1]
+ });
+ let arr2 = arr1[0].children.filter(item=>{
+ return item.id = val[2]
+ })
+ let speName = arr1[0].name + "-" + arr2[0].name;
+ this.speName = speName;
+
+ },
+ getSpecifications(val){
+ if(val != null){
+ this.selectSpecificationByMaterielId(val);
+ let item = this.mList.filter(item => {
+ return item.id == val;
+ });
+ this.finishedTable.code = item[0].code;
+ this.tmp.mcode = item[0].code;
+ this.tmp.name = item[0].name;
+ }
+ },
+ async selectSpecificationByMaterielId(mId){
+ await getSpecificationByMaterielId({id : mId}).then(res=>{
+ this.specificationList = new Array(res.data);
+ }).catch(error => {
+ this.$message.error(error.message);
+ });
+ },
+ //鏄剧ず鏂板妫�楠屽崟妯℃�佹
+ showAddDialog(){
+ this.selectMaterielList();
+ this.checkTypeVisible = true
+ },
+ //鑾峰彇鎴愬搧淇℃伅
+ async selectMaterielList(){
+ await getMaterielList().then(res=>{
+ this.mList = res.data
+ }).catch(error => {
+ this.$message.error(error.message);
+ });
+ },
async selectAll() {
+
const res = selectAll({
type: 0
})
@@ -654,7 +713,7 @@
})
this.rawMaterialTable = arr
})
- } else if (this.type === 1) {
+ } else if (this.type === 2) {
this.commisionVisible = true
selectAll({
type: 2
@@ -690,7 +749,7 @@
version: this.version
}
}
- if (this.type === 1) {
+ if (this.type === 2) {
obj = {
endTime: this.commisionSelection.checkdate[1],
formTime: this.commisionSelection.formTime,
@@ -698,6 +757,7 @@
name: this.commisionSelection.name,
num: this.commisionSelection.num,
specifications: this.commisionSelection.specifications,
+ specificationId:this.commisionSelection.specificationsId,
startTime: this.commisionSelection.checkdate[0],
supplier: this.commisionSelection.supplier,
type: this.type,
@@ -705,16 +765,15 @@
version: this.version
}
}
- if (this.type === 2) {
+ if (this.type === 1) {
obj = {
endTime: this.finishedTable.checkdate[1],
- formTime: this.finishedTable.deliverydate,
mcode: this.finishedTable.code,
- name: this.finishedTable.name,
+ name: this.tmp.name,
num: parseInt(this.finishedTable.amount),
- specifications: this.finishedTable.modelandspecification,
- startTime: this.finishedTable.checkdate[1],
- supplier: this.finishedTable.supplier,
+ specifications: this.speName,
+ specificationId: this.finishedTable.modelandspecification[2],
+ startTime: this.finishedTable.checkdate[0],
type: this.type,
unit: this.finishedTable.unit,
version: this.version
@@ -725,7 +784,7 @@
message: '娣诲姞鎴愬姛锛�',
type: 'success'
});
- this.type = 2
+ this.type = 1
this.checkTypeVisible = false
this.$router.push(`Viewdetails/${res.data}`)
}).catch(error=>{
@@ -756,7 +815,8 @@
// },
//纭畾璺宠浆
QUEding() {
- if (this.infoForm.checkdate[0] == undefined || this.infoForm.checkdate[1] == undefined) {
+ console.log(this.infoForm);
+ if (this.type==0 &&(this.infoForm.checkdate[0] == undefined || this.infoForm.checkdate[1] == undefined)) {
this.$message({
message: '璇烽�夋嫨妫�楠屾椂闂�',
type: 'warning'
diff --git a/src/views/experiment/reportAuditing/index.vue b/src/views/experiment/reportAuditing/index.vue
index bfe06e0..6ebb875 100644
--- a/src/views/experiment/reportAuditing/index.vue
+++ b/src/views/experiment/reportAuditing/index.vue
@@ -22,7 +22,7 @@
<el-radio-group v-model="checkStatus" @change="handleRadioChange">
<el-radio-button>鍏ㄩ儴</el-radio-button>
<el-radio-button label="0">寰呴�氳繃</el-radio-button>
- <el-radio-button label="2">閫氳繃</el-radio-button>
+ <el-radio-button label="1">閫氳繃</el-radio-button>
</el-radio-group>
<el-checkbox v-model="checked" style="margin-left: 20px"
>浠呯湅鎴戠殑</el-checkbox
diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue
index 10a9d5c..cd2ced4 100644
--- a/src/views/inspectionManagement/commissionInspection/addCommision.vue
+++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -45,10 +45,12 @@
<td colspan="6">
<ul>
<li>
- <i :class="`${infoForm.way == 1 ? 'el-icon-success' : 'el-icon-circle-check'}`"></i> 閫佹牱
+ <span class="success-icon">{{infoForm.way == 1 ? '鈭�' : ''}}</span>
+ <span>鈻� 閫佹牱</span>
</li>
<li>
- <i :class="`${infoForm.way == 2 ? 'el-icon-success' : 'el-icon-circle-check'}`"></i> 涓婇棬
+ <span class="success-icon">{{infoForm.way == 2 ? '鈭�' : ''}}</span>
+ <span>鈻� 涓婇棬</span>
</li>
</ul>
</td>
@@ -142,7 +144,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="鑱旂郴浜猴細">
- <el-input style="width: 200px" v-model="infoForm.contacter" placeholder="璇疯緭鍏ュ鎵樺崟浣�" size="small" />
+ <el-input style="width: 200px" v-model="infoForm.contacter" placeholder="璇疯緭鍏ヨ仈绯讳汉" size="small" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -222,13 +224,13 @@
label-width="100px" size="mini">
<el-row :gutter="50">
<el-col :span="11">
- <el-form-item label="鏍峰搧缂栧彿锛�">
+ <el-form-item label="鏍峰搧缂栧彿锛�" prop="sampleNumber">
<el-input v-model="addPointerForm.sampleNumber" size="small" disabled>
</el-input>
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="鏍峰搧鍚嶇О锛�">
+ <el-form-item label="鏍峰搧鍚嶇О锛�" prop="sampleName">
<el-select v-model="addPointerForm.sampleName" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О"
@change="upMaterialName">
<el-option v-for="(options,index) in sampleoptions" :key="index" :value="options.key" :label="options.value"></el-option>
@@ -238,7 +240,7 @@
</el-row>
<el-row :gutter="50">
<el-col :span="11">
- <el-form-item label="璇勫畾鏍囧噯锛�">
+ <el-form-item label="璇勫畾鏍囧噯锛�" prop="addway">
<el-select v-model="addPointerForm.addway" size="small" placeholder="璇烽�夋嫨璇勫畾鏍囧噯">
<el-option v-for="options in model_spe_options" :value="options.value"
:key="options.key">{{ options.value }}</el-option>
@@ -246,7 +248,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="瑙勬牸鍨嬪彿锛�">
+ <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="specificationsModels">
<el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О"
@change="getProductList">
<el-option v-for="options in model_sta_options" :value="options.key" :label="options.value"
@@ -257,19 +259,19 @@
</el-row>
<el-row :gutter="50">
<el-col :span="11">
- <el-form-item label="鏍峰搧鍗曚綅锛�">
+ <el-form-item label="鏍峰搧鍗曚綅锛�" prop="unit">
<el-input type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" />
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="鏍峰搧鏁伴噺锛�">
+ <el-form-item label="鏍峰搧鏁伴噺锛�" prop="samplesNumber">
<el-input type="text" v-model="addPointerForm.samplesNumber" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="50">
<el-col :span="11">
- <el-form-item label="娣诲姞椤圭洰锛�">
+ <el-form-item label="娣诲姞椤圭洰锛�" prop="experiment" :rules="[{required: true,message:'椤圭洰涓嶈兘涓虹┖',trigger:'blur'}]">
<el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;">
<el-checkbox v-for="(expers, ai) in productList" :label="expers"
:key="ai">{{ expers }}</el-checkbox>
@@ -277,7 +279,7 @@
</el-form-item>
</el-col>
<el-col :span="11">
- <el-form-item label="澶囨敞锛�">
+ <el-form-item label="澶囨敞锛�" prop="remarks">
<el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;"
v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" />
</el-form-item>
@@ -285,7 +287,7 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="addInspection">娣诲姞</el-button>
+ <el-button type="primary" @click="addInspection('addPointerForm')">娣诲姞</el-button>
<el-button @click="dialogueFormVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -360,6 +362,23 @@
}
},
watch: {
+ dialogueFormVisible(val){
+ if(val == false){
+ this.addPointerForm = {
+ sampleNumber: '',
+ sampleName: '',
+ specificationsModels: '',
+ unit: '',
+ samplesNumber: '',
+ remarks: '',
+ experiment: [],
+ addway: '',
+ speName: ''
+ }
+ this.productList = [];
+ this.$refs['addPointerForm'].clearValidate();
+ }
+ },
addPointerForm: {
handler: function(val) {
if (val.addway != "") {
@@ -390,15 +409,14 @@
},
methods: {
printCommision(){
+ if(this.detectionInfo.length < 1){
+ this.$message.error("璇峰厛娣诲姞涓�鏉℃牱鍝佹暟鎹�!");
+ return
+ }
console.log(this.infoForm);
PrintJS({
printable: "printCommision",
type: "html",
- css: [
- "https://unpkg.com/element-ui/lib/theme-chalk/fonts/element-icons.ttf",
- "https://unpkg.com/element-ui/lib/theme-chalk/fonts/element-icons.woff",
- "https://unpkg.com/element-ui/lib/theme-chalk/icon.css"
- ],
targetStyles: ["*"],
ignoreElements: ["no-ignore"],
});
@@ -447,40 +465,36 @@
}
})
},
- addInspection() {
- let sName = this.addPointerForm.sampleName;
- this.sampleoptions.forEach(a=>{
- if(a.key == sName) this.sampleNameList.push(a.value);
- })
- this.standardList.push(this.addPointerForm.addway);
- this.testProjectList.push(this.addPointerForm.experiment);
- let exper = this.addPointerForm.experiment[0]
- for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
- exper += ',' + this.addPointerForm.experiment[i]
- }
- this.addPointerForm.experiment = exper
- let tmp = this.addPointerForm
- this.sampleoptions.forEach(a => {
- if (a.key == tmp.sampleName) tmp.sampleName = a.value
- })
- tmp.speName = tmp.addway + '-' + tmp.speName
- tmp.addway = 1
- this.detectionInfo.push(tmp)
- this.dialogueFormVisible = false
- this.addPointerForm = {
- sampleNumber: '',
- sampleName: '',
- specificationsModels: '',
- unit: '',
- samplesNumber: '',
- remarks: '',
- experiment: [],
- addway: '',
- speName: ''
- }
- console.log(this.sampleNameList);
+ addInspection(formName) {
+ this.$refs[formName].validate((valid)=>{
+ if(valid){
+ let sName = this.addPointerForm.sampleName;
+ this.sampleoptions.forEach(a=>{
+ if(a.key == sName) this.sampleNameList.push(a.value);
+ })
+ this.standardList.push(this.addPointerForm.addway);
+ this.testProjectList.push(this.addPointerForm.experiment);
+ let exper = this.addPointerForm.experiment[0]
+ for (let i = 1; i < this.addPointerForm.experiment.length; i++) {
+ exper += ',' + this.addPointerForm.experiment[i]
+ }
+ this.addPointerForm.experiment = exper
+ let tmp = this.addPointerForm
+ this.sampleoptions.forEach(a => {
+ if (a.key == tmp.sampleName) tmp.sampleName = a.value
+ })
+ tmp.speName = tmp.addway + '-' + tmp.speName
+ tmp.addway = 1
+ this.detectionInfo.push(tmp)
+ this.dialogueFormVisible = false
+ }
+ });
},
async submitInspection() {
+ if(this.detectionInfo.length < 1){
+ this.$message.error("璇峰厛娣诲姞涓�鏉℃牱鍝佹暟鎹�!");
+ return
+ }
let sampledeliveryway
if (this.infoForm.way === '閫佹牱') {
sampledeliveryway = 1
@@ -597,6 +611,11 @@
display: inline;
width:100px;
margin: 0 25px;
+ .success-icon{
+ position: relative;
+ left: 15px;
+ bottom: 3px;
+ }
}
}
diff --git a/src/views/laboratory/ledger/index.vue b/src/views/laboratory/ledger/index.vue
index e79e599..7d96ba1 100644
--- a/src/views/laboratory/ledger/index.vue
+++ b/src/views/laboratory/ledger/index.vue
@@ -53,7 +53,7 @@
<div class="table-box">
<el-table ref="equipmentTable" node-key="father_name" :cell-style="{ textAlign: 'left' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
- :data="equipmentTable" style="width: 100%;">
+ :data="equipmentTable" style="width: 100%;height: 100vh">
<el-table-column type="index" label="搴忓彿" min-width="90" />
<el-table-column prop="equipment_code" label="浠櫒璁惧缂栧彿" min-width="200" />
<el-table-column prop="equipment_name" label="浠櫒璁惧鍚嶇О" min-width="150" />
@@ -180,7 +180,7 @@
<el-table ref="codePointsTable" :cell-style="{ textAlign: 'center' }"
:header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
- :data="codePointsTable" style="width: 100%">
+ :data="codePointsTable" style="width: 100%;overflow: scroll;height:314px;">
<el-table-column type="index" label="搴忓彿" min-width="90" />
<el-table-column prop="equipmentPoint" label="鐮佺偣缂栫爜" min-width="150">
<template slot-scope="scope">
--
Gitblit v1.9.3