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

src/views/hangingWorkOrder/index.vue

@@ -152,6 +152,25 @@ export default {
           label: '完结原因',
           align: 'center'
         },
+        {
+            prop: 'customerName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true
+        },
+        {
+          prop: 'serialNo',
+          label: '客户代号',
+          align: 'center',
+          showOverflowTooltip: true
+        },
+
+        {
+          prop: 'simpleName',
+          label: '客户简称',
+          align: 'center',
+          showOverflowTooltip: true
+        },
         {
           columnKey: 'action',
           label: '操作',

src/views/productionPlan/index.vue

@@ -10,7 +10,7 @@
       >
       </productionPlan-search>
       
-      <div class="statistics">
+      <!-- <div class="statistics">
         <el-row :gutter="24">
           <el-col :span="cardSpan">
             <el-card shadow="hover" class="cardItem">
@@ -77,7 +77,7 @@
             </el-card>
           </el-col>
         </el-row>
-      </div>
+      </div> -->
       <div class="btn_box">
         <el-button
           type="success"
@@ -711,7 +711,27 @@
               );
               return obj && obj.label;
             }
-          }
+          },
+          {
+            prop: 'customerName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+
+          {
+            prop: 'serialNo',
+            label: '客户代号',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+
+          {
+            prop: 'simpleName',
+            label: '客户简称',
+            align: 'center',
+            showOverflowTooltip: true
+          },
         ];
       }
     },

src/views/workOrder/index.vue

@@ -381,7 +381,12 @@ export default {
             return obj && obj.label;
           }
         },
-
+        {
+            prop: 'customerName',
+            label: '客户名称',
+            align: 'center',
+            showOverflowTooltip: true
+        },
         {
           prop: 'serialNo',
           label: '客户代号',