Răsfoiți Sursa

fix 优化 bug

ylong 4 luni în urmă
părinte
comite
8d1c6bf502

+ 2 - 3
src/views/data/universities/components/universities-edit.vue

@@ -90,8 +90,7 @@
         add: '/baseinfo/schoolInfo/save',
         update: '/baseinfo/schoolInfo/edit'
     });
-    const formData = ref({ schoolTag: '1' });
-    const defaultFormData = { schoolTag: '1' };
+    const formData = ref();
 
     const editRef = ref(null);
 
@@ -99,7 +98,7 @@
         title.value = data && data.id ? '编辑高校' : '新增高校';
 
         // 重置表单数据
-        formData.value = JSON.parse(JSON.stringify(defaultFormData));
+        formData.value = JSON.parse(JSON.stringify({}));
 
         // 如果是编辑模式,才合并数据
         if (data && data.id) {

+ 6 - 2
src/views/recycle/remindArea/index.vue

@@ -24,6 +24,10 @@
                 </el-button>
             </template>
 
+            <template #useStatus="{ row }">
+                <dict-data code="remind_area_status" type="tag" :model-value="row.useStatus" />
+            </template>
+
             <template #action="{ row }">
                 <div>
                     <!-- <el-button type="primary" link v-permission="'recycle:remindArea:update'"
@@ -82,9 +86,9 @@
         { label: '推送人', prop: 'createName', align: 'center' },
         {
             label: '状态',
-            prop: 'schoolLevel',
+            prop: 'useStatus',
             align: 'center',
-            formatter: (row) => '生效中'
+            slot: 'useStatus'
         },
         { label: '添加时间', prop: 'createTime', align: 'center' },
         {

+ 1 - 1
src/views/recycleLogistics/arrivalSign/components/arrivalSign-search.vue

@@ -32,7 +32,7 @@
                     filterable: true
                 }
             },
-            { type: 'input', label: '签收者', prop: 'signUserName' },
+            { type: 'input', label: '员工姓名', prop: 'signUserName' },
             { type: 'input', label: '物流单号', prop: 'deliveryCode' },
             { type: 'input', label: '物流CODE', prop: 'expressCode' },
             {

+ 2 - 2
src/views/recycleLogistics/arrivalSign/index.vue

@@ -98,7 +98,7 @@
     /** 表格列配置 */
     const columns = ref([
         {
-            label: '签收者',
+            label: '员工姓名',
             prop: 'signUserName',
             align: 'center'
         },
@@ -120,7 +120,7 @@
 
     const columns1 = ref([
         {
-            label: '签收者',
+            label: '员工姓名',
             prop: 'signUserName',
             align: 'center'
         },

+ 1 - 1
src/views/recycleLogistics/expressCheck/components/page-search.vue

@@ -32,7 +32,7 @@
                     filterable: true
                 }
             },
-            { type: 'input', label: '签收者', prop: 'signUserName' },
+            { type: 'input', label: '员工姓名', prop: 'signUserName' },
             { type: 'input', label: '物流单号', prop: 'deliveryCode' },
             { type: 'input', label: '物流CODE', prop: 'expressCode' },
             { type: 'input', label: '批次号', prop: 'batchNum' },

+ 1 - 1
src/views/recycleLogistics/expressCheck/index.vue

@@ -29,7 +29,7 @@
     /** 表格列配置 */
     const columns = ref([
         {
-            label: '签收者',
+            label: '员工姓名',
             prop: 'signUserName',
             align: 'center'
         },

+ 1 - 1
src/views/recycleLogistics/transferSign/components/page-search.vue

@@ -32,7 +32,7 @@
                     filterable: true
                 }
             },
-            { type: 'input', label: '签收者', prop: 'signUserName' },
+            { type: 'input', label: '员工姓名', prop: 'signUserName' },
             { type: 'input', label: '物流单号', prop: 'deliveryCode' },
             { type: 'input', label: '物流CODE', prop: 'expressCode' },
             {

+ 1 - 1
src/views/recycleLogistics/transferSign/index.vue

@@ -33,7 +33,7 @@
     /** 表格列配置 */
     const columns = ref([
         {
-            label: '签收者',
+            label: '员工姓名',
             prop: 'signUserName',
             align: 'center'
         },

+ 4 - 4
src/views/statistic/arrivalSign/components/page-search.vue

@@ -35,8 +35,8 @@
                     valueFormat: 'YYYY-MM-DD',
                     onChange: (value) => {
                         searchRef.value?.setData({
-                            statDateStart: value ? value[0] : '',
-                            statDateEnd: value ? value[1] : ''
+                            statistateStart: value ? value[0] : '',
+                            statistateEnd: value ? value[1] : ''
                         });
                     }
                 },
@@ -48,8 +48,8 @@
     });
 
     const initKeys = reactive({
-        statDateStart: '',
-        statDateEnd: '',
+        statistateStart: '',
+        statistateEnd: '',
         signUserName: ''
     });
 

+ 4 - 1
src/views/statistic/audit/index.vue

@@ -63,7 +63,10 @@
             label: '不良率',
             prop: 'badRate',
             align: 'center',
-            formatter: (row) => (row.badRate || 0) + '%'
+            formatter: (row) => {
+                const rate = Number(row.badRate) || 0;
+                return (rate * 100).toFixed(2) + '%';
+            }
         },
         { label: '预估金额', prop: 'expectMoney', align: 'center' },
         { label: '审核金额', prop: 'finalMoney', align: 'center' },

+ 4 - 4
src/views/statistic/inspection/components/page-search.vue

@@ -35,8 +35,8 @@
                     valueFormat: 'YYYY-MM-DD',
                     onChange: (value) => {
                         searchRef.value?.setData({
-                            statDateStart: value ? value[0] : '',
-                            statDateEnd: value ? value[1] : ''
+                            statistateStart: value ? value[0] : '',
+                            statistateEnd: value ? value[1] : ''
                         });
                     }
                 },
@@ -48,8 +48,8 @@
     });
 
     const initKeys = reactive({
-        statDateStart: '',
-        statDateEnd: '',
+        statistateStart: '',
+        statistateEnd: '',
         signUserName: ''
     });
 

+ 1 - 1
src/views/statistic/inspection/index.vue

@@ -35,7 +35,7 @@
     /** 表格列配置 */
     const columns = ref([
         { type: 'index', label: '#', align: 'center', width: 80 },
-        { label: '操作员', prop: 'signUserName', align: 'center' },
+        { label: '员工姓名', prop: 'signUserName', align: 'center' },
         { label: '批次号', prop: 'batchNum', align: 'center' },
         { label: '验收包裹数量', prop: 'statNum', align: 'center' },
         { label: '统计日期', prop: 'statDate', align: 'center' }

+ 4 - 4
src/views/statistic/unpacking/components/page-search.vue

@@ -35,8 +35,8 @@
                     valueFormat: 'YYYY-MM-DD',
                     onChange: (value) => {
                         searchRef.value?.setData({
-                            statDateStart: value ? value[0] : '',
-                            statDateEnd: value ? value[1] : ''
+                            statistateStart: value ? value[0] : '',
+                            statistateEnd: value ? value[1] : ''
                         });
                     }
                 },
@@ -48,8 +48,8 @@
     });
 
     const initKeys = reactive({
-        statDateStart: '',
-        statDateEnd: '',
+        statistateStart: '',
+        statistateEnd: '',
         signUserName: ''
     });
 

+ 1 - 1
src/views/statistic/unpacking/index.vue

@@ -35,7 +35,7 @@
     /** 表格列配置 */
     const columns = ref([
         { type: 'index', label: '#', align: 'center', width: 80 },
-        { label: '拆包员', prop: 'signUserName', align: 'center' },
+        { label: '员工姓名', prop: 'signUserName', align: 'center' },
         { label: '拆包数量', prop: 'statNum', align: 'center' },
         { label: '统计日期', prop: 'statDate', align: 'center' }
     ]);