修改bug

src/xt_pages/stock/Dialog/salesReturnDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="propForm.title" :visible.sync="visibility"  :close-on-click-modal="isClose"
+  <el-dialog title="选择商品" :visible.sync="visibility"  :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
@@ -59,7 +59,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancle()">取 消</el-button>
-    <el-button type="primary" @click="comfirm()">确 定</el-button>
+    <el-button type="primary" @click="comfirm()">保 存</el-button>
   </span>
   </el-dialog>
 

src/xt_pages/stock/Dialog/stockInDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="propForm.title" :visible.sync="visibility" :close-on-click-modal="isClose"
+  <el-dialog title="选择商品" :visible.sync="visibility" :close-on-click-modal="isClose"
              :close-on-press-escape="isClose">
 
     <div class="filter-container">
@@ -59,7 +59,7 @@
 
     <span slot="footer" class="dialog-footer">
     <el-button @click="cancle('form')">取 消</el-button>
-    <el-button type="primary" @click="comfirm('form')">确 定</el-button>
+    <el-button type="primary" @click="comfirm('form')">保 存</el-button>
   </span>
   </el-dialog>
 

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="app-container">
-      <sales-return-dialog :propForm="propForm"
+      <sales-return-dialog ref="dialog" :propForm="propForm"
                            :visibility="isVisibility"
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -166,7 +166,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -186,7 +187,8 @@
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -273,9 +275,6 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -286,6 +285,7 @@
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
           return cur
         }, [])
+        this.$refs.dialog.show()
       }, back() {
         this.$router.go(-1)
       }, submit() {

src/xt_pages/stock/salesReturnEdit.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog ref="dialog" :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -172,7 +172,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -192,7 +193,9 @@
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -285,9 +288,7 @@
         }
       }, showDialog(index, row) {
         this.currentIndex = index
-
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
+        this.$refs.dialog.show()
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -9,7 +9,7 @@
     </div>
 
     <div class="app-container">
-      <sales-return-dialog :propForm="propForm"
+      <sales-return-dialog ref="dialog" :propForm="propForm"
                            :visibility="isVisibility"
                            v-on:dialog-comfirm="comfirm"
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -192,7 +192,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -212,7 +213,9 @@
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.type
@@ -305,8 +308,8 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
-          console.log(this.form.manufacturer)
+          this.$refs.dialog.show()
+
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
               this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)

src/xt_pages/stock/stockInOrderAdd.vue

@@ -10,7 +10,7 @@
     </div>
     <div class="app-container">
 
-      <stock-in-dialog :propForm="propForm"
+      <stock-in-dialog ref="dialog" :propForm="propForm"
                        :visibility="isVisibility"
                        v-on:dialog-comfirm="comfirm"
                        v-on:dialog-cancle="cancle"></stock-in-dialog>
@@ -339,7 +339,7 @@
         this.propForm.isCreated = 1
         this.isVisibility = true
       }, comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -366,7 +366,8 @@
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetAllGoodType: function() {
         GetAllGoodType().then(response => {
           if (response.data.state == 0) {
@@ -466,7 +467,8 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
+
+          // this.isVisibility = true
           const params = {
             id: this.form.manufacturer
           }
@@ -488,6 +490,8 @@
                   obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
                   return cur
                 }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                this.$refs.dialog.show()
+
               }
             }
           })

src/xt_pages/stock/stockInOrderEdit.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <stock-in-dialog :propForm="propForm"
+    <stock-in-dialog ref="dialog" :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></stock-in-dialog>
@@ -259,7 +259,8 @@ export default {
     methods: {
 
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
@@ -286,7 +287,8 @@ export default {
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         GetAllConfig().then(response => {
           if (response.data.state == 0) {
@@ -397,6 +399,8 @@ export default {
                   obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
                   return cur
                 }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+                this.$refs.dialog.show()
+
               }
             }
           })

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -11,7 +11,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog ref="dialog" :propForm="propForm"
                          :visibility="isVisibility"
                          v-on:dialog-comfirm="comfirm"
                          v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -211,7 +211,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
             if (i == 0) {
@@ -232,7 +233,8 @@
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -327,7 +329,8 @@
           this.$message.error('请先选择厂商')
           return
         } else {
-          this.isVisibility = true
+          this.$refs.dialog.show()
+
           console.log(this.form.manufacturer)
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -10,7 +10,7 @@
 
   <div class="app-container">
 
-    <sales-return-dialog :propForm="propForm"
+    <sales-return-dialog  ref="dialog"  :propForm="propForm"
                      :visibility="isVisibility"
                      v-on:dialog-comfirm="comfirm"
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -193,7 +193,8 @@
     },
     methods: {
       comfirm: function(val) {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
+
         if (val.selectedGoodInfo.length > 0) {
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
             if (i == 0) {
@@ -215,7 +216,7 @@
 
         this.currentIndex = -1
       }, cancle: function() {
-        this.isVisibility = false
+        this.$refs.dialog.hide()
       }, GetConfigInfo: function() {
         const params = {
           type: this.$route.query.type
@@ -305,8 +306,7 @@
       }, showDialog(index, row) {
         this.currentIndex = index
 
-        this.isVisibility = true
-        console.log(this.form.manufacturer)
+
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -317,6 +317,8 @@
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
           return cur
         }, [])
+        this.$refs.dialog.show()
+
       }, back() {
         this.$router.go(-1)
       }, submit() {