luobang 1 rok temu
rodzic
commit
3bd6cfcf8a

+ 1 - 1
build/utils.js

@@ -17,7 +17,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
 let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'sale']
+// let devModules = ['index', 'statisticalReport', 'appoint']
 // let devModules = ['all']/
 // let devModules = ['index', 'sale']
 

Plik diff jest za duży
+ 332 - 329
src/views/appoint/components/saleContract/copySteelOrder.vue


+ 3 - 0
src/views/appoint/components/saleContract/editSaleOrder.vue

@@ -1720,6 +1720,9 @@ export default {
           this.selectionList[this.indexChangeMaterial].meterNumber = null
         } else {
           this.selectionList[this.indexChangeMaterial].haveMeter = 1
+          this.selectionList[this.indexChangeMaterial].meterNumber = Number(
+            this.selectedMaterialName.replace(/[^0-9]/gi, '')
+          )
         }
         //重新初始化
         this.indexChangeMaterial = null

+ 15 - 4
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -88,6 +88,9 @@
           <el-button type="primary" @click="refresh">
             <i class="el-icon-refresh"></i>
           </el-button>
+          <el-button type="primary" @click="updateMaxHeight">
+            <i class="el-icon-refresh"></i>改高
+          </el-button>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="checkTrans()"
@@ -2463,12 +2466,16 @@ export default {
   computed: {},
   mounted() {
     this.$nextTick(() => {
+      const that = this
       window.onresize = () => {
         return (() => {
-          this.maxHeight =
-            window.innerHeight -
-            document.querySelector('.tableTop').offsetHeight -
-            40
+          console.log('我触发了表格分辨率变化的时间')
+          that.$nextTick(() => {
+            that.maxHeight =
+              window.innerHeight -
+              document.querySelector('.tableTop').offsetHeight -
+              40
+          })
         })()
       }
     })
@@ -2491,6 +2498,10 @@ export default {
   },
   computed: {},
   methods: {
+    updateMaxHeight() {
+      this.maxHeight = 900
+      console.log(this.maxHeight)
+    },
     openBlank() {
       let page = this.$router.resolve({
         name: 'saleSteelReports',

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików