From b92d17185f0c68317cd3563c7468132c7f46658a Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期五, 25 八月 2023 11:54:06 +0800 Subject: [PATCH] 修改委托 --- src/views/inspectionManagement/commissionInspection/addCommision.vue | 123 ++++++++++++++++------------------------ 1 files changed, 49 insertions(+), 74 deletions(-) diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue index 46f1dbd..99d34ff 100644 --- a/src/views/inspectionManagement/commissionInspection/addCommision.vue +++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue @@ -19,7 +19,7 @@ </div> <el-table ref="detectionInfo" :max-height="800" :cell-style="{textAlign: 'center'}" :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'center'}" - :data="detectionInfo" style="width: 100%"> + :data="detectionInfo" style="width: 100%;margin-bottom: 20px;"> <el-table-column type="index" label="搴忓彿" min-width="10%" /> <el-table-column prop="sampleNumber" label="鏍峰搧缂栧彿" min-width="8%" /> <el-table-column prop="sampleName" label="鏍峰搧鍚嶇О" min-width="10%" /> @@ -29,15 +29,14 @@ <el-table-column prop="addway" label="娣诲姞鏂瑰紡" min-width="8%"> <template slot-scope="scope"> <div v-if="scope.row.addway === 0"> - <el-tag :type='success' disable-transitions>鎵弿</el-tag> + <el-tag type="success" disable-transitions>鎵弿</el-tag> </div> <div v-if="scope.row.addway === 1"> - <el-tag :type='primary' disable-transitions>褰曞叆</el-tag> + <el-tag type="primary" disable-transitions>褰曞叆</el-tag> </div> <div v-else></div> </template> </el-table-column> - <el-table-column prop="experiment" label="璇曢獙" min-width="8%" /> <el-table-column prop="remarks" label="澶囨敞" min-width="8%" /> <el-table-column label="鎿嶄綔" min-width="8%"> <template slot-scope="scope"> @@ -49,10 +48,8 @@ </div> <div class="secondBox"> <el-row class="header"> - <el-col :span="12">鍩烘湰淇℃伅</el-col> + <el-col :span="12" style="font-size: 16px;margin-bottom: 5px;">鍩烘湰淇℃伅</el-col> <el-col :span="12" style="text-align: right;"> - <!-- 鐐瑰嚮杩斿洖锛屽綋鍓嶉〉闈㈠�间负false --> - <!-- <el-button type="primary" size="mini" style="background-color: rgb(1, 102, 226); ">鎵撳嵃濮旀墭鍗�</el-button> --> </el-col> </el-row> <el-form :model="infoForm" ref="infoForm" class="infoForm" label-position="right" label-width="100px" @@ -61,48 +58,49 @@ <el-row :gutter="200"> <el-col :span="5"> <el-form-item label="濮旀墭缂栧彿锛�"> - <el-input style="width: 160px" type="text" :value="infoForm.commisioncode" readonly disabled - autocomplete="off" /> + <el-input style="width: 200px" type="text" :value="infoForm.commisioncode" readonly disabled + autocomplete="off" size="small" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="濮旀墭鍗曚綅锛�"> - <el-input style="width: 160px" v-model="infoForm.department" placeholder="璇疯緭鍏ュ鎵樺崟浣�" /> + <el-input style="width: 200px" v-model="infoForm.department" placeholder="璇疯緭鍏ュ鎵樺崟浣�" size="small" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鑱旂郴浜猴細"> - <el-input style="width: 160px" v-model="infoForm.contacter" placeholder="璇疯緭鍏ュ鎵樺崟浣�" /> + <el-input style="width: 200px" v-model="infoForm.contacter" placeholder="璇疯緭鍏ュ鎵樺崟浣�" size="small" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鑱旂郴鐢佃瘽锛�"> - <el-input style="width: 160px" v-model="infoForm.tel" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> + <el-input style="width: 200px" v-model="infoForm.tel" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" size="small" /> </el-form-item> </el-col> </el-row> <el-row :gutter="200"> <el-col :span="5"> <el-form-item label="鑱旂郴鍦板潃锛�"> - <el-input style="width: 160px;" v-model="infoForm.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" - autocomplete="off" /> + <el-input style="width: 200px;" v-model="infoForm.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" autocomplete="off" + size="small" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="瀹屾垚鏈熼檺锛�"> - <el-date-picker v-model="infoForm.deadline" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 160px;"> + <el-date-picker v-model="infoForm.deadline" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 200px;" + size="small"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="閫佹牱鏃堕棿锛�"> - <el-date-picker v-model="infoForm.time" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 160px;"> + <el-date-picker v-model="infoForm.time" type="date" placeholder="閫夋嫨鏃ユ湡" style="width: 200px;"> </el-date-picker> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="閫佹牱鏂瑰紡锛�"> - <el-select style="width: 160px;" v-model="infoForm.way" size="small" placeholder="閫佹牱"> + <el-select style="width: 200px;" v-model="infoForm.way" size="small" placeholder="閫佹牱"> <el-option v-for="options in sampleDeliveryMode" :key="options.key" :value="options.value">{{ options.value }}</el-option> </el-select> @@ -112,23 +110,26 @@ <el-row :gutter="200"> <el-col :span="5"> <el-form-item label="閫佹牱浜猴細"> - <el-input style="width: 160px;" v-model="infoForm.sender" placeholder="璇疯緭鍏ラ�佹牱浜�" autocomplete="off" /> + <el-input style="width: 200px;" v-model="infoForm.sender" placeholder="璇疯緭鍏ラ�佹牱浜�" autocomplete="off" + size="small" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="閫佹牱浜虹數璇濓細"> - <el-input style="width: 160px;" v-model="infoForm.sendertel" placeholder="璇疯緭鍏ラ�佹牱浜虹數璇�" - autocomplete="off" /> + <el-input style="width: 200px;" v-model="infoForm.sendertel" placeholder="璇疯緭鍏ラ�佹牱浜虹數璇�" + autocomplete="off" size="small" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="鎶ュ憡鏁帮細"> - <el-input style="width: 160px;" v-model="infoForm.num" placeholder="璇疯緭鍏ユ姤鍛婃暟" autocomplete="off" /> + <el-input style="width: 200px;" v-model="infoForm.num" placeholder="璇疯緭鍏ユ姤鍛婃暟" autocomplete="off" + size="small" /> </el-form-item> </el-col> <el-col :span="5"> <el-form-item label="濮旀墭澶囨敞锛�"> - <el-input style="width: 160px;" v-model="infoForm.other" placeholder="澶囨敞" autocomplete="off" /> + <el-input style="width: 200px;" v-model="infoForm.other" placeholder="澶囨敞" autocomplete="off" + size="small" /> </el-form-item> </el-col> </el-row> @@ -143,60 +144,55 @@ </div> </div> <div class="checkType"> - <el-dialog title="娣诲姞鎸囨爣" :visible.sync="dialogueFormVisible" width="40%"> + <el-dialog title="娣诲姞鏍峰搧" :visible.sync="dialogueFormVisible" width="40%" top="30vh"> <el-form :model="addPointerForm" ref="addPointerForm" class="addPointerForm" label-position="right" label-width="100px" size="mini"> <el-row :gutter="50"> - <el-col :span="10"> + <el-col :span="11"> <el-form-item label="鏍峰搧缂栧彿锛�"> - <el-input style="width: 160px;" v-model="addPointerForm.sampleNumber" size="small" disabled> + <el-input v-model="addPointerForm.sampleNumber" size="small" disabled> </el-input> </el-form-item> </el-col> - <el-col :span="10"> + <el-col :span="11"> <el-form-item label="鏍峰搧鍚嶇О锛�"> - <el-select style="width: 160px;" v-model="addPointerForm.sampleName" size="small" - placeholder="璇烽�夋嫨鏍峰搧鍚嶇О" @change="upMaterialName"> - <el-option v-for="options in sampleoptions" :value="options.key" - :label="options.value"></el-option> + <el-select v-model="addPointerForm.sampleName" size="small" placeholder="璇烽�夋嫨鏍峰搧鍚嶇О" + @change="upMaterialName"> + <el-option v-for="options in sampleoptions" :value="options.key" :label="options.value"></el-option> </el-select> </el-form-item> </el-col> </el-row> <el-row :gutter="50"> - <el-col :span="10"> + <el-col :span="11"> <el-form-item label="瑙勬牸鍨嬪彿锛�"> - <el-select style="width: 160px;" v-model="addPointerForm.specificationsModels" size="small" - placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О"> + <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О"> <el-option v-for="options in model_spe_options" :value="options.value" :key="options.key">{{ options.value }}</el-option> </el-select> </el-form-item> </el-col> - <el-col :span="10"> + <el-col :span="11"> <el-form-item label="鏍峰搧鍗曚綅锛�"> - <el-input style="width: 160px" type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�" - autocomplete="off" /> + <el-input type="text" v-model="addPointerForm.unit" placeholder="璇疯緭鍏ュ崟浣�" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="50"> - <el-col :span="10"> + <el-col :span="11"> <el-form-item label="鏍峰搧鏁伴噺锛�"> - <el-input style="width: 160px" type="text" v-model="addPointerForm.samplesNumber" placeholder="璇疯緭鍏ユ暟閲�" - autocomplete="off" /> + <el-input type="text" v-model="addPointerForm.samplesNumber" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" /> </el-form-item> </el-col> - <el-col :span="10"> + <el-col :span="11"> <el-form-item label="澶囨敞锛�"> - <el-input style="width: 160px" type="text" v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" - autocomplete="off" /> + <el-input type="text" v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="50"> <el-col :span="10"> - <el-form-item label="娣诲姞瀹為獙锛�"> + <el-form-item label="娣诲姞椤圭洰锛�"> <el-checkbox-group v-model="addPointerForm.experiment" style="display: flex; flex-direction: column;"> <el-checkbox v-for="expers in experList" :label="expers.label" :key="expers.key">{{ expers.label }}</el-checkbox> @@ -292,7 +288,7 @@ }, created() { this.viewId = this.$route.params.viewId - this.$store.commit('settings/SAVE_LINK',this.viewId) + this.$store.commit('settings/SAVE_LINK', this.viewId) this.getlink(this.$route.params.viewId) }, mounted() { @@ -319,7 +315,8 @@ this.sampleoptions = res.data.map((item) => { return { key: item.id.toString(), - value: item.name + value: item.name, + code: item.code } }) }, @@ -377,31 +374,6 @@ sampleDeliveryPhone: this.infoForm.sendertel, sampleSender: this.infoForm.sender }) - // const res = await addInspection({ - // completionDeadline: "2023-08-03", - // contactAddress: "姹熻嫃鍗楅��", - // contactNumber: "12321423432", - // contacts: "灏忛粦", - // entrustRemarks: "濮旀墭澶囨敞YPBH123456789YPBH123456789YPBH123456789", - // entrusted: "闃块噷宸村反", - // inspectionTime: "2023-08-03", - // linkDetectionList: [ - // { - // "experiment": "鍋氭ⅵ", - // "remarks": "閫氳繃浜�", - // "sampleName": "鍙戝姩鏈�", - // "sampleNumber": "YPBH123456789", - // "samplesNumber": 20, - // "specificationsModels": "GGXH-AAAAA", - // "unit": "鐧惧害" - // } - // ], - // reportNumber: 23, - // sampleDeliveryMode: 1, - // sampleDeliveryPhone: "123456789676", - // sampleSender: "灏忕櫧" - // }) - // console.log(res) this.infoForm.commisioncode = res.data if (res.data) { this.$message({ @@ -422,11 +394,14 @@ this.pageParams.pageNo = pageNo }, deleteRow(row) { - console.log(row) - row = null + }, - upMaterialName(val){ - console.log(val); + upMaterialName(val) { + this.sampleoptions.forEach(a => { + if (a.key == val) { + this.addPointerForm.sampleNumber = a.code + } + }) this.getModelSpecification(val) } } -- Gitblit v1.9.3