add

src/views/warehouseManagement/stockManagement/details.vue

@@ -184,6 +184,7 @@
                   prop="univalence"
                   width="150"
                   align="center"
+                  v-if="extInfo.assetType == 1"
                 >
                   <template slot-scope="{ row }">
                     <template>
@@ -193,7 +194,21 @@
                   </template>
                 </el-table-column>
                 <el-table-column
-                  label="总额"
+                  label="单价"
+                  prop="univalence"
+                  width="150"
+                  align="center"
+                  v-if="extInfo.assetType == 4"
+                >
+                  <template slot-scope="{ row }">
+                    <template>
+                      {{ row.price + '元' }}/{{ row.measuringUnit }}
+                      <!-- {{ { yuan: '元', wanyuan: '万元' }[row.univalenceUnit] }} -->
+                    </template>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="金额"
                   align="center"
                   prop="contentImage"
                   :show-overflow-tooltip="true"
@@ -208,6 +223,95 @@
                     {{ row.totalMoney }}
                   </template>
                 </el-table-column>
+                <el-table-column
+                  label="数量"
+                  prop="batchNo"
+                  width="150"
+                  align="center"
+                  v-if="extInfo.assetType == 1"
+                >
+                  <template slot-scope="{ row, $index }">
+                    <template> {{ row.packingCount }} </template>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="数量"
+                  prop="batchNo"
+                  width="150"
+                  align="center"
+                  v-if="extInfo.assetType == 4"
+                >
+                  <template slot-scope="{ row, $index }">
+                    <template>
+                      {{ row.packingCount }}
+                    </template>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="计量单位"
+                  prop="batchNo"
+                  width="150"
+                  align="center"
+                  v-if="extInfo.assetType == 1"
+                >
+                  <template slot-scope="{ row, $index }">
+                    <template>
+                      {{ row.minPackUnit }}
+                    </template>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="计量单位"
+                  prop="batchNo"
+                  width="150"
+                  align="center"
+                  v-if="extInfo.assetType == 4"
+                >
+                  <template slot-scope="{ row, $index }">
+                    <template>
+                      {{ row.measuringUnit }}
+                    </template>
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  label="重量"
+                  align="center"
+                  prop="contentImage"
+                  :show-overflow-tooltip="true"
+                  v-if="extInfo.assetType == 1"
+                >
+                  <template slot-scope="{ row, $index }">
+                    <!-- {{ weightTotal(row.outInNum, row.minPackingCount) }} -->
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  label="重量"
+                  align="center"
+                  prop="contentImage"
+                  :show-overflow-tooltip="true"
+                  v-if="extInfo.assetType == 4"
+                >
+                  <template slot-scope="{ row, $index }">
+                    <!-- {{
+                      deviceWeight(
+                        row.roughWeight,
+                        row.minPackingCount * row.outInNum
+                      )
+                    }} -->
+                  </template>
+                </el-table-column>
+
+                <el-table-column
+                  label="重量单位"
+                  align="center"
+                  prop="contentImage"
+                  :show-overflow-tooltip="true"
+                >
+                  <template slot-scope="{ row, $index }">
+                    {{ row.weightUnit }}
+                  </template>
+                </el-table-column>
                 <el-table-column
                   label="货位"
                   prop="warehouseName"
@@ -260,7 +364,7 @@
               </el-table-column>
               <el-table-column label="" prop="measurementUnit">
                 <template slot-scope="{ row, $index }">
-                  {{ row.weightUnit }} /{{ row.packingUnit }}
+                  {{ handleRowUnit(row) }} /{{ row.packingUnit }}
                 </template>
               </el-table-column>
             </el-table-column>