@@ -614,6 +660,30 @@
+
+
+
+
+
+
+
+ 查看详情
+
+
+
+
+
+
@@ -630,6 +700,7 @@ import {
$_savaSurveyRecord,
$_addProcessingResults,
$_getSurveyRecord,
+ $_getAbnormalPackage,
} from '@/api/aftersales/aftersalesWorkOrder';
import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
import { getToken } from '@/utils/auth';
@@ -656,6 +727,13 @@ const Msgtextarea = ref(''); //回复框消息
const msgState = ref(0); //回复消息状态
const Msgloading = ref(false); //消息回复的加载效果
const companyProportion = ref(0); //公司占比
+const HistoricalPackageList = ref([]); //历史包件数组
+const dialogHistoricalPackage=ref(false);//包件弹窗
+const HistoricalPackageinput=ref('');//历史包件选择
+const PackageInfo = ref([
+ //包件信息
+ { packageCode: '', orderCode: '', waybillNumber: '' },
+]);
// 提货责任方
const responsible = ref([
{
@@ -1184,6 +1262,47 @@ const amountMoney = () => {
console.log('收款总计金额', TotalamountReceived.value);
};
+// 添加包件
+const AddPackage = () => {
+ PackageInfo.value.push({ packageCode: '', orderCode: '', waybillNumber: '' });
+};
+// 包件移除
+const PackagRemoval = val => {
+ PackageInfo.value.splice(val, 1); //移除当前点击的按钮
+};
+// 查看历史包件
+const historicalPackages = val => {
+ dialogHistoricalPackage.value = true; //打开历史包件弹窗
+ HistorIndex.value = val;
+ console.log(val);
+};
+// 查询包件信息自动回显
+const ChangePackageInfo = (val, index) => {
+ let data = {
+ packageCode: val,
+ };
+ $_getAbnormalPackage(data).then(res => {
+ console.log(res, '包件信息');
+ console.log(res.data.data, '包件信息');
+
+ const packageData = res.data.data[0];
+ PackageInfo.value[index].orderCode = packageData.orderCode; //订单自编码
+ PackageInfo.value[index].waybillNumber = packageData.waybillNumber; //运单号
+ PackageInfo.value[index].orderId = packageData.orderId; //运单号
+ PackageInfo.value[index].state = false; //状态
+
+ if (res.data.data.length > 1) {
+ HistoricalPackageList.value = res.data.data;
+ PackageInfo.value[index].state = true; //状态
+ }
+ // packageCode; //包件码
+ // //订单自编码
+ // orderCode: orderId; //运单号
+ // workOrderId; //工单id
+ // workOrderNumber; //工单名称
+ console.log(PackageInfo.value, '处理好的参数');
+ });
+};
// 新视频预览
const AddVideoPreview = val => {
VideoPreviewStatus.value = true; //开启视频查看弹窗
@@ -1448,6 +1567,29 @@ const replyMessage = () => {
}
});
};
+
+// 历史包件里面的查看
+const ViewPackageDetails = val => {
+ if(!val){
+ ElMessage({
+ message: '请选择要查看的数据',
+ type: 'warning',
+ })
+ return
+ }
+ console.log(val);
+ let info = HistoricalPackageList.value.find(obj => obj.workOrderId == val);
+ console.log(info,'筛选的值');
+ $router.push({
+ path: '/aftersales/aftersalesWorkOrderInfo',
+ query: {
+ id: info.workOrderId,
+ name: info.workOrderId + '-信息查看',
+ routerState: 'view',
+ },
+ });
+ dialogHistoricalPackage.value = false; //打开历史包件弹窗
+};
diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
index a6c24102..aab34e96 100644
--- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
+++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
@@ -647,11 +647,11 @@ onMounted(() => {
initconfig();
initnumber();
});
-async function initnumber() {
- let res = await Alloclocationsnub();
- console.log(res.data.data);
- details.countnumber = res.data.data;
-}
+// async function initnumber() {
+// let res = await Alloclocationsnub();
+// console.log(res.data.data);
+// details.countnumber = res.data.data;
+// }
// watchEffect(()=>{
// if(details.isshowupt){
// details.inputtxts=''
@@ -666,8 +666,10 @@ async function initconfig() {
let res = await getstoreCargo();
details.arrlist = res.data.data;
console.log(details.arrlist, '仓库列表');
+
if (details.arrlist.length > 0) {
$_locationsnub({ warehouseId: details.arrlist[0].id }).then(res => {
+ details.countnumber =res.data.data
console.log('初始化仓库参数成功', res);
});
}
@@ -849,6 +851,7 @@ const checkcso = val => {
console.log(details.arrlist[val].id, '选择的ID-=====');
console.log(val, '货位接受参数');
$_locationsnub({ warehouseId: details.arrlist[val].id }).then(res => {
+ details.countnumber =res.data.data
console.log('切换请求成功', res);
});
if (details.arrlist[details.checkselect]?.warehouseGoodsAreaVOList.length > 0) {
diff --git a/vite.config.js b/vite.config.js
index eacdd94d..5b916f74 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,9 +23,10 @@ export default ({ mode, command }) => {
// 新zyc
// target: 'http://192.168.6.116:8777',
- target: 'http://192.168.6.122:8777',
+ // target: 'http://192.168.6.122:8777',
// target: 'http://192.168.6.116:8777',
- // tjj
+ // tjj :
+ target:'http://192.168.10.25:13000',
// sst
// target: 'http://192.168.10.94:8888',
// target: 'http://192.168.10.29:13000',