From 754425386162ff681f78f72da8b1f991bef85377 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 16 十一月 2023 10:04:35 +0800
Subject: [PATCH] 	modified:   src/api/plan/customerorder.js 	modified:   src/views/plan/customerorder/customerorder-form.vue

---
 src/views/basic/param/index.vue |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/views/basic/param/index.vue b/src/views/basic/param/index.vue
index 113eb28..48d6a1c 100644
--- a/src/views/basic/param/index.vue
+++ b/src/views/basic/param/index.vue
@@ -17,7 +17,7 @@
             <el-form-item class="btn-group">
               <el-button type="" @click="onSearch">鏌ヨ</el-button>
               <el-button type="primary" @click="addOrUpdateHandle">鏂板</el-button>
-              <el-button @click="showImportDialog">瀵煎叆</el-button>
+              <el-button type="primary" @click="showImportDialog">瀵煎叆</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -173,16 +173,16 @@
     ...mapGetters(['permissions'])
   },
   created() {
+    this.loading = true
     this.getData()
     this.getParamType()
-  },
-  beforeUpdate() {
-    console.log("updated");
     this.rowSort()
     this.rowCalc()
-    this.loading = false
   },
-  watch: {},
+  beforeUpdate() {
+    this.rowSort()
+    this.rowCalc()
+  },
   methods: {
     //涓嬭浇妯℃澘
     downloadTemplate() {
@@ -267,32 +267,40 @@
       this.option.column.forEach(item => {
         if (row.paramItemThree == "" && item.prop == 'paramItemThree') {
           item.display = false
+        }else if(row.paramItemThree != "" && item.prop == 'paramItemThree'){
+          item.display = true
         }
         if (row.paramItemTwo == "" && item.prop == 'paramItemTwo') {
           item.display = false
+        }else if(row.paramItemTwo != "" && item.prop == 'paramItemTwo'){
+          item.display = true
         }
       })
+      console.log(row);
+      // let type=this.typeOptions.filter(t=>{
+      //   return t.label==row.paramType
+      // })[0]
+      // row.paramType=type.value
       this.$refs.crud.rowEdit(row, index)
     },
     showDel(row, index) {
       this.$refs.crud.rowDel(row, index)
     },
     updateParam(row, index, done, loading) {
-      // this.formDisabled = true
       let data = {
         dict: '',
-        id: 0,
+        id: '',
         parameterFormat: '',
         parameterItem: '',
         type: row.paramType,
         unit: row.unit,
       }
       row.paramType == '2' ? data.dict = row.paramFormat : data.parameterFormat = row.paramFormat
-      if (row.threeId) {
+      if (row.threeId!="null") {
         data.id = row.threeId
         data.parameterItem = row.paramItemThree
       } else {
-        if (row.twoId) {
+        if (row.twoId!="null") {
           data.id = row.twoId
           data.parameterItem = row.paramItemTwo
         } else {
@@ -300,7 +308,12 @@
           data.parameterItem = row.paramItem
         }
       }
-      console.log(data)
+      if(data.type=='鏂囨湰鏍煎紡'){
+        let type=this.typeOptions.filter(t=>{
+        return t.label==row.paramType
+      })[0]
+      data.type=type.value
+      }
       putObj(data).then(res => {
         if (res.data.data.code == 0) {
           this.$message.success("鏇存柊鎴愬姛")
@@ -371,7 +384,9 @@
         this.tableData = res.data.data.records
         this.page.total = res.data.data.total
         this.page.currentPage = res.data.data.records.pages
+        this.loading = false
       })
+
     },
     //鍔ㄦ�佸悎骞舵柟娉�
     rowCalc() {
@@ -442,9 +457,9 @@
 </script>
 
 <style>
-.grid-header {
+/* .grid-header {
   display: none;
-}
+} */
 
 .param-basic {
   margin: 0 10px;

--
Gitblit v1.9.3