diff --git a/src/router/views/index.js b/src/router/views/index.js index 012c6323..d72adef9 100644 --- a/src/router/views/index.js +++ b/src/router/views/index.js @@ -1614,6 +1614,42 @@ export default [ }, ], }, + // 工单新增拷贝页面 + { + path: '/aftersales/aftersalesWorkOrderAddCopy', + component: Layout, + redirect: '/aftersales/aftersalesWorkOrderAddCopy', + children: [ + { + meta: { + i18n: 'dict', + keepAlive: true, + }, + path: '/aftersales/aftersalesWorkOrderAddCopy', + name: '工单新增拷贝页面', + component: () => import('@/views/aftersales/aftersalesWorkOrderAddCopy.vue'), + }, + ], + }, + + // 工单新增重构页面 + + { + path: '/aftersales/aftersalesWorkOrderAddTemp', + component: Layout, + redirect: '/aftersales/aftersalesWorkOrderAddTemp', + children: [ + { + meta: { + i18n: 'dict', + keepAlive: true, + }, + path: '/aftersales/aftersalesWorkOrderAddTemp', + name: '工单新增重构页面', + component: () => import('@/views/aftersales/aftersalesWorkOrderAddTemp.vue'), + }, + ], + }, // { // // 这是父路由，财务主页面 // path: '/financialsector/FinanceHome', diff --git a/src/utils/poptxt.js b/src/utils/poptxt.js index 98023724..f77a11c3 100644 --- a/src/utils/poptxt.js +++ b/src/utils/poptxt.js @@ -1,15 +1,5 @@ -import { ElMessage } from 'element-plus' // 引入 ElMessage 组件 export function popmsg(res) { // 显示成功消息 - if (res.msg == '导入成功') { - ElMessage({ - message: res.msg, - type: 'success', - }); - return; - }else{ - - // 创建包含 p 标签的内容的 div 元素 var fragment = document.createDocumentFragment(); var div = document.createElement('div'); @@ -23,14 +13,14 @@ export function popmsg(res) { div.style.left = '50%'; div.style.transform = 'translate(-50%, -50%)'; div.style.width = '50%'; - div.style.height = '200px'; + div.style.height = '50%'; div.style.backgroundColor = '#ffffff'; div.style.borderRadius = '4px'; div.style.overflow = 'scroll'; div.style.border = '1px solid #ccc'; div.style.padding = '10px'; // 将后端返回的内容作为 HTML 插入到 div 中 - div.innerHTML = res.msg; + div.innerHTML = res.data; // 遍历所有的

标签并设置首行缩进 var pTags = div.querySelectorAll('p'); pTags.forEach(function (pTag) { @@ -63,5 +53,5 @@ export function popmsg(res) { // 添加点击事件监听 document.addEventListener('click', closePopupOnClickOutside); - } + } \ No newline at end of file diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue index 2bf91694..1bc5f7ce 100644 --- a/src/views/Pricesystem/ListOfPriceSystems.vue +++ b/src/views/Pricesystem/ListOfPriceSystems.vue @@ -16,7 +16,14 @@

-
+
+ + 导出模板 + + 导入模板 +
搜 索 @@ -143,7 +150,32 @@ + + + + +
点击上传 或者拖拽上传
+ + + + +
import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue'; import { columnList } from '@/option/Pricesystem/index.js'; -import { $_getpriceTemplate, $_deletelpriceTemplate } from '@/api/financialsector/index'; //价格模板 +import { $_getpriceTemplate, $_deletelpriceTemplate , $_getexport} from '@/api/financialsector/index'; //价格模板 import { getBasicdataPrice, postBasicdataPrice } from '@/api/Pricesystem/index'; //价格模板 import { getDictionaryBiz } from '@/api/system/dict'; //字典 import { processRowProperty, setNodeHeight } from '@/utils/util'; +import { getToken } from 'utils/auth'; // 用于获取存储的Token import functions from '@/utils/functions.js'; import { ElMessageBox, ElMessage } from 'element-plus'; +import { popmsg } from '@/utils/poptxt'; import { downloadXls, deepClone } from '@/utils/util'; import { useStore } from 'vuex'; import dayjs from 'dayjs'; const $router = useRouter(); //跳转 const $useStore = useStore(); //权限 const $route = useRoute(); //获取地址栏参数 +const dialogTemp=ref(false) const details = reactive({ /** 是否开启搜索 */ search: false, @@ -239,7 +274,56 @@ const details = reactive({ /** 价格模板数组 */ templateArr: [], }); +const headers = computed(() => { + return { 'Blade-Auth': 'Bearer ' + getToken() }; +}); +const handleSuccess = res => { + if (res.code == 200 && !res.data) { + ElMessage({ + message: res.msg, + type: 'success', + }); + } else if (res.code == 200 && res.data) { + ElMessage({ + message: '导入失败，请查看原因重新导入！', + type: 'warning', + }); + popmsg(res); + } else{ + ElMessage({ + message: res.msg, + type: 'warning', + }); + } + console.log(res, 'datas'); +}; +// 上传文件之前 +const beforeAvatarUpload= (rawFile) => { + console.log(rawFile,'rawFile'); + + if (rawFile.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') { + ElMessage.error('请上传EXCEL文件!') + return false + } + return true +} +// 导出模板 +const exporTemp = () => { + ElMessageBox.confirm('是否导出价格模板', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + $_getexport().then(res => { + downloadXls(res.data, `价格模板.xlsx`); + }); + }); +}; +// 导入模板 +const ImportTemplate = () => { + dialogTemp.value = true; +}; /** 生效时间 -- 生效时间不能大于到期时间 */ const time1 = time => { if (!details.form.expiryTime) return false; diff --git a/src/views/Pricesystem/Price/PriceWarehousing.vue b/src/views/Pricesystem/Price/PriceWarehousing.vue index bc801594..fdd9f597 100644 --- a/src/views/Pricesystem/Price/PriceWarehousing.vue +++ b/src/views/Pricesystem/Price/PriceWarehousing.vue @@ -307,11 +307,14 @@ const onLoad = async () => { } } else { console.log('没有附加品类'); - let data = requestInfo.value.additionalCategory[0]; + if( requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length){ + let data = requestInfo.value.additionalCategory[0]; console.log(data, 'data数据'); form.value.operatePrice = data.operatePrice || 0; form.value.warehouseManagementPrice = data.warehouseManagementPrice || 0; form.value.warehouseSortPrice = data.warehouseSortPrice || 0; + } + } form.value.publicData = []; //清空数据 // 仓储回显 diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 7575f456..61025c5a 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -1215,10 +1215,7 @@ const screenHeight = ref(0); // 屏幕高度 const eightyPercentHeight = ref(0); // 80% 高度 const list = ref([]); const options = ref([]); -const arbitration = ref({ - a: 0, - b: 1, -}); + const arbitrationTemp = ref(0); //仲裁中当点击的那个菜单 const CustomerData = ref([]); //客服指派表格查询 const repulse = ref(false); @@ -2825,7 +2822,6 @@ const appealFn = val => { // 申诉列表 const AppealTab = val => { console.log(val, '仲裁中当前列表'); - console.log(arbitration.value, '菜单'); arbitrationTemp.value = val; if (val == 0) { diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index a950ba15..38464aaf 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -150,7 +150,13 @@ 查看历史包件 - 移除 + + 移除 +
@@ -348,7 +354,7 @@ - + @@ -1182,6 +1189,27 @@ const rules = reactive({ discoveryNode: [{ required: true, message: '请选择发现节点', trigger: 'blur' }], investigationPocess: [{ required: true, message: '请填写调查经过', trigger: 'blur' }], }); +function validateDataItem(item) { + const fields = [ + { key: 'businessName', message: '责任方不能为空' }, + { key: 'personResponsibleName', message: '责任人不能为空' }, + { key: 'tripartite', message: '三方责任人不能为空' }, + { key: 'description', message: '说明不能为空', emptyCheck: true }, + ]; + + for (const field of fields) { + const value = item[field.key]; + const isInvalid = field.emptyCheck ? value === '' : !value; + if (isInvalid) { + ElMessage({ + message: field.message, + type: 'warning', + }); + return false; + } + } + return true; +} //表单提交 const ConfirmForm = () => { @@ -1201,6 +1229,19 @@ const ConfirmForm = () => { } } } + // 内部责任划分校验 + if (!FangAddList.value.length) { + ElMessage({ + message: `请填写内部责任划分`, + type: 'warning', + }); + return; + } + for (const item of FangAddList.value) { + if (!validateDataItem(item)) { + return; + } + } // 判断干线，配送环节是否是同一个运单号和订单号 if (['3', '5', '6'].includes(groundlineType.value)) { @@ -1231,6 +1272,7 @@ const ConfirmForm = () => { } } console.log(Indexform.value.businessMame, '提货责任方'); + let DataSubmit = { personResponsibleDTO: [], packageEntityList: [], ////包件信息 diff --git a/src/views/aftersales/aftersalesWorkOrderAddCopy.vue b/src/views/aftersales/aftersalesWorkOrderAddCopy.vue new file mode 100644 index 00000000..718f52e4 --- /dev/null +++ b/src/views/aftersales/aftersalesWorkOrderAddCopy.vue @@ -0,0 +1,2342 @@ + + + + + + \ No newline at end of file diff --git a/src/views/aftersales/aftersalesWorkOrderAddTemp.vue b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue new file mode 100644 index 00000000..b0122983 --- /dev/null +++ b/src/views/aftersales/aftersalesWorkOrderAddTemp.vue @@ -0,0 +1,256 @@ + + + + + diff --git a/src/views/basicdata/brand/basicdataFreight.vue b/src/views/basicdata/brand/basicdataFreight.vue index 515a4412..47a5032c 100644 --- a/src/views/basicdata/brand/basicdataFreight.vue +++ b/src/views/basicdata/brand/basicdataFreight.vue @@ -735,8 +735,15 @@ export default { methods: { // 上传成功 async doubledCountSuce(res) { - await popmsg(res); + if (res.msg == '导入成功') { + ElMessage({ + message: res.msg, + type: 'success', + }); + }else{ + await popmsg(res); this.onLoad(this.page); + } }, uploadAfter(res, done, loading, column) { console.log('121221'); diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue index f6d5e162..11fbe0bc 100644 --- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue +++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationDetails.vue @@ -617,14 +617,7 @@ async function onLoad(page, params = {}) { default: break; } - - let query= JSON.parse($route.query.info) - console.log(query,'结构参数'); data.areaType =details.pageInfo.areaType - - - - let response = await geturl(url, data); if (response.data.code == 200) { console.log('res', response.data); diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index fb8a216a..65b019d6 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -148,7 +148,7 @@ 地 图 取消配送 diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 69c60718..3e523c44 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -251,6 +251,9 @@ + 批量查看二维码 + + 批量查看二维码 批量签收 @@ -513,8 +519,8 @@ > res.id).join(','), + }; + this.html = ''; + const res = await showOrderPackgeCode(qr); + + const { code, data } = res.data; + + if (code !== 200) return; + + // this.orderPackageCode = res.data + console.log(res.data); + this.html = this.getHtmls(data.dataList, data.templateHtml); + + this.isShowPrint = true; + } catch (error) { + console.log('error :>> ', error); + } finally { + this.loadingObj.pageLoading = false; + } + }, // 库存品查看二维码 async handleStockQRCode(row) { try { @@ -4580,8 +4618,17 @@ export default { // 批量签收 Batchsigning() { console.log(this.selectionList, 'this.selectionList'); + if(!this.selectionList.length){ + ElMessage({ + message: '请勾选需要计划取消的数据', + type: 'warning', + }); + return; + } - let data = { + this.$confirm('是否确认进行批量签收？') + .then(() => { + let data = { deliveryId: this.deliveryId, reservationId: this.wid, barcodes: this.selectionList.map(item => item.orderPackageCode).join(','), @@ -4601,6 +4648,45 @@ export default { this.selectionList = []; //清空选择 this.loading = false; }); + }) + + + + + }, + + // 包件批量查看二维码 + async QRcodes(){ + if(!this.selectionList.length){ + ElMessage({ + message: `请勾选要查看二维码的数据`, + type: 'warning', + }); + return + } + try { + this.loading= true; + + let qr = { + ids: this.selectionList.map(res=>res.id).join(','), + }; + this.html = ''; + const res = await showOrderPackgeCode(qr); + + const { code, data } = res.data; + this.loading = false; + if (code !== 200) return; + + // this.orderPackageCode = res.data + console.log(res.data); + this.html = this.getHtmls(data.dataList, data.templateHtml); + + this.isShowPrint = true; + } catch (error) { + console.log('error :>> ', error); + } finally { + this.loading = false; + } }, // 批量计划取消 Batchcancellation() { diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index 8d22fe67..05a305cd 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -41,6 +41,19 @@ + + + + + {{ stockquantity || 0 }} + + + + + {{ locations || 0 }} + + + @@ -19,6 +19,9 @@ end-placeholder="结束时间" :shortcuts="shortcuts" /> + + +
@@ -801,7 +804,11 @@ export default { searchHide() { this.search = !this.search; }, - searchChange() { + searchChange() { + this.query.pickupBatchs= this.query.pickupBatchs.replace(/，/g, ","); + if(!this.query.pickupBatchs){ + delete this.query.pickupBatchs + } this.onLoad(this.page); }, searchReset() { diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue index beeda67a..c170d52f 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue @@ -830,7 +830,7 @@ export default { }, { prop: 'trainNumber', - label: '客户车次号', + label: '自提批次号', type: 2, values: '', width: '150', diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue index 763b637e..f5dc1fe8 100644 --- a/src/views/distribution/signfor/distributionSignforedt.vue +++ b/src/views/distribution/signfor/distributionSignforedt.vue @@ -1203,6 +1203,17 @@ const menuData2 = ref([ sortable: true, head: false, }, + { + prop: 'materialName', + label: '物料名称', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'orderPackageStatusName', label: '包件状态', diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index b2804e08..b06f5731 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -205,7 +205,7 @@ - +
@@ -907,7 +907,7 @@ const DataSubmit = ref({ stockup: { forkliftId: null, //叉车ID forkliftName: null, //备货人员 - goodsAreaId: null, //备货区ID + // goodsAreaId: null, //备货区ID goodsAreaName: null, //备货区域 outboundDate: null, //出库时间 stockupDate: null, //备货时间 @@ -1804,7 +1804,7 @@ onMounted(() => { } DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftName||''; //备货人员名称 DataSubmit.value.stockup.forkliftId = res.data.data.stockupInfo.forkliftId||''; //备货人员ID - DataSubmit.value.stockup.goodsAreaId = res.data.data.stockupInfo.goodsAreaId||''; //备货区域ID + // DataSubmit.value.stockup.goodsAreaId = res.data.data.stockupInfo.goodsAreaId||''; //备货区域ID DataSubmit.value.stockup.goodsAreaName = res.data.data.stockupInfo.stockupArea||''; //备货区域名称 DataSubmit.value.stockup.outboundDate = res.data.data.stockupInfo.outboundDate||''; //出库时间 DataSubmit.value.stockup.stockupDate = res.data.data.stockupInfo.stockupDate||''; //备货时间 @@ -2627,13 +2627,13 @@ const StockPersonnel = val => { }; // 选择备货区域触发 -const StockUpSera = val => { - let data = []; - data = findObjectById(val, StockInfo.value.StockUpArea); - DataSubmit.value.stockup.goodsAreaId = data.id; //备货区域ID - console.log(data, '备货区域'); - DataSubmit.value.stockup.goodsAreaName = data.headline; //备货区域名称 -}; +// const StockUpSera = val => { +// let data = []; +// data = findObjectById(val, StockInfo.value.StockUpArea); +// DataSubmit.value.stockup.goodsAreaId = data.id; //备货区域ID +// console.log(data, '备货区域'); +// DataSubmit.value.stockup.goodsAreaName = data.headline; //备货区域名称 +// }; //装车班组触发 const Loading = val => { if(val){ diff --git a/src/views/financialsector/CustomerBaseprice.vue b/src/views/financialsector/CustomerBaseprice.vue index 7df8a7b9..307ee97c 100644 --- a/src/views/financialsector/CustomerBaseprice.vue +++ b/src/views/financialsector/CustomerBaseprice.vue @@ -85,42 +85,7 @@
- - - - -
- 点击上传 或者拖拽上传 -
- - - - - + + +