From fdbfb974fc4765a57e1194fa5f86460fe7f186e5 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 20 Aug 2024 10:53:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artery/addTripartiteTransfer.vue          | 53 +++++++++++++++++--
 .../system/pdaversion/pdaversionManage.vue    | 17 ++----
 2 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/src/views/distribution/artery/addTripartiteTransfer.vue b/src/views/distribution/artery/addTripartiteTransfer.vue
index 676a7830..bb4ff183 100644
--- a/src/views/distribution/artery/addTripartiteTransfer.vue
+++ b/src/views/distribution/artery/addTripartiteTransfer.vue
@@ -68,7 +68,7 @@
               :teleported="false"
               v-model="form.deliveryType"
               class="m-2"
-              placeholder="运费分摊方式"
+              placeholder="送货方式"
               size="default"
               @change="
                 val => {
@@ -89,12 +89,12 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="付款方式" prop="payMethod">
+          <el-form-item label="送货方式" prop="payMethod">
             <el-select
               :teleported="false"
               v-model="form.payMethod"
               class="m-2"
-              placeholder="运费分摊方式"
+              placeholder="送货方式"
               size="default"
             >
               <el-option
@@ -163,7 +163,7 @@
               </el-select>
             </el-form-item>
 
-            <el-button type="primary" @click="handleAddCarrier" icon="Plus" />
+            <el-button type="primary" @click="handleAddVehicle" icon="Plus" />
           </div>
 
           <div style="display: flex">
@@ -213,7 +213,7 @@
               </SelectBox>
             </el-form-item>
 
-            <el-button type="primary" @click="handleAddCarrier" icon="Plus" />
+            <el-button type="primary" @click="handleAddCar" icon="Plus" />
           </div>
 
           <el-form-item label="客户类型" prop="customerType">
@@ -635,6 +635,30 @@ const details = reactive<any>({
         trigger: ['change'],
       },
     ],
+    /** 付款方式 */
+    payMethod: [
+      {
+        required: true,
+        message: '请选择付款方式',
+        trigger: ['change'],
+      },
+    ],
+    /** 运费分摊方式 */
+    chargeType: [
+      {
+        required: true,
+        message: '请选择运费分摊方式',
+        trigger: ['change'],
+      },
+    ],
+    /** 是否结算 */
+    isSettlement: [
+      {
+        required: true,
+        message: '请选择结算状态',
+        trigger: ['change'],
+      },
+    ],
     /** 客户类型 */
     customerType: [
       {
@@ -1122,6 +1146,25 @@ const handleAddCarrier = () => {
   $router.push({ path: '/basicdata/carrier/basicdataCarrier' });
 };
 
+/** 新增车辆 */
+const handleAddCar = () => {
+  $router.push({ path: '/basicdata/vehicle/basicdataVehicle' });
+};
+
+/** 新增司机 */
+const handleAddVehicle = () => {
+  $store.commit('DEL_ONCE_TAG', 'basicdataDriverArteryAdd');
+
+  $router.push({
+    path: '/basicdata/driverArtery/basicdataDriverArteryAdd',
+    query: {
+      name: '司机信息新增',
+      type: 'add',
+      backPatch: '/basicdata/driverArtery/basicdataDriverArtery',
+    },
+  });
+};
+
 /** 选择承运商 */
 const carrierNameChange = () => {
   const findValue = form.value.carrierName;
diff --git a/src/views/system/pdaversion/pdaversionManage.vue b/src/views/system/pdaversion/pdaversionManage.vue
index 6a7613c5..49b2e55c 100644
--- a/src/views/system/pdaversion/pdaversionManage.vue
+++ b/src/views/system/pdaversion/pdaversionManage.vue
@@ -94,7 +94,6 @@
               multiple
               class="upfilebox"
               v-model:file-list="form.filelink"
-              :before-upload="uploadBefore"
               :limit="1"
               list-type="text"
               drag
@@ -437,19 +436,9 @@ export default {
       handleClearTableQuery(this.columnList);
       this.onLoad(this.page);
     },
-   async uploadBefore(rawFile, done, loading, column) {
-        if (rawFile.type !== 'image/png' && rawFile.type !== 'image/jpeg') {
-    ElMessage.error('图片格式只能为 png/jpg!');
-    return false;
-  } else if (rawFile.size / 1024 / 1024 > 10) {
-    ElMessage.error('图片大小不能大于10MB!');
-    return false;
-  }
-  const res = await compressImageBlob(rawFile);
-  return res;
-      },
-      async customUploadRequest({ file }) {
-    try {
+
+    async customUploadRequest({ file }) {
+      try {
         console.log(file, '文件上传');
         const responses = await this.$fileslicing(this, file); // 文件切片上传的全局函数(初始)
         console.log(responses, 'responses');