下线完成
This commit is contained in:
parent
6deef5fcc5
commit
82263ebb91
@ -57,7 +57,7 @@
|
|||||||
"vue-seamless-scroll": "^1.1.23",
|
"vue-seamless-scroll": "^1.1.23",
|
||||||
"vuedraggable": "^2.20.0",
|
"vuedraggable": "^2.20.0",
|
||||||
"vuex": "3.6.0",
|
"vuex": "3.6.0",
|
||||||
"vxe-table": "^3.6.13",
|
"vxe-table": "^3.7.8",
|
||||||
"xe-utils": "^3.5.11",
|
"xe-utils": "^3.5.11",
|
||||||
"xlsx": "^0.18.5"
|
"xlsx": "^0.18.5"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -39,8 +39,8 @@ import UploadFile from '@/components/FileUpload/index';
|
|||||||
import DictData from '@/components/DictData'
|
import DictData from '@/components/DictData'
|
||||||
|
|
||||||
import VXETable from 'vxe-table'
|
import VXETable from 'vxe-table'
|
||||||
|
|
||||||
import 'vxe-table/lib/style.css'
|
import 'vxe-table/lib/style.css'
|
||||||
import "@/vxe.scss"
|
|
||||||
|
|
||||||
import dataV from '@jiaminghi/data-view'
|
import dataV from '@jiaminghi/data-view'
|
||||||
|
|
||||||
@ -90,6 +90,7 @@ Vue.use(Element, {
|
|||||||
})
|
})
|
||||||
|
|
||||||
Vue.use(VXETable)
|
Vue.use(VXETable)
|
||||||
|
|
||||||
Vue.use(dataV)
|
Vue.use(dataV)
|
||||||
Vue.use(AFTableColumn)
|
Vue.use(AFTableColumn)
|
||||||
|
|
||||||
|
|||||||
@ -29,29 +29,31 @@
|
|||||||
show-overflow
|
show-overflow
|
||||||
ref="xTable"
|
ref="xTable"
|
||||||
v-loading="loading_1"
|
v-loading="loading_1"
|
||||||
|
:cell-style="rowClassName"
|
||||||
height="800"
|
height="800"
|
||||||
:row-config="{ isHover: true, useKey: true, keyField: 'sort' }"
|
:row-config="{ isHover: true, useKey: true }"
|
||||||
|
:column-config="{ useKey: true }"
|
||||||
:data="workorder_table_data"
|
:data="workorder_table_data"
|
||||||
>
|
>
|
||||||
<vxe-column type="seq" width="60"></vxe-column>
|
<vxe-column type="seq" width="60"></vxe-column>
|
||||||
<vxe-column field="clientWorkorder" title="工单号" width="130"></vxe-column>
|
<vxe-column field="clientWorkorder" title="工单号" width="130" type="html"></vxe-column>
|
||||||
<vxe-column field="blankNumber" title="毛坯号"></vxe-column>
|
<vxe-column field="blankNumber" title="毛坯号" type="html"></vxe-column>
|
||||||
<vxe-column field="finishedPartNumber" title="成品零件号"></vxe-column>
|
<vxe-column field="finishedPartNumber" title="成品零件号" type="html"></vxe-column>
|
||||||
<vxe-column field="productDescription" title="产品描述"></vxe-column>
|
<vxe-column field="productDescription" title="产品描述" type="html"></vxe-column>
|
||||||
<vxe-column field="colour" title="颜色"></vxe-column>
|
<vxe-column field="colour" title="颜色" type="html"></vxe-column>
|
||||||
<vxe-column field="specifications" title="规格"></vxe-column>
|
<vxe-column field="specifications" title="规格" type="html"></vxe-column>
|
||||||
<vxe-column field="codeNumber" title="编码号"></vxe-column>
|
<vxe-column field="codeNumber" title="编码号" type="html"></vxe-column>
|
||||||
<vxe-column field="vehicleNumber" title="车数"></vxe-column>
|
<vxe-column field="vehicleNumber" title="车数" type="html"></vxe-column>
|
||||||
<vxe-column field="hangNumber" title="挂具摆放数"></vxe-column>
|
<vxe-column field="hangNumber" title="挂具摆放数" type="html"></vxe-column>
|
||||||
<vxe-column field="previousNumber" title="上件数"></vxe-column>
|
<vxe-column field="previousNumber" title="上件数" type="html"></vxe-column>
|
||||||
<vxe-column field="cylinderNumber" title="双组号缸号"></vxe-column>
|
<vxe-column field="cylinderNumber" title="双组号缸号" type="html"></vxe-column>
|
||||||
<vxe-column field="remark1" title="备注1"></vxe-column>
|
<vxe-column field="remark1" title="备注1" type="html"></vxe-column>
|
||||||
<vxe-column field="remark2" title="备注2"></vxe-column>
|
<vxe-column field="remark2" title="备注2" type="html"></vxe-column>
|
||||||
<vxe-column title="操作" width="150" show-overflow>
|
<vxe-column title="操作" width="150" show-overflow>
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<div v-show="row.remark3 == '是'">
|
<div v-show="row.remark3 == '是'">
|
||||||
<vxe-button size="mini" type="text" status="primary" content="开始上线" @click="updateitem(row)"></vxe-button>
|
<vxe-button size="mini" type="text" status="primary" content="开始上线" @click="updateitem(row)"></vxe-button>
|
||||||
<vxe-button size="mini" type="text" status="danger" content="取消上线" @click="cancelitem(row)"></vxe-button>
|
<vxe-button size="mini" type="text" status="danger" content="取消上线" @click="cancelitem(row)"></vxe-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</vxe-column>
|
</vxe-column>
|
||||||
@ -110,8 +112,6 @@ export default {
|
|||||||
this.loading_1 = false
|
this.loading_1 = false
|
||||||
this.workorder_table_data = res.data.item1
|
this.workorder_table_data = res.data.item1
|
||||||
this.pagination.total = res.data.item2
|
this.pagination.total = res.data.item2
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@ -127,7 +127,6 @@ export default {
|
|||||||
},
|
},
|
||||||
//todo 取消上线
|
//todo 取消上线
|
||||||
cancelitem(row) {
|
cancelitem(row) {
|
||||||
|
|
||||||
this.$modal
|
this.$modal
|
||||||
.confirm('是否确认取消生产工单名称为' + row.productDescription + '"的数据项?')
|
.confirm('是否确认取消生产工单名称为' + row.productDescription + '"的数据项?')
|
||||||
.then(function () {
|
.then(function () {
|
||||||
@ -140,6 +139,15 @@ export default {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
//todo 更改单元格格式
|
||||||
|
rowClassName(item) {
|
||||||
|
if (item.row.status > 0) {
|
||||||
|
return {
|
||||||
|
backgroundColor: '#FFFF00',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@ -147,7 +155,7 @@ export default {
|
|||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.el-dropdown-link {
|
.el-dropdown-link {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
color: #409eff;
|
color: #93ff40;
|
||||||
}
|
}
|
||||||
.el-icon-arrow-down {
|
.el-icon-arrow-down {
|
||||||
font-size: 0.5rem;
|
font-size: 0.5rem;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user