| src/components/experiment/template_testReport/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/utils/GlobalClickMixin.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/passRateStatistics/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/experiment/planAssignments/plan.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/laboratory/measure/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/laboratory/personnel/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/standardLibrary/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/components/experiment/template_testReport/index.vue
@@ -276,7 +276,7 @@ <span>备注</span><br> <span>Remark </span> </td> <td colspan="5"></td> <td colspan="5">{{reportData.notes }}</td> </tr> <tr> <td> @@ -288,7 +288,7 @@ <span>检验</span><br> <span>Tester</span> </td> <td colspan="2"></td> <td colspan="2">{{ reportData.iUserName }}</td> </tr> <tr> <td> @@ -454,21 +454,21 @@ </td> </tr> </thead> <tr v-for="(item, index) in table" :key="index"> <tr v-for="(item, index) in reportData.equipment" :key="index"> <td> <span>{{ item.id }}</span> <span>{{ item.eId }}</span> </td> <td colspan="2"> <span>{{ item.equipment_name }}</span> <span>{{ item.eName }}</span> </td> <td> <span>{{ item.type }}</span><br> <span>{{ item.eType }}</span><br> </td> <td colspan="2"> <span>{{ item.factory_number }}</span> <span>{{ item.eCode }}</span> </td> <td colspan="2"> <span>{{ item.validity }}</span> <span>{{ item.validty }}</span> </td> </tr> </table> src/utils/GlobalClickMixin.js
@@ -10,13 +10,13 @@ methods: { $_handleGlobalClick(event) { if (event.target.tagName === 'SPAN'||event.target.tagName==='BUTTON') { if(sessionStorage.getItem('user')===undefined&&sessionStorage.getItem('user')===null){ return; } let user=JSON.parse(sessionStorage.getItem('user')); if(user.account === 'admin'&&user.sessionLayerId === 'f5c8bcb7d5a0fd27e2323280f7e98cad'){ return; } // if(sessionStorage.getItem('user')===undefined&&sessionStorage.getItem('user')===null){ // return; // } // let user=JSON.parse(sessionStorage.getItem('user')); // if(user.account === 'admin'&&user.sessionLayerId === 'f5c8bcb7d5a0fd27e2323280f7e98cad'){ // return; // } // console.log(this.$router.currentRoute); // console.log(user.role.roleMenuList); // console.log(event.target.innerText); src/views/experiment/passRateStatistics/index.vue
@@ -27,7 +27,7 @@ </el-option> </el-select> </el-form-item> <div class="rightBtn"> <div class="rightBtn" style="position: absolute;top: 90px;right: 20px;"> <el-form-item> <el-button type="primary" @click="clear" plain size="mini">清空</el-button> <el-button type="primary" @click="search" size="mini">查询</el-button> src/views/experiment/planAssignments/plan.vue
@@ -121,7 +121,7 @@ <el-row style="line-height: 50px;"> <el-col :span="4" style="font-size: 14px;text-align: right;">人员:</el-col> <el-col :span="16" :offset="1"> <el-select v-model="upData.checker" size="medium" clearable style="width: 100%;"> <el-select @change="selectChecker" v-model="upData.checker" size="medium" clearable style="width: 100%;"> <el-option v-for="(a, ai) in users" :key="ai" :label="a.name" :value="a.id"></el-option> </el-select> </el-col> @@ -268,14 +268,20 @@ .children.length }, openUpDia(row) { // console.log(row); this.upDia = true this.upData = { id: row.code, checker: null, device: null } this.upData.checker=row.uId this.upData.device=row.isuId }, submitUpData() { // console.log(this.upData.device); // console.log(this.devices); // return; if (this.upData.checker == null || this.upData.checker == '') { this.$message.error('人员未分配') return @@ -293,6 +299,9 @@ this.selectDataList() }) }, selectChecker(){ // console.log(this.upData.checker); }, openUpInsDia(row) { this.upInsDia = true this.upData = this.HaveJson(row) src/views/laboratory/measure/index.vue
@@ -8,6 +8,7 @@ </el-input> </el-form-item> <el-form-item v-if="this.radioValue === 1"> <!-- <el-col :span="12"><span hidden>2121</span></el-col> --> <el-button type="primary" @click="searchPlan">查询</el-button> </el-form-item> <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '仪器设备名称:' : '设备名称'" @@ -126,7 +127,7 @@ size="mini" plain>返回</el-button> <div v-if="addBtn" style="display: flex;justify-content: center;width: 10%;position: fixed;top: 43px;right: 14px; z-index: 1000;"> <el-button @click="addTop = -82; addBtn = false" size="mini" style="width: 60px;">返回</el-button> <el-button @click="addTop = -82; addBtn = false;lookVisible= false" size="mini" style="width: 60px;">返回</el-button> <el-button size="mini" @click="measureAdd" style="width: 60px;" type="primary">保存</el-button> </div> </div> @@ -396,7 +397,8 @@ }); this.lookVisible = false this.addBtn = false this.limitGetPlanMeasureInstrument() // this.limitGetPlanMeasureInstrument() this.getPlanPageList() }, async handleSizeChangePlan(num) { this.pageSizePlan = num @@ -520,7 +522,7 @@ this.reset() }, async getPlanPageList() { console.log(111); // console.log(111); let param = { currentPage: this.currentPage, pageSize: this.pageSize, src/views/laboratory/personnel/index.vue
@@ -203,7 +203,7 @@ }, ], roleId: [{ required: true, message: "请输入权限(0或1)", message: "请选择人员权限", trigger: "blur" }, ], }, src/views/standardLibrary/index.vue
@@ -65,22 +65,22 @@ <el-dialog class="addTree" title="添加标准指标" width="28%" :visible.sync="addTreeFormVisible"> <el-form v-model="addTreeForm" label-position="top"> <el-form-item label="标准类型"> <el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions" <el-cascader v-model="addTreeForm.addTypeArr" :options="formTypeOptions" :props="{ ...defaultProps, checkStrictly: true }" clearable @change="changeCascader"/> </el-form-item> <el-form-item v-show="addTreeForm.addTypeArr.length < 2" label="物料名称"> <el-input v-model="addTreeForm.materialName" /> <el-input @change="changeSample" v-model="addTreeForm.materialName" /> </el-form-item> <el-form-item v-show="addTreeForm.addTypeArr.length < 3" label="执行标准"> <el-input v-model="addTreeForm.standardName" /> <el-input v-model="addTreeForm.standardName" /> </el-form-item> <el-form-item v-show="addTreeForm.addTypeArr.length < 4" label="规格型号"> <el-input v-model="addTreeForm.specificationsName" /> <el-input v-model="addTreeForm.specificationsName" /> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="subAddTreeForm">确 定</el-button> <el-button @click="addTreeFormVisible = false">取 消</el-button> <el-button @click="clear">取 消</el-button> </div> </el-dialog> </div> @@ -144,6 +144,41 @@ }, mounted() {}, methods: { clear(){ this.addTreeFormVisible = false; this.addTreeForm.addTypeArr=[]; this.addTreeForm.specificationsName=''; this.addTreeForm.materialName='' this.addTreeForm.standardName='' }, changeSample(){ // console.log(this.standardTree); // console.log(this.addTreeForm); // console.log(this.addTreeForm.addTypeArr.length); let selectType=this.standardTree.filter(item=>{ return item.id===this.addTreeForm.addTypeArr[0] })[0]; if(this.addTreeForm.addTypeArr.length==1){ let samples=selectType.children.filter(item=>{ return item.name===this.addTreeForm.materialName })[0] if(samples===undefined||samples===[]){ this.$message({ message: '请先在基础数据中添加该【'+this.addTreeForm.materialName+'】样品', type: 'warning' }); return false; } } return true }, oneSize(){}, twoSize(){ return true; }, threeSize(){ return true; }, async initSelect() { this.options = []; this.versionValue = ""; @@ -331,6 +366,17 @@ ); }, async subAddTreeForm() { if(this.addTreeForm.addTypeArr.length==0){ this.$message({ message: '请先选择标准类型！', type: 'warning' }); return } let handelerSample=this.changeSample() if(!handelerSample){ return; } let res = null; try { switch (this.addTreeForm.addTypeArr.length) { @@ -360,8 +406,11 @@ this.addTreeFormVisible = false; this.getStandardTree(); this.getTableByClick(this.selectData, this.versionValue); this.addTreeForm=null this.addTreeForm.addTypeArr=[] this.addTreeForm.addTypeArr=[]; this.addTreeForm.specificationsName='' this.addTreeForm.materialName='' this.addTreeForm.standardName='' // console.log(this.addTreeForm); }, changeCascader(data) { this.addTreeForm.addTypeArr = data; @@ -393,7 +442,6 @@ }); } }); console.log(this.tableData); }, // 表格树全部选中配置 // 全选/取消选操作
