更新
This commit is contained in:
liushuai
@@ -9,8 +9,8 @@
|
||||
<el-radio :label="1">整改件投产</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="机床号" style="margin-top:28px">
|
||||
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床号" @change="typeChange1()">
|
||||
<el-form-item label="机床图号" style="margin-top:28px">
|
||||
<el-select v-model="toolNumValue" filterable size="small" style="margin-bottom:10px;width: 180px" placeholder="机床图号" @change="typeChange1()">
|
||||
<el-option
|
||||
v-for="item in toolNum"
|
||||
:key="item.value"
|
||||
@@ -78,7 +78,7 @@
|
||||
</el-col>
|
||||
<el-col :span="1" class="line">～</el-col>
|
||||
<el-col :span="11">
|
||||
<el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
|
||||
<el-date-picker v-model="time_machiningFinish" :picker-options="pickerOptions" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
|
||||
</el-col>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
@@ -179,22 +179,22 @@
|
||||
layout="total, sizes, prev, pager, next, jumper"
|
||||
@size-change="handleSizeChange"
|
||||
@current-change="handleCurrentChange"/>
|
||||
<el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" @click="openUrgentItem()">加急件</el-button>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
|
||||
<el-button :loading="listLoading3" type="danger" size="small" style="float:right;margin-left: 10px" plain @click="back">打回</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
|
||||
<el-button :loading="listLoading3" type="warning" size="small" style="float:right;" plain @click="production">投产</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
|
||||
<el-button :loading="listLoading3" type="primary" size="small" style="float:right;" plain @click="production10">备料投产</el-button>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
|
||||
<el-checkbox v-model="checked_hebing" style="margin-top:10px;margin-right:10px">合并生产</el-checkbox>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="将零件加急处理" placement="top">
|
||||
<el-checkbox v-model="checked_UrgentItem" style="float:right;margin-top:10px;margin-right:10px">是否加急</el-checkbox>
|
||||
<el-checkbox v-model="checked_UrgentItem" style="margin-top:10px;margin-right:10px">是否加急</el-checkbox>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
|
||||
<el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
|
||||
<el-button :loading="listLoading3" type="primary" size="small" plain @click="production10">备料投产</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
|
||||
<el-button :loading="listLoading3" type="warning" size="small" plain @click="production">投产</el-button>
|
||||
</el-tooltip>
|
||||
<el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
|
||||
<el-button :loading="listLoading3" type="danger" size="small" style="margin-left: 10px" plain @click="back">打回</el-button>
|
||||
</el-tooltip>
|
||||
<el-button icon="el-icon-circle-plus-outline" type="distribution" size="small" style="float:right;" @click="openUrgentItem()">加急件</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
@@ -294,25 +294,25 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center width="450px">
|
||||
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center width="370px">
|
||||
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
|
||||
<el-form-item label="零件图号" prop="PDnumber">
|
||||
<el-input v-model="form.PDnumber" size="small" disabled style="width:250px" />
|
||||
<el-input v-model="form.PDnumber" size="small" disabled style="width:160px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="投产总数量" prop="quantity">
|
||||
<el-input v-model="form.quantity" size="small" disabled style="width:250px" />
|
||||
<el-input v-model="form.quantity" size="small" disabled style="width:160px" />
|
||||
</el-form-item>
|
||||
<el-form-item label="未投产数量" prop="unputquantity">
|
||||
<el-input v-model="form.unputquantity" size="small" disabled style="width:250px"/>
|
||||
<el-input v-model="form.unputquantity" size="small" disabled style="width:160px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="投产批次" prop="productionBatch">
|
||||
<el-input v-model="form.productionBatch" size="small" disabled style="width:250px" placeholder="请输入投产批次"/>
|
||||
<el-input v-model="form.productionBatch" size="small" disabled style="width:160px" placeholder="请输入投产批次"/>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="temp === 1" label="批次数量1" prop="batchQuantity">
|
||||
<el-input-number v-model="form.batchQuantity" :min="1" :max="parseInt(form.unputquantity)" size="small" style="width:250px" label="批次数量"/>
|
||||
<el-input-number v-model="form.batchQuantity" :min="1" :max="parseInt(form.unputquantity)" size="small" style="width:160px" label="批次数量"/>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="temp === 2" label="批次数量2" prop="batchQuantity2">
|
||||
<el-input-number v-model="form.batchQuantity2" :min="1" :max="parseInt(maxmax)" size="small" style="width:250px" label="批次数量"/>
|
||||
<el-input-number v-model="form.batchQuantity2" :min="1" :max="parseInt(maxmax)" size="small" style="width:160px" label="批次数量"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="加工开始时间">
|
||||
<el-date-picker
|
||||
@@ -321,7 +321,7 @@
|
||||
disabled
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="top: 1px;width:250px"
|
||||
style="top: 1px;width:160px"
|
||||
placeholder="选择开始日期"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="加工结束时间" prop="endDate_F">
|
||||
@@ -331,23 +331,20 @@
|
||||
size="small"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
style="top: 1px;width:250px"
|
||||
style="top: 1px;width:160px"
|
||||
placeholder="选择结束日期"/>
|
||||
</el-form-item>
|
||||
<el-row>
|
||||
<el-col :span="14"/>
|
||||
<el-form-item >
|
||||
<el-button size="small" @click="callOff('form')">取消</el-button>
|
||||
<el-button size="small" type="primary" @click="submit('form')">确定</el-button>
|
||||
</el-form-item>
|
||||
</el-row>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button size="small" @click="callOff('form')">取消</el-button>
|
||||
<el-button size="small" type="primary" @click="submit('form')">确定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible10" title="添加加急件" center style="min-height: 300px" width="500px">
|
||||
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible10" title="添加加急件" center style="min-height: 300px" width="350px">
|
||||
<el-form ref="form10" :model="form10" :rules="rules10" label-position="left" label-width="100px" class="demo-ruleForm">
|
||||
<el-form-item label="机床号" prop="机床号" style="margin-left: 70px">
|
||||
<el-select v-model="form10.机床号" placeholder="选择机床" filterable clearable size="small" style="width:200px" @change="getGroupSelect1">
|
||||
<el-form-item label="机床图号" prop="机床图号">
|
||||
<el-select v-model="form10.机床号" placeholder="选择机床" filterable clearable size="small" style="width:160px" @change="getGroupSelect1">
|
||||
<el-option
|
||||
v-for="item in machine"
|
||||
:key="item.value"
|
||||
@@ -355,8 +352,8 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="组号" prop="组号" style="margin-left: 70px">
|
||||
<el-select v-model="form10.组号" placeholder="选择组号" filterable clearable size="small" style="width:200px">
|
||||
<el-form-item label="组号" prop="组号">
|
||||
<el-select v-model="form10.组号" placeholder="选择组号" filterable clearable size="small" style="width:160px">
|
||||
<el-option
|
||||
v-for="item in group1"
|
||||
:key="item.value"
|
||||
@@ -364,20 +361,20 @@
|
||||
:value="item.value"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="零件图号" prop="零件图号" style="margin-left: 70px">
|
||||
<el-input v-model="form10.零件图号" placeholder="零件图号" size="small" style="width:200px" clearable/>
|
||||
<el-form-item label="零件图号" prop="零件图号">
|
||||
<el-input v-model="form10.零件图号" placeholder="零件图号" size="small" style="width:160px" clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="零件名称" prop="零件名称" style="margin-left: 70px">
|
||||
<el-input v-model="form10.零件名称" placeholder="零件名称" size="small" style="width:200px" clearable/>
|
||||
<el-form-item label="零件名称" prop="零件名称">
|
||||
<el-input v-model="form10.零件名称" placeholder="零件名称" size="small" style="width:160px" clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格" style="margin-left: 70px">
|
||||
<el-input v-model="form10.规格" placeholder="规格" size="small" style="width:200px" clearable/>
|
||||
<el-form-item label="规格">
|
||||
<el-input v-model="form10.规格" placeholder="规格" size="small" style="width:160px" clearable/>
|
||||
</el-form-item>
|
||||
<el-form-item label="零件数量" prop="零件数量" style="margin-left: 70px">
|
||||
<el-input-number v-model="form10.零件数量" :step="1" :min="0" size="mini" style="width:200px"/>
|
||||
<el-form-item label="零件数量" prop="零件数量">
|
||||
<el-input-number v-model="form10.零件数量" :step="1" :min="0" size="mini" style="width:160px"/>
|
||||
</el-form-item>
|
||||
<el-form-item label="零件备注" prop="零件备注" style="margin-left: 70px">
|
||||
<el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:200px" clearable/>
|
||||
<el-form-item label="零件备注" prop="零件备注">
|
||||
<el-input v-model="form10.零件备注" placeholder="零件备注" size="small" style="width:160px" clearable/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -479,6 +476,10 @@ export default {
|
||||
rules3: { // 表单验证规则
|
||||
投产数量: [{ required: true, message: '请输入投产数量', trigger: 'blur' }]
|
||||
},
|
||||
pickerOptions: {
|
||||
// 限制日期
|
||||
disabledDate: this.disabledDate
|
||||
},
|
||||
// value1: '',
|
||||
result: 0,
|
||||
dialogFormVisible1: false,
|
||||
@@ -548,6 +549,9 @@ export default {
|
||||
this.fetchData()
|
||||
},
|
||||
methods: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7 + 3 * 24 * 60 * 60 * 1000
|
||||
},
|
||||
gaibianwaixie(index, row) {
|
||||
if (row.checked_waixie === false) {
|
||||
row.checked_dailiao = false
|
||||
@@ -1352,9 +1356,24 @@ export default {
|
||||
margin:2px;
|
||||
/*margin-left: 120px;*/
|
||||
}
|
||||
</style>
|
||||
<style>
|
||||
.el-table .IsUrgentItem{
|
||||
background: #ff7575;
|
||||
.el-form--label-left >>> .el-form-item__label {
|
||||
text-align: right;
|
||||
}
|
||||
>>>.el-dialog--center .el-dialog__body {
|
||||
text-align: initial;
|
||||
padding: 20px 30px 20px
|
||||
}
|
||||
>>>.el-dialog__header {
|
||||
padding: 20px 20px 0px;
|
||||
}
|
||||
>>>.el-dialog__footer {
|
||||
padding: 0px 20px 20px;
|
||||
/*text-align: right;*/
|
||||
-webkit-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
>>>.el-form-item {
|
||||
margin-bottom: 13px;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user