Merge remote-tracking branch 'origin/master'

zkqy-ui/src/api/tablelist/commonTable.js

@@ -432,6 +432,7 @@ export function productColourList(data) {
   return request({
     url: '/system/ProductColour/list',
     method: 'get',
+    params: data,
     //baseURL: process.env.VUE_APP_BASE_API1
   })
 }

zkqy-ui/src/views/orderMange/financialReconciliation/index.vue

@@ -220,16 +220,16 @@
                   打印对账单
                 </el-button>
               </el-dropdown-item>
-<!--              <el-dropdown-item>-->
-<!--                <el-button-->
-<!--                  type="text"-->
-<!--                  size="mini"-->
-<!--                  @click="handleDetail(scope.$index, scope.row)"-->
-<!--                  v-hasPermi="['system:ProductInvoice:export']"-->
-<!--                >-->
-<!--                  详情-->
-<!--                </el-button>-->
-<!--              </el-dropdown-item>-->
+              <el-dropdown-item>
+                <el-button
+                  type="text"
+                  size="mini"
+                  @click="handleDetail(scope.$index, scope.row)"
+                  v-hasPermi="['system:ProductInvoice:export']"
+                >
+                  详情
+                </el-button>
+              </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>

zkqy-ui/src/views/orderMange/index.vue

@@ -582,16 +582,16 @@
                 </template>
               </el-table-column>
 
-<!--              <el-table-column prop="inventoryBoxNum" label="库存箱数">-->
-<!--                <template slot-scope="scope">-->
-<!--                  {{ scope.row.inventoryBoxNum }}-->
-<!--                </template>-->
-<!--              </el-table-column>-->
-<!--              <el-table-column prop="inventoryWeight" label="库存重量/kg">-->
-<!--                <template slot-scope="scope">-->
-<!--                  {{ scope.row.inventoryWeight }}-->
-<!--                </template>-->
-<!--              </el-table-column>-->
+              <el-table-column prop="inventoryBoxNum" label="库存箱数">
+                <template slot-scope="scope">
+                  {{ scope.row.inventoryBoxNum }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="inventoryWeight" label="库存重量/kg">
+                <template slot-scope="scope">
+                  {{ scope.row.inventoryWeight }}
+                </template>
+              </el-table-column>
 
               <el-table-column prop="remark" label="备注">
                 <template slot-scope="scope">