yangg 1 週間 前
コミット
0ae5eca997

+ 2 - 2
src/utils/commonCrud.ts

@@ -51,14 +51,14 @@ export const commonCrudConfig = (options = {
             column: {
                 align: 'center',
                 width: 300,
-                show: options.dept_belong_id?.table || false,
+                show: false,/* options.dept_belong_id?.table ||  */
                 component: {
                     name: shallowRef(deptFormat),
                     vModel: "modelValue",
                 }
             },
             form: {
-                show: options.dept_belong_id?.form || false,
+                show:  false,/* options.dept_belong_id?.form || */
                 component: {
                     multiple: false,
                     clearable: true,

+ 5 - 5
src/views/system/borrow/component/CollectEquipment/index.vue

@@ -800,7 +800,7 @@ const handleViewAbnormal = (index: number) => {
   if (device) {
     if(device.problem_records?.length){
       currentAbnormalData.value = {
-        damage_type:device.problem_records?.[0].damage_type ||device.damage_type ||'',
+        damage_type:device.problem_records?.[0].damage_type.value ||device.damage_type.value ||'',
         condition: device.problem_records?.[0].device_condition_after ||'',
         photos: device.problem_records?.[0].returned_images.map((item:any)=>item.image_url) ||[]
       };
@@ -847,7 +847,7 @@ const handleScanSearch = async () => {
                     device_type: device.category_name,
                     device_name: device.name || '',
                     borrow_count: 1,
-                    brand: device.brand || '',
+                    brand: device.brand ||device.device_brand || '',
                     device_specification: device.specification,
                     model: device.model || '',
                     warehouse: device.warehouse,
@@ -894,7 +894,7 @@ const handleReturnScanSearch = async () => {
                     device_type: device.category_name,
                     device_name: device.name || '',
                     borrow_count: 1,
-                    brand: device.brand || '',
+                    brand: device.brand||device.device_brand || '',
                     model: device.model || '',
                     warehouse: device.warehouse,
                     return_status:device.return_status,
@@ -1183,7 +1183,7 @@ watch(() => props.modelValue, async (val) => {
                             device_type: item.remark,
                             device_name: item.device_name,
                             borrow_count: item.quantity,
-                            brand: item.brand || '',
+                            brand: item.brand ||item.device_brand || '',
                             model: item.device_specification,
                             warehouse: item.location,
                             problem_records: item.problem_records,
@@ -1270,7 +1270,7 @@ watch(() => props.modelValue, async (val) => {
                             device_type: item.remark,
                             device_name: item.device_name,
                             borrow_count: item.quantity,
-                            brand: item.brand || '',
+                            brand: item.brand ||item.device_brand || '',
                             model: item.device_specification,
                             warehouse: item.location,
                             problem_records: item.problem_records,

+ 13 - 13
src/views/system/users/crud.tsx

@@ -105,7 +105,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
                     export: {
                         text: "导出",//按钮文字
                         title: "导出",//鼠标停留显示的信息
-                        show: auth('user:Export'),
+                        show: false,//auth('user:Export'),
                         click: (ctx: any) => ElMessageBox.confirm(
                             '确定重设密码吗?', '提示',
                             { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
@@ -116,24 +116,24 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
             rowHandle: {
                 //固定右侧
                 fixed: 'right',
-                width: 200,
+                width: 300,
                 buttons: {
                     view: {
                         show: false,
                     },
                     edit: {
                         iconRight: 'Edit',
-                        type: 'text',
+                        /* type: 'text', */
                         show: auth('user:Update'),
                     },
                     remove: {
                         iconRight: 'Delete',
-                        type: 'text',
+                        /* type: 'text', */
                         show: auth('user:Delete'),
                     },
                     custom: {
                         text: '重设密码',
-                        type: 'text',
+                        /* type: 'text', */
                         show: auth('user:ResetPassword'),
                         tooltip: {
                             placement: 'top',
@@ -246,19 +246,15 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
                         label: 'name'
                     }),
                     column: {
+                        show: false,
                         minWidth: 200, //最小列宽
                         formatter({ value, row, index }) {
                             return row.dept_name_all
                         }
                     },
                     form: {
-                        rules: [
-                            // 表单校验规则
-                            {
-                                required: true,
-                                message: '必填项',
-                            },
-                        ],
+                        value: 1,
+                        show: false,
                         component: {
                             filterable: true,
                             placeholder: '请选择',
@@ -308,7 +304,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
                 mobile: {
                     title: '手机号码',
                     search: {
-                        show: true,
+                        show: false,
                     },
                     type: 'input',
                     column: {
@@ -389,6 +385,9 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
                         show: true,
                     },
                     type: 'dict-radio',
+                    form: {
+                        value: true,
+                    },
                     column: {
                         component: {
                             name: 'fs-dict-switch',
@@ -416,6 +415,7 @@ export const createCrudOptions = function ({ crudExpose }: CreateCrudOptionsProp
                         show: false,
                     },
                     column: {
+                        show:false,
                         minWidth: 100, //最小列宽
                     },
                 },

+ 1 - 1
src/views/system/users/index.vue

@@ -27,7 +27,7 @@
           </el-tree>
         </el-card>
       </el-col> -->
-      <el-col xs="24" :sm="16" :md="18" :lg="24" :xl="20" class="p-1">
+      <el-col xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="p-1">
         <el-card :body-style="{ height: '100%' }">
           <fs-crud ref="crudRef" v-bind="crudBinding">
             <!-- <template #actionbar-right>