Forráskód Böngészése

Merge branch 'develop_yh15' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh15

chenrui 2 éve
szülő
commit
46599b2ac6

+ 1 - 1
public/version.json

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

+ 10 - 0
src/App.vue

@@ -45,6 +45,16 @@ export default {
     window.addEventListener('visibilitychange',()=>{
       this.$store.state.app.visibilityState = document.visibilityState == 'visible'
     })
+    window.addEventListener('focus',(e)=>{
+      if(!this.$store.state.app.visibilityState){
+        this.$store.state.app.visibilityState = true
+      }
+    })
+    window.addEventListener('blur',(e)=>{
+      if(this.$store.state.app.visibilityState){
+        this.$store.state.app.visibilityState = false
+      }
+    })
     this.$message.config({
       top: `100px`,
       duration: 3,

+ 2 - 2
src/utils/mixin.js

@@ -97,10 +97,10 @@ const commonMixin = {
     '$store.state.app.visibilityState':function(a,b){
       if(a && this.isActiveComp){
         if(this.$refs.table){
-          this.$refs.table.refresh()
+          // this.$refs.table.refresh()
         }
         if(this.$refs.chooseTable){
-          this.$refs.chooseTable.refresh()
+          // this.$refs.chooseTable.refresh()
         }
       }
     }

+ 1 - 1
src/views/salesManagement/salesQuery/chooseShelfProduct.vue

@@ -372,7 +372,7 @@ export default {
       this.$refs.table.refresh(true)
     },
     reload () {
-      // this.$refs.table.clearSelected()
+      this.$refs.table.clearSelected()
       this.$refs.table.refresh()
     },
     // ---------- 全部产品----------

+ 8 - 3
src/views/salesManagement/salesQueryNew/edit.vue

@@ -89,7 +89,7 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24" v-else>
+              <!-- <a-col :md="4" :sm="24" v-else>
                 <a-form-item label="是否为缺货">
                   <a-select allowClear v-model="productForm.oosFlag" placeholder="请选择是否">
                     <a-select-option value="1">
@@ -100,7 +100,7 @@
                     </a-select-option>
                   </a-select>
                 </a-form-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="4" :sm="24">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetForm" id="salesEdit-reset">重置</a-button>
@@ -640,7 +640,7 @@ export default {
         closable: true,
         onOk () {
           _this.spinning = true
-          const params = { id: _this.orderId, oosFlag: flag == 1 ? 1 : undefined, qhFlag: flag == 2 ? 1 : undefined }
+          const params = { id: _this.orderId, oosFlag: !flag ? undefined : 1 }
           salesDel(params).then(res => {
             if (res.status == 200) {
               _this.getOrderDetail(true)
@@ -792,6 +792,11 @@ export default {
         if (res.status == 200) {
           vm.detailData = res.data
           vm.discountAmountBak = vm.detailData.discountAmount
+          if(res.data.delFlag == 1){
+            vm.$message.info("该销售单已删除")
+            vm.handleBack()
+            return false
+          }
           if (flag) {
             const buyerSn = (vm.detailData && vm.detailData.buyerSn && vm.detailData.sourceType && vm.detailData.sourceType == 'PURCHASE') ? '' : vm.detailData.buyerSn
             const priceType = vm.$route.params.priceType

+ 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
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.183/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.183:8503/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,