suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

样式修改

Browse Source
master
jinna 7 months ago
parent f486cab5d7
commit 904140e4d3
5 changed files with 256 additions and 198 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 278
      src/views/tankSolutionSystem/info.vue
  2. 14
      src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
  3. 15
      src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
  4. 15
      src/views/tankSolutionSystem/workTankLine.vue
  5. 10
      src/views/tankSolutionSystem/workTankMangage.vue

278
src/views/tankSolutionSystem/info.vue
Unescape View File

@ -3,32 +3,35 @@
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
@refresh-change="refreshChange" @on-load="onLoad" >
<template #menu-left>
<el-button type="danger" icon="el-icon-delete" @click="handleDelete">删 除
<el-button type="danger" icon="el-icon-delete" @click="handleDelete"
>删 除
</el-button>
<el-button type="success" icon="el-icon-upload" @click="handleImport">导入
<el-button
type="success"
icon="el-icon-upload"
@click="handleImport"
>导入
</el-button>
<el-button type="primary" icon="el-icon-setting" @click="handleSetting">批量设置
<el-button
type="primary"
icon="el-icon-setting"
@click="handleSetting"
>批量设置
</el-button>
</template>
<template #menu="{ row }">
<el-button type="primary" text plain style="border: 0; background-color: transparent !important"
size="medium" @click.stop="handleIssue(row)">
<el-icon>
<Pointer />
</el-icon> 下发
</el-button>
size="medium" @click.stop="handleIssue(row)" >下发</el-button>
</template>
<template #targetLimit-form="{ type }">
<div style="width: 100%;display: flex;justify-content: space-between;"
v-show="type == 'add' || type == 'edit'">
<el-input style="width: 47%;" placeholder="请输入"></el-input>~<el-input style="width: 47%;"
placeholder="请输入"></el-input>
<template #targetLimit-form="{type}">
<div style="width: 100%;display: flex;justify-content: space-between;" v-show="type == 'add' || type == 'edit'">
<el-input style="width: 47%;" placeholder="请输入"></el-input>~<el-input style="width: 47%;" placeholder="请输入"></el-input>
</div>
<div v-show="type == 'view'">5 ~ 10</div>
</template>
<template #assayCycle1-form="{ type }">
<template #assayCycle1-form="{type}">
<div style="width: 100%;" v-show="type == 'add' || type == 'edit'">
<el-select style="width: 200px;margin-bottom: 10px;">
<el-option label="每周" :value="1"></el-option>
@ -61,8 +64,12 @@
<el-dialog title="批量设置" append-to-body v-model="setBox" width="555px">
<el-form v-model="settingForm" label-width="80px">
<el-form-item label="有效期">
<el-date-picker v-model="settingForm.reallyDate" type="date" style="width: 100%;"
placeholder="请选择有效期" />
<el-date-picker
v-model="settingForm.reallyDate"
type="date"
style="width: 100%;"
placeholder="请选择有效期"
/>
</el-form-item>
<el-form-item label="主管工艺">
<el-select v-model="settingForm.chargeCraft"></el-select>
@ -80,18 +87,17 @@
<script>
export default {
data() {
return {
excelBox: false,
loading: false,
setBox: false,
data: [],
settingForm: {},
checkList: [1, 2, 3, 4, 5, 6, 7],
option: {
// sortable:true,
rowSort: false,
columnSort: true,
data(){
return{
excelBox:false,
loading:false,
setBox:false,
data:[],
settingForm:{},
checkList:[1,2,3,4,5,6,7],
option:{
height:'auto',
calcHeight: 32,
tip: false,
size: 'medium',
simplePage: true,
@ -106,9 +112,12 @@ export default {
viewBtn: true,
delBtn: true,
editBtnText: '修改',
viewBtnText: '详情',
viewBtnIcon:' ',
delBtnIcon:' ',
editBtnIcon:' ',
viewBtnText:'详情',
labelWidth: 120,
menuWidth: 330,
menuWidth: 220,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@ -116,18 +125,19 @@ export default {
filterBtn: true,
searchShowBtn: false,
excelBtn: true,
columnSort:true,
index: false,
showOverflowTooltip: true,
column: [
column:[
{
label: '作业中心',
prop: 'wcName',
type: 'select',
sortable: true,
width: 150,
width:150,
filter: true,
span: 8,
search: true,
search:true,
rules: [
{
required: true,
@ -150,9 +160,9 @@ export default {
label: '槽号',
prop: 'slotNo',
search: true,
type: 'select',
type:'select',
sortable: true,
width: 120,
width:120,
filter: true,
span: 8,
dicData: [
@ -178,7 +188,7 @@ export default {
prop: 'testEle',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
span: 8,
rules: [
@ -194,7 +204,7 @@ export default {
prop: 'proContent',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
span: 8,
rules: [
@ -210,9 +220,9 @@ export default {
prop: 'targetLimit',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
hide: true,
hide:true,
span: 8,
rules: [
{
@ -227,11 +237,11 @@ export default {
prop: 'targetUpperLimit',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
addDisplay: false,
viewDisplay: false,
editDisplay: false,
addDisplay:false,
viewDisplay:false,
editDisplay:false,
span: 8,
rules: [
{
@ -246,10 +256,10 @@ export default {
prop: 'targetLowerLimit',
search: false,
sortable: true,
addDisplay: false,
viewDisplay: false,
editDisplay: false,
width: 120,
addDisplay:false,
viewDisplay:false,
editDisplay:false,
width:120,
filter: true,
span: 8,
rules: [
@ -265,7 +275,7 @@ export default {
prop: 'targetValue',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
span: 8,
rules: [
@ -282,7 +292,7 @@ export default {
search: false,
type: 'select',
sortable: true,
width: 120,
width:120,
filter: true,
span: 8,
rules: [
@ -309,9 +319,9 @@ export default {
search: false,
type: 'select',
sortable: true,
width: 120,
width:120,
filter: true,
hide: true,
hide:true,
span: 8,
rules: [
{
@ -337,9 +347,9 @@ export default {
disabled: true,
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
hide: true,
hide:true,
span: 8,
rules: [
{
@ -354,7 +364,7 @@ export default {
prop: 'addPoints',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
span: 8,
rules: [
@ -370,10 +380,10 @@ export default {
prop: 'assayCycle',
search: false,
sortable: true,
addDisplay: false,
viewDisplay: false,
editDisplay: false,
width: 120,
addDisplay:false,
viewDisplay:false,
editDisplay:false,
width:120,
filter: true,
span: 8,
rules: [
@ -389,8 +399,8 @@ export default {
prop: 'reallyDate',
search: false,
sortable: true,
type: 'date',
width: 120,
type:'date',
width:120,
filter: true,
span: 8,
rules: [
@ -406,10 +416,10 @@ export default {
prop: 'lastTest',
search: false,
sortable: true,
addDisplay: false,
viewDisplay: false,
editDisplay: false,
width: 150,
addDisplay:false,
viewDisplay:false,
editDisplay:false,
width:150,
filter: true,
span: 8,
rules: [
@ -423,10 +433,10 @@ export default {
{
label: '槽液到期日期',
prop: 'dueDate',
type: 'date',
type:'date',
search: false,
sortable: true,
width: 150,
width:150,
filter: true,
span: 8,
rules: [
@ -440,10 +450,10 @@ export default {
{
label: '化验人',
prop: 'userName',
type: 'select',
type:'select',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
span: 8,
rules: [
@ -457,10 +467,10 @@ export default {
{
label: '主管工艺',
prop: 'chargeCraft',
type: 'select',
type:'select',
search: false,
sortable: true,
width: 120,
width:120,
filter: true,
span: 16,
rules: [
@ -476,10 +486,10 @@ export default {
prop: 'updateTime',
search: false,
sortable: true,
width: 120,
addDisplay: false,
viewDisplay: false,
editDisplay: false,
width:120,
addDisplay:false,
viewDisplay:false,
editDisplay:false,
filter: true,
span: 8,
rules: [
@ -495,8 +505,8 @@ export default {
prop: 'assayCycle1',
search: false,
sortable: true,
hide: true,
width: 120,
hide:true,
width:120,
filter: true,
span: 24,
rules: [
@ -509,7 +519,7 @@ export default {
},
]
},
form: {
form:{
},
page: {
@ -517,7 +527,7 @@ export default {
currentPage: 1,
total: 0,
},
excelOption: {
excelOption:{
submitBtn: false,
emptyBtn: false,
column: [
@ -544,11 +554,11 @@ export default {
},
}
},
mounted() {
mounted(){
},
methods: {
getName(val) {
methods:{
getName(val){
return val == 1 ? '周一' : val == 2 ? '周二' : val == 3 ? '周三' : val == 4 ? '周四' : val == 5 ? '周五' : val == 6 ? '周六' : '周日'
},
handleImport() {
@ -608,14 +618,14 @@ export default {
}).then(() => {
})
},
handleSetting() {
handleSetting(){
if (this.selectionList.length === 0) {
this.$message.warning('请选择至少一条数据');
return;
}
this.setBox = true
},
handleIssue(row) {
handleIssue(row){
this.$confirm('此操作将产生新的任务, 是否继续?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -623,56 +633,76 @@ export default {
}).then(() => {
})
},
onLoad() {
onLoad(){
this.loading = true
this.data = [
{
id: '1',
wcName: '化学镀镍作业中心',
slotNo: '11#氰化镀铜槽',
testEle: '碳酸钠',
proContent: '0',
targetUpperLimit: '10',
targetLowerLimit: '5',
targetValue: '3',
drugName: '111',
addPoints: '0',
assayCycle: '7',
reallyDate: '2025-10-09',
lastTest: '2023-06-13',
dueDate: '2023-06-20',
userName: '崔殿龙',
chargeCraft: '崔殿龙',
updateTime: '2024-01-12'
},
{
id: '2',
wcName: '化学镀镍作业中心',
slotNo: '22#氰化镀铜槽',
testEle: '碳酸钠',
proContent: '0',
targetUpperLimit: '10',
targetLowerLimit: '5',
targetValue: '3',
drugName: '111',
addPoints: '0',
assayCycle: '7',
reallyDate: '2025-10-09',
lastTest: '2023-06-13',
dueDate: '2023-06-20',
userName: '崔殿龙',
chargeCraft: '崔殿龙',
updateTime: '2024-01-12'
id:'1',
wcName:'化学镀镍作业中心',
slotNo:'11#氰化镀铜槽',
testEle:'碳酸钠',
proContent:'0',
targetUpperLimit:'10',
targetLowerLimit:'5',
targetValue:'3',
drugName:'111',
addPoints:'0',
assayCycle:'7',
reallyDate:'2025-10-09',
lastTest:'2023-06-13',
dueDate:'2023-06-20',
userName:'崔殿龙',
chargeCraft:'崔殿龙',
updateTime:'2024-01-12'
},
{
id:'2',
wcName:'化学镀镍作业中心',
slotNo:'22#氰化镀铜槽',
testEle:'碳酸钠',
proContent:'0',
targetUpperLimit:'10',
targetLowerLimit:'5',
targetValue:'3',
drugName:'111',
addPoints:'0',
assayCycle:'7',
reallyDate:'2025-10-09',
lastTest:'2023-06-13',
dueDate:'2023-06-20',
userName:'崔殿龙',
chargeCraft:'崔殿龙',
updateTime:'2024-01-12'
}
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
setTimeout(() =>{
this.selectionClear()
}, 500)
},500)
}
}
}
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
</style>
<style lang="scss">
.el-table .el-table__cell{
height: 36px !important;
padding: 0 !important;
line-height: 36px !important;
}
.el-table th.el-table__cell{
background: #284c89 !important;
color: #fff !important;
}
.el-table .sort-caret.ascending{
border-bottom-color: #fff !important;
}
.el-table .sort-caret.descending {
border-top-color: #fff;
}
</style>

14
src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
Unescape View File

@ -117,7 +117,6 @@ export default {
issueForm:{},
option:{
tip: false,
simplePage: true,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
@ -141,6 +140,19 @@ export default {
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
align:'center',
height:'auto',
calcHeight: 32,
// height: 'auto',
// calcHeight: 32,
// tip: false,
// searchShow: true,
// searchMenuSpan: 6,
// border: true,
// index: true,
// viewBtn: true,
// selection: true,
// dialogClickModal: false,
column:[
{
label: '任务编号',

15
src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
Unescape View File

@ -19,13 +19,12 @@
@on-load="onLoad"
>
<template #menu="scope">
<el-button text icon="el-icon-view" @click="handleView(scope.row,'view')">详情</el-button>
<el-button text @click="handleView(scope.row,'view')">详情</el-button>
<el-button text @click="handleView(scope.row,'add')" v-show="scope.row.status == 1 || scope.row.status == 4">
<el-icon style="margin-right: 5px;"><Edit /></el-icon>
填报
</el-button>
<el-button text v-show="scope.row.status == 3" icon="el-icon-first-aid-kit" @click="handleView(scope.row,'drug')">领药</el-button>
<el-button text v-show="scope.row.status == 2" icon="el-icon-circle-check" @click="handleView(scope.row,'check')">审核</el-button>
<el-button text v-show="scope.row.status == 3" @click="handleView(scope.row,'drug')">领药</el-button>
<el-button text v-show="scope.row.status == 2" @click="handleView(scope.row,'check')">审核</el-button>
</template>
<template #userId="{ row }">
{{ row.testMan.userName }}
@ -66,7 +65,9 @@ export default {
issueForm:{},
option:{
tip: false,
simplePage: true,
height:'auto',
calcHeight: 32,
// simplePage: true,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
@ -81,6 +82,9 @@ export default {
editBtn:false,
editBtnText: '修改',
viewBtnText:'详情',
viewBtnIcon:' ',
delBtnIcon:' ',
editBtnIcon:' ',
labelWidth: 120,
// menuWidth: 330,
dialogWidth: 600,
@ -90,6 +94,7 @@ export default {
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
align:'center',
column:[
{
label: '任务编号',

15
src/views/tankSolutionSystem/workTankLine.vue
Unescape View File

@ -13,8 +13,8 @@
</el-button>
</template>
<template #menu="scope">
<el-button icon="el-icon-view" type="text" @click="handleView(scope.row)">详情</el-button>
<el-button icon="el-icon-view" type="text" @click="rowDel(scope.row)">删除</el-button>
<el-button type="text" @click="handleView(scope.row)">详情</el-button>
<el-button type="text" @click="rowDel(scope.row)">删除</el-button>
</template>
</avue-crud>
<el-dialog title="生产曲线" append-to-body v-model="lineBox" width="70%">
@ -111,7 +111,10 @@ export default {
option:{
tip: false,
size: 'medium',
simplePage: true,
height:'auto',
align:'center',
calcHeight: 32,
// simplePage: true,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
@ -127,7 +130,7 @@ export default {
editBtnText: '修改',
viewBtnText:'详情',
labelWidth: 120,
menuWidth: 200,
// menuWidth: 200,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
@ -135,6 +138,9 @@ export default {
filterBtn: true,
searchShowBtn: false,
excelBtn: true,
viewBtnIcon:' ',
delBtnIcon:' ',
editBtnIcon:' ',
index: false,
showOverflowTooltip: true,
column:[
@ -230,6 +236,7 @@ export default {
filter: true,
span: 8,
search:false,
width:240,
rules: [
{
required: true,

10
src/views/tankSolutionSystem/workTankMangage.vue
Unescape View File

@ -30,7 +30,7 @@
</el-button>
</template>
<template #status="{ row }">
<div style="display: flex;align-items: center;">
<div style="display: flex;align-items: center;justify-content: center;">
<span :style="{marginRight:'5px',backgroundColor:row.status == 1 ? '#00A854' : '#F04134',width:'12px',height:'12px',borderRadius:'50%',display:'inline-block'}"></span><span>{{ row.status == 0 ? '暂停使用' : '使用中' }}</span>
</div>
</template>
@ -63,7 +63,8 @@ export default {
excelBox:false,
option:{
tip: false,
simplePage: true,
height:'auto',
calcHeight: 32,
searchShow: true,
searchMenuSpan: 6,
searchIcon: true,
@ -76,8 +77,10 @@ export default {
delBtn: true,
editBtnText: '修改',
viewBtnText:'详情',
editBtnIcon:' ',
viewBtnIcon:' ',
delBtnIcon:' ',
labelWidth: 120,
menuWidth: 330,
dialogWidth: 600,
dialogClickModal: false,
searchEnter: true,
@ -85,6 +88,7 @@ export default {
searchShowBtn: false,
excelBtn: true,
showOverflowTooltip: true,
align:'center',
column:[
{
label: '编码',

Write Preview
Loading…
Cancel
Save