lilei 6 months ago
parent
commit
6c698bc7b9

+ 2 - 2
src/views/financialManagement/financialCollection/selectGlSalesModal.vue

@@ -93,8 +93,8 @@
         :showFooter="false"
         :openModal="showDetailModal"
         @cancel="cancelDetail">
-        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn" @close="cancelDetail"></salesDetail>
+        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn" @close="cancelDetail"></dispatchDetail>
       </commonModal>
     </a-spin>
   </a-modal>

+ 2 - 2
src/views/salesManagement/examineVerify/list.vue

@@ -163,8 +163,8 @@
         :showFooter="false"
         :openModal="showDetailModal"
         @cancel="cancelDetail">
-        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+        <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn" @close="cancelDetail"></salesDetail>
+        <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn" @close="cancelDetail"></dispatchDetail>
       </commonModal>
     </a-card>
   </div>

+ 2 - 2
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -151,8 +151,8 @@
       :showFooter="false"
       :openModal="showDetailModal"
       @cancel="cancelDetail">
-      <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-      <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+      <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn" @close="cancelDetail"></salesDetail>
+      <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn" @close="cancelDetail"></dispatchDetail>
     </commonModal>
   </div>
 </template>

+ 1 - 1
src/views/salesManagement/pushOrderManagement/list.vue

@@ -186,7 +186,7 @@
           :showFooter="false"
           :openModal="showDetailModal"
           @cancel="closeDetailModal">
-          <salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail>
+          <salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn" @close="closeDetailModal"></salesDetail>
         </commonModal>
 
         <!-- 发货说明 -->

+ 2 - 2
src/views/salesManagement/salesCollection/list.vue

@@ -208,8 +208,8 @@
           :showFooter="false"
           :openModal="showDetailModal"
           @cancel="cancelDetail">
-          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn" @close="cancelDetail"></salesDetail>
+          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn" @close="cancelDetail"></dispatchDetail>
         </commonModal>
       </a-spin>
     </a-card>

+ 3 - 2
src/views/salesManagement/salesList/list.vue

@@ -171,8 +171,8 @@
           :showFooter="false"
           :openModal="showDetailModal"
           @cancel="closeDetailModal">
-          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn" @close="closeDetailModal"></salesDetail>
+          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn" @close="closeDetailModal"></dispatchDetail>
         </commonModal>
         <!-- 发货单详情 -->
         <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
@@ -365,6 +365,7 @@ export default {
       }
     },
     closeDetailModal () {
+      this.detailType = 3
       this.showDetailModal = false
       this.bizSn = null
     },

+ 7 - 0
src/views/salesManagement/salesQueryNew/detail.vue

@@ -377,11 +377,13 @@ export default {
   methods: {
     //  返回
     handleBack () {
+      this.$emit('close')
       this.$router.push({ name: 'salesQueryNewList' })
     },
     // 编辑
     handleEdit () {
       const row = this.detailData
+      this.$emit('close')
       this.$router.push({ name: 'salesNewEdit', params: { sn: row.salesBillSn, wSn: row.warehouseSn } })
     },
     // 改单
@@ -401,6 +403,7 @@ export default {
             _this.$refs.tipModal.getShowInfo(obj)
             _this.openTipModal = true
           } else {
+            _this.$emit('close')
             _this.$router.push({ name: 'salesNewEdit', params: { sn: row.salesBillSn, wSn: row.warehouseSn } })
           }
         }
@@ -416,6 +419,7 @@ export default {
           this.$message.success(res.message)
           this.openTipModal = false
           this.$nextTick(() => {
+            this.$emit('close')
             this.$router.push({ name: 'salesNewEdit', params: { sn: row.salesBillSn, wSn: row.warehouseSn } })
           })
         }
@@ -424,6 +428,7 @@ export default {
     // 取消时,跳转编辑页面
     closeTipModal () {
       this.openTipModal = false
+      this.$emit('close')
       this.$router.push({ name: 'salesNewEdit', params: { sn: this.$route.params.sn || this.bizSn } })
     },
     // 查询第三方库存
@@ -493,6 +498,7 @@ export default {
     },
     // 下推
     handleDispatch (row) {
+      this.$emit('close')
       this.$router.push({ name: 'waitDispatchNew', params: { salesBillSn: row.salesBillSn } })
     },
     // 打开审核/一键审核弹框
@@ -689,6 +695,7 @@ export default {
           this.$nextTick(() => {
             // 审核通过,跳转到带下推页面
             if (billStatus == 'AUDIT_PASS' && !_this.auditText) {
+              _this.$emit('close')
               _this.$router.push({ name: 'waitDispatchNew', params: { salesBillSn: _this.bizSn || _this.$route.params.sn } })
             } else {
               // 不通过关闭详情返回列表

+ 2 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -471,7 +471,7 @@ export default {
     columns () {
       const _this = this
       let arr = [
-        { title: '创建时间', dataIndex: 'createDate', width: '5%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '8%', align: 'left' },
         { title: '提交时间', slots: { title: 'customDateTitle' }, dataIndex: 'firstSubmitDate', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -487,7 +487,7 @@ export default {
         { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '5%', align: 'center', isShow: false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '转采购额金额', dataIndex: 'totalConvertPromoGiftsAmount', width: '5%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditDate', width: '5%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },

+ 2 - 2
src/views/salesManagement/stockPrint/list.vue

@@ -196,8 +196,8 @@
           :showFooter="false"
           :openModal="showDetailModal"
           @cancel="cancelDetail">
-          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn"></salesDetail>
-          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
+          <salesDetail v-if="detailType==0" ref="salesDetail" :bizSn="bizSn" @close="cancelDetail"></salesDetail>
+          <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn" @close="cancelDetail"></dispatchDetail>
         </commonModal>
         <!-- 操作提示 -->
         <commonModal modalTit="操作提示" okText="暂不打印" :openModal="showPrintModal" @cancel="canselModal" @ok="updatePrintStatus">