diff --git a/src/api/basicdata/basicClient.js b/src/api/basicdata/basicClient.js index d3d700aa..51ba4434 100644 --- a/src/api/basicdata/basicClient.js +++ b/src/api/basicdata/basicClient.js @@ -89,3 +89,4 @@ export const selectName = (current, size, params) => { }) } + diff --git a/src/api/basicdata/basicdataFreight.js b/src/api/basicdata/basicdataFreight.js index bf55461a..cd22ed1f 100644 --- a/src/api/basicdata/basicdataFreight.js +++ b/src/api/basicdata/basicdataFreight.js @@ -48,3 +48,41 @@ export const update = (row) => { }) } + +// 查看用户名称 +export const $_QueryUserName = (params) => { + return request({ + url: '/api/logpm-basicdata-zqb/basicdataClient/detail', + method: 'get', + params + }) +} + +// 查询品牌 +export const $_brand = (params) => { + return request({ + url: '/api/logpm-basicdata-zqb/basicdataStoreBrand/detail', + method: 'get', + params + }) +} + +// 查询品类 + + + +export const $_category = (params) => { + return request({ + url: '/api/logpm-basicdata-zqb/basicdataCategory/detail', + method: 'get', + params + }) +} + +export const $_getDeptLazyTree = params => { + return request({ + url: '/api/logpm-basicdata/basicdataCategory/lazy-tree', + method: 'get', + params + }); +}; \ No newline at end of file diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue index cc267a49..e3c2071d 100644 --- a/src/views/aftersales/aftersalesWorkOrderend.vue +++ b/src/views/aftersales/aftersalesWorkOrderend.vue @@ -749,7 +749,7 @@ - - + --> 下一条 @@ -780,6 +780,7 @@ @input="appoint(Msgtextarea)" />
+ 结束回复 回复
@@ -2699,7 +2700,6 @@ const CustomerServiceCompleted = () => { right: 0; bottom: 0; :deep(.el-button) { - margin-left: 20px; } } .ovhe { @@ -2935,7 +2935,10 @@ const CustomerServiceCompleted = () => { align-items: center; justify-content: space-between; } -:deep(.el-upload){ + +:deep(.Transport_damage_photos){ + .el-upload{ display: none; } +} diff --git a/src/views/basicdata/brand/basicdataFreight.vue b/src/views/basicdata/brand/basicdataFreight.vue index 943147c7..fa8f98cd 100644 --- a/src/views/basicdata/brand/basicdataFreight.vue +++ b/src/views/basicdata/brand/basicdataFreight.vue @@ -51,14 +51,116 @@ + + +
+ + + + + + + + + + + + + + + +
+
+ + + + + + + + + + +
+ + + +
+
+ + + + + + + +
+ + +
+
+
+ + + + + + + +
+
+ + +
+
+
+ + + + + + + +
+
+ + + + + - diff --git a/src/views/basicdata/brand/basicdataFreightFrom.vue b/src/views/basicdata/brand/basicdataFreightFrom.vue index 27e40a81..f2f067c6 100644 --- a/src/views/basicdata/brand/basicdataFreightFrom.vue +++ b/src/views/basicdata/brand/basicdataFreightFrom.vue @@ -4,7 +4,7 @@ - + @@ -314,6 +315,8 @@ export default { DryWarehouseDistributionBID: '', //仓库ID DryWarehouseDistributionCID: '', //配送ID clientOptions: [], //客户集合 + categoryData:[],//品类数据 + categoryDataID:[],//品类数据的ID activeName: 'second', // 分页信息 page: { @@ -359,13 +362,20 @@ export default { lazy: true, multiple: true, checkStrictly: true, - lazyLoad(node, resolve) { + lazyLoad:(node, resolve)=> { + console.log(this,'this'); + let _this=this const { level } = node; setTimeout(async () => { // console.log("node/////////",node); const parentId = node.level === 0 ? 1 : node.data.value; // console.log("par",parentId); let shuju = await getDeptLazyTree(parentId); + console.log(shuju,'品类数据'); + shuju.data.data.forEach((item=>{ + _this.categoryData.push(item) + })) + console.log(_this.categoryData,'categoryData'); // console.log(")))))))))))",shuju); const nodes = Array.from(shuju.data.data).map(item => ({ value: item.id, @@ -469,7 +479,7 @@ export default { this.form.arterys = fei; this.form.clientIds = this.form.clientIds; this.form.brand = this.form.brand; - + this.form.itemName = this.form.clientIds this.form.category = this.form.category ? this.form.category.flat().join(',') : null; console.log(this.DryWarehouseDistributionA, '干选择'); console.log(this.DryWarehouseDistributionB, '仓选择'); @@ -478,6 +488,25 @@ export default { // this.form.details = this.DryWarehouseDistributionB; this.form.details = [].concat(...this.DryWarehouseDistributionA, ...this.DryWarehouseDistributionB, ...this.DryWarehouseDistributionC); console.log('提交的数据》》》', this.form); + console.log(this.categoryDataID,'id'); + console.log(this.categoryData,'名字'); + let matchedData = this.categoryDataID.map(subArray => { + // subArray 应该包含一个元素，即 id + if (subArray.length === 1) { + let idToMatch = subArray[0]; + // 在 datas 中寻找匹配的 id + let matched = this.categoryData.find(data => data.id === idToMatch); + // 如果找到匹配，则返回对应的对象 + if (matched) { + return matched; + } + } + return null; + }).filter(item => item !== null); // 过滤掉任何未匹配的值（null） + console.log(matchedData,'筛选出来的值'); + this.form.categoryName = matchedData.map(res=>res.name).join(',') + console.log('提交的数据》》》', this.form); + // return add(this.form).then(() => { this.$store.commit('DEL_TAG_CURRENT'); //关闭当前页面 this.$router.push('/basicdata/brand/basicdataFreight'); //添加成功跳转到列表 @@ -726,7 +755,21 @@ export default { break; } }, - + categoryChange(val,a){ + console.log(val,a); + let newArray = val.map(subArray => { + // 如果内层数组长度大于 1，则只取最后一个元素组成新的数组 + if (subArray.length > 1) { + return [subArray[subArray.length - 1]]; + } + // 否则，直接保留这个数组 + return subArray; +}); +this.categoryDataID=newArray +console.log(this.categoryDataID,'data中的数据'); +console.log(newArray,'重新组织的'); + }, + handleCheckedCitiesChange(value, index) { //费用选择 console.log('>>>>>>>', value, index); @@ -872,6 +915,7 @@ export default { // console.log("字典》》》",res); this.delivery = res.data.data; }); + }, }, }; diff --git a/src/views/distribution/inventory/distributionStockListMarket.vue b/src/views/distribution/inventory/distributionStockListMarket.vue index e4db1301..6bf8925f 100644 --- a/src/views/distribution/inventory/distributionStockListMarket.vue +++ b/src/views/distribution/inventory/distributionStockListMarket.vue @@ -826,7 +826,7 @@ export default { //查询物料数据 let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, { name: query, - pid: this.stockList.materialId, + // pid: this.stockList.materialId, }).then(); console.log('物料信息', asd.data.data); if (!!asd.data.data) { @@ -1115,7 +1115,7 @@ export default { this.getQuery.quantityStock = row.row.quantityStock; this.formInline.descriptionGoods = this.getQuery.name; let q = this.distributionUnit.find(i => i.dictKey == this.getQuery.logpmUnit); - this.getQuery.logpmUnitName = q.dictValue; + this.getQuery.logpmUnitName =q?q.dictValue:null; // getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => { // console.log("<><>===", res.data.data); // const data = res.data.data; diff --git a/src/views/warehouse/warehouseStock/warehouseStock.vue b/src/views/warehouse/warehouseStock/warehouseStock.vue index 5a30762f..0cb2f1ff 100644 --- a/src/views/warehouse/warehouseStock/warehouseStock.vue +++ b/src/views/warehouse/warehouseStock/warehouseStock.vue @@ -77,6 +77,7 @@ import option from '@/option/warehouse/warehouseStock'; import { mapGetters } from 'vuex'; import { ElMessage } from 'element-plus' import { downloadXls,checkParams} from '@/utils/util'; +import dayjs from 'dayjs'; export default { data() { return { @@ -93,7 +94,6 @@ export default { sortable: false, head: false, }, - { prop: 'nodeName', label: '节点名称', @@ -105,9 +105,10 @@ export default { sortable: false, head: false, }, + { prop: 'scanNodeType', - label: '扫描详情', + label: '节点描述', type: 2, values: '', width: '130', @@ -116,6 +117,16 @@ export default { sortable: false, head: false, }, + { + prop: 'operatorTime', + label: '操作时间', + type: 4, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'serviceNumber', label: '服务号', @@ -283,16 +294,7 @@ export default { fixed: false, sortable: false, }, - { - prop: 'operatorTime', - label: '操作时间', - type: 6, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, + // { // prop: '', // label: '操作', @@ -485,18 +487,19 @@ checkParams(data, targetParam) { } }, - timesc(index, row) { // index = this.formatDate(index); - this.query[row.prop] = index; - console.log(checkParams(this.query, 'operatorTime'),'232323'); // 输出 true - if(checkParams(this.query, 'operatorTime')){ - ElMessage({ - message: '请携带其他任意参数', - type: 'warning', - }) - return + if (!!index) { + index = dayjs(index).format('YYYY-MM-DD'); } + this.query[row.prop] = index; + // if(checkParams(this.query, 'operatorTime')){ + // ElMessage({ + // message: '请携带其他任意参数', + // type: 'warning', + // }) + // return + // } this.onLoad(this.page); }, inputsc(index, row) { @@ -639,9 +642,9 @@ checkParams(data, targetParam) { const data = res.data.data; this.page.total = data.total; this.data = data.records; - - }).catch(()=>{ - + + }).catch(()=>{ + }).finally(()=>{ this.loading = false; }); diff --git a/vite.config.js b/vite.config.js index a73aa7ad..8e6d5d7c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,15 +15,17 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.126:8889', // hy // target: 'http://192.168.3.12:13000', + // cg + // target: 'http://192.168.3.18:13000', // lmy // target: 'http://192.168.10.123:8889', // target: 'http://192.168.10.101:8888', // 老zyc - // target: 'http://192.168.10.75:8777', + // target: 'http://192.168.10.75:8777', // 新zyc // target: 'http://192.168.6.116:8777', // target: 'http://192.168.6.122:8777', - // target: 'http://192.168.3.14:13000', + target: 'http://192.168.3.14:13000', // target: 'http://192.168.10.25:2888', // target: 'http://192.168.6.161:9777',//CY // target: 'http://192.168.10.57:13000', @@ -31,7 +33,7 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.29:13000', // target: 'http://192.168.3.5:13000',//？ // target: 'http://h5uapi.huitongys.com', - target: 'http://test.api.huo5you.com', + // target: 'http://test.api.huo5you.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), },