合并冲突

licp

2024-05-28 52e18000ace434b2acdebce5e118c45c337a3fe7

 src/views/plan/customerorder/index.vue

@@ -60,6 +60,7 @@
          <el-button
            style="margin-left: 10px;padding: 9px 14px;"
            type="primary"
            v-if="permissions.plan_customerorder_check"
            @click="handleCheck"
            >审核</el-button
          >
@@ -534,6 +535,7 @@
        isSearch: true, // 高级查询按钮
        defaultOrderBy: { column: 'placeOrderDate', direction: 'desc' },
        cancelRunCreated: true,
        reserveSelection: true,//是否保留之前选择的数据
      },
      table: {
        total: 0,
@@ -601,7 +603,7 @@
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'date',
            searchInfoType: 'datetimerange',
            formatter: this.formatDutyDate,
          },
          {