| src/components/do/b1-ins-order/add.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-inspect-order-plan/Inspection.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/b1-inspect-order-plan.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/components/view/b1-sample.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/do/b1-ins-order/add.vue
@@ -351,6 +351,17 @@ <el-input size="small" :placeholder="active>1 ? '' : '请输入'" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input> </div> </el-col> <el-col class="search_thing" :span="6"> <div class="search_label"><span class="required-span">* </span>约定时间：</div> <div class="search_input"> <el-date-picker v-model="addObj.appointed" type="date" placeholder="选择日期" size="small" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker> </div> </el-col> <el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;"> <div class="search_label">备注：</div> <div class="search_input"> @@ -1015,6 +1026,7 @@ departmentLimsId:null, departmentLims:null, partNo: null, // 零件号 appointed:null, }, sample: { sampleCode: null, @@ -1670,6 +1682,8 @@ this.$message.error('请输入样品名称') } else if (!this.sampleList.every(m => m.model)) { this.$message.error('请输入样品型号') }else if (!this.addObj.appointed) { this.$message.error('请选择约定时间') } else if (!this.sampleList.every(m => m.standardMethodListId&&m.standardMethodListId.length>0)) { this.$message.error('请选择检验标准') } else if(this.addObj.formType&&this.addObj.formType!='其他成品'&&!this.addObj.issueUser){ src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -260,7 +260,7 @@ <el-col :span="12" style="padding-left: 20px;text-align: left;" :class="{noShow:noBack}">检验单详情 </el-col> <el-col :span="12" style="text-align: right;"> <el-button size="small" type="primary" @click="versionDialogVisible=true">检验模板切换</el-button> <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1">检验模板切换</el-button> <el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">样品切换</el-button> <el-button size="small" type="primary" @click="taskVisible=true" v-show="!isLook">任务切换</el-button> <el-button size="small" type="primary" @click="handleSubmit" v-if="state==1" src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -1,21 +1,21 @@ <template> <div class="circuit-parameters"> <el-divider></el-divider> <el-row :gutter="5" style="width: calc(100% - 1px);margin-bottom: 10px;"> <el-row :gutter="8" style="width: calc(100% - 1px);margin-bottom: 10px;"> <el-col :span="17"> <el-row> <el-col :span="23" style="display: flex;flex-wrap: wrap;"> <table border="1" cellpadding="10" style="margin: 0 10px 10px 0;" v-for="(item,index) in insProductNew" :key="index + 'ppp'" v-show="isMore?true:(index<3?true:false)"> <table border="1" cellpadding="10" style="margin: 4px 10px 10px 0;width: 32%;" v-for="(item,index) in insProductNew" :key="index + 'ppp'" v-show="isMore?true:(index<3?true:false)"> <tr> <td style="text-align: center;background: #F0F1F5;"> <el-tooltip effect="dark" :content="item.inspectionItemSubclass" placement="top-start"><span style="display: inline-block;width: 95px;" class="single-line-ellipsis">{{ item.inspectionItemSubclass }}</span> </el-tooltip> </td> <td> <el-input size="small" placeholder="设备名称" v-model="item.equipName" style="width: 95px;" readonly></el-input> <el-input size="small" placeholder="设备名称" v-model="item.equipName" readonly></el-input> </td> <td> <el-select v-model="item.equipValue" placeholder="设备编码" size="small" style="width: 95px;" :disabled="state>1" @focus="methodFocus(item)" @change="m=>handleEquip(m,item)"> <el-select v-model="item.equipValue" placeholder="设备编码" size="small" :disabled="state>1" @focus="methodFocus(item)" @change="m=>handleEquip(m,item)"> <el-option v-for="m in item.equipOptions" :key="m.value" @@ -34,11 +34,11 @@ </el-row> </el-col> <el-col :span="7"> <div style="display: flex;align-items: center;justify-content: flex-end;" class="btns" v-if="!isLook"> <el-button type="primary" size="small" @click="addList(allBandList,'频段')" :disabled="state>1">添加频段</el-button> <el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'删除频段')" :disabled="state>1">删除频段</el-button> <el-button type="primary" size="small" @click="addList(angleList)" :disabled="state>1">添加角度</el-button> <el-button size="small" @click="deleteList(angleList.length-1,angleList)" :disabled="state>1">删除角度</el-button> <div style="display: flex;align-items: center;justify-content: flex-end;flex-wrap: wrap;" class="btns" v-if="!isLook"> <el-button type="primary" size="small" @click="addList(allBandList,'频段')" :disabled="state>1" style="margin: 4px;">添加频段</el-button> <el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'删除频段')" :disabled="state>1" style="margin: 4px;">删除频段</el-button> <el-button type="primary" size="small" @click="addList(angleList)" :disabled="state>1" style="margin: 4px;">添加角度</el-button> <el-button size="small" @click="deleteList(angleList.length-1,angleList)" :disabled="state>1" style="margin: 4px;">删除角度</el-button> </div> </el-col> </el-row> @@ -70,8 +70,8 @@ :value="item.value"> </el-option> </el-select> <el-button type="primary" size="small" @click="addList(h.projectList,'互调')" style="margin-left: 16px;" :disabled="state>1" v-show="!isLook">添加互调</el-button> <el-button size="small" @click="deleteList(0,h.projectList,'互调')" :disabled="state>1" v-show="!isLook">删除互调</el-button> <el-button type="primary" size="small" @click="addList(h.projectList,'互调')" style="margin-left: 16px;" :disabled="state>1" v-show="!isLook&&intermodulationNum>0">添加互调</el-button> <el-button size="small" @click="deleteList(0,h.projectList,'互调')" :disabled="state>1" v-show="!isLook&&intermodulationNum>0">删除互调</el-button> <el-button type="primary" size="small" @click="save(h,y)" :disabled="state>1" :loading="loading[y]" v-show="!isLook">保 存</el-button> </div> <el-divider></el-divider> @@ -100,8 +100,8 @@ </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button> @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> @@ -151,8 +151,8 @@ </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button> @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> @@ -194,8 +194,8 @@ </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button> @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> @@ -343,7 +343,8 @@ allBandList:[],//频段 insProductNew:[], isMore:false, loading:{} loading:{}, intermodulationNum:0,//互调检验项目的数量 }; }, watch: { @@ -351,8 +352,17 @@ angleList(val) { this.allBandList.forEach(item => { item.projectList.forEach(m => { if(m.angleList.length!==val.length){ m.angleList = JSON.parse(JSON.stringify(this.angleList)) // 添加角度 for(let i=0;i<val.length;i++){ if(!m.angleList[i]){ this.$set(m.angleList,i, {value:''}) } } // 删除角度 for(let i=0;i<m.angleList.length;i++){ if(!val[i]){ m.angleList.splice(i,1) } } if(m.inspectionItemSubclass.includes('耦合度')){ for(let i = 0;i<m.angleList.length;i++){ @@ -377,7 +387,7 @@ } }) }) console.log(this.allBandList) // console.log(this.allBandList) }, currentNum(val) { this.initData() @@ -401,6 +411,9 @@ // 处理项目 this.insProductNew = JSON.parse(JSON.stringify(this.insProduct)).filter(m=>m.inspectionItem.includes('电路试验')) this.insProductNew.forEach(async item => { if(item.inspectionItemSubclass.includes('互调')){ this.intermodulationNum++ } // 获取设备列表 item.equipOptions = await this.getEquipOptions(item) }) src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -1,21 +1,21 @@ <template> <div class="circuit-parameters"> <el-divider></el-divider> <el-row :gutter="5" style="width: calc(100% - 1px);margin-bottom: 10px;"> <el-row :gutter="8" style="width: calc(100% - 1px);margin-bottom: 10px;"> <el-col :span="17"> <el-row> <el-col :span="23" style="display: flex;flex-wrap: wrap;"> <table border="1" cellpadding="10" style="margin: 0 10px 10px 0;" v-for="(item,index) in insProductNew" :key="index + 'ppp'" v-show="isMore?true:(index<3?true:false)"> <table border="1" cellpadding="10" style="margin: 4px 10px 10px 0;width: 32%;" v-for="(item,index) in insProductNew" :key="index + 'ppp'" v-show="isMore?true:(index<3?true:false)"> <tr> <td style="text-align: center;background: #F0F1F5;"> <el-tooltip effect="dark" :content="item.inspectionItemSubclass" placement="top-start"><span style="display: inline-block;width: 95px;" class="single-line-ellipsis">{{ item.inspectionItemSubclass }}</span> </el-tooltip> </td> <td> <el-input size="small" placeholder="设备名称" v-model="item.equipName" style="width: 95px;" readonly></el-input> <el-input size="small" placeholder="设备名称" v-model="item.equipName" readonly></el-input> </td> <td> <el-select v-model="item.equipValue" placeholder="设备编码" size="small" style="width: 95px;" :disabled="state>1" @focus="methodFocus(item)" @change="m=>handleEquip(m,item)"> <el-select v-model="item.equipValue" placeholder="设备编码" size="small" :disabled="state>1" @focus="methodFocus(item)" @change="m=>handleEquip(m,item)"> <el-option v-for="m in item.equipOptions" :key="m.value" @@ -35,10 +35,10 @@ </el-col> <el-col :span="7" v-if="!isLook"> <div style="display: flex;align-items: center;justify-content: flex-end;" class="btns"> <el-button type="primary" size="small" @click="addList(allBandList,'频段')" :disabled="state>1">添加频段</el-button> <el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'删除频段')" :disabled="state>1">删除频段</el-button> <el-button type="primary" size="small" @click="addList(angleList)" v-if="!(state>1)&&intermodulationNum>0">添加角度</el-button> <el-button size="small" @click="deleteList(angleList.length-1,angleList)" v-if="!(state>1)&&intermodulationNum>0">删除角度</el-button> <el-button type="primary" size="small" @click="addList(allBandList,'频段')" :disabled="state>1" style="margin: 4px;">添加频段</el-button> <el-button size="small" @click="deleteList(allBandList.length-1,allBandList,'删除频段')" :disabled="state>1" style="margin: 4px;">删除频段</el-button> <el-button type="primary" size="small" @click="addList(angleList)" v-if="!(state>1)&&intermodulationNum>0" style="margin: 4px;">添加角度</el-button> <el-button size="small" @click="deleteList(angleList.length-1,angleList)" v-if="!(state>1)&&intermodulationNum>0" style="margin: 4px;">删除角度</el-button> </div> </el-col> </el-row> @@ -100,8 +100,8 @@ </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button> @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr> @@ -151,8 +151,8 @@ </td> <td :rowspan="n.angleList.length+1"> <el-button icon="el-icon-minus" circle size="mini" type="danger" @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1"></el-button> @click="deleteList(n.portList.length-1,n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> <el-button icon="el-icon-plus" circle size="mini" type="primary" @click="addList(n.portList)" :disabled="state>1" style="margin: 5px;"></el-button> </td> </tr> <tr v-for="(item,index) in n.angleList" :key="index + 'eee'"> src/components/view/b1-inspect-order-plan.vue
@@ -803,7 +803,6 @@ this.$message.error('该二维码有误') }else{ this.sampleCode = code console.log(3333,this.sampleCode) } }catch(e){ this.$message.error('该二维码有误') src/components/view/b1-sample.vue
@@ -255,7 +255,7 @@ <el-col class="search_thing" :span="24"> <div class="search_label"><span class="required-span">* </span>样品编号：</div> <div class="search_input"> <el-input v-model="sampleCode" size="small"></el-input> <el-input v-model="sampleCode" size="small" @change="sampleCodeChange"></el-input> </div> </el-col> </el-row> @@ -287,7 +287,7 @@ <el-col class="search_thing" :span="24"> <div class="search_label"><span class="required-span">* </span>样品编号：</div> <div class="search_input"> <el-input v-model="sampleCode" size="small"></el-input> <el-input v-model="sampleCode" size="small" @change="sampleCodeChange"></el-input> </div> </el-col> </el-row> @@ -446,7 +446,6 @@ methods: { keyup(e){ var code = '' // console.log(3333,this.codeInfo,e) try{ code = JSON.parse(this.codeInfo) if(code==null||code==undefined||code==''){ @@ -798,6 +797,11 @@ this.isDetail = true; } }) }, sampleCodeChange(e){ if(e){ this.sampleCode = e.replaceAll('"','') } } } } src/main.js
@@ -20,11 +20,11 @@ //本地 // Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80"; // const javaApi = 'http://127.0.0.1:8001'; // const javaApi = 'http://172.20.10.5:8001'; const javaApi = 'http://172.20.10.5:8001'; // //通信测试库 // Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080"; const javaApi = 'http://10.1.13.77:8001'; // const javaApi = 'http://10.1.13.77:8001'; //云 // Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
