1

src/api/warehouse_product_storege.ts

@@ -27,3 +27,15 @@ export function apiWarehouseProductStoregeDelete(params: any) {
 export function apiWarehouseProductStoregeDetail(params: any) {
     return request.get({ url: '/warehouse_product_storege/warehouseproductstorege/detail', params })
 }
+
+/**
+ * 是否强制校验
+ * @param params
+ * @returns
+ */
+export function apiWarehouseProductStoregeVerify(params: any) {
+    return request.post({
+        url: '/warehouse_product_storege/warehouseproductstorege/verify',
+        params
+    })
+}

src/views/order/beforehand_order/component/outbound.vue

@@ -108,7 +108,9 @@
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="dialogBuyer = false">取消</el-button>
-                <el-button type="primary" @click="oneClickStorage" :disabled="disableClick"> 确认 </el-button>
+                <el-button type="primary" @click="oneClickStorage" :disabled="disableClick">
+                    确认
+                </el-button>
             </div>
         </template>
     </el-dialog>
@@ -220,18 +222,21 @@ const resetWarehouseData = ref({
 const disableClick = ref(false)
 const oneClickStorage = () => {
     disableClick.value = true
-	try {
+    // try {
     apiBeforehandOrderCreateOutboundOrder(one_click_storage.value).then((res) => {
         ElMessage.success('出库成功')
         dialogBuyer.value = false
         disableClick.value = false
         getLists()
     })
-	} catch (error) {
+    // } catch (error) {
+    //     setTimeout(() => {
+    //         disableClick.value = false
+    //     }, 2000)
+    // }
     setTimeout(() => {
         disableClick.value = false
-		}, 2000)
+    }, 4000)
-	}
 }
 const OclickDialogBuyer = () => {
     dialogBuyer.value = true

src/views/warehouse/product_import.vue

@@ -3,12 +3,25 @@
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
                 <el-form-item label="商品名称" prop="store_name">
-					<el-input class="w-[280px]" @keydown.enter="resetPage" v-model="queryParams.store_name" clearable
+                    <el-input
-						placeholder="请输入商品名称" />
+                        class="w-[280px]"
+                        @keydown.enter="resetPage"
+                        v-model="queryParams.store_name"
+                        clearable
+                        placeholder="请输入商品名称"
+                    />
                 </el-form-item>
                 <el-form-item label="商品分类" prop="store_name">
-					<el-cascader class="w-[280px]" v-model="queryParams.class_all" filterable clearable
+                    <el-cascader
-						:before-filter="beforeFilter" :props="props" placeholder="请选择商品分类" @change="resetPage" />
+                        class="w-[280px]"
+                        v-model="queryParams.class_all"
+                        filterable
+                        clearable
+                        :before-filter="beforeFilter"
+                        :props="props"
+                        placeholder="请选择商品分类"
+                        @change="resetPage"
+                    />
                 </el-form-item>
                 <!-- <el-form-item label="商品条码" prop="bar_code">
                     <el-input
@@ -19,27 +32,43 @@
                     />
                 </el-form-item> -->
                 <el-form-item label="排序" prop="order_by">
-					<el-select v-model="queryParams.order_by" placeholder="请选择排序" style="width: 240px"
+                    <el-select
-						@change="resetPage">
+                        v-model="queryParams.order_by"
-						<el-option v-for="item in [
+                        placeholder="请选择排序"
+                        style="width: 240px"
+                        @change="resetPage"
+                    >
+                        <el-option
+                            v-for="item in [
                                 { id: 'asc', name: '升序' },
                                 { id: 'desc', name: '降序' }
-                            ]" :key="item.id" :label="item.name" :value="item.id" />
+                            ]"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
-					<export-data class="ml-2.5" :fetch-fun="apiWarehouseProductStoregeLists" :params="queryParams"
+                    <export-data
-						:page-size="pager.size" />
+                        class="ml-2.5"
+                        :fetch-fun="apiWarehouseProductStoregeLists"
+                        :params="queryParams"
+                        :page-size="pager.size"
+                    />
                 </el-form-item>
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-			<router-link :to="{
+            <router-link
+                :to="{
                     path: 'import',
                     query: { warehouse_id: queryParams.warehouse_id }
-                }" class="ml-4">
+                }"
+                class="ml-4"
+            >
                 <el-button type="primary"> 出库 </el-button>
             </router-link>
             <div class="mt-4">
@@ -48,24 +77,85 @@
                     <el-table-column label="id" prop="id" show-overflow-tooltip />
                     <el-table-column label="商品图片" prop="image" min-width="80">
                         <template #default="{ row }">
-							<el-image style="width: 50px; height: 50px" :src="row.image" :preview-teleported="true" />
+                            <el-image
+                                style="width: 50px; height: 50px"
+                                :src="row.image"
+                                :preview-teleported="true"
+                            />
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="商品名称"
+                        prop="store_name"
+                        min-width="200"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="分类"
+                        prop="cate_name"
+                        min-width="120"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="单位"
+                        prop="unit_name"
+                        min-width="80"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column label="价格" prop="price" min-width="80" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <p>商户价{{ row.cost }}</p>
+                            <p>供货价{{ row.purchase }}</p>
+                            <p>零售{{ row.price }}</p>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
+                        label="规格"
+                        prop="store_info"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="毛利率"
+                        prop="rose"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="库存"
+                        prop="nums"
+                        min-width="100"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="价值"
+                        prop="total_price"
+                        min-width="200"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column label="强制校验" prop="is_verify">
+                        <template #default="{ row }">
+                            <el-switch
+                                size="large"
+                                @change="verifyChange(row)"
+                                v-model="row.is_verify"
+                                :active-value="1"
+                                :inactive-value="0"
+                                active-text="校验"
+                                inactive-text="不校验"
+                                inline-prompt
+                            />
                         </template>
                     </el-table-column>
-					<el-table-column label="商品名称" prop="store_name" min-width="200" show-overflow-tooltip />
-					<el-table-column label="分类" prop="cate_name" min-width="120" show-overflow-tooltip />
-					<el-table-column label="单位" prop="unit_name" min-width="80" show-overflow-tooltip />
-					<el-table-column label="供货价" prop="purchase" min-width="100" show-overflow-tooltip />
-					<el-table-column label="商户价" prop="cost" min-width="120" show-overflow-tooltip />
-					<el-table-column label="终端零售价" prop="price" min-width="120" show-overflow-tooltip />
-					<el-table-column label="规格" prop="store_info" min-width="100" show-overflow-tooltip />
-					<el-table-column label="毛利率" prop="rose" min-width="100" show-overflow-tooltip />
-					<el-table-column label="库存" prop="nums" min-width="100" show-overflow-tooltip />
-					<el-table-column label="价值" prop="total_price" min-width="200" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-							<el-button link @click="resetProductStoregeClick(row)" v-perms="[
+                            <el-button
+                                link
+                                @click="resetProductStoregeClick(row)"
+                                v-perms="[
                                     'warehouse_product_storege.warehouse_product_storege/edit'
-                                ]">
+                                ]"
+                            >
                                 重置数量
                             </el-button>
                         </template>
@@ -84,10 +174,20 @@
                 <el-input v-model="formData.store_name" clearable :readonly="false" disabled />
             </el-form-item>
             <el-form-item label="数量" prop="nums">
-				<el-input v-model="formData.nums" clearable :readonly="false" placeholder="请输入数量" />
+                <el-input
+                    v-model="formData.nums"
+                    clearable
+                    :readonly="false"
+                    placeholder="请输入数量"
+                />
             </el-form-item>
             <el-form-item label="备注" prop="remark">
-				<el-input v-model="formData.remark" clearable :readonly="false" placeholder="请输入数量" />
+                <el-input
+                    v-model="formData.remark"
+                    clearable
+                    :readonly="false"
+                    placeholder="请输入数量"
+                />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -104,7 +204,8 @@
 import { useDictData } from '@/hooks/useDictOptions'
 import {
     apiWarehouseProductStoregeLists,
-		apiWarehouseProductStoregeEdit
+    apiWarehouseProductStoregeEdit,
+    apiWarehouseProductStoregeVerify
 } from '@/api/warehouse_product_storege'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
@@ -219,7 +320,12 @@
         })
     }
 }
-
+const verifyChange = (row: any) => {
+    apiWarehouseProductStoregeVerify({
+        id: row.id,
+        is_verify: row.is_verify
+    })
+}
 onMounted(() => {
     getLists()
 })