lilei 4 роки тому
батько
коміт
b9491fcc0f

+ 9 - 1
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -38,7 +38,7 @@
             v-model="record.warehouseCascade"
             expand-trigger="hover"
             :options="warehouseCascadeData"
-            :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
+            :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
             id="purchaseOrderWarehousing-warehouseCascade"
             placeholder="请选择仓库仓位"
             :allowClear="false"
@@ -175,6 +175,14 @@ export default {
     getWarehouseCascade () {
       warehouseCascadeList({}).then(res => {
         if (res.status == 200) {
+			res.data.map(item => {
+			  item.sn = item.warehouseSn
+			  if (item.warehouseLocationList) {
+				item.warehouseLocationList.map(subItem => {
+				  subItem.sn = subItem.warehouseLocationSn
+				})
+			  }
+			})
           this.warehouseCascadeData = res.data
         } else {
           this.warehouseCascadeData = []

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

@@ -92,7 +92,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1590, y: tableHeight }"
+      :scroll="{ x: 1810, y: tableHeight }"
       bordered>
       <!-- 单号 -->
       <template slot="salesReturnNo" slot-scope="text, record">
@@ -175,6 +175,8 @@ export default {
         { title: '销售退货单号', scopedSlots: { customRender: 'salesReturnNo' }, width: 260, align: 'center' },
         { title: '客户名称', dataIndex: 'buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退款总金额', dataIndex: 'totalAmount', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总款数', dataIndex: 'totalCategory', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总数量', dataIndex: 'totalQty', width: 110, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '是否抓单', dataIndex: 'grabFlag', width: 100, align: 'center', customRender: function (text) { return ['否', '是'][text] } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: 110, align: 'center' },

+ 9 - 1
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -132,7 +132,7 @@
             v-model="record.warehouseCascade"
             expand-trigger="hover"
             :options="warehouseCascadeData"
-            :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
+            :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
             id="bulkWarehousingOrderEdit-warehouseCascade"
             placeholder="请选择仓库仓位"
             style="width: 100%;" />
@@ -326,6 +326,14 @@ export default {
     getWarehouseCascade () {
       warehouseCascadeList({}).then(res => {
         if (res.status == 200) {
+		  res.data.map(item => {
+		    item.sn = item.warehouseSn
+		    if (item.warehouseLocationList) {
+		  	item.warehouseLocationList.map(subItem => {
+		  	  subItem.sn = subItem.warehouseLocationSn
+		  	})
+		    }
+		  })
           this.warehouseCascadeData = res.data
         } else {
           this.warehouseCascadeData = []

+ 10 - 1
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -121,7 +121,8 @@
             v-model="record.warehouseCascade"
             expand-trigger="hover"
             :options="warehouseCascadeData"
-            :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
+            :allowClear="false"
+            :fieldNames="{ label: 'name', value: 'sn', children: 'warehouseLocationList' }"
             id="bulkWarehousingOrderEdit-warehouseCascade"
             placeholder="请选择仓库仓位"
             style="width: 100%;" />
@@ -328,6 +329,14 @@ export default {
     getWarehouseCascade () {
       warehouseCascadeList({}).then(res => {
         if (res.status == 200) {
+		  res.data.map(item => {
+		    item.sn = item.warehouseSn
+		    if (item.warehouseLocationList) {
+		  	item.warehouseLocationList.map(subItem => {
+		  	  subItem.sn = subItem.warehouseLocationSn
+		  	})
+		    }
+		  })
           this.warehouseCascadeData = res.data
         } else {
           this.warehouseCascadeData = []