@@ -0,0 +1,14 @@ | |||
<?xml version="1.0" encoding="UTF-8"?> | |||
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> | |||
<title>rollback</title> | |||
<g id="页面" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> | |||
<g id="按钮与选择" transform="translate(-135.000000, -282.000000)" fill-rule="nonzero"> | |||
<g id="编组-3" transform="translate(127.000000, 274.000000)"> | |||
<g id="rollback" transform="translate(8.000000, 8.000000)"> | |||
<rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="16" height="16"></rect> | |||
<path d="M11.390625,3.78125 L5.71875,3.78125 L5.71875,2.625 C5.71875,2.5203125 5.5984375,2.4625 5.5171875,2.5265625 L3.2984375,4.2765625 C3.234375,4.3265625 3.234375,4.4234375 3.2984375,4.4734375 L5.5171875,6.2234375 C5.5984375,6.2875 5.71875,6.2296875 5.71875,6.125 L5.71875,4.96875 L11.203125,4.96875 C11.7554097,4.96875 12.203125,5.41646525 12.203125,5.96875 L12.203125,11.3125 C12.203125,11.8647847 11.7554097,12.3125 11.203125,12.3125 L2.93775156,12.3125 L2.93775156,12.3125 C2.55569144,12.3125 2.36466138,12.4938859 2.36466138,12.8566576 C2.36466138,13.5 2.93775156,13.5 2.93775156,13.5 C2.93775156,13.5 5.75537604,13.5 11.390625,13.5 C13,13.5 13.390625,12.8986083 13.390625,11.9909216 L13.390625,4.96875 C13.390625,4.06071182 13,3.78125 11.390625,3.78125 Z" id="路径" fill="currentColor"></path> | |||
</g> | |||
</g> | |||
</g> | |||
</g> | |||
</svg> |
@@ -1,7 +1,7 @@ | |||
<template> | |||
<el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form"> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form" label-position='top'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="订单名" prop="orderId"> | |||
<el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;"> | |||
<el-option | |||
@@ -13,14 +13,12 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="发货单名称" prop="name"> | |||
<el-input v-model="form.name"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="发货时间" prop="deliveryTime"> | |||
<el-date-picker | |||
v-model="form.deliveryTime" | |||
@@ -32,14 +30,14 @@ | |||
</el-date-picker> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="发货单号" prop="code"> | |||
<el-input v-model="form.code"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="发货负责人" prop="deliveryPersonId"> | |||
<el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;"> | |||
<el-option | |||
@@ -51,21 +49,19 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="运输负责人" prop="principal"> | |||
<el-input v-model="form.principal"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="运输联系方式" prop="principalCall"> | |||
<el-input v-model="form.principalCall"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="运输费用" prop="principalCost"> | |||
<el-input-number v-model="form.principalCost" :min="0" :max='9999999999' :precision='2'></el-input-number> | |||
<el-input-number v-model="form.principalCost" :min="0" :max='9999999999' :precision='2' style='width: 100%;'></el-input-number> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
@@ -2,10 +2,11 @@ | |||
<div> | |||
<el-drawer | |||
title="发货清单详情" | |||
size="60%" | |||
size="65%" | |||
:append-to-body="true" | |||
:visible.sync="centervisible" | |||
@close='close'> | |||
@close='close' | |||
:show-close='false'> | |||
<div class="box1"> | |||
<el-row> | |||
<el-col :span='12'> | |||
@@ -90,7 +91,7 @@ const tableProps = [ | |||
{ | |||
prop: 'packagingSize', | |||
label: '装箱规格(片/箱)', | |||
width: 120 | |||
width: 150 | |||
}, | |||
{ | |||
prop: 'packagingNum', | |||
@@ -1,19 +1,17 @@ | |||
<template> | |||
<el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form"> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-form ref="addOrUpdate" :rules="rules" label-width="130px" :model="form" label-position='top'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="发货单号"> | |||
<el-input v-model="code" disabled></el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="装车单号" prop="deliveryCarCode"> | |||
<el-input v-model="form.deliveryCarCode"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="装车时间" prop="loadTime"> | |||
<el-date-picker | |||
v-model="form.loadTime" | |||
@@ -25,19 +23,19 @@ | |||
</el-date-picker> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="车辆联系人" prop="contactPerson"> | |||
<el-input v-model="form.contactPerson"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="联系方式" prop="contactPersonCall"> | |||
<el-input v-model="form.contactPersonCall"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="装车产品" prop="productId"> | |||
<el-select v-model="form.productId" disabled placeholder="请选择" style="width: 100%;"> | |||
<el-option | |||
@@ -49,26 +47,24 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="装箱规格(片/箱)" prop="packagingSize"> | |||
<el-input-number v-model="form.packagingSize" :min="0" :max='9999999999' style="width:100%"></el-input-number> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="产品批次" prop="productDate"> | |||
<el-input v-model="form.productDate" placeholder="多个批次用','隔开"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="箱/托数" prop="packagingNum"> | |||
<el-input-number v-model="form.packagingNum" :min="0" :max='9999999999' style="width:100%"></el-input-number> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="装车总量" prop="quantity"> | |||
<el-input-number v-model="form.quantity" :min="0" :max='9999999999' style="width:100%"></el-input-number> | |||
</el-form-item> | |||
@@ -103,7 +103,8 @@ const tableProps = [ | |||
}, | |||
{ | |||
prop: 'principalCost', | |||
label: '运输费用' | |||
label: '运输费用', | |||
align: 'right' | |||
}, | |||
{ | |||
prop: 'remark', | |||
@@ -225,7 +226,11 @@ export default { | |||
}, | |||
getList() { | |||
deliveryLogPage({...this.queryParams}).then(res => { | |||
this.list = res.data.list || [] | |||
let arr = res.data.list || [] | |||
arr && arr.map(item => { | |||
item.principalCost = item.principalCost.toFixed(2) | |||
}) | |||
this.list = arr | |||
this.total = res.data.total || 0 | |||
}) | |||
}, | |||
@@ -4,7 +4,8 @@ | |||
:visible.sync="centervisible" | |||
size="80%" | |||
class="deliveryLogDetail" | |||
@close='closeA'> | |||
@close='closeA' | |||
:show-close='false'> | |||
<div class="box1"> | |||
<div class="box_col"> | |||
<div class="blodTip">订单名</div> | |||
@@ -77,7 +78,8 @@ | |||
size="60%" | |||
:append-to-body="true" | |||
:visible.sync="innerDrawer" | |||
@close='closeB'> | |||
@close='closeB' | |||
:show-close='false'> | |||
<div class="box3"> | |||
<el-row> | |||
<el-col :span='12'> | |||
@@ -2,7 +2,7 @@ | |||
<div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }"> | |||
<el-form :inline="true" class="demo-form-inline"> | |||
<span class="blue-block"></span> | |||
<el-form-item label="能源类型"> | |||
<el-form-item label="能源类型" required> | |||
<el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small"> | |||
<el-option | |||
v-for="item in energyTypeList" | |||
@@ -12,7 +12,7 @@ | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="时间维度"> | |||
<el-form-item label="时间维度" required> | |||
<el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small"> | |||
<el-option | |||
v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)" | |||
@@ -22,7 +22,7 @@ | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="时间范围"> | |||
<el-form-item label="时间范围" required> | |||
<div v-show="queryParams.timeDim === '1'"> | |||
<el-date-picker | |||
v-model="timeValue" | |||
@@ -124,7 +124,7 @@ | |||
</el-date-picker> | |||
</div> | |||
</el-form-item> | |||
<el-form-item label="对象维度"> | |||
<el-form-item label="对象维度" required> | |||
<el-select v-model="queryParams.objType" placeholder="请选择" style="width: 80px;" @change="selectObjs" size="small"> | |||
<el-option | |||
v-for="item in getDictDatas(this.DICT_TYPE.OBJECT_TYPE)" | |||
@@ -134,7 +134,7 @@ | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="对象选择"> | |||
<el-form-item label="对象选择" required> | |||
<el-select v-model="queryParams.objIds" placeholder="请选择" multiple :multiple-limit='5' collapse-tags style="width: 200px;" size="small"> | |||
<el-option | |||
v-for="item in objectList" | |||
@@ -148,6 +148,8 @@ | |||
</el-form-item> | |||
<el-form-item> | |||
<el-button type="primary" size="small" @click="search">查询</el-button> | |||
<span class="separateStyle"></span> | |||
<el-button size="small" @click="resetBtn">重置</el-button> | |||
</el-form-item> | |||
</el-form> | |||
<span v-if="isFold" class="foldClass" @click='switchMode'> | |||
@@ -400,6 +402,19 @@ export default { | |||
console.log(this.queryParams) | |||
this.$emit('submit', this.queryParams) | |||
}, | |||
resetBtn() { | |||
this.queryParams.energyTypeId = null | |||
this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时 | |||
this.queryParams.objIds = [] | |||
this.queryParams.objType = '' | |||
this.timeValue = [] | |||
this.dateValue = [] | |||
this.weekValue1 = null | |||
this.weekValue2 = null | |||
this.monthValue = [] | |||
this.yearValue1 = null | |||
this.yearValue2 = null | |||
}, | |||
transformTime(timeStamp) {// 本月最后一天 | |||
let year = moment(timeStamp).format('YYYY') | |||
let month = moment(timeStamp).format('MM') | |||
@@ -471,4 +486,12 @@ export default { | |||
height: 45px; | |||
overflow: hidden; | |||
} | |||
.separateStyle { | |||
display: inline-block; | |||
width: 1px; | |||
height: 24px; | |||
background: #E8E8E8; | |||
vertical-align: middle; | |||
margin: 0 10px; | |||
} | |||
</style> |
@@ -34,10 +34,10 @@ export default { | |||
mounted() { | |||
window.addEventListener('resize', () => { | |||
this.tableH = this.tableHeight(260) | |||
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310) | |||
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437) | |||
// console.log(document.getElementById("contrastAnalysisBox").offsetWidth) | |||
}) | |||
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1310) | |||
this.isFold = this.searchBarWidth('contrastAnalysisBox', 1437) | |||
}, | |||
methods: { | |||
getList(params) { | |||
@@ -1,7 +1,7 @@ | |||
<template> | |||
<el-form :inline="true" class="demo-form-inline"> | |||
<span class="blue-block"></span> | |||
<el-form-item label="对象选择"> | |||
<el-form-item label="对象选择" required> | |||
<el-cascader | |||
v-model="objArr" | |||
:options="objList" | |||
@@ -11,7 +11,7 @@ | |||
style="width: 250px;" | |||
clearable></el-cascader> | |||
</el-form-item> | |||
<el-form-item label="时间维度"> | |||
<el-form-item label="时间维度" required> | |||
<el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small"> | |||
<el-option | |||
v-for="item in timeType" | |||
@@ -22,7 +22,7 @@ | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="时间"> | |||
<el-form-item label="时间" required> | |||
<div v-show="queryParams.type === 1"> | |||
<el-date-picker | |||
v-model="monthValue" | |||
@@ -129,7 +129,7 @@ export default { | |||
}, | |||
// 查询 | |||
search() { | |||
if (!this.objArr.length === 0) { | |||
if (this.objArr.length === 0) { | |||
this.$modal.msgError('请选择对象') | |||
return false | |||
} else { | |||
@@ -2,7 +2,7 @@ | |||
<div class="searchBarBox divHeight" ref="searchBarRef" :style="{ paddingRight: isFold ? '55px' : '0px' }"> | |||
<el-form :inline="true" class="demo-form-inline"> | |||
<span class="blue-block"></span> | |||
<el-form-item label="能源类型"> | |||
<el-form-item label="能源类型" required> | |||
<el-select v-model="queryParams.energyTypeId" placeholder="请选择" style="width: 100px;" size="small"> | |||
<el-option | |||
v-for="item in energyTypeList" | |||
@@ -12,7 +12,7 @@ | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="对象选择"> | |||
<el-form-item label="对象选择" required> | |||
<el-cascader | |||
v-model="objArr" | |||
:options="objList" | |||
@@ -21,7 +21,7 @@ | |||
size="small" | |||
clearable></el-cascader> | |||
</el-form-item> | |||
<el-form-item label="时间维度"> | |||
<el-form-item label="时间维度" required> | |||
<el-select v-model="queryParams.timeDim" placeholder="请选择" style="width: 80px;" size="small"> | |||
<el-option | |||
v-for="item in getDictDatas(this.DICT_TYPE.TIME_DIM)" | |||
@@ -32,7 +32,7 @@ | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="时间范围"> | |||
<el-form-item label="时间范围" required> | |||
<div v-show="queryParams.timeDim === '1'"> | |||
<el-date-picker | |||
v-model="timeValue" | |||
@@ -129,6 +129,8 @@ | |||
</el-form-item> | |||
<el-form-item> | |||
<el-button type="primary" size="small" @click="search">查询</el-button> | |||
<span class="separateStyle"></span> | |||
<el-button size="small" @click="resetBtn">重置</el-button> | |||
</el-form-item> | |||
</el-form> | |||
<span v-if="isFold" class="foldClass" @click='switchMode'> | |||
@@ -360,6 +362,14 @@ export default { | |||
this.queryParams.endTime = this.queryParams.endTime + '' | |||
this.$emit('submit', this.queryParams) | |||
}, | |||
// 重置 | |||
resetBtn() { | |||
this.queryParams.energyTypeId = null | |||
this.queryParams.objId = null | |||
this.objArr = [] | |||
this.queryParams.timeDim = this.getDictDatas(this.DICT_TYPE.TIME_DIM)[0].value // 默认时 | |||
this.timeValue = [moment().startOf('day'), moment().endOf('day')-59*61*1000] | |||
}, | |||
transformTime(timeStamp) {// 本月最后一天 | |||
let year = moment(timeStamp).format('YYYY') | |||
let month = moment(timeStamp).format('MM') | |||
@@ -435,4 +445,12 @@ export default { | |||
height: 45px; | |||
overflow: hidden; | |||
} | |||
.separateStyle { | |||
display: inline-block; | |||
width: 1px; | |||
height: 24px; | |||
background: #E8E8E8; | |||
vertical-align: middle; | |||
margin: 0 10px; | |||
} | |||
</style> |
@@ -34,9 +34,9 @@ export default { | |||
mounted() { | |||
window.addEventListener('resize', () => { | |||
this.tableH = this.tableHeight(260) | |||
this.isFold = this.searchBarWidth('trendAnalysisBox', 1146) | |||
this.isFold = this.searchBarWidth('trendAnalysisBox', 1263) | |||
}) | |||
this.isFold = this.searchBarWidth('trendAnalysisBox', 1146) | |||
this.isFold = this.searchBarWidth('trendAnalysisBox', 1263) | |||
}, | |||
methods: { | |||
getList(params) { | |||
@@ -1,7 +1,7 @@ | |||
<template> | |||
<el-form :inline="true" class="demo-form-inline"> | |||
<span class="blue-block"></span> | |||
<el-form-item label="对象选择"> | |||
<el-form-item label="对象选择" required> | |||
<el-cascader | |||
v-model="objArr" | |||
:options="objList" | |||
@@ -10,7 +10,7 @@ | |||
size="small" | |||
clearable></el-cascader> | |||
</el-form-item> | |||
<el-form-item label="时间维度"> | |||
<el-form-item label="时间维度" required> | |||
<el-select v-model="queryParams.type" placeholder="请选择" style="width: 80px;" size="small"> | |||
<el-option | |||
v-for="item in timeType" | |||
@@ -21,7 +21,7 @@ | |||
</el-option> | |||
</el-select> | |||
</el-form-item> | |||
<el-form-item label="时间"> | |||
<el-form-item label="时间" required> | |||
<div v-show="queryParams.type === 1 || queryParams.type === 2"> | |||
<el-date-picker | |||
v-model="yearValue" | |||
@@ -103,7 +103,7 @@ export default { | |||
}, | |||
// 查询 | |||
search() { | |||
if (!this.objArr.length === 0) { | |||
if (this.objArr.length === 0) { | |||
this.$modal.msgError('请选择对象') | |||
return false | |||
} else { | |||
@@ -25,18 +25,16 @@ | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span="24"> | |||
<el-form-item label="描述" prop="description"> | |||
<el-input v-model="form.description"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span="24"> | |||
<el-col :span="12"> | |||
<el-form-item label="是否采集" prop="collection"> | |||
<el-switch v-model="form.collection"></el-switch> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span="12"> | |||
<el-form-item label="描述" prop="description"> | |||
<el-input v-model="form.description"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
</el-form> | |||
</template> | |||
@@ -1,6 +1,6 @@ | |||
<template> | |||
<div> | |||
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'> | |||
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'> | |||
<div class="box"> | |||
<el-form :inline="true"> | |||
<el-form-item label="关联表名"> | |||
@@ -27,7 +27,7 @@ | |||
</template> | |||
<script> | |||
import { getEnergyQuantityRealtimePage, exportEnergyQuantityRealtimeExcel } from "@/api/base/energyQuantityRealtime" | |||
import { getEnergyQuantityRealtimePage } from "@/api/base/energyQuantityRealtime" | |||
import { getEnergyTypeListAll } from "@/api/base/energyType" | |||
// import { publicFormatter } from '@/utils/dict' | |||
import FileSaver from "file-saver" | |||
@@ -140,18 +140,16 @@ export default { | |||
break | |||
default: | |||
this.exportTable() | |||
// this.$modal.confirm('是否确认导出').then(() => { | |||
// return exportEnergyQuantityRealtimeExcel({...this.queryParams}); | |||
// }).then(response => { | |||
// console.log(response) | |||
// this.$download.excel(response, '能源抄表.xls'); | |||
// }).catch(() => {}) | |||
} | |||
}, | |||
/** 查询列表 */ | |||
getList() { | |||
getEnergyQuantityRealtimePage(this.queryParams).then(response => { | |||
this.list = response.data.list || [] | |||
let arr = response.data.list || [] | |||
arr && arr.map(item => { | |||
item.amount = item.amount ? (!isNaN(parseFloat(item.amount)) && isFinite(item.amount) ? item.amount.toFixed(2) : '') : '' | |||
}) | |||
this.list = arr | |||
this.total = response.data.total; | |||
this.exportList = [] | |||
}); | |||
@@ -5,7 +5,8 @@ | |||
v-for='item in tableProps' | |||
:key="item.prop" | |||
:prop="item.prop" | |||
:label="item.label" | |||
:label="item.label" | |||
:align="item.align ? item.align : 'left'" | |||
width="120"> | |||
</el-table-column> | |||
</el-table> | |||
@@ -1,6 +1,6 @@ | |||
<template> | |||
<div> | |||
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD'> | |||
<el-drawer :title="drawerTitle" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'> | |||
<div class="box"> | |||
<el-form :inline="true"> | |||
<el-form-item label="方案名称"> | |||
@@ -3,7 +3,8 @@ | |||
title="新增" | |||
:visible.sync="centervisible" | |||
size="60%" | |||
@close='closeA'> | |||
@close='closeA' | |||
:show-close='false'> | |||
<div class="box"> | |||
<!-- 搜索工作栏 --> | |||
<search-bar | |||
@@ -156,7 +156,7 @@ export default { | |||
} | |||
}) | |||
} else { | |||
createGroupClasses({ ...obj }).then((res) => { | |||
createGroupClasses({ ...this.form }).then((res) => { | |||
if (res.code === 0) { | |||
this.$modal.msgSuccess("操作成功"); | |||
this.$emit('successSubmit') | |||
@@ -1,6 +1,6 @@ | |||
<template> | |||
<div> | |||
<el-drawer :title="title" :visible.sync="visible" size="70%" @close='closeD'> | |||
<el-drawer :title="title" :visible.sync="visible" size="70%" @close='closeD' :show-close='false'> | |||
<div class="box"> | |||
<el-row class="topBox"> | |||
<el-col :span="6"> | |||
@@ -59,6 +59,7 @@ | |||
@cancel="handleCancel" | |||
@confirm="handleConfirm" | |||
:before-close="handleCancel" | |||
width='40%' | |||
> | |||
<worker-team-add ref="workerTeamAdd" @successSubmit="successSubmit" /> | |||
</base-dialog> | |||
@@ -38,6 +38,7 @@ | |||
@cancel="handleCancel" | |||
@confirm="handleConfirm" | |||
:before-close="handleCancel" | |||
width='40%' | |||
> | |||
<group-team-add ref="groupList" @successSubmit="successSubmit" /> | |||
</base-dialog> | |||
@@ -50,9 +51,9 @@ | |||
import { getGroupTeamPage, deleteGroupTeam, updateGroupTeam } from "@/api/base/groupTeam"; | |||
import { parseTime } from '@/utils/ruoyi' | |||
import GroupTeamAdd from './components/groupTeamAdd' | |||
import StatusBtn from './components/statusBtn.vue' | |||
import WorkerOperate from './components/workerOperate.vue' | |||
import WorkerEdit from './components/workerEdit.vue'; | |||
import StatusBtn from './components/statusBtn' | |||
import WorkerOperate from './components/workerOperate' | |||
import WorkerEdit from './components/workerEdit' | |||
const tableProps = [ | |||
{ | |||
prop: 'createTime', | |||
@@ -1,7 +1,7 @@ | |||
<template> | |||
<el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form"> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-form ref="addWorkOrder" :rules="rules" label-width="130px" :model="form" label-position='top'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="工单名称" prop="name" v-if='!isBind'> | |||
<el-input v-model="form.name"></el-input> | |||
</el-form-item> | |||
@@ -16,14 +16,12 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="工单编码" prop="code"> | |||
<el-input v-model="form.code" disabled></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="产品名称" prop="planProductId"> | |||
<el-select v-model="form.planProductId" placeholder="请选择" disabled style="width: 100%;"> | |||
<el-option | |||
@@ -37,7 +35,7 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="计划开始时间"> | |||
<el-date-picker | |||
v-model="planStartTime" | |||
@@ -50,8 +48,8 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="计划完成时间"> | |||
<el-date-picker | |||
v-model="planFinishTime" | |||
@@ -63,19 +61,17 @@ | |||
</el-date-picker> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="计划投入数量" prop="planAssignQuantity"> | |||
<el-input-number v-model="form.planAssignQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="计划生产数量" prop="planQuantity"> | |||
<el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" :disabled="isBind" style="width: 100%;"></el-input-number> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="关联工艺" prop="processFlowId"> | |||
<el-select v-model="form.processFlowId" placeholder="请选择" disabled style="width: 100%;"> | |||
<el-option | |||
@@ -88,16 +84,16 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="物料计算方式" prop="materialMethod"> | |||
<el-radio-group v-model="form.materialMethod" disabled> | |||
<el-radio :label="1">产品基础BOM</el-radio> | |||
<el-radio :label="2">工艺扩展BOM</el-radio> | |||
</el-radio-group> | |||
<el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" disabled> | |||
<el-option label="产品基础BOM" :value="1"></el-option> | |||
<el-option label="工艺扩展BOM" :value="2"></el-option> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="优先级" prop="priority"> | |||
<el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" :disabled="isBind"> | |||
<el-option | |||
@@ -109,9 +105,7 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="工单类型" prop="type"> | |||
<el-select v-model="form.type" placeholder="请选择" style="width: 100%;" :disabled="isBind"> | |||
<el-option | |||
@@ -123,7 +117,7 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="关联产线" prop="productLineId"> | |||
<el-select v-model="form.productLineId" placeholder="请选择" multiple style="width: 100%;" :disabled="isBind"> | |||
<el-option | |||
@@ -136,15 +130,13 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="负责人" prop="workers"> | |||
<el-input v-model="form.workers" :disabled="isBind"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="计划分配订单量" prop="planAssignmentQuantity"> | |||
<el-input-number v-model="form.planAssignmentQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number> | |||
</el-form-item> | |||
@@ -1,24 +1,22 @@ | |||
<template> | |||
<el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form"> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-form ref="orderAddForm" :rules="rules" label-width="130px" :model="form" label-position='top'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="订单名称" prop="name"> | |||
<el-input v-model="form.name"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="订单号" prop="code"> | |||
<el-input v-model="form.code"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="计划加工数量" prop="planQuantity"> | |||
<el-input-number v-model="form.planQuantity" :min="0" :max="9999999999999" style="width: 100%;"></el-input-number> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="产品名称" prop="planProductId"> | |||
<el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;"> | |||
<el-option | |||
@@ -33,13 +31,13 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="单价" prop="price"> | |||
<el-input-number v-model="form.price" :min="0" :max="9999999999999" :precision='2' style="width: 100%;"></el-input-number> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="客户" prop="customerId"> | |||
<el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable> | |||
<el-option | |||
@@ -51,9 +49,7 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="优先级" prop="priority"> | |||
<el-select v-model="form.priority" placeholder="请选择" style="width: 100%;" clearable> | |||
<el-option | |||
@@ -65,7 +61,7 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="包装规格" prop="packSpec"> | |||
<el-select v-model="form.packSpec" placeholder="请选择" style="width: 100%;" clearable> | |||
<el-option | |||
@@ -78,13 +74,13 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="负责人" prop="workers"> | |||
<el-input v-model="form.workers"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="关联工艺" prop="processFlowId"> | |||
<el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange"> | |||
<el-option | |||
@@ -96,17 +92,15 @@ | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="物料计算方式" prop="materialMethod"> | |||
<el-radio-group v-model="form.materialMethod" @change='materialMethodChange'> | |||
<el-radio :label="1">产品基础BOM</el-radio> | |||
<el-radio :label="2">工艺扩展BOM</el-radio> | |||
</el-radio-group> | |||
<el-select v-model="form.materialMethod" placeholder="请选择" style="width: 100%;" @change='materialMethodChange'> | |||
<el-option label="产品基础BOM" :value="1"></el-option> | |||
<el-option label="工艺扩展BOM" :value="2"></el-option> | |||
</el-select> | |||
</el-form-item> | |||
</el-col> | |||
<el-col :span='12'> | |||
<el-col :span='6'> | |||
<el-form-item label="订单计划开始时间" prop="planStartTime"> | |||
<el-date-picker | |||
v-model="form.planStartTime" | |||
@@ -119,8 +113,8 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<el-col :span='12'> | |||
<el-row :gutter="20"> | |||
<el-col :span='6'> | |||
<el-form-item label="订单计划完成时间" prop="planFinishTime"> | |||
<el-date-picker | |||
v-model="form.planFinishTime" | |||
@@ -138,20 +132,19 @@ | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
<el-row> | |||
<!-- <el-row> | |||
<el-col :span='24'> | |||
<el-form-item label="描述信息" prop="description"> | |||
<el-input v-model="form.description"></el-input> | |||
</el-form-item> | |||
</el-col> | |||
</el-row> | |||
</el-row> --> | |||
</el-form> | |||
</template> | |||
<script> | |||
import { getOrderCode, getOrderById, getProcessFlowList, orderUpdate, orderCreate } from '@/api/base/orderManage' | |||
import { getProductAll } from '@/api/base/product' | |||
import { getCustomerList } from '@/api/base/customer' | |||
import moment from 'moment' | |||
export default { | |||
name: 'OrderAdd', | |||
data() { | |||
@@ -170,12 +163,13 @@ export default { | |||
processFlowId: '', | |||
materialMethod: 1, | |||
remark: '', | |||
description: '', | |||
// description: '', | |||
planStartTime: '', | |||
planFinishTime: '' | |||
}, | |||
rules: { | |||
name: [{ required: true, message: "订单名称不能为空", trigger: "blur" }], | |||
code: [{ required: true, message: "订单号不能为空", trigger: "blur" }], | |||
planQuantity: [{ required: true, message: "计划加工数量不能为空", trigger: "blur" }], | |||
planProductId: [{ required: true, message: "产品名称不能为空", trigger: "change" }] | |||
}, | |||
@@ -207,7 +201,7 @@ export default { | |||
this.form.materialMethod = res.data.materialMethod | |||
this.form.planFinishTime = res.data.planFinishTime ? res.data.planFinishTime : null | |||
this.form.remark = res.data.remark | |||
this.form.description = res.data.description | |||
// this.form.description = res.data.description | |||
} | |||
}) | |||
} else { | |||
@@ -36,7 +36,7 @@ | |||
@cancel="handleCancel" | |||
@confirm="handleConfirm" | |||
:before-close="handleCancel" | |||
width='70%' | |||
width='60%' | |||
> | |||
<order-add ref="orderAdd" @successSubmit="successSubmit" /> | |||
</base-dialog> | |||
@@ -120,7 +120,8 @@ const tableProps = [ | |||
}, | |||
{ | |||
prop: 'price', | |||
label: '单价(元)' | |||
label: '单价(元)', | |||
align: 'right' | |||
}, | |||
{ | |||
prop: 'workOrderNum', | |||
@@ -5,7 +5,7 @@ | |||
<span class="blueTitle"></span> | |||
<span>订单编码: {{orderMsg.code}}</span> | |||
</div> | |||
<el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage">返回</el-button> | |||
<el-button type="primary" plain size="small" style="float: right;" @click="returnOrderManage"><svg-icon icon-class="return"/> 返回</el-button> | |||
<div style="padding-left: 14px;"> | |||
<el-row> | |||
<el-col :span='3'> | |||
@@ -259,7 +259,8 @@ export default { | |||
let arr = res2.data | |||
arr.map(item => { | |||
if (item) { | |||
item.num = item.num * this.orderMsg.remainingQuantity | |||
let a = item.num * this.orderMsg.remainingQuantity | |||
item.num = !isNaN(parseFloat(a)) && isFinite(a) ? a : '' | |||
} | |||
}) | |||
this.list2 = arr | |||