Browse Source

备货打印添加实际总金额/开单总金额/正价总金额字段

chenrui 1 year ago
parent
commit
49b67ad363

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/chooseProductsModal.vue

@@ -189,7 +189,6 @@ export default {
     },
     //  清空选项
     resetSearchForm () {
-      this.rowSelectionInfo = null
       this.$refs.table.clearSelected()
     },
     // 保存
@@ -222,6 +221,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.resetSearchForm()
+        this.rowSelectionInfo = null
         this.$emit('close')
       } else {
         const _this = this

+ 4 - 4
src/views/promotionRulesManagement/dealerPromotions/tableType1.vue

@@ -309,7 +309,7 @@ export default {
       const newClassifyArr = []
       mainArr.forEach(item => {
         if (item.productTypeLevel == 1) {
-          if ((item.dataRef&&!item.dataRef.children)||(!item.dataRef &&!item.children)) {
+          if ((item.dataRef && !item.dataRef.children) || (!item.dataRef && !item.children)) {
             const objType1 = {
               productTypeSn1: item.snPaths
             }
@@ -321,7 +321,7 @@ export default {
           }
         }
         if (item.productTypeLevel == 2) {
-          if ((item.dataRef&&!item.dataRef.children)||(!item.dataRef &&!item.children)) {
+          if ((item.dataRef && !item.dataRef.children) || (!item.dataRef && !item.children)) {
             const typeArr1 = item.snPaths ? item.snPaths.split(',') : []
             const objType2 = {
               productTypeSn1: typeArr1[0],
@@ -406,10 +406,10 @@ export default {
     // 添加产品
     addProductTag (pos, row) {
       this.productTagIndex = pos
-      this.openProductsModal = true
-      const dataList = this.setShowData('This')
       const echoData = this.handleEchoData('This', row.productThisList)
       this.chooseProducts = echoData
+      this.openProductsModal = true
+      const dataList = this.setShowData('This')
       this.$refs.productBox.handleDisabled(dataList)
     },
     handleProductsOk (arr) {

+ 9 - 7
src/views/salesManagement/stockPrint/list.vue

@@ -137,9 +137,9 @@
           <div slot="costTitle">
             <a-tooltip placement="top">
               <template slot="title">
-                如果收货客户名称不为空,则按照收货客户级别的价格计算得到(总售价内容包括促销产品)。
+                如果收货客户名称不为空,则按照收货客户级别的价格计算得到(实际总金额包含所有产品的原售价)。
               </template>
-              <span style="margin-right: 5px;">实际总售价</span> <a-icon type="question-circle" />
+              <span style="margin-right: 5px;">实际总金额(保价)</span> <a-icon type="question-circle" />
             </a-tooltip>
           </div>
           <!-- 操作 -->
@@ -291,11 +291,13 @@ export default {
 
       if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限
         const ind = this.isShowWarehouse ? 10 : 9
-		    arr.splice(ind, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 1, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 2, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 3, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
-        arr.splice(ind + 4, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind, 0, { title: '开单总金额', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 1, 0, { title: '正价总金额', dataIndex: 'normalTotalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+		    arr.splice(ind + 2, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 3, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 4, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 5, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind + 6, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '60px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }