Commit 0ff1d882 authored by renjintao's avatar renjintao

mesplan

parent e53a5c48
...@@ -413,6 +413,21 @@ div::-webkit-scrollbar-corner { ...@@ -413,6 +413,21 @@ div::-webkit-scrollbar-corner {
.pr30 { .pr30 {
padding-right: 30px; padding-right: 30px;
} }
.pr50 {
padding-right: 50px;
}
.pr80 {
padding-right: 80px;
}
.pr100 {
padding-right: 100px;
}
.pr200 {
padding-right: 200px;
}
.pr240 {
padding-right: 240px;
}
.bnone { .bnone {
border: none; border: none;
...@@ -1002,11 +1017,6 @@ textarea::-webkit-input-placeholder { ...@@ -1002,11 +1017,6 @@ textarea::-webkit-input-placeholder {
display:block; display:block;
line-height:30px; line-height:30px;
padding:5px 10px; padding:5px 10px;
background:#f5f6fa;
border-bottom:solid 1px #ccc;
border-left:solid 1px #ccc;
border-right:solid 1px #ccc;
} }
.cellInfoTitle { .cellInfoTitle {
padding: 0 10px; padding: 0 10px;
......
...@@ -57,8 +57,9 @@ ...@@ -57,8 +57,9 @@
<Detail :row="rowData" /> <Detail :row="rowData" />
</Modal> </Modal>
<Modal v-model="splitModal" title="订单分解" width="1200"> <Modal v-model="splitModal" title="订单分解" width="1200">
<Split :row="rowData" ref="orderSplit" /> <Split :row="rowData" ref="orderSplit" @on-amount="getAmount" />
<div slot="footer"> <div slot="footer">
<span class="pr240">剩余产品数量:{{amountNew}}</span>
<Button @click="splitModal = false">取消</Button> <Button @click="splitModal = false">取消</Button>
<Button type="primary" @click="orderSplitOk">确定分解</Button> <Button type="primary" @click="orderSplitOk">确定分解</Button>
</div> </div>
...@@ -487,7 +488,8 @@ export default { ...@@ -487,7 +488,8 @@ export default {
codeList: [], //订单编号List codeList: [], //订单编号List
operatorIdList: [] //操作员id operatorIdList: [] //操作员id
}, //确定后返回数据 }, //确定后返回数据
wfstatu: 1 //流程是否启用1 禁用 0启用 wfstatu: 1, //流程是否启用1 禁用 0启用
amountNew: 0,
}; };
}, },
created() { created() {
...@@ -575,11 +577,15 @@ export default { ...@@ -575,11 +577,15 @@ export default {
split(row) { split(row) {
if (row.quantity > 1) { if (row.quantity > 1) {
this.splitModal = true; this.splitModal = true;
this.amountNew = row.quantity
this.rowData = row; this.rowData = row;
} else { } else {
this.$Message.error("数量为1,不能进行分解"); this.$Message.error("数量为1,不能进行分解");
} }
}, },
getAmount(val) {
this.amountNew = val
},
onHide() { onHide() {
// this.$Message.info("收起左侧树") // this.$Message.info("收起左侧树")
this.showMenu = false; this.showMenu = false;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</Col> </Col>
<Col span="12"> <Col span="12">
<FormItem label="分解数量" style="width:100%" prop="splitQuantity"> <FormItem label="分解数量" style="width:100%" prop="splitQuantity">
<InputNumber :min="2" :max="orderForm.quantity" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber> <InputNumber :min="1" :max="orderForm.quantity" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
<Button type="primary" @click="addSplitOrder" v-noClick>确定</Button> <Button type="primary" @click="addSplitOrder" v-noClick>确定</Button>
</FormItem> </FormItem>
</Col> </Col>
...@@ -47,10 +47,6 @@ ...@@ -47,10 +47,6 @@
<DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker> <DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker>
</template> </template>
</Table> </Table>
<div class="cellblock">
<p class="tr" style="padding-right:380px;"><span class="pr20">剩余产品数量:</span>{{amount}}</p>
</div>
</div> </div>
</template> </template>
...@@ -221,6 +217,7 @@ export default { ...@@ -221,6 +217,7 @@ export default {
splitAmount = Number(splitAmount) + Number(el.quantity) splitAmount = Number(splitAmount) + Number(el.quantity)
}) })
this.amount = Number(this.orderForm.quantity) - splitAmount this.amount = Number(this.orderForm.quantity) - splitAmount
this.$emit("on-amount", this.amount);
}, },
inputFocus(row, index) { inputFocus(row, index) {
this.amountMax = this.amount + Number(row.quantity) this.amountMax = this.amount + Number(row.quantity)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment