界面列表宽度优化

2021-05-24 23:28:58 +08:00
parent a152f3ae61
commit 51f670e42f
26 changed files with 92 additions and 43 deletions
--- a/jshERP-web/src/views/financial/AdvanceInList.vue
+++ b/jshERP-web/src/views/financial/AdvanceInList.vue
@@ -124,6 +124,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width:200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/financial/GiroList.vue
+++ b/jshERP-web/src/views/financial/GiroList.vue
@@ -123,6 +123,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width:200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/financial/ItemInList.vue
+++ b/jshERP-web/src/views/financial/ItemInList.vue
@@ -124,6 +124,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width:200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/financial/ItemOutList.vue
+++ b/jshERP-web/src/views/financial/ItemOutList.vue
@@ -124,6 +124,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width:200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/financial/MoneyInList.vue
+++ b/jshERP-web/src/views/financial/MoneyInList.vue
@@ -124,6 +124,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width:200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/financial/MoneyOutList.vue
+++ b/jshERP-web/src/views/financial/MoneyOutList.vue
@@ -124,6 +124,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width:200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
+++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue
@@ -17,7 +17,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款会员">
-              <a-select placeholder="选择付款会员" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择付款会员" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in retailList" :key="index" :value="item.id">
                  {{ item.supplier }}
                </a-select-option>
@@ -26,7 +26,7 @@
          </a-col>
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                  {{ item.name }}
                </a-select-option>
@@ -101,7 +101,7 @@
        model: {},
        labelCol: {
          xs: { span: 24 },
-          sm: { span: 6 },
+          sm: { span: 8 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -120,9 +120,14 @@
        },
        confirmLoading: false,
        validatorRules:{
-          billTime:{
+          organId:{
            rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请选择付款会员!' }
+            ]
+          },
+          handsPersonId:{
+            rules: [
+              { required: true, message: '请选择经手人!' }
            ]
          }
        },
--- a/jshERP-web/src/views/financial/modules/GiroModal.vue
+++ b/jshERP-web/src/views/financial/modules/GiroModal.vue
@@ -17,7 +17,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                  {{ item.name }}
                </a-select-option>
@@ -101,7 +101,7 @@
        model: {},
        labelCol: {
          xs: { span: 24 },
-          sm: { span: 6 },
+          sm: { span: 8 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -120,9 +120,9 @@
        },
        confirmLoading: false,
        validatorRules:{
-          billTime:{
+          handsPersonId:{
            rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请选择经手人!' }
            ]
          }
        },
--- a/jshERP-web/src/views/financial/modules/ItemInModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue
@@ -17,7 +17,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
-              <a-select placeholder="选择往来单位" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择往来单位" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
                  {{ item.supplier }}
                </a-select-option>
@@ -26,7 +26,7 @@
          </a-col>
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                  {{ item.name }}
                </a-select-option>
@@ -108,7 +108,7 @@
        model: {},
        labelCol: {
          xs: { span: 24 },
-          sm: { span: 6 },
+          sm: { span: 8 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -127,9 +127,14 @@
        },
        confirmLoading: false,
        validatorRules:{
-          billTime:{
+          organId:{
            rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请选择往来单位!' }
+            ]
+          },
+          handsPersonId:{
+            rules: [
+              { required: true, message: '请选择经手人!' }
            ]
          }
        },
--- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue
@@ -17,7 +17,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="往来单位">
-              <a-select placeholder="选择往来单位" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择往来单位" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
                  {{ item.supplier }}
                </a-select-option>
@@ -26,7 +26,7 @@
          </a-col>
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                  {{ item.name }}
                </a-select-option>
@@ -108,7 +108,7 @@
        model: {},
        labelCol: {
          xs: { span: 24 },
-          sm: { span: 6 },
+          sm: { span: 8 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -127,9 +127,14 @@
        },
        confirmLoading: false,
        validatorRules:{
-          billTime:{
+          organId:{
            rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请选择往来单位!' }
+            ]
+          },
+          handsPersonId:{
+            rules: [
+              { required: true, message: '请选择经手人!' }
            ]
          }
        },
--- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue
@@ -17,7 +17,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单位">
-              <a-select placeholder="选择付款单位" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择付款单位" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in cusList" :key="index" :value="item.id">
                  {{ item.supplier }}
                </a-select-option>
@@ -26,7 +26,7 @@
          </a-col>
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                  {{ item.name }}
                </a-select-option>
@@ -101,7 +101,7 @@
        model: {},
        labelCol: {
          xs: { span: 24 },
-          sm: { span: 6 },
+          sm: { span: 8 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -120,9 +120,14 @@
        },
        confirmLoading: false,
        validatorRules:{
-          billTime:{
+          organId:{
            rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请选择付款单位!' }
+            ]
+          },
+          handsPersonId:{
+            rules: [
+              { required: true, message: '请选择经手人!' }
            ]
          }
        },
--- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
+++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue
@@ -17,7 +17,7 @@
        <a-row class="form-row" :gutter="24">
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款单位">
-              <a-select placeholder="选择收款单位" v-decorator="[ 'organId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择收款单位" v-decorator="[ 'organId', validatorRules.organId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
                  {{ item.supplier }}
                </a-select-option>
@@ -26,7 +26,7 @@
          </a-col>
          <a-col :lg="6" :md="12" :sm="24">
            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="经手人">
-              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId' ]" :dropdownMatchSelectWidth="false">
+              <a-select placeholder="选择经手人" v-decorator="[ 'handsPersonId', validatorRules.handsPersonId ]" :dropdownMatchSelectWidth="false">
                <a-select-option v-for="(item,index) in personList" :key="index" :value="item.id">
                  {{ item.name }}
                </a-select-option>
@@ -101,7 +101,7 @@
        model: {},
        labelCol: {
          xs: { span: 24 },
-          sm: { span: 6 },
+          sm: { span: 8 },
        },
        wrapperCol: {
          xs: { span: 24 },
@@ -120,9 +120,14 @@
        },
        confirmLoading: false,
        validatorRules:{
-          billTime:{
+          organId:{
            rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请选择收款单位!' }
+            ]
+          },
+          handsPersonId:{
+            rules: [
+              { required: true, message: '请选择经手人!' }
            ]
          }
        },
--- a/jshERP-web/src/views/material/MaterialPropertyList.vue
+++ b/jshERP-web/src/views/material/MaterialPropertyList.vue
@@ -83,6 +83,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/AccountList.vue
+++ b/jshERP-web/src/views/system/AccountList.vue
@@ -99,7 +99,7 @@
            title: '#',
            dataIndex: '',
            key:'rowIndex',
-            width:60,
+            width:40,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
@@ -116,6 +116,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 150,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/CustomerList.vue
+++ b/jshERP-web/src/views/system/CustomerList.vue
@@ -132,6 +132,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/DepotList.vue
+++ b/jshERP-web/src/views/system/DepotList.vue
@@ -94,7 +94,7 @@
            title: '#',
            dataIndex: '',
            key:'rowIndex',
-            width:60,
+            width:40,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
@@ -114,6 +114,7 @@
            title: '操作',
            dataIndex: 'action',
            align:"center",
+            width: 200,
            scopedSlots: { customRender: 'action' },
          }
        ],
--- a/jshERP-web/src/views/system/FunctionList.vue
+++ b/jshERP-web/src/views/system/FunctionList.vue
@@ -103,6 +103,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/InOutItemList.vue
+++ b/jshERP-web/src/views/system/InOutItemList.vue
@@ -98,7 +98,7 @@
            title: '#',
            dataIndex: '',
            key:'rowIndex',
-            width:60,
+            width:40,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
@@ -110,6 +110,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/MemberList.vue
+++ b/jshERP-web/src/views/system/MemberList.vue
@@ -132,6 +132,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/PersonList.vue
+++ b/jshERP-web/src/views/system/PersonList.vue
@@ -89,7 +89,7 @@
            title: '#',
            dataIndex: '',
            key:'rowIndex',
-            width:60,
+            width:40,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
@@ -98,17 +98,20 @@
          {
            title: '姓名',
            align:"center",
-            dataIndex: 'name'
+            dataIndex: 'name',
+            width: 100,
          },
          {
            title: '类型',
            align:"center",
-            dataIndex: 'type'
+            dataIndex: 'type',
+            width: 100,
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
+            width: 150,
            scopedSlots: { customRender: 'action' },
          }
        ],
--- a/jshERP-web/src/views/system/PluginList.vue
+++ b/jshERP-web/src/views/system/PluginList.vue
@@ -142,6 +142,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -104,22 +104,26 @@
          {
            title: '角色名称',
            align:"center",
-            dataIndex: 'name'
+            dataIndex: 'name',
+            width: 100
          },
          {
            title: '数据类型',
            align:"center",
-            dataIndex: 'type'
+            dataIndex: 'type',
+            width: 100
          },
          {
            title: '描述',
            align:"center",
-            dataIndex: 'description'
+            dataIndex: 'description',
+            width: 100
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
+            width: 150,
            scopedSlots: { customRender: 'action' },
          }
        ],
--- a/jshERP-web/src/views/system/SerialNumberList.vue
+++ b/jshERP-web/src/views/system/SerialNumberList.vue
@@ -120,6 +120,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/SystemConfigList.vue
+++ b/jshERP-web/src/views/system/SystemConfigList.vue
@@ -104,7 +104,7 @@
            title: '负库存', dataIndex: 'minusStockFlag', width: 80, align: "center",
            scopedSlots: { customRender: 'customRenderFlag' }
          },
-          {title: '操作', dataIndex: 'action', align:"center",
+          {title: '操作', dataIndex: 'action', width: 150, align:"center",
            scopedSlots: { customRender: 'action' },
          }
        ],
--- a/jshERP-web/src/views/system/UnitList.vue
+++ b/jshERP-web/src/views/system/UnitList.vue
@@ -85,13 +85,14 @@
              return parseInt(index)+1;
            }
          },
-          { title: '计量单位', align:"center", dataIndex: 'name' },
-          { title: '基本单位', align:"center", dataIndex: 'basicUnit' },
-          { title: '副单位', align:"center", dataIndex: 'otherUnit' },
-          { title: '比例', align:"center", dataIndex: 'ratio' },
+          { title: '计量单位', align:"center", dataIndex: 'name', width:100 },
+          { title: '基本单位', align:"center", dataIndex: 'basicUnit', width:100 },
+          { title: '副单位', align:"center", dataIndex: 'otherUnit', width:100 },
+          { title: '比例', align:"center", dataIndex: 'ratio', width:100 },
          {
            title: '操作',
            dataIndex: 'action',
+            width:150,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
--- a/jshERP-web/src/views/system/VendorList.vue
+++ b/jshERP-web/src/views/system/VendorList.vue
@@ -132,6 +132,7 @@
          {
            title: '操作',
            dataIndex: 'action',
+            width: 200,
            align:"center",
            scopedSlots: { customRender: 'action' },
          }