Pārlūkot izejas kodu

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

chenrui 1 gadu atpakaļ
vecāks
revīzija
687f1fd88c

+ 2 - 2
src/views/salesManagement/salesQueryNew/comps/detailProductList.vue

@@ -217,8 +217,8 @@
             }
             this.colspanNums = this.colspanNums + 3
             arr = arr.concat([
-                { title: '待下推数', field: 'surplusQty', width: 80,key: "o", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
-                { title: '已下推数', field: 'epushedQty', width: 80,key: "p", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
+                { title: '待下推数', field: 'unpushedQty', width: 80,key: "o", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
+                { title: '已下推数', field: 'pushedQty', width: 80,key: "p", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
                 { title: '已取消数', field: 'cancelQty', width: 80,key: "q", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} }
             ])
           return arr

+ 2 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -82,7 +82,8 @@
           <div class="totalPrice">总售价:¥<span>{{ toThousands(detailData.totalAmount) }}</span></div>
           <div>
             产品总款数:<strong style="margin-right: 10px;"> {{ detailData.totalCategory }} </strong>
-            总数量:<strong> {{ detailData.totalQty }} </strong>
+            总数量:<strong style="margin-right: 10px;"> {{ detailData.totalQty }} </strong>
+            <!-- 总售价:¥<strong> {{ toThousands(detailData.totalOrigAmount) }}</strong> -->
             <span style="margin:0 10px;" v-if="detailData.totalDiscountAmount">优惠金额:¥-<strong>{{ Number(detailData.totalDiscountAmount).toFixed(2) }}</strong></span>
             <a-popover title="优惠明细" @visibleChange="(visible)=>{visible&&getPromYhDetail()}">
               <a-button shape="round" size="small" v-if="detailData.totalDiscountAmount">优惠明细</a-button>

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

@@ -241,7 +241,7 @@ export default {
           }
       // 输入框
       const inputFormat = function(record,data,h) {
-        if(record.surplusQty>0){
+        if(record.unpushedQty>0){
           return (
             <div>
               <a-input-number
@@ -250,7 +250,7 @@ export default {
                 onChange={e => _this.cancelNumsChange(e,record)}
                 precision={0}
                 min={0}
-                max={record.surplusQty}
+                max={record.unpushedQty}
                 style="width: 100%;"
                 placeholder="请输入" />
             </div>
@@ -260,7 +260,7 @@ export default {
       }
       // 操作按钮
       const actionFormat = function(record,data,h) {
-        if(record.surplusQty>0){
+        if(record.unpushedQty>0){
           return (
             <div>
                <a-button
@@ -327,9 +327,9 @@ export default {
           { title: '可用库存', field: 'stockQty', width: 80,key: "j", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
           { title: '销售数量', field: 'qty', width: 80,key: "k", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
           { title: '已取消', field: 'cancelQty', width: 80,key: "o", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
-          { title: '已下推', field: 'epushedQty', width: 80,key: "p", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
-          { title: '待下推', field: 'surplusQty', width: 80,key: "q", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
-          { title: '取消数量', field: 'surplusQty', width: 80,key: "r", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return inputFormat(row,row[column.field],h)} },
+          { title: '已下推', field: 'pushedQty', width: 80,key: "p", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
+          { title: '待下推', field: 'unpushedQty', width: 80,key: "q", align: 'center',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return numsFormat(row[column.field])} },
+          { title: '取消数量', field: 'cancelNums', width: 80,key: "r", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return inputFormat(row,row[column.field],h)} },
           { title: '操作', field: 'action', width: 80,key: "s", align: 'center',fixed: 'right',operationColumn: false, renderBodyCell: ({ row, column, rowIndex }, h) => { return actionFormat(row,row[column.field],h)} },
         ])
       
@@ -472,10 +472,9 @@ export default {
           item.productName = productName || '--'
           item.productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
           item.productOrigUnit = productOrigUnit || '--'
-          item.epushedQty = Number(item.pushedQty) - Number(item.pushQty)
-          item.cancelNums = item.surplusQty
+          item.cancelNums = item.unpushedQty
           // 库存为0或待下推数为0,不可添加
-          if(!item.surplusQty || item.surplusQty<0){
+          if(!item.unpushedQty || item.unpushedQty<0){
             this.disableSelectedRowKeys.push(item.id)
           }
         })

+ 2 - 2
vue.config.js

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