将财务模块的财务人员字段改为非必填，调整位置

jshERP-web/src/views/financial/AdvanceInList.vue

@@ -46,19 +46,19 @@
               </span>
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
-                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
-                        {{ item.name }}
+                        {{ item.userName }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
-                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                        {{ item.userName }}
+                        {{ item.name }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -183,10 +183,10 @@
             scopedSlots: { customRender: 'action' },
           },
           { title: '付款会员', dataIndex: 'organName',width:140, ellipsis:true},
-          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
+          { title: '操作员', dataIndex: 'userName',width:100, ellipsis:true},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:100},
           { title: '合计金额', dataIndex: 'totalPrice',width:80},
           { title: '收款金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},

jshERP-web/src/views/financial/GiroList.vue

@@ -26,10 +26,10 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                  <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
-                    <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                    <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
-                      {{ item.name }}
+                      {{ item.userName }}
                     </a-select-option>
                   </a-select>
                 </a-form-item>
@@ -46,10 +46,10 @@
               </span>
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
-                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                        {{ item.userName }}
+                        {{ item.name }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -182,10 +182,10 @@
             align:"center",
             scopedSlots: { customRender: 'action' },
           },
-          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
+          { title: '操作员', dataIndex: 'userName',width:100, ellipsis:true},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:100},
           { title: '实付金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",

jshERP-web/src/views/financial/ItemInList.vue

@@ -46,19 +46,19 @@
               </span>
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
-                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
-                        {{ item.name }}
+                        {{ item.userName }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
-                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                        {{ item.userName }}
+                        {{ item.name }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -193,10 +193,10 @@
             scopedSlots: { customRender: 'action' },
           },
           { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true},
-          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
+          { title: '操作员', dataIndex: 'userName',width:100, ellipsis:true},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:100},
           { title: '收入金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",

jshERP-web/src/views/financial/ItemOutList.vue

@@ -46,19 +46,19 @@
               </span>
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
-                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
-                        {{ item.name }}
+                        {{ item.userName }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
-                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                        {{ item.userName }}
+                        {{ item.name }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -193,10 +193,10 @@
             scopedSlots: { customRender: 'action' },
           },
           { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true},
-          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
+          { title: '操作员', dataIndex: 'userName',width:100, ellipsis:true},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:100},
           { title: '支出金额', dataIndex: 'changeAmount',width:80},
           { title: '备注', dataIndex: 'remark',width:200},
           { title: '状态', dataIndex: 'status', width: 80, align: "center",

jshERP-web/src/views/financial/MoneyInList.vue

@@ -46,19 +46,19 @@
               </span>
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
-                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
-                        {{ item.name }}
+                        {{ item.userName }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
-                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                        {{ item.userName }}
+                        {{ item.name }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -200,10 +200,10 @@
             scopedSlots: { customRender: 'action' },
           },
           { title: '客户', dataIndex: 'organName',width:140, ellipsis:true},
-          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
+          { title: '操作员', dataIndex: 'userName',width:100, ellipsis:true},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:100},
           { title: '合计收款', dataIndex: 'totalPrice',width:80},
           { title: '优惠金额', dataIndex: 'discountMoney',width:80},
           { title: '实际收款', dataIndex: 'changeAmount',width:80},

jshERP-web/src/views/financial/MoneyOutList.vue

@@ -46,19 +46,19 @@
               </span>
               <template v-if="toggleSearchStatus">
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
+                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
-                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
-                        {{ item.name }}
+                        {{ item.userName }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
-                  <a-form-item label="操作员" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-form-item label="财务人员" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-select placeholder="选择操作员" showSearch optionFilterProp="children" v-model="queryParam.creator">
+                    <a-select placeholder="选择财务人员" showSearch optionFilterProp="children" v-model="queryParam.handsPersonId">
-                      <a-select-option v-for="(item,index) in userList" :key="index" :value="item.id">
+                      <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
-                        {{ item.userName }}
+                        {{ item.name }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -200,10 +200,10 @@
             scopedSlots: { customRender: 'action' },
           },
           { title: '供应商', dataIndex: 'organName',width:140, ellipsis:true},
-          { title: '财务人员', dataIndex: 'handsPersonName',width:140},
           { title: '单据编号', dataIndex: 'billNo',width:160},
           { title: '单据日期 ', dataIndex: 'billTimeStr',width:160},
-          { title: '操作员', dataIndex: 'userName',width:80, ellipsis:true},
+          { title: '操作员', dataIndex: 'userName',width:100, ellipsis:true},
+          { title: '财务人员', dataIndex: 'handsPersonName',width:100},
           { title: '合计付款', dataIndex: 'totalPrice',width:80},
           { title: '优惠金额', dataIndex: 'discountMoney',width:80},
           { title: '实际付款', dataIndex: 'changeAmount',width:80},

jshERP-web/src/views/financial/modules/AdvanceInModal.vue

@@ -27,10 +27,20 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId' ]"
-                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                        :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <div slot="dropdownRender" slot-scope="menu">
                   <v-nodes :vnodes="menu" />
                   <a-divider style="margin: 4px 0;" />
@@ -43,16 +53,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-            </a-form-item>
-          </a-col>
         </a-row>
         <j-editable-table
           :ref="refKeys[0]"
@@ -161,11 +161,6 @@
               { required: true, message: '请选择付款会员!' }
             ]
           },
-          handsPersonId:{
-            rules: [
-              { required: true, message: '请选择财务人员!' }
-            ]
-          },
           billTime:{
             rules: [
               { required: true, message: '请选择单据日期!' }

jshERP-web/src/views/financial/modules/GiroModal.vue

@@ -17,10 +17,20 @@
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row class="form-row" :gutter="24">
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId' ]"
-                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                        :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <div slot="dropdownRender" slot-scope="menu">
                   <v-nodes :vnodes="menu" />
                   <a-divider style="margin: 4px 0;" />
@@ -33,16 +43,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-            </a-form-item>
-          </a-col>
           <a-col :lg="6" :md="12" :sm="24">
           </a-col>
         </a-row>
@@ -162,11 +162,6 @@
         },
         confirmLoading: false,
         validatorRules:{
-          handsPersonId:{
-            rules: [
-              { required: true, message: '请选择财务人员!' }
-            ]
-          },
           billTime:{
             rules: [
               { required: true, message: '请选择单据日期!' }

jshERP-web/src/views/financial/modules/ItemInModal.vue

@@ -27,10 +27,20 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime ]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId' ]"
-                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                        :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <div slot="dropdownRender" slot-scope="menu">
                   <v-nodes :vnodes="menu" />
                   <a-divider style="margin: 4px 0;" />
@@ -43,16 +53,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-              <j-date v-decorator="['billTime', validatorRules.billTime ]" :show-time="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-            </a-form-item>
-          </a-col>
         </a-row>
         <j-editable-table
           :ref="refKeys[0]"
@@ -175,11 +175,6 @@
               { required: true, message: '请选择客户!' }
             ]
           },
-          handsPersonId:{
-            rules: [
-              { required: true, message: '请选择财务人员!' }
-            ]
-          },
           billTime:{
             rules: [
               { required: true, message: '请选择单据日期!' }

jshERP-web/src/views/financial/modules/ItemOutModal.vue

@@ -27,10 +27,20 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId' ]"
-                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                        :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <div slot="dropdownRender" slot-scope="menu">
                   <v-nodes :vnodes="menu" />
                   <a-divider style="margin: 4px 0;" />
@@ -43,16 +53,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-            </a-form-item>
-          </a-col>
         </a-row>
         <j-editable-table
           :ref="refKeys[0]"
@@ -175,11 +175,6 @@
               { required: true, message: '请选择供应商!' }
             ]
           },
-          handsPersonId:{
-            rules: [
-              { required: true, message: '请选择财务人员!' }
-            ]
-          },
           billTime:{
             rules: [
               { required: true, message: '请选择单据日期!' }

jshERP-web/src/views/financial/modules/MoneyInModal.vue

@@ -33,10 +33,20 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId' ]"
-                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                        :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <div slot="dropdownRender" slot-scope="menu">
                   <v-nodes :vnodes="menu" />
                   <a-divider style="margin: 4px 0;" />
@@ -49,16 +59,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="6" :md="12" :sm="24">
@@ -205,9 +205,6 @@
           organId:{
             rules: [{ required: true, message: '请选择客户!' }]
           },
-          handsPersonId:{
-            rules: [{ required: true, message: '请选择财务人员!' }]
-          },
           billTime:{
             rules: [{ required: true, message: '请选择单据日期!' }]
           },

jshERP-web/src/views/financial/modules/MoneyOutModal.vue

@@ -33,10 +33,20 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
+              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6" :md="12" :sm="24">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
+              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
+            </a-form-item>
+          </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="财务人员">
-              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]"
+              <a-select placeholder="选择财务人员" v-decorator="[ 'handsPersonId' ]"
-                :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
+                        :dropdownMatchSelectWidth="false" showSearch optionFilterProp="children">
                 <div slot="dropdownRender" slot-scope="menu">
                   <v-nodes :vnodes="menu" />
                   <a-divider style="margin: 4px 0;" />
@@ -49,16 +59,6 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-              <j-date v-decorator="['billTime', validatorRules.billTime]" :show-time="true"/>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
-              <a-input placeholder="请输入单据编号" v-decorator.trim="[ 'billNo' ]" :readOnly="true"/>
-            </a-form-item>
-          </a-col>
         </a-row>
         <a-row class="form-row" :gutter="24">
           <a-col :lg="6" :md="12" :sm="24">
@@ -205,9 +205,6 @@
           organId:{
             rules: [{ required: true, message: '请选择供应商!' }]
           },
-          handsPersonId:{
-            rules: [{ required: true, message: '请选择财务人员!' }]
-          },
           billTime:{
             rules: [{ required: true, message: '请选择单据日期!' }]
           },