Merge remote-tracking branch 'origin/master'

zhangherong

3 天以前 f4b97641a18b333e7b8417ebbe6db0c87e538eb5

 src/views/cms/modules/ToolStocktakingModal.vue

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