From 1abc40a846c2f938836b8d84dc61b9175068fef9 Mon Sep 17 00:00:00 2001
From: zhangyanan <tvxq.sj.hi@163.com>
Date: Wed, 12 Nov 2025 14:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=86=85=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/main/scrtraindata/addForm.vue  | 18 +++++++++++++++++-
 src/views/main/scrtraindata/editForm.vue | 18 +++++++++++++++++-
 src/views/main/scrtraindata/index.vue    | 16 +++++++++++++---
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/views/main/scrtraindata/addForm.vue b/src/views/main/scrtraindata/addForm.vue
index 768f1f5..7e959fd 100644
--- a/src/views/main/scrtraindata/addForm.vue
+++ b/src/views/main/scrtraindata/addForm.vue
@@ -34,6 +34,22 @@
           <a-input-number placeholder="请输入数量" style="width: 100%" v-decorator="['num', {rules: [{required: true, message: '请输入数量！'}]}]" />
         </a-form-item>
         <a-form-item
+          label="内部数量"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          has-feedback
+        >
+          <a-input-number placeholder="请输入内部数量" style="width: 100%" v-decorator="['nbNum', {rules: [{required: true, message: '请输入内部数量！'}]}]" />
+        </a-form-item>
+        <a-form-item
+          label="外部数量"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          has-feedback
+        >
+          <a-input-number placeholder="请输入外部数量" style="width: 100%" v-decorator="['wbNum', {rules: [{required: true, message: '请输入外部数量！'}]}]" />
+        </a-form-item>
+        <!-- <a-form-item
           label="内部还是外部"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -41,7 +57,7 @@
           <a-radio-group placeholder="请选择内部还是外部" v-decorator="['nborwb',{rules: [{ required: true, message: '请选择内部还是外部！' }]}]" >
             <a-radio v-for="(item,index) in nborwbData" :key="index" :value="item.code">{{ item.name }}</a-radio>
           </a-radio-group>
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item
           label="部门"
           :labelCol="labelCol"
diff --git a/src/views/main/scrtraindata/editForm.vue b/src/views/main/scrtraindata/editForm.vue
index a6344e2..af82236 100644
--- a/src/views/main/scrtraindata/editForm.vue
+++ b/src/views/main/scrtraindata/editForm.vue
@@ -35,6 +35,22 @@
           <a-input-number placeholder="请输入数量" style="width: 100%" v-decorator="['num', {rules: [{required: true, message: '请输入数量！'}]}]" />
         </a-form-item>
         <a-form-item
+          label="内部数量"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          has-feedback
+        >
+          <a-input-number placeholder="请输入内部数量" style="width: 100%" v-decorator="['nbNum', {rules: [{required: true, message: '请输入内部数量！'}]}]" />
+        </a-form-item>
+        <a-form-item
+          label="外部数量"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          has-feedback
+        >
+          <a-input-number placeholder="请输入外部数量" style="width: 100%" v-decorator="['wbNum', {rules: [{required: true, message: '请输入外部数量！'}]}]" />
+        </a-form-item>
+        <!-- <a-form-item
           label="内部还是外部"
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -42,7 +58,7 @@
           <a-radio-group placeholder="请选择内部还是外部" v-decorator="['nborwb',{rules: [{ required: true, message: '请选择内部还是外部！' }]}]" >
             <a-radio v-for="(item,index) in nborwbData" :key="index" :value="item.code">{{ item.name }}</a-radio>
           </a-radio-group>
-        </a-form-item>
+        </a-form-item> -->
         <a-form-item
           label="部门"
           :labelCol="labelCol"
diff --git a/src/views/main/scrtraindata/index.vue b/src/views/main/scrtraindata/index.vue
index ff9fc51..395a12a 100644
--- a/src/views/main/scrtraindata/index.vue
+++ b/src/views/main/scrtraindata/index.vue
@@ -108,11 +108,21 @@
             dataIndex: 'num'
           },
           {
-            title: '内部/外部',
+            title: '内部数量',
             align: 'center',
-            dataIndex: 'nborwb',
-            scopedSlots: { customRender: 'nborwbScopedSlots' }
+            dataIndex: 'nbNum'
           },
+          {
+            title: '外部数量',
+            align: 'center',
+            dataIndex: 'wbNum'
+          },
+          // {
+          //   title: '内部/外部',
+          //   align: 'center',
+          //   dataIndex: 'nborwb',
+          //   scopedSlots: { customRender: 'nborwbScopedSlots' }
+          // },
           {
             title: '部门',
             align: 'center',