Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dengfei

src/mixins/tableColumnsMixin.js

@@ -3,12 +3,15 @@ import request from '@/utils/request';
 export default {
   data() {
     return {
-      newColumns: []
+      newColumns: [],
+      tabMixinsInit: true //进入页面是否默认请求列配置
     };
   },
   created() {
     //从服务器获取缓存列表配置
-    this.getTabColumns();
+    if (this.tabMixinsInit) {
+      this.getTabColumns();
+    }
     // 创建防抖函数并绑定this
     this.debouncedHandleColumnChange = this.debounce(
       this.handleColumnChangeImpl,
@@ -35,6 +38,7 @@ export default {
 
     // 获取table-column配置
     async getTabColumns() {
+      console.log(1);
       const res = await this.getByTableId(this.cacheKeyUrl);
       if (res?.columnConfig?.length > 0) {
         //对比接口返回和本地columns

src/views/productionPlan/index.vue

@@ -506,6 +506,7 @@
         pageType: 'add',
         dialogTitle: '',
         isBindPlan: false,
+        tabMixinsInit:false,
         statusOpt: {
           first: [
             { label: '所有状态', value: '3,2' },

src/views/saleOrder/components/printTemplateSaleOrder.vue

@@ -66,8 +66,7 @@
         <tbody>
           <tr align="center">
             <td style="padding: 5px; width: 25%;"> 名称 </td>
-            <td style="padding: 5px; width: 10%;"> 型号 </td>
-            <td style="padding: 5px; width: 15%;"> 规格 </td>
+            <td style="padding: 5px; width: 15%;"> 型号规格 </td>
             <td style="padding: 5px; width: 10%;"> 颜色 </td>
             <td style="padding: 5px; width: 10%"> 数量</td>
             <td style="padding: 5px; width: 10%"> 单位</td>
@@ -78,10 +77,7 @@
 
           <tr align="center" v-for="(item, index) in formData.productInfoList">
             <td style="padding: 5px"> {{ item.productName }} </td>
-            <td style="padding: 5px"> {{ item.model }}</td>
-            <td style="padding: 5px">
-              {{ item.specification }}
-            </td>
+            <td style="padding: 5px"> {{ item.model }}/{{ item.specification }}</td>
             <td style="padding: 5px"> {{ item.colorKey }}</td>
             <td style="padding: 5px"> {{ item.contractNum }}</td>
             <td style="padding: 5px"> {{ item.measuringUnit }}</td>

src/views/saleOrder/index.vue

@@ -156,7 +156,7 @@
   } from '@/api/saleOrder';
   import dictMixins from '@/mixins/dictMixins';
   import { debounce } from 'lodash';
-  import { Alert } from 'element-ui';
+
   import tabMixins from '@/mixins/tableColumnsMixin';
 
   export default {
@@ -176,7 +176,7 @@
         loading: false,
         activeName: 'first',
         selection: [],
-
+        tabMixinsInit:false,
         columns: [],
         cacheKeyUrl: 'c32a9c7d-aps-saleOrder-index',
         columnsVersion: 1,
@@ -410,14 +410,14 @@
             minWidth: 110,
             showOverflowTooltip: true
           },
-          {
-            prop: 'workOrderType',
-            label: '订单类型',
-            slot: 'workOrderType',
-            align: 'center',
-            minWidth: 110,
-            showOverflowTooltip: true
-          },
+          // {
+          //   prop: 'workOrderType',
+          //   label: '订单类型',
+          //   slot: 'workOrderType',
+          //   align: 'center',
+          //   minWidth: 110,
+          //   showOverflowTooltip: true
+          // },
 
           {
             prop: 'productSumWeight',
@@ -683,9 +683,7 @@
               showOverflowTooltip: true
             };
           });
-          // console.log(this._newColumns, 'newRes');
           this.columns = [...this.columns, ...newRes, ...privateColumn];
-          // console.log(this.newColumns, 'productCode')
           this.getTabColumns();
           // this.$forceUpdate();
         });

src/views/workOrder/index.vue

@@ -308,6 +308,7 @@
         dispatchVisible: false,
         selectionMap: {},
         detailsVisible: false,
+        tabMixinsInit:false,
         tabValue: '1',
         treeId: [],
         tableHeight: 'calc(100vh - 345px)'

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.103:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.158:18086',
-        // target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.251:18186',