Merge remote-tracking branch 'origin/master'

cuilei

2 天以前 7edd931aa33aa0f4fff9a89e1bc1a064c3709035

 src/views/cms/modules/ToolStocktakingModal.vue

@@ -47,6 +47,7 @@
      },
      handleOk () {
        this.$refs.realForm.submitForm();
        this.loadData()
      },
      submitCallback(){
        this.$emit('ok');