zpy 8.15

ruoyi-ui/src/views/smartSchool/schoolProperty/outboundLedger/index.vue

@@ -34,14 +34,22 @@
       <el-table-column label="规格" align="center" prop="specification" fixed="left" />
       <el-table-column label="分类编码" align="center" prop="classificationCode" />
       <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="归属类型" align="center" prop="affiliationType" />
-      <el-table-column label="设备状态" align="center" prop="equipmentState" />
-      <el-table-column label="投产日期" align="center" prop="dateOfProduction" width="200"/>
-      <el-table-column label="价格（元）" align="center" prop="price"  width="180"/>
+      <el-table-column align="center" prop="affiliationType" label="归属类型">
+        <template slot-scope="{ row }">
+          <div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="equipmentState" label="设备状态">
+        <template slot-scope="{ row }">
+          <div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="投产日期" align="center" prop="dateOfProduction" width="200" />
+      <el-table-column label="价格（元）" align="center" prop="price" width="180" />
       <el-table-column label="效用年限（年）" align="center" prop="lifeOfUtility" width="120px" />
       <el-table-column label="地点" align="center" prop="place" />
       <el-table-column label="使用人" align="center" prop="useName" />
-      <el-table-column label="备注" align="center" prop="remark" width="200"/>
+      <el-table-column label="备注" align="center" prop="remark" width="200" />
       <el-table-column label="操作" align="center" prop="orgname" width="200" fixed="right">
         <template slot-scope="{ row }">
           <el-button type="text" size="small" @click="handleLook(row)">查看</el-button>

ruoyi-ui/src/views/smartSchool/schoolProperty/warehousingLedger/index.vue

@@ -41,8 +41,14 @@
             <el-table-column align="center" prop="unit" label="单位">
             </el-table-column>
             <el-table-column align="center" prop="affiliationType" label="归属类型">
+                <template slot-scope="{ row }">
+                    <div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="equipmentState" label="设备状态">
+                <template slot-scope="{ row }">
+                    <div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="dateOfProduction" label="投产日期" width="130">
             </el-table-column>
@@ -54,7 +60,7 @@
             </el-table-column>
             <el-table-column align="center" prop="useName" label="使用人">
             </el-table-column>
-            <el-table-column align="center" prop="remark" label="备注">
+            <el-table-column align="center" prop="remark" label="备注" width="200">
             </el-table-column>
             <el-table-column label="操作" width="180" align="center" fixed="right">
                 <template slot-scope="scope">