feat

src/views/InvoiceSales/invoiceApply/components/currentcy-form/add-edit-form.vue

@@ -150,8 +150,8 @@ function handleSave() {
 
     const { code, message } = await httpAdd({
       relaComNo: ruleForm.value.companyNo,
-      ...ruleForm.value,
       ...generatorOrderArr(),
+      ...ruleForm.value,
       is_comon:'1'
     });
 

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

@@ -0,0 +1,193 @@
+<script setup lang="ts">
+import { ref } from "vue"
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+
+import Modal from "./components/Modal.vue"
+
+
+const formData = ref({ 
+  companyNo: '', 
+  supplierNo: '' 
+})
+</script>
+
+<template>
+  <ElForm>
+    <ElRow :gutter="10">
+      <ElCol :span="12">
+        <ElFormItem label="销售方公司" prop="supplierNo">
+          <ElInput 
+            placeholder="销售方公司"
+            v-model="formData.supplierNo"
+          />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="12">
+        <ElFormItem label="购买方公司" prop="companyNo">
+          <ElInput 
+            placeholder="购买方公司"
+            v-model="formData.companyNo"
+          />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="商品来源" prop="source">
+          <ElSelect 
+            style="width: 100%" 
+            placeholder="商品来源"
+            v-model="formData.source"
+          >
+            <ElOption label="采销商品" value="0" />
+            <ElOption label="非采销商品" value="1" />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="商品编号" prop="code">
+          <ElInput 
+            placeholder="商品编号"
+            v-model="formData.code"
+          />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="订单商品类型">
+          <ElSelect style="width: 100%" placeholder="订单商品类型">
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="组合类型">
+          <ElSelect style="width: 100%">
+            <ElOption />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="订单商品名称">
+          <ElInput placeholder="订单商品名称" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="发票商品名称">
+          <ElInput placeholder="发票商品名称" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="规格">
+          <ElInput placeholder="规格" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="商品代码">
+          <ElInput placeholder="商品代码" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="成本税前单价">
+          <ElInput placeholder="成本税前单价" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="单位">
+          <ElInput placeholder="单位" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="重量">
+          <ElInput placeholder="重量" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="8">
+        <ElFormItem label="成本税后单价">
+          <ElInput placeholder="成本税后单价" />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="进项税目">
+          <ElInput 
+            style="width: 100%" 
+            placeholder="进项税目" 
+          />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="分光">
+          <ElInput 
+            style="width: 100%" 
+            placeholder="分光" 
+          />
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="发票类型">
+          <ElSelect placeholder="发票类型" style="width: 100%">
+
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="进项税率">
+          <ElSelect placeholder="进项税率" style="width: 100%">
+
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+
+      <ElCol :span="6">
+        <ElFormItem label="进项成本状态">
+          <ElSelect placeholder="进项成本状态">
+            <ElOption label="真实成本信息" />
+            <ElOption label="预估成本信息" />
+          </ElSelect>
+        </ElFormItem>
+      </ElCol>
+    </ElRow>
+
+    <ElRow>
+      <ElCol :span="24">
+        <ElFormItem label="子商品">
+          <ElTable border size="small">
+            <ElTableColumn label="比例" />
+            <ElTableColumn label="商品编号" />
+            <ElTableColumn label="商品类型" />
+            <ElTableColumn label="商品名称" />
+
+            <ElTableColumn width="80px">
+              <template #header>
+               <div class="w-full flex justify-between">
+                  <p>操作</p>
+                  <ElButton 
+                    link
+                    size="small"
+                    type="primary"
+                    :icon="useRenderIcon('add')"
+                  />
+               </div> 
+              </template>
+            </ElTableColumn>
+          </ElTable>
+        </ElFormItem>
+      </ElCol>
+    </ElRow>
+
+    <Modal />
+  </ElForm>
+</template>

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

@@ -0,0 +1,13 @@
+<script setup lang="ts">
+import { useVModel } from "@vueuse/core"
+
+const props = defineProps<{ visible: boolean }>()
+const visible = useVModel(props, 'visible')
+
+</script>
+
+<template>
+  <ElDialog v-model="visible">
+    
+  </ElDialog>
+</template>

src/views/invoiceInOut/productManager/detail.vue

@@ -3,6 +3,7 @@ import { useDetail } from "/@/hooks/core/useDetail";
 import BasicDescriptions from "/@/components/BasicDescriptions";
 import { goodColumns } from "./config/columns"
 
+
 import BaseForm from "./components/BaseForm.vue"
 
 const { id, title, isDetail, collapses } = useDetail({ baseName: '商品', collapseLen: 2 });
@@ -13,8 +14,12 @@ const { id, title, isDetail, collapses } = useDetail({ baseName: '商品', colla
     <ElTabs>
       <ElTabPane :label="title">
         <ElCollapse v-model="collapses">
-          <ElCollapseItem :title="title" name="1">
-            <BasicDescriptions :columns="goodColumns"  :data="{}"  />
+          <ElCollapseItem 
+            :title="title" 
+            name="1"
+          >
+            <BaseForm />
+            <!-- <BasicDescriptions :columns="goodColumns" :data="{}" /> -->
           </ElCollapseItem>
         </ElCollapse>
       </ElTabPane>