no message
							parent
							
								
									de3a988032
								
							
						
					
					
						commit
						492ba76a97
					
				
										
											Binary file not shown.
										
									
								
							| 
						 | 
				
			
			@ -42,6 +42,7 @@
 | 
			
		|||
      },
 | 
			
		||||
      "devDependencies": {
 | 
			
		||||
        "@types/lodash": "^4.17.16",
 | 
			
		||||
        "@types/nprogress": "^0.2.3",
 | 
			
		||||
        "@types/pinyin": "^2.10.2",
 | 
			
		||||
        "@vitejs/plugin-vue": "5.1.4",
 | 
			
		||||
        "@vitejs/plugin-vue-jsx": "4.0.1",
 | 
			
		||||
| 
						 | 
				
			
			@ -1618,6 +1619,12 @@
 | 
			
		|||
      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
 | 
			
		||||
      "dev": true
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@types/nprogress": {
 | 
			
		||||
      "version": "0.2.3",
 | 
			
		||||
      "resolved": "https://registry.npmmirror.com/@types/nprogress/-/nprogress-0.2.3.tgz",
 | 
			
		||||
      "integrity": "sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==",
 | 
			
		||||
      "dev": true
 | 
			
		||||
    },
 | 
			
		||||
    "node_modules/@types/parse-json": {
 | 
			
		||||
      "version": "4.0.2",
 | 
			
		||||
      "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.2.tgz",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -50,6 +50,7 @@
 | 
			
		|||
  },
 | 
			
		||||
  "devDependencies": {
 | 
			
		||||
    "@types/lodash": "^4.17.16",
 | 
			
		||||
    "@types/nprogress": "^0.2.3",
 | 
			
		||||
    "@types/pinyin": "^2.10.2",
 | 
			
		||||
    "@vitejs/plugin-vue": "5.1.4",
 | 
			
		||||
    "@vitejs/plugin-vue-jsx": "4.0.1",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -16,7 +16,7 @@ import { PAGE_PATH_404, PAGE_PATH_LOGIN, HOME_PAGE_PATH } from '/@/constants/com
 | 
			
		|||
import { HOME_PAGE_NAME } from '/@/constants/system/home-const';
 | 
			
		||||
import SmartLayout from '../layout/index.vue';
 | 
			
		||||
import { useUserStore } from '/@/store/modules/system/user';
 | 
			
		||||
import { localClear, localRead } from '/@/utils/local-util';
 | 
			
		||||
import {localRead } from '/@/utils/local-util';
 | 
			
		||||
import _ from 'lodash';
 | 
			
		||||
import LocalStorageKeyConst from '/@/constants/local-storage-key-const.js';
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -91,7 +91,7 @@
 | 
			
		|||
    },
 | 
			
		||||
  });
 | 
			
		||||
 | 
			
		||||
  const columns = reactive([
 | 
			
		||||
  let columns = reactive([
 | 
			
		||||
    {
 | 
			
		||||
      title: '姓名',
 | 
			
		||||
      dataIndex: 'actualName',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -187,7 +187,7 @@ const tableData = ref([]);
 | 
			
		|||
// 总数
 | 
			
		||||
const total = ref(0);
 | 
			
		||||
//列
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '收货地址id',
 | 
			
		||||
    dataIndex: 'addressId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -150,7 +150,7 @@ import {TABLE_ID_CONST} from "/@/constants/support/table-id-const";
 | 
			
		|||
import AreaSelect from "/@/views/business/wms/base/area/area-select.vue";
 | 
			
		||||
// ---------------------------- 表格列 ----------------------------
 | 
			
		||||
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '库区id',
 | 
			
		||||
    dataIndex: 'areaId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -137,7 +137,7 @@ import CustomerSelect from "/@/views/business/wms/base/customer/customer-select.
 | 
			
		|||
 | 
			
		||||
// ---------------------------- 表格列 ----------------------------
 | 
			
		||||
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '客户id',
 | 
			
		||||
    dataIndex: 'customerId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -189,7 +189,7 @@ import {UploadFile} from 'ant-design-vue';
 | 
			
		|||
import {fileApi} from "/@/api/support/file-api";
 | 
			
		||||
import DictLabel from "/@/components/support/dict-label/index.vue";
 | 
			
		||||
// ---------------------------- 表格列 ----------------------------
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '物料id',
 | 
			
		||||
    dataIndex: 'itemId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -237,7 +237,7 @@ import {UploadFile} from 'ant-design-vue';
 | 
			
		|||
import {fileApi} from "/@/api/support/file-api";
 | 
			
		||||
// ---------------------------- 表格列 ----------------------------
 | 
			
		||||
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '库位ID',
 | 
			
		||||
    dataIndex: 'locationId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -200,7 +200,7 @@ import LocationSelect from "/@/views/business/wms/base/location/location-select.
 | 
			
		|||
import DictLabel from "/@/components/support/dict-label/index.vue";
 | 
			
		||||
// ---------------------------- 表格列 ----------------------------
 | 
			
		||||
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '容器id',
 | 
			
		||||
    dataIndex: 'stockId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -103,7 +103,7 @@ import ItemSelect from "/@/views/business/wms/base/item/item-select.vue";
 | 
			
		|||
import LocationSelect from "/@/views/business/wms/base/location/location-select.vue";
 | 
			
		||||
// ---------------------------- 表格列 ----------------------------
 | 
			
		||||
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '库存id',
 | 
			
		||||
    dataIndex: 'inventoryId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -160,7 +160,7 @@ import {useRoute, useRouter} from "vue-router";
 | 
			
		|||
 | 
			
		||||
// ---------------------------- 表格列 ----------------------------
 | 
			
		||||
 | 
			
		||||
const columns = ref([
 | 
			
		||||
let columns = ref([
 | 
			
		||||
  {
 | 
			
		||||
    title: '入库单id',
 | 
			
		||||
    dataIndex: 'asnId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -41,20 +41,21 @@
 | 
			
		|||
          </template>
 | 
			
		||||
          批量移除
 | 
			
		||||
        </a-button>
 | 
			
		||||
 | 
			
		||||
        <TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.ASN_DETAIL" :refresh="queryData"/>
 | 
			
		||||
        <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.WMS.ASN_DETAIL"
 | 
			
		||||
                       :refresh="queryData"/>
 | 
			
		||||
      </div>
 | 
			
		||||
 | 
			
		||||
    </div>
 | 
			
		||||
    <a-table
 | 
			
		||||
        :loading="tableLoading"
 | 
			
		||||
        size="small"
 | 
			
		||||
        :dataSource="tableData"
 | 
			
		||||
        :columns="columns"
 | 
			
		||||
        :pagination="false"
 | 
			
		||||
        rowKey="asnDetailId"
 | 
			
		||||
        :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
 | 
			
		||||
        size="small"
 | 
			
		||||
        bordered
 | 
			
		||||
        :loading="tableLoading"
 | 
			
		||||
        :pagination="false"
 | 
			
		||||
        :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
 | 
			
		||||
 | 
			
		||||
    >
 | 
			
		||||
      <template #bodyCell="{ text, record, index, column }">
 | 
			
		||||
        <template v-if="column.dataIndex === 'action'">
 | 
			
		||||
| 
						 | 
				
			
			@ -106,7 +107,7 @@ import {reactive, ref, watch} from 'vue';
 | 
			
		|||
import {PAGE_SIZE, PAGE_SIZE_OPTIONS} from '/@/constants/common-const';
 | 
			
		||||
import {smartSentry} from '/@/lib/smart-sentry';
 | 
			
		||||
import {TABLE_ID_CONST} from "/@/constants/support/table-id-const";
 | 
			
		||||
import TableOperator from "/@/components/support/table-operator/index.vue";
 | 
			
		||||
import TableOperator from '/@/components/support/table-operator/index.vue';
 | 
			
		||||
import {asnDetailApi} from "/@/api/business/wms/receive/asnDetail/asn-detail-api";
 | 
			
		||||
import AsnDetailForm from "/@/views/business/wms/receive/asnDetail/asn-detail-form.vue";
 | 
			
		||||
import {message, Modal} from "ant-design-vue";
 | 
			
		||||
| 
						 | 
				
			
			@ -119,7 +120,7 @@ const props = defineProps({
 | 
			
		|||
    default: 0,
 | 
			
		||||
  },
 | 
			
		||||
});
 | 
			
		||||
const columns = reactive([
 | 
			
		||||
let columns = reactive([
 | 
			
		||||
  {
 | 
			
		||||
    title: '入库明细id',
 | 
			
		||||
    dataIndex: 'asnDetailId',
 | 
			
		||||
| 
						 | 
				
			
			@ -192,6 +193,7 @@ async function queryData() {
 | 
			
		|||
    const queryResult = await asnDetailApi.queryPage(queryForm);
 | 
			
		||||
    tableData.value = queryResult.data.list;
 | 
			
		||||
    total.value = queryResult.data.total;
 | 
			
		||||
    console.log('刷新啦啦啦')
 | 
			
		||||
  } catch (e) {
 | 
			
		||||
    smartSentry.captureError(e);
 | 
			
		||||
  } finally {
 | 
			
		||||
| 
						 | 
				
			
			@ -295,18 +297,23 @@ async function requestBatchDelete() {
 | 
			
		|||
 | 
			
		||||
watch(
 | 
			
		||||
    () => props.asnId,
 | 
			
		||||
    (e) => {
 | 
			
		||||
      if (e) {
 | 
			
		||||
    (value) => {
 | 
			
		||||
      if (value) {
 | 
			
		||||
        queryForm.asnId = value;
 | 
			
		||||
        queryData();
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    {immediate: true}
 | 
			
		||||
    {
 | 
			
		||||
      immediate: true,
 | 
			
		||||
    }
 | 
			
		||||
);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
defineExpose({
 | 
			
		||||
  queryData
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<style scoped lang="less">
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -84,7 +84,7 @@ const props = defineProps({
 | 
			
		|||
    default: 0,
 | 
			
		||||
  },
 | 
			
		||||
});
 | 
			
		||||
const columns = reactive([
 | 
			
		||||
let columns = reactive([
 | 
			
		||||
  {
 | 
			
		||||
    title: '任务ID',
 | 
			
		||||
    dataIndex: 'taskId',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -74,6 +74,7 @@
 | 
			
		|||
  const formDefault = {
 | 
			
		||||
    oldPassword: '',
 | 
			
		||||
    newPassword: '',
 | 
			
		||||
    confirmPwd: '',
 | 
			
		||||
  };
 | 
			
		||||
  let form = reactive({
 | 
			
		||||
    ...formDefault,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue