浏览代码

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

chenrui 2 年之前
父节点
当前提交
6bbcf4e8f7

+ 1 - 1
public/version.json

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

+ 1 - 1
src/components/index.less

@@ -456,7 +456,7 @@
 .ant-alert-message, .ant-card-head{
   color: #000000!important;
 }
-.ant-input-number-disabled,.ant-input-disabled,.ant-select-disabled .ant-select-selection,.ant-input[disabled],input[readonly]{
+.ant-input-number-disabled,.ant-input-disabled,.ant-select-disabled .ant-select-selection,.ant-input[disabled],.ant-input-number input[readonly]{
   background-color: #F8F8F8!important;
   color: #333!important;
   cursor: not-allowed;

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/detailModal.vue

@@ -32,8 +32,8 @@
                   @click="viewSales(item)">
                   {{ item.salesBillNo }};
                 </a>
+                <span v-if="salesOrderList.length==0">--</span>
                 <a-button v-if="totalNums" type="primary" class="button-info" @click="showPlModal=true">生成销售单</a-button>
-                <span v-else>--</span>
               </div>
             </a-descriptions-item>
           </a-descriptions>

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/outWarehousingModal.vue

@@ -151,7 +151,7 @@ export default {
               _this.listData.map((item, index) => {
                 arr.push({
                   productSn: item.productSn,
-                  confirmQty: item.confirmQty,
+                  confirmQty: item.qty,
                   replenishBillDetailSn: item.replenishBillDetailSn,
                   id: item.id
                 })

+ 6 - 5
src/views/salesManagement/salesQuery/edit.vue

@@ -369,6 +369,7 @@ export default {
     updateData (priceType) {
       // 价格类型变更
       if (priceType != this.$route.params.priceType) {
+        this.getOrderDetail(true)
         this.$router.push({ name: 'salesEdit', params: { id: this.orderId, sn: this.salesBillSn, priceType: priceType } })
       } else {
         this.getOrderDetail(true)
@@ -708,7 +709,11 @@ export default {
     },
     getShelfQueryByCustomer () {
       queryByCustomerSn({ sn: this.detailData.buyerSn }).then(res => {
-        this.shelfInfo = Object.assign(res.data, { salePriceType: this.$route.params.priceType, salesBillSn: this.salesBillSn })
+        if (res.data) {
+          this.shelfInfo = Object.assign(res.data, { salePriceType: this.$route.params.priceType, salesBillSn: this.salesBillSn })
+        } else {
+          this.shelfInfo = null
+        }
       })
     },
     // 提交销售单
@@ -804,10 +809,6 @@ export default {
     	})
     }
   },
-  deactivated () {
-    // this.dataSource = []
-    // this.showPage = false
-  },
   beforeRouteEnter (to, from, next) {
     next(vm => {})
   }

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