瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
4661e2165a

+ 4 - 1
src/views/allocationManagement/transferOut/detail.vue

@@ -194,7 +194,10 @@ export default {
     handleExcel () {
       const _this = this
       this.spinning = true
-      exportExcel(allocateBillDetailExcel, { allocateSn: this.outBizSn || this.$route.params.sn }, '调拨明细', function () {
+      const params = { allocateSn: this.outBizSn || this.$route.params.sn }
+      params.showCostFlag = this.$hasPermissions('B_isShowCost')
+      params.showAmountFlag = this.$hasPermissions('B_isShowPrice')
+      exportExcel(allocateBillDetailExcel, params, '调拨明细', function () {
         _this.spinning = false
       })
     },

+ 4 - 1
src/views/allocationManagement/transferOut/edit.vue

@@ -592,7 +592,10 @@ export default {
     handleExcel () {
       const _this = this
       this.spinning = true
-      exportExcel(allocateBillDetailExcel, { allocateSn: this.outBizSn || this.$route.params.sn }, '调拨明细', function () {
+      const params = { allocateSn: this.$route.params.sn }
+      params.showCostFlag = this.$hasPermissions('B_isShowCost')
+      params.showAmountFlag = this.$hasPermissions('B_isShowPrice')
+      exportExcel(allocateBillDetailExcel, params, '调拨明细', function () {
         _this.spinning = false
       })
     },

+ 0 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -354,7 +354,6 @@ export default {
     handleExport () {
       const _this = this
       const params = this.queryParam
-      params.showCostFlag = this.$hasPermissions('B_isShowCost')
       this.exportLoading = true
       this.spinning = true
       hdExportExcel(allocateBillExport, params, '调拨列表', function () {

+ 2 - 1
src/views/productManagement/productPricing/chooseImportModal.vue

@@ -106,7 +106,8 @@ export default {
         { title: '特约价', dataIndex: 'specialPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '终端价', dataIndex: 'terminalPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '车主价', dataIndex: 'carOwnersPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '备注', dataIndex: 'errorMsg', width: '22%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '变更原因', dataIndex: 'changeReason', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'errorMsg', width: '14%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       unLoadData: [],
       loading: false

+ 5 - 1
src/views/productManagement/productPricing/list.vue

@@ -132,7 +132,7 @@
     <!-- 编辑价格 -->
     <product-pricing-edit-modal :openModal="openModal" :itemSn="itemSn" @close="closeModal" @ok="$refs.table.refresh()" />
     <!-- 审核价格 -->
-    <product-pricing-audit-modal :openModal="openAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="$refs.table.refresh()" />
+    <product-pricing-audit-modal :openModal="openAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="auditSuccess" />
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
   </a-card>
@@ -268,6 +268,10 @@ export default {
       this.itemSn = row.productSn
       this.openAuditModal = true
     },
+    auditSuccess () {
+      this.$refs.table.clearSelected() // 清空表格选中项
+      this.$refs.table.refresh()
+    },
     // 批量审核
     handleBatchAudit () {
       const _this = this