lilei 4 سال پیش
والد
کامیت
495b471d25

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -145,7 +145,7 @@ export default {
     // 编辑
     handleEdit () {
       const row = this.detailData
-      this.$router.push({ name: 'salesEdit', params: { id: row.id, sn: row.salesBillSn } })
+      this.$router.push({ name: 'salesEdit', params: { id: row.id, sn: row.salesBillSn, priceType: row.priceType } })
     },
     //  详情
     getDetail () {

+ 2 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -150,6 +150,7 @@
           v-if="record.billStatus !== 'FINISH' && record.financialStatus !== 'FINISH'"
           @click="handleDel(record)"
           id="salesManagementList-del-btn">删除</a-button>
+        <span v-if="record.billStatus == 'FINISH'">--</span>
       </template>
     </s-table>
     <!-- 选择客户弹框 -->
@@ -209,7 +210,7 @@ export default {
         { title: '急件', dataIndex: 'oosFlag', scopedSlots: { customRender: 'oosFlag' }, width: 100, align: 'center' },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
         { title: '财务状态', dataIndex: 'financialStatus', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 280, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 220, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 3 - 2
src/views/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -66,7 +66,7 @@ export default {
       columns: [
         {
           title: '销售时间',
-          dataIndex: 'putTime',
+          dataIndex: 'salesBillEntity.createDate',
           align: 'center',
           width: 250
         },
@@ -84,7 +84,7 @@ export default {
         },
         {
           title: '客户名称',
-          dataIndex: 'buyerName',
+          dataIndex: 'salesBillEntity.buyerName',
           align: 'center'
         }
       ],
@@ -147,6 +147,7 @@ export default {
       if (!newValue) {
         this.$emit('close')
         this.curTab = '1'
+        this.list = []
       }
     }
   }