接口调整

src/api/supermarketerp/common.ts

@@ -31,6 +31,24 @@ export function getErpSpuSimpleAll() {
 	})
 }
 
+// 采购申请单分页查询
+export function getCgsqPage(query?: Object) {
+	return request({
+		url: "/supermarket/smErpCgDd/cgsq/page",
+		method: "get",
+		params: query,
+	})
+}
+
+// 采购订单分页查询
+export function getCgddPage(params?: Object) {
+	return request({
+		url: "/supermarket/smErpInventoryRecords/cgdd/page",
+		method: "get",
+		params,
+	})
+}
+
 // 获取出入库订单列表
 export function getCgInventoryPage(params?: Object) {
 	return request({

src/api/supermarketerp/smErpCgBack.ts

@@ -1,40 +0,0 @@
-import request from "/@/utils/request"
-
-export function fetchList(query?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack/page",
-		method: "get",
-		params: query,
-	})
-}
-
-export function addObj(obj?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack",
-		method: "post",
-		data: obj,
-	})
-}
-
-export function getObj(id?: string) {
-	return request({
-		url: "/supermarket/smErpCgBack/" + id,
-		method: "get",
-	})
-}
-
-export function delObjs(ids?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack",
-		method: "delete",
-		data: ids,
-	})
-}
-
-export function putObj(obj?: Object) {
-	return request({
-		url: "/supermarket/smErpCgBack",
-		method: "put",
-		data: obj,
-	})
-}

src/api/supermarketerp/smErpCgDd.ts

@@ -38,12 +38,3 @@ export function putObj(obj?: Object) {
 		data: obj,
 	})
 }
-
-// 采购申请单分页查询
-export function getCgsqPage(query?: Object) {
-	return request({
-		url: "/supermarket/smErpCgDd/cgsq/page",
-		method: "get",
-		params: query,
-	})
-}

src/api/supermarketerp/smErpInventoryRecords.ts

@@ -38,11 +38,3 @@ export function putObj(obj?: Object) {
 		data: obj,
 	})
 }
-
-export function getCgddPage(params?: Object) {
-	return request({
-		url: "/supermarket/smErpInventoryRecords/cgdd/page",
-		method: "get",
-		params,
-	})
-}

src/views/supermarketerp/purchaseManagement/smErpCgBack/form.vue

@@ -172,14 +172,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgBack"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getPlanCode, getErpSpuSimpleAll, getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { displayPrice } from "/@/utils/formatMoney"
 
 const router = useRouter()

src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue

@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue

@@ -173,13 +173,12 @@ import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
 import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgDd"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getPlanCode, getErpSpuSimpleAll, getCgsqPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgsqPage } from "/@/api/supermarketerp/smErpCgDd"
 import { displayPrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -177,14 +177,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgInventory"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getPlanCode, getErpSpuSimpleAll, getCgddPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgddPage } from "/@/api/supermarketerp/smErpCgInventory"
 import { displayPrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue

@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/retailManagement/smErpRetailBack/form.vue

@@ -201,14 +201,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgInventory"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getPlanCode, getErpSpuSimpleAll, getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgInventoryPage } from "/@/api/supermarketerp/common"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue

@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 
 const router = useRouter()

src/views/supermarketerp/retailManagement/smErpRetailDelivery/form.vue

@@ -201,14 +201,13 @@
 import { ref, reactive, computed, onMounted } from "vue"
 import { useRouter, useRoute } from "vue-router"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpCgInventory"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/smErpInventoryRecords"
-import { getPlanCode, getErpSpuSimpleAll } from "/@/api/supermarketerp/common"
+import { getPlanCode, getErpSpuSimpleAll, getCgddPage } from "/@/api/supermarketerp/common"
 import { VxeTableEvents, VxeTablePropTypes, type VxeTableInstance } from "vxe-table"
 import { formatDate } from "/@/utils/formatTime"
 import { Search } from "@element-plus/icons-vue"
 import erpSpuSelectDialog from "/@/views/supermarketerp/components/erpSpuSelectDialog.vue"
 import linkCodeDialog from "/@/views/supermarketerp/components/linkCodeDialog.vue"
-import { getCgddPage } from "/@/api/supermarketerp/smErpCgInventory"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue

@@ -115,7 +115,7 @@
 <script setup lang="ts">
 import { useRouter } from "vue-router"
 import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/supermarketerp/smErpCgInventory"
+import { fetchList, delObjs } from "../../../../api/supermarketerp/smErpInventoryRecords"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 

src/views/supermarketerp/smErpInventoryWarning/index.vue

@@ -48,9 +48,8 @@
 				<el-table-column prop="spec" label="规格" show-overflow-tooltip />
 				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
 				<el-table-column prop="warnType" label="预警类型" show-overflow-tooltip min-width="100">
-					<template #default="scope">
+					<template #default="{ row }">
-						<el-tag type="danger" v-if="scope.row.warnType == 1">库存不足</el-tag>
+						<dict-tag :options="sm_inventory_warning_type" :value="row.warnType" />
-						<el-tag type="danger" v-if="scope.row.warnType == 2">库存超额</el-tag>
 					</template>
 				</el-table-column>
 				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
@@ -78,7 +77,9 @@
 import { BasicTableProps, useTable } from "/@/hooks/table"
 import { getSmErpInventoryWarningList } from "/@/api/supermarketerp/smErpInventoryWarning"
 import { getSupermarketCategory } from "/@/api/supermarketerp/supermarketSpu"
+import { useDict } from "/@/hooks/dict"
 
+const { sm_inventory_warning_type } = useDict("sm_inventory_warning_type")
 const queryRef = ref()
 const showSearch = ref(true)
 const selectObjs = ref([]) as any