feat

src/components/BasicForm/src/fields/business-query.vue

@@ -7,7 +7,7 @@ import { httpCompanylist } from "/@/api/netOrderEnter/netOrderEntry";
 const props = defineProps<{
   modelValue?: string;
   disabled?: boolean;
-  size: string
+  size: string;
 }>();
 
 const emits = defineEmits(['change']);

src/components/BasicForm/src/fields/customer-query-second.vue

@@ -4,12 +4,9 @@ import { useVModel } from "@vueuse/core";
 import RemoteSelect from "/@/components/RemoteSelect";
 import { httpCustomers } from "/@/api/netOrderEnter/netOrderEntry";
 
-const props = defineProps<{
-  modelValue?: string;
-  disabled?: boolean;
-}>();
+const props = defineProps<{ modelValue?: string; disabled?: boolean }>();
 
-const emits = defineEmits(['change']);
+const emits = defineEmits(["change"]);
 
 const value = useVModel(props, "modelValue");
 
@@ -26,8 +23,8 @@ defineExpose({
 
 <template>
   <RemoteSelect
-    ref="RemoteSelectRef"
     is-root
+    ref="RemoteSelectRef"
     :disabled="disabled"
     v-model="value"
     style="width: 100%"

src/components/BasicForm/src/fields/customer-query.vue

@@ -9,7 +9,7 @@ const props = defineProps<{
   disabled?: boolean;
 }>();
 
-const emits = defineEmits(['change']);
+const emits = defineEmits(["change"]);
 
 const value = useVModel(props, "modelValue");
 

src/views/invoiceInOut/productManager/components/BaseForm.vue

@@ -1,14 +1,11 @@
 <script setup lang="ts">
-import { ref } from "vue"
+import { ref } from "vue";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { cg_order_type_options } from "/@/utils/status";
 
-import Modal from "./components/Modal.vue"
+import Modal from "./components/Modal.vue";
 
-
-const formData = ref({ 
-  companyNo: '', 
-  supplierNo: '' 
-})
+const formData = ref({ companyNo: "", supplierNo: "" });
 </script>
 
 <template>
@@ -16,28 +13,22 @@ const formData = ref({
     <ElRow :gutter="10">
       <ElCol :span="12">
         <ElFormItem label="销售方公司" prop="supplierNo">
-          <ElInput 
-            placeholder="销售方公司"
-            v-model="formData.supplierNo"
-          />
+          <ElInput placeholder="销售方公司" v-model="formData.supplierNo" />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="12">
         <ElFormItem label="购买方公司" prop="companyNo">
-          <ElInput 
-            placeholder="购买方公司"
-            v-model="formData.companyNo"
-          />
+          <ElInput placeholder="购买方公司" v-model="formData.companyNo" />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="8">
         <ElFormItem label="商品来源" prop="source">
-          <ElSelect 
-            style="width: 100%" 
-            placeholder="商品来源"
+          <ElSelect
             v-model="formData.source"
+            style="width: 100%"
+            placeholder="商品来源"
           >
             <ElOption label="采销商品" value="0" />
             <ElOption label="非采销商品" value="1" />
@@ -47,16 +38,18 @@ const formData = ref({
 
       <ElCol :span="8">
         <ElFormItem label="商品编号" prop="code">
-          <ElInput 
-            placeholder="商品编号"
-            v-model="formData.code"
-          />
+          <ElInput placeholder="商品编号" v-model="formData.code" />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="8">
         <ElFormItem label="订单商品类型">
           <ElSelect style="width: 100%" placeholder="订单商品类型">
+            <ElOption
+              v-for="opt in cg_order_type_options"
+              :value="opt.value"
+              :label="opt.label"
+            />
           </ElSelect>
         </ElFormItem>
       </ElCol>
@@ -119,35 +112,25 @@ const formData = ref({
 
       <ElCol :span="6">
         <ElFormItem label="进项税目">
-          <ElInput 
-            style="width: 100%" 
-            placeholder="进项税目" 
-          />
+          <ElInput style="width: 100%" placeholder="进项税目" />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
         <ElFormItem label="分光">
-          <ElInput 
-            style="width: 100%" 
-            placeholder="分光" 
-          />
+          <ElInput style="width: 100%" placeholder="分光" />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
         <ElFormItem label="发票类型">
-          <ElSelect placeholder="发票类型" style="width: 100%">
-
-          </ElSelect>
+          <ElSelect placeholder="发票类型" style="width: 100%"> </ElSelect>
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
         <ElFormItem label="进项税率">
-          <ElSelect placeholder="进项税率" style="width: 100%">
-
-          </ElSelect>
+          <ElSelect placeholder="进项税率" style="width: 100%"> </ElSelect>
         </ElFormItem>
       </ElCol>
 
@@ -172,15 +155,15 @@ const formData = ref({
 
             <ElTableColumn width="80px">
               <template #header>
-               <div class="w-full flex justify-between">
+                <div class="w-full flex justify-between">
                   <p>操作</p>
-                  <ElButton 
+                  <ElButton
                     link
                     size="small"
                     type="primary"
                     :icon="useRenderIcon('add')"
                   />
-               </div> 
+                </div>
               </template>
             </ElTableColumn>
           </ElTable>

src/views/invoiceInOut/productManager/detail.vue

@@ -14,10 +14,7 @@ const { id, title, isDetail, collapses } = useDetail({ baseName: '商品', colla
     <ElTabs>
       <ElTabPane :label="title">
         <ElCollapse v-model="collapses">
-          <ElCollapseItem 
-            :title="title" 
-            name="1"
-          >
+          <ElCollapseItem :title="title" name="1">
             <BaseForm />
             <!-- <BasicDescriptions :columns="goodColumns" :data="{}" /> -->
           </ElCollapseItem>

src/views/invoiceInOut/productManager/index.vue

@@ -2,17 +2,20 @@
 import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
 import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
-import { useRouter } from "vue-router"
+import { useRouter } from "vue-router";
 
 const PageName = "productManager";
-const router = useRouter()
+const router = useRouter();
 
 const hooks: PageHooks = {
   pageSearchHook: () => usePageSearch(undefined, undefined, searchConfig)
 };
 
 const events: PageEvents = {
-  content: { preview: ({ id }) => router.push('/invoiceInOut/productManagerDetail?id=' + id) }
+  content: {
+    preview: ({ id }) =>
+      router.push("/invoiceInOut/productManagerDetail?id=" + id)
+  }
 };
 </script>
 
@@ -21,8 +24,8 @@ const events: PageEvents = {
     <PageContainer
       :hooks="hooks"
       :events="events"
+      :searchConfig="searchConfig"
       :contentConfig="contentConfig"
-      :search-config="searchConfig"
     />
   </PageAuth>
 </template>