Browse Source

bug 修复

lilei 2 years ago
parent
commit
b472e28b77

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
 {
   "message": "发现有新版本发布,确定更新系统?",
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
   "vendorJsVersion": "",
-  "version": 1678081077776
+  "version": 1678084276954
 }
 }

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -416,7 +416,7 @@ export default {
       const _this = this
       const _this = this
       this.$confirm({
       this.$confirm({
         title: '提示',
         title: '提示',
-        content: '确认要清空已选产品列表吗',
+        content: '确认要清空已选产品列表吗',
         centered: true,
         centered: true,
         onOk () {
         onOk () {
           _this.spinning = true
           _this.spinning = true

+ 1 - 0
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -140,6 +140,7 @@
                   ghost
                   ghost
                   class="button-error"
                   class="button-error"
                   id="purchaseReturnEdit-delAll-btn"
                   id="purchaseReturnEdit-delAll-btn"
+                  :disabled="dataSource.length == 0"
                   @click.stop="handleDel('', 'all')"
                   @click.stop="handleDel('', 'all')"
                 >清空列表</a-button>
                 >清空列表</a-button>
               </div>
               </div>

+ 3 - 2
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -83,6 +83,7 @@
                   type="primary"
                   type="primary"
                   ghost
                   ghost
                   @click="salesReturnDelAll"
                   @click="salesReturnDelAll"
+                  :disabled="chooseLoadData.length==0"
                   :loading="delLoading"
                   :loading="delLoading"
                   style="margin-left: 10px"
                   style="margin-left: 10px"
                   id="salesReturn-del-all">清空列表</a-button>
                   id="salesReturn-del-all">清空列表</a-button>
@@ -439,7 +440,7 @@ export default {
     resetSearchForm (flag) {
     resetSearchForm (flag) {
       this.$refs.table.refresh(!!flag)
       this.$refs.table.refresh(!!flag)
       if (flag) {
       if (flag) {
-        this.getOrderDetail()
+        this.getOrderDetail(true)
       }
       }
     },
     },
     // 添加或修改产品
     // 添加或修改产品
@@ -479,7 +480,7 @@ export default {
       salesReturnSaveProduct(params).then(res => {
       salesReturnSaveProduct(params).then(res => {
         this.resetSearchForm(type == 'edit')
         this.resetSearchForm(type == 'edit')
         if (type == 'new') {
         if (type == 'new') {
-          this.getOrderDetail()
+          this.getOrderDetail(true)
         }
         }
         this.isInster = false
         this.isInster = false
         this.spinning = false
         this.spinning = false

+ 1 - 0
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -83,6 +83,7 @@
                 <a-button
                 <a-button
                   type="primary"
                   type="primary"
                   ghost
                   ghost
+                  :disabled="chooseLoadData.length==0"
                   @click="salesReturnDelAll"
                   @click="salesReturnDelAll"
                   :loading="delLoading"
                   :loading="delLoading"
                   style="margin-left: 10px"
                   style="margin-left: 10px"

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.0.183/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.0.183/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,
         changeOrigin: true,
         changeOrigin: true,