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
---
src/views/inspectionManagement/commissionInspection/addCommision.vue | 117 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 68 insertions(+), 49 deletions(-)
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;
+ }
}
}
--
Gitblit v1.9.3