Browse Source

Merge branch 'dev' into pre-production

pre-production
pref_mail@163.com 7 months ago
parent
commit
f47a929c19
  1. 3
      package.json
  2. 2
      src/views/Pricesystem/PricesyHome.vue
  3. 24
      src/views/aftersales/aftersalesWorkOrderAddCopy.vue
  4. 21
      src/views/aftersales/aftersalesWorkOrderInfo.vue
  5. 4
      src/views/aftersales/aftersalesWorkOrderend.vue
  6. 4
      src/views/basicdata/brand/basicZonePriceFrom.vue
  7. 6
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  8. 1
      src/views/distribution/checkInventoryTask/createTask.vue
  9. 7
      src/views/distribution/reservation/reservationAddFrom.vue
  10. 2
      src/views/distribution/signdetail/distributionSigndetail.vue
  11. 23
      src/views/distribution/turndelivery/deliveryDiscuss.vue
  12. 3
      src/views/financialsector/FinanceHome.vue
  13. 5
      src/views/mail/order/list.vue

3
package.json

@ -6,8 +6,7 @@
"prod": "vite --mode production", "prod": "vite --mode production",
"build": "vite build", "build": "vite build",
"build:prod": "vite build --mode production", "build:prod": "vite build --mode production",
"serve": "vite preview --host", "serve": "vite preview --host"
"type": "module"
}, },
"dependencies": { "dependencies": {
"@antfu/utils": "^0.7.2", "@antfu/utils": "^0.7.2",

2
src/views/Pricesystem/PricesyHome.vue

@ -248,6 +248,7 @@ const handleClick = (tab, event) => {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding: 10px; padding: 10px;
box-shadow: -1px -1px 3px; box-shadow: -1px -1px 3px;
display: flex;
.el_Template { .el_Template {
display: flex; display: flex;
align-items: center; align-items: center;
@ -256,7 +257,6 @@ const handleClick = (tab, event) => {
margin-right: 10px; margin-right: 10px;
} }
} }
display: flex;
.el_Service { .el_Service {
margin-left: 30px; margin-left: 30px;
display: flex; display: flex;

24
src/views/aftersales/aftersalesWorkOrderAddCopy.vue

@ -2013,13 +2013,13 @@ const isShowFormItem4 = computed(() => {
} }
} }
.ResponsibilityBoxS { .ResponsibilityBoxS {
.el_packBtn {
margin-top: 10px;
}
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-bottom: 10px; margin-bottom: 10px;
.el_packBtn {
margin-top: 10px;
}
.leftbox { .leftbox {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
@ -2031,11 +2031,9 @@ const isShowFormItem4 = computed(() => {
align-items: center; align-items: center;
width: 30%; width: 30%;
margin-right: 20px; margin-right: 20px;
:deep(.el-form-item) { :deep(.el-form-item) {
margin: 0; margin: 0;
margin-right: 10px; margin-right: 10px;
font-size: 12px; font-size: 12px;
.el-form-item__label { .el-form-item__label {
margin: 0; margin: 0;
@ -2065,8 +2063,6 @@ const isShowFormItem4 = computed(() => {
margin-bottom: 10px; margin-bottom: 10px;
width: 100%; width: 100%;
border-left: none; border-left: none;
.el-tabs__header {
}
.el-tabs__content { .el-tabs__content {
padding-top: 0; padding-top: 0;
} }
@ -2118,9 +2114,7 @@ const isShowFormItem4 = computed(() => {
align-items: center; align-items: center;
padding-left: 10px; padding-left: 10px;
} }
:deep(.el-card__body) {
// margin-bottom: 50px;
}
:deep(.el-upload-dragger) { :deep(.el-upload-dragger) {
display: flex; display: flex;
align-items: center; align-items: center;
@ -2255,11 +2249,7 @@ const isShowFormItem4 = computed(() => {
margin-bottom: 0 !important; margin-bottom: 0 !important;
margin: 5px 0 !important; margin: 5px 0 !important;
} }
:deep(.el_Exception) {
.el-form-item__content {
// width: 120px !important;
}
}
:deep(.el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before) { :deep(.el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before) {
color: #ff0000; color: #ff0000;
} }
@ -2273,7 +2263,5 @@ const isShowFormItem4 = computed(() => {
.page_loading { .page_loading {
height: 100%; height: 100%;
} }
.el_btn_remove {
// padding-top: 6px;
}
</style> </style>

21
src/views/aftersales/aftersalesWorkOrderInfo.vue

@ -10,7 +10,7 @@
<el-form :model="Indexform" class="IndexFrom" ref="IndexForm" disabled> <el-form :model="Indexform" class="IndexFrom" ref="IndexForm" disabled>
<div class="el_top"> <div class="el_top">
<el-form-item label="异常类型" class="el_inputTop"> <el-form-item label="异常类型" class="el_inputTop">
<el-select v-model="Indexform.workOrderType"> <el-select v-model="Indexform.workOrderType" style="width: 240px;">
<el-option <el-option
v-for="item in IndexException" v-for="item in IndexException"
:key="item.value" :key="item.value"
@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item label="发现节点" class="el_inputTop"> <el-form-item label="发现节点" class="el_inputTop">
<el-select v-model="Indexform.discoveryNode"> <el-select v-model="Indexform.discoveryNode" style="width: 240px;">
<el-option <el-option
v-for="item in DiscoveringNodes" v-for="item in DiscoveringNodes"
:key="item.value" :key="item.value"
@ -1943,18 +1943,15 @@ const ResultDetermination = () => {
} }
} }
.el_zb { .el_zb {
width: 250px;
text-align: right;
:deep(.el-input__inner) { :deep(.el-input__inner) {
text-align: center; text-align: center;
} }
width: 250px;
text-align: right;
:deep(.el-input) { :deep(.el-input) {
margin-left: 10px; margin-left: 10px;
text-align: right; text-align: right;
} }
:deep(.el-form-item__content) { :deep(.el-form-item__content) {
flex-wrap: nowrap; flex-wrap: nowrap;
} }
@ -2025,9 +2022,7 @@ const ResultDetermination = () => {
:deep(.el-form-item) { :deep(.el-form-item) {
margin: 0; margin: 0;
margin-right: 10px; margin-right: 10px;
font-size: 12px; font-size: 12px;
.el-form-item__label { .el-form-item__label {
margin: 0; margin: 0;
} }
@ -2079,14 +2074,6 @@ const ResultDetermination = () => {
width: 100%; width: 100%;
border-left: none; border-left: none;
border-right: none; border-right: none;
.el-tabs__header {
}
.el-tabs__content {
// padding-right: 0;
}
.is-active { .is-active {
font-weight: bold; font-weight: bold;
} }

4
src/views/aftersales/aftersalesWorkOrderend.vue

@ -10,7 +10,7 @@
<el-form :model="endFrom"> <el-form :model="endFrom">
<div class="el_top"> <div class="el_top">
<el-form-item label="异常类型" class="el_inputTop"> <el-form-item label="异常类型" class="el_inputTop">
<el-select v-model="endFrom.workOrderType" disabled> <el-select v-model="endFrom.workOrderType" disabled style="width: 240px;">
<el-option <el-option
v-for="item in IndexException" v-for="item in IndexException"
:key="item.value" :key="item.value"
@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item label="发现节点" class="el_inputTop"> <el-form-item label="发现节点" class="el_inputTop">
<el-select v-model="endFrom.discoveryNode" disabled> <el-select v-model="endFrom.discoveryNode" disabled style="width: 240px;">
<el-option <el-option
v-for="item in DiscoveringNodes" v-for="item in DiscoveringNodes"
:key="item.value" :key="item.value"

4
src/views/basicdata/brand/basicZonePriceFrom.vue

@ -837,12 +837,12 @@ export default {
} }
.el_chexk_item{ .el_chexk_item{
width: 20%; width: 20%;
.el-checkbox__label{ margin-right: 12%;
.el-checkbox__label{
width: 100%; width: 100%;
.el-input{ .el-input{
width: 100%; width: 100%;
} }
} }
margin-right: 12%;
} }
</style> </style>

6
src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@ -11,6 +11,7 @@
class="" class=""
placeholder="请选择仓库" placeholder="请选择仓库"
@change="checkcso" @change="checkcso"
style="width: 200px"
> >
<el-option <el-option
v-for="(item, index) in arrlist" v-for="(item, index) in arrlist"
@ -25,6 +26,7 @@
v-model="checkregionselect" v-model="checkregionselect"
class="regionsele" class="regionsele"
placeholder="请选择区域" placeholder="请选择区域"
style="width: 200px"
@change="checkregion" @change="checkregion"
> >
<el-option <el-option
@ -2833,6 +2835,7 @@ const {
.el-sel { .el-sel {
display: flex !important; display: flex !important;
align-items: center; align-items: center;
width: 50%;
:deep(.el-select) { :deep(.el-select) {
height: 32px; height: 32px;
.el-input { .el-input {
@ -2843,12 +2846,13 @@ const {
.el-sel-title { .el-sel-title {
font-size: 17px; font-size: 17px;
margin-right: 10px; margin-right: 10px;
width:10%;
} }
.el-sel-title:nth-of-type(2) { .el-sel-title:nth-of-type(2) {
margin-left: 20px; margin-left: 20px;
} }
.el-exp { .el-exp {
width: 110px; width:200px;
height: 32px; height: 32px;
border: 1px solid #d3832a; border: 1px solid #d3832a;
display: flex; display: flex;

1
src/views/distribution/checkInventoryTask/createTask.vue

@ -87,6 +87,7 @@
v-model="item.values" v-model="item.values"
:placeholder="`请输入${item.label}`" :placeholder="`请输入${item.label}`"
/> />
<span v-else></span>
</template> </template>
<template #default="props"> <template #default="props">

7
src/views/distribution/reservation/reservationAddFrom.vue

@ -3594,11 +3594,12 @@ input[type='number'] {
height: 60px; height: 60px;
} }
.el_sumS { .el_sumS {
display: flex;
width: 200px;
height: 20px;
span { span {
width: 100px; width: 100px;
} }
display: flex;
height: 20px;
width: 200px;
} }
</style> </style>

2
src/views/distribution/signdetail/distributionSigndetail.vue

@ -7,7 +7,7 @@
<div class="fr-fo"> <div class="fr-fo">
<el-form-item label="类型:"> <el-form-item label="类型:">
<el-select v-model="searchType" placeholder="请选择搜索类型" @change="changetypesof"> <el-select v-model="searchType" placeholder="请选择搜索类型" @change="changetypesof" style="width:200px">
<el-option <el-option
v-for="item in searchTypeDate" v-for="item in searchTypeDate"
:key="item.value" :key="item.value"

23
src/views/distribution/turndelivery/deliveryDiscuss.vue

@ -818,6 +818,8 @@ const VehicleInformationCopy=ref([]);//拷贝司机信息
const StockInfo = ref({ const StockInfo = ref({
createDate: new Date(), // createDate: new Date(), //
radio: 1, radio: 1,
Cl:[],
Sj:[],
// //
DriverInformation: [ DriverInformation: [
{ {
@ -1757,9 +1759,7 @@ const wrap = ref([
}, },
]); ]);
// //
function onLoad() {
loading.value = true; //
}
statisticsList.value = menuData.value.filter(item => item.statistics); // statisticsList.value = menuData.value.filter(item => item.statistics); //
console.log(statisticsList.value, '需要统计的字段'); console.log(statisticsList.value, '需要统计的字段');
@ -1808,26 +1808,29 @@ onMounted(() => {
driverName: item.driverName, // driverName: item.driverName, //
driverPhone: item.driverPhone, // driverPhone: item.driverPhone, //
}); });
console.log(DriverTemporaryStorage.value,'处理好的司机');
chooseDriverIds.value.push(item.driverId); chooseDriverIds.value.push(item.driverId);
VehicleTemporaryStorage.value.push({ VehicleTemporaryStorage.value.push({
vehicleId: item.vehicleId, //ID vehicleId: item.vehicleId, //ID
vehicleNub: item.vehicleNub, // vehicleNub: item.vehicleNub, //
}); });
chooseCarIds.value.push(item.vehicleId); chooseCarIds.value.push(item.vehicleId);
// //
StockInfo.value.Sj.push(item.driverId); StockInfo.value.Sj.push(item.driverId);
// //
StockInfo.value.Cl.push(item.vehicleId); StockInfo.value.Cl.push(item.vehicleId);
if (item.isMaster == 2) { if (item.isMaster == 2) {
DataSubmit.value.masterDriverName = item.driverName; // DataSubmit.value.masterDriverName = item.driverName; //
DataSubmit.value.masterVehicleNub = item.vehicleNub; // DataSubmit.value.masterVehicleNub = item.vehicleNub; //
} }
}); });
} }
} }
console.log(res.data.data,'123');
wrapDataInfo.value = res.data.data.stockArticleList||''; // wrapDataInfo.value = res.data.data.stockArticleList||''; //
dataInfo.value = res.data.data.stockArticleList||''; // dataInfo.value = res.data.data.stockArticleList||''; //
@ -1840,7 +1843,7 @@ onMounted(() => {
if(!res.data.data.stockupInfo){ if(!res.data.data.stockupInfo){
return return
} }
DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftName||''; // DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftId||''; //
DataSubmit.value.stockup.forkliftId = res.data.data.stockupInfo.forkliftId||''; //ID 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.goodsAreaName = res.data.data.stockupInfo.stockupArea||''; //
@ -1852,7 +1855,7 @@ onMounted(() => {
}).catch(()=>{ }).catch(()=>{
}).finally(()=>{ }).finally(()=>{
editLoading.value = false; // editLoading.value = false; //
}); });
} }
}); });
@ -2923,7 +2926,7 @@ const Outsourcing = val => {
if(SJname.length){ if(SJname.length){
if(SJname[0].vehicleVOList){ if(SJname[0].vehicleVOList){
if(SJname[0].vehicleVOList.length===1 && !StockInfo.value.Cl.length){ if(SJname[0].vehicleVOList.length===1 && !StockInfo.value.Cl.length){
//1 //1
StockInfo.value.Cl.push(SJname[0].vehicleVOList[0].id);// StockInfo.value.Cl.push(SJname[0].vehicleVOList[0].id);//
DataSubmit.value.masterVehicleNub = SJname[0].vehicleVOList[0].vehicleNub; // DataSubmit.value.masterVehicleNub = SJname[0].vehicleVOList[0].vehicleNub; //
CLchangeSelect([SJname[0].vehicleVOList[0].id]) CLchangeSelect([SJname[0].vehicleVOList[0].id])
@ -3327,7 +3330,7 @@ sjInput.value=''
<style lang="scss" scoped> <style lang="scss" scoped>
.orderPage, .orderPage,
.orderPageS { .orderPageS {
height: 100%; height: auto;
:deep(.el-form) { :deep(.el-form) {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;

3
src/views/financialsector/FinanceHome.vue

@ -337,6 +337,7 @@ const handleChange = () => {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
padding: 10px; padding: 10px;
box-shadow: -1px -1px 3px; box-shadow: -1px -1px 3px;
display: flex;
.el_Template { .el_Template {
display: flex; display: flex;
align-items: center; align-items: center;
@ -345,7 +346,7 @@ const handleChange = () => {
margin-right: 10px; margin-right: 10px;
} }
} }
display: flex;
.el_Service { .el_Service {
margin-left: 30px; margin-left: 30px;
display: flex; display: flex;

5
src/views/mail/order/list.vue

@ -1341,6 +1341,11 @@ export default {
this.query.typeService = 2; this.query.typeService = 2;
$_clientList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( $_clientList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
res => { res => {
console.log(res,'res');
if(!res.data){
this.loading = false;
return;
}
const data = res.data.data; const data = res.data.data;
this.page.total = data.total; this.page.total = data.total;
this.data = data.records; this.data = data.records;

Loading…
Cancel
Save