Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/views/TechnologyCenter/CreatePackingList/index.vue

@@ -16,6 +16,7 @@
         v-loading="loading"
         :data="receiptData"
         border
+        size="mini"
         style="margin-top:20px">
         <el-table-column
           label="装箱单号"
@@ -74,12 +75,14 @@
         v-loading="loading"
         :data="machineTableData"
         border
+        size="mini"
         style="margin-top:20px">
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-table
               :data="props.row.groupData"
               border
+              size="mini"
               style="width: 90%">
               <el-table-column
                 label="序号"
@@ -171,6 +174,7 @@
         v-loading="loading"
         :data="spareData"
         border
+        size="mini"
         style="margin-top:20px">
         <el-table-column
           label="序号"
@@ -228,6 +232,7 @@
         v-loading="fileLoading"
         :data="fileData"
         border
+        size="mini"
         style="margin-top:20px">
         <el-table-column
           label="序号"

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -26,6 +26,7 @@
         v-loading="listLoading"
         :data="tableData"
         :row-class-name="tableRowClassName"
+        size="mini"
         border>
         <el-table-column align="center" label="图号" min-width="150">
           <template slot-scope="scope">

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -27,6 +27,7 @@
         v-loading="listLoading"
         :data="tableData"
         :row-class-name="tableRowClassName"
+        size="mini"
         border>
         <el-table-column align="center" label="物料状态" min-width="100">
           <template slot-scope="scope">

src/views/TechnologyCenter/QueryParts/index.vue

@@ -36,6 +36,7 @@
         :data="tableData"
         highlight-current-row
         border
+        size="mini"
         style="width: 100%;max-height: 520px"
         height="520">
         <el-table-column
@@ -109,6 +110,7 @@
         v-loading="loadingWB"
         :data="tableDataWB"
         style="width: 100%;min-height: 600px;"
+        size="mini"
         height="600"
         highlight-current-row
         border>
@@ -211,8 +213,9 @@ export default {
   },
   watch: {
     project(val) {
+      console.log(val)
       if (val.length > 0) {
-        this.projectValue = val[1].value
+        this.projectValue = val[0].value
       }
     },
     projectValue(val) {