日执行计划页面卡死的问题修改

.env.development

@@ -4,9 +4,9 @@ ENV = 'development'
 # base api
 # 测试线
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.56:80/'
+VUE_APP_BASE_API = 'http://192.168.1.56:80/'
 # VUE_APP_BASE_API = 'http://192.168.1.93/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -1381,7 +1381,7 @@ export default {
     getList() {
       this.table.listLoading = true
       GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
+        console.log('table数据-------', response.data.list)
         if (response.data.list !== null) {
           // var obj = { 'id': '580999', 'havebutton': '0', 'lpplantype': 2, 'pid': '3283220207862547456', 'times': '第二班', 'projname': '2.666' }
           // response.data.list[6] = obj

src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -153,7 +153,6 @@
     <!-- 新增、编辑 -->
     <el-dialog
       :fullscreen="dialogFull"
-      :destroy-on-close="true"
       :visible.sync="create.dialogFormVisible"
       :before-close="close"
       :close-on-click-modal="false"
@@ -440,7 +439,7 @@
                 </div>
               </draggable>
             </div>
-          </div>
+          </div>el
           <div slot="footer" class="dialog-footer" style="height:55px;">
             <el-button class="cancelClose" :disabled="isokDisable" @click="close()" style="top:40px;">关闭</el-button>
             <el-button class="save" :disabled="isokDisable" @click="updateData()" style="top:40px;">确认</el-button>
@@ -452,7 +451,6 @@
     <!-- 更改TMR编号 -->
     <el-dialog
     :title="textMap[tmrNumber.dialogStatus]"
-    :destroy-on-close="true"
     :visible.sync="tmrNumber.dialogFormVisible"
     :before-close="close"
     :close-on-click-modal="false"
@@ -771,7 +769,7 @@ export default {
       postJson(url, data).then(response => {
         if (response.data.list !== undefined) {
           if (response.data.list !== null) {
-            console.log('table数据', response.data.list)
+            console.log('table数据123456', response.data.list)
             for (let i = 0; i < response.data.list.length; i++) {
               if (response.data.list[i].arrList == null) {
                 this.$set(response.data.list[i], 'arrList', [])
@@ -779,9 +777,9 @@ export default {
             }
             this.table.list = response.data.list
             this.table.total = response.data.list.length
-            setTimeout(() => {
+            this.$nextTick(() => {
               this.$refs.table.doLayout()
-            }, 100)
+            })
           } else {
             this.table.list = []
           }
@@ -1303,7 +1301,6 @@ export default {
       //   }
       //   console.log('temp',this.create.temp)
       // }
-      console.log(this.create.temp.tclassname,'this.create.temp.tclassname')
       if(this.create.temp.tclassname == '固定式'){
         if(this.equipmentList.find(obj => obj.tclassname == '任意车1') !== undefined){
           this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '任意车1').eqcode
@@ -1322,7 +1319,6 @@ export default {
         this.getCreateList1()
         return
       }
-      console.log('item.weight===>', item.weight)
       const url = 'authdata/lpplandtl/date/add'
       const data = {}
       data.parammaps = {}
@@ -1346,16 +1342,6 @@ export default {
           'returnmap': '0'
         }
         this.requestParam.data = []
-        // this.requestParam.data[0] = {
-        //   'name': 'updateLpplandtlSortsdate',
-        //   'type': 'e',
-        //   'parammaps': {
-        //     pastureid: evt.pastureid,
-        //     sort: evt.sort,
-        //     lppid: evt.id,
-        //     date: this.date
-        //   }
-        // }
         this.requestParam.data[0] = {
           'name': 'updateFpdetailUsedate',
           'type': 'e',
@@ -1378,7 +1364,6 @@ export default {
           this.getCreateList1()
         })
       })
-      console.log(this.create.temp.tmrid,'66666')
     },
     handleUpdate(row) {
       this.getDownList()
@@ -1389,7 +1374,6 @@ export default {
       this.create.temp = Object.assign({}, row)
       this.create.temp.mytmrname = row.tmrname
       this.create.temp.mytmrid = row.tmrid
-      console.log('this.create.temp', this.create.temp)
       this.create.checkBarList = []
       this.getCreateList1()
       this.getmaterialdetailsList(row)
@@ -1452,8 +1436,7 @@ export default {
           this.isDispaly = false
           this.dialogFull = false
           this.create.dialogFormVisible = false
-          // TODO:
-          // this.getList()
+          this.getList()
         } else {
           this.$notify({
             title: '保存失败',
@@ -1465,7 +1448,6 @@ export default {
       })
     },
     async close(done) {
-      // TODO:
       try {
         if (this.create.dialogStatus == 'create') {
         console.log('新增关闭')
@@ -1503,7 +1485,6 @@ export default {
           }, 1000)
           const url = 'authdata/lpplandtl/restore/day'
           const data = {}
-          // TODO:
           for (let i = 0; i < this.create.temp.arrList.length; i++) {
             this.$set(this.create.temp.arrList[i], 'date', this.date)
           }
@@ -1512,8 +1493,15 @@ export default {
           }
           data.old = this.create.temp.arrList
           data.new = this.create.list2
+          const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        });
           postJson(url, data).then(response => {
             console.log('新增保存发送参数', this.requestParam)
+            loading.close();
             if (response.msg !== 'fail') {
               this.$notify({
                 title: '成功',
@@ -1521,9 +1509,9 @@ export default {
                 type: 'success',
                 duration: 2000
               })
-              this.isDispaly = false
-              this.dialogFull = false
-              this.create.dialogFormVisible = false
+              // this.isDispaly = false
+              // this.dialogFull = false
+              // this.create.dialogFormVisible = false
               this.getList()
             } else {
               this.$notify({
@@ -1534,7 +1522,8 @@ export default {
               })
             }
             done?.();
-          }).catch(() => {
+          }).catch((err) => {
+            console.log(err,'hhhhhhh')
             done?.();
           })
         }