lilei 4 anos atrás
pai
commit
5dd15bcbe8

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

@@ -210,7 +210,7 @@ export default {
         okText: '审核通过',
         cancelText: '审核不通过',
         onOk () {
-          _this.auditOrder(row.salesReturnBillSn, 'AUDIT_CHECK')
+          _this.auditOrder(row.salesReturnBillSn, 'WAIT_CHECK')
         },
         onCancel (e) {
           if (!e.triggerCancel) {

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

@@ -295,7 +295,7 @@ export default {
         okText: '审核通过',
         cancelText: '审核不通过',
         onOk () {
-          _this.auditOrder(row.salesReturnBillSn, 'AUDIT_CHECK')
+          _this.auditOrder(row.salesReturnBillSn, 'WAIT_CHECK')
         },
         onCancel (e) {
           if (!e.triggerCancel) {

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

@@ -186,6 +186,7 @@ export default {
         title: '单位',
         dataIndex: 'productEntity.unit',
         align: 'center',
+        customRender: function (text) { return text || '--' },
         width: 100
       },
       { slots: { title: 'customTitle' }, scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }]

+ 5 - 4
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -13,7 +13,7 @@
       </a-page-header>
     </a-affix>
     <a-card size="small" :bordered="false" class="pages-wrap">
-      <div class="table-operator">
+      <div>
         <a-button type="primary" :loading="loading" class="button-error" @click="backStock">批量返库</a-button>
       </div>
       <!-- 已选配件列表 -->
@@ -97,13 +97,13 @@ export default {
         },
         {
           title: '产品编码',
-          dataIndex: 'dealerProductEntity.code',
+          dataIndex: 'productEntity.code',
           align: 'center',
           width: 160
         },
         {
           title: '产品名称',
-          dataIndex: 'dealerProductEntity.name',
+          dataIndex: 'productEntity.name',
           align: 'center',
           width: 200
         },
@@ -122,8 +122,9 @@ export default {
         },
         {
           title: '单位',
-          dataIndex: 'dealerProductEntity.unit',
+          dataIndex: 'productEntity.unit',
           align: 'center',
+          customRender: function (text) { return text || '--' },
           width: 100
         },
         {