zhangqing hace 1 año
padre
commit
e969d7310c

+ 5 - 1
src/views/aps/presalesorder/import-dialog.vue

@@ -105,7 +105,11 @@ export default {
         .catch((data) => {
           this.loading = false;
           if (data.code != -1) {
-            this.$message.error(data.message);
+            // this.$message.info(data.message);
+            this.$alert(data.message, '提示', {
+              confirmButtonText: '确定',
+              callback: action => {}
+            });
           }
         })
     },

+ 14 - 1
src/views/aps/presalesorder/index.vue

@@ -411,6 +411,19 @@ export default {
           label: '订单状态',
           showOverflowTooltip: true,
           align: 'center',
+        },{
+          prop: 'density',
+          width: 120,
+          label: '密度',
+          showOverflowTooltip: true,
+          align: 'center',
+        },
+        {
+          prop: 'drawingVersion',
+          width: 120,
+          label: '图纸版本',
+          showOverflowTooltip: true,
+          align: 'center',
         },
         {
           columnKey: 'action',
@@ -681,7 +694,7 @@ export default {
       console.log(this.whereForm, 'this.whereForm')
 
       this.loading = true;
-      let params = this.whereForm ? this.whereForm : []
+      let params = this.whereForm ? this.whereForm : {}
       exportFile(params).then(res => {
         this.loading = false;