Selaa lähdekoodia

优化资产信息的管理状态

LinWuTai 1 vuosi sitten
vanhempi
commit
240f5e4687

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbAssetInformation.java

@@ -73,7 +73,7 @@ public class TbAssetInformation extends BaseEntity
     private String abcCategory;
 
     /** 管理状态,0:闲置 */
-    @Excel(name = "管理状态,0:闲置")
+    @Excel(name = "管理状态,0:正常,1:调整,2:调拨,3:借出,4:拆分,5:闲置,6:启用,7:报废,8:变卖")
     private Long manageStatus;
 
     /** 使用部门 */

+ 1 - 1
ruoyi-admin/src/main/java/com/ruoyi/order/domain/TbOrder.java

@@ -28,7 +28,7 @@ public class TbOrder extends BaseEntity
     private String orderNumber;
 
     /** 单据类型,0:未知:1:调整,2:调拨,3:借出,4:拆分, 5:闲置,6:启用,7:报废,8:变卖 */
-    @Excel(name = "单据类型,0:未知:1:调整,2:调拨,3:借出,4:拆分, 5:闲置,6:启用,7:报废,8:变卖")
+    @Excel(name = "单据类型,0:正常:1:调整,2:调拨,3:借出,4:拆分, 5:闲置,6:启用,7:报废,8:变卖")
     private Long orderType;
 
     /** 申请日期 */

+ 3 - 3
ruoyi-ui/src/views/asset/information/index.vue

@@ -65,7 +65,7 @@
       </el-form-item>
       <el-form-item v-if="isExist('管理状态')" label="管理状态" prop="manageStatus">
         <el-select v-model="queryParams.manageStatus" placeholder="请选择管理状态" clearable>
-          <el-option v-for="dict in dict.type.sys_manger_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-option v-for="dict in dict.type.asset_order_type" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item v-if="isExist('入账时间')" label="入账时间" prop="paymentReceivingTime">
@@ -270,7 +270,7 @@
       <el-table-column v-if="isExist('备注')" label="备注" align="center" prop="remark" />
       <el-table-column v-if="isExist('管理状态')" label="管理状态" align="center" prop="manageStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_manger_status" :value="scope.row.manageStatus" />
+          <dict-tag :options="dict.type.asset_order_type" :value="scope.row.manageStatus" />
         </template>
       </el-table-column>
       <el-table-column v-if="isExist('资产性质')" label="资产性质" align="center" prop="property">
@@ -687,7 +687,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
 export default {
   name: 'Information',
-  dicts: ['asset_record_status', 'sys_yes_no', 'sys_manger_status', 'sys_asset_property'],
+  dicts: ['asset_record_status', 'sys_yes_no', 'asset_order_type', 'sys_asset_property'],
   components: {
     ImageUploadTemp,
     Treeselect,