diff --git a/public/css/loadinge.css b/public/css/loadinge.css index ee893e92..f352a5f5 100644 --- a/public/css/loadinge.css +++ b/public/css/loadinge.css @@ -41,47 +41,58 @@ body { background: -moz-linear-gradient(left, rgba(30, 252, 200, 1) 0%, rgba(29, 211, 214, 1) 100%); background: -webkit-linear-gradient(left, #172e60 0%, #172e60 100%); background: linear-gradient(to right, #b9c0cf36 0%, #000000 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1efcc8', endColorstr='#1dd3d6',GradientType=1 ); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1efcc8', endColorstr='#1dd3d6', GradientType=1); color: white; padding-top: 8px; padding-bottom: 18px; animation: bg 3s linear infinite; } +@keyframes truckMove { + 0% { + transform: translateX(-250px); + /* 卡车从屏幕左侧外部开始 */ + } + + 50% { + transform: translateX(calc(10px)); + /* 卡车移出到屏幕右侧外部 */ + } + + 100% { + transform: translateX(150px); + /* 卡车从左侧再次进入 */ + } +} + .truck { height: 110px; width: 150px; position: absolute; - bottom: 48px; left: calc(50% + 10px); transform: translateX(-50%); + animation: truckMove 2s linear infinite; } -.truck > .truck-container { +.truck>.truck-container { background: rgb(175, 189, 195); - background: -moz-linear-gradient( - -45deg, - rgba(175, 189, 195, 1) 0%, - rgba(175, 189, 195, 1) 50%, - rgba(143, 163, 173, 1) 51%, - rgba(143, 163, 173, 1) 100% - ); - background: -webkit-linear-gradient( - -45deg, - rgba(175, 189, 195, 1) 0%, - rgba(175, 189, 195, 1) 50%, - rgba(143, 163, 173, 1) 51%, - rgba(143, 163, 173, 1) 100% - ); - background: linear-gradient( - 135deg, - rgba(175, 189, 195, 1) 0%, - rgba(175, 189, 195, 1) 50%, - rgba(143, 163, 173, 1) 51%, - rgba(143, 163, 173, 1) 100% - ); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afbdc3', endColorstr='#8fa3ad',GradientType=1 ); + background: -moz-linear-gradient(-45deg, + rgba(175, 189, 195, 1) 0%, + rgba(175, 189, 195, 1) 50%, + rgba(143, 163, 173, 1) 51%, + rgba(143, 163, 173, 1) 100%); + background: -webkit-linear-gradient(-45deg, + rgba(175, 189, 195, 1) 0%, + rgba(175, 189, 195, 1) 50%, + rgba(143, 163, 173, 1) 51%, + rgba(143, 163, 173, 1) 100%); + background: linear-gradient(135deg, + rgba(175, 189, 195, 1) 0%, + rgba(175, 189, 195, 1) 50%, + rgba(143, 163, 173, 1) 51%, + rgba(143, 163, 173, 1) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#afbdc3', endColorstr='#8fa3ad', GradientType=1); height: 60px; width: 60px; position: absolute; @@ -91,30 +102,24 @@ body { background: url('../img/Clogo.png') no-repeat !important; } -.truck > .glases { +.truck>.glases { background: rgb(40, 181, 245); - background: -moz-linear-gradient( - -45deg, - rgba(40, 181, 245, 1) 0%, - rgba(40, 181, 245, 1) 50%, - rgba(2, 153, 227, 1) 52%, - rgba(2, 153, 227, 1) 100% - ); - background: -webkit-linear-gradient( - -45deg, - rgba(40, 181, 245, 1) 0%, - rgba(40, 181, 245, 1) 50%, - rgba(2, 153, 227, 1) 52%, - rgba(2, 153, 227, 1) 100% - ); - background: linear-gradient( - 135deg, - rgba(40, 181, 245, 1) 0%, - rgba(40, 181, 245, 1) 50%, - rgba(2, 153, 227, 1) 52%, - rgba(2, 153, 227, 1) 100% - ); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#28b5f5', endColorstr='#0299e3',GradientType=1 ); + background: -moz-linear-gradient(-45deg, + rgba(40, 181, 245, 1) 0%, + rgba(40, 181, 245, 1) 50%, + rgba(2, 153, 227, 1) 52%, + rgba(2, 153, 227, 1) 100%); + background: -webkit-linear-gradient(-45deg, + rgba(40, 181, 245, 1) 0%, + rgba(40, 181, 245, 1) 50%, + rgba(2, 153, 227, 1) 52%, + rgba(2, 153, 227, 1) 100%); + background: linear-gradient(135deg, + rgba(40, 181, 245, 1) 0%, + rgba(40, 181, 245, 1) 50%, + rgba(2, 153, 227, 1) 52%, + rgba(2, 153, 227, 1) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#28b5f5', endColorstr='#0299e3', GradientType=1); position: absolute; height: 25px; width: 25px; @@ -125,7 +130,8 @@ body { border-top-right-radius: 6px; animation: updown-half 0.4s linear infinite; } -.truck > .glases:after { + +.truck>.glases:after { content: ''; display: block; background-color: #fbd734; @@ -140,7 +146,7 @@ body { border-top-left-radius: 0px; } -.truck > .glases:before { +.truck>.glases:before { content: ''; display: block; background-color: #f9bf2c; @@ -152,7 +158,7 @@ body { border-top-right-radius: 4px; } -.truck > .bonet { +.truck>.bonet { background-color: #f9bf2c; position: absolute; width: 124px; @@ -163,32 +169,26 @@ body { animation: updown 0.4s linear infinite; } -.truck > .bonet:after { +.truck>.bonet:after { content: ''; display: block; background: rgb(255, 255, 255); - background: -moz-linear-gradient( - -45deg, - rgba(255, 255, 255, 1) 0%, - rgba(241, 241, 241, 1) 50%, - rgba(225, 225, 225, 1) 51%, - rgba(246, 246, 246, 1) 100% - ); - background: -webkit-linear-gradient( - -45deg, - rgba(255, 255, 255, 1) 0%, - rgba(241, 241, 241, 1) 50%, - rgba(225, 225, 225, 1) 51%, - rgba(246, 246, 246, 1) 100% - ); - background: linear-gradient( - 135deg, - rgba(255, 255, 255, 1) 0%, - rgba(241, 241, 241, 1) 50%, - rgba(225, 225, 225, 1) 51%, - rgba(246, 246, 246, 1) 100% - ); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f6f6f6',GradientType=1 ); + background: -moz-linear-gradient(-45deg, + rgba(255, 255, 255, 1) 0%, + rgba(241, 241, 241, 1) 50%, + rgba(225, 225, 225, 1) 51%, + rgba(246, 246, 246, 1) 100%); + background: -webkit-linear-gradient(-45deg, + rgba(255, 255, 255, 1) 0%, + rgba(241, 241, 241, 1) 50%, + rgba(225, 225, 225, 1) 51%, + rgba(246, 246, 246, 1) 100%); + background: linear-gradient(135deg, + rgba(255, 255, 255, 1) 0%, + rgba(241, 241, 241, 1) 50%, + rgba(225, 225, 225, 1) 51%, + rgba(246, 246, 246, 1) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6', GradientType=1); height: 10px; width: 6px; position: absolute; @@ -197,7 +197,7 @@ body { border-top-left-radius: 4px; } -.truck > .base { +.truck>.base { position: absolute; background-color: #445a64; width: 106px; @@ -208,7 +208,7 @@ body { animation: updown 0.4s linear infinite; } -.truck > .base:before { +.truck>.base:before { content: ''; display: block; background-color: #e54a18; @@ -220,7 +220,7 @@ body { border-bottom-left-radius: 4px; } -.truck > .base:after { +.truck>.base:after { content: ''; display: block; background-color: RGB(84, 110, 122); @@ -233,7 +233,7 @@ body { z-index: -1; } -.truck > .base-aux { +.truck>.base-aux { width: 82px; height: 8px; background-color: #f9bf2c; @@ -243,77 +243,66 @@ body { border-bottom-right-radius: 4px; animation: updown 0.4s linear infinite; } -.truck > .wheel-back { + +.truck>.wheel-back { left: 20px; } -.truck > .wheel-front { +.truck>.wheel-front { left: 95px; } -.truck > .wheel-back, -.truck > .wheel-front { +.truck>.wheel-back, +.truck>.wheel-front { border-radius: 100%; position: absolute; background: rgb(84, 110, 122); - background: -moz-linear-gradient( - -45deg, - rgba(84, 110, 122, 1) 0%, - rgba(84, 110, 122, 1) 49%, - rgba(68, 90, 100, 1) 52%, - rgba(68, 90, 100, 1) 100% - ); - background: -webkit-linear-gradient( - -45deg, - rgba(84, 110, 122, 1) 0%, - rgba(84, 110, 122, 1) 49%, - rgba(68, 90, 100, 1) 52%, - rgba(68, 90, 100, 1) 100% - ); - background: linear-gradient( - 135deg, - rgba(84, 110, 122, 1) 0%, - rgba(84, 110, 122, 1) 49%, - rgba(68, 90, 100, 1) 52%, - rgba(68, 90, 100, 1) 100% - ); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#546e7a', endColorstr='#445a64',GradientType=1 ); + background: -moz-linear-gradient(-45deg, + rgba(84, 110, 122, 1) 0%, + rgba(84, 110, 122, 1) 49%, + rgba(68, 90, 100, 1) 52%, + rgba(68, 90, 100, 1) 100%); + background: -webkit-linear-gradient(-45deg, + rgba(84, 110, 122, 1) 0%, + rgba(84, 110, 122, 1) 49%, + rgba(68, 90, 100, 1) 52%, + rgba(68, 90, 100, 1) 100%); + background: linear-gradient(135deg, + rgba(84, 110, 122, 1) 0%, + rgba(84, 110, 122, 1) 49%, + rgba(68, 90, 100, 1) 52%, + rgba(68, 90, 100, 1) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#546e7a', endColorstr='#445a64', GradientType=1); top: 80px; height: 22px; width: 22px; animation: spin 0.6s linear infinite; } -.truck > .wheel-back:before, -.truck > .wheel-front:before { +.truck>.wheel-back:before, +.truck>.wheel-front:before { content: ''; border-radius: 100%; left: 5px; top: 5px; position: absolute; background: rgb(175, 189, 195); - background: -moz-linear-gradient( - -45deg, - rgba(175, 189, 195, 1) 0%, - rgba(175, 189, 195, 1) 50%, - rgba(143, 163, 173, 1) 51%, - rgba(143, 163, 173, 1) 100% - ); - background: -webkit-linear-gradient( - -45deg, - rgba(175, 189, 195, 1) 0%, - rgba(175, 189, 195, 1) 50%, - rgba(143, 163, 173, 1) 51%, - rgba(143, 163, 173, 1) 100% - ); - background: linear-gradient( - 135deg, - rgba(175, 189, 195, 1) 0%, - rgba(175, 189, 195, 1) 50%, - rgba(143, 163, 173, 1) 51%, - rgba(143, 163, 173, 1) 100% - ); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afbdc3', endColorstr='#8fa3ad',GradientType=1 ); + background: -moz-linear-gradient(-45deg, + rgba(175, 189, 195, 1) 0%, + rgba(175, 189, 195, 1) 50%, + rgba(143, 163, 173, 1) 51%, + rgba(143, 163, 173, 1) 100%); + background: -webkit-linear-gradient(-45deg, + rgba(175, 189, 195, 1) 0%, + rgba(175, 189, 195, 1) 50%, + rgba(143, 163, 173, 1) 51%, + rgba(143, 163, 173, 1) 100%); + background: linear-gradient(135deg, + rgba(175, 189, 195, 1) 0%, + rgba(175, 189, 195, 1) 50%, + rgba(143, 163, 173, 1) 51%, + rgba(143, 163, 173, 1) 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#afbdc3', endColorstr='#8fa3ad', GradientType=1); height: 12px; width: 12px; } @@ -322,6 +311,7 @@ body { 50% { top: 81px; } + 100% { transform: rotate(360deg); } @@ -331,6 +321,7 @@ body { 30% { transform: rotate(1deg); } + 50% { top: 11px; } @@ -340,24 +331,9 @@ body { transform: rotate(-1deg); } } -@keyframes truckMove { - 0% { - transform: translateX(-250px); /* 卡车从屏幕左侧外部开始 */ - } - 50% { - transform: translateX(calc(10px)); /* 卡车移出到屏幕右侧外部 */ - } - 100% { - transform: translateX(150px); /* 卡车从左侧再次进入 */ - } -} -.truck { - animation: truckMove 1s linear infinite; -} - -.truck > .smoke { +.truck>.smoke { position: absolute; background-color: #afbdc3; border-radius: 100%; @@ -369,7 +345,7 @@ body { opacity: 0; } -.truck > .smoke:after { +.truck>.smoke:after { content: ''; position: absolute; background-color: RGB(143, 163, 173); @@ -380,7 +356,7 @@ body { left: 4px; } -.truck > .smoke:before { +.truck>.smoke:before { content: ''; position: absolute; background-color: RGB(143, 163, 173); @@ -391,11 +367,13 @@ body { left: 0px; } + @keyframes fade { 30% { opacity: 0.3; left: 7px; } + 50% { opacity: 0.5; left: 6px; @@ -416,6 +394,7 @@ body { from { background-position-x: 0px; } + to { background-position-x: -400px; } @@ -439,4 +418,4 @@ body { 70% { transform: translateY(-5%); } -} +} \ No newline at end of file diff --git a/src/api/basicdata/basicdataWarehouse.js b/src/api/basicdata/basicdataWarehouse.js index 5ae8ea8a..63bc6ca4 100644 --- a/src/api/basicdata/basicdataWarehouse.js +++ b/src/api/basicdata/basicdataWarehouse.js @@ -204,3 +204,19 @@ export const $_basicdataWarehousedetail = params => { params, }); }; +// 扩展配置 +export const $_warehouseConfig = params => { + return request({ + url: '/api/logpm-warehouse/warehouseConfig/detail', + method: 'get', + params, + }); +}; +// 扩展配置更新 +export const $_warehouseConfigupdate = data => { + return request({ + url: '/api/logpm-warehouse/warehouseConfig/update', + method: 'post', + data, + }); +}; \ No newline at end of file diff --git a/src/option/basicdata/basicdataWarehouseTemp.js b/src/option/basicdata/basicdataWarehouseTemp.js index 50603507..4b56acea 100644 --- a/src/option/basicdata/basicdataWarehouseTemp.js +++ b/src/option/basicdata/basicdataWarehouseTemp.js @@ -337,7 +337,7 @@ export const columnList = [ label: '操作', type: 6, values: '', - width: '150', + width: '180', checkarr: [], fixed: 'right', sortable: false, diff --git a/src/utils/util.js b/src/utils/util.js index 8e53616a..4187322d 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -547,13 +547,11 @@ const updateDetailQuery = (index, propName, detailsQuery) => { } else { if (detailsQuery.hasOwnProperty(propName)) { delete detailsQuery[propName]; // 确保删除属性 - } else { } } }; -// 处理 row 属性并更新 details.query +// 处理 row 属性并更新 details.query(不可移除) export const processRowProperty = (index, row, details) => { - console.log(`Processing: ${row.prop}`); if (typeof row.prop === 'string') { const nameRegex = /([a-zA-Z0-9_]+)NameS$/; const match = row.prop.match(nameRegex); @@ -569,10 +567,27 @@ export const processRowProperty = (index, row, details) => { } else { updateDetailQuery(index, row.prop, details.query); } - } else { } }; +// 处理 row 属性并更新 details.query新版支持多个, +export const processRowPropertyName = (index, row, details) => { + if (typeof row.prop === 'string') { + const nameRegex = /([a-zA-Z0-9_]+)NameS$/; + const match = row.prop.match(nameRegex); + if (match) { + const basePropName = match[1]; + const fullPropNameS = basePropName + 'NameS'; + if (details.hasOwnProperty(fullPropNameS)) { + delete details[fullPropNameS]; + } else { + } + updateDetailQuery(index, basePropName, details); + } else { + updateDetailQuery(index, row.prop, details); + } + } +}; /** * 数字运算(主要用于小数点精度问题) * [see](https://juejin.im/post/6844904066418491406#heading-12) diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue index a10fc374..34821e45 100644 --- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue +++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue @@ -1,8 +1,7 @@ + + + + + + + + + + + + + { console.log(file); @@ -456,7 +524,6 @@ const rules = reactive({ department: [{ required: true, message: '请选择所属部门', trigger: 'change' }], address: [{ required: true, message: '请选择仓库地址', trigger: 'change' }], daterange: [{ required: true, message: '请选日期范围', trigger: 'change' }], - }); const Topquery = ref({}); //顶部搜索参数 const newlyaddload = ref(false); //新增弹窗 @@ -663,7 +730,6 @@ const showdrawer = _flag => { function updateDictionary(targetArray, dictionaryType) { getDictionaryBiz(dictionaryType).then(res => { res.data.data.forEach(item => { - console.log(item); targetArray.push({ dictKey: item.dictKey, dictValue: item.dictValue, @@ -671,6 +737,15 @@ function updateDictionary(targetArray, dictionaryType) { }); }); } +// 获取当前仓库ID +const getwarehouse = () => { + // 获取本地存储的值 + const my_data = JSON.parse(localStorage.getItem('my_data')); + warehouseID.value = my_data.id; + console.log(warehouseID.value, '仓库ID'); +}; +getwarehouse(); + const dictionary = () => { updateDictionary(options.value, 'warehouse_function_type'); //职能类型 updateDictionary(WarehouseType.value, 'warehouse_type'); //仓库类型 @@ -788,9 +863,7 @@ const onLoad = val => { }); }; onLoad(); -const searchHide = () => { - -}; +const searchHide = () => {}; // 每页多少条 const sizeChange = val => { @@ -915,7 +988,10 @@ const edit = value => { newlyaddload.value = true; //展开弹窗 GetDetails(value); //获取详情 }; - +// 是否全屏 +const Isfullscreen = () => { + Isitfullscreen.value = !Isitfullscreen.value; +}; // 查看详情 const view = value => { dialogTitle.value = '查看详情'; @@ -940,6 +1016,57 @@ const beforeAvatarUpload = async rawFile => { const res = await compressImageBlob(rawFile); return res; }; +// 扩展配置 +const Expandconfiguration = async row => { + if (!row.id) { + ElMessage({ + message: '当前仓库数据错误', + type: 'warning', + }); + return; + } + console.log('扩展配置'); + try { + let data = { + warehouseId: row.id, + }; + + let _res = await $_warehouseConfig(data); + + if (_res.data.code == 200) { + const { id, isStrictLoading } = _res.data.data; + dialogExpandconfiguration.value = true; + Expandconfigurationform.value.id = id; //id + Expandconfigurationform.value.isStrictLoading = isStrictLoading; //是否强制装车 + } + console.log(_res, '_res'); + } catch (err) { + console.log(err); + } finally { + } +}; +// 扩展配置提交 +const Expandconfigurationsubmit = async () => { + try { + let data = { + ...Expandconfigurationform.value, + }; + Expandconfigurationloading.value = true; + let _res = await $_warehouseConfigupdate(data); + if (_res.data.code == 200) { + dialogExpandconfiguration.value = false; //关闭弹窗 + ElMessage({ + message: _res.data.msg, + type: 'success', + }); + } + console.log(_res); + } catch (error) { + console.log(error, 'error'); + } finally { + Expandconfigurationloading.value = false; + } +}; // 删除 const DeleteInformation = val => { ElMessageBox.confirm('是否删除该条数据?确定此操作后不可撤销!', '删除提示', { @@ -1004,16 +1131,16 @@ const newlyaddSubmit = () => { return; } data.paymentCodeUrl = imgURl.join(','); - }else{ - delete data.paymentCodeUrl + } else { + delete data.paymentCodeUrl; } data.warehouseAddress = Addform.value.address[2]; //地址 console.log(Addform.value, 'Addform.value'); if (data.daterange?.length) { data.daterange[0] = dayjs(data.daterange[0]).format('YYYY-MM-DD'); data.daterange[1] = dayjs(data.daterange[1]).format('YYYY-MM-DD'); - }else{ - delete data.daterange + } else { + delete data.daterange; } data.administrativeAreas = data.administrativeAreas.join(','); if (Addform.value.daterange?.length) { @@ -1111,4 +1238,26 @@ const newlyaddSubmit = () => { color: white; background-color: #8f8f8f; } +.el_dialog__header { + display: flex; + justify-content: space-between; + align-items: center; + i { + margin: 0 8px; + } +} +:deep(.el_Inventorydialog) { + .el-tab-pane { + display: none; + } + .el-tabs__content { + padding: 0 10px; + } +} +.el_Expandconfiguration { + .el-form-item { + flex-direction: column; + width: 20%; + } +} diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index ea9ee65c..cfeecac4 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -46,7 +46,6 @@ :loading="loadingObj.list" @inputTxt="inputsc" @timeCheck="timesc" - @btnCheck="btnsc" @selectCheck="selectsc" @selection="selectionChange" > @@ -252,8 +251,8 @@ - +
@@ -301,7 +299,7 @@ cancel-button-text="取消" icon="Download" icon-color="#626AEF" - title="是否导出数据?" + title="是否导出该条数据?" @confirm="ExportDataIndexRwo(slotProps.scope.row)" >