Merge remote-tracking branch 'origin/master'

cy

2023-11-30 870a9499eb65de0031ef8e8f70607e5dfb64b806

 admin-web/src/views/stock/procure/purchaseOrder/index.vue

@@ -14,7 +14,7 @@
              <my-button name="导入" @click="importSetting.dialogShow = true" site="tools" size="medium" />
            </div>
            <div v-loading="loading" style="margin-bottom: 15px">
              <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 360}px` }">
              <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
                <el-row v-if="list.length" class="card" :gutter="5">
                  <el-col v-for="(item, index) in list" :key="index" class="cm-item">
                    <el-card class="card-data">
@@ -40,7 +40,7 @@
                              >
                            </template>
                            <template v-if="item.states != 1">
                              <el-button site="form" type="success" size="mini" @click="handleExport(item)"
                              <el-button site="form" type="success" size="mini" @click="handleExport('procureExport',`采购入库单-${item.businessFormCode}`,{id:item.id})"
                              >导出入库单</el-button
                              >
                            </template>
@@ -75,7 +75,7 @@
                    </el-card>
                  </el-col>
                </el-row>
                <div class="no-data" v-else>暂无数据</div>
                <el-empty v-else description="暂无数据"></el-empty>
              </div>
            </div>

@@ -116,14 +116,14 @@
</template>

<script>
import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
import {procureDel, procureIncome, procureList} from '@/api/stock/procure/purchaseOrder';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
import { getBaseUrl } from '@/utils/base';
import listPage from '../../../mixins/listPage';
import {getBaseUrl} from '@/utils/base';
import listPage from '@/views/mixins/listPage';

export default {
  name: 'index',
@@ -202,13 +202,13 @@
        },
        {
          type: 'date-picker',
          dataIndex: 'incomeTimeStart',
          dataIndex: 'startTime',
          label: '入库时间',
          defaultValue: '',
        },
        {
          type: 'date-picker',
          dataIndex: 'incomeTimeEnd',
          dataIndex: 'endTime',
          label: '至',
          defaultValue: '',
        },
@@ -297,16 +297,6 @@
          })
          .catch(() => {});
      });
    },
    fifterForm(params) {
      this.filterFrom = Object.assign(this.filterFrom, params);
      if (this.filterFrom.incomeTimeStart) {
        this.filterFrom.incomeTimeStart = this.filterFrom.incomeTimeStart.replace(/\-/g, '');
      }
      if (this.filterFrom.incomeTimeEnd) {
        this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
      }
      this.search(1);
    },
  },
};