分支自 lims-before
src/views/experiment/inspectionApplication/index.vue
@@ -180,20 +180,21 @@ 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-group v-model="type" @click.native="handleRadioChange"> <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="来料日期："> <el-input style="width: 300px" type="text" :value="infoForm.dateSurvey" placeholder="请输入来料日期" autocomplete="off" /> <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="请输入来料日期" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> @@ -205,19 +206,19 @@ <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="原材料编码："> <el-input style="width: 300px" type="text" :value="infoForm.materialCoding" placeholder="请输入原材料编码" autocomplete="off" /> <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="请输入原材料编码" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="原材料名称："> <el-input style="width: 300px" type="text" :value="infoForm.materialName" placeholder="请输入原材料名称" autocomplete="off" /> <el-input style="width: 300px" type="text" :value="infoForm.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="infoForm.specificationsModels" placeholder="请输入规格型号" autocomplete="off" /> <el-input style="width: 300px" type="text" :value="infoForm.specifications" placeholder="请输入规格型号" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> @@ -229,13 +230,13 @@ <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="数量："> <el-input style="width: 300px" type="text" :value="infoForm.quantity" placeholder="请输入数量" autocomplete="off" /> <el-input style="width: 300px" type="text" :value="infoForm.num" placeholder="请输入数量" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="检验时间："> <el-date-picker v-model="infoForm.checkdate" v-model="infoForm.endTime" type="daterange" range-separator="至" start-placeholder="开始日期" @@ -248,27 +249,27 @@ </el-form> </div> <div v-if="type === 1"> <el-form :model="commisionSelection" ref="commisionTable" class="checkTypeForm" label-position="top" label-width="200px" size="mini"> <el-form :model="commisionSelection" ref="commisionSelection" 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-form-item label="委托单位"> <el-input style="width: 300px" type="text" :value="commisionSelection.supplier" placeholder="请输入委托单位" autocomplete="off" /> </el-form-item> </el-col> </el-row> <el-row :gutter="100"> <el-col :span="10"> <el-form-item label="委托编号："> <el-form-item label="样品编号"> <el-input style="width: 300px" type="text" :value="commisionSelection.mcode" placeholder="请输入样品编号" autocomplete="off" /> </el-form-item> </el-col> <el-col :span="10"> <el-form-item label="委托名称："> <el-form-item label="样品名称"> <el-input style="width: 300px" type="text" :value="commisionSelection.name" placeholder="请输入样品名称" autocomplete="off" /> </el-form-item> </el-col> @@ -280,15 +281,15 @@ </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.supplier" 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"> @@ -378,25 +379,26 @@ <el-dialog title="标准库" :visible.sync="Standardframe" width="48%" width="49%" > <!-- <el-form :model="form"> <el-form-item label="请选择审核结果:" :label-width="formLabelWidth"> </el-form-item> </el-form> --> <!-- <div slot="footer" class="dialog-footer"> --> <el-card> <template slot-scope="scope" > <span>版本选择：</span> <el-select @change="ccc" v-model="selectedValue" size="small" slot="append" style="width: 220px;"> <el-option v-for="item in BANben" :key="item" :label="item" :value="item"></el-option> </el-select> </template> </el-card> <el-table :data="tableData" style="width: 100%; margin-bottom: 20px" row-key="name" row-key="id" border height="calc(100vh - 250px)" height="calc(80vh - 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> @@ -416,7 +418,7 @@ > {{ scope.row.code == "[1]" ? "01" : "02" }} </div> <span style="color: black">{{ scope.row.name }}</span></el-tag <span style="color: black">{{ scope.row.name }}</span></el-tag > </template> </el-table-column> @@ -446,7 +448,11 @@ </template> </el-table-column> </el-table> <!-- </div> --> <span slot="footer" class="dialog-footer"> <el-button @click="Standardframe = false">取 消</el-button> <el-button type="primary" @click="GOfrom">确 定</el-button> </span> </el-dialog> <!-- 原材料检验模态框 --> @@ -464,9 +470,8 @@ style="width: 100%" @selection-change="handleSelectionChange" > <el-table-column <el-table-column type="selection" label="" min-width="10%" /> <el-table-column @@ -475,7 +480,7 @@ min-width="8%" /> <el-table-column prop="dateSurvey" prop="startTime" label="来料日期" min-width="8%" /> @@ -485,17 +490,17 @@ min-width="12%" /> <el-table-column prop="materialCoding" prop="mcode" label="材料编码" min-width="8%" /> <el-table-column prop="materialName" prop="name" label="材料名称" min-width="8%" /> <el-table-column prop="specificationsModels" prop="specifications" label="规格型号" min-width="12%" /> @@ -505,27 +510,27 @@ min-width="5%" /> <el-table-column prop="quantity" prop="num" label="数量" min-width="5%" /> <el-table-column prop="inspectionDate" prop="endTime" label="报检日期" min-width="8%" /> <el-table-column prop="surveyor" prop="supplier" label="检验人" min-width="8%" /> <el-table-column prop="createTime" prop="startTime" label="检验日期" min-width="8%" /> <el-table-column prop="state" prop="condition" label="状态" min-width="8%" > @@ -557,50 +562,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="supplier" label="委托单位" min-width="12%" /> <el-table-column prop="mcode" label="样品编号" min-width="8%" /> <el-table-column prop="name" label="样品名称" min-width="8%" /> <el-table-column prop="specifications" label="规格型号" min-width="12%" /> <el-table-column prop="endTime" label="送达时间" min-width="8%" /> <el-table-column prop="formTime" label="完成期限" min-width="8%" /> <el-table-column prop="contacts" label="委托编制人" min-width="8%" /> <el-table-column prop="endTime" 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,15 +598,15 @@ </template> <template v-else> <router-view /> </template> </div> </template> <script> import { selectInspectsList, selectAll, addInspect,getCommisionList} from '@/api/experiment/planAssignments' import { selectInspectsList, selectAll, addInspect,chooseVer,lookProByVer} from '@/api/experiment/planAssignments' export default { data() { return { showDetail: false, searchData: { @@ -627,34 +614,12 @@ type: '', state: '', }, valu:{}, inputValue: '', icode:'', inspectionTable: [], rawMaterialTable: [], commisionTable: [{ specifications_models: "GGXH-AAAAA", inspectionTime: "2023-08-03", id: 2, samples_number: 0, dateSurvey: "2023-08-03", entrusted: "阿里巴巴", completionDeadline: "2023-08-03", contacts: "小黑", entrust_coding: "SL20230803000003", sample_name: "发动机", inspection_status: 1 },{ specifications_models: "GGXH-AAAAA", inspectionTime: "2023-08-03", id: 2, samples_number: 0, dateSurvey: "2023-08-03", entrusted: "阿里巴巴", completionDeadline: "2023-08-03", contacts: "小黑", entrust_coding: "SL20230803000003", sample_name: "发动机", inspection_status: 1 }], commisionTable: [], finishedTable: { deliverydate: '', supplier: '', @@ -665,7 +630,8 @@ amount: '', checkdate: [] }, infoForm:'', selectedValue:1, infoForm:{}, commisionSelection:{ entrust_coding: '', entrusted: '', @@ -706,11 +672,16 @@ pageSize: 8, // 每页的数据条数 radioValue: '全部', checkTypeVisible: false, type: '', // 默认不选中的状态 type: 0, // 默认不选中的状态 rawmaterialVisible: false, commisionVisible: false, tmp: '', Standardframe: false Standardframe: false, tableData: [], tableRow:{}, BANben:[], select_1: [], aa:{} } }, watch: { @@ -730,26 +701,59 @@ if (this.$route.name === 'ForInspectionDetail') this.showDetail = true }, methods: { async handleClick(row){ // console.log(item); // const res = await ddd({goodId:id}) // this.$message({ // message: '恭喜你，这是一条成功消息', // type: 'success' // }); async selectAll(){ const res = selectAll({type:0}) // console.log(res); this.rawMaterialTable = res.data }, async selectAll(){ const res = selectAll({type:2}) // console.log(res); this.commisionTable = res.data }, async handleClick(row){ this.inspectionTable = row; console.log(row.id); this.id = row.id this.$router.push({name:'Viewdetails',query: {id:row.id}}); this.selectInspectsList() }, //委托检验 async getCommisionList() { const res = await getCommisionList({pageNo:1,pageSize:10 }) this.commisionTable = res.data console.log(this.commisionTable); // validateInput() { // if (this.inputValue.trim() === '') { // } // }, // 输入值为空，弹出提示信息或进行其他处理 // alert('输入值不能为空'); // return; //版本库 async chooseVer() { console.log(this.tmp.materialCoding); console.log(this.tmp.materialName); console.log(this.tmp.specificationsModels); const res = await chooseVer ({ mcode:this.tmp.mcode, name:this.tmp.name, specifications:this.tmp.specifications }) this.BANben = res.data console.log(res.data); this.aa = this.BANben[0] this.lookProByVer() }, //标准库 async lookProByVer() { const res = await lookProByVer({ mcode:this.tmp.mcode, name:this.tmp.name, specifications:this.tmp.specifications, version:this.aa }) console.log(res); this.tableData = res.data }, ccc(val){ // console.log(val); this.aa = val this.lookProByVer() }, async selectInspectsList() { // 获取分页列表 @@ -762,7 +766,7 @@ var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"] var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"] var checkdate = startTime + '~' + endTime var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"] var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%d')"] item['formTime'] = formTime // 来料日期 item['checkdate'] = checkdate // 检验日期 item['createTime'] = createTime // 登记日期 @@ -783,7 +787,6 @@ item['checkdate'] = checkdate // 检验日期 item['createTime'] = createTime // 登记日期 }) console.log('data:',data) this.inspectionTable = data if(this.searchData.type !== ''){ if(this.searchData.state !== ''){ @@ -817,6 +820,7 @@ this.$refs.multipleTable.toggleRowSelection(val.pop()) } this.tmp = val[0] // console.log(this.tmp); }, handleCommisionSelection(){ this.commisionSelection = this.tmp @@ -824,37 +828,38 @@ }, handleRawMaterialSelection(){ this.infoForm = this.tmp // console.log(this.infoForm); this.rawmaterialVisible = false }, async handleRadioChange(){ if(this.type === 0){ 原材料报检 handleRadioChange(){ setTimeout(()=>{ if(this.type === 0){ // 原材料报检 this.rawmaterialVisible = true const res = await selectAll({type: this.type}) var data = res.data data.forEach((item)=>{ var checkdate = [] checkdate.push(item['createTime']) checkdate.push(item['updateTime']) item['checkdate'] = checkdate // 检验日期 selectAll({type:0}).then(res=>{ // console.log(res); // var data = res.data // data.forEach((item)=>{ // var checkdate = [] // checkdate.push(item['createTime']) // checkdate.push(item['updateTime']) // item['checkdate'] = checkdate // 检验日期 // }) console.log(res); this.rawMaterialTable = res.data }) // this.infoForm = res.data // this.$router.push({ name: 'ReportForInspection' }); }else if(this.type === 1){ this.commisionVisible = true const res = await getCommisionList({pageNo:1,pageSize:10}) // var data = res.data // data.forEach((item)=>{ // var checkdate = [] // checkdate.push(item['startTime']) // checkdate.push(item['endTime']) // item['checkdate_'] = item['startTime'] + '~' + item['endTime'] // item['checkdate'] = checkdate // 检验日期 // }) this.commisionTable = res.data // this.$router.push({ name: 'CommissionInspection' }); } this.commisionVisible = true selectAll({type:2}).then(res=>{ this.commisionTable = res.data }) } },100) }, // 新增检验 async addInspection(){ @@ -897,7 +902,7 @@ type: this.type, unit: this.finishedTable.unit }) } this.type = '' this.type = 0 this.checkTypeVisible = false this.$message({ message: '添加成功！', @@ -919,8 +924,30 @@ }, //确定跳转 QUEding(){ // this.tableRow = a this.Standardframe = true } this.chooseVer() }, //確定詳情頁 GOfrom( ){ this.Standardframe = false // console.log(this.tmp.materialCoding); // console.log(this.tmp.materialName); // console.log(this.tmp.specificationsModels); // console.log(this.aa) // const data = { // // mcode : this.tmp.mcode, // // name:this.tmp.name, // // specifications:this.tmp.specifications, // version:this.tmp.id // } this.$router.push({name:'Viewdetails',query:{id:this.tmp.id}}) }, } } </script> @@ -944,7 +971,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;
