Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYua...

huanghongfeng

2024-05-20 cb62fe00ff0c80bce983b0aa7a2b320fdc26f85f

 ´úÂë¹ÜÀí/WMS/WMS_Client/src/views/dialog/addTask.vue

@@ -1,6 +1,6 @@
<template>
    <div>
        <vol-box :lazy="true" v-model="detialBox" title="手动移库" :height="350" :width="400" :padding="15">
        <vol-box :lazy="true" v-model="detialBox" title="NG任务" :height="350" :width="400" :padding="15">
            <div>
                <el-form :model="formdata" label-width="120px" :rules="rules" size="mini" ref="ruleFormRef">
                    <!-- <el-form-item label="类型">
@@ -10,18 +10,18 @@
                        </el-radio-group>
                    </el-form-item> -->

                    <el-form-item v-if="inType == 'handle'" label="起始地址" prop="from_address">
                        <el-select v-model="formdata.from_address" clearable filterable placeholder="请选择起始地址">
                            <el-option v-for="item in formAddressList" :label="item.key" :value="item.key" />
                    <el-form-item v-if="inType == 'handle'" label="NG下料位" prop="from_address">
                        <el-select v-model="formdata.from_address" clearable filterable placeholder="请选择NG下料位">
                            <el-option v-for="item in formAddressList" :label="item.value" :value="item.key" />
                        </el-select>
                    </el-form-item>
                    <el-form-item label="目的地址" prop="to_address">
                    <!-- <el-form-item label="目的地址" prop="to_address">
                        <el-select v-model="formdata.to_address" clearable filterable placeholder="请选择目的地址">
                            <el-option v-for="item in toAddressList" :label="item.key" :value="item.key" />
                        </el-select>
                    </el-form-item>
                    </el-form-item> -->
                    <el-form-item label="">
                        <el-button type="primary" @click="onSubmit()" size="mini"> ç¡®è®¤ç§»åº“</el-button>
                        <el-button type="primary" @click="onSubmit()" size="mini"> ç¡®è®¤æ·»åŠ NG任务</el-button>
                    </el-form-item>
                </el-form>
            </div>
@@ -35,17 +35,17 @@
export default {
    components: { "vol-box": VolBox1Vue },
    methods: {},
    created() {
        this.http.post("/api/Sys_Dictionary/GetVueDictionary", ["route_began", "route_end"]).then(x => {
            x.forEach(item => {
                if (item.dicNo == 'route_end') {
                    this.toAddressList = item.data;
                } else if (item.dicNo == 'route_began') {
                    this.formAddressList = item.data;
                }
            })
        })
    },
    // created() {
    //     this.http.post("/api/Sys_Dictionary/GetVueDictionary", ["route_began", "route_end"]).then(x => {
    //         x.forEach(item => {
    //             if (item.dicNo == 'route_end') {
    //                 this.toAddressList = item.data;
    //             } else if (item.dicNo == 'route_began') {
    //                 this.formAddressList = item.data;
    //             }
    //         })
    //     })
    // },
    data() {
        return {
            detialBox: false,
@@ -59,7 +59,11 @@
                from_address: "",
                to_address: ""
            },
            formAddressList: [],
            formAddressList: [
                { key: "X01001003", value: "1单元NG下料位" },
          { key: "X02001003", value: "2单元NG下料位" },
          { key: "X03001002", value: "3单元NG下料位" }
            ],
            toAddressList: []
        };
    },
@@ -68,10 +72,17 @@
            var _this = this;
            this.$refs.ruleFormRef.validate((valid) => {
                if (valid) {
                    _this.http.post("/api/ToMes/AddToFloat3", _this.formdata, "正在添加....").then(x => {
                        if (!x.status) return _this.$Message.error(x.message);
                        _this.$Message.success("添加成功!");
                        _this.refresh();
                    _this.http.post("/api/dt_agvtask/addNgTask", _this.formdata, "正在添加....").then(x => {
                        if (!x.status){
                            _this.detialBox=false;
                            _this.formdata.from_address="";
                             _this.$Message.error(x.message);
                        }else{
                            _this.detialBox=false;
                            _this.formdata.from_address="";
                            _this.$Message.success("添加成功!");
                            window.location.reload();
                        }
                    });
                }
            })