| src/views/business/inspectionTask/components/EditInspectionItem.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/inspectionTask/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/materialOrder/copperOrder.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/productOrder/components/addInspectionDia.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/productOrder/components/auxiliaryWireCore.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/productOrder/components/cable-config.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/business/productOrder/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/statisticalCharts/itemInspectionAnalysis/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/views/business/inspectionTask/components/EditInspectionItem.vue
@@ -84,7 +84,7 @@ prop: "inspectionItemSubclass", }, { label: "条件", label: "试验条件", minWidth: "120px", prop: "radius", }, src/views/business/inspectionTask/index.vue
@@ -46,17 +46,17 @@ :disabled="(scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5) && checkPermi(['update:product:onPlan'])" @click="editInspection(scope.row)">修改检验值</el-button> <el-button type="text" size="small" :disabled="( scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5 || (scope.row.userName && !scope.row.userName.includes(nickName)) )" @click="handleInspection(scope.row)">检验</el-button> scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5 || (scope.row.userName && !scope.row.userName.includes(nickName)) )" @click="handleInspection(scope.row)">检验</el-button> <el-button type="text" size="small" :disabled="( scope.row.userName == null || scope.row.insState == 5 || scope.row.insState == 3 || (scope.row.userName && !scope.row.userName.includes(nickName)) )" @click="handleConnect(scope.row)" v-if="tabIndex != 0">交接</el-button> scope.row.userName == null || scope.row.insState == 5 || scope.row.insState == 3 || (scope.row.userName && !scope.row.userName.includes(nickName)) )" @click="handleConnect(scope.row)" v-if="tabIndex != 0">交接</el-button> <el-button type="text" size="small" @click="viewInspectInfo(scope.row)">原始记录</el-button> <el-popover placement="bottom" trigger="hover" style="margin-left: 6px"> <template #reference> @@ -64,21 +64,20 @@ </template> <div> <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null || (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px" type="text" size="small" @click="download(scope.row)">下载报告</el-button> (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px" type="text" size="small" @click="download(scope.row)">下载报告</el-button> <el-upload ref='upload' :action="javaApi + '/insReport/inReport'" :before-upload="beforeUpload" :data="{ id: scope.row.insReportId }" :headers="uploadHeader" :on-error="onError" :on-success="handleSuccessUp" :show-file-list="false" style="display: inline;margin: 0 6px" accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'> <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null || (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small" type="text">上传</el-button> (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small" type="text">上传</el-button> </el-upload> <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null || (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small" (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small" @click="handleRestore(scope.row)">还原</el-button> <el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null || (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small" (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small" @click="handleIssued(scope.row)">查看报告</el-button> </div> </el-popover> @@ -88,8 +87,8 @@ </div> <el-dialog :visible.sync="claimVisible" title="提示" width="400px"> 是否认领委托编号<span style="color: #33c130">{{ sampleUserForm.entrustCode }}</span>的任务 sampleUserForm.entrustCode }}</span>的任务 <span slot="footer" class="dialog-footer"> <el-button @click="claimVisible = false">取 消</el-button> <el-button :loading="loading" type="primary" @click="confirmClaim">确 定</el-button> @@ -472,7 +471,7 @@ { label: "检验子项", prop: "inspectionItemSubclass" }, { label: "单位", prop: "unit" }, { label: "样品型号", prop: "model", mergeCol: true }, { label: "条件", prop: "radius" }, { label: "试验条件", prop: "radius" }, { label: "电缆标识", prop: "cableTag" }, { label: "试验要求", prop: "tell" }, { label: "检验结果", prop: "lastValue" }, src/views/business/materialOrder/copperOrder.vue
@@ -242,7 +242,7 @@ </span> </template> </el-table-column> <el-table-column label="条件" min-width="140" prop="radius" show-overflow-tooltip></el-table-column> <el-table-column label="试验条件" min-width="140" prop="radius" show-overflow-tooltip></el-table-column> <el-table-column label="试验方法" min-width="120" prop="methodS" show-overflow-tooltip> <template slot="header" slot-scope="scope"> <div style="display: flex;align-items: center;flex-direction: column;font-size: 14px"> src/views/business/materialOrderComponents/materialOrder/dataLookVisible.vue
@@ -47,7 +47,7 @@ { label: '检验子项', prop: 'inspectionItemSubclass' }, { label: '单位', prop: 'unit' }, { label: '样品型号', prop: 'model' }, { label: '条件', prop: 'radius' }, { label: '试验条件', prop: 'radius' }, { label: '电缆标识', prop: 'cableTag' }, { label: '试验要求', prop: 'tell' }, { label: '检验结果', prop: 'lastValue' }, src/views/business/productOrder/components/addInspectionDia.vue
@@ -1,14 +1,9 @@ <template> <div> <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="dialogVisible" title="添加检验项" <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="dialogVisible" title="添加检验项" width="80%"> <el-table ref="sampleTable" :data="sampleList" border class="el-table sampleTable" highlight-current-row :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" max-height="400px" tooltip-effect="dark"> :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" max-height="400px" tooltip-effect="dark"> <el-table-column align="center" label="序号" type="index" width="65"></el-table-column> <el-table-column align="center" label="样品名称" min-width="100" prop="sample"> <template slot-scope="scope"> @@ -18,19 +13,18 @@ <el-table-column align="center" label="样品编号" min-width="100" prop="sampleCode"> <template slot-scope="scope"> <el-input v-model="scope.row.sampleCode" clearable disabled placeholder="不填写则系统自动生成" size="small"></el-input> size="small"></el-input> </template> </el-table-column> <el-table-column align="center" label="样品型号" min-width="60" prop="model"> <template slot-scope="scope"> <el-input v-model="scope.row.model" clearable disabled placeholder="不填写则系统自动生成" size="small"></el-input> <el-input v-model="scope.row.model" clearable disabled placeholder="不填写则系统自动生成" size="small"></el-input> </template> </el-table-column> <el-table-column align="center" label="检验标准" min-width="100" prop="standardMethodListId"> <template slot-scope="scope"> <el-input v-model="scope.row.standardMethodListId" clearable disabled placeholder="不填写则系统自动生成" size="small"></el-input> size="small"></el-input> </template> </el-table-column> <el-table-column label="操作" min-width="120"> @@ -40,65 +34,63 @@ </el-table-column> </el-table> </el-dialog> <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="itemDialogVisible" title="添加检验项" width="90%"> <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" max-height="580px" tooltip-effect="dark" @selection-change="selectProduct"> <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :visible.sync="itemDialogVisible" title="添加检验项" width="90%"> <el-table ref="productTable" v-loading="getProductLoad" :data="productList" :row-class-name="tableRowClassName" border class="el-table" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" max-height="580px" tooltip-effect="dark" @selection-change="selectProduct"> <el-table-column type="selection" width="65"></el-table-column> <el-table-column label="检验项分类" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column> <el-table-column label="检验项分类" min-width="140" prop="inspectionItemClass" show-overflow-tooltip></el-table-column> <el-table-column label="检验项" min-width="140" prop="inspectionItem" show-overflow-tooltip></el-table-column> <el-table-column label="检验项子项" min-width="140" prop="inspectionItemSubclass" show-overflow-tooltip></el-table-column> <el-table-column label="检验项子项" min-width="140" prop="inspectionItemSubclass" show-overflow-tooltip></el-table-column> <el-table-column label="要求值" min-width="220px" prop="ask"> <template slot-scope="scope"> <el-input v-if="active==1&&scope.row.inspectionValueType!='5'" v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="要求值" size="small" type="textarea"></el-input> <el-input v-if="active == 1 && scope.row.inspectionValueType != '5'" v-model="scope.row.ask" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="要求值" size="small" type="textarea"></el-input> <span v-else> <template >{{ scope.row.ask }}</template> </span> <template>{{ scope.row.ask }}</template> </span> </template> </el-table-column> <el-table-column label="要求描述" min-width="220px" prop="tell"> <template slot-scope="scope"> <el-input v-if="active==1" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="要求描述" size="small" type="textarea"></el-input> <el-input v-if="active == 1" v-model="scope.row.tell" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="要求描述" size="small" type="textarea"></el-input> <span v-else> <template >{{ scope.row.tell }}</template> </span> <template>{{ scope.row.tell }}</template> </span> </template> </el-table-column> <el-table-column label="条件" min-width="140" prop="radius" show-overflow-tooltip> <template slot-scope="scope"> <el-input v-if="active==1&&!scope.row.inspectionItem.includes('高温压力试验')" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="条件" size="small" type="textarea"> <el-input v-if="active == 1 && !scope.row.inspectionItem.includes('高温压力试验')" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="试验条件" size="small" type="textarea"> </el-input> <el-select v-else-if="scope.row.inspectionItem.includes('高温压力试验') && active==1" v-model="scope.row.radius" clearable placeholder="条件" size="small"> <el-option v-for="(a,i) in JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option> <el-select v-else-if="scope.row.inspectionItem.includes('高温压力试验') && active == 1" v-model="scope.row.radius" clearable placeholder="条件" size="small"> <el-option v-for="(a, i) in JSON.parse(scope.row.radiusList)" :key="i" :label="a" :value="a"></el-option> </el-select> <span v-else>{{scope.row.radius}}</span> <span v-else>{{ scope.row.radius }}</span> </template> </el-table-column> <el-table-column label="线芯" min-width="120" prop="cableTag" show-overflow-tooltip> <template slot-scope="scope"> <el-input v-if="active==1" v-model="scope.row.cableTag" :autosize="{ minRows: 1, maxRows: 3}" clearable placeholder="线芯" size="small" type="textarea"></el-input> <el-input v-if="active == 1" v-model="scope.row.cableTag" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="线芯" size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="试验方法" min-width="120" prop="methodS" show-overflow-tooltip></el-table-column> <el-table-column label="计量单位" prop="unit" show-overflow-tooltip width="100"></el-table-column> <el-table-column label="单价" prop="price" show-overflow-tooltip width="100"></el-table-column> <el-table-column label="区间" min-width="120" prop="section" show-overflow-tooltip></el-table-column> <el-table-column :filter-method="filterHandler" :filters="filters" label="子实验室" min-width="130" prop="sonLaboratory" show-overflow-tooltip></el-table-column> <el-table-column :filter-method="filterHandler" :filters="filters" label="子实验室" min-width="130" prop="sonLaboratory" show-overflow-tooltip></el-table-column> </el-table> <span slot="footer" class="dialog-footer"> <el-button @click="itemDialogVisible = false">取 消</el-button> <el-button @click="itemDialogVisible = false">取 消</el-button> <el-button :loading="upLoad" type="primary" @click="submitList">确 定</el-button> </span> </el-dialog> @@ -106,7 +98,7 @@ </template> <script> import {addOmitOrderProduct, getProductTreeBySampleId, getSampleByOrderId} from "@/api/business/productOrder"; import { addOmitOrderProduct, getProductTreeBySampleId, getSampleByOrderId } from "@/api/business/productOrder"; export default { name: "addInspectionDia", @@ -122,8 +114,8 @@ productList: [], // 检验项表格数据 productListSelected: [], // 选择的检验项表格 active: 1, methodS:null, id:null, methodS: null, id: null, filters: [], upLoad: false, } @@ -135,15 +127,15 @@ methods: { getDataList(row) { this.dialogVisible = true getSampleByOrderId({insOrderId: row.id}).then(res => { getSampleByOrderId({ insOrderId: row.id }).then(res => { this.sampleList = res.data }) }, openAddItemDia (row) { openAddItemDia(row) { this.itemDialogVisible = true this.getProductLoad = true this.id=row.id getProductTreeBySampleId({insSampleId: row.id}).then(res => { this.id = row.id getProductTreeBySampleId({ insSampleId: row.id }).then(res => { this.getProductLoad = false this.productList = res.data }).catch(err => { @@ -160,14 +152,14 @@ } this.productListSelected = val }, submitList () { submitList() { this.$confirm('确认添加此检验项?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }).then(() => { this.upLoad = true addOmitOrderProduct({insProductBindingList:this.productListSelected,insSampleId:this.id}).then(res => { addOmitOrderProduct({ insProductBindingList: this.productListSelected, insSampleId: this.id }).then(res => { this.upLoad = false this.$message.success('添加成功！') this.itemDialogVisible = false @@ -181,7 +173,7 @@ }); }); }, tableRowClassName({row, rowIndex}) { tableRowClassName({ row, rowIndex }) { if (row.state === 0) { return ''; } src/views/business/productOrder/components/auxiliaryWireCore.vue
@@ -13,8 +13,8 @@ :value="item.value"></el-option> </el-select> </el-form-item> <el-form-item label="检验标准" prop="standardMethodListId"> <el-select v-model="auxiliaryWireCore.standardMethodListId" disabled placeholder="请选择检验标准" size="small" <el-form-item label="检验标准" prop="standardMethodListIds"> <el-select v-model="auxiliaryWireCore.standardMethodListIds" disabled placeholder="请选择检验标准" size="small" @change="(value) => methodChange(value)" multiple> <el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id"> </el-option> @@ -65,7 +65,7 @@ size="small" type="textarea"></el-input> </template> </el-table-column> <el-table-column label="条件" min-width="140" prop="radius" show-overflow-tooltip> <el-table-column label="试验条件" min-width="140" prop="radius" show-overflow-tooltip> <template slot-scope="scope"> <el-input v-if="!scope.row.inspectionItem.includes('高温压力试验')" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="要求描述" size="small" type="textarea"> @@ -124,7 +124,7 @@ tree: '', standards: [], auxiliaryWireCore: { standardMethodListId: [], standardMethodListIds: [], insProduct: [], num: [], modelNum: '' @@ -266,7 +266,7 @@ } catch (e) { } }) this.auxiliaryWireCore.standardMethodListId = this.sampleSelectionList[0].standardMethodListId this.auxiliaryWireCore.standardMethodListIds = this.sampleSelectionList[0].standardMethodListId // 查询检测标准下拉框选项 if (this.auxiliaryWireCore.insProduct.length > 0) { this.productList = this.auxiliaryWireCore.insProduct src/views/business/productOrder/components/cable-config.vue
@@ -13,8 +13,8 @@ :value="item.value"></el-option> </el-select> </el-form-item> <el-form-item label="检验标准" prop="standardMethodListId"> <el-select v-model="insulating.standardMethodListId" disabled placeholder="请选择检验标准" size="small" <el-form-item label="检验标准" prop="standardMethodListIds"> <el-select v-model="insulating.standardMethodListIds" disabled placeholder="请选择检验标准" size="small" @change="(value) => methodChange(value)" multiple> <el-option v-for="item in standards" :key="item.id" :label="item.code" :value="item.id"> </el-option> @@ -71,7 +71,7 @@ <span v-else>{{ scope.row.ask }}</span> </template> </el-table-column> <el-table-column label="条件" min-width="140" prop="radius" show-overflow-tooltip> <el-table-column label="试验条件" min-width="140" prop="radius" show-overflow-tooltip> <template slot-scope="scope"> <el-input v-if="active == 1 && (isAskOnlyRead || isSpecial) && !scope.row.inspectionItem.includes('高温压力试验')" v-model="scope.row.radius" :autosize="{ minRows: 1, maxRows: 3 }" clearable placeholder="要求描述" @@ -141,7 +141,7 @@ tree: '', standards: [], insulating: { standardMethodListId: [], standardMethodListIds: [], insProduct: [], num: [] }, @@ -252,7 +252,7 @@ } } catch (e) { } }) this.insulating.standardMethodListId = this.sampleSelectionList[0].standardMethodListId this.insulating.standardMethodListIds = this.sampleSelectionList[0].standardMethodListId // 查询检测标准下拉框选项 if (this.insulating.insProduct.length > 0) { this.productList = this.insulating.insProduct src/views/business/productOrder/index.vue
@@ -579,7 +579,7 @@ { label: '检验子项', prop: 'inspectionItemSubclass' }, { label: '单位', prop: 'unit' }, { label: '样品型号', prop: 'model' }, { label: '条件', prop: 'radius' }, { label: '试验条件', prop: 'radius' }, { label: '电缆标识', prop: 'cableTag' }, { label: '试验要求', prop: 'tell' }, { label: '检验结果', prop: 'lastValue' }, src/views/statisticalCharts/itemInspectionAnalysis/index.vue
@@ -248,7 +248,7 @@ { label: '检验子项', prop: 'inspectionItemSubclass' }, { label: '单位', prop: 'unit' }, { label: '样品型号', prop: 'model' }, { label: '条件', prop: 'radius' }, { label: '试验条件', prop: 'radius' }, { label: '电缆标识', prop: 'cableTag' }, { label: '试验要求', prop: 'tell' }, { label: '检验结果', prop: 'lastValue' },
