分支自 lims-before
src/views/experiment/inspectionApplication/index.vue
@@ -180,16 +180,17 @@ title="新增检验单" :visible.sync="checkTypeVisible" width="50%" top="10vh" > <div class="check-box"> <el-radio-group v-model="type" @change="handleRadioChange"> <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >原材料检验</el-radio> <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="1" border>委托检验</el-radio> <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="2" border>成品检验</el-radio> <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> </el-radio-group> </div> <div v-if="type === 0 || type === ''"> <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini"> <div v-if="type === 0"> <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium"> <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="来料日期："> @@ -251,44 +252,44 @@ <el-form :model="commisionSelection" ref="commisionTable" 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" :value="commisionSelection.formTime" placeholder="请输入来料日期" autocomplete="off" /> <el-form-item label="委托编号"> <el-input style="width: 300px" type="text" :value="commisionSelection.entrust_coding" placeholder="请输入来料日期" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="供应商名称："> <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="请输入委托单位" autocomplete="off" /> <el-form-item label="委托单位"> <el-input style="width: 300px" type="text" :value="commisionSelection.entrusted" 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" :value="commisionSelection.mcode" placeholder="请输入样品编号" autocomplete="off" /> <el-form-item label="样品编号"> <el-input style="width: 300px" type="text" :value="commisionSelection.samples_number" placeholder="请输入样品编号" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="委托名称："> <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="请输入样品名称" autocomplete="off" /> <el-form-item label="样品名称"> <el-input style="width: 300px" type="text" :value="commisionSelection.sample_name" 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" :value="commisionSelection.specifications" placeholder="请输入型号规格" autocomplete="off" /> <el-input style="width: 300px" type="text" :value="commisionSelection.specifications_models" placeholder="请输入型号规格" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="单位："> <el-input style="width: 300px" type="text" :value="commisionSelection.unit" placeholder="请输入单位" autocomplete="off" /> <el-form-item label="送达时间"> <el-input style="width: 300px" type="text" :value="commisionSelection.dateSurvey" 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" :value="commisionSelection.num" placeholder="请输入数量" autocomplete="off" /> <el-form-item label="完成期限"> <el-input style="width: 300px" type="text" :value="commisionSelection.completionDeadline" placeholder="请输入数量" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> @@ -395,8 +396,6 @@ height="calc(100vh - 250px)" default-expand-all ref="multipleTable" @select="selectTr" @select-all="selectAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" > <el-table-column type="selection" label="序号"> </el-table-column> @@ -557,50 +556,32 @@ @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="formTime" label="委托bian'ha" 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="specifications" label="规格型号" min-width="8%" /> <el-table-column prop="unit" label="单位" min-width="12%" /> <el-table-column prop="num" label="数量" min-width="8%" /> <el-table-column prop="checkdate_" label="检验日期" min-width="8%" /> <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="entrusted" label="委托单位" min-width="12%" /> <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="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="inspection_status" label="状态" min-width="8%"> <template slot-scope="scope"> <div v-if="scope.row.inspection_status === 1"> <span style="color: green;">已检测</span> </div> <div v-else> <span style="color: red;">待检测</span> </div> </template> </el-table-column> <el-table-column label="操作" min-width="8%"> <template slot-scope="scope"> <el-button type="text" size="small">删除</el-button> </template> </el-table-column> </el-table> <span slot="footer" class="dialog-footer"> <el-button @click="commisionVisible = false">取 消</el-button> @@ -611,7 +592,6 @@ </template> <template v-else> <router-view /> </template> </div> </template> @@ -665,7 +645,7 @@ amount: '', checkdate: [] }, infoForm:'', infoForm:{}, commisionSelection:{ entrust_coding: '', entrusted: '', @@ -706,11 +686,12 @@ pageSize: 8, // 每页的数据条数 radioValue: '全部', checkTypeVisible: false, type: '', // 默认不选中的状态 type: 0, // 默认不选中的状态 rawmaterialVisible: false, commisionVisible: false, tmp: '', Standardframe: false Standardframe: false, tableData: [] } }, watch: { @@ -725,6 +706,7 @@ }, created() { this.selectInspectsList() // this.getCommisionList() }, updated() { if (this.$route.name === 'ForInspectionDetail') this.showDetail = true @@ -828,8 +810,7 @@ }, async handleRadioChange(){ if(this.type === 0){ 原材料报检 // 原材料报检 this.rawmaterialVisible = true const res = await selectAll({type: this.type}) var data = res.data @@ -897,7 +878,7 @@ type: this.type, unit: this.finishedTable.unit }) } this.type = '' this.type = 0 this.checkTypeVisible = false this.$message({ message: '添加成功！', @@ -944,7 +925,7 @@ } height: auto; font-size: 22px !important; padding: 20px 40px !important; padding: 40px 50px !important; ::v-deep .el-radio__label{ font-size: 22px !important; padding-left: 0px !important;
