增加内外部数量

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"

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"

src/views/main/scrtraindata/index.vue

@@ -108,11 +108,21 @@
             dataIndex: 'num'
           },
           {
-            title: '内部/外部',
+            title: '内部数量',
             align: 'center',
-            dataIndex: 'nborwb',
+            dataIndex: 'nbNum'
-            scopedSlots: { customRender: 'nborwbScopedSlots' }
           },
+          {
+            title: '外部数量',
+            align: 'center',
+            dataIndex: 'wbNum'
+          },
+          // {
+          //   title: '内部/外部',
+          //   align: 'center',
+          //   dataIndex: 'nborwb',
+          //   scopedSlots: { customRender: 'nborwbScopedSlots' }
+          // },
           {
             title: '部门',
             align: 'center',