xiaoning
/
gjerp_ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.作业计划

Browse Source
master
董哲奇 11 months ago
parent e18ac963c8
commit a4e3e68a44
11 changed files with 223 additions and 131 deletions
Show Stats Download Patch File Download Diff File

1
package.json
Unescape View File

@ -69,7 +69,6 @@
"@vue/cli-plugin-eslint": "4.4.4",
"@vue/cli-plugin-unit-jest": "4.4.4",
"@vue/cli-service": "4.4.4",
"@vue/composition-api": "^1.7.2",
"@vue/test-utils": "1.0.0-beta.29",
"autoprefixer": "9.5.1",
"babel-eslint": "10.1.0",

11
pnpm-lock.yaml
Unescape View File

@ -148,9 +148,6 @@ devDependencies:
'@vue/cli-service':
specifier: 4.4.4
version: 4.4.4(babel-core@7.0.0-bridge.0)(less-loader@5.0.0)(sass-loader@8.0.2)(vue-template-compiler@2.6.10)
'@vue/composition-api':
specifier: ^1.7.2
version: 1.7.2(vue@2.6.10)
'@vue/test-utils':
specifier: 1.0.0-beta.29
version: 1.0.0-beta.29(vue-template-compiler@2.6.10)(vue@2.6.10)
@ -2483,14 +2480,6 @@ packages:
- whiskers
dev: true
/@vue/composition-api@1.7.2(vue@2.6.10):
resolution: {integrity: sha512-M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw==}
peerDependencies:
vue: '>= 2.5 < 2.7'
dependencies:
vue: 2.6.10
dev: true
/@vue/preload-webpack-plugin@1.1.2(html-webpack-plugin@3.2.0)(webpack@4.46.0):
resolution: {integrity: sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==}
engines: {node: '>=6.0.0'}

81
src/components/ProjectSelect/index.vue
Unescape View File

@ -0,0 +1,81 @@
<template>
<vxe-pulldown ref="xDown4" transfer>
<template #default>
<vxe-input
v-model="dcCh"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="250"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
</template>
<script>
import {getCzplBase} from "@/api/sjzx/jcsj";
export default {
name:'ProjectSelect',
data(){
return {
dcCh:'',
projectData:[],
projectData1:[],
projectColumns:[
{field: 'cbbm', title: '船号',width: 110},
{ field: 'wgbs', title: '完工标识', width: 80,
slots:{
default: 'wgbsEdit'
},
},
],
}
},
created(){
this.initProject()
},
methods:{
getDcch(){
return this.dcch
},
initProject(){
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
cellClickEvent({row}){
this.dcCh = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4(){
this.$refs.xDown4.showPanel()
},
keyupEvent4(){
if (this.dcCh) {
this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.dcCh.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
}
}
</script>

4
src/main.js
Unescape View File

@ -89,8 +89,8 @@ import VueWorker from 'vue-worker' // Web worker插件
Vue.use(VueWorker)
//引入composition-api
import VueCompositionAPI from '@vue/composition-api'
Vue.use(VueCompositionAPI)
// import VueCompositionAPI from '@vue/composition-api'
// Vue.use(VueCompositionAPI)
// register global utility filters
Object.keys(filters).forEach(key => {

2
src/permission.js
Unescape View File

@ -8,7 +8,7 @@ import getPageTitle from '@/utils/get-page-title'
NProgress.configure({ showSpinner: false }) // NProgress Configuration
const whiteList = ['/menu','/login', '/auth-redirect','/kban','/hbao','/sliao','/sczyjh','/zyjh'] // no redirect whitelist
const whiteList = ['/menu','/login', '/auth-redirect','/kban','/hbao','/sliao','/sczyjh',] // no redirect whitelist
export function flatRoutes(routes) {
let ret = [];
routes.forEach(it => {

10
src/router/index.js
Unescape View File

@ -43,11 +43,11 @@ export const constantRoutes = [
}
]
},
{
path: '/zyjh',
component: () => import('@/views/jhzxgl/zyjh/index.vue'),
hidden: true
},
// {
// path: '/zyjh',
// component: () => import('@/views/jhzxgl/zyjh/index.vue'),
// hidden: true
// },
{
path: '/hbao',
component: () => import('@/views/hbao/index'),

4
src/views/hbao/comps/Hgd.vue
Unescape View File

@ -47,7 +47,7 @@ export default {
this.layer.destroyChildren();
this.containerGroup=new Konva.Group({
x:15,
x:0,
y:20,
})
this.layer.add(this.containerGroup)
@ -502,7 +502,7 @@ export default {
imageObj.onload = function () {
const imgSize=118
const shape = new Konva.Image({
x: 255,
x: 205,
y: 1,
width: imgSize,
height: imgSize,

77
src/views/jhzxgl/zyjh/comps/head.vue
Unescape View File

@ -3,35 +3,7 @@
<el-row>
<el-col :span="3">
<el-form-item label="船号:">
<vxe-pulldown ref="xDown4" transfer >
<template #default>
<vxe-input
v-model="request.dcCh"
placeholder="船号"
style="height: 28px;
line-height: 28px; width: 150px;"
suffix-icon="vxe-icon--search"
@keyup="keyupEvent4"
@focus="focusEvent4"
/>
</template>
<template #dropdown>
<div class="my-dropdown mytable " style="width: 250px">
<vxe-grid
highlight-hover-row
height="auto"
:data="projectData"
:columns="projectColumns"
@cell-click="cellClickEvent"
show-overflow
>
<template #wgbsEdit="{ row}">
<vxe-checkbox v-model="row.wgbs" checked-value="Y" unchecked-value="N" disabled ></vxe-checkbox>
</template>
</vxe-grid>
</div>
</template>
</vxe-pulldown>
<ProjectSelect ref="projectSelectRef" :dcCh="request.dcCh"/>
</el-form-item>
</el-col>
<el-col :span="2">
@ -54,59 +26,50 @@
</el-form-item>
</el-col>
</el-col>
<el-col :span="12" style="text-align: right">
<el-col :span="5">
<el-form-item >
<el-date-picker v-model="qgjhrq" format="yyyy/MM/dd" value-format="yyyy/MM/dd" placeholder="请选择切割日期" type="date" style="width: 55%;" />
<el-button type="primary" @click="plsr">修正切割日期</el-button>
</el-form-item>
</el-col>
<el-col :span="8" style="text-align: right">
<el-button type="primary" @click="loadData">查询</el-button>
<el-button type="success" @click="save">保存</el-button>
</el-col>
</el-row>
</el-form>
</template>
<script>
import {getCzplBase} from "@/api/sjzx/jcsj";
import ProjectSelect from "@/components/ProjectSelect/index.vue";
export default {
name:'ZyjhHead',
components: {ProjectSelect},
data(){
return {
projectData:[],
projectData1:[],
projectColumns:[],
qgjhrq:'',
request:{
dcCh:'',
dcPl:'',
},
}
},
created(){
// this.initProject()
},
methods:{
save(){
this.$emit('$save')
},
plsr(){
this.$emit('$plsr',this.qgjhrq)
},
loadData(){
this.request.dcCh=this.$refs.projectSelectRef.getDcch();
const data=[
{dcCh:'123',dcPl:'123',dcFd:'123',}
]
this.$emit("initData",data)
},
initProject(){
getCzplBase({}).then(res=>{
this.projectData=res.data.cbbm
this.projectData1=res.data.cbbm
})
},
cellClickEvent({row}){
this.request.dcCh = row.cbbm
this.$refs.xDown4.hidePanel()
},
focusEvent4(){
this.$refs.xDown4.showPanel()
},
keyupEvent4(){
if (this.request.dcCh) {
this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.request.dcCh.toUpperCase()) > -1)
} else {
this.projectData = this.projectData1.slice(0)
}
},
}
}
</script>

15
src/views/jhzxgl/zyjh/index.js
Unescape View File

@ -1,14 +1,23 @@
export default function () {
const activeRowMethod=({ row, rowIndex })=>{
console.log(row)
return true
}
const options={
height:700,
height:780,
align:'center',
border: true,
resizable: true,
keepSource:true,
size:'mini',
showOverflow: true,
scrollY:{enable:true},
editConfig:{trigger: 'click', mode: 'row', showStatus: true,activeMethod: activeRowMethod},
data:[]
}
const columns = [
{ type: 'checkbox', width: 40 },
{ type: 'seq',title:'序号', width: 60 },
{field: 'dcCh', title: '船号', width: 120},
{field: 'dcPl', title: '批量', width: 120},
@ -23,6 +32,8 @@ export default function () {
{field: '', title: '大组需求期', width: 120},
{field: '', title: '上料计划日期', width: 120},
{field: '', title: '库存垛位', width: 120},
{field: '', title: '层数', width: 120},
{field: '', title: '预处理垛位', width: 120},
{field: '', title: '层数', width: 120},
{field: '', title: '派工人', width: 120},
@ -60,7 +71,7 @@ export default function () {
{field: '', title: '借用跨位', width: 120},
{field: '', title: '借用套料图号', width: 120},
{field: '', title: '切割计划日期', width: 120},
{field: 'qgjhrq', title: '切割计划日期', width: 120,editRender:{name:'$input',props:{type:'date',labelFormat:'yyyy/MM/dd',valueFormat:'yyyy/MM/dd'}}},
{field: '', title: '取自理料垛位', width: 120},
{field: '', title: '取自层数', width: 120},
{field: '', title: '派工人', width: 120},

109
src/views/jhzxgl/zyjh/index.vue
Unescape View File

@ -1,23 +1,26 @@
<template>
<el-container>
<el-header style="padding: 15px">
<ZyjhHead ref="zyjhSearchParams" @initData="initData" />
<ZyjhHead ref="zyjhSearchParams" @initData="initData" @$plsr="plsr" @$save="save" />
</el-header>
<el-main>
<VxeGrid v-bind="gridOptions" />
</el-main>
<el-container>
<el-main>
<VxeGrid ref="_table" v-bind="gridOptions" />
</el-main>
</el-container>
</el-container>
</template>
<script>
import zyjhConfig from "@/views/jhzxgl/zyjh/index";
import ZyjhHead from "@/views/jhzxgl/zyjh/comps/head.vue";
import ZyjhHead from './comps/head'
import zyjhConfig from './index'
export default {
name:"Zyjh",
components: {ZyjhHead},
data(){
return {
list:{},
gridOptions:{}
}
},
@ -25,15 +28,101 @@ export default {
const {options,columns}=zyjhConfig()
this.gridOptions=options
this.gridOptions.columns=columns
console.log(this.gridOptions)
},
mounted(){
},
mounted(){},
methods:{
save(){
const data=this.$refs._table.getUpdateRecords();
console.log(data)
if(data.length===0){
this.$message.warning('没有修改的数据无需保存')
return
}
},
plsr(qgjhrq){
const _table=this.$refs._table
const _data=_table.getCheckboxRecords()
if (_data.length===0){
this.$message.warning('请选择待处理的数据')
return
}
for (const item of _data) {
item.qgjhrq=qgjhrq
}
_table.updateData()
},
initData(data){
this.list=data;
this.gridOptions.data=data;
}
}
}
</script>
<style lang="scss" scoped >
.el-header{margin:0;padding: 5px;height:auto;
.el-input{
width: 140px;
}
.el-select{
width: 140px;
}
}
.el-container{padding: 0;margin:0;}
.el-main{padding: 0;}
.el-col{padding: 0;height: 32px;}
.el-aside{background: #fff;padding: 0}
.el-container{padding: 0}
.el-row {}
.el-row:last-child {margin-bottom: 0; }
.tableStyles{
background: #0a76a4;
}
.my-dropdown {
width: 400px;
height: 400px;
background-color: #fff;
border: 1px solid #dcdfe6;
box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
font-size: 12px;
}
.mytable1{
}
.borderClass{
}
.vxe-input {
display: inline-block !important;
position: relative !important;
width: auto;
}
.el-input {
display: inline-block !important;
position: relative !important;
width: auto;
}
.keyword-lighten {
color: #000;
background-color: #FFFF00;
}
.vxe-textarea--inner {
line-height: inherit;
}
.el-form-item__label-wrap {
margin-left: 0px !important;
float: left;
}
.fontClass{
font-size: 12px;
font-weight: bold;
}
</style>

40
src/views/sliao/index.vue
Unescape View File

@ -5,46 +5,6 @@
<script>
import Konva from "konva";
// import sliao from "@/views/sliao/draw";
import {defineComponent,ref, reactive, onMounted,computed } from '@vue/composition-api'
export default defineComponent({
setup() {
const sliao=ref()
const state = reactive({
message: 'Hello, world!'
})
const width=ref(0)
const height=ref(0)
onMounted(() => {
console.log(sliao)
console.log(sliao.clientWidth)
width.value=sliao.clientWidth
height.value=sliao.clientHeight
console.log(width.value)
console.log('Component mounted')
})
const count = ref(0);
// Computed state
const message = computed(() => `Hello Vue ${count.value}`);
// Methods
function increment() {
count.value++;
}
return {
...state,
width,height,
sliao,
count
}
}
})
// export default {
// name:'SLiao',

Write Preview
Loading…
Cancel
Save