Merge branch 'xinyan' into test

src/views/reportManage/TaskManage/index.vue

@@ -980,9 +980,11 @@ onMounted(() => {
         :rules="rules"
         :size="formSize"
         class="demo-taskRuleForm"
+        label-position="top"
         label-width="auto"
         status-icon
         style="max-width: 600px">
+      <div style="display: grid; grid-template-columns: repeat(2, 1fr); gap: 10px">
       <el-form-item
           v-for="(item, index) in formItems"
           :key="index"
@@ -1024,6 +1026,7 @@ onMounted(() => {
           </el-autocomplete>
         </template>
       </el-form-item>
+      </div>
     </el-form>
     <template #footer>
       <div class="dialog-footer">

src/views/reportManage/TaskManage/utils/columns.ts

@@ -9,7 +9,7 @@ export const taskColumns = ref([
     fixed: 'left',
     editRender: { autofocus: '.vxe-input--inner' },
     slots: { edit: 'number_edit' },
-    minWidth: 72
+    minWidth: 70
   },
   {
     field: 'platformName',

src/views/reportManage/dataCenter/normalDisplay/components/TableDataEntry.vue

@@ -197,8 +197,8 @@ const rules = reactive<FormRules>({
   impression: [{ required: true, message: '请输入广告展示量', trigger: 'blur' }],
   ad_click: [{ required: true, message: '请输入广告点击量', trigger: 'blur' }],
   ad_order: [{ required: true, message: '请输入广告订单量', trigger: 'blur' }],
-  money_by_amazon: [{ required: true, message: '请输入亚马逊佣金', trigger: 'blur' }],
-  money_by_other: [{ required: true, message: '请输入其他佣金', trigger: 'blur' }],
+  money_by_amazon: [{ required: true, message: '请输入截止目前Amazon回款金额', trigger: 'blur' }],
+  money_by_other: [{ required: true, message: '请输入截止目前Other回款金额', trigger: 'blur' }],
   session: [{ required: true, message: '请输入会话数', trigger: 'blur' }],
   order: [{ required: true, message: '请输入订单', trigger: 'blur' }],
   availableSalesDay: [{ required: true, message: '请输入可用销量天数', trigger: 'blur' }],