From cb62fe00ff0c80bce983b0aa7a2b320fdc26f85f Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 20 五月 2024 08:51:03 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYuanTaiZhong
---
代码管理/WMS/WMS_Client/src/views/dialog/addTask.vue | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/dialog/addTask.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/dialog/addTask.vue"
index 69a2208..ac6d802 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/dialog/addTask.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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,30 +35,35 @@
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,
inType: "handle",
rules: {
- from_address: [{ required: true, message: '璇烽�夋嫨璧峰鍦板潃', trigger: 'blur' }],
- to_address: [{ required: true, message: '璇烽�夋嫨鐩殑鍦板潃', trigger: 'blur' }]
+ from_address: [{ required: true, message: '璇烽�夋嫨NG涓嬫枡浣�', trigger: 'blur' }],
+ // from_address: [{ required: true, message: '璇烽�夋嫨璧峰鍦板潃', trigger: 'blur' }],
+ // to_address: [{ required: true, message: '璇烽�夋嫨鐩殑鍦板潃', trigger: 'blur' }]
},
formdata: {
from_address: "",
to_address: ""
},
- formAddressList: [],
+ formAddressList: [
+ { key: "X01001003", value: "1鍗曞厓NG涓嬫枡浣�" },
+ { key: "X02001003", value: "2鍗曞厓NG涓嬫枡浣�" },
+ { key: "X03001002", value: "3鍗曞厓NG涓嬫枡浣�" }
+ ],
toAddressList: []
};
},
@@ -67,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();
+ }
});
}
})
--
Gitblit v1.9.3