From a8d8e088de4db031f040684d876c238598bd8817 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Tue, 26 Dec 2023 10:51:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../turndelivery/deliveryDiscuss.vue          | 56 ++++++++++++++++++-
 vite.config.js                                |  4 +-
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 0671ee89..86849f7a 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -267,6 +267,16 @@
                     <el-button type="primary" @click="AddInfo"
                       ><el-icon><Plus /></el-icon>新 增</el-button
                     >
+                    <div class="el_multifunctional">
+                      <el-input
+                        v-model="multifunctional"
+                        placeholder="请输入要搜索的值"
+                        clearable
+                      />
+                      <el-button type="primary" @click="SearchFu"
+                        ><el-icon><Plus /></el-icon>搜索</el-button
+                      >
+                    </div>
                   </div>
                 </div>
                 <!-- 顶部结束 -->
@@ -309,11 +319,14 @@
                           align="center"
                         >
                           <template #default="props">
-                            <span>{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
+                            <span :class="props.row[item.prop]=='state'?'.static-class':''">{{ props.row[item.prop] ? props.row[item.prop] : '/' }}</span>
                           </template>
                         </el-table-column>
                       </template>
 
+
+
+
                       <template v-if="item.type === 2">
                         <el-table-column
                           v-if="item.head"
@@ -814,6 +827,7 @@ const data = ref([]); // 表格数据
 const wrapData = ref([]); //包件表格信息
 const wrapLoading = ref(false); //包件表格弹窗
 const dataInfo = ref([]); //表格展示信息
+// const dataInfoTemp=ref([]);//
 const dataTmp = ref([]); //暂存数据
 const TabHeight = ref(230); //动态获取表格高度
 const TCTabHeight = ref(600); //动态获取弹窗表格高度
@@ -843,6 +857,7 @@ const SjTc = ref(false); //司机信息弹窗
 const editLoading = ref(false); //编辑弹窗
 const state = ref(false); //提交信息状态
 const tableRefs = ref(null); //包件实例
+const multifunctional = ref(''); //编辑订单搜索
 const dataId = ref(null); //包件对应ID,用于存储包件下面的ID
 const wrapDataInfo = ref([]); //订单包件回显
 const RouteId = ref(null); //编辑页面的ID参数
@@ -1978,6 +1993,29 @@ const Entering = val => {
     isZeroTable.value = res.data.data;
   });
 };
+
+// 编辑多功能搜索
+const SearchFu = () => {
+  console.log('多功能搜索功能');
+  console.log(dataInfo.value, '当前订单');
+
+
+  let st= dataInfo.value.filter(item => {
+        return Object.values(item).some(val => {
+          if (typeof val === 'string') {
+            return val.includes(multifunctional.value);
+          }
+          return false;
+        });
+      });
+
+st.forEach(item=>{
+  item.state=true;
+})
+
+
+  console.log(st, '搜索结果');
+};
 // 数量录入
 const QuantityEntry = val => {
   dataId.value = findIndexById(val.id); //记录当前点击的订单
@@ -2536,6 +2574,7 @@ const SubmitCommercial = () => {
     justify-content: space-between;
   }
   .el-Cart-button-left {
+    width: 100%;
     :deep(button) {
       padding: 0 14px;
       min-width: 70px;
@@ -2943,4 +2982,19 @@ const SubmitCommercial = () => {
     margin-top: 26px;
   }
 }
+.el_multifunctional {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 24%;
+    .el-input {
+    margin-right: 4px;
+  }
+  button {
+    width: 100px;
+  }
+}
+.static-class {
+  background-color: seagreen;
+}
 </style>
diff --git a/vite.config.js b/vite.config.js
index 768ed4ed..a8678b55 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.10.25:13000',
+          target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888',
           // target: 'http://192.168.6.148:9777',
           // target: 'http://192.168.10.57:13000',
@@ -32,7 +32,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.94:8888',
           // target: 'http://192.168.10.29:13000',
           // target: 'http://h5uapi.huitongys.com',
-          target: 'http://test.api.huitongys.com',
+          // target: 'http://test.api.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },