From 3b272cd19172e16a26006ad268b052f36ce8c75c Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 1 Mar 2024 10:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E9=85=8D=E5=A4=96=E5=8D=8F=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8F=B8=E6=9C=BA=EF=BC=8C=E5=8F=B8=E6=9C=BA=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D=EF=BC=8C=E8=BD=A6=E8=BE=86=E8=BD=A6=E7=89=8C=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/basicdataWarehouseTemp.vue      | 44 ++++++++++++++++---
 .../turndelivery/deliveryDiscuss.vue          | 27 ++++++++++++
 vite.config.js                                |  1 -
 3 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
index 72130622..537571f9 100644
--- a/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
+++ b/src/views/basicdata/warehouse/warehouse/basicdataWarehouseTemp.vue
@@ -108,7 +108,9 @@
         </el-form-item>
 
         <el-form-item label="所属部门">
-          <el-input v-model="Addform.name" placeholder="请选择所属部门" />
+          <avue-tree :option="AffiliationList"
+             v-model="Addform.bm">
+          </avue-tree>
         </el-form-item>
 
         <el-form-item label="仓库类型">
@@ -337,8 +339,8 @@ dictionary();
 // 页面初始化
 const onLoad = val => {
   let data = {
-    current: page.currentPage,
-    size: page.pageSize,
+    current: details.page.currentPage,
+    size: details.page.pageSize,
     ...val,
   };
   details.loadingObj.list = true; //开启表格加载
@@ -362,12 +364,12 @@ const onLoad = val => {
 onLoad();
 // 每页多少条
 const sizeChange = val => {
-  page.pageSize = val;
+  details.page.pageSize = val;
   onLoad();
 };
 /** 页码改变执行的回调 */
 const currentChange = val => {
-  page.currentPage = val;
+  details.page.currentPage = val;
   onLoad();
 };
 // 新增数据
@@ -378,6 +380,38 @@ const newlyadd = () => {
 const newlyaddSubmit = () => {
   console.log(Addform.value);
 };
+// 部门选择
+const AffiliationList=ref({
+        formOption: {
+          labelWidth: 100,
+          column: [{
+            label: '自定义项',
+            prop: 'label'
+          }],
+        },
+        lazy: true,
+        treeLoad: function (node, resolve) {
+          if (node.level === 0) {
+            return resolve([{ is_show: true, label: 'region', value: new Date().getTime() }]);
+          }
+          if (node.level > 2) return resolve([]);
+          setTimeout(() => {
+            const data = [{
+              label: 'leaf',
+              is_show: true,
+              value: new Date().getTime(),
+              leaf: true
+            }, {
+              is_show: true,
+              value: new Date().getTime(),
+              label: 'zone'
+            }];
+
+            resolve(data);
+          }, 500);
+        },
+      }
+  ) 
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 83133870..4df2a997 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -2570,6 +2570,8 @@ const CLchangeSelect = val => {
 // 合并司机和车辆信息
 const merge = (val, kindS) => {
   if (kindS == 'WX') {
+
+
     // 如果是外协就不进行下面的司机合并
     console.log('当前是外协');
 
@@ -2581,6 +2583,31 @@ const merge = (val, kindS) => {
       return;
     }
 
+    if(!DataSubmit.value.tripartite.driverName){
+      ElMessage({
+        message: '请选填写司机名称',
+        type: 'warning',
+      });
+      return
+    }
+
+    const phoneRegExp = /^[0-9]{11}$/;
+    if (!phoneRegExp.test(DataSubmit.value.tripartite.driverPhone)) {
+    ElMessage({
+    message: '请输入正确的11位司机电话号码',
+    type: 'warning',
+    });
+    return;
+    }
+
+    if(!DataSubmit.value.tripartite.vehicleNum){
+      ElMessage({
+        message: '请选填车辆车牌',
+        type: 'warning',
+      });
+      return
+    }
+
     if (!DataSubmit.value.taskTime) {
       ElMessage({
         message: '请填写配送日期',
diff --git a/vite.config.js b/vite.config.js
index 44164c17..a73aa7ad 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -32,7 +32,6 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.3.5:13000',//？
           // target: 'http://h5uapi.huitongys.com',
           target: 'http://test.api.huo5you.com',
-
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },