Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

界面调整

Browse Source
yangwl
zhaoxiaolin 3 months ago
parent 03d9240177
commit e8ad5d296a
6 changed files with 77 additions and 70 deletions
Show Stats Download Patch File Download Diff File

2
src/views/quality/checkType/index.vue
Unescape Escape View File

@ -94,7 +94,7 @@
type="text" type="text"
icon="el-icon-connection" icon="el-icon-connection"
@click="handleBind(scope.row)" @click="handleBind(scope.row)"
>绑定</el-button> >分配检检员</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

1
src/views/quality/checkTypeProject/index.vue
Unescape Escape View File

@ -206,6 +206,7 @@
<el-form-item label="下差值" prop="downDiff"> <el-form-item label="下差值" prop="downDiff">
<el-input v-model="form.downDiff" placeholder="请输入下差值" /> <el-input v-model="form.downDiff" placeholder="请输入下差值" />
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-select v-model="form.unit" placeholder="请选择单位" > <el-select v-model="form.unit" placeholder="请选择单位" >
<el-option <el-option

35
src/views/quality/incomeReport/index.vue
Unescape Escape View File

@ -111,7 +111,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -124,7 +124,7 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-button <el-button
class="print-btn" class="print-btn"
size="mini" size="mini"
type="primary" type="primary"
@ -185,14 +185,14 @@
<el-input v-model="form.supplierName" disabled/> <el-input v-model="form.supplierName" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应编码" prop="supplierCode"> <el-form-item label="供应编码" prop="supplierCode">
<el-input v-model="form.supplierCode" disabled/> <el-input v-model="form.supplierCode" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="来料数量" prop="quality"> <el-form-item label="来料数量" prop="quality">
<el-input type="number" v-model="form.quality" disabled/> <el-input type="number" v-model="form.quality" disabled/>
</el-form-item> </el-form-item>
@ -214,7 +214,7 @@
<el-input v-model="form.standardNo" disabled /> <el-input v-model="form.standardNo" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="报检日期" prop="createTime"> <el-form-item label="报检日期" prop="createTime">
<el-input v-model="form.createTime" disabled> <el-input v-model="form.createTime" disabled>
@ -229,33 +229,34 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" > <el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<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" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/> <el-table-column label="标准要求" align="center" prop="checkStandard" width="400"/>
<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="180"/> <el-table-column label="实测结果" align="center" prop="actualValue" width="130"/>
<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"/>
</template> </template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="不良类型" align="center" prop="defectCode" width="80"> <el-table-column label="不良类型" align="center" prop="defectCode" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span> <span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
</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>
@ -294,13 +295,13 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel">确 定</el-button> <el-button type="primary" @click="cancel">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -598,7 +599,7 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
margin-left: 10px; margin-left: 10px;
} }
.center-text { .center-text {
text-align: center; text-align: center;
} }
.report-logo { .report-logo {
@ -606,4 +607,4 @@ export default {
margin-left: 15px; margin-left: 15px;
height: 38px; height: 38px;
} }
</style> </style>

52
src/views/quality/inventoryReport/index.vue
Unescape Escape View File

@ -110,7 +110,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -123,7 +123,7 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-button <el-button
class="print-btn" class="print-btn"
size="mini" size="mini"
type="primary" type="primary"
@ -183,14 +183,14 @@
<el-input v-model="form.supplierName" disabled/> <el-input v-model="form.supplierName" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="供应编码" prop="supplierCode"> <el-form-item label="供应编码" prop="supplierCode">
<el-input v-model="form.supplierCode" disabled/> <el-input v-model="form.supplierCode" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="库存数量" prop="quality"> <el-form-item label="库存数量" prop="quality">
<el-input type="number" v-model="form.quality" disabled/> <el-input type="number" v-model="form.quality" disabled/>
</el-form-item> </el-form-item>
@ -212,7 +212,7 @@
<el-input v-model="form.sampleQuality" disabled /> <el-input v-model="form.sampleQuality" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="报检日期" prop="createTime"> <el-form-item label="报检日期" prop="createTime">
<el-input v-model="form.createTime" disabled> <el-input v-model="form.createTime" disabled>
@ -227,34 +227,35 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" > <el-table v-loading="loading" :data="checkProjectList" >
<el-table-column type="selection" width="50" align="center" /> <el-table-column type="selection" width="50" align="center" />
<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="ruleName" /> <el-table-column label="检验项目" align="center" prop="ruleName" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/> <el-table-column label="标准要求" align="center" prop="checkStandard" width="350"/>
<el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/> <!--<el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/>
<el-table-column label="单位" align="center" prop="unitCode" width="50"/> <el-table-column label="单位" align="center" prop="unitCode" width="50"/>-->
<el-table-column label="实测结果" align="center" prop="actualValue" width="160"/> <el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
<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"/>
</template> </template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="不良类型" align="center" prop="defectCode" width="80"> <el-table-column label="不良类型" align="center" prop="defectCode" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span> <span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
</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>
@ -263,12 +264,13 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="综合检验结论" prop="checkManName" label-width="100px"> <el-form-item label="综合检验结论" label-width="100px">
<el-col offset="6" span="6"> <el-col :span="6">
<el-checkbox disabled>合格</el-checkbox> <span v-if="this.checkResult=='Y'">√合格</span>
<span label="N" v-else>×不合格</span>
</el-col> </el-col>
<el-col offset="3" span="6"> <el-col :span="8">
<el-checkbox disabled>不合格</el-checkbox> 备注:判定合格打“√”，不合格打“×”
</el-col> </el-col>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -292,13 +294,13 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel">确 定</el-button> <el-button type="primary" @click="cancel">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -425,7 +427,7 @@ export default {
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
} }
listInventory(this.queryParams).then(response => { listInventory(this.queryParams).then(response => {
this.incomeList = response.rows; this.incomeList = response.rows;
this.total = response.total; this.total = response.total;
@ -468,7 +470,7 @@ export default {
updateTime: null, updateTime: null,
factoryCode: null, factoryCode: null,
delFlag: null, delFlag: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -586,7 +588,7 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
margin-left: 10px; margin-left: 10px;
} }
.center-text { .center-text {
text-align: center; text-align: center;
} }
.report-logo { .report-logo {
@ -594,4 +596,4 @@ export default {
margin-left: 15px; margin-left: 15px;
height: 38px; height: 38px;
} }
</style> </style>

44
src/views/quality/llAnalysisReport/index.vue
Unescape Escape View File

@ -22,7 +22,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-show="queryParams.ymdms=='yyyy'" label="检验时间"> <el-form-item v-show="queryParams.ymdms=='yyyy'" label="检验时间">
<el-date-picker <el-date-picker
v-model="queryParams.incomeTimeStr" v-model="queryParams.incomeTimeStr"
style="width: 230px" style="width: 230px"
type="year" type="year"
@ -38,8 +38,8 @@
<el-date-picker v-model="queryParams.incomeTimeStr" size="small" style="width: 230px" type="date" value-format="yyyy-MM-dd" placeholder="选择检验时间" <el-date-picker v-model="queryParams.incomeTimeStr" size="small" style="width: 230px" type="date" value-format="yyyy-MM-dd" placeholder="选择检验时间"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -103,7 +103,7 @@
</template> </template>
<script> <script>
import { getIncomeTableList,getTableHzTitleTh,getTableHzDataSC,getTableHzNoOkData,getDictData} from "@/api/quality/qcTable"; import { getIncomeTableList,getTableHzTitleTh,getTableHzDataSC,getTableHzNoOkDataSC,getDictData} from "@/api/quality/qcTable";
import moment from 'moment'; import moment from 'moment';
import * as echarts from "echarts"; import * as echarts from "echarts";
@ -139,7 +139,7 @@ export default {
checkType:'checkTypeLL', checkType:'checkTypeLL',
ymdms: 'dd', ymdms: 'dd',
incomeTimeStr: moment().format('YYYY-MM-DD'), incomeTimeStr: moment().format('YYYY-MM-DD'),
}, },
// 表单参数 // 表单参数
form: {}, form: {},
@ -173,7 +173,7 @@ export default {
// }, // },
], ],
tableThead:[ tableThead:[
], ],
tableTbody:[], tableTbody:[],
tableBlfx:[], tableBlfx:[],
@ -188,9 +188,9 @@ export default {
this.getTbody() this.getTbody()
this.getBlfx() this.getBlfx()
// }) // })
// this.getEchartsThl() // this.getEchartsThl()
}, },
created() { created() {
@ -207,7 +207,7 @@ export default {
let res=await getTableHzTitleTh({checkType:'checkTypeLL'}) let res=await getTableHzTitleTh({checkType:'checkTypeLL'})
console.log('resTh',res) console.log('resTh',res)
this.tableThead=res.columns1 this.tableThead=res.columns1
}, },
async getTbody(){ async getTbody(){
this.loading=true this.loading=true
@ -223,7 +223,7 @@ export default {
res.map((item,index)=>{ res.map((item,index)=>{
xData.push(item.timeCol), xData.push(item.timeCol),
yData.push(item.noOkRate) yData.push(item.noOkRate)
}) })
console.log('tableTbody',this.tableTbody) console.log('tableTbody',this.tableTbody)
this.loading=false this.loading=false
@ -233,7 +233,7 @@ export default {
let xdata=[] let xdata=[]
let ydata=[] let ydata=[]
let peiData=[] let peiData=[]
let res=await getTableHzNoOkData(this.queryParams) let res=await getTableHzNoOkDataSC(this.queryParams)
console.log('res不良分析',res) console.log('res不良分析',res)
res.map((item,index)=>{ res.map((item,index)=>{
var pDat={} var pDat={}
@ -296,7 +296,7 @@ export default {
rotate: _this.queryParams.ymdms=='mm'?50:0, rotate: _this.queryParams.ymdms=='mm'?50:0,
fontSize:11 fontSize:11
}, },
data: xData data: xData
}, },
yAxis: { yAxis: {
@ -311,7 +311,7 @@ export default {
} }
}, },
series: [ series: [
{ {
name:'成品包装不良率%', name:'成品包装不良率%',
data: yData, data: yData,
type: 'line', type: 'line',
@ -339,7 +339,7 @@ export default {
] ]
}; };
optionl && myChartl.setOption(optionl); optionl && myChartl.setOption(optionl);
}, },
getEchartsTl(xdata,ydata){ getEchartsTl(xdata,ydata){
var chartDoml = document.getElementById('echartTsl'); var chartDoml = document.getElementById('echartTsl');
@ -360,7 +360,7 @@ export default {
show:false, show:false,
inside:true, inside:true,
}, },
data: xdata data: xdata
}, },
yAxis: { yAxis: {
@ -370,7 +370,7 @@ export default {
}, },
}, },
series: [ series: [
{ {
name:'成品包装不良率%', name:'成品包装不良率%',
data: ydata, data: ydata,
type: 'bar', type: 'bar',
@ -397,7 +397,7 @@ export default {
] ]
}; };
option2l && myChart2l.setOption(option2l); option2l && myChart2l.setOption(option2l);
}, },
getEchartsThl(peiData){ getEchartsThl(peiData){
console.log('peiData',peiData) console.log('peiData',peiData)
@ -445,7 +445,7 @@ export default {
} }
] ]
} }
option3l && myChart3l.setOption(option3l); option3l && myChart3l.setOption(option3l);
}, },
// 表单重置 // 表单重置
reset() { reset() {
@ -480,7 +480,7 @@ export default {
this.getThead() this.getThead()
this.getTbody() this.getTbody()
this.getBlfx() this.getBlfx()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
@ -525,7 +525,7 @@ export default {
padding: 5px 0px; padding: 5px 0px;
font-weight: 600; font-weight: 600;
} }
} }
.top-right-table{ .top-right-table{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -549,7 +549,7 @@ export default {
font-weight: 600; font-weight: 600;
} }
} }
} }
} }
.bottom-echart{ .bottom-echart{
@ -616,4 +616,4 @@ export default {
} }
} }
</style> </style>

13
src/views/quality/qcProjectType/index.vue
Unescape Escape View File

@ -129,14 +129,17 @@
<el-table-column label="检验方式" align="center" prop="checkMode" :show-overflow-tooltip="true" width="200"/> <el-table-column label="检验方式" align="center" prop="checkMode" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="检验工具" align="center" prop="checkTool" /> <el-table-column label="检验工具" align="center" prop="checkTool" />
<el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/> <el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
<!--
<el-table-column label="单位" align="center" prop="unitCode" > <el-table-column label="单位" align="center" prop="unitCode" >
<template slot-scope="scope"><dict-tag :options="dict.type.unit" :value="scope.row.unitCode"/></template> <template slot-scope="scope"><dict-tag :options="dict.type.unit" :value="scope.row.unitCode"/></template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/> <el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/>
--> -->
<el-table-column label="合格下限" align="center" prop="downDiff" width="100"/> <el-table-column label="合格下限" align="center" prop="downDiff" width="100"/>
<el-table-column label="合格上限" align="center" prop="upperDiff" width="100"/> <el-table-column label="合格上限" align="center" prop="upperDiff" width="100"/>
</el-table-column>
<el-table-column label="检测项分类" align="center" prop="itemType" width="100" :formatter="itemTypeFormat" /> <el-table-column label="检测项分类" align="center" prop="itemType" width="100" :formatter="itemTypeFormat" />
<!--<el-table-column label="合格判定比例" align="center" prop="judgeRate" width="150"/>--> <!--<el-table-column label="合格判定比例" align="center" prop="judgeRate" width="150"/>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
@ -243,7 +246,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!--
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="单位" prop="unitCode"> <el-form-item label="单位" prop="unitCode">
@ -258,7 +261,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
-->
</template> </template>
<!-- <!--
<el-row> <el-row>
@ -275,7 +278,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>--> </el-row>-->
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="检测项分类" prop="itemType"> <el-form-item label="检测项分类" prop="itemType">
@ -577,7 +580,7 @@ export default {
}else{ }else{
this.$modal.msgError("此方案不允许修改"); this.$modal.msgError("此方案不允许修改");
} }
} }
} }
}; };

Write Preview
Loading…
Cancel
Save