From 2e9370979f871bf47f6dc145c49d7bf32ffa4b51 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期一, 03 六月 2024 09:08:02 +0800 Subject: [PATCH] 完成光纤配置进行检验 --- src/components/view/b1-inspection-order.vue | 471 ++++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 338 insertions(+), 133 deletions(-) diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue index a062c6a..b81c76c 100644 --- a/src/components/view/b1-inspection-order.vue +++ b/src/components/view/b1-inspection-order.vue @@ -9,22 +9,24 @@ height: 80px; display: flex; align-items: center; + overflow: hidden; } .search_thing { - width: 350px; display: flex; align-items: center; + height: 50px; + width: 230px; } .search_label { - width: 110px; + width: 90px; font-size: 14px; text-align: right; } .search_input { - width: calc(100% - 110px); + width: calc(100% - 90px); } .table { @@ -54,7 +56,7 @@ border-radius: 8px 0 0 8px; } - .tab li:nth-child(4) { + .tab li:nth-child(5) { border-radius: 0 8px 8px 0; } @@ -75,35 +77,77 @@ <el-row class="title"> <el-col :span="12" style="padding-left: 20px;">妫�楠屼笅鍗�</el-col> <el-col :span="12" style="text-align: right;"> - <el-button size="medium" type="primary" @click="playOrder(1)">涓嬪崟</el-button> + <el-button size="medium" type="primary" @click="playOrder(1)" v-if="addPower">涓嬪崟</el-button> </el-col> </el-row> </div> - <div class="search"> - <div class="search_thing"> - <div class="search_label">濮旀墭缂栧彿锛�</div> - <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable - v-model="componentData.entity.deviceName" @keyup.enter.native="refreshTable()"></el-input></div> - </div> - <div class="search_thing"> - <div class="search_label">鏍峰搧鍚嶇О锛�</div> - <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable - v-model="componentData.entity.specificationModel" @keyup.enter.native="refreshTable()"></el-input></div> - </div> - <div class="search_thing" style="padding-left: 30px;"> - <el-button size="small" @click="refresh()">閲� 缃�</el-button> - <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button> - </div> + <div class="search" :style="`height: ${more?130:80}px;`"> + <el-row :gutter="10" style="width: 100%;"> + <el-col :span="20" style="display: flex;flex-wrap: wrap;"> + <div class="search_thing" style="width: 20%;"> + <div class="search_label">濮旀墭缂栧彿锛�</div> + <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable + v-model="componentData.entity.entrustCode" @keyup.enter.native="refreshTable()"></el-input></div> + </div> + <div class="search_thing" style="width: 20%;"> + <div class="search_label">鏍峰搧鍚嶇О锛�</div> + <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable + v-model="componentData.entity.sampleType" @keyup.enter.native="refreshTable()"></el-input></div> + </div> + <div class="search_thing" style="width: 20%;"> + <div class="search_label">鏍峰搧鍨嬪彿锛�</div> + <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable + v-model="componentData.entity.sampleModel" @keyup.enter.native="refreshTable()"></el-input></div> + </div> + <div class="search_thing" style="width: 20%;"> + <div class="search_label">鏍峰搧缂栧彿锛�</div> + <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable + v-model="componentData.entity.sampleCode" @keyup.enter.native="refreshTable()"></el-input></div> + </div> + <div class="search_thing" style="width: 20%;"> + <div class="search_label">涓嬪崟鏃堕棿锛�</div> + <div class="search_input"> + <el-date-picker style="width:100%" v-model="componentData.entity.createTime" + type="date" + size="small" + format="yyyy-MM-dd" + value-format="yyyy-MM-dd HH:mm:ss" + clearable + placeholder="閫夋嫨鏃ユ湡"> + </el-date-picker> + </div> + </div> + <div class="search_thing" style="width: 20%;" v-if="more"> + <div class="search_label">涓嬪崟浜猴細</div> + <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable + v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div> + </div> + <div class="search_thing" style="width: 20%;" v-if="more"> + <div class="search_label">宸ョ▼鍚嶇О锛�</div> + <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable + v-model="componentData.entity.engineering" @keyup.enter.native="refreshTable()"></el-input></div> + </div> + <div class="search_thing" style="width: 20%;" v-if="more"> + <div class="search_label">鐢熶骇鍗曚綅锛�</div> + <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable + v-model="componentData.entity.production" @keyup.enter.native="refreshTable()"></el-input></div> + </div> + </el-col> + <el-col :span="4"> + <div class="search_thing"> + <el-button type="text" :icon="!more?'el-icon-arrow-down':'el-icon-arrow-up'" style="color: #3A7BFA;" @click="more=!more">{{!more?'鏇村':'鏀惰捣'}}</el-button> + <el-button size="small" @click="refresh()">閲� 缃�</el-button> + <el-button size="small" type="primary" @click="refreshTable()">鏌� 璇�</el-button> + </div> + </el-col> + </el-row> </div> <div class="table"> <ul class="tab"> <li v-for="(m,i) in tabList" :key="i" :class="{active:i==tabIndex}" @click="handleTab(m,i)">{{m.label}}</li> </ul> - <!-- 璇硶 瀛愮粍浠堕�氳繃 this.$emit +浼犲叆鏂规硶鍚� 璋冪敤鐖剁粍浠舵柟娉� 渚嬪 this.$emit锛坰electAllByOne锛� 灏遍渶鍦ㄧ埗缁勪欢澹版槑骞朵紶鍏� @selectAllByOne="selectAllByOne"--> - <ValueTable ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData" - :key="upIndex" style="height: calc(100% - 44px)" @selectAllByOne="selectAllByOne" - @handleDataLook="handleDataLook" @download="download" @handleVerify="handleVerify" @handlEquash="handlEquash" - @handleIssued="handleIssued" /> + <ValueTable :style="getStyle()" ref="ValueTable" :url="$api.insOrder.selectInsOrderParameter" :componentData="componentData" + :key="'b'+upIndex" /> </div> <!-- 瀹℃牳 --> <el-dialog title="涓嬪崟瀹℃牳" :visible.sync="verifyDialogVisible" width="30%" :before-close="handleClose"> @@ -128,7 +172,7 @@ <!-- 鎾ら攢 --> <el-dialog title="涓嬪崟鎾ら攢" :visible.sync="quashDialogVisible" width="30%" :before-close="handleClose"> <p style="font-size:16px;color:#333333" v-if="!isQuash">濮旀墭缂栧彿<span - style="color:#34BD66">ZTMS2023071001</span>鐨勪俊鎭槸鍚︽挙閿�</p> + style="color:#34BD66">{{this.insOrderRow.entrustCode}}</span>鐨勪俊鎭槸鍚︽挙閿�</p> <el-form :label-position="labelPosition" :model="formData" label-width="150px" ref="ruleForm" v-else> <el-form-item label="璇疯緭鍏ユ挙閿�鍘熷洜锛�"> <el-input v-model="formData.specificationModel" size="small" style="width:60%"></el-input> @@ -146,22 +190,28 @@ </span> </el-dialog> <!-- 涓嬪彂 --> - <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="30%" :before-close="handleClose"> - <el-form :label-position="labelPosition" :model="formData2" label-width="150px" ref="ruleForm"> - <el-form-item label="绾﹀畾鏃堕棿锛�"> - <el-date-picker style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="formData2.appointed2" - type="date" size="small" placeholder="閫夋嫨鏃堕棿"> - </el-date-picker> - </el-form-item> - <el-form-item > - </el-form-item> - <el-form-item label="鎸囨淳浜哄憳锛�"> - <el-select v-model="formData2.getUserMenu" placeholder="璇烽�夋嫨" size="small" style="width:100%"> - <el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value"> - </el-option> - </el-select> - </el-form-item> - </el-form> + <el-dialog title="妫�楠屽垎閰�" :visible.sync="issuedDialogVisible" width="400px" :before-close="handleClose"> + <div class="body" style="max-height: 60vh;"> + <el-row> + <el-col class="search_thing" style="width: 95%;"> + <div class="search_label"><span class="required-span">* </span>绾﹀畾鏃堕棿锛�</div> + <div class="search_input"> + <el-date-picker size="small" v-model="distributeData.appointed" type="date" placeholder="閫夋嫨鏃ユ湡" + value-format="yyyy-MM-dd" style="width: 100%;" format="yyyy-MM-dd"> + </el-date-picker> + </div> + </el-col> + <el-col class="search_thing" style="width: 95%;"> + <div class="search_label"><span class="required-span" v-show="distributeData.type==2">* </span>鎸囨淳浜哄憳锛�</div> + <div class="search_input"> + <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" clearable filterable> + <el-option v-for="(item,i) in personList" :key="i" :label="item.label" :value="item.value"> + </el-option> + </el-select> + </div> + </el-col> + </el-row> + </div> <span slot="footer" class="dialog-footer"> <el-row> <el-button @click="handleClose2">鍙� 娑�</el-button> @@ -169,15 +219,15 @@ </el-row> </span> </el-dialog> - <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="70%" :before-close="handleClose2"> - <div style="height: 70vh;overflow-y: auto;"> - <ValueTable ref="ValueTableDataLook" :url="$api.deviceScope.selectDeviceParameter" - :componentData="componentDataDataLook" :key="upIndex" /> + <el-dialog title="鏁版嵁鏌ョ湅" :visible.sync="dataDialogVisible" width="80%"> + <div style="height: 70vh;overflow-y: auto;" v-if="dataDialogVisible"> + <ValueTable ref="ValueTableDataLook" :url="$api.insOrder.selectSampleAndProductByOrderId" + :componentData="componentDataDataLook"/> </div> </el-dialog> </div> - <div style="width: 100%;height: 100%;" v-if="active == 1"> - <Add/> + <div style="width: 100%;height: 100%;" v-if="active >0"> + <Add :active="active" :currentId="currentId" v-if="active<4" /> </div> </div> </template> @@ -199,18 +249,29 @@ verifyDialogVisible: false, quashDialogVisible: false, issuedDialogVisible: false, - issuedDialogVisible2: false, dataDialogVisible: false, formData: {}, - formData0:{}, - formData1:{}, - formData2:{}, + formData0: {}, + formData1: {}, + distributeData: { + orderId: '', + sampleId: '', + appointed: '', + userId: '' + }, // 浜哄憳鍒楄〃 personList: [], - labelPosition: 'right', componentData: { entity: { - state: 1, + entrustCode: null, + sampleType: null, + sampleName: null, + sampleModel: null, + sampleCode: null, + state: 0, + name:null, + engineering:null, + production:null, orderBy: { field: 'id', order: 'asc' @@ -223,28 +284,47 @@ id: 'dataLook', font: '鏁版嵁鏌ョ湅', type: 'text', - method: 'handleDataLook' + method: 'handleDataLook', + disabFun: (row, index) => { + return row.state != 1 && row.state != 4 + } }, { id: 'download', font: '鎶ュ憡涓嬭浇', type: 'text', - method: 'download' + method: 'download', + disabFun: (row, index) => { + return row.state != 4 || row.reportId == null + } }, { id: 'verify', font: '瀹℃牳', type: 'text', - method: 'handleVerify' + method: 'handleVerify', + disabFun: (row, index) => { + return row.state != 0 + } }, { id: 'quash', font: '鎾ら攢', type: 'text', - method: 'handlEquash' + method: 'handlEquash', + disabFun: (row, index) => { + return row.state != 1 && row.state != 0 + } }, { - id: 'issued', - font: '涓嬪彂', + font: '鍒嗛厤', type: 'text', - method: 'handleIssued' + method: 'handleIssued', + disabFun: (row, index) => { + return row.state != 1 || row.sendTime != null + } }], + linkEvent: { + entrustCode: { + method: 'selectAllByOne' + } + }, tagField: { type: { select: [{ @@ -261,21 +341,49 @@ label: '绱ф��' }] }, - }, - linkEvent:{ - deviceName:{ - id: 'details', - method:'selectAllByOne', - } + createUser: { + select: [] + }, + orderType: { + select: [] + }, + processing: { + select: [{ + value: 1, + label: '瀹為獙瀹ゅ鐞�' + },{ + value: 0, + label: '濮旀墭鍗曚綅鍙栧洖' + }] + }, + isLeave: { + select: [{ + value: 1, + label: '鐣欐牱' + },{ + value: 0, + label: '涓嶇暀鏍�' + }] + }, + send: { + select: [{ + value: 1, + label: '鑷彇' + },{ + value: 0, + label: '鍏朵粬' + }] + } }, selectField: {}, - requiredAdd: ['largeCategory', 'subclass', 'deviceName', 'internalCode', 'specificationModel', 'manufacturer'], - requiredUp: ['largeCategory', 'subclass', 'deviceName', 'internalCode', 'specificationModel', 'manufacturer'] + requiredAdd: [], + requiredUp: [] }, componentDataDataLook: { entity: { + id: 0, orderBy: { - field: 'id', + field: 'sampleCode', order: 'asc' } }, @@ -284,23 +392,38 @@ select: false, do: [], tagField: { - deviceStatus: { + insState: { + select: [] + }, + insResult: { select: [{ - value: 0, - type: 'success', - label: '姝e父' - }, { value: 1, - type: 'warning', - label: '鎶ュ簾' - }, { - value: 2, - type: 'danger', - label: '淇濅慨' + label: '鍚堟牸', + type: 'success' + },{ + value: 0, + label: '涓嶅悎鏍�', + type: 'danger' }] } }, selectField: {}, + spanConfig:{ + rows:[ + { + name:'sampleCode', + index:0 + }, + { + name:'sample', + index:1 + }, + { + name:'model', + index:2 + } + ] + }, requiredAdd: [], requiredUp: [] }, @@ -309,12 +432,15 @@ addPower: true, upLoad: false, tabList: [{ - label: '妫�楠屽鐞�', + label: '寰呭鏍�', + value: 0 + }, { + label: '寰呮楠�', value: 1 }, { - label: '寰呭鏍�', - value: 0 + label: '宸叉楠�', + value: 4 }, { label: '閫�鍥�', @@ -326,19 +452,25 @@ }, ], tabIndex: 0, - active: 1 + active: 0, //1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝4锛氬厜绾ら厤缃�,榛樿涓�0 + currentId: null, + more:false, + insOrderRow:{} } }, mounted() { this.entityCopy = this.HaveJson(this.componentData.entity) this.getPower() + this.getUserMenu() this.getAuthorizedPerson() + this.getInsStateDicts() + this.selectEnumByCategoryForOrderType() }, methods: { - getAuthorizedPerson(){ - this.$axios.get(this.$api.deviceScope.selectDevicePrincipal).then(res => { + getAuthorizedPerson() { + this.$axios.get(this.$api.user.getUserMenu).then(res => { let data = [] - res.data.forEach(a=>{ + res.data.forEach(a => { data.push({ label: a.name, value: a.id @@ -346,7 +478,7 @@ }) this.personList = data }) - }, + }, refreshTable() { this.$refs['ValueTable'].selectList() }, @@ -360,23 +492,24 @@ let up = false let del = false let add = false + let revoke = false for (var i = 0; i < power.length; i++) { - if (power[i].menuMethod == 'upDeviceParameter') { + if (power[i].menuMethod == 'upInsOrder') { up = true } - if (power[i].menuMethod == 'delDeviceParameter') { - del = true - } - if (power[i].menuMethod == 'addDeviceParameter') { + if (power[i].menuMethod == 'addInsOrder') { add = true } - } - if (!del) { - this.componentData.do.splice(1, 1) + if (power[i].menuMethod == 'updateStatus') { + revoke = true + } } if (!up) { - this.componentData.do.splice(0, 1) + this.componentData.do.splice(4, 1) } + if (!revoke) { + this.componentData.do.splice(3, 1) + } this.addPower = add }, handleClose() { @@ -395,39 +528,70 @@ }, // 璇︽儏 selectAllByOne(row) { - //鎵撳紑寮规 - this.dialogVisible = true; - //row = 鐐瑰嚮瀵瑰簲琛屽�� - //澶嶅埗缁檉ormData - this.formData = this.HaveJson(row); + this.active = 2; + // console.log(row); + // //鎵撳紑寮规 + // this.dialogVisible = true; + // //row = 鐐瑰嚮瀵瑰簲琛屽�� + // //澶嶅埗缁檉ormData + // this.formData = this.HaveJson(row); + this.currentId = row.id }, // 鏁版嵁鏌ョ湅 handleDataLook(row) { + this.componentDataDataLook.entity.id = row.id this.dataDialogVisible = true; }, // 涓嬭浇鎶ュ憡 download(row) { - - }, + let url = row.urlS?row.urlS:row.url; + if(url){ + url = url.split('.')[0]+'.pdf' + const link = document.createElement('a'); + link.href = this.javaApi + url; + link.target = '_blank'; + document.body.appendChild(link); + link.click(); + } + }, // 瀹℃牳 handleVerify(row) { - this.verifyDialogVisible = true; + // this.verifyDialogVisible = true; + this.active = 3; + this.currentId = row.id }, // 鎾ら攢 handlEquash(row) { this.quashDialogVisible = true; + this.insOrderRow=row }, // 涓嬪彂 handleIssued(row) { this.issuedDialogVisible = true; - this.issuedDialogVisible2 = true; + this.$axios.post(this.$api.insOrder.selectOrderManDay, { + id: row.id + }).then(res => { + this.distributeData.orderId = row.id + this.distributeData.sampleId = row.sampleId + this.distributeData.appointed = res.data + this.distributeData.type = row.type + }) }, - submitForm2(){ + submitForm2() { + if (this.distributeData.appointed == null || this.distributeData.appointed == '') { + this.$message.error('绾﹀畾鏃堕棿鏈~鍐�') + return + } + if(this.distributeData.type==2&&(this.distributeData.userId==null||this.distributeData.userId=='')){ + this.$message.error('鎸囨淳浜哄憳鏈~鍐�') + return + } this.upLoad = true; - this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData2, { - headers: { - 'Content-Type': 'application/json' - } + this.$axios.post(this.$api.insOrder.upInsOrder, { + orderId: this.distributeData.orderId, + sampleId: this.distributeData.sampleId, + appointed: this.distributeData.appointed, + userId: this.distributeData.userId }).then(res => { if (res.code === 201) { this.upLoad = false @@ -435,40 +599,40 @@ } this.$message.success('淇敼鎴愬姛') this.upLoad = false + this.issuedDialogVisible = false this.refreshTable() - this.dialogVisible = false }).catch(e => { this.$message.error('淇敼澶辫触') - this.dialogVisible = false this.upLoad = false }) }, submitForm() { this.upLoad = true; + if (this.tabIndex==1){ + this.axios.put(this.$api.insOrder.updateInspected+"?id="+this.insOrderRow.id).then(res=>{ + if (res.code===200){ + this.upLoad=false + this.quashDialogVisible=false + this.refreshTable() + this.$message.success("鏇存柊鎴愬姛") + } + }) + }else{ + this.axios.put(this.$api.insOrder.updateStatus+"?id="+this.insOrderRow.id).then(res=>{ + if (res.code===200){ + this.upLoad = false + this.quashDialogVisible = false + this.refreshTable() + this.$message.success("鏇存柊鎴愬姛") + } + }) + } let authorizedPerson = this.formData.authorizedPerson.length > 0 ? this.formData.authorizedPerson.join(',') : '' delete this.formData.createTime delete this.formData.updateTime delete this.formData.createUser delete this.formData.updateUser this.formData.authorizedPerson = authorizedPerson - this.$axios.post(this.$api.insOrder.getDeviceManager, this.formData, { - headers: { - 'Content-Type': 'application/json' - } - }).then(res => { - if (res.code === 201) { - this.upLoad = false - return - } - this.$message.success('淇敼鎴愬姛') - this.upLoad = false - this.refreshTable() - this.dialogVisible = false - }).catch(e => { - this.$message.error('淇敼澶辫触') - this.dialogVisible = false - this.upLoad = false - }) }, // 涓嬪崟 playOrder(num) { @@ -478,7 +642,48 @@ this.tabIndex = i; this.componentData.entity.state = m.value this.refreshTable() - } + }, + getUserMenu() { + this.$axios.get(this.$api.user.getUserMenu).then(res => { + let data = [] + res.data.forEach(a => { + data.push({ + label: a.name, + value: a.id + }) + }) + this.componentData.tagField.createUser.select = data + }) + }, + getInsStateDicts() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "妫�楠屼换鍔$姸鎬�" + }).then(res => { + let data = res.data + this.insStateList = data + data.forEach(ele => { + //0:寰呮楠� 1:妫�楠屼腑 2:宸叉楠� 3:寰呭鏍� 4:澶嶆牳鏈�氳繃 5:澶嶆牳閫氳繃 + if (['2', '5'].includes(ele.value)) { + ele.type = 'success' + } else if (['1', '3'].includes(ele.value)) { + ele.type = 'warning' + } else if (['0', '4'].includes(ele.value)) { + ele.type = 'danger' + } + }) + this.componentDataDataLook.tagField.insState.select = data + }) + }, + selectEnumByCategoryForOrderType() { + this.$axios.post(this.$api.enums.selectEnumByCategory, { + category: "妫�楠岀被鍒�" + }).then(res => { + this.componentData.tagField.orderType.select = res.data + }) + }, + getStyle(){ + return 'height: calc(100% - '+(this.more?'94':'44')+'px)' + } } } </script> -- Gitblit v1.9.3