zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
zty 2024-10-31 11:28:27 +08:00
parent 0dd7648593 9734d461cf
commit 30e24fd8f5
6 changed files with 41 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/assets/icons/Scan.vue Normal file
View File

@ -0,0 +1,8 @@
<template>
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24">
<g fill="none">
<path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z" />
<path fill="currentColor" d="M4 14.5A1.5 1.5 0 0 1 5.5 16v2.5H9a1.5 1.5 0 0 1 0 3H5A2.5 2.5 0 0 1 2.5 19v-3A1.5 1.5 0 0 1 4 14.5m16 0a1.5 1.5 0 0 1 1.493 1.356L21.5 16v3a2.5 2.5 0 0 1-2.336 2.495L19 21.5h-4a1.5 1.5 0 0 1-.144-2.993L15 18.5h3.5V16a1.5 1.5 0 0 1 1.5-1.5m0-4a1.5 1.5 0 0 1 .144 2.993L20 13.5H4a1.5 1.5 0 0 1-.144-2.993L4 10.5zm-11-8a1.5 1.5 0 0 1 .144 2.993L9 5.5H5.5V8a1.5 1.5 0 0 1-2.993.144L2.5 8V5a2.5 2.5 0 0 1 2.336-2.495L5 2.5zm10 0a2.5 2.5 0 0 1 2.495 2.336L21.5 5v3a1.5 1.5 0 0 1-2.993.144L18.5 8V5.5H15a1.5 1.5 0 0 1-.144-2.993L15 2.5z" />
</g>
</svg>
</template>

3
src/assets/icons/index.js
View File

@ -24,4 +24,5 @@ export { default as Zhixing } from './Zhixing.vue'
export { default as Zhizao } from './Zhizao.vue' export { default as Zhizao } from './Zhizao.vue'
export { default as Env } from './Env.vue' export { default as Env } from './Env.vue'
export { default as Elec } from './Elec.vue' export { default as Elec } from './Elec.vue'
export { default as Jcpz } from './Jcpz.vue' export { default as Jcpz } from './Jcpz.vue'
export { default as Scan } from './Scan.vue'

2
src/views/qm/process2.vue
View File

@ -122,7 +122,7 @@
></materials> ></materials>
</el-dialog> </el-dialog>
<el-dialog v-model="printVisible" width="1200px"> <el-dialog v-model="printVisible" width="1200px">
<print :baseData="rowItem" type="ptest_gx" @closePrint="printVisible=false"/> <print :baseData="rowItem" type="ptest_cj" @closePrint="printVisible=false"/>
</el-dialog> </el-dialog>
</el-container> </el-container>
</template> </template>

24
src/views/setting/print/A4.vue
View File

@ -163,7 +163,8 @@
<li class="export_ulli export_ulli_h"></li> <li class="export_ulli export_ulli_h"></li>
</ul> </ul>
<ul class="export_ul"> <ul class="export_ul">
<li class="export_ulli">{{ baseData.count_ok }}</li> <li class="export_ulli" v-if="type=='ptest_gx'">{{ baseData.count_ok }}</li>
<li class="export_ulli" v-else>{{ baseData.count_sampling_ok }}</li>
<li class="export_ulli">{{baseData.count_notok}}</li> <li class="export_ulli">{{baseData.count_notok}}</li>
<li class="export_ulli">{{ baseData.rate }}</li> <li class="export_ulli">{{ baseData.rate }}</li>
<li class="export_ulli"></li> <li class="export_ulli"></li>
@ -197,16 +198,16 @@
<li class="export_ulli">{{baseData.count_n_txd}}</li> <li class="export_ulli">{{baseData.count_n_txd}}</li>
</ul> </ul>
<ul class="export_ul" v-else> <ul class="export_ul" v-else>
<li class="export_ulli">{{baseData.count_notok_json.count_n_hd}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hd}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_qp}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_qp}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_swen}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_swen}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_bb}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_bb}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_hs}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_hs}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_md}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_md}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_xbb}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_xbb}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_wj}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_wj}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_yd}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_yd}}</li>
<li class="export_ulli">{{baseData.count_notok_json.count_n_txd}}</li> <li class="export_ulli" v-if="baseData.count_notok_json">{{baseData.count_notok_json.count_n_txd}}</li>
</ul> </ul>
</div> </div>
<!-- 尺寸检验/外观检验 --> <!-- 尺寸检验/外观检验 -->
@ -551,6 +552,7 @@
}; };
}, },
mounted() { mounted() {
console.log('this.baseData',this.baseData)
let that = this; let that = this;
that.printId = that.baseData.id; that.printId = that.baseData.id;
that.value = that.type+":"+that.printId; that.value = that.type+":"+that.printId;

16
src/views/template/scan.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<el-icon v-if="type=='info'" size="18" @click="open"><el-icon-files /></el-icon> <el-icon class="printIcon" v-if="type=='info'" size="18" @click="open"><component :is="'sc-icon-scan'" /></el-icon>
<el-button v-else type="primary" @click="open" style="margin-left: 10px;">扫码添加</el-button> <el-button v-else type="primary" @click="open" style="margin-left: 10px;">扫码添加</el-button>
<el-dialog <el-dialog
title="扫描二维码" title="扫描二维码"
@ -49,4 +49,16 @@ export default {
} }
} }
} }
</script> </script>
<style scoped>
.printIcon{
width: 38px;
height: 58px;
padding: 0 10px;
font-size: 19px;
color: rgb(145,149,162);
&:hover{
background-color: rgba(255, 255, 255, 0.1) !important;
}
}
</style>

6
src/views/wpm_gx/handover.vue
View File

@ -153,7 +153,7 @@
<el-button <el-button
link link
size="small" size="small"
v-if="scope.row.send_mgroup == mgroupId" v-if="scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept"
@click="table_print(scope.row)" @click="table_print(scope.row)"
type="success" type="success"
>打印</el-button >打印</el-button
@ -178,7 +178,7 @@
v-auth="'handover.update'" v-auth="'handover.update'"
type="primary" type="primary"
v-if=" v-if="
scope.row.send_mgroup == mgroupId && (scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
scope.row.submit_time == null scope.row.submit_time == null
" "
>编辑</el-button >编辑</el-button
@ -186,7 +186,7 @@
<el-popconfirm <el-popconfirm
title="确定删除吗？" title="确定删除吗？"
v-if=" v-if="
scope.row.send_mgroup == mgroupId && (scope.row.send_mgroup == mgroupId||deptId==scope.row.send_dept)&&
scope.row.submit_time == null scope.row.submit_time == null
" "
@confirm="table_del(scope.row, scope.$index)" @confirm="table_del(scope.row, scope.$index)"