Browse Source

bug 修复

lilei 4 years ago
parent
commit
a7d75d9944

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

@@ -222,7 +222,7 @@ export default {
         fax: '', //  客户传真
         fax: '', //  客户传真
         dispatchType: undefined, //  配送方式
         dispatchType: undefined, //  配送方式
         satelliteFlag: 0, //  是否卫星仓客户
         satelliteFlag: 0, //  是否卫星仓客户
-        priceType: '', //  价格类型
+        priceType: undefined, //  价格类型
         settleStyle: '', //  收款方式
         settleStyle: '', //  收款方式
         salesManSn: undefined, //  业务员
         salesManSn: undefined, //  业务员
         salesManName: '',
         salesManName: '',

+ 9 - 3
src/views/salesManagement/salesQuery/edit.vue

@@ -84,7 +84,13 @@
     <a-card size="small" :bordered="false" class="salesEdit-cont">
     <a-card size="small" :bordered="false" class="salesEdit-cont">
       <!-- 提交按钮 -->
       <!-- 提交按钮 -->
       <div style="text-align: center;">
       <div style="text-align: center;">
-        <a-button size="large" type="primary" class="button-primary" @click="handleSubmit()" id="productInfoList-handleSubmit">提交</a-button>
+        <a-button
+          size="large"
+          style="width: 150px;"
+          type="primary"
+          class="button-primary"
+          @click="handleSubmit()"
+          id="productInfoList-handleSubmit">提交</a-button>
       </div>
       </div>
     </a-card>
     </a-card>
     <!-- 选择客户弹框 -->
     <!-- 选择客户弹框 -->
@@ -127,8 +133,8 @@ export default {
         { title: '售价', scopedSlots: { customRender: 'price' }, width: 150, align: 'center' },
         { title: '售价', scopedSlots: { customRender: 'price' }, width: 150, align: 'center' },
         { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '销售数量', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '售价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return (text ? ('¥' + text) : '--') } },
-        { title: '折后小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return (text ? ('¥' + text) : '--') } },
+        { title: '售价小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '折后小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 170, align: 'center', fixed: 'right' }
       ],
       ],
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象

+ 8 - 3
src/views/salesManagement/salesQuery/list.vue

@@ -188,7 +188,7 @@ export default {
         { title: '总售价', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '收款方式', dataIndex: 'settleStyle', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款方式', dataIndex: 'settleStyle', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '急件', dataIndex: 'urgentFlag', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件', dataIndex: 'oosFlag', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', scopedSlots: { customRender: 'billStatus' }, width: 110, align: 'center' },
         { title: '业务状态', scopedSlots: { customRender: 'billStatus' }, width: 110, align: 'center' },
         { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
         { title: '财务状态', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center', fixed: 'right' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center', fixed: 'right' }
@@ -241,13 +241,16 @@ export default {
         title: '提示',
         title: '提示',
         content: '请点击下方按钮确认操作?',
         content: '请点击下方按钮确认操作?',
         centered: true,
         centered: true,
+        closable: true,
         okText: '审核通过',
         okText: '审核通过',
         cancelText: '审核不通过',
         cancelText: '审核不通过',
         onOk () {
         onOk () {
           _this.auditOrder(row.id, 'AUDIT_PASS')
           _this.auditOrder(row.id, 'AUDIT_PASS')
         },
         },
-        onCancel () {
-          _this.auditOrder(row.id, 'AUDIT_REJECT')
+        onCancel (e) {
+          if (!e.triggerCancel) {
+            _this.auditOrder(row.id, 'AUDIT_REJECT')
+          }
         }
         }
       })
       })
     },
     },
@@ -269,6 +272,7 @@ export default {
         title: '提示',
         title: '提示',
         content: '确认要出库吗?',
         content: '确认要出库吗?',
         centered: true,
         centered: true,
+        closable: true,
         onOk () {
         onOk () {
           salesWriteStockOut({
           salesWriteStockOut({
             id: row.id,
             id: row.id,
@@ -297,6 +301,7 @@ export default {
         title: '提示',
         title: '提示',
         content: '确认要删除吗?',
         content: '确认要删除吗?',
         centered: true,
         centered: true,
+        closable: true,
         onOk () {
         onOk () {
           salesDel({ id: row.id }).then(res => {
           salesDel({ id: row.id }).then(res => {
             if (res.status == 200) {
             if (res.status == 200) {

+ 1 - 0
src/views/salesManagement/salesQuery/queryPart.vue

@@ -103,6 +103,7 @@
       <!-- 售价 -->
       <!-- 售价 -->
       <template slot="price" slot-scope="text, record">
       <template slot="price" slot-scope="text, record">
         <div @dblclick.stop>
         <div @dblclick.stop>
+          ¥
           <a-input-number
           <a-input-number
             v-model="record.dealerProduct.cityPrice"
             v-model="record.dealerProduct.cityPrice"
             :precision="2"
             :precision="2"