whj 1 рік тому
батько
коміт
463f01b960

+ 1 - 1
src/views/sb/info/MeasureSbInfoAll.vue

@@ -1,5 +1,5 @@
 <template>
-  <SbInfo :use-type="4"/>
+  <SbInfo :use-type="4" :type-flag="1"/>
 </template>
 
 <script>

+ 1 - 1
src/views/sb/info/MeasureSbInfoCheck.vue

@@ -1,5 +1,5 @@
 <template>
-  <SbInfo :use-type="4" :is-measure="1" :is-self="0" />
+  <SbInfo :use-type="4" :is-measure="1" :is-self="0" :type-flag="2" />
 </template>
 
 <script>

+ 1 - 1
src/views/sb/info/MeasureSbInfoCheckSelf.vue

@@ -1,5 +1,5 @@
 <template>
-  <SbInfo :use-type="4" :is-measure="1" :is-self="1"/>
+  <SbInfo :use-type="4" :is-measure="1" :is-self="1" :type-flag="3"/>
 </template>
 
 <script>

+ 1 - 1
src/views/sb/info/MeasureSbInfoInStore.vue

@@ -1,5 +1,5 @@
 <template>
-  <SbInfo :use-type="4" :status="1"/>
+  <SbInfo :use-type="4" :status="1" :type-flag="5"/>
 </template>
 
 <script>

+ 1 - 1
src/views/sb/info/MeasureSbInfoNotCheck.vue

@@ -1,5 +1,5 @@
 <template>
-  <SbInfo :use-type="4" :is-measure="0"/>
+  <SbInfo :use-type="4" :is-measure="0" :type-flag="4"/>
 </template>
 
 <script>

+ 5 - 1
src/views/sb/info/SbInfoC.vue

@@ -377,6 +377,10 @@ export default {
       type: Number,
       default: null
     },
+    typeFlag: {
+      type: Number,
+      default: null
+    },
     status: {
       type: Number,
       default: null
@@ -1005,7 +1009,7 @@ export default {
     },
     doImportStandard () {
       // this.$refs.importModalStandard.base()
-      this.$refs.importModalUpdate2.base(null, 1)
+      this.$refs.importModalUpdate2.base(null, 1, this.typeFlag)
     },
     doImportForUpdate () {
       this.$refs.importModalUpdate2.base(null, 2)

+ 4 - 1
src/views/sb/info/modules/ImportFormUpdate2.vue

@@ -42,11 +42,13 @@ export default {
       useCompany: null,
       useProject: null,
       type: null,
+      typeFlag: null,
       fileList: []
     }
   },
   methods: {
-    base (useCompany, type) {
+    base (useCompany, type, typeFlag) {
+      this.typeFlag = typeFlag
       this.visible = true
       this.useCompany = useCompany
       if (type === 1) {
@@ -95,6 +97,7 @@ export default {
         }
         const formData = new FormData()
         formData.append('type', this.type)
+        formData.append('typeFlag', this.typeFlag)
         formData.append('file', this.fileList[0])
         importSbInfo2(formData)
           .then((res) => {