瀏覽代碼

修改bug

csx 6 年之前
父節點
當前提交
29783f7ff7

+ 2 - 2
src/xt_pages/stock/Dialog/salesReturnDialog.vue 查看文件

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

+ 2 - 2
src/xt_pages/stock/Dialog/stockInDialog.vue 查看文件

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

+ 6 - 6
src/xt_pages/stock/cancelStockOrderEdit.vue 查看文件

@@ -8,7 +8,7 @@
8 8
       </div>
9 9
     </div>
10 10
     <div class="app-container">
11
-      <sales-return-dialog :propForm="propForm"
11
+      <sales-return-dialog ref="dialog" :propForm="propForm"
12 12
                            :visibility="isVisibility"
13 13
                            v-on:dialog-comfirm="comfirm"
14 14
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -166,7 +166,8 @@
166 166
     },
167 167
     methods: {
168 168
       comfirm: function(val) {
169
-        this.isVisibility = false
169
+        this.$refs.dialog.hide()
170
+
170 171
         if (val.selectedGoodInfo.length > 0) {
171 172
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
172 173
             if (i == 0) {
@@ -186,7 +187,8 @@
186 187
 
187 188
         this.currentIndex = -1
188 189
       }, cancle: function() {
189
-        this.isVisibility = false
190
+        this.$refs.dialog.hide()
191
+
190 192
       }, GetConfigInfo: function() {
191 193
         const params = {
192 194
           type: this.$route.query.type
@@ -273,9 +275,6 @@
273 275
         }
274 276
       }, showDialog(index, row) {
275 277
         this.currentIndex = index
276
-
277
-        this.isVisibility = true
278
-        console.log(this.form.manufacturer)
279 278
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
280 279
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
281 280
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -286,6 +285,7 @@
286 285
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
287 286
           return cur
288 287
         }, [])
288
+        this.$refs.dialog.show()
289 289
       }, back() {
290 290
         this.$router.go(-1)
291 291
       }, submit() {

+ 7 - 6
src/xt_pages/stock/salesReturnEdit.vue 查看文件

@@ -10,7 +10,7 @@
10 10
 
11 11
   <div class="app-container">
12 12
 
13
-    <sales-return-dialog :propForm="propForm"
13
+    <sales-return-dialog ref="dialog" :propForm="propForm"
14 14
                      :visibility="isVisibility"
15 15
                      v-on:dialog-comfirm="comfirm"
16 16
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -172,7 +172,8 @@
172 172
     },
173 173
     methods: {
174 174
       comfirm: function(val) {
175
-        this.isVisibility = false
175
+        this.$refs.dialog.hide()
176
+
176 177
         if (val.selectedGoodInfo.length > 0) {
177 178
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
178 179
             if (i == 0) {
@@ -192,7 +193,9 @@
192 193
 
193 194
         this.currentIndex = -1
194 195
       }, cancle: function() {
195
-        this.isVisibility = false
196
+
197
+        this.$refs.dialog.hide()
198
+
196 199
       }, GetConfigInfo: function() {
197 200
         const params = {
198 201
           type: this.$route.query.type
@@ -285,9 +288,7 @@
285 288
         }
286 289
       }, showDialog(index, row) {
287 290
         this.currentIndex = index
288
-
289
-        this.isVisibility = true
290
-        console.log(this.form.manufacturer)
291
+        this.$refs.dialog.show()
291 292
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
292 293
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
293 294
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)

+ 8 - 5
src/xt_pages/stock/salesReturnOrderAdd.vue 查看文件

@@ -9,7 +9,7 @@
9 9
     </div>
10 10
 
11 11
     <div class="app-container">
12
-      <sales-return-dialog :propForm="propForm"
12
+      <sales-return-dialog ref="dialog" :propForm="propForm"
13 13
                            :visibility="isVisibility"
14 14
                            v-on:dialog-comfirm="comfirm"
15 15
                            v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -192,7 +192,8 @@
192 192
     },
193 193
     methods: {
194 194
       comfirm: function(val) {
195
-        this.isVisibility = false
195
+        this.$refs.dialog.hide()
196
+
196 197
         if (val.selectedGoodInfo.length > 0) {
197 198
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
198 199
             if (i == 0) {
@@ -212,7 +213,9 @@
212 213
 
213 214
         this.currentIndex = -1
214 215
       }, cancle: function() {
215
-        this.isVisibility = false
216
+
217
+        this.$refs.dialog.hide()
218
+
216 219
       }, GetConfigInfo: function() {
217 220
         const params = {
218 221
           type: this.type
@@ -305,8 +308,8 @@
305 308
           this.$message.error('请先选择厂商')
306 309
           return
307 310
         } else {
308
-          this.isVisibility = true
309
-          console.log(this.form.manufacturer)
311
+          this.$refs.dialog.show()
312
+
310 313
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
311 314
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
312 315
               this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)

+ 8 - 4
src/xt_pages/stock/stockInOrderAdd.vue 查看文件

@@ -10,7 +10,7 @@
10 10
     </div>
11 11
     <div class="app-container">
12 12
 
13
-      <stock-in-dialog :propForm="propForm"
13
+      <stock-in-dialog ref="dialog" :propForm="propForm"
14 14
                        :visibility="isVisibility"
15 15
                        v-on:dialog-comfirm="comfirm"
16 16
                        v-on:dialog-cancle="cancle"></stock-in-dialog>
@@ -339,7 +339,7 @@
339 339
         this.propForm.isCreated = 1
340 340
         this.isVisibility = true
341 341
       }, comfirm: function(val) {
342
-        this.isVisibility = false
342
+        this.$refs.dialog.hide()
343 343
         if (val.selectedGoodInfo.length > 0) {
344 344
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
345 345
             if (i == 0) {
@@ -366,7 +366,8 @@
366 366
 
367 367
         this.currentIndex = -1
368 368
       }, cancle: function() {
369
-        this.isVisibility = false
369
+        this.$refs.dialog.hide()
370
+
370 371
       }, GetAllGoodType: function() {
371 372
         GetAllGoodType().then(response => {
372 373
           if (response.data.state == 0) {
@@ -466,7 +467,8 @@
466 467
           this.$message.error('请先选择厂商')
467 468
           return
468 469
         } else {
469
-          this.isVisibility = true
470
+
471
+          // this.isVisibility = true
470 472
           const params = {
471 473
             id: this.form.manufacturer
472 474
           }
@@ -488,6 +490,8 @@
488 490
                   obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
489 491
                   return cur
490 492
                 }, []) // 设置cur默认类型为数组,并且初始值为空的数组
493
+                this.$refs.dialog.show()
494
+
491 495
               }
492 496
             }
493 497
           })

+ 7 - 3
src/xt_pages/stock/stockInOrderEdit.vue 查看文件

@@ -10,7 +10,7 @@
10 10
 
11 11
   <div class="app-container">
12 12
 
13
-    <stock-in-dialog :propForm="propForm"
13
+    <stock-in-dialog ref="dialog" :propForm="propForm"
14 14
                      :visibility="isVisibility"
15 15
                      v-on:dialog-comfirm="comfirm"
16 16
                      v-on:dialog-cancle="cancle"></stock-in-dialog>
@@ -259,7 +259,8 @@ export default {
259 259
     methods: {
260 260
 
261 261
       comfirm: function(val) {
262
-        this.isVisibility = false
262
+        this.$refs.dialog.hide()
263
+
263 264
         if (val.selectedGoodInfo.length > 0) {
264 265
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
265 266
             if (i == 0) {
@@ -286,7 +287,8 @@ export default {
286 287
 
287 288
         this.currentIndex = -1
288 289
       }, cancle: function() {
289
-        this.isVisibility = false
290
+        this.$refs.dialog.hide()
291
+
290 292
       }, GetConfigInfo: function() {
291 293
         GetAllConfig().then(response => {
292 294
           if (response.data.state == 0) {
@@ -397,6 +399,8 @@ export default {
397 399
                   obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
398 400
                   return cur
399 401
                 }, []) // 设置cur默认类型为数组,并且初始值为空的数组
402
+                this.$refs.dialog.show()
403
+
400 404
               }
401 405
             }
402 406
           })

+ 7 - 4
src/xt_pages/stock/stockOutOrderAdd.vue 查看文件

@@ -11,7 +11,7 @@
11 11
 
12 12
   <div class="app-container">
13 13
 
14
-    <sales-return-dialog :propForm="propForm"
14
+    <sales-return-dialog ref="dialog" :propForm="propForm"
15 15
                          :visibility="isVisibility"
16 16
                          v-on:dialog-comfirm="comfirm"
17 17
                          v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -211,7 +211,8 @@
211 211
     },
212 212
     methods: {
213 213
       comfirm: function(val) {
214
-        this.isVisibility = false
214
+        this.$refs.dialog.hide()
215
+
215 216
         if (val.selectedGoodInfo.length > 0) {
216 217
           for (let i = val.selectedGoodInfo.length - 1; ;i--) {
217 218
             if (i == 0) {
@@ -232,7 +233,8 @@
232 233
 
233 234
         this.currentIndex = -1
234 235
       }, cancle: function() {
235
-        this.isVisibility = false
236
+        this.$refs.dialog.hide()
237
+
236 238
       }, GetConfigInfo: function() {
237 239
         const params = {
238 240
           type: this.$route.query.type
@@ -327,7 +329,8 @@
327 329
           this.$message.error('请先选择厂商')
328 330
           return
329 331
         } else {
330
-          this.isVisibility = true
332
+          this.$refs.dialog.show()
333
+
331 334
           console.log(this.form.manufacturer)
332 335
           for (let i = 0; i < this.propForm.goodInfo.length; i++) {
333 336
             if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {

+ 7 - 5
src/xt_pages/stock/stockOutOrderEdit.vue 查看文件

@@ -10,7 +10,7 @@
10 10
 
11 11
   <div class="app-container">
12 12
 
13
-    <sales-return-dialog :propForm="propForm"
13
+    <sales-return-dialog  ref="dialog"  :propForm="propForm"
14 14
                      :visibility="isVisibility"
15 15
                      v-on:dialog-comfirm="comfirm"
16 16
                      v-on:dialog-cancle="cancle"></sales-return-dialog>
@@ -193,7 +193,8 @@
193 193
     },
194 194
     methods: {
195 195
       comfirm: function(val) {
196
-        this.isVisibility = false
196
+        this.$refs.dialog.hide()
197
+
197 198
         if (val.selectedGoodInfo.length > 0) {
198 199
           for (let i = val.selectedGoodInfo.length - 1; ; i--) {
199 200
             if (i == 0) {
@@ -215,7 +216,7 @@
215 216
 
216 217
         this.currentIndex = -1
217 218
       }, cancle: function() {
218
-        this.isVisibility = false
219
+        this.$refs.dialog.hide()
219 220
       }, GetConfigInfo: function() {
220 221
         const params = {
221 222
           type: this.$route.query.type
@@ -305,8 +306,7 @@
305 306
       }, showDialog(index, row) {
306 307
         this.currentIndex = index
307 308
 
308
-        this.isVisibility = true
309
-        console.log(this.form.manufacturer)
309
+
310 310
         for (let i = 0; i < this.propForm.goodInfo.length; i++) {
311 311
           if (this.propForm.goodInfo[i].manufacturer == this.form.manufacturer) {
312 312
             this.propForm.goodType.push(this.propForm.goodInfo[i].GoodsType)
@@ -317,6 +317,8 @@
317 317
           obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
318 318
           return cur
319 319
         }, [])
320
+        this.$refs.dialog.show()
321
+
320 322
       }, back() {
321 323
         this.$router.go(-1)
322 324
       }, submit() {