|
|
@ -3,20 +3,33 @@ |
|
|
<!-- 菜单按钮区域 --> |
|
|
<!-- 菜单按钮区域 --> |
|
|
<fieldset class="customer-field" style="width: 612px; padding: 0.35em 0.75em 0.425em;" > |
|
|
<fieldset class="customer-field" style="width: 612px; padding: 0.35em 0.75em 0.425em;" > |
|
|
<legend>菜单</legend> |
|
|
<legend>菜单</legend> |
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" > |
|
|
|
|
|
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -2px;" > |
|
|
<el-form-item :label="''"> |
|
|
<el-form-item :label="''"> |
|
|
<el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">列表</el-button> |
|
|
|
|
|
|
|
|
<el-button type="primary" style="margin-left: 30px; margin-bottom: 5px;">列表</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="''"> |
|
|
<el-form-item :label="''"> |
|
|
<el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">关闭</el-button> |
|
|
|
|
|
|
|
|
<el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">关闭</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="''"> |
|
|
<el-form-item :label="''"> |
|
|
<el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">查询</el-button> |
|
|
|
|
|
|
|
|
<el-button type="primary" @click="refreshPageTables()" style="margin-left: 10px; margin-bottom: 5px;">查询</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
</fieldset> |
|
|
</fieldset> |
|
|
|
|
|
<!-- 排序规则 --> |
|
|
|
|
|
<fieldset class="customer-field" style="margin-left: 640px; margin-top: -45px; width: 135px;" > |
|
|
|
|
|
<legend>排序</legend><br> |
|
|
|
|
|
<el-form :inline="true" style="margin-top: -10px; margin-bottom: 15px;" label-position="top" label-width="100px" > |
|
|
|
|
|
<el-form-item :label="''" style="margin-bottom: 5px;"> |
|
|
|
|
|
<el-radio-group v-model="searchData.sortField"> |
|
|
|
|
|
<el-radio label="needDate">要求完工日期</el-radio> |
|
|
|
|
|
<el-radio label="orderNo">订单号</el-radio> |
|
|
|
|
|
<el-radio label="partNo">产品编码</el-radio> |
|
|
|
|
|
</el-radio-group> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
|
|
|
</fieldset> |
|
|
<!-- 查询时间和产品 --> |
|
|
<!-- 查询时间和产品 --> |
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;" > |
|
|
|
|
|
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -15px;" > |
|
|
<el-form-item :label="'录入日期:'"> |
|
|
<el-form-item :label="'录入日期:'"> |
|
|
<el-date-picker class="el-time-width" |
|
|
<el-date-picker class="el-time-width" |
|
|
style="" |
|
|
style="" |
|
|
@ -24,7 +37,7 @@ |
|
|
value-format="yyyy-MM-dd"> |
|
|
value-format="yyyy-MM-dd"> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="''"> |
|
|
|
|
|
|
|
|
<el-form-item :label="''" style="margin-top: -10px;"> |
|
|
<el-date-picker class="el-time-width" |
|
|
<el-date-picker class="el-time-width" |
|
|
style="margin-top: 30px;" |
|
|
style="margin-top: 30px;" |
|
|
v-model="searchData.enterTime2" |
|
|
v-model="searchData.enterTime2" |
|
|
@ -38,7 +51,7 @@ |
|
|
value-format="yyyy-MM-dd" placeholder=""> |
|
|
value-format="yyyy-MM-dd" placeholder=""> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="''"> |
|
|
|
|
|
|
|
|
<el-form-item :label="''" style="margin-top: -10px;"> |
|
|
<el-date-picker class="el-time-width" |
|
|
<el-date-picker class="el-time-width" |
|
|
style="margin-top: 30px;" |
|
|
style="margin-top: 30px;" |
|
|
v-model="searchData.needTime2" |
|
|
v-model="searchData.needTime2" |
|
|
@ -49,24 +62,12 @@ |
|
|
<el-input v-model="searchData.partNo" style="width: 120px"></el-input> |
|
|
<el-input v-model="searchData.partNo" style="width: 120px"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
<!-- 排序规则 --> |
|
|
|
|
|
<fieldset class="customer-field" style="margin-left: 640px; margin-top: -90px; width: 135px;" > |
|
|
|
|
|
<legend>排序</legend><br> |
|
|
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" > |
|
|
|
|
|
<el-form-item :label="''" style="margin-bottom: 5px;"> |
|
|
|
|
|
<el-radio-group v-model="searchData.sortField"> |
|
|
|
|
|
<el-radio label="needDate">要求完工日期</el-radio> |
|
|
|
|
|
<el-radio label="orderNo">订单号</el-radio> |
|
|
|
|
|
<el-radio label="partNo">产品编码</el-radio> |
|
|
|
|
|
</el-radio-group> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
|
|
|
</fieldset> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 排产信息 --> |
|
|
<!-- 排产信息 --> |
|
|
<fieldset class="customer-field" style="margin-top: 10px; width: 612px; padding: 0.125em;" > |
|
|
<fieldset class="customer-field" style="margin-top: 10px; width: 612px; padding: 0.125em;" > |
|
|
<legend>排产信息</legend> |
|
|
<legend>排产信息</legend> |
|
|
<!-- 排产日期 --> |
|
|
<!-- 排产日期 --> |
|
|
<el-form :inline="true" label-position="top" label-width="100px" > |
|
|
|
|
|
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;"> |
|
|
<el-form-item :label="'排产日期:'"> |
|
|
<el-form-item :label="'排产日期:'"> |
|
|
<el-date-picker class="el-time-width" |
|
|
<el-date-picker class="el-time-width" |
|
|
style="" |
|
|
style="" |
|
|
@ -74,7 +75,7 @@ |
|
|
value-format="yyyy-MM-dd"> |
|
|
value-format="yyyy-MM-dd"> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="''"> |
|
|
|
|
|
|
|
|
<el-form-item :label="''" style="margin-top: -10px;"> |
|
|
<el-time-picker |
|
|
<el-time-picker |
|
|
format="HH:mm" |
|
|
format="HH:mm" |
|
|
arrow-control |
|
|
arrow-control |
|
|
@ -83,12 +84,23 @@ |
|
|
value-format="HH:mm"> |
|
|
value-format="HH:mm"> |
|
|
</el-time-picker> |
|
|
</el-time-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="''" style="margin-left: -5px;"> |
|
|
|
|
|
|
|
|
<el-form-item :label="''" style="margin-top: -10px; margin-left: -5px;"> |
|
|
<el-checkbox style="margin-top: 28px;" label="仅查看前道工序已排产的工序" name="type"></el-checkbox> |
|
|
<el-checkbox style="margin-top: 28px;" label="仅查看前道工序已排产的工序" name="type"></el-checkbox> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
|
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 10px;"> |
|
|
|
|
|
<el-form-item :label="'工厂编号:'"> |
|
|
|
|
|
<el-input v-model="searchData.site" style="width: 85px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="'机台编号:'"> |
|
|
|
|
|
<el-input v-model="searchData.resourceId" style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="'加工中心编码:'"> |
|
|
|
|
|
<el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
<!-- 记录示意图 --> |
|
|
<!-- 记录示意图 --> |
|
|
<fieldset style="margin-left: 380px; margin-top: -40px; width: 180px;"> |
|
|
|
|
|
|
|
|
<fieldset style="margin-left: 380px; margin-top: -88px; width: 180px;"> |
|
|
<legend>记录示意图</legend> |
|
|
<legend>记录示意图</legend> |
|
|
<el-form :inline="true" label-position="top" label-width="100px" class="customer-card"> |
|
|
<el-form :inline="true" label-position="top" label-width="100px" class="customer-card"> |
|
|
<el-form-item :label="'已关闭,已达数量'"> |
|
|
<el-form-item :label="'已关闭,已达数量'"> |
|
|
@ -103,33 +115,23 @@ |
|
|
</el-form> |
|
|
</el-form> |
|
|
</fieldset> |
|
|
</fieldset> |
|
|
<!-- 等待订单 --> |
|
|
<!-- 等待订单 --> |
|
|
<fieldset style="margin-left: 585px; margin-top: -93px; width: 180px; "> |
|
|
|
|
|
|
|
|
<fieldset style="margin-left: 585px; margin-top: -93px; width: 180px; margin-bottom: 5px;"> |
|
|
<legend>等待订单</legend> |
|
|
<legend>等待订单</legend> |
|
|
<el-form :inline="true" label-position="left" label-width="100px" class="customer-border"> |
|
|
<el-form :inline="true" label-position="left" label-width="100px" class="customer-border"> |
|
|
<el-form-item :label="'等待时间(分钟):'" > |
|
|
<el-form-item :label="'等待时间(分钟):'" > |
|
|
<el-input type="number" v-model="searchData.waitTimes" |
|
|
<el-input type="number" v-model="searchData.waitTimes" |
|
|
style="margin-top: 15px; width: 48px;"> |
|
|
|
|
|
|
|
|
style="margin-top: 3px; width: 48px;"> |
|
|
</el-input> |
|
|
</el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
<el-form-item :label="''" style="text-align: center;"> |
|
|
|
|
|
<el-button type="primary" style="margin-left: 30px; margin-top: 13px; margin-bottom: 5px;">插入等待订单</el-button> |
|
|
|
|
|
|
|
|
<el-form-item :label="''" style="text-align: center; margin-top: 15px; margin-bottom: 9px;"> |
|
|
|
|
|
<el-button type="primary" style="margin-left: 30px; margin-top: 10px; margin-bottom: 15px;">插入等待订单</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-form> |
|
|
</el-form> |
|
|
</fieldset> |
|
|
</fieldset> |
|
|
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -50px;"> |
|
|
|
|
|
<el-form-item :label="'工厂编号:'"> |
|
|
|
|
|
<el-input v-model="searchData.site" style="width: 85px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="'机台编号:'"> |
|
|
|
|
|
<el-input v-model="searchData.resourceId" style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
<el-form-item :label="'加工中心编码:'"> |
|
|
|
|
|
<el-input v-model="searchData.workCenterNo" style="width: 120px"></el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
|
|
|
|
|
|
|
|
|
</fieldset > |
|
|
</fieldset > |
|
|
<!-- 机台班次信息 --> |
|
|
<!-- 机台班次信息 --> |
|
|
<el-main style="margin-left: 950px; margin-top: -245px; width: 452px;"> |
|
|
|
|
|
|
|
|
<el-main style="margin-left: 770px; margin-top: -255px; width: 452px;"> |
|
|
<el-table |
|
|
<el-table |
|
|
height="235" |
|
|
height="235" |
|
|
:data="resourceShiftList" |
|
|
:data="resourceShiftList" |
|
|
@ -166,7 +168,7 @@ |
|
|
:data="shopOrderList" |
|
|
:data="shopOrderList" |
|
|
border |
|
|
border |
|
|
v-loading="dataListLoading" |
|
|
v-loading="dataListLoading" |
|
|
style="width: 100%;"> |
|
|
|
|
|
|
|
|
style="margin-top: -20px; width: 100%;"> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
v-for="(item,index) in columnOrderArray" :key="index" |
|
|
v-for="(item,index) in columnOrderArray" :key="index" |
|
|
:sortable="item.columnSortable" |
|
|
:sortable="item.columnSortable" |
|
|
@ -196,7 +198,7 @@ |
|
|
:data="orderScheduleList" |
|
|
:data="orderScheduleList" |
|
|
border |
|
|
border |
|
|
v-loading="dataListLoading" |
|
|
v-loading="dataListLoading" |
|
|
style="width: 100%;"> |
|
|
|
|
|
|
|
|
style="margin-top: -20px; width: 100%;"> |
|
|
<el-table-column |
|
|
<el-table-column |
|
|
v-for="(item,index) in columnOrderScheduleArray" :key="index" |
|
|
v-for="(item,index) in columnOrderScheduleArray" :key="index" |
|
|
:sortable="item.columnSortable" |
|
|
:sortable="item.columnSortable" |
|
|
|