| .env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/api/inspection/commisioninspection.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/inspectionApplication/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inspectionManagement/commissionInspection/addCommision.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inspectionManagement/commissionInspection/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/inspectionManagement/reportForInspection/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.development
@@ -2,4 +2,4 @@ ENV = 'development' # base api VUE_APP_BASE_API = 'http://192.168.110.107:1234/' VUE_APP_BASE_API = 'http://localhost:1234/' src/api/inspection/commisioninspection.js
@@ -73,3 +73,11 @@ params }) } export function getContractsSampleInfo(params){ return request({ url: '/link-basic/getContractsSampleInfo', method: 'get', params }) } src/views/experiment/inspectionApplication/index.vue
@@ -517,8 +517,6 @@ watch: { $route: { handler(val, oldval) { console.log(val) // 新路由信息 console.log(oldval) // 老路由信息 }, // 深度观察监听 deep: true src/views/inspectionManagement/commissionInspection/addCommision.vue
@@ -21,13 +21,11 @@ :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%" /> <el-table-column prop="specificationsModels" label="规格型号" min-width="10%" /> <el-table-column prop="unit" label="单位" min-width="8%" /> <el-table-column prop="samplesNumber" label="数量" min-width="8%" /> <el-table-column prop="addway" label="添加方式" min-width="8%"> <!-- <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> @@ -37,7 +35,7 @@ </div> <div v-else></div> </template> </el-table-column> </el-table-column> --> <el-table-column prop="remarks" label="备注" min-width="8%" /> <el-table-column label="操作" min-width="8%"> <template slot-scope="scope"> @@ -102,8 +100,8 @@ <el-col :span="5"> <el-form-item label="送样方式："> <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-option v-for="options in sampleDeliveryMode" :key="options.key" :value="options.key" :label="options.value">{{ options.value }}</el-option> </el-select> </el-form-item> </el-col> @@ -229,7 +227,8 @@ getlink, addInspection, isIfViewUUID, getProductList getProductList, getContractsSampleInfo } from '@/api/inspection/commisioninspection' export default { data() { @@ -274,17 +273,8 @@ key: '4', label: '绝缘部分交流耐压试验' }], sampleoptions: [{ key: '1', value: '选项1' }, { key: '2', value: '选项2' }], samplecodeoptions: [{ key: '1', value: '' }], sampleoptions: [], samplecodeoptions: [], model_spe_options: [], model_sta_options: [], model_options: [], @@ -342,6 +332,8 @@ if (!res.data) { this.$message.error('当前链接不在有效期内,系统自动关闭') this.$router.push('/404') } else { this.getContractsSampleInfo() } }) }, @@ -373,8 +365,6 @@ 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 this.detectionInfo.push(tmp) @@ -414,7 +404,7 @@ this.infoForm.commisioncode = res.data if (res.data) { this.$message({ message: '恭喜你!', message: '添加成功!', type: 'success' }) this.showDetail = true @@ -447,6 +437,28 @@ return item.name }) }) }, getContractsSampleInfo() { getContractsSampleInfo({ viewId: this.viewId }).then(res => { this.infoForm = { commisioncode: res.data.entrustCoding, deadline: res.data.completionDeadline, address: res.data.contactAddress, tel: res.data.contactNumber, contacter: res.data.contacts, other: res.data.entrustRemarks, department: res.data.entrusted, time: res.data.inspectionTime, detectionInfo: res.data.linkDetectionList, num: res.data.reportNumber, way: '' + res.data.sampleDeliveryMode, sendertel: res.data.sampleDeliveryPhone, sender: res.data.sampleSender } this.detectionInfo = res.data.linkDetectionList }) } } } src/views/inspectionManagement/commissionInspection/index.vue
@@ -68,10 +68,10 @@ <el-table-column prop="samples_number" label="样品数量" min-width="8%" /> <el-table-column prop="sample_name" label="样品名称" min-width="8%" /> <el-table-column prop="specifications_models" label="规格型号" min-width="12%" /> <el-table-column prop="dateSurvey" label="送样时间" min-width="8%" /> <el-table-column prop="inspectionTime" label="送样时间" min-width="8%" /> <el-table-column prop="completionDeadline" label="完成期限" min-width="8%" /> <el-table-column prop="contacts" label="委托编制人" min-width="8%" /> <el-table-column prop="inspectionTime" label="检验日期" min-width="8%" /> <el-table-column prop="insTime" label="检验日期" min-width="8%" /> <el-table-column prop="inspection_status" label="状态" min-width="8%"> <template slot-scope="scope"> <div v-if="scope.row.inspection_status === 0"> src/views/inspectionManagement/reportForInspection/index.vue
@@ -383,10 +383,8 @@ // 获取分页列表数据 async getRawMaterialList(){ const res = await getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize}) // console.log(res) this.inspectionTable = res.data.row this.data = res.data.row console.log(res.data.row); this.total = res.data.total }, async search(){ @@ -398,7 +396,6 @@ pageNo: this.currentPage, pageSize: this.pageSize }) // console.log(res) this.inspectionTable = res.data.row this.data = res.data.row this.total = res.data.total @@ -414,7 +411,6 @@ }, radioclick(){ this.searchData.state = this.radioValue // console.log(this.radioValue) this.inspectionTable = this.data.filter((item)=>{ return item.condition === this.radioValue }) @@ -425,13 +421,11 @@ }, // 每页条数改变时触发 选择一页显示多少行 handleSizeChange(val) { console.log(`每页 ${val} 条`) this.pageSize = val this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize}) }, // 当前页改变时触发 跳转其他页 handleCurrentChange(val) { console.log(`当前页: ${val}`) this.currentPage = val this.getRawMaterialList({pageNo: this.currentPage,pageSize:this.pageSize}) }
