Browse Source

Merge branch 'dev' into pre-production

master
pref_mail@163.com 1 year ago
parent
commit
18949e9d47
  1. 2
      src/config/website.js
  2. 20
      src/views/aftersales/aftersalesWorkOrderAdd.vue
  3. 13
      src/views/distribution/inventory/delivery/distributionStockArticle.vue
  4. 27
      src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
  5. 11
      src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
  6. 31
      src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
  7. 60
      src/views/distribution/signfor/distributionSignforedt.vue
  8. 3
      vite.config.js

2
src/config/website.js

@ -5,7 +5,7 @@ export default {
title: '货无忧物流信息平台',
logo: 'S',
key: 'TWMS', //配置主键,目前用于存储
indexTitle: '货无 Admin',
indexTitle: '货无 Admin',
clientId: 'saber', // 客户端id
clientSecret: 'saber_secret', // 客户端密钥
tenantMode: true, // 是否开启租户模式

20
src/views/aftersales/aftersalesWorkOrderAdd.vue

@ -1002,16 +1002,16 @@ const ConfirmForm = () => {
delete DataSubmit.processor; //
console.log(DataSubmit, '处理好的数据');
// stringify
// $_submit(DataSubmit).then(res => {
// if (res.data.code == 200) {
// ElMessage({
// message: res.data.msg,
// type: 'success',
// });
// Indexform.value = {}; //
// $router.push('/aftersales/aftersalesWorkOrder'); //
// }
// });
$_submit(DataSubmit).then(res => {
if (res.data.code == 200) {
ElMessage({
message: res.data.msg,
type: 'success',
});
Indexform.value = {}; //
$router.push('/aftersales/aftersalesWorkOrder'); //
}
});
};
//
const changeDeliveryDriver=(val)=>{

13
src/views/distribution/inventory/delivery/distributionStockArticle.vue

@ -101,7 +101,7 @@
v-if="handler"
>修改服务类型</el-button
>
<el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
<el-button type="danger" icon="Download" @click="handleExport" plain
> </el-button
>
@ -626,17 +626,6 @@ export default {
isshowSummary: true,
sortable: true,
},
{
prop: 'availableQuantity',
label: '可用数量',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
isshowSummary: true,
sortable: true,
},
{
prop: 'notReceived',
label: '未入库数量',

27
src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@ -80,23 +80,13 @@
>
<!-- <el-button type="danger" icon="el-icon-delete" @click="handleMoke" v-if = "handler">转预约单</el-button>-->
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>-->
<el-button
type="danger"
icon="el-icon-delete"
@click="handleCallDelivery('3')"
v-if="handler"
<el-button type="danger" icon="Edit" @click="handleCallDelivery('3')" v-if="handler"
>修改客户信息</el-button
>
<el-button
type="danger"
icon="el-icon-delete"
@click="handleCallDelivery('2')"
v-if="handler"
<el-button type="danger" icon="Edit" @click="handleCallDelivery('2')" v-if="handler"
>修改服务类型</el-button
>
<el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
> </el-button
>
<el-button type="danger" icon="Download" @click="handleExport" plain> </el-button>
</div>
<!-- <div class="avue-crud__left">
<el-button type="primary" icon="el-icon-plus" @click="handlebill" v-if = "!handler">创建提货单</el-button>
@ -539,17 +529,6 @@ export default {
isshowSummary: true,
sortable: true,
},
{
prop: 'availableQuantity',
label: '可用数量',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
isshowSummary: true,
sortable: true,
},
{
prop: 'notReceived',
label: '未入库数量',

11
src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@ -555,17 +555,6 @@ export default {
isshowSummary: true,
sortable: true,
},
{
prop: 'availableQuantity',
label: '可用数量',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
isshowSummary: true,
sortable: true,
},
{
prop: 'notReceived',
label: '未入库数量',

31
src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@ -80,32 +80,22 @@
<el-button type="primary" icon="el-icon-plus" @click="handlebill" v-if="handler"
>创建提货单</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if="handler"
<el-button type="primary" icon="Position" @click="handleStockList" v-if="handler"
>批量转库存品</el-button
>
<el-button
type="danger"
icon="el-icon-delete"
@click="handleCallDelivery('3')"
v-if="handler"
<el-button type="danger" icon="Edit" @click="handleCallDelivery('3')" v-if="handler"
>修改客户信息</el-button
>
<el-button
type="danger"
icon="el-icon-delete"
@click="handleCallDelivery('2')"
v-if="handler"
<el-button type="danger" icon="Edit" @click="handleCallDelivery('2')" v-if="handler"
>修改服务类型</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1', '1')"
>通知提货</el-button
>
<el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1', '2')"
<el-button type="danger" icon="Plus" @click="handleCallDelivery('1', '2')"
>再次通知</el-button
>
<el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
> </el-button
>
<el-button type="danger" icon="Download" @click="handleExport" plain> </el-button>
</div>
<div class="avue-crud__left">
<!-- <el-button type="primary" icon="el-icon-plus" @click="handlebill" >创建提货单</el-button>-->
@ -684,17 +674,6 @@ export default {
isshowSummary: true,
sortable: true,
},
{
prop: 'availableQuantity',
label: '可用数量',
type: 2,
values: '',
width: '140',
checkarr: [],
fixed: false,
isshowSummary: true,
sortable: true,
},
{
prop: 'notReceived',
label: '未入库数量',

60
src/views/distribution/signfor/distributionSignforedt.vue

@ -386,8 +386,8 @@
height="500"
style="width: 100%"
ref="tableRef"
@select-all="selectAll"
@select="selectChange"
@select-all="qsselectAll"
@select="qsselectChange"
>
<el-table-column type="selection" width="55" fixed />
<el-table-column
@ -457,7 +457,7 @@
</el-tab-pane>
</template>
</el-tabs>
<span class="gx_num">勾选数量{{TcTemp.length}}</span>
<span class="gx_num">勾选数量{{sptemp.length}}</span>
</el-collapse-item>
</el-collapse>
@ -465,7 +465,7 @@
<el-collapse @change="ServiceChange" style="margin-top: 10px">
<el-collapse-item title="增值服务信息" name="2">
<el-tabs
v-loading="editLoading"
v-loading="ZCeditLoading"
element-loading-text="数据正在更新中..."
type="border-card"
@tab-click="tabClickB"
@ -476,7 +476,7 @@
<div class="BatchDelete">
<el-button type="primary" @click="newlyAdded(item.name)"> 新增 </el-button>
<el-button
v-if="TcTemp.length > 0"
v-if="ZCTableData.length > 0"
type="primary"
@click="BatchDelete(item.name)"
>
@ -580,6 +580,7 @@
</el-tab-pane>
</template>
</el-tabs>
<span class="gx_num">勾选数量:{{ZCTableData.length}}</span>
</el-collapse-item>
</el-collapse>
<!-- 增值服务弹窗信息 -->
@ -671,7 +672,7 @@
</template>
</el-table-column>
</el-table>
<span class="gx_num">勾选数量:{{TcTemp.length}}</span>
<template #footer>
<!-- 表格翻页功能 -->
<div class="demo-pagination-block">
@ -738,7 +739,7 @@
</template>
<script setup lang="ts">
import { ref } from 'vue';
import { ref ,computed} from 'vue';
import { useRoute, useRouter } from 'vue-router';
import {
getDetail,
@ -758,6 +759,7 @@ const RouterId = ref(null); //编辑ID
const RouterReservationId = ref(null); //
const DoorstepPhoto = ref([]); //
const StackingPhoto = ref([]); //
const sptemp=ref([]);//
const FragilePhotos = ref([]); //
const HomePhotos = ref([]); //
const SignForPhotos = ref([]); //
@ -789,6 +791,7 @@ const active = ref(1); //签收状态
const route = useRoute();
const router = useRouter(); //ID
const dataAdded = ref([]); //
const ZCeditLoading=ref(false);//
const TcDataAdded = ref([]); //
// const TabIndex = ref(0); //
const TCeditLoading = ref(false); //Load
@ -803,6 +806,7 @@ const TcZcInput = ref({}); //增值服务距离费用包间确认信息
const TcTemp = ref([]); //
const TcData = ref([]); //
const state = ref(false); //
const ZCTableData = ref([]); //
const ServiceRadioSelection = ref([]); //
const TabInfo = ref(null); //
const addvalueDetailId = ref(null); //
@ -825,15 +829,7 @@ const srcListB=ref([])
const srcListC=ref([])
const srcListD=ref([])
const srcListE=ref([])
const srcList = [
'https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg',
'https://fuss10.elemecdn.com/1/34/19aa98b1fcb2781c4fba33d850549jpeg.jpeg',
'https://fuss10.elemecdn.com/0/6f/e35ff375812e6b0020b6b4e8f9583jpeg.jpeg',
'https://fuss10.elemecdn.com/9/bb/e27858e973f5d7d3904835f46abbdjpeg.jpeg',
'https://fuss10.elemecdn.com/d/e6/c4d93a3805b3ce3f323f7974e6f78jpeg.jpeg',
'https://fuss10.elemecdn.com/3/28/bbf893f792f03a54408b3b7a7ebf0jpeg.jpeg',
'https://fuss10.elemecdn.com/2/11/6535bcfb26e4c79b48ddde44f4b6fjpeg.jpeg',
]
const srcList = []
const Tabs = ref([
{
label: '订单列表',
@ -1785,6 +1781,7 @@ const selectable = (row, index) => {
};
//
const newlyAdded = val => {
TcTemp.value=[];//
let menData = menuDataB1.value.slice(0, -1); //menuDataB1.value
menuDataB.value = menData; //
dialogBatchDelete.value = true; //
@ -1820,6 +1817,16 @@ const addedSubmission = val => {
ConfirmationInformation.value = true; //
};
const qsselectAll=(select)=>{
console.log(select,'商品全选');
sptemp.value=select
}
const qsselectChange=(select)=>{
console.log(select,'商品单选');
sptemp.value=select
}
//
const cancellation = val => {
if (!Array.isArray(val)) {
@ -1849,7 +1856,7 @@ const cancellation = val => {
ZcBtnDis.value = true; //使
//
TcData.value = []; //
TcTemp.value = []; //
ZCTableData.value = []; //
}
});
};
@ -1858,7 +1865,7 @@ const cancellation = val => {
const BatchDelete = row => {
ElMessageBox.confirm('是否取消包件数?')
.then(() => {
cancellation(TcTemp.value);
cancellation(ZCTableData.value);
})
.catch(() => {
// catch error
@ -1868,6 +1875,7 @@ const BatchDelete = row => {
const TzClose = () => {
menuDataB.value = menuDataB1.value; //
TcZcInput.value = {}; //
};
//
const DeleteEvent = row => {
@ -1888,14 +1896,14 @@ const DataSelectAll = (select, val) => {
});
ZcBtnDis.value = false; //
}
TcTemp.value = select; //
ZCTableData.value = select; //
console.log(select, val);
};
//
const ZcSelectChange = (select, val) => {
val.checkbox = !val.checkbox;
TcTemp.value = select; //
if (select.length > 1) {
ZCTableData.value = select; //
if (select.length > 0) {
ZcBtnDis.value = false; //使
} else {
ZcBtnDis.value = true; //
@ -2075,7 +2083,7 @@ function InventoryList() {
}
//
const tabClick = val => {
TcTemp.value=[];//
sptemp.value=[];//
switch (val.props.name) {
case '0':
console.log(data.value, 'datavalue');
@ -2104,14 +2112,13 @@ const valueAddedServices = val => {
TabTitle.value[1].value = '暂无数据'; //
TabTitle.value[2].value = '暂无数据'; //
TabTitle.value[3].value = '暂无数据'; //
editLoading.value = true; //
ZCeditLoading.value = true; //
addvalueInfoList({
addvalueId: val,
signforId: RouterId.value,
reservationId: RouterReservationId.value,
}).then(res => {
editLoading.value = false; //
editLoading.value = false; //
ZCeditLoading.value = false; //
console.log(res, '增值服务上楼的返回值');
if (res.data.data) {
if (res.data.data.addvalueDetailId) {
@ -2140,11 +2147,12 @@ const ServiceChange = val => {
};
//
const TitleBarSwitch = data => {
ZCTableData.value=[];//
TcServices.value = data.props.label; //
TcIndex.value = Number(data.props.name); //tab
TcIndex.value++;
console.log(TcIndex.value, '当前的tab下标');
editLoading.value = true; //
ZCeditLoading.value = true; //
if (data.props.name == 0) {
menuDataB.value = menuDataB1.value;
valueAddedServices(1);

3
vite.config.js

@ -23,9 +23,6 @@ export default ({ mode, command }) => {
// target: 'http://192.168.6.122:8777',
// target: 'http://192.168.10.57:13000',
// target: 'http://192.168.6.122:8777',
// target: 'http://192.168.6.116:8777',
// tjj
// sst
// target: 'http://192.168.10.94:8888',
// target: 'http://192.168.10.29:13000',
// target: 'http://h5uapi.huitongys.com',

Loading…
Cancel
Save