样式与文字调整

master
FCD 2 weeks ago
parent 85833af3d0
commit fdf19604ab

@ -176,10 +176,10 @@
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod"> <el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod">
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="projectRuleName" /> <el-table-column label="检验项目" align="center" prop="projectRuleName" width="90" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="400"/> <el-table-column label="标准要求" align="center" prop="checkStandard" width="350"/>
<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/> <el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
<el-table-column label="实测结果" align="center" prop="actualValue" width="130"/> <el-table-column label="实测结果" align="center" prop="actualValue" />
<el-table-column label="判定" align="center" prop="status" width="70"> <el-table-column label="判定" align="center" prop="status" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/> <dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
@ -192,14 +192,14 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>--> <el-table-column label="不良数量" align="center" prop="defectQuality" width="80"/>-->
<el-table-column label="附件" align="center" prop="files" width="120"> <!-- <el-table-column label="附件" align="center" prop="files" width="120">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-image v-for="(item,index) in scope.row.files" :key="index" <!-- <el-image v-for="(item,index) in scope.row.files" :key="index"-->
:src="item.fileAddress" <!-- :src="item.fileAddress"-->
style="width: 100px; height: 100px" <!-- style="width: 100px; height: 100px"-->
:fit="fit" /> <!-- :fit="fit" />-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> </el-table>
</el-col> </el-col>
</el-row> </el-row>

@ -666,7 +666,7 @@
<el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod" ><!----> <el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod" ><!---->
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="left" prop="projectRuleName" width="150"/> <el-table-column label="检验项目" align="left" prop="projectRuleName" width="150"/>
<el-table-column label="内容" align="left" prop="ruleName" width="300"/> <el-table-column label="内容" align="left" prop="ruleName" />
<!-- <!--
<el-table-column label="检测项类型" align="center" prop="propertyCode" width="100"> <el-table-column label="检测项类型" align="center" prop="propertyCode" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -676,7 +676,7 @@
/> />
</template> </template>
</el-table-column>--> </el-table-column>-->
<el-table-column label="实际检测结果" align="center" prop="actualValue" width="250"/> <el-table-column label="实际检测结果" align="center" prop="actualValue" />
<el-table-column label="判定" align="center" prop="status" width="50" <el-table-column label="判定" align="center" prop="status" width="50"
:formatter="checkStatusFormate" :formatter="checkStatusFormate"
/> />
@ -830,11 +830,11 @@
<el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod" ><!----> <el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod" ><!---->
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="left" prop="projectRuleName" /> <el-table-column label="检验项目" align="left" prop="projectRuleName" />
<el-table-column label="内容" align="left" prop="ruleName" width="300"/> <el-table-column label="内容" align="left" prop="ruleName"/>
<el-table-column label="判定" align="center" prop="status" width="50" <el-table-column label="判定" align="center" prop="status"
:formatter="checkStatusFormate" :formatter="checkStatusFormate"
/> />
<el-table-column label="附件" align="center" prop="files" width="200"> <el-table-column label="附件" align="center" prop="files">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image v-for="(item,index) in scope.row.files" :key="index" <el-image v-for="(item,index) in scope.row.files" :key="index"
:src="item.fileAddress" :src="item.fileAddress"

@ -62,6 +62,25 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="定量检测项" prop="projectNoArray">
<el-select
v-model="queryParams.projectNoArray"
multiple
collapse-tags
filterable
:filter-method="handleProjectFilter"
placeholder="请选择或搜索定量检测项"
clearable
>
<!-- 遍历过滤后的选项列表 -->
<el-option
v-for="item in filteredProjectOptions"
:key="item.recordId"
:label="item.ruleName"
:value="item.recordId"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="定量检测项" prop="projectNoArray"> <el-form-item label="定量检测项" prop="projectNoArray">
<el-select <el-select
v-model="queryParams.projectNoArray" v-model="queryParams.projectNoArray"
@ -221,7 +240,7 @@
:visible.sync="open" :visible.sync="open"
width="1300px" width="1300px"
append-to-body append-to-body
> >
<el-button type="primary" round v-if="title == 'CPK分析'" @click="handleExportCPK">CPK</el-button> <el-button type="primary" round v-if="title == 'CPK分析'" @click="handleExportCPK">CPK</el-button>
<div <div
@ -303,6 +322,7 @@ export default {
workCenterList: [], workCenterList: [],
checkTypeList: [], checkTypeList: [],
projectNoOptions: [], projectNoOptions: [],
filteredProjectOptions:[],
// //
form: {}, form: {},
// //
@ -366,6 +386,7 @@ export default {
getProjectListFunc(val) { getProjectListFunc(val) {
getProjectOptionList(val).then((response) => { getProjectOptionList(val).then((response) => {
this.projectNoOptions = response; this.projectNoOptions = response;
this.filteredProjectOptions = response
}); });
}, },
indexMethod(index) { indexMethod(index) {
@ -1041,6 +1062,22 @@ export default {
}; };
myChart1.setOption(option3); myChart1.setOption(option3);
}, },
handleProjectFilter(keyword){
this.projectSearchKeyword = keyword.trim();
}
},
computed: {
//
filteredProjectOptions() {
//
if (!this.projectSearchKeyword) {
return this.projectNoOptions;
}
// ruleName
return this.projectNoOptions.filter(item =>
item.ruleName.toLowerCase().includes(this.projectSearchKeyword.toLowerCase())
);
}
}, },
}; };
</script> </script>

@ -65,21 +65,39 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="定量检测项" prop="projectId"> <el-form-item label="定量检测项" prop="projectNoArray">
<el-select <el-select
v-model="queryParams.projectId" v-model="queryParams.projectId"
collapse-tags collapse-tags
placeholder="必选定量检测项" filterable
:filter-method="handleProjectFilter"
placeholder="请选择或搜索定量检测项"
clearable
> >
<!-- 遍历过滤后的选项列表 -->
<el-option <el-option
v-for="item in projectNoOptions" v-for="item in filteredProjectOptions"
:key="item.recordId" :key="item.recordId"
:label="item.ruleName" :label="item.ruleName"
:value="item.recordId" :value="item.recordId"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="定量检测项" prop="projectId">-->
<!-- <el-select-->
<!-- v-model="queryParams.projectId"-->
<!-- collapse-tags-->
<!-- placeholder="必选定量检测项"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in projectNoOptions"-->
<!-- :key="item.recordId"-->
<!-- :label="item.ruleName"-->
<!-- :value="item.recordId"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="生产时间" prop="incomeTimeArray"> <el-form-item label="生产时间" prop="incomeTimeArray">
<el-date-picker <el-date-picker
v-model="queryParams.incomeTimeArray" v-model="queryParams.incomeTimeArray"
@ -116,7 +134,7 @@
>导出</el-button >导出</el-button
> >
</el-col> </el-col>
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList"
@ -129,7 +147,7 @@
<el-table-column label="线体名称" align="center" prop="equipmentName" width="90" /> <el-table-column label="线体名称" align="center" prop="equipmentName" width="90" />
<el-table-column label="产品编码" align="center" prop="materialCode" width="110" :formatter="productCodeFormate"/> <el-table-column label="产品编码" align="center" prop="materialCode" width="110" :formatter="productCodeFormate"/>
<el-table-column label="产品名称" align="center" prop="materialName" width="180" :show-overflow-tooltip="true"/> <el-table-column label="产品名称" align="center" prop="materialName" width="180" :show-overflow-tooltip="true"/>
<el-table-column label="订单号" align="center" prop="workorderCodeSap" width="100" :formatter="orderCodeFormate"/> <el-table-column label="订单号" align="center" prop="workorderCodeSap" width="100" :formatter="orderCodeFormate"/>
<!--<el-table-column label="工单号" align="center" prop="workorderCode" width="130"/>--> <!--<el-table-column label="工单号" align="center" prop="workorderCode" width="130"/>-->
<el-table-column label="批次号" align="center" prop="batchNo" width="150" /> <el-table-column label="批次号" align="center" prop="batchNo" width="150" />
@ -160,7 +178,7 @@
:visible.sync="open" :visible.sync="open"
width="1300px" width="1300px"
append-to-body append-to-body
> >
<el-button type="primary" round v-if="title == 'CPK分析'" @click="handleExportCPK">CPK</el-button> <el-button type="primary" round v-if="title == 'CPK分析'" @click="handleExportCPK">CPK</el-button>
<div <div
@ -243,6 +261,7 @@ export default {
workCenterList: [], workCenterList: [],
checkTypeList: [], checkTypeList: [],
projectNoOptions: [], projectNoOptions: [],
projectSearchKeyword:"",
// //
form: {}, form: {},
// //
@ -435,9 +454,21 @@ export default {
`DLMxTable_${new Date().getTime()}.xlsx` `DLMxTable_${new Date().getTime()}.xlsx`
); );
}, },
// handleProjectFilter(keyword){
cancel() { this.projectSearchKeyword = keyword.trim();
this.open = false; }
},
computed: {
//
filteredProjectOptions() {
//
if (!this.projectSearchKeyword) {
return this.projectNoOptions;
}
// ruleName
return this.projectNoOptions.filter(item =>
item.ruleName.toLowerCase().includes(this.projectSearchKeyword.toLowerCase())
);
} }
}, },
}; };

@ -2,6 +2,13 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="生产批号" prop="incomeBatchNo">
<el-input
v-model="queryParams.incomeBatchNo"
placeholder="请输入生产批号"
clearable
/>
</el-form-item>
<el-form-item label="样品名称" prop="materialName"> <el-form-item label="样品名称" prop="materialName">
<el-input <el-input
v-model="queryParams.materialName" v-model="queryParams.materialName"

@ -41,7 +41,7 @@
v-hasPermi="['wms:outorder:export']">导出</el-button> v-hasPermi="['wms:outorder:export']">导出</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" @click="clickShowPostingList('ZC')"></el-button> <el-button type="success" plain icon="el-icon-edit" size="mini" @click="clickShowPostingList('ZC')"></el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" @click="clickShowPostingList('X')"></el-button> <el-button type="success" plain icon="el-icon-edit" size="mini" @click="clickShowPostingList('X')"></el-button>

Loading…
Cancel
Save