From e4418b60a9e80a1438919e618d2e5e2048d404bc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 17 Oct 2022 11:23:11 +0800
Subject: [PATCH] 农场图片显示优化；加工产品管理去除导入功能；修复加工、销售、出库、损耗记录表的查询功能

---
 src/views/task/task.vue |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/views/task/task.vue b/src/views/task/task.vue
index e49951b..160b827 100644
--- a/src/views/task/task.vue
+++ b/src/views/task/task.vue
@@ -72,6 +72,14 @@
 
 export default {
   data() {
+    const validateNum = (rule, value, callback) => {
+      if (!/^[1-9]\d*$/.test(value)) {
+        callback(new Error("请输入正整数"));
+      } else {
+        callback();
+      }
+    };
+
     return {
       form: {},
       query: {},
@@ -102,10 +110,12 @@
         refreshBtn:false,
         columnBtn:false,
         searchShowBtn:false,
+        menuWidth:300,
         column: [
           {
             label: "任务名称",
             prop: "taskName",
+            maxlength:200,
             rules: [{
               required: true,
               message: "请输入任务名称",
@@ -164,10 +174,10 @@
             // dicUrl: `/api/soldr/soldr/selectSol`,
             props: {
               label: "spn",
-              value: "stockId1"
+              value: "id"
             },
             change: function (value) {
-              console.log(value.value)
+              // console.log(value.value)
             }
           },
           {
@@ -176,8 +186,13 @@
             hide: true,
             span: 6,
             type: "number",
-            labelWidth: 110,
+            // labelWidth: 110,
             display: false,
+            rules:[{
+              require:false,
+              trigger: "blur",
+              validator: validateNum
+            }]
           },
           {
             label: "拍照照片",
@@ -198,6 +213,7 @@
             row: true,
           },
           {
+            editDisplay: false,
             label: "任务状态",
             addDisplay: false,
             type: "select",
@@ -259,6 +275,7 @@
             prop: "remark",
             type: "textarea",
             span: 24,
+            maxlength:200,
           },
         ]
       },
@@ -273,6 +290,7 @@
         viewBtn: true,
         selection: true,
         dialogClickModal: false,
+        emptyBtn:false,
         column: [
           {
             label: "任务名称",
@@ -340,7 +358,7 @@
               value: "id"
             },
             change: function (value) {
-              console.log(value.value)
+              // console.log(value.value)
             }
           },
           {
@@ -348,7 +366,7 @@
             prop: "stockNum",
             hide: true,
             disabled: true,
-            span: 6,
+            span: 7,
             type: "number",
             labelWidth: 110,
           },
@@ -399,6 +417,7 @@
             editDisplay: false,
             prop: "remark",
             type: "textarea",
+            maxlength:200,
             span: 23,
           },
         ]
@@ -418,12 +437,14 @@
           {
             label: "任务名称",
             prop: "taskName",
+            maxlength:200,
             disabled: true,
           },
           {
             label: "任务说明",
             prop: "taskExplain",
             type: "textarea",
+            maxlength:200,
             span: 23,
             disabled: true,
           },
@@ -481,7 +502,7 @@
               value: "stock_id1"
             },
             change: function (value) {
-              console.log(value.value)
+              // console.log(value.value)
             }
           },
           {
@@ -496,6 +517,7 @@
           {
             label: "拍照照片",
             prop: "type",
+            value:"1",
             span: 6,
             disabled: true,
             type: "switch",
@@ -542,6 +564,7 @@
             editDisplay: false,
             prop: "remark",
             type: "textarea",
+            maxlength:200,
             span: 23,
           },
         ]
@@ -594,9 +617,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);
@@ -630,9 +660,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;
     },
@@ -646,8 +678,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
         }
       })
     },
@@ -678,6 +712,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