Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

Mr.Shi

2023-09-01 68d975c737a051975cbb9b7c5bada7f37ae9e722

 minipro_standard/components/selectMaterial.vue

@@ -69,7 +69,6 @@
               unitName: '块',

               qualityType: 0,

               procedureName: '压制',



            }]

         },

         scrolltoupper() {

@@ -90,7 +89,7 @@


<style lang="scss" scoped>

   .material-content {

      height: 800rpx;

      height: 1100rpx;

   }



   .page_content_title_top {