chenrui 2 kuukautta sitten
vanhempi
commit
042bc2ffc6

+ 4 - 5
src/views/expenseManagement/expenseReimbursement/baseDataModal.vue

@@ -348,8 +348,7 @@ export default {
         if (valid) {
           const form = JSON.parse(JSON.stringify(_this.form))
           form.expenseDate = form.expenseDate + '-01'
-          form.expenseAccountFilesList = this.attachList
-          // console.log(form)
+          form.expenseAccountFilesList = _this.attachList
           // 判断费用归属品类  最少要选择到2级或3级分类
           if (_this.form.productTypeSn1 && !_this.form.productTypeSn2) {
             _this.$message.warning('请选择归属分类(至少选择到2级或3级分类)')
@@ -358,12 +357,12 @@ export default {
           _this.spinning = true
           // 从销售单转的费用,直接提交
           if (_this.fromPage == 'sales') {
-            _this.$emit('expenseSaveOk', form, this.fromPage)
+            _this.$emit('expenseSaveOk', form, _this.fromPage)
             return false
           }
           // 从销售单转的费用,合并提交
           if (_this.fromPage == 'salesMearge') {
-            _this.$emit('expenseSaveOk', form, this.fromPage)
+            _this.$emit('expenseSaveOk', form, _this.fromPage)
             return false
           }
           // 手动建的费用单
@@ -371,7 +370,7 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               setTimeout(() => {
-                if (this.expenseAccountSn) {
+                if (_this.expenseAccountSn) {
                   _this.$emit('refashData')
                 } else {
                   // 跳转到费用明细单页面

+ 12 - 4
src/views/reportData/allocationOrderTotal/list.vue

@@ -91,6 +91,14 @@
           bordered
           :style="{ height: tableHeight+84.5+'px' }"
           :scroll="{ y: tableHeight - 20 }">
+          <!-- 调拨类型 -->
+          <template slot="allocateType" slot-scope="text, record">
+            <div>
+              <span>{{ record.allocateSortName||'--' }}</span>
+              <span v-if="record.allocateSortName&&record.allocateTypeName">/{{ record.allocateTypeName }}</span>
+            </div>
+          </template>
+          <!-- 费用归属品类 -->
           <template slot="productType" slot-scope="text, record">
             <span v-if="record.productTypeName1">{{ record.productTypeName1 }}{{ record.productTypeName2?'>'+record.productTypeName2:'' }}{{ record.productTypeName3?'>'+record.productTypeName3:'' }}</span>
             <span v-else>--</span>
@@ -200,7 +208,7 @@ export default {
         { title: '客户名称', dataIndex: 'targetName', width: '20%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'targetTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用类型', dataIndex: 'costTypeName', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨类型', dataIndex: 'allocateSortName', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型', dataIndex: 'allocateSortName', width: '15%', align: 'center', scopedSlots: { customRender: 'allocateType' } },
         { title: '费用归属品牌', dataIndex: 'productBrandName', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '费用归属品类', dataIndex: 'productTypeName1', width: '15%', align: 'center', scopedSlots: { customRender: 'productType' } },
         { title: '调拨数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -209,11 +217,11 @@ export default {
         { title: '操作员', dataIndex: 'creatorName', width: '11%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
       if (this.$hasPermissions('M_allocationOrderTotalList_salesPrice')) { //  成本价权限
-        arr.splice(10, 0, { title: '售价', dataIndex: 'totalPrice', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(10, 0, { title: '售价', dataIndex: 'totalPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_allocationOrderTotalList_costPrice')) { //  成本价权限
-        arr.splice(11, 0, { title: '成本价', dataIndex: 'totalCost', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(12, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '11%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(11, 0, { title: '成本价', dataIndex: 'totalCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(12, 0, { title: '毛利', dataIndex: 'totalGrossProfit', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 5 - 1
src/views/reportData/productRebateReport/dealerList.vue

@@ -111,6 +111,8 @@
               <a-col flex="10%">总开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               <a-col flex="10%">总实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
               <a-col flex="10%">总差价金额:{{ (totalData && (totalData.directRebateAmount || totalData.directRebateAmount==0)) ? toThousands(totalData.directRebateAmount) : '--' }}</a-col>
+              <a-col flex="10%">原总开单金额:{{ (totalData && (totalData.totalBillingAmount || totalData.totalBillingAmount==0)) ? toThousands(totalData.totalBillingAmount) : '--' }}</a-col>
+              <a-col flex="10%">原总实售金额:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -225,7 +227,9 @@ export default {
         { title: '总实售金额', dataIndex: 'totalRealAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总差价金额', dataIndex: 'directRebateAmount', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '差价金额', dataIndex: 'rebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '单据类型', dataIndex: 'bizTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原总开单金额', dataIndex: 'totalBillingAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '原总实售金额', dataIndex: 'totalRealSaleAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }

+ 5 - 1
src/views/reportData/productRebateReport/detailList.vue

@@ -105,6 +105,8 @@
               <a-col flex="10%" >总开单金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
               <a-col flex="10%" >总实售金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
               <a-col flex="10%" >总差价金额:{{ (totalData && (totalData.rebateAmount || totalData.rebateAmount==0)) ? toThousands(totalData.rebateAmount) : '--' }}</a-col>
+              <a-col flex="10%">原总开单金额:{{ (totalData && (totalData.totalAmountOrig || totalData.totalAmountOrig==0)) ? toThousands(totalData.totalAmountOrig) : '--' }}</a-col>
+              <a-col flex="10%">原总实售金额:{{ (totalData && (totalData.totalRealAmountOrig || totalData.totalRealAmountOrig==0)) ? toThousands(totalData.totalRealAmountOrig) : '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -211,7 +213,9 @@ export default {
         { title: '总开单金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: function (text, record) { return ((text || text == 0) && _this.getNormalVal(record.rebateParentTypeDictValue) ? _this.toThousands(text) : '--') } },
         { title: '总实售金额', dataIndex: 'totalRealAmount', width: '80px', align: 'right', customRender: function (text, record) { return ((text || text == 0) && _this.getNormalVal(record.rebateParentTypeDictValue) ? _this.toThousands(text) : '--') } },
         { title: '总差价金额', dataIndex: 'totalRebateAmount', width: '80px', align: 'right', customRender: function (text, record) { return ((text || text == 0) && _this.getNormalVal(record.rebateParentTypeDictValue) ? _this.toThousands(text) : '--') } },
-        { title: '差价金额', dataIndex: 'rebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '差价金额', dataIndex: 'rebateAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '原总开单金额', dataIndex: 'totalAmountOrig', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '原总实售金额', dataIndex: 'totalRealAmountOrig', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }

+ 5 - 1
src/views/reportData/productRebateReport/list.vue

@@ -84,6 +84,8 @@
               <a-col flex="10%">直接差价金额:{{ (totalData && (totalData.directRebate || totalData.directRebate==0)) ? toThousands(totalData.directRebate) : '--' }}</a-col>
               <a-col flex="10%">间接差价金额:{{ (totalData && (totalData.indirectRebate || totalData.indirectRebate==0)) ? toThousands(totalData.indirectRebate) : '--' }}</a-col>
               <a-col flex="10%">总实售价金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
+              <a-col flex="10%">原总开单金额:{{ (totalData && (totalData.totalBillingAmount || totalData.totalBillingAmount==0)) ? toThousands(totalData.totalBillingAmount) : '--' }}</a-col>
+              <a-col flex="10%">原总实售金额:{{ (totalData && (totalData.totalRealSaleAmount || totalData.totalRealSaleAmount==0)) ? toThousands(totalData.totalRealSaleAmount) : '--' }}</a-col>
             </a-row>
           </template>
         </s-table>
@@ -177,7 +179,9 @@ export default {
         { title: '总开单金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '直接差价金额', dataIndex: 'directRebate', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '间接差价金额', dataIndex: 'indirectRebate', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '总实售价金额', dataIndex: 'totalRealAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '总实售价金额', dataIndex: 'totalRealAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '原总开单金额', dataIndex: 'totalBillingAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '原总实售金额', dataIndex: 'totalRealSaleAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       if (this.showCols.includes('directRebateAmountInfo')) {
         arr.splice(6, 0, { title: '直接上级差价', dataIndex: 'directSuperiorsAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })