Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2025-06-06 77946261ec663aa1fe7f6f97e550532ed879f982

 admin/src/views/stock/out.vue

@@ -15,8 +15,10 @@
          <div v-for="item in row.recordList">{{ item.materialName }}[{{ item.materialCode }}]*{{ item.stock }}{{ item.materialUnitName }}</div>
        </template>
      </el-table-column>
      <el-table-column prop="createUserName" label="领用人" min-width="90" show-overflow-tooltip />
      <el-table-column prop="outUserName" label="领用人" min-width="90" show-overflow-tooltip />
      <el-table-column prop="createUserName" label="操作人" min-width="90" show-overflow-tooltip />
      <el-table-column prop="createDate" label="操作时间" min-width="140" show-overflow-tooltip />
      <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
      <el-table-column prop="workTime" label="操作" min-width="80" show-overflow-tooltip>
        <template v-slot="{ row }">
          <span @click="handleDetail(row)" v-permissions="['business:ywoutinboundrecord:query']" class="primaryColor pointer">查看详情</span>
@@ -40,7 +42,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import { ywOutinboundPage } from '@/api'
import { ywOutinboundPage, ywOutinboundEx } from '@/api'
import { fetchList as getStoreList } from '@/api/ywWarehouse'
import { StoreTypeOps, rules } from './components/config'
export default {
@@ -87,7 +89,7 @@
            label: '出库类型',
            labelCode: 'name',
            valueCode: 'id',
            options: StoreTypeOps.filter(i => i.type == 0)
            options: StoreTypeOps.filter(i => i.type == 1)
          },
        ],
        online: true