master
xiezuo003 2 years ago
parent 6fa1c3af24
commit 822503496c

@ -21,10 +21,10 @@ export function update(data) {
}
// 一键生成
export function generate(data) {
export function generate(nf) {
return request({
url: "/emGcrl/generate",
method: "post",
data,
params:{nf},
});
}

@ -5,7 +5,8 @@ import Cookies from 'js-cookie'
import 'normalize.css/normalize.css' // a modern alternative to CSS resets
import Element from 'element-ui'
import './styles/element-variables.scss'
// import './styles/element-variables.scss'
import 'element-ui/lib/theme-chalk/index.css'
import '@/styles/index.scss' // global css
@ -24,8 +25,8 @@ import 'xe-utils'
import VXETable from 'vxe-table'
import 'vxe-table/lib/style.css'
import cal from './utils/calculation'
import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
VXETable.use(VXETablePluginExportXLSX)
// import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
// VXETable.use(VXETablePluginExportXLSX)
Vue.prototype.cal = cal
Vue.use(VXETable)
import print from './utils/print' //能不能单独引用

@ -3,23 +3,30 @@
<el-container>
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="60px">
<el-row>
<el-col :span="4">
<el-form-item label="计划期:">
<el-date-picker
v-model="request.date"
type="daterange"
format="yyyy/MM/dd"
:unlink-panels="true"
range-separator="~"
start-placeholder=""
end-placeholder=""
>
</el-date-picker>
<div class="flex-form">
<div class="flex-query">
<el-form-item label="计划期:" style="width: 350px">
<div class="date-flex">
<el-date-picker
v-model="request.dateStart"
type="date"
value-format="yyyy/MM/dd"
@change="changeDateStart"
:picker-options="pickerOptionsStart"
>
</el-date-picker>
<div class="center">~</div>
<el-date-picker
v-model="request.dateEnd"
type="date"
value-format="yyyy/MM/dd"
@change="changeDateEnd"
:picker-options="pickerOptionsEnd"
>
</el-date-picker>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:">
<el-form-item label="状态:" style="width: 350px">
<el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
@ -30,11 +37,11 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" style="text-align: right">
</div>
<div style="width: 100%; text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
</div>
</div>
</el-form>
</el-header>
<el-container style="padding-top: 10px">
@ -75,7 +82,8 @@ export default {
data() {
return {
request: {
date: "",
dateStart: "",
dateEnd: "",
Zt: "",
},
list: [],
@ -169,9 +177,10 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "bz",
title: "备注",
field: "zt",
title: "状态",
align: "center",
slots: { default: "Zt_default" },
filters: [
{
data: {
@ -189,8 +198,8 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "bzy",
title: "编制人",
field: "bz",
title: "备注",
align: "center",
filters: [
{
@ -209,8 +218,8 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "bzrq",
title: "编制日期",
field: "bzy",
title: "编制",
align: "center",
filters: [
{
@ -229,10 +238,9 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "zt",
title: "状态",
field: "bzrq",
title: "编制日期",
align: "center",
slots: { default: "Zt_default" },
filters: [
{
data: {
@ -260,6 +268,12 @@ export default {
label: "已审核",
},
],
pickerOptionsEnd: {
disabledDate: this.disabledDateEnd,
},
pickerOptionsStart: {
disabledDate: this.disabledDateStart,
},
};
},
created() {
@ -268,17 +282,42 @@ export default {
this.initList();
},
methods: {
//
getFutureMonthDay(sourceDate, monthNum = 3) {
const d = new Date(sourceDate);
//
const SY = d.getFullYear();
const SM = d.getMonth();
const SD = d.getDate();
//
const mydate = new Date(
SY,
String(SM + monthNum).padStart(2, "0"),
String(SD).padStart(2, "0")
);
const yyyy = mydate.getFullYear();
let MM = (mydate.getMonth() + 1).toString().padStart(2, "0");
let dd = mydate.getDate().toString().padStart(2, "0");
//2230
if (MM == 2 && dd > 28) {
if (yyyy % 100 == 0 && yyyy % 400 == 0) {
dd = 29;
} else if (yyyy % 100 != 0 && yyyy % 4 == 0) {
dd = 29;
} else {
dd = 28;
}
}
return `${yyyy}/${MM}/${dd}`;
},
//
initList() {
let params = {
Zt: this.request.Zt,
jhrq: "",
};
if (this.request.date && this.request.date.length > 0) {
params.jhrq =
this.request.date[0].toLocaleDateString() +
"~" +
this.request.date[1].toLocaleDateString();
if (this.request.dateStart && this.request.dateEnd) {
params.jhrq = this.request.dateStart + "~" + this.request.dateEnd;
} else {
params.jhrq = "";
}
@ -289,6 +328,34 @@ export default {
}
});
},
//
changeDateStart(value) {
if (value) {
this.request.dateEnd = this.getFutureMonthDay(value, 3);
}
},
changeDateEnd(value) {},
//
disabledDateStart(time) {
const beginDateVal = this.request.dateEnd;
if (beginDateVal) {
return (
time.valueOf() >=
new Date(beginDateVal).valueOf() - 24 * 60 * 60 * 1000 + 1
);
}
},
//
disabledDateEnd(time) {
const beginDateVal = this.request.dateStart;
if (beginDateVal) {
return (
time.valueOf() <=
new Date(beginDateVal).valueOf() - 24 * 60 * 60 * 1000 + 1
);
}
},
getHeight() {
this.height = window.innerHeight - 160;
},
@ -351,4 +418,18 @@ export default {
::v-deep .el-date-editor.el-input__inner {
width: auto !important;
}
.date-flex {
display: flex;
.center {
margin-left: 5px;
margin-right: 5px;
}
}
.flex-form {
display: flex;
.flex-query {
display: flex;
align-items: center;
}
}
</style>

@ -3,23 +3,30 @@
<el-container>
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="60px">
<el-row>
<el-col :span="4">
<el-form-item label="计划期:">
<el-date-picker
v-model="request.date"
type="daterange"
format="yyyy/MM/dd"
:unlink-panels="true"
range-separator="~"
start-placeholder=""
end-placeholder=""
>
</el-date-picker>
<div class="flex-form">
<div class="flex-query">
<el-form-item label="计划期:" style="width: 350px">
<div class="date-flex">
<el-date-picker
v-model="request.dateStart"
type="date"
value-format="yyyy/MM/dd"
@change="changeDateStart"
:picker-options="pickerOptionsStart"
>
</el-date-picker>
<div class="center">~</div>
<el-date-picker
v-model="request.dateEnd"
type="date"
value-format="yyyy/MM/dd"
@change="changeDateEnd"
:picker-options="pickerOptionsEnd"
>
</el-date-picker>
</div>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:">
<el-form-item label="状态:" style="width: 350px">
<el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
@ -30,14 +37,14 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" style="text-align: right">
</div>
<div style="width: 100%; text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('submit')"
>审核</el-button
>
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
</div>
</div>
<el-row>
<el-col :span="24" style="text-align: right">
<div class="upload-demo">
@ -98,7 +105,8 @@ export default {
data() {
return {
request: {
date: "",
dateStart: "",
dateEnd: "",
Zt: "",
},
list: [],
@ -113,49 +121,10 @@ export default {
fixed: "left",
},
{
field: "dcCh",
title: "船号",
align: "center",
filters: [
{
data: {
checks: [],
sVal: "",
sMenu: "",
fType1: "",
fVal1: "",
fMode: "and",
fType2: "",
fVal2: "",
},
},
],
filterRender: { name: "FilterCombination" },
},
{
field: "dcPl",
title: "批量",
align: "center",
filters: [
{
data: {
checks: [],
sVal: "",
sMenu: "",
fType1: "",
fVal1: "",
fMode: "and",
fType2: "",
fVal2: "",
},
},
],
filterRender: { name: "FilterCombination" },
},
{
field: "dcFd",
title: "分段",
field: "zt",
title: "状态",
align: "center",
slots: { default: "Zt_default" },
filters: [
{
data: {
@ -173,8 +142,8 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "jhrq",
title: "计划期",
field: "dcCh",
title: "船号",
align: "center",
filters: [
{
@ -193,8 +162,8 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "bz",
title: "备注",
field: "dcPl",
title: "批量",
align: "center",
filters: [
{
@ -213,8 +182,8 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "bzy",
title: "编制人",
field: "dcFd",
title: "分段",
align: "center",
filters: [
{
@ -233,8 +202,8 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "bzrq",
title: "编制日期",
field: "jhrq",
title: "计划期",
align: "center",
filters: [
{
@ -253,10 +222,9 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "zt",
title: "状态",
field: "bz",
title: "备注",
align: "center",
slots: { default: "Zt_default" },
filters: [
{
data: {
@ -284,6 +252,12 @@ export default {
label: "已审核",
},
],
pickerOptionsEnd: {
disabledDate: this.disabledDateEnd,
},
pickerOptionsStart: {
disabledDate: this.disabledDateStart,
},
fileList: [], //
checkedList: [],
};
@ -294,17 +268,42 @@ export default {
this.initList();
},
methods: {
//
getFutureMonthDay(sourceDate, monthNum = 3) {
const d = new Date(sourceDate);
//
const SY = d.getFullYear();
const SM = d.getMonth();
const SD = d.getDate();
//
const mydate = new Date(
SY,
String(SM + monthNum).padStart(2, "0"),
String(SD).padStart(2, "0")
);
const yyyy = mydate.getFullYear();
let MM = (mydate.getMonth() + 1).toString().padStart(2, "0");
let dd = mydate.getDate().toString().padStart(2, "0");
//2230
if (MM == 2 && dd > 28) {
if (yyyy % 100 == 0 && yyyy % 400 == 0) {
dd = 29;
} else if (yyyy % 100 != 0 && yyyy % 4 == 0) {
dd = 29;
} else {
dd = 28;
}
}
return `${yyyy}/${MM}/${dd}`;
},
//
initList() {
let params = {
Zt: this.request.Zt,
jhrq: "",
};
if (this.request.date && this.request.date.length > 0) {
params.jhrq =
this.request.date[0].toLocaleDateString() +
"~" +
this.request.date[1].toLocaleDateString();
if (this.request.dateStart && this.request.dateEnd) {
params.jhrq = this.request.dateStart + "~" + this.request.dateEnd;
} else {
params.jhrq = "";
}
@ -315,6 +314,33 @@ export default {
}
});
},
//
changeDateStart(value) {
if (value) {
this.request.dateEnd = this.getFutureMonthDay(value, 3);
}
},
changeDateEnd(value) {},
//
disabledDateStart(time) {
const beginDateVal = this.request.dateEnd;
if (beginDateVal) {
return (
time.valueOf() >=
new Date(beginDateVal).valueOf() - 24 * 60 * 60 * 1000 + 1
);
}
},
//
disabledDateEnd(time) {
const beginDateVal = this.request.dateStart;
if (beginDateVal) {
return (
time.valueOf() <=
new Date(beginDateVal).valueOf() - 24 * 60 * 60 * 1000 + 1
);
}
},
// excel
actionUpload(file) {
const formData = new FormData();
@ -448,4 +474,18 @@ export default {
::v-deep .el-date-editor.el-input__inner {
width: auto !important;
}
.date-flex {
display: flex;
.center {
margin-left: 5px;
margin-right: 5px;
}
}
.flex-form {
display: flex;
.flex-query {
display: flex;
align-items: center;
}
}
</style>

@ -31,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="年份:">
<el-form-item label="年份:" style="width: 260px;">
<div style="display: flex">
<el-date-picker
v-model="nrStart"
@ -109,7 +109,7 @@
import { getList, tj, save, upload } from "@/api/jhzx/xbjhWH";
import { getCzxx } from "@/api/jhzx/qfxq";
export default {
name: "xbjhWH",
name: "xbjhCX",
data() {
return {
request: {
@ -151,8 +151,24 @@ export default {
this.getHeight();
},
methods: {
//
compare(property) {
return function (object1, object2) {
let value1 = object1[property];
let value2 = object2[property];
//
return value1 - value2;
};
},
//
getTableList(data) {
Object.keys(data).forEach((item, index) => {
data[item].sort(this.compare("nf"));
data[item].sort(this.compare("yf"));
data[item].forEach((em) => {
em.zl = em.zl ? em.zl : null;
});
});
this.tableData = data;
this.leftColumn = []; //
this.topColumn = []; //
@ -227,8 +243,11 @@ export default {
objeckList[i][
"cl" + this.tableData[i][v].nf + this.tableData[i][v].yf
] = this.tableData[i][v].zl;
objeckList[i]["cltotal" + this.tableData[i][v].nf] =
sumArr[i][this.tableData[i][v].nf];
objeckList[i]["cltotal" + this.tableData[i][v].nf] = sumArr[i][
this.tableData[i][v].nf
]
? sumArr[i][this.tableData[i][v].nf]
: "";
}
}
this.arrList = Object.values(objeckList); //data
@ -329,7 +348,7 @@ export default {
if ($rowIndex == 0) {
return "row-gre-header";
} else {
if (column.field === "total1" || column.field === "total2") {
if (column.field.indexOf("cltotal") > -1) {
return "row-gre-total-header";
} else {
return "row-gre-header";
@ -338,8 +357,12 @@ export default {
},
// css
cellClassName({ column }) {
if (column.field === "total1" || column.field === "total2") {
return "col-gre-total-col";
if (column.field) {
if (column.field.indexOf("cltotal") > -1) {
return "col-gre-total-col";
} else {
return "col-gre-col";
}
} else {
return "col-gre-col";
}
@ -354,7 +377,7 @@ export default {
async toolbarButtonClickEvent(code) {
switch (code) {
case "submit":
if (!JSON.stringify(this.checkedList) =="{}") {
if (!JSON.stringify(this.checkedList) == "{}") {
this.$confirm("是否确认提交选择的数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@ -375,7 +398,7 @@ export default {
}
break;
case "save":
if (JSON.stringify(this.checkedList) =="{}") {
if (JSON.stringify(this.checkedList) == "{}") {
this.$confirm("是否确认保存选择的数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
@ -406,7 +429,7 @@ export default {
};
</script>
<style scoped>
<style scoped lang="scss">
.first-col {
position: relative;
height: 20px;
@ -478,23 +501,15 @@ export default {
border-bottom: 2px solid #000 !important;
}
/* border 颜色 */
::v-deep .vxe-table--render-default.border--full .vxe-body--column,
.vxe-table--render-default.border--full .vxe-footer--column,
.vxe-table--render-default.border--full .vxe-header--column {
background-image: linear-gradient(#000, #000) !important;
}
::v-deep.vxe-table--render-default.border--full .vxe-body--column,
.vxe-table--render-default.border--full .vxe-footer--column,
.vxe-table--render-default.border--full .vxe-header--column {
::v-deep.vxe-table--render-default.border--full .vxe-body--column{
background-image: linear-gradient(#000, #000), linear-gradient(#000, #000) !important;
background-repeat: no-repeat !important;
background-size: 1px 100%,100% 1px !important;
background-position: 100% 0px,100% 99% !important;
}
:v-deep.vxe-table--render-default.border--full .vxe-body--column,
.vxe-table--render-default.border--full .vxe-footer--column,
.vxe-table--render-default.border--full .vxe-header--column {
::v-deep.vxe-table--render-default.border--full .vxe-footer--column{
background-image: linear-gradient(#000, #000), linear-gradient(#000, #000) !important;
}
::v-deep.vxe-table--render-default.border--full .vxe-body--column,
::v-deep.vxe-table--render-default.border--full .vxe-footer--column,
::v-deep.vxe-table--render-default.border--full .vxe-header--column {
background-image: linear-gradient(#000, #000), linear-gradient(#000, #000) !important;
}

@ -31,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="年份:">
<el-form-item label="年份:" style="width: 260px">
<div style="display: flex">
<el-date-picker
v-model="nrStart"
@ -173,8 +173,24 @@ export default {
this.getHeight();
},
methods: {
//
compare(property) {
return function (object1, object2) {
let value1 = object1[property];
let value2 = object2[property];
//
return value1 - value2;
};
},
//
getTableList(data) {
Object.keys(data).forEach((item, index) => {
data[item].sort(this.compare("nf"));
data[item].sort(this.compare("yf"));
data[item].forEach((em) => {
em.zl = em.zl ? em.zl : null;
});
});
this.tableData = data;
this.leftColumn = []; //
this.topColumn = []; //
@ -249,8 +265,11 @@ export default {
objeckList[i][
"cl" + this.tableData[i][v].nf + this.tableData[i][v].yf
] = this.tableData[i][v].zl;
objeckList[i]["cltotal" + this.tableData[i][v].nf] =
sumArr[i][this.tableData[i][v].nf];
objeckList[i]["cltotal" + this.tableData[i][v].nf] = sumArr[i][
this.tableData[i][v].nf
]
? sumArr[i][this.tableData[i][v].nf]
: "";
}
}
this.arrList = Object.values(objeckList); //data
@ -351,7 +370,7 @@ export default {
if ($rowIndex == 0) {
return "row-gre-header";
} else {
if (column.field === "total1" || column.field === "total2") {
if (column.field.indexOf("cltotal") > -1) {
return "row-gre-total-header";
} else {
return "row-gre-header";
@ -360,8 +379,12 @@ export default {
},
// css
cellClassName({ column }) {
if (column.field === "total1" || column.field === "total2") {
return "col-gre-total-col";
if (column.field) {
if (column.field.indexOf("cltotal") > -1) {
return "col-gre-total-col";
} else {
return "col-gre-col";
}
} else {
return "col-gre-col";
}
@ -428,7 +451,7 @@ export default {
};
</script>
<style scoped>
<style scoped lang="scss">
.first-col {
position: relative;
height: 20px;
@ -469,27 +492,27 @@ export default {
}
/* 尾部 */
::v-deep.mytable-style .row-end-gre {
background-color: #9ed3a4;
background-color: #9ed3a4 !important;
color: #000;
font-weight: bold;
}
/* 列 */
::v-deep.mytable-style.vxe-table .vxe-body--column.col-gre-total-col {
background-color: #9ed3a4;
background-color: #9ed3a4 !important;
color: #000;
}
::v-deep.mytable-style.vxe-table .vxe-body--column.col-gre-col {
background-color: #cce8cf;
background-color: #cce8cf !important;
color: #000;
}
/* header */
::v-deep.mytable-style.vxe-table .vxe-header--column.row-gre-header {
background-color: #cce8cf;
background-color: #cce8cf !important;
color: #000;
font-weight: bold;
}
::v-deep.mytable-style.vxe-table .vxe-header--column.row-gre-total-header {
background-color: #9ed3a4;
background-color: #9ed3a4 !important;
color: #000;
font-weight: bold;
}
@ -500,23 +523,15 @@ export default {
border-bottom: 2px solid #000 !important;
}
/* border 颜色 */
::v-deep .vxe-table--render-default.border--full .vxe-body--column,
.vxe-table--render-default.border--full .vxe-footer--column,
.vxe-table--render-default.border--full .vxe-header--column {
background-image: linear-gradient(#000, #000) !important;
}
::v-deep.vxe-table--render-default.border--full .vxe-body--column,
.vxe-table--render-default.border--full .vxe-footer--column,
.vxe-table--render-default.border--full .vxe-header--column {
background-image: linear-gradient(#000, #000), linear-gradient(#000, #000) !important;
::v-deep.vxe-table--render-default.border--full .vxe-body--column {
background-repeat: no-repeat !important;
background-size: 1px 100%, 100% 1px !important;
background-position: 100% 0px, 100% 99% !important;
background-image: linear-gradient(#000, #000),linear-gradient( #000, #000) !important;
}
:v-deep.vxe-table--render-default.border--full .vxe-body--column,
.vxe-table--render-default.border--full .vxe-footer--column,
.vxe-table--render-default.border--full .vxe-header--column {
::v-deep.vxe-table--render-default.border--full .vxe-footer--column {
background-image: linear-gradient(#000, #000), linear-gradient(#000, #000) !important;
}
::v-deep.vxe-table--render-default.border--full .vxe-body--column,
::v-deep.vxe-table--render-default.border--full .vxe-footer--column,
::v-deep.vxe-table--render-default.border--full .vxe-header--column {
background-image: linear-gradient(#000, #000), linear-gradient(#000, #000) !important;
}

@ -2,9 +2,14 @@
<!-- 中日程计划查询 -->
<el-container>
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="75px">
<el-row>
<el-col :span="4">
<el-form
ref="requestForm"
:model="request"
label-width="75px"
class="flex-form"
>
<div class="flex-query">
<div style="width: 300px">
<el-form-item label="钢加开始:">
<el-date-picker
v-model="request.date"
@ -17,8 +22,8 @@
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
</div>
<div style="width: 300px">
<el-form-item label="状态:">
<el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option
@ -30,11 +35,11 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
</div>
</div>
<div>
<el-button type="primary" @click="initList()"></el-button>
</div>
</el-form>
</el-header>
<el-container style="padding-top: 10px">
@ -173,7 +178,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "dcFD",
field: "dcFd",
title: "分段号",
align: "center",
minWidth: "80",
@ -194,7 +199,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "ZL",
field: "zl",
title: "重量",
align: "center",
minWidth: "70",
@ -215,7 +220,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "dcPL",
field: "dcPl",
title: "批量号",
align: "center",
minWidth: "80",
@ -383,7 +388,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "LP",
field: "sjcLp",
title: "时间差L-P",
align: "center",
minWidth: "120",
@ -446,7 +451,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "RS",
field: "sjcRs",
title: "时间差R-S",
align: "center",
minWidth: "120",
@ -509,7 +514,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "UV",
field: "sjcUv",
title: "时间差U-V",
align: "center",
minWidth: "120",
@ -787,12 +792,15 @@ export default {
//
initList() {
let params = {
Zt:this.request.Zt,
gjks:""
}
if(this.request.date && this.request.date.length>0){
params.gjks = this.request.date[0].toLocaleDateString()+"~"+this.request.date[1].toLocaleDateString();
}else{
Zt: this.request.Zt,
gjks: "",
};
if (this.request.date && this.request.date.length > 0) {
params.gjks =
this.request.date[0].toLocaleDateString() +
"~" +
this.request.date[1].toLocaleDateString();
} else {
params.gjks = "";
}
getList(params).then((res) => {
@ -857,4 +865,12 @@ export default {
::v-deep .el-date-editor.el-input__inner {
width: auto !important;
}
.flex-form {
display: flex;
justify-content: space-between;
align-items: center;
.flex-query {
display: flex;
}
}
</style>

@ -3,43 +3,45 @@
<el-container>
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="75px">
<el-row>
<el-col :span="4">
<el-form-item label="钢加开始:">
<el-date-picker
v-model="request.date"
type="daterange"
format="yyyy/MM/dd"
:unlink-panels="true"
range-separator="~"
start-placeholder=""
end-placeholder=""
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:">
<el-select
v-model="request.Zt"
placeholder="状态"
clearable
disabled
>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
<div class="flex-form">
<div class="flex-query">
<div>
<el-form-item label="钢加开始:" style="width: 300px">
<el-date-picker
v-model="request.date"
type="daterange"
format="yyyy/MM/dd"
:unlink-panels="true"
range-separator="~"
start-placeholder=""
end-placeholder=""
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
</el-date-picker>
</el-form-item>
</div>
<div>
<el-form-item label="状态:" style="width: 300px">
<el-select
v-model="request.Zt"
placeholder="状态"
clearable
disabled
>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</div>
<div class="button">
<el-button type="primary" @click="initList()"></el-button>
</div>
</div>
</div>
<el-row>
<el-col :span="24" style="text-align: right">
<el-button type="primary" @click="toolbarButtonClickEvent('back')"
@ -89,7 +91,7 @@
</template>
<script>
import { getList, tj, sh } from "@/api/jhzx/zrcWH";
import { getList, tj, sh } from "@/api/jhzx/zrcSH";
import { param } from "@/utils";
export default {
name: "zrcSH",
@ -195,7 +197,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "dcFD",
field: "dcFd",
title: "分段号",
align: "center",
minWidth: "80",
@ -216,7 +218,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "ZL",
field: "zl",
title: "重量",
align: "center",
minWidth: "70",
@ -237,7 +239,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "dcPL",
field: "dcPl",
title: "批量号",
align: "center",
minWidth: "80",
@ -405,7 +407,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "LP",
field: "sjcLp",
title: "时间差L-P",
align: "center",
minWidth: "120",
@ -468,7 +470,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "RS",
field: "sjcRs",
title: "时间差R-S",
align: "center",
minWidth: "120",
@ -531,7 +533,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "UV",
field: "sjcUv",
title: "时间差U-V",
align: "center",
minWidth: "120",
@ -951,4 +953,16 @@ export default {
::v-deep .el-date-editor.el-input__inner {
width: auto !important;
}
.flex-form {
// display: flex;
// justify-content: space-between;
// align-items: center;
.flex-query {
display: flex;
}
.button {
width: 100%;
text-align: right;
}
}
</style>

@ -3,46 +3,50 @@
<el-container>
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="75px">
<el-row>
<el-col :span="4">
<el-form-item label="钢加开始:">
<el-date-picker
v-model="request.date"
type="daterange"
format="yyyy/MM/dd"
:unlink-panels="true"
range-separator="~"
start-placeholder=""
end-placeholder=""
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="状态:">
<el-select
v-model="request.Zt"
placeholder="状态"
clearable
disabled
>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
<div class="flex-form" style="width: 100%">
<div class="flex-query">
<div>
<el-form-item label="钢加开始:" style="width: 300px">
<el-date-picker
v-model="request.date"
type="daterange"
format="yyyy/MM/dd"
:unlink-panels="true"
range-separator="~"
start-placeholder=""
end-placeholder=""
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" style="text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('submit')"
>提交</el-button
>
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
</el-date-picker>
</el-form-item>
</div>
<div>
<el-form-item label="状态:" style="width: 300px">
<el-select
v-model="request.Zt"
placeholder="状态"
clearable
disabled
>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
</div>
<div style="width: 100%; text-align: right">
<el-button
type="success"
@click="toolbarButtonClickEvent('submit')"
>提交</el-button
>
<el-button type="primary" @click="initList()"></el-button>
</div>
</div>
</div>
<el-row>
<el-col :span="24" style="text-align: right">
<div class="upload-demo">
@ -202,7 +206,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "dcFD",
field: "dcFd",
title: "分段号",
align: "center",
minWidth: "80",
@ -223,7 +227,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "ZL",
field: "zl",
title: "重量",
align: "center",
minWidth: "70",
@ -244,7 +248,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "dcPL",
field: "dcPl",
title: "批量号",
align: "center",
minWidth: "80",
@ -412,7 +416,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "LP",
field: "sjcLp",
title: "时间差L-P",
align: "center",
minWidth: "120",
@ -475,7 +479,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "RS",
field: "sjcRs",
title: "时间差R-S",
align: "center",
minWidth: "120",
@ -538,7 +542,7 @@ export default {
filterRender: { name: "FilterCombination" },
},
{
field: "UV",
field: "sjcUv",
title: "时间差U-V",
align: "center",
minWidth: "120",
@ -969,4 +973,13 @@ export default {
::v-deep .el-date-editor.el-input__inner {
width: auto !important;
}
.flex-form {
// width: 100%;
// display: flex;
// justify-content: space-between;
// align-items: center;
.flex-query {
display: flex;
}
}
</style>

@ -137,6 +137,9 @@ export default {
created() {
window.addEventListener("resize", this.getHeight);
this.getHeight();
var date=new Date;
var year=date.getFullYear();
this.request.nf = year;
this.typeList();
this.initList();
},
@ -159,7 +162,7 @@ export default {
const { updateRecords } = this.$refs.tableRef.getRecordset();
switch (code) {
case "generate":
generate().then((res) => {
generate(this.request.nf).then((res) => {
if (res.success) {
const xTable = this.$refs.tableRef;
xTable.loadData(this.initList());

@ -193,7 +193,7 @@ export default {
editRender: {
name: "$select",
options: [],
props: { clearable: true },
props: { clearable: true }
},
filters: [
{
@ -274,7 +274,7 @@ export default {
for (let i = 0; i < this.personnelInfoList.length; i++) {
const temp = {
label: this.personnelInfoList[i].rymc,
value: this.personnelInfoList[i].jgflm,
value: this.personnelInfoList[i].rymc,
};
testList.push(temp);
}

@ -4,34 +4,32 @@
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="100px">
<el-row>
<el-col :span="20">
<el-col :span="4">
<el-form-item label="设备编号:">
<el-input
v-model="request.sbbh"
placeholder="设备编号"
clearable
<el-col :span="4">
<el-form-item label="设备编号:">
<el-input
v-model="request.sbbh"
placeholder="设备编号"
clearable
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属部门:">
<el-select
v-model="request.szcs"
placeholder="所属部门"
clearable
>
<el-option
v-for="item in departmentOptions"
:key="item.bm"
:value="item.bm"
:label="item.bmsm"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="所属部门:">
<el-select
v-model="request.szcs"
placeholder="所属部门"
clearable
>
<el-option
v-for="item in departmentOptions"
:key="item.bm"
:value="item.bm"
:label="item.bmsm"
/>
</el-select>
</el-form-item>
</el-col>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" style="text-align: right">
<el-col :span="16" style="text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('insert')"
>添加</el-button
>
@ -39,30 +37,28 @@
</el-col>
</el-row>
<el-row>
<el-col :span="20">
<el-col :span="4">
<el-form-item label="计划开始时间:">
<el-date-picker
v-model="request.beginTime"
value-format="yyyy/MM/dd"
type="date"
placeholder="计划开始时间"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="计划结束时间:">
<el-date-picker
v-model="request.endTime"
type="date"
value-format="yyyy/MM/dd"
placeholder="计划结束时间"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="计划开始时间:">
<el-date-picker
v-model="request.beginTime"
value-format="yyyy/MM/dd"
type="date"
placeholder="计划开始时间"
style="width: 100%"
/>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="计划结束时间:">
<el-date-picker
v-model="request.endTime"
type="date"
value-format="yyyy/MM/dd"
placeholder="计划结束时间"
/>
</el-form-item>
</el-col>
<el-col :span="4" style="text-align: right">
<el-col :span="16" style="text-align: right">
<el-button type="danger" @click="toolbarButtonClickEvent('delete')"
>删除</el-button
>
@ -237,7 +233,7 @@ export default {
options: [],
props: {
clearable: true,
}
},
},
slots: { edit: "sbmc_edit" },
filters: [
@ -260,7 +256,7 @@ export default {
field: "sbbh",
title: "设备编号",
align: "center",
minWidth: "120",
minWidth: "130",
editRender: { name: "input" },
slots: { edit: "sbbh_edit" },
filters: [
@ -472,7 +468,7 @@ export default {
departmentOptions: [],
options: [],
sbmcOptions: [],
checkedList: []
checkedList: [],
};
},
created() {

@ -4,7 +4,7 @@
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="45px">
<el-row>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="船号:">
<el-select v-model="request.dcCh" placeholder="船号" clearable>
<el-option
@ -17,7 +17,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="批量:">
<el-input
v-model="request.dcPl"
@ -27,9 +27,14 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="16" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="状态:">
<el-select v-model="request.zt" placeholder="状态" clearable>
<el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
:key="item.value"
@ -40,12 +45,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="text-align: right">
<el-col :span="20" style="text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('insert')"
>提交</el-button
>

@ -4,7 +4,7 @@
<el-header style="width: 100%">
<el-form ref="requestForm" :model="request" label-width="45px">
<el-row>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="船号:">
<el-select v-model="request.dcCh" placeholder="船号" clearable>
<el-option
@ -17,7 +17,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="4">
<el-form-item label="批量:">
<el-input
v-model="request.dcPl"
@ -27,9 +27,14 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="16" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="状态:">
<el-select v-model="request.zt" placeholder="状态" clearable>
<el-select v-model="request.Zt" placeholder="状态" clearable>
<el-option
v-for="item in statusOptions"
:key="item.value"
@ -40,12 +45,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6" style="text-align: right">
<el-button type="primary" @click="initList()"></el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="text-align: right">
<el-col :span="20" style="text-align: right">
<el-button type="success" @click="toolbarButtonClickEvent('insert')"
>审核</el-button
>

Loading…
Cancel
Save