Commit 5b3338b6 authored by 任金涛 's avatar 任金涛

aps/edit/excute

parent 90dc20fd
...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('tASKSEQ')" prop="tASKSEQ"> <FormItem :label="l('tASKSEQ')" prop="tASKSEQ">
<Input></Input> <Input v-model="entity.task_seq"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('tASKNAME')" prop="tASKNAME"> <FormItem :label="l('tASKNAME')" prop="tASKNAME">
<Input></Input> <Input v-model="entity.task_name"></Input>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('sHOPID')" prop="sHOPID"> <FormItem :label="l('sHOPID')" prop="sHOPID">
<!-- v-model="orderSearchForm.orderCat" --> <!-- v-model="orderSearchForm.orderCat" -->
<Select > <Select v-model="entity.sHOPID">
<Option value="" class="option-text">请选择</Option> <Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option> <Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select> </Select>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('eQUIPID')" prop="eQUIPID"> <FormItem :label="l('eQUIPID')" prop="eQUIPID">
<Select > <Select v-model="entity.eQUIPID">
<Option value="" class="option-text">请选择</Option> <Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option> <Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select> </Select>
...@@ -30,16 +30,16 @@ ...@@ -30,16 +30,16 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="关重资源名称" prop="rUNTIME"> <FormItem label="关重资源名称" prop="rUNTIME">
<Select > <Select v-model="entity.run_time">
<Option value="" class="option-text">请选择</Option> <Option value="" class="option-text">请选择</Option>
<Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option> <Option v-for="item in orderCatList" :value="item" :key="item">{{ item }}</Option>
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12" v-model="entity.rUNTIME">
<FormItem :label="l('rUNTIME')" prop="rUNTIME"> <FormItem :label="l('rUNTIME')" prop="rUNTIME">
<!-- v-model="value1" --> <!-- v-model="value1" -->
<InputNumber :max="100" :min="1"></InputNumber> <InputNumber v-model="entity.run_time" :max="100" :min="1"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -75,10 +75,7 @@ export default { ...@@ -75,10 +75,7 @@ export default {
}, },
methods: { methods: {
load(v) { load(v) {
// Api.get({ id: v }).then((r) => { this.entity = v
// this.entity = r.result
// this.$emit('on-load')
// })
}, },
handleSubmit() { handleSubmit() {
this.$refs.form.validate((v) => { this.$refs.form.validate((v) => {
...@@ -111,9 +108,10 @@ export default { ...@@ -111,9 +108,10 @@ export default {
} }
}, },
watch: { watch: {
eid(v) { row(v) {
if (v != 0) { if (v != {}) {
this.load(v) alert(JSON.stringify(v))
this.entity = v
} }
} }
} }
......
...@@ -13,15 +13,7 @@ ...@@ -13,15 +13,7 @@
:height="gridHeight" :height="gridHeight"
></DataGrid> ></DataGrid>
<Modal v-model="editModal" title="编辑" footer-hide width="800"> <Modal v-model="editModal" title="编辑" footer-hide width="800">
<Edit <Edit :row="rowData" @on-close="cancel" @on-option-ok="addOk" />
:eid="curId"
:opTaskPk="setParams.opTaskPk"
:partTaskPk="setParams.partTaskPk"
:taskSeq="setParams.taskSeq"
:count="setParams.count"
@on-close="cancel"
@on-option-ok="addOk"
/>
</Modal> </Modal>
<Modal <Modal
v-model="insertlModal" v-model="insertlModal"
...@@ -32,7 +24,15 @@ ...@@ -32,7 +24,15 @@
<p>确定进行 {{ insertTItle }} 操作?</p> <p>确定进行 {{ insertTItle }} 操作?</p>
</Modal> </Modal>
<Modal v-model="setParsModal" title="工序参数设置" footer-hide width="1000"> <Modal v-model="setParsModal" title="工序参数设置" footer-hide width="1000">
<Add :eid="curId" @on-parameter-ok="addOk" @on-close="cancel" /> <Add
:eid="curId"
@on-parameter-ok="addOk"
@on-close="cancel"
:opTaskPk="setParams.opTaskPk"
:partTaskPk="setParams.partTaskPk"
:taskSeq="setParams.taskSeq"
:count="setParams.count"
/>
</Modal> </Modal>
</div> </div>
</template> </template>
...@@ -348,9 +348,8 @@ export default { ...@@ -348,9 +348,8 @@ export default {
type: "icon", type: "icon",
title: "編輯工序", title: "編輯工序",
oprate: "edit", oprate: "edit",
msg: "确认要移出排产吗?",
}, },
on: { click: () => this.edit(params.row.id) }, on: { click: () => this.edit(params.row) },
}), }),
h("op", { h("op", {
attrs: { attrs: {
...@@ -377,6 +376,7 @@ export default { ...@@ -377,6 +376,7 @@ export default {
count: 0, count: 0,
}, //生产计划数量 }, //生产计划数量
//设置参数结束 //设置参数结束
rowData:{},//编辑时传入行数据
}; };
}, },
mounted() { mounted() {
...@@ -428,7 +428,7 @@ export default { ...@@ -428,7 +428,7 @@ export default {
//单个工序进行参设置start---- //单个工序进行参设置start----
openParms(row) { openParms(row) {
this.setParams = { this.setParams = {
opTaskPk:row.op_task_pk, opTaskPk: row.op_task_pk,
partTaskPk: row.part_task_pk, partTaskPk: row.part_task_pk,
taskSeq: row.task_seq, taskSeq: row.task_seq,
count: row.put_into_qty, count: row.put_into_qty,
...@@ -438,9 +438,9 @@ export default { ...@@ -438,9 +438,9 @@ export default {
//单个工序进行参数设置end---- //单个工序进行参数设置end----
//编辑工序start---- //编辑工序start----
edit(id) { edit(row) {
this.editModal = true; this.editModal = true;
this.curId = Number(id); this.rowData = row;
}, },
//编辑工序end---- //编辑工序end----
...@@ -464,7 +464,7 @@ export default { ...@@ -464,7 +464,7 @@ export default {
this.data1 = []; this.data1 = [];
this.loadData(this.rowId); this.loadData(this.rowId);
this.setParsModal = false; this.setParsModal = false;
this.editModal=false this.editModal = false;
}, },
//删除工序时间end----- //删除工序时间end-----
cancel() { cancel() {
......
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