商城联调

src/views/MiniMall/Purchase/Comp/DialogAdd.vue

@@ -67,9 +67,9 @@
             >
               <el-option
                 v-for="item in warehouseOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
+                :key="item.warehouseId"
+                :label="item.warehouseName"
+                :value="item.warehouseId"
               />
             </el-select>
           </el-form-item>
@@ -94,6 +94,11 @@
 
 <script setup>
 import * as PurchaseApi from '@/api/mall/purchase'
+import * as WarehouseApi from '@/api/mall/warehouse'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
 const props = defineProps({
   opts: {
     type: Object,
@@ -101,7 +106,8 @@ const props = defineProps({
       return {
         product: [],
         spec: [],
-        supplier: []
+        supplier: [],
+        warehouse: []
       }
     }
   }
@@ -129,13 +135,16 @@ const rules = {
   unitPrice: { required: true, message: '采购单价不可为空', trigger: 'change,blur' }
 }
 
-const warehouseOptions = ref([
-  { label: '自营仓', value: 1 },
-  { label: '供应商仓', value: 2 }
-])
+const warehouseOptions = ref([])
+function getOptions() {
+  WarehouseApi.getSimpleWarehouseList().then((data) => {
+    warehouseOptions.value = data
+  })
+}
 
 const open = (val) => {
   dialogVisible.value = true
+  getOptions()
   form.value = { ...val } || {
     productId: undefined,
     specsId: undefined,

src/views/MiniMall/Purchase/index.vue

@@ -47,6 +47,8 @@
         <el-date-picker
           v-model="queryParams.applyTime"
           type="daterange"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
           range-separator="-"
           start-placeholder="申请时间"
           end-placeholder="申请时间"
@@ -56,6 +58,8 @@
         <el-date-picker
           v-model="queryParams.checkTime"
           type="daterange"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
           range-separator="-"
           start-placeholder="审核时间"
           end-placeholder="审核时间"
@@ -81,11 +85,11 @@
         :formatter="item.formatter"
         showOverflowTooltip
       />
-      <el-table-column label="操作" width="150px" fixed="right">
+      <el-table-column label="操作" width="240px" fixed="right">
         <template #default="{ row }">
           <el-button
             type="primary"
-            v-if="row.status == 1"
+            v-if="row.auditStatus == 1"
             link
             @click="handleAudit(row)"
             v-hasPermi="['mall:purchase:audit']"