优化

src/views/EquipmentEntryApply/EquipmentMainList.vue

@@ -10,13 +10,13 @@
           </el-form-item>
 
           <el-form-item label="申请时间" prop="createTime">
-            <el-date-picker type="daterange" style="width: 100%" unlink-panels range-separator="至"
+            <el-date-picker type="daterange" style="width: 240px" unlink-panels range-separator="至"
               start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd"
               v-model="queryParams.createTime" />
           </el-form-item>
 
           <el-form-item label="审批状态" prop="status">
-            <el-select clearable style="width: 100%" placeholder="请选择审批状态" v-model="queryParams.status">
+            <el-select clearable style="width: 240px" placeholder="请选择审批状态" v-model="queryParams.status">
               <el-option label="待审批" value="0" />
               <el-option label="已审批" value="1" />
               <el-option label="草稿" value="3" />

src/views/EquipmentEntryApply/equipmentInput/add.vue

@@ -148,36 +148,6 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理模式" prop="manageType">
-            <el-select
-              v-model="form.manageType"
-              placeholder="请选择管理方式"
-              clearable
-              @change="deviceTypeChange"
-              style="width: 100%"
-            >
-              <el-option label="编码" value="0" />
-              <el-option label="数量" value="1" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="装备数量" prop="count">
-            <el-input-number
-              v-model="form.count"
-              placeholder="请输入装备数量"
-              :min="1"
-              :max="100"
-              :precision="0"
-              :controls="false"
-              style="width: 100%"
-              :disabled="form.manageType == 0"
-            />
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="计数单位" prop="unit">
             <!-- <el-input v-model="form.unit" placeholder="请输入计数单位" clearable maxlength="11" /> -->
@@ -191,6 +161,36 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <!-- <el-col :span="6">
+          <el-form-item label="管理模式" prop="manageType">
+            <el-select
+              v-model="form.manageType"
+              placeholder="请选择管理方式"
+              clearable
+              @change="deviceTypeChange"
+              style="width: 100%"
+            >
+              <el-option label="编码" value="0" />
+              <el-option label="数量" value="1" />
+            </el-select>
+          </el-form-item>
+        </el-col> -->
+      </el-row>
+      <el-row :gutter="24">
+        <!-- <el-col :span="6">
+          <el-form-item label="装备数量" prop="count">
+            <el-input-number
+              v-model="form.count"
+              placeholder="请输入装备数量"
+              :min="1"
+              :max="100"
+              :precision="0"
+              :controls="false"
+              style="width: 100%"
+              :disabled="form.manageType == 0"
+            />
+          </el-form-item>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="采购日期" prop="purchaseDate">
             <el-date-picker
@@ -340,6 +340,7 @@ export default {
   name: 'EquipmentEntryEditDialog', // 明确组件名称
   emits: ['update:isVisible', 'submit', 'getOrderId'], // 声明事件
   dicts: ['dev_unit_type'],
+  components: { ImageUpload, FileUpload },
   data() {
     return {
       isSubmit: false,
@@ -362,7 +363,7 @@ export default {
         originalCode: '', // 装备原始编码
         nextMaintenanceDate: '', // 下次维保日期
         maxServiceLifeYears: '', // 装备寿命
-        manageType: '', // 管理模式
+        manageType: '0', // 管理模式
         count: 1, // 装备数量
         unit: '', // 计数单位
         purchaseDate: '',
@@ -387,7 +388,7 @@ export default {
         originalCode: [{ required: true, message: '请输入装备原始编码', trigger: 'blur' }],
         nextMaintenanceDate: [{ required: true, message: '请选择下次维保日期', trigger: 'change' }],
         maxServiceLifeYears: [{ required: true, message: '请输入装备寿命', trigger: 'blur' }],
-        manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
+        // manageType: [{ required: true, message: '请选择管理方式', trigger: 'change' }],
         count: [{ required: true, message: '请输入装备数量', trigger: 'blur' }],
         unit: [{ required: true, message: '请输入计数单位', trigger: 'blur' }],
         purchaseDate: [{ required: true, message: '请选择采购日期', trigger: 'change' }],
@@ -402,9 +403,10 @@ export default {
     this.firstLevel()
     this.getManufacturerSelectList()
     this.query = this.$route.query
+    console.log('🚀 ~ this.query:', this.query)
+    this.form.orderId = this.orderId = this.query.orderId || ''
     if (this.query && this.query.maId) {
       this.pageTitle = '编辑装备'
-      this.orderId = this.query.orderId
       this.getInfo()
     }
   },
@@ -503,8 +505,7 @@ export default {
     },
     // 返回上一页
     goBack() {
-      this.$router.go(-1)
+      this.$tab.closePage()
-      // this.$router.push({ path: '/equipment/equipment-input/index' })
     },
     deviceTypeChange(val) {
       if (val === 0) {
@@ -546,7 +547,7 @@ export default {
           this.isSubmit = true
           const loading = this.$loading()
           try {
-            if (!this.query.maId) {
+            if (!this.query.orderId) {
               const result = await getEquipmentAddIdApi()
               this.orderId = result.data.id
               this.form.orderId = this.orderId
@@ -653,6 +654,8 @@ export default {
                   isAddVisible: false,
                   isApprovalVisible: false,
                 },
+              }).then(() => {
+                this.$tab.closePage({ path: '/equipment/equipment-input/add' })
               })
             }
           } catch (error) {

src/views/EquipmentEntryApply/equipmentInput/index.vue

@@ -93,7 +93,7 @@
               v-model="queryParams.manufacturerId"
               placeholder="请选择生产厂家"
               clearable
-              style="width: 100%"
+              style="width: 200px"
             >
               <el-option
                 v-for="item in manufacturerList"
@@ -130,7 +130,7 @@
           <el-form-item prop="minBuyPrice" label="资产原值">
             <el-input
               clearable
-              style="width: 90px"
+              style="width: 95px"
               placeholder="请输入"
               v-model.trim="queryParams.minBuyPrice"
             />
@@ -139,7 +139,7 @@
           <el-form-item prop="maxBuyPrice" label="-" style="margin-left: -6%;">
             <el-input
               clearable
-              style="width: 90px"
+              style="width: 95px"
               placeholder="请输入"
               v-model.trim="queryParams.maxBuyPrice"
             />
@@ -392,10 +392,11 @@ export default {
   components: { EquipmentEntryEditDialog },
   emits: ['update:isVisible', 'submit'], // 声明事件
   created() {
-    console.log(this.$route)
+    console.log('🚀 ~ this.$route:', this.$route)
     this.orderId = this.$route.query && this.$route.query.orderId
-    this.isAddVisible = this.$route.query && this.$route.query.isAddVisible
+    console.log('🚀 ~ this.orderId:', this.orderId)
-    this.isApprovalVisible = this.$route.query && this.$route.query.isApprovalVisible
+    this.isAddVisible = this.$route.query.isAddVisible && JSON.parse(this.$route.query.isAddVisible)
+    this.isApprovalVisible = this.$route.query.isApprovalVisible && JSON.parse(this.$route.query.isApprovalVisible)
     if (!this.orderId) {
       this.pageTitle = '新增设备录入'
       this.submitButtonText = '提交申请'
@@ -567,8 +568,8 @@ export default {
     },
     equipmentDeployment() {
       this.$router.push({
-        name: 'equipmentInputAdd',  // 完整路径
+        path: '/equipment/equipment-input/add',
-        params: {  // 因为使用path，所以用query传递参数
+        query: {
           orderId: this.orderId
         }
       })
@@ -723,7 +724,11 @@ export default {
         this.dialogList = row.purchaseInvoices || []
       }
       this.dialogVisible = true
-    }
+    },
+    importTemplate() {
+      // this.download('system/user/importTemplate', {
+      // }, `user_template_${new Date().getTime()}.xlsx`)
+    },
   }
 }
 </script>

src/views/EquipmentLedger/details.vue

@@ -84,23 +84,23 @@
             <el-input clearable maxlength="20" placeholder="最大使用年限" v-model="form.maxServiceLifeYears" readonly />
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="管理模式" prop="manageType">
-            <el-input v-model="form.manageTypeName" placeholder="管理方式" readonly />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="24">
-        <el-col :span="6">
-          <el-form-item label="装备数量" prop="count">
-            <el-input v-model="form.count" placeholder="装备数量" readonly />
-          </el-form-item>
-        </el-col>
         <el-col :span="6">
           <el-form-item label="计数单位" prop="unit">
             <el-input v-model="form.unit" placeholder="计数单位" readonly />
           </el-form-item>
         </el-col>
+        <!-- <el-col :span="6">
+          <el-form-item label="管理模式" prop="manageType">
+            <el-input v-model="form.manageTypeName" placeholder="管理方式" readonly />
+          </el-form-item>
+        </el-col> -->
+      </el-row>
+      <el-row :gutter="24">
+        <!-- <el-col :span="6">
+          <el-form-item label="装备数量" prop="count">
+            <el-input v-model="form.count" placeholder="装备数量" readonly />
+          </el-form-item>
+        </el-col> -->
         <el-col :span="6">
           <el-form-item label="采购日期" prop="purchaseDate">
             <el-input v-model="form.purchaseDate" placeholder="采购日期" readonly />