From 082613d446e29e4ec1c16bfaa52345106a498b23 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:03:49 +0800
Subject: [PATCH] 农事操作隐藏后四个，地图模式2d改为3d
---
src/views/task/task.vue | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 62 insertions(+), 17 deletions(-)
diff --git a/src/views/task/task.vue b/src/views/task/task.vue
index e5872d8..45bc5ec 100644
--- a/src/views/task/task.vue
+++ b/src/views/task/task.vue
@@ -72,6 +72,18 @@
export default {
data() {
+ const validateNum = (rule, value, callback) => {
+ if (!/^[1-9]\d*$/.test(value)) {
+ callback(new Error("请输入正整数"));
+ } else {
+ if (value>9999){
+ callback(new Error("限制为9999以内"));
+ }else {
+ callback();
+ }
+ }
+ };
+
return {
form: {},
query: {},
@@ -107,10 +119,11 @@
{
label: "任务名称",
prop: "taskName",
+ maxlength:200,
rules: [{
required: true,
message: "请输入任务名称",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -126,7 +139,7 @@
rules: [{
required: true,
message: "请输入地块",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -138,7 +151,7 @@
rules: [{
required: true,
message: "请输入截止时间",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -153,7 +166,7 @@
rules: [{
required: true,
message: "请输入负责人",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -165,10 +178,10 @@
// dicUrl: `/api/soldr/soldr/selectSol`,
props: {
label: "spn",
- value: "stockId1"
+ value: "id"
},
change: function (value) {
- console.log(value.value)
+ // console.log(value.value)
}
},
{
@@ -179,6 +192,11 @@
type: "number",
// labelWidth: 110,
display: false,
+ rules:[{
+ require:false,
+ trigger: ["blur","change"],
+ validator: validateNum
+ }]
},
{
label: "拍照照片",
@@ -199,6 +217,7 @@
row: true,
},
{
+ editDisplay: false,
label: "任务状态",
addDisplay: false,
type: "select",
@@ -227,7 +246,7 @@
rules: [{
required: true,
message: "请输入任务说明",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -260,6 +279,7 @@
prop: "remark",
type: "textarea",
span: 24,
+ maxlength:200,
},
]
},
@@ -274,6 +294,7 @@
viewBtn: true,
selection: true,
dialogClickModal: false,
+ emptyBtn:false,
column: [
{
label: "任务名称",
@@ -311,7 +332,7 @@
rules: [{
required: true,
message: "请输入负责人",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -325,7 +346,7 @@
rules: [{
required: true,
message: "请输入截止时间",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -338,10 +359,10 @@
dicUrl: `/api/soldr/soldr/selectSol`,
props: {
label: "spn",
- value: "stockId1"
+ value: "id"
},
change: function (value) {
- console.log(value.value)
+ // console.log(value.value)
}
},
{
@@ -400,6 +421,7 @@
editDisplay: false,
prop: "remark",
type: "textarea",
+ maxlength:200,
span: 23,
},
]
@@ -419,12 +441,14 @@
{
label: "任务名称",
prop: "taskName",
+ maxlength:200,
disabled: true,
},
{
label: "任务说明",
prop: "taskExplain",
type: "textarea",
+ maxlength:200,
span: 23,
disabled: true,
},
@@ -452,7 +476,7 @@
rules: [{
required: true,
message: "请输入负责人",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -466,7 +490,7 @@
rules: [{
required: true,
message: "请输入截止时间",
- trigger: "blur"
+ trigger: ["blur","change"]
}]
},
{
@@ -482,7 +506,7 @@
value: "stock_id1"
},
change: function (value) {
- console.log(value.value)
+ // console.log(value.value)
}
},
{
@@ -497,6 +521,7 @@
{
label: "拍照照片",
prop: "type",
+ value:"1",
span: 6,
disabled: true,
type: "switch",
@@ -543,6 +568,7 @@
editDisplay: false,
prop: "remark",
type: "textarea",
+ maxlength:200,
span: 23,
},
]
@@ -595,9 +621,16 @@
}
},
methods: {
- //入库
+ //处理
submitR(row, done, loading) {
var that = this;
+ if(row.type == "0"){
+ if(row.tp == ""){
+ that.$message.warning("请上传照片")
+ done()
+ return
+ }
+ }
updatechuli(row).then(
() => {
that.onLoad(this.page);
@@ -631,9 +664,11 @@
type: row.type
};
- if (row.type === "0") {
- var tp = this.findObject(this.optionchuli.column, "tp");
+ var tp = this.findObject(this.optionchuli.column, "tp");
+ if (row.type == "0") {
tp.display = true;
+ }else {
+ tp.display = false
}
this.gradeBoxVisiblechuli = true;
},
@@ -647,8 +682,10 @@
getLandList(this.$farmId).then((res) => {
if (res.data.code == 200) {
var landIdcolumn = that.findObject(that.option.column, "landId");
+ var landIdColumnChuli = that.findObject(that.optionchuli.column,"landId")
that.landList = res.data.data;
landIdcolumn.dicData = res.data.data;
+ landIdColumnChuli.dicData = res.data.data
}
})
},
@@ -679,6 +716,14 @@
});
},
rowUpdate(row, index, done, loading) {
+ if(row.stockNum<0){
+ this.$message({
+ type: "warning",
+ message: "农资量不能为负数!"
+ });
+ done();
+ return
+ }
update(row).then(() => {
this.onLoad(this.page);
this.$message({
--
Gitblit v1.9.3