瀏覽代碼

修改bug

chenrui 1 年之前
父節點
當前提交
5c662250c1

+ 0 - 2
src/views/productManagement/newProduct/list.vue

@@ -142,8 +142,6 @@ export default {
         const ajaxName = this.$route.params.type == 'onlineInfo' ? productList : queryNewProductPage
         if (this.$route.params.type == 'onlineInfo') {
           this.queryParam.state = 'ONLINE'
-          this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
-          this.queryParam.endDate = getDate.getCurrMonthDays().endtime
           if (this.queryParam.beginDate || this.queryParam.endDate) {
             this.queryParam.onlineFalg = 1
             this.queryParam.newProductDateScope = 9999

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

@@ -58,8 +58,8 @@
             <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
             <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="改单时间">{{ detailData&&detailData.submitDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="最新提交时间">{{ detailData&&detailData.firstSubmitDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="改单时间" v-if="detailData.salesBillSource=='PURCHASE'">{{ detailData&&detailData.submitDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="最新提交时间" v-else>{{ detailData&&detailData.firstSubmitDate || '--' }}</a-descriptions-item>
             <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
           </a-descriptions>
         </div>

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

@@ -167,9 +167,9 @@
             <a-badge count="促" v-if="record.promoFlag==1" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
           </template>
           <!-- 提交时间 -->
-          <!-- submitDateTit -->
-          <template slot="submitDateTit">
-            <span>提交时间</span>
+          <template slot="submitDateBox" slot-scope="text, record">
+            <span v-if="record.salesBillSource=='PURCHASE'">{{ record.submitDate }}</span>
+            <span v-else>{{ record.firstSubmitDate }}</span>
           </template>
           <!-- 出库仓库 -->
           <template slot="warehouseBox" slot-scope="text, record">
@@ -417,7 +417,7 @@ export default {
       const arr = [
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
-        { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
+        { title: <a-tooltip placement='top' title='第一次提交时间'>提交时间&nbsp;<a-icon type="question-circle" /></a-tooltip>, dataIndex: 'firstSubmitDate', width: '8%', align: 'center', scopedSlots: { customRender: 'submitDateBox' }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'center', ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },