chenrui 3 anni fa
parent
commit
90d1c7b2fb

+ 8 - 8
src/views/power/user/userList.vue

@@ -37,7 +37,7 @@
         rowKey="id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1360, y: tableHeight }"
+        :scroll="{ x: 1200, y: tableHeight }"
         bordered>
         <span slot="status" slot-scope="text, record">
           <a-switch v-if="$hasPermissions('B_powerMD_user_enable') && record.superAdmin!=1" checkedChildren="启用" unCheckedChildren="禁用" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
@@ -97,15 +97,15 @@ export default {
       itemData: null, // 编辑行数据
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '来源', dataIndex: 'org.name', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '来源', dataIndex: 'org.name', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '用户名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '手机号码', dataIndex: 'phone', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '手机号码', dataIndex: 'phone', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '用户账号', dataIndex: 'loginName', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '角色', width: 200, align: 'center', dataIndex: 'roleNames', customRender: function (text) { return text || '--' } },
-        { title: '状态', width: 100, align: 'center', scopedSlots: { customRender: 'status' }, fixed: 'right' },
-        { title: '操作', width: 120, align: 'center', scopedSlots: { customRender: 'action' }, fixed: 'right' }
+        { title: '角色', width: 180, align: 'center', dataIndex: 'roleNames', customRender: function (text) { return text || '--' } },
+        { title: '状态', width: 80, align: 'center', scopedSlots: { customRender: 'status' }, fixed: 'right' },
+        { title: '操作', width: 100, align: 'center', scopedSlots: { customRender: 'action' }, fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 1 - 1
src/views/salesManagement/salesReturn/detail.vue

@@ -79,7 +79,7 @@
 import moment from 'moment'
 import { getOperationalPrecision } from '@/libs/tools.js'
 import { STable, VSelect } from '@/components'
-import { salesReturnDetail, salesReturnQueryCount, salesReturnDetailList, salesReturnDetailPrint } from '@/api/salesReturn'
+import { salesReturnDetail, salesReturnQueryCount, salesReturnDetailList, salesReturnDetailPrint, salesDetailExport } from '@/api/salesReturn'
 export default {
   name: 'SalesReturnDetail',
   components: { STable, VSelect },