优化修改资产单据页面

ruoyi-ui/src/views/order/detail/index.vue

@@ -183,16 +183,16 @@
         <el-form-item label="资产编号" prop="assetNumber">
           <el-input v-model="form.assetNumber" placeholder="请输入资产编号" />
         </el-form-item>
-        <el-form-item label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
+        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】旧管理人" prop="allocationOldResponsiblePerson">
           <el-input v-model="form.allocationOldResponsiblePerson" placeholder="请输入【调拨】旧管理人" />
         </el-form-item>
-        <el-form-item label="【调拨】旧功能位置编号" prop="allocationOldLocationNumber">
+        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】旧功能位置编号" prop="allocationOldLocationNumber">
           <el-input v-model="form.allocationOldLocationNumber" placeholder="请输入【调拨】旧功能位置编号" />
         </el-form-item>
-        <el-form-item label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
+        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】新管理人" prop="allocationNewResponsiblePerson">
           <el-input v-model="form.allocationNewResponsiblePerson" placeholder="请输入【调拨】新管理人" />
         </el-form-item>
-        <el-form-item label="【调拨】新功能位置编号" prop="allocationNewLocationNumber">
+        <el-form-item v-if="orderInfo.orderType === '2'" label="【调拨】新功能位置编号" prop="allocationNewLocationNumber">
           <el-input v-model="form.allocationNewLocationNumber" placeholder="请输入【调拨】新功能位置编号" />
         </el-form-item>
         <el-form-item label="【借出】预计归还时间" prop="lendReturnDate">
@@ -231,6 +231,33 @@ import { listDetail, getDetail, delDetail, addDetail, updateDetail } from "@/api
 
 export default {
   name: "Detail",
+  props: {
+    orderInfo: {
+      type: Object,
+      default: {
+        id: null,
+        orderNumber: null,
+        orderType: null,
+        applicationDate: null,
+        applicationDepartment: null,
+        adjustmentAssetNumber: null,
+        allocationCallOutDepartment: null,
+        allocationCallOutBy: null,
+        allocationCallOutDate: null,
+        allocationCallInDepartment: null,
+        allocationCallInBy: null,
+        allocationCallInDate: null,
+        lendDepartment: null,
+        lendBySponsor: null,
+        lendPassingUnit: null,
+        reason: null,
+        preparedBy: null,
+        preparedDepartment: null,
+        corporation: null,
+        recordStatus: null
+      }
+    }
+  },
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/order/order/index.vue

@@ -223,18 +223,18 @@
           <dict-tag :options="dict.type.asset_order_type" :value="scope.row.orderType"/>
         </template>
       </el-table-column>
-      <el-table-column v-if="queryParams.orderType !== '1'" label="资产总原值" align="center" prop="assetTotalOriginalValue" />
-      <el-table-column v-if="queryParams.orderType !== '1'" label="资产总净值" align="center" prop="assetTotalNetValue" />
       <el-table-column label="申请日期" align="center" prop="applicationDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请部门" align="center" prop="applicationDepartmentName" />
+      <el-table-column v-if="queryParams.orderType !== '1'" label="资产总原值" align="center" prop="assetTotalOriginalValue" />
+      <el-table-column v-if="queryParams.orderType !== '1'" label="资产总净值" align="center" prop="assetTotalNetValue" />
       <el-table-column v-if="queryParams.orderType === '1'" label="【调整】资产编号" align="center" prop="adjustmentAssetNumber" />
       <el-table-column v-if="queryParams.orderType === '1'" label="【调整】资产原信息" align="center" prop="adjustmentOriginalAssetInfo">
         <template slot-scope="scope">
-          <el-button type="text" icon="el-icon-search" @click="onSelectOriginalAssetInfo(scope.row.adjustmentOriginalAssetInfo)">查看</el-button>
+          <el-button v-if="queryParams.orderType === '1'" type="text" icon="el-icon-search" @click="onSelectOriginalAssetInfo(scope.row.adjustmentOriginalAssetInfo)">查看</el-button>
         </template>
       </el-table-column>
       <el-table-column v-if="queryParams.orderType === '2'" label="【调拨】调出部门" align="center" prop="allocationCallOutDepartmentName" />
@@ -265,9 +265,17 @@
           <dict-tag :options="dict.type.asset_record_status" :value="scope.row.recordStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button
+            v-if="queryParams.orderType !== '1'"
+            size="mini"
+            type="text"
+            icon="el-icon-document"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['order:order:edit']"
+          >明细</el-button>
+          <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
@@ -442,6 +450,9 @@
     <el-dialog title="资产调整" :visible.sync="openAdjustment" width="900px" append-to-body>
       <AssetInfo :title="'资产原信息'" :assetInfo="adjustmentOriginalAssetInfo"/>
     </el-dialog>
+
+    <el-dialog title="">
+    </el-dialog>
   </div>
 </template>