| | |
| | | </el-row> |
| | | </el-form> |
| | | </div> |
| | | <div class="packageInspect-detail"> |
| | | <el-row :gutter="10" style="width:100%;z-index: 10;height:30px;"> |
| | | <el-col :span="12">检验项目</el-col> |
| | | <el-col :span="12" style="text-align: right;"> |
| | | <el-dropdown @command="handleCommand" v-if="!isShow"> |
| | | <el-button size="mini" style="margin-right: 10px;" type="primary" > |
| | | 切换默认检验项<i class="el-icon-arrow-down el-icon--right"></i> |
| | | </el-button> |
| | | <el-dropdown-menu slot="dropdown"> |
| | | <el-dropdown-item command="1">检验项目1</el-dropdown-item> |
| | | <el-dropdown-item divided command="2">检验项目2</el-dropdown-item> |
| | | </el-dropdown-menu> |
| | | </el-dropdown> |
| | | <el-button v-if="resultVal=='' || resultVal==null" size="mini" @click="clickAddLine()">添加检验项目</el-button> |
| | | <el-button v-if="resultVal=='' || resultVal==null" type="primary" size="mini" |
| | | @click="savePackIns()">保存</el-button> |
| | | </el-col> |
| | | </el-row> |
| | | <el-row style="width:100%;"> |
| | | <el-col :span="24"> |
| | | <el-table |
| | | :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" |
| | | :cell-style="{textAlign:'center'}" |
| | | ref="table" |
| | | :data="list" |
| | | border |
| | | style="width: 100%;" |
| | | height="400" |
| | | row-key="randomId" class="l-mes" |
| | | default-expand-all |
| | | :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> |
| | | <el-table-column type="index" label="序号" width="60"> |
| | | </el-table-column> |
| | | <el-table-column prop="name" label="项目" width="160"> |
| | | <template slot-scope="scope"> |
| | | <el-input :readonly="resultVal!=null || !scope.row.isEdit" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name" |
| | | placeholder="请输入项目名称"></el-input> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="required" label="要求" width="160"> |
| | | <template slot-scope="scope"> |
| | | <div v-if="!scope.row.children"> |
| | | <el-tooltip :content="scope.row.required"> |
| | | <el-input :readonly="resultVal!=null || !scope.row.isEdit" |
| | | v-model="scope.row.required" |
| | | placeholder="请输入要求"></el-input> |
| | | </el-tooltip> |
| | | </div> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="note" label="检验描述" width="160"> |
| | | <template slot-scope="scope"> |
| | | <div v-if="!scope.row.children"> |
| | | <el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="检验描述"></el-input> |
| | | </div> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="testState" label="结论" min-width="150"> |
| | | <template slot-scope="scope"> |
| | | <el-select style="width:100%" :disabled="resultVal!=null" @change="changeResult" v-model="scope.row.result" v-if="!scope.row.children"> |
| | | <el-option label="合格" value="合格"></el-option> |
| | | <el-option label="不合格" value="不合格"></el-option> |
| | | </el-select> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column v-if="resultVal=='' || resultVal==null" fixed="right" style="background-color: white;" label="操作" width="200"> |
| | | <template slot-scope="scope"> |
| | | <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-plus-outline" type="text" @click="clickAddChildren(scope.row,scope.$index)">添加行</el-button> |
| | | <el-button v-if="!scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text" |
| | | @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">取消</el-button> |
| | | <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text" |
| | | @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">删除项目</el-button> |
| | | <div> |
| | | <el-tabs class="packageInspect-detail" @tab-click="tabsClick"> |
| | | <el-tab-pane label="检验项目"> |
| | | <el-row> |
| | | <el-col :span="24" style="text-align: right;"> |
| | | <el-dropdown @command="handleCommand" v-if="isShow && (resultVal==null || resultVal=='')"> |
| | | <el-button size="mini" style="margin-right: 10px;" type="primary" > |
| | | 切换检验项模板<i class="el-icon-arrow-down el-icon--right"></i> |
| | | </el-button> |
| | | <el-dropdown-menu slot="dropdown"> |
| | | <el-dropdown-item :key="index" v-for="(item,index) in inspectMoulds" :command="item.father">{{item.father}}</el-dropdown-item> |
| | | </el-dropdown-menu> |
| | | </el-dropdown> |
| | | <el-button v-if="resultVal=='' || resultVal==null" size="mini" @click="clickAddLine()">添加检验项目</el-button> |
| | | <el-button v-if="resultVal=='' || resultVal==null" type="primary" size="mini" |
| | | @click="savePackIns()">保存</el-button> |
| | | </el-col> |
| | | </el-row> |
| | | <el-row> |
| | | <el-col :span="24"> |
| | | <el-table |
| | | :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" |
| | | :cell-style="{textAlign:'center'}" |
| | | ref="table" |
| | | :data="list" |
| | | border |
| | | style="width: 100%;" |
| | | height="400" |
| | | row-key="randomId" class="l-mes" |
| | | default-expand-all |
| | | :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> |
| | | <el-table-column type="index" prop="parentIndex" label="序号" width="60"> |
| | | <template scope="scope"> |
| | | <span v-if="scope.row.isIndex">{{scope.row.parentIndex}}</span> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="name" label="项目" min-width="160"> |
| | | <template slot-scope="scope"> |
| | | <el-input :readonly="resultVal!=null || !scope.row.isEdit" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name" |
| | | placeholder="请输入项目名称"></el-input> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="required" label="要求" min-width="160"> |
| | | <template slot-scope="scope"> |
| | | <div v-if="!scope.row.children"> |
| | | <el-tooltip :content="scope.row.required"> |
| | | <el-input :readonly="resultVal!=null || !scope.row.isEdit" |
| | | v-model="scope.row.required" |
| | | placeholder="请输入要求"></el-input> |
| | | </el-tooltip> |
| | | </div> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="note" label="检验描述" min-width="160"> |
| | | <template slot-scope="scope"> |
| | | <div v-if="!scope.row.children"> |
| | | <el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="检验描述"></el-input> |
| | | </div> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column prop="testState" label="结论" min-width="150"> |
| | | <template slot-scope="scope"> |
| | | <el-select style="width:100%" :disabled="resultVal!=null" @change="changeResult" v-model="scope.row.result" v-if="!scope.row.children"> |
| | | <el-option label="合格" value="合格"></el-option> |
| | | <el-option label="不合格" value="不合格"></el-option> |
| | | <el-option label="不适用" value="不适用"></el-option> |
| | | </el-select> |
| | | </template> |
| | | </el-table-column> |
| | | <el-table-column v-if="resultVal=='' || resultVal==null" fixed="right" style="background-color: white;" label="操作" width="200"> |
| | | <template slot-scope="scope"> |
| | | <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-plus-outline" type="text" @click="clickAddChildren(scope.row,scope.$index)">添加行</el-button> |
| | | <el-button v-if="!scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text" |
| | | @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">取消</el-button> |
| | | <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text" |
| | | @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">删除项目</el-button> |
| | | |
| | | </template> |
| | | </el-table-column> |
| | | </el-table> |
| | | </el-col> |
| | | </el-row> |
| | | </el-tab-pane> |
| | | <el-tab-pane label="附件上传" type="card"> |
| | | <div style="display: flex;justify-content:flex-end;"> |
| | | <div></div> |
| | | </div> |
| | | <div |
| | | v-loading="progrecessFileLoading" |
| | | element-loading-text="请稍等,文件上传中" |
| | | > |
| | | <el-upload |
| | | drag |
| | | ref="upload" |
| | | action="/mes/attachment/upload" |
| | | :auto-upload="true" |
| | | :headers="headers" |
| | | :before-upload="submitUpload" |
| | | :on-success="uploadSuccess" |
| | | :data="paramData" |
| | | :with-credentials="true" |
| | | :show-file-list="false" |
| | | > |
| | | <i class="el-icon-upload"></i> |
| | | <div class="el-upload__text"> |
| | | 将文件拖到此处,或<em>点击上传</em> |
| | | </div> |
| | | </el-upload> |
| | | </div> |
| | | <el-table :data="processConfigFileTableData" height="260px"> |
| | | <el-table-column |
| | | prop="rawInsNo" |
| | | align="center" |
| | | width="120" |
| | | label="原材料检验编号" |
| | | show-overflow-tooltip |
| | | ></el-table-column> |
| | | <el-table-column |
| | | prop="originalFileName" |
| | | align="center" |
| | | label="原文件名" |
| | | width="200" |
| | | ></el-table-column> |
| | | <el-table-column prop="fileName" align="center" label="文件后缀"></el-table-column> |
| | | <el-table-column prop="createUser" align="center" label="上传人"></el-table-column> |
| | | <el-table-column |
| | | prop="createTime" |
| | | align="center" |
| | | label="上传时间" |
| | | show-overflow-tooltip |
| | | ></el-table-column> |
| | | <el-table-column prop="updateUser" align="center" label="更新人"> |
| | | </el-table-column> |
| | | <el-table-column |
| | | prop="updateTime" |
| | | align="center" |
| | | label="更新时间" |
| | | show-overflow-tooltip |
| | | ></el-table-column> |
| | | <el-table-column align="center" label="操作"> |
| | | <template slot-scope="scope"> |
| | | <el-button |
| | | @click="delProcessConfigFile(scope.row)" |
| | | type="text" |
| | | size="small" |
| | | :disabled="(resultVal!=null && resultVal!='')" |
| | | >删除</el-button |
| | | > |
| | | <el-button |
| | | @click="downloadProcessConfigFile(scope.row)" |
| | | type="text" |
| | | size="small" |
| | | >下载</el-button |
| | | > |
| | | </template> |
| | | </el-table-column> |
| | | </el-table-column> |
| | | </el-table> |
| | | </el-col> |
| | | </el-row> |
| | | </el-tab-pane> |
| | | </el-tabs> |
| | | </div> |
| | | <div class="packageInspect-result"> |
| | | <el-row> |
| | |
| | | updatePackageInspectById, |
| | | getCustomer, |
| | | } from '@/api/quality/packageInspect' |
| | | import {inspect1,inspect2} from '@/const/defaultPackageInspect' |
| | | import { |
| | | getProcessConfigFiles, |
| | | deleteProcessConfigFile, |
| | | downloadProcessConfigFile |
| | | } from '@/api/quality/attachment' |
| | | import {getAllTemplateByEnable} from '@/api/quality/packageInspectTemp' |
| | | import { getStore } from '@/util/store' |
| | | export default { |
| | | computed:{ |
| | | }, |
| | |
| | | }, |
| | | data(){ |
| | | return{ |
| | | isShow: false, |
| | | progrecessFileLoading: false, |
| | | processConfigFileTableData: [], |
| | | headers: { |
| | | Authorization: 'Bearer ' + getStore({ name: 'access_token' }) |
| | | }, |
| | | paramData: { |
| | | rawInsNo: '', |
| | | lineNumber: '', |
| | | type: 4 |
| | | }, |
| | | inspectMoulds: [], |
| | | isShow: true, |
| | | submitData: { |
| | | id:null, |
| | | result: null, |
| | |
| | | this.resultVal=val |
| | | } |
| | | } |
| | | this.getAllInspect() |
| | | this.init() |
| | | |
| | | }, |
| | | watch:{ |
| | | dialogVisible(newVal){ |
| | |
| | | } |
| | | }, |
| | | methods:{ |
| | | handleCommand(command) { |
| | | switch(command){ |
| | | case "1": |
| | | this.init(inspect1) |
| | | break; |
| | | case "2": |
| | | this.init(inspect2) |
| | | break; |
| | | delProcessConfigFile(row) { |
| | | this.$confirm('是否删除该附件', '提示', { |
| | | confirmButtonText: '确定', |
| | | cancelButtonText: '取消', |
| | | type: 'warning', |
| | | closeOnClickModal: false |
| | | }).then(function() { |
| | | return deleteProcessConfigFile(row.id) |
| | | }).then((data) => { |
| | | this.getConfigFiles() |
| | | }) |
| | | }, |
| | | getConfigFiles() { |
| | | const param = { |
| | | no: this.dataForm.packInsNo, |
| | | lineNumber: this.dataForm.id, |
| | | type: 4 |
| | | } |
| | | getProcessConfigFiles(param).then((res) => { |
| | | this.processConfigFileTableData = res.data.data |
| | | }) |
| | | }, |
| | | downloadProcessConfigFile(row) { |
| | | downloadProcessConfigFile({ |
| | | bucket: row.bucketName, |
| | | fileName: row.fileName, |
| | | originalFileName: row.originalFileName |
| | | }) |
| | | }, |
| | | submitUpload() { |
| | | this.paramData.no = this.dataForm.packInsNo |
| | | this.paramData.lineNumber = this.dataForm.id |
| | | this.progrecessFileLoading = true |
| | | }, |
| | | uploadSuccess() { |
| | | this.progrecessFileLoading = false |
| | | this.getConfigFiles() |
| | | }, |
| | | tabsClick(tab,even){ |
| | | if(tab.index == 1){ |
| | | this.getConfigFiles(); |
| | | } |
| | | }, |
| | | checkShowState(){ |
| | | let num = 0 |
| | | this.list.forEach(ele=>{ |
| | | if(ele.children){ |
| | | ele.children.forEach(c=>{ |
| | | if(c.pid){ |
| | | num+=1 |
| | | } |
| | | }) |
| | | } |
| | | }) |
| | | this.isShow = num==0 |
| | | }, |
| | | getAllInspect(){ |
| | | getAllTemplateByEnable().then(res=>{ |
| | | if(res.status===200){ |
| | | this.inspectMoulds = res.data.data |
| | | } |
| | | }).catch(error=>{ |
| | | console.error(error) |
| | | }) |
| | | }, |
| | | handleCommand(command) { |
| | | this.inspectMoulds.forEach(ele=>{ |
| | | if(ele.father==command){ |
| | | this.init(ele.children) |
| | | } |
| | | }) |
| | | }, |
| | | changeResult(){ |
| | | let result = '' |
| | |
| | | clickAddLine() { |
| | | this.list.push({ |
| | | name: '', |
| | | isIndex : true, |
| | | parentIndex : this.list.length + 1, |
| | | randomId: Math.random(), |
| | | isEdit: true, |
| | | children: [{ |
| | |
| | | _than.list = [] |
| | | let userNameList = [] |
| | | if(dataList){ |
| | | _than.list = JSON.parse(JSON.stringify(dataList)) |
| | | let tempList = [] |
| | | dataList.forEach((ele,index)=>{ |
| | | let obj = { |
| | | randomId: Math.random(), |
| | | name: ele.inspectName, |
| | | isIndex: true, |
| | | parentIndex: index+1, |
| | | children: [] |
| | | } |
| | | if(ele.children){ |
| | | ele.children.forEach(e=>{ |
| | | obj.children.push({ |
| | | required: e.inspectRequired, |
| | | randomId: Math.random(), |
| | | isEdit: false, |
| | | note: '', |
| | | result: '' |
| | | }) |
| | | }) |
| | | } |
| | | tempList.push(obj) |
| | | }) |
| | | _than.list = tempList |
| | | } |
| | | data.packageInsProductS.forEach(item => { |
| | | data.packageInsProductS.forEach((item,index) => { |
| | | if (item.children) { |
| | | let ele = { |
| | | isIndex: true, |
| | | parentIndex: index+1, |
| | | isEdit: true, |
| | | randomId: Math.random(), |
| | | name: null, |
| | |
| | | _than.list.push(ele) |
| | | } |
| | | }) |
| | | let find1 = this.list.find(ele=>ele.name===inspect1[0].name&&ele.isEdit) !=undefined; |
| | | let find2 = this.list.find(ele=>ele.name===inspect2[0].name&&ele.isEdit) !=undefined; |
| | | this.isShow = find1||find2 |
| | | |
| | | _than.conclusionTable = [{ |
| | | packageNo: data.packageNo, |
| | | userName: Array.from(new Set(userNameList)).join(','), |
| | |
| | | _than.$nextTick(()=>{ |
| | | if(_than.list.length>0){ |
| | | _than.changeResult() |
| | | _than.checkShowState() |
| | | } |
| | | }) |
| | | }).catch(error=>{ |
| | |
| | | <style> |
| | | .packageInspect-detail { |
| | | width: 100%; |
| | | height: 490px; |
| | | height: 520px; |
| | | padding: 10px 20px; |
| | | display: flex; |
| | | border: 1px solid #ddd; |
| | | background-color: #fff; |
| | | margin-top: 10px; |
| | | box-sizing: border-box; |
| | | flex-wrap: wrap; |
| | | /* display: flex; |
| | | flex-wrap: wrap; */ |
| | | } |
| | | |
| | | .packageInspect-result { |