Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

1 year ago · 71e7575e2c
4 changed files with 195 additions and 28 deletions
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@ -1531,6 +1531,49 @@ export default [
    ],
  },

+
+
+// {
+//   // 这是父路由，财务主页面
+//   path: '/financialsector/FinanceHome',
+//   component: Layout,
+//   redirect: '/financialsector/FinanceHome',
+//   children: [
+//     {
+//       // 这是父页面的默认视图
+//       meta: {
+//         i18n: 'dict',
+//         keepAlive: false,
+//       },
+//       path: '/financialsector/FinanceHome', 
+//       name: '财务', 
+//       component: () => import('@/views/financialsector/FinanceHome.vue'),
+//     },
+//     {
+//       // 子页面
+//       meta: {
+//         i18n: 'dict',
+//         keepAlive: false,
+//       },
+//       path: '/financialsector/Financialse/FinancialWarehousing',
+//       name: '新增模板',
+//       component: () => import('@/views/financialsector/Financialse/FinancialWarehousing.vue'),
+//     },
+//   ],
+// },
+
+
+
+
+
+
+
+
+
+
+
+
+
  // {
  //   path: '/aftersales/aftersalesWorkOrderSS',
  //   component: Layout,
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@ -28,17 +28,21 @@
                  remote
                  :loading='sjloading'
                  loading-text='正在加载中'
+              
                >
                  <el-option-group
                    v-for="group in StockInfo.DriverInformation"
                    :key="group.id"
                    :label="group.label"
+                
+                    
                  >
                    <el-option
                      v-for="item in group.options"
                      :key="item.id"
                      :label="item.name"
                      :value="item.id"
+                      :disabled="item.display"
                    />
                  </el-option-group>
                </el-select>
@ -1026,9 +1030,14 @@ Info(); //页面初始化获取车辆和司机信息
 // arr1 传入需要匹配的
 // arr2进行匹配的
 function CurrentVehicle(arr1, arr2) {
+  console.log(arr1,'arr1====>');
+  console.log(arr2,'arr2====>');
+  
  const matchedArray = [];
  arr1.forEach(id => {
    const matchedItem = arr2.find(item => item.id === id);
+    console.log(matchedItem,'matchedItem');
+    
    if (matchedItem) {
      matchedArray.push(matchedItem);
    }
@ -2587,22 +2596,44 @@ const Outsourcing = val => {

 };
 // 选择司机触发
-const SJchangeSelect = val => {
-  if (!val.length) {
-    DataSubmit.value.masterDriverName = null; //清空司机信息
-    StockInfo.value.VehicleInformation[1].options = vehicle.value; //初始化车辆
-    return;
-  }
+  const    SJchangeSelect = async (val) => {
+  console.log(val,'司机接受的参数Val');
  if (val.length) {
-    let SJname = null; //用来少选第一选择的司机名称
-    SJname = CurrentVehicle(val, StockInfo.value.DriverInformation[1].options);
-    
+    let SJname = null; //用来筛选第一选择的司机名称
+    console.log(StockInfo.value.DriverInformation[1].options,'StockInfo.value.DriverInformation[1].options首次');
+    SJname = await CurrentVehicle(val, StockInfo.value.DriverInformation[1].options);//司机信息
+    console.log(SJname,'SJname');
+    if(!SJname.length){
+    ElMessage({
+    message: '选择司机不属于当前仓库,或者没有维护关系，请重新选择司机',
+    type: 'warning',
+    }) 
+    DataSubmit.value.masterDriverName='';//清空主司机    
+    return
+    }
+    if(SJname.length){
+      if(SJname[0].vehicleVOList){
+      if(SJname[0].vehicleVOList.length===1 &&  !StockInfo.value.Cl.length){
+        //带出来的车辆如果只有1辆并且车辆没有选择值，就直接进行带出赋值
+      StockInfo.value.Cl.push(SJname[0].vehicleVOList[0].id);//输入框赋值
+      DataSubmit.value.masterVehicleNub = SJname[0].vehicleVOList[0].vehicleNub; //主车牌赋值
+      CLchangeSelect([SJname[0].vehicleVOList[0].id])
+    }else{
+      // 如果存在多辆车展开输入框自己选择
+      clSelect.value[0].visible = true; // 展开车辆下拉框
+    }
+    }
+    }
+
+
+    console.log(StockInfo.value.Cl,'StockInfo.value.Cl')
    DataSubmit.value.masterDriverName = SJname[0].name;
    let data = []; //存储函数筛选后的司机车辆信息
    let dataInfo = []; //临时存储的司机车辆信息
    let SjData = []; //临时存放司机信息
    //   CurrentVehicle()方法 传入ID可以匹配出数组里面对应的数据
    data = CurrentVehicle(val, StockInfo.value.DriverInformation[1].options);
+    console.log(data,'筛选出来的司机')
    if (data) {
      data.forEach(item => {
        SjData.push({
@ -2628,29 +2659,41 @@ const SJchangeSelect = val => {
      //VehicleInformation[0] 存储的是当下司机名下所有车辆信息
      StockInfo.value.VehicleInformation[0].options = dataInfo;
    }
+  }else{
+    DataSubmit.value.masterDriverName = null; //清空司机信息
+    StockInfo.value.VehicleInformation[1].options = vehicle.value; //初始化车辆
+    StockInfo.value.VehicleInformation[0].options = []; //清空当前车辆
  }
+  StockInfo.value.VehicleInformation[1].options= removeDuplicatesById(StockInfo.value.VehicleInformation[1].options)
 };

 // 选择车辆触发
-const CLchangeSelect = val => {
-  if (!val.length) {
-    StockInfo.value.DriverInformation[1].options = driver.value; //初始化司机信息
-    DataSubmit.value.masterVehicleNub = null; //清空司机牌照
-    return;
-  }
-  // 接收一个车辆ID 用于查询车辆车牌
+const CLchangeSelect = async val => {
+
+
+  if (val.length) {
+      // 接收一个车辆ID 用于查询车辆车牌
  let data = [];
  let dataInfo = []; //临时存储的当前车辆的所有司机信息
  let ClData = []; //临时存放车辆信息
  let ClName = null; //用来筛选第一选择的车牌信息
-  if (val.length) {
-    ClName = CurrentVehicle(val, StockInfo.value.VehicleInformation[1].options);
+  ClName = await CurrentVehicle(val, StockInfo.value.VehicleInformation[1].options);
+  if(await !ClName.length){
+    ElMessage({
+    message: '查询失败请重试',
+    type: 'warning',
+    })  
+    DataSubmit.value.masterVehicleNub='';//清空主车辆
+    return
+    }
+    sjSelect.value[0].visible = true; // 展开司机下拉框
+
    DataSubmit.value.masterVehicleNub = ClName[0].vehicleNub; //处理好的车牌
    data = CurrentVehicle(val, StockInfo.value.VehicleInformation[1].options);
    console.log(data, '返回的值===');
-
    //   处理从车辆 信息 获取车辆的ID和车牌号
    if (data) {
+      console.log(data,'data===>');
      data.forEach(item => {
        ClData.push({
          vehicleId: item.id, //车辆ID
@ -2667,17 +2710,38 @@ const CLchangeSelect = val => {
      data.forEach(item => {
        // 防止有些车辆下面没有绑定司机
        if (item.driverArteryEntityList) {
-          item.driverArteryEntityList.forEach(item => {
+          if(item.driverArteryEntityList.length){
+            item.driverArteryEntityList.forEach(item => {
            dataInfo.push(item);
            console.log(item, 'itemInfo解析');
          });
+          }
+       
        }
      });
      dataInfo = removeDuplicatesById(dataInfo); //对当前选择的车辆司机去重
      console.log(dataInfo, 'dataInfo信息');
      StockInfo.value.DriverInformation[0].options = dataInfo; // 把去重后的值赋值给当前车辆下面的司机
+      console.log(StockInfo.value.DriverInformation,'司机触发查看');
+
+
+// 判断打带出来的司机是否属于本仓库，如不属于不可选中！
+    StockInfo.value.DriverInformation[0].options.forEach(item => {
+    // 检查该对象的 id 是否存在于 全部数组中
+    const exists = StockInfo.value.DriverInformation[1].options.some(btcItem => btcItem.id === item.id);
+    // 如果不存在于则给该对象添加 display 属性并设置为 true
+    if (!exists) {
+        item.display = true;
+    }
+      });
    }
+  }else{
+    StockInfo.value.DriverInformation[1].options = driver.value; //初始化司机信息
+    StockInfo.value.DriverInformation[0].options=[];//清空当前司机
+    console.log( StockInfo.value.DriverInformation,' StockInfo.value.DriverInformation');
+    DataSubmit.value.masterVehicleNub = null; //清空司机牌照
  }
+  StockInfo.value.DriverInformation[1].options= removeDuplicatesById(StockInfo.value.DriverInformation[1].options);//去重
 };

 // 合并司机和车辆信息
@ -2740,6 +2804,9 @@ const merge = (val, kindS) => {
  }
  //   判读司机配置是否选择完整
  if (DriverTemporaryStorage.value.length != VehicleTemporaryStorage.value.length) {
+    console.log(DriverTemporaryStorage.value,'DriverTemporaryStorage.value');
+    console.log(VehicleTemporaryStorage.value,'VehicleTemporaryStorage.value');
+    
    ElMessage({
      message: '司机配置未选择完整!',
      type: 'warning',
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@ -31,42 +31,78 @@
        </el-select>
      </div>
    </div>
+
+    <!-- 模板内容 -->
+    <div class="content">
+      <el-tabs type="border-card">
+        <template v-for="item in ServiceList" :key="item.label">
+          <el-tab-pane v-if="item.state" :label="item.label" >
+            <span v-if="item.label == '提货'">提货</span>
+            <span v-if="item.label == '干线'">干线</span>
+            <span v-if="item.label == '仓储'"><FinancialWarehousing :templateData="templateInfo"/></span>
+            <span v-if="item.label == '配送'">配送</span>
+            <span v-if="item.label == '安装'">安装</span>
+          </el-tab-pane>
+        </template>
+      </el-tabs>
+    </div>
  </div>
 </template>

 <script setup>
-import { ref } from 'vue';
+
+import { ref, defineAsyncComponent } from 'vue';
+
+const FinancialWarehousing = defineAsyncComponent(() =>
+  import('@/views/financialsector/Financialse/FinancialWarehousing.vue')
+);
 const form = ref({});
+const tabNum=ref('干线')
+const templateInfo=ref({
+  name:'参数'
+})
 const ServiceList = ref([
  {
    label: '提货',
    value: '1',
+    state: false,
+    check: false,
  },
  {
    label: '干线',
    value: '2',
+    state: false,
+    check: false,
  },
  {
    label: '仓储',
    value: '3',
+    state: false,
+    check: false,
  },
  {
    label: '配送',
    value: '4',
+    state: false,
+    check: false,
  },
  {
    label: '安装',
    value: '5',
+    state: false,
+    check: false,
  },
 ]);
+// 点击菜单
 const isChecked = val => {
-  console.log(val);
+  console.log(val,'点击的');
+  val.state=!val.state
+};
+// 点击移除
+const removeTag = value => {
+  ServiceList.value.find(res => res.value == value).check  = false;
+  ServiceList.value.find(res => res.value == value).state  = false;
 };
-const removeTag=(value) =>{
-console.log(value,'value');
-ServiceList.value.find(res=>res.value==value).check=false
-}
-
 </script>

 <style scoped lang="scss">
@ -75,15 +111,25 @@ ServiceList.value.find(res=>res.value==value).check=false
  height: 100%;
 }
 .header {
+  border-bottom: 1px solid #ccc;
+  padding: 10px;
+  box-shadow: -1px -1px 3px;
  .el_Template {
+    display: flex;
+    align-items: center;
    .name {
      font-size: 16px;
+      margin-right: 10px;
    }
  }
  display: flex;
  .el_Service {
    margin-left: 30px;
-
+    display: flex;
+    align-items: center;
+    .name {
+      margin-right: 10px;
+    }
    .el-checkbox {
      width: 100% !important;
      padding: 0 30px;
@ -113,4 +159,7 @@ ServiceList.value.find(res=>res.value==value).check=false
  content: '';
  display: none;
 }
+.content {
+  margin-top: 6px;
+}
 </style>
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@ -237,9 +237,17 @@
 </template>

 <script setup>
+
 import { ref } from 'vue';
+import { defineProps } from 'vue';
+// 接收参数
+const props = defineProps({
+  templateData: Object 
+});
+console.log(props,'来自父页面参数');
 const Storageloading = ref(false); //仓储品类加载
 const goriesloading = ref(false); //仓储品类加载
+console.log('仓储子页面');
 const form = ref({
  CalculationBasis: '1', // 计算基准
  Distinguishcategories: '1', //是否区分品类