Przeglądaj źródła

Merge branch 'develop_yh49_1' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh49_1

chenrui 7 miesięcy temu
rodzic
commit
134bd5d7d7

+ 5 - 3
src/views/allocationManagement/transferOut/edit.vue

@@ -199,7 +199,7 @@
               type="link"
               class="button-primary"
               :loading="spinning"
-              @click="handleAdd(record, false, 'noRefresh')"
+              @click.stop="handleAdd(record, false, 'noRefresh')"
             >添加</a-button>
           </template>
         </s-table>
@@ -322,7 +322,7 @@
               type="link"
               class="button-error"
               :loading="spinning"
-              @click="handleDel(record)"
+              @click.stop="handleDel(record)"
               :id="'allocateBillEdit-del-btn'+record.id">删除</a-button>
           </template>
         </s-table>
@@ -612,7 +612,9 @@ export default {
       return {
         on: {
           dblclick: (event) => {
-            this.handleAdd(record, false, 'noRefresh')
+            if (!this.spinning) {
+              this.handleAdd(record, false, 'noRefresh')
+            }
           }
         }
       }

+ 1 - 0
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -755,6 +755,7 @@ export default {
       this.spinning = false
       this.$refs.updateActive.confirmLoading = false
       this.openUpActiveModal = false
+      this.$refs.table.clearSelected()
       this.$refs.table.refresh(false)
     },
     // 添加产品

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.131/ocs-admin',
+        // target: 'http://192.168.2.10/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,