✨ ERP：初始化其它入库的表单 40%

Author: YunaiV

src/api/erp/stock/stock/index.ts

@@ -24,6 +24,11 @@ export const StockApi = {
     return await request.get({ url: `/erp/stock/get?id=` + id })
   },
 
+  // 查询产品库存详情
+  getStock2: async (productId: number, warehouseId: number) => {
+    return await request.get({ url: `/erp/stock/get`, params: { productId, warehouseId } })
+  },
+
   // 导出产品库存 Excel
   exportStock: async (params) => {
     return await request.download({ url: `/erp/stock/export-excel`, params })

src/components/UploadFile/src/UploadFile.vue

@@ -160,7 +160,7 @@ const emitUpdateModelValue = () => {
   // 情况1：数组结果
   let result: string | string[] = fileList.value.map((file) => file.url!)
   // 情况2：逗号分隔的字符串
-  if (isString(props.modelValue)) {
+  if (props.limit === 1 || isString(props.modelValue)) {
     result = result.join(',')
   }
   emit('update:modelValue', result)

src/views/erp/stock/in/StockInForm.vue

@@ -8,54 +8,54 @@
       v-loading="formLoading"
     >
       <el-row :gutter="20">
-        <el-col :span="12">
+        <!-- TODO 芋艿：待接入 -->
+        <el-col :span="8">
           <el-form-item label="入库单号" prop="no">
             <el-input v-model="formData.no" placeholder="请输入入库单号" />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <el-col :span="8">
           <el-form-item label="入库时间" prop="inTime">
             <el-date-picker
               v-model="formData.inTime"
               type="date"
               value-format="x"
               placeholder="选择入库时间"
+              class="!w-1/1"
             />
           </el-form-item>
         </el-col>
-        <el-col :span="12">
+        <!-- TODO 芋艿：待接入 -->
+        <el-col :span="8">
           <el-form-item label="供应商" prop="supplierId">
-            <el-input v-model="formData.supplierId" placeholder="请输入供应商编号" />
+            <el-input v-model="formData.supplierId" placeholder="请输入供应商" />
           </el-form-item>
         </el-col>
-        <!-- TODO 芋艿：附件 -->
-        <el-col :span="24">
+        <el-col :span="16">
           <el-form-item label="备注" prop="remark">
-            <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
+            <el-input
+              type="textarea"
+              v-model="formData.remark"
+              :rows="1"
+              placeholder="请输入备注"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="附件" prop="fileUrl">
+            <UploadFile :is-show-tip="false" v-model="formData.fileUrl" :limit="1" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <!-- 子表的表单 -->
-    <el-tabs v-model="subTabsName">
-      <el-tab-pane label="入库产品清单" name="stockInItem">
-        <StockInItemForm ref="stockInItemFormRef" :in-id="formData.id" />
-      </el-tab-pane>
-    </el-tabs>
-    <el-form
-      ref="formRef2"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="合计数量" prop="totalCount">
-        <el-input v-model="formData.totalCount" placeholder="请输入合计数量" />
-      </el-form-item>
-      <el-form-item label="合计金额" prop="totalPrice">
-        <el-input v-model="formData.totalPrice" placeholder="请输入合计金额，单位：元" />
-      </el-form-item>
-    </el-form>
+    <ContentWrap>
+      <el-tabs v-model="subTabsName" class="-mt-15px -mb-10px">
+        <el-tab-pane label="入库产品清单" name="stockInItem">
+          <StockInItemForm ref="stockInItemFormRef" :items="formData.items" />
+        </el-tab-pane>
+      </el-tabs>
+    </ContentWrap>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -82,18 +82,15 @@ const formData = ref({
   no: undefined,
   supplierId: undefined,
   inTime: undefined,
-  totalCount: undefined,
-  totalPrice: undefined,
-  remark: undefined
+  remark: undefined,
+  fileUrl: '',
+  items: []
 })
 const formRules = reactive({
   no: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
-  inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }],
-  totalCount: [{ required: true, message: '合计数量不能为空', trigger: 'blur' }],
-  totalPrice: [{ required: true, message: '合计金额，单位：元不能为空', trigger: 'blur' }]
+  inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
-const formRef2 = ref() // 表单 Ref TODO 芋艿：需要优化
 
 /** 子表的表单 */
 const subTabsName = ref('stockInItem')
@@ -122,20 +119,11 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  await formRef2.value.validate() // TODO 芋艿：需要在看看
-  // 校验子表单
-  try {
-    await stockInItemFormRef.value.validate()
-  } catch (e) {
-    subTabsName.value = 'stockInItem'
-    return
-  }
+  await stockInItemFormRef.value.validate()
   // 提交请求
   formLoading.value = true
   try {
     const data = formData.value as unknown as StockInVO
-    // 拼接子表的数据
-    data.stockInItems = stockInItemFormRef.value.getData()
     if (formType.value === 'create') {
       await StockInApi.createStockIn(data)
       message.success(t('common.createSuccess'))
@@ -160,9 +148,10 @@ const resetForm = () => {
     inTime: undefined,
     totalCount: undefined,
     totalPrice: undefined,
-    remark: undefined
+    remark: undefined,
+    fileUrl: undefined,
+    items: []
   }
   formRef.value?.resetFields()
-  formRef2.value?.resetFields() // TODO 芋艿：需要在看看
 }
 </script>