From 1c98deaf27ba0103a0bcc12d8a7f0637dcf44b4c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 7 Feb 2024 00:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20ERP=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=E5=8F=B7=E7=9A=84=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/stock/in/StockInForm.vue | 8 +-------
 src/views/erp/stock/in/index.vue       | 6 +++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue
index 38b9ec96..fd339520 100644
--- a/src/views/erp/stock/in/StockInForm.vue
+++ b/src/views/erp/stock/in/StockInForm.vue
@@ -9,10 +9,9 @@
       :disabled="disabled"
     >
       <el-row :gutter="20">
-        <!-- TODO 芋艿：待接入 -->
         <el-col :span="8">
           <el-form-item label="入库单号" prop="no">
-            <el-input v-model="formData.no" placeholder="请输入入库单号" />
+            <el-input disabled v-model="formData.no" placeholder="保存时自动生成" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -93,7 +92,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改；detail - 详情
 const formData = ref({
   id: undefined,
-  no: undefined,
   supplierId: undefined,
   inTime: undefined,
   remark: undefined,
@@ -101,7 +99,6 @@ const formData = ref({
   items: []
 })
 const formRules = reactive({
-  no: [{ required: true, message: '入库单号不能为空', trigger: 'blur' }],
   inTime: [{ required: true, message: '入库时间不能为空', trigger: 'blur' }]
 })
 const disabled = computed(() => formType.value === 'detail')
@@ -161,11 +158,8 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    no: undefined,
     supplierId: undefined,
     inTime: undefined,
-    totalCount: undefined,
-    totalPrice: undefined,
     remark: undefined,
     fileUrl: undefined,
     items: []
diff --git a/src/views/erp/stock/in/index.vue b/src/views/erp/stock/in/index.vue
index 91a66f23..e8a9fa4b 100644
--- a/src/views/erp/stock/in/index.vue
+++ b/src/views/erp/stock/in/index.vue
@@ -150,7 +150,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column width="30" label="选择" type="selection" />
-      <el-table-column label="入库单号" align="center" prop="no" />
+      <el-table-column min-width="140" label="入库单号" align="center" prop="no" />
       <el-table-column label="产品信息" align="center" prop="productNames" min-width="200" />
       <el-table-column label="供应商" align="center" prop="supplierName" />
       <el-table-column
@@ -163,12 +163,12 @@
       <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column label="数量" align="center" prop="totalCount" />
       <el-table-column label="金额" align="center" prop="totalPrice" />
-      <el-table-column label="状态" align="center" prop="status">
+      <el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" min-width="150">
+      <el-table-column label="操作" align="center" fixed="right" width="220">
         <template #default="scope">
           <el-button
             link