guarantee-lsq 2 years ago
parent
commit
e543731183

+ 4 - 3
src/views/sb/info/SbInfo.vue

@@ -128,7 +128,7 @@
               </a-button>-->
               <a-button style="margin-left:8px;" type="primary" @click="doImportStandard">
                 <a-icon type="upload"/>
-                新增设备和标准导入
+                导入
               </a-button>
               <a-button style="margin-left:8px;" type="primary" @click="doImportForUpdate">
                 <a-icon type="upload"/>
@@ -738,10 +738,11 @@ export default {
       this.$refs.importModal.base(null, null)
     },
     doImportStandard () {
-      this.$refs.importModalStandard.base()
+      // this.$refs.importModalStandard.base()
+      this.$refs.importModalUpdate.base(null, 1)
     },
     doImportForUpdate () {
-      this.$refs.importModalUpdate.base(null, null)
+      this.$refs.importModalUpdate.base(null, 4)
     }
   }
 }

+ 3 - 3
src/views/sb/info/modules/BaseForm.vue

@@ -52,7 +52,7 @@
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="型号"
+            label="设备型号"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -98,7 +98,7 @@
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="设备价格"
+            label="设备价格(原值)"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
 
@@ -556,7 +556,7 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="资产编号"
+            label="资产编号(财务编码)"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

+ 7 - 4
src/views/sb/info/modules/ImportFormUpdate.vue

@@ -46,12 +46,15 @@ export default {
     }
   },
   methods: {
-    base (useCompany, useProject) {
+    base (useCompany, type) {
       this.visible = true
       this.useCompany = useCompany
-      this.useProject = useProject
-      this.modalTitle = '设备修改导入'
-      this.type = 4
+      if (type === 1) {
+        this.modalTitle = '设备新增导入'
+      } else {
+        this.modalTitle = '设备修改导入'
+      }
+      this.type = type
     },
     handleRemove (file) {
       const index = this.fileList.indexOf(file)