Browse Source

修复商配不能编辑。修复已知bug

dev
马远东 1 month ago
parent
commit
6dbb7a5c71
  1. 3
      package.json
  2. 6
      src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue
  3. 1
      src/views/distribution/checkInventoryTask/createTask.vue
  4. 17
      src/views/distribution/turndelivery/deliveryDiscuss.vue

3
package.json

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

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

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

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

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

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

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

Loading…
Cancel
Save