From b59ad11f54d28a6b4f9b33e5fb30b55e4b263efb Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期二, 29 八月 2023 17:31:55 +0800 Subject: [PATCH] bug修复 --- src/views/inspectionManagement/commissionInspection/addCommision.vue | 75 +++++++++++++++++++++++++------------ 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/src/views/inspectionManagement/commissionInspection/addCommision.vue b/src/views/inspectionManagement/commissionInspection/addCommision.vue index ce5d9d4..ddcf3bc 100644 --- a/src/views/inspectionManagement/commissionInspection/addCommision.vue +++ b/src/views/inspectionManagement/commissionInspection/addCommision.vue @@ -15,7 +15,6 @@ style="width: 200px;" > </el-input>--> - <el-button type="primary" size="small" style="background-color: rgb(1, 102, 226);">閲嶇疆</el-button> </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'}" @@ -42,7 +41,6 @@ <el-table-column prop="remarks" label="澶囨敞" min-width="8%" /> <el-table-column label="鎿嶄綔" min-width="8%"> <template slot-scope="scope"> - <el-button type="text" size="small">淇敼</el-button> <el-button type="text" size="small" @click="deleteRow(scope.row)">鍒犻櫎</el-button> </template> </el-table-column> @@ -176,41 +174,38 @@ </el-col> <el-col :span="11"> <el-form-item label="瑙勬牸鍨嬪彿锛�"> - <el-select v-model="addPointerForm.specificationsModels" size="small" placeholder="璇峰厛閫夋嫨鏍峰搧鍚嶇О"> - <el-option v-for="options in model_spe_options" :value="options.value" + <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" :key="options.key">{{ options.value }}</el-option> </el-select> </el-form-item> </el-col> - </el-row> <el-row :gutter="50"> - <el-col :span="11"> <el-form-item label="鏍峰搧鍗曚綅锛�"> <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-input type="text" v-model="addPointerForm.samplesNumber" placeholder="璇疯緭鍏ユ暟閲�" autocomplete="off" /> </el-form-item> </el-col> - </el-row> <el-row :gutter="50"> <el-col :span="9"> <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> + <el-checkbox v-for="(expers, ai) in productList" :label="expers" + :key="ai">{{ expers }}</el-checkbox> </el-checkbox-group> </el-form-item> </el-col> <el-col :span="41"> <el-form-item label="澶囨敞锛�"> - <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;" v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" /> + <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 20}" style="width: 200px;" + v-model="addPointerForm.remarks" placeholder="璇疯緭鍏ュ娉�" autocomplete="off" /> </el-form-item> </el-col> </el-row> @@ -231,7 +226,8 @@ getModelSpecification, getlink, addInspection, - isIfViewUUID + isIfViewUUID, + getProductList } from '@/api/inspection/commisioninspection' export default { data() { @@ -288,6 +284,8 @@ value: '' }], model_spe_options: [], + model_sta_options: [], + model_options: [], sampleDeliveryMode: [{ key: '1', value: '閫佹牱' @@ -297,7 +295,28 @@ }], dialogueFormVisible: false, showDetail: false, - viewId: null + viewId: null, + productList: [] + } + }, + watch: { + addPointerForm: { + handler: function(val) { + if(val.addway!=""){ + this.model_sta_options = [] + this.model_options.forEach(a=>{ + if(a.specificationsName==val.addway){ + this.model_sta_options = a.children.map(item=>{ + return{ + key: item.modelId, + value: item.modelName + } + }) + } + }) + } + }, + deep: true } }, created() { @@ -338,6 +357,7 @@ const res = await getModelSpecification({ materialId: val }) + this.model_options = res.data this.model_spe_options = res.data.map((item) => { return { key: item.specificationsId, @@ -351,7 +371,7 @@ for (let i = 1; i < this.addPointerForm.experiment.length; i++) { exper += ',' + this.addPointerForm.experiment[i] } - + // console.log(exper) this.addPointerForm.experiment = exper let tmp = this.addPointerForm @@ -395,8 +415,6 @@ message: '鎭枩浣�!', type: 'success' }) - // 璺宠浆椤甸潰 - this.$router.push('/inspectionManagement/commissionInspection') this.showDetail = true } else { this.$message.error(res.message) @@ -418,21 +436,28 @@ } }) this.getModelSpecification(val) + }, + getProductList(val){ + getProductList({modelId: val}).then(res=>{ + this.productList = res.data.map(item=>{ + return item.name + }) + }) } } } </script> <style lang="scss" scoped> -.content-main{ - padding: 20px 40px; - background-color: #f0f2f5; - width: 100%; - height: 100vh; - display: flex; - flex-direction: column; - justify-content: space-between; - // align-items: center; + .content-main { + padding: 20px 40px; + background-color: #f0f2f5; + width: 100%; + height: 100vh; + display: flex; + flex-direction: column; + justify-content: space-between; + // align-items: center; .firstBox { .title { -- Gitblit v1.9.3