Parcourir la source

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

chenrui il y a 1 an
Parent
commit
baa5488df4

+ 20 - 73
src/api/salesNew.js

@@ -139,6 +139,23 @@ export const salesWriteSubmit = (params) => {
   })
 }
 
+// 是否更新价格判断
+export const submitCheck = (params) => {
+  return axios({
+    url: '/salesn/submitCheck',
+    method: 'post',
+    data: params
+  })
+}
+// 当前价格  提交
+export const updateBatch = (params) => {
+  return axios({
+    url: '/salesn/detail/updateBatch',
+    method: 'post',
+    data: params
+  })
+}
+
 // 查询可生成的费用报销单
 export const queryCreateBySalesBillSn = (params) => {
   return axios({
@@ -156,6 +173,9 @@ export const expenseAccountSave = (params) => {
   })
 }
 
+
+
+
 //  销售 打印
 export const salesPrint = (params) => {
   return axios({
@@ -172,34 +192,6 @@ export const salesPrintPreview = (params) => {
     method: 'post'
   })
 }
-
-// 获取促销活动
-export const getPromoacActiveList = (params) => {
-  return axios({
-    url: `/sales/getPromoacActiveList/${params.salesBillSn}`,
-    data: params,
-    method: 'get'
-  })
-}
-//  促销订单统计 列表  有分页
-export const salesPromoList = (params) => {
-  const url = `/sales/queryPageByPromo/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-//  促销订单统计 合计
-export const salesPromoCount = (params) => {
-  return axios({
-    url: '/sales/queryCountByPromo',
-    data: params,
-    method: 'post'
-  })
-}
 // 销售  详情  该销售单的产品二级分类
 export const salesDetailProductType = (params) => {
   return axios({
@@ -239,48 +231,3 @@ export const salesDetailTypeExcel = params => {
     responseType: 'blob'
   })
 }
-
-// 车架号
-export const supperCodeByVin = (params) => {
-  return axios({
-    url: `/vinIdentify/queryPartCodeByVin/${params.vin}`,
-    method: 'get'
-  })
-}
-// 车架号  识别图片内容
-export const vinCodeParse = params => {
-  return axios.request({
-    url: `/vinIdentify/ocr`,
-    method: 'post',
-    data: params,
-    responseType: 'blob'
-  })
-}
-// 是否更新价格判断
-export const submitCheck = (params) => {
-  return axios({
-    url: '/sales/submitCheck',
-    method: 'post',
-    data: params
-  })
-}
-// 当前价格  提交
-export const updateBatch = (params) => {
-  return axios({
-    url: '/sales/detail/updateBatch',
-    method: 'post',
-    data: params
-  })
-}
-
-// 销售一览表 列表
-export const salesOverviewQueryPage = (params) => {
-  const url = `/salesOverview/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}

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

@@ -565,7 +565,7 @@
         // 当删除成功且不是”不参与活动“时
         if(delRet.status == 200 && data != 0){
           // 再添加到其它活动
-
+          this.$emit()
         }
         this.openUpActiveModal = false
         this.spinning = false

+ 1 - 1
src/views/salesManagement/waitDispatchNew/edit.vue

@@ -301,7 +301,7 @@ export default {
       this.isInster = true
       this.spinning = true
       salesDetailUpdateCancelQty({
-        salesBillDetailSnList: list,
+        salesBillDetailList: list,
         salesBillSn: this.salesBillSn
       }).then(res => {
         if (res.status == 200) {

+ 9 - 3
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -223,7 +223,8 @@ export default {
             <div>
               <a-input-number
                 size="small"
-                vModel={record.cancelNums}
+                value={record.cancelNums}
+                onChange={e => _this.cancelNumsChange(e,record)}
                 precision={0}
                 min={0}
                 max={record.surplusQty}
@@ -327,6 +328,10 @@ export default {
         }
       }
     },
+    cancelNumsChange(v,record){
+      record.cancelNums = v
+      this.dataSource.splice()
+    },
     // 选择单元格
     selectedRowChange({ row, isSelected, selectedRowKeys }){
       // console.log(row, isSelected, selectedRowKeys);
@@ -404,9 +409,10 @@ export default {
           item.productName = productName || '--'
           item.productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
           item.productOrigUnit = productOrigUnit || '--'
+          item.cancelNums = item.surplusQty
           // 库存为0或待下推数为0,不可添加
-          if(item.stockQty<0 || !item.stockQty || !item.surplusQty || item.surplusQty<0){
-            // this.disableSelectedRowKeys.push(item.id)
+          if(!item.surplusQty || item.surplusQty<0){
+            this.disableSelectedRowKeys.push(item.id)
           }
         })
         this.tableHeight = (this.showEmpty ? 200 : this.maxHeight) + 'px'

+ 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.111/ocs-admin',
+        target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,