Merge remote-tracking branch 'origin/master'

liuguocan

2023-11-28 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636

 admin-web/src/views/stock/scrap/itemScrapping/index.vue

@@ -12,7 +12,7 @@
            <div class="table-tool-bar" style="margin-bottom: 15px">
              <my-button name="新增" @click="handleAdd" site="tools" size="medium" />
            </div>
            <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }">
            <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
              <el-row class="card" :gutter="5" v-loading="loading">
                <el-col v-for="(item, index) in list" :key="index" class="cm-item">
                  <el-card class="card-data">
@@ -21,7 +21,7 @@
                        <div class="card-header-left">
                          <span>报废单号：</span>
                          <span class="value">{{ item.businessFormCode }}</span>
                          

                        </div>
                        <div class="card-header-right">
                          <el-button site="form" type="success" size="mini" @click="handleExport(item)"
@@ -138,13 +138,13 @@
        },
        {
          type: 'date-picker',
          dataIndex: 'incomeTimeStart',
          dataIndex: 'startTime',
          label: '报废时间',
          defaultValue: '',
        },
        {
          type: 'date-picker',
          dataIndex: 'incomeTimeEnd',
          dataIndex: 'endTime',
          label: '至',
          defaultValue: '',
        },
@@ -199,7 +199,6 @@
        this.list = res.datas;
        this.total = res.totalRows;
        this.loading = false;
        console.log(this.list);
      });
    },