lilei преди 3 години
родител
ревизия
ffb95ab9d1

+ 1 - 4
src/views/purchasingManagement/purchaseReturnOutSync/edit.vue

@@ -296,11 +296,8 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
         return purchaseReturnDetailList(Object.assign(parameter,
+          this.chooseQueryParam,
           {
-            dealerProductEntity: {
-              code: this.chooseQueryParam.productCode,
-              name: this.chooseQueryParam.productName
-            },
             purchaseReturnSn: this.$route.params.sn,
             orderBy: 'qpls_purchase_return_bill_detail.CREATE_DATE desc'
           })).then(res => {

+ 6 - 8
src/views/purchasingManagement/purchaseReturnOutSync/grapEdit.vue

@@ -287,14 +287,12 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
-        return purchaseReturnDetailList(Object.assign(parameter, {
-          dealerProductEntity: {
-            code: this.chooseQueryParam.productCode,
-            name: this.chooseQueryParam.productName
-          },
-          purchaseReturnSn: this.$route.params.sn,
-          orderBy: 'qpls_purchase_return_bill_detail.CREATE_DATE desc'
-        })).then(res => {
+        return purchaseReturnDetailList(Object.assign(parameter,
+          this.chooseQueryParam,
+          {
+            purchaseReturnSn: this.$route.params.sn,
+            orderBy: 'qpls_purchase_return_bill_detail.CREATE_DATE desc'
+          })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {

+ 1 - 2
src/views/purchasingManagement/purchaseReturnOutSync/list.vue

@@ -198,11 +198,10 @@ export default {
         { title: '总金额', dataIndex: 'totalAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '是否抓单', dataIndex: 'grabFlag', width: '7%', align: 'center', customRender: function (text) { return text == '1' ? '抓单' : '不抓单' } },
         { title: '出库时间', dataIndex: 'outStockTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'noSyncStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核', scopedSlots: { customRender: 'audit' }, width: '3%', align: 'center' },
         { title: '出库', scopedSlots: { customRender: 'waitOut' }, width: '3%', align: 'center' },
         { title: '收款', scopedSlots: { customRender: 'financial' }, width: '3%', align: 'center' },
-        // { title: '财务状态', dataIndex: 'settleStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象