Jelajahi Sumber

Merge branch 'develop_yh18' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh18

chenrui 2 tahun lalu
induk
melakukan
a1f68b4f9a

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1682228257029
+  "version": 1682232221302
 }

+ 1 - 1
src/views/allocationManagement/storeTransferOut/importGuideModal.vue

@@ -92,7 +92,7 @@ export default {
         savePathType: 'local',
         storeCallOutSn: this.params.storeCallOutSn
       },
-      filePath: location.protocol + '//' +location.host + '/templ/店内调出产品导入模板.xlsx'
+      filePath: location.protocol + '//' +location.host + '/templ/店内调出产品导入模板.xls'
     }
   },
   methods: {

+ 4 - 2
src/views/bulkManagement/bulkReturnGoods/chooseImportModal.vue

@@ -107,7 +107,7 @@ export default {
         { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', dataIndex: 'returnPriceStr', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货单价', dataIndex: 'returnPrice', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '退货数量', dataIndex: 'returnQtyStr', width: '14%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],
@@ -116,7 +116,7 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货单价', dataIndex: 'returnPriceStr', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货单价', dataIndex: 'returnPrice', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '退货数量', dataIndex: 'returnQtyStr', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '错误说明', scopedSlots: { customRender: 'errorMsg' }, width: '10%', align: 'center' }
       ],
@@ -131,10 +131,12 @@ export default {
       this.unLoadData = paramsData.errorList || []
       this.loadData.map((item, index) => {
         item.no = index + 1
+        item.returnPrice = item.returnPriceStr ? item.returnPriceStr : item.returnPrice
         item.sparePartsReturnSn = paramsData.sparePartsReturnSn
       })
       this.unLoadData.map((item, index) => {
         item.no = index + 1
+        item.returnPrice = item.returnPriceStr ? item.returnPriceStr : item.returnPrice
         item.sparePartsReturnSn = paramsData.sparePartsReturnSn
       })
     },

+ 1 - 0
src/views/bulkManagement/bulkReturnGoods/edit.vue

@@ -332,6 +332,7 @@ export default {
       this.spinning = true
       sparePartsRetDetailBatchSave(obj).then(res => {
         if (res.status == 200) {
+          this.$refs.table.refresh()
           this.chooseResetSearchForm()
         }
         this.spinning = false