Merge branch 'master' of gitlab.gavelinfo.com:lisu/lxyl-vue

src/views/ccgl/cxfx/kwxq/index.vue

@@ -13,7 +13,10 @@
 
 <script>
   import Edit from './edit.vue'
+  import wlsx from 'common/src/mixin/wlsx.js'
+  import wlphsx from 'common/src/mixin/wlphsx.js'
   export default {
+    mixins: [wlsx, wlphsx],
     data() {
       return {
         power: {
@@ -102,6 +105,7 @@
             {
               title: "库存数量",
               field: "kcsl",
+              fieldType:"float",
               width: 140
             }
 
@@ -201,8 +205,13 @@
                 prop: 'wlxxInfo',
                 span: 6,
                 type: 'input',
+              },
+              {
+                label: '物料描述',
+                prop: 'wlphSx01',
+                span: 6,
+                type: 'input',
               }
-
             ]
 
           ],