Merge remote-tracking branch 'origin/dev' into dev

src/views/aftersales/VueTemp.vue

@@ -100,38 +100,54 @@
   <basic-container>
     <div class="avue-crud">
       <!-- 搜索模块 -->
-      <el-row v-if="!search">
+      <el-row v-if="search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="el-fr-d">
-          <el-form-item label="交期:" class="el-times">
+          <div class="el_tims_box">
-            <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
+          <el-form-item label="上报日期" class="el-times">
             <el-date-picker
-              v-model="stockupDate"
+              v-model="value1"
               type="daterange"
-              unlink-panels
               range-separator="至"
-              start-placeholder="开始时间"
+              start-placeholder="开始日期"
-              end-placeholder="结束时间"
+              end-placeholder="结束日期"
-              :shortcuts="shortcuts"
+              :size="size"
-              clearable
             />
           </el-form-item>
-          <el-form-item label="创建时间:" class="el-times">
+          <el-form-item label="处理时间" class="el-times">
-            <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
             <el-date-picker
-              v-model="stockupDate"
+              v-model="value1"
               type="daterange"
-              unlink-panels
               range-separator="至"
-              start-placeholder="开始时间"
+              start-placeholder="开始日期"
-              end-placeholder="结束时间"
+              end-placeholder="结束日期"
-              :shortcuts="shortcuts"
+              :size="size"
-              clearable
+            />
+          </el-form-item>
+          <el-form-item label="送货时间" class="el-times">
+            <el-date-picker
+              v-model="value1"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :size="size"
+            />
+          </el-form-item>
+          <el-form-item label="运损发现" class="el-times">
+            <el-date-picker
+              v-model="value1"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :size="size"
             />
           </el-form-item>
+        </div>
           <!-- 查询按钮 -->
           <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button type="primary" icon="el-icon-search">搜 索</el-button>
             <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
           </el-form-item>
         </el-form>
@@ -398,12 +414,21 @@
           label="配送司机"
           v-if="groundlineSet || groundlineType == 3 || groundlineType == 4"
         >
-          <el-input
+          <el-select
             v-model="Indexform.deliveryDriver"
-            :disabled="FromDisabled"
+            multiple
+            filterable
+            default-first-option
+            :reserve-keyword="false"
             placeholder="请输入配送司机"
-            clearable
+          >
-          />
+            <el-option
+              v-for="item in DeliveryDriver"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </el-form-item>
         <!-- 必填 -->
         <el-form-item label="异常问题描述">
@@ -530,7 +555,7 @@
         </el-form-item>
 
         <el-form-item label="运损发现节点">
-          <el-select v-model="endFrom.a" class="m-2" placeholder="Select">
+          <el-select v-model="endFrom.a" class="m-2" clearable placeholder="请选择运损发现节点">
             <el-option
               v-for="item in TransportLossNode"
               :key="item.value"
@@ -781,7 +806,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
 import { ref, reactive, toRefs, computed, onMounted, nextTick } from 'vue';
 import { columnList, recordList } from '@/option/aftersales/vueTvemp.js';
-import {  processRowProperty } from '@/utils/util';
+import { processRowProperty } from '@/utils/util';
 import dayjs from 'dayjs';
 const currentPage = ref(1); // 默认页码
 const pageSize = ref(30); // 默认每一页几条
@@ -810,10 +835,24 @@ const eightyPercentHeight = ref(0); // 80% 高度
 const list = ref([]);
 const options = ref([]);
 const ProcessingList = ref([]); //赔付方式列表
+const DeliveryDriver = ref([
+  {
+    value: '0',
+    label: '兰溪',
+  },
+  {
+    value: '1',
+    label: '李华',
+  },
+  {
+    value: '2',
+    label: '唐飞',
+  },
+]); //配送司机
 const CompensationParty = ref([{ name: '', state: 0, num: 0, reason: '', cld: 1 }]); //赔付款方
 const details = reactive({
   /** 是否开启搜索 */
-  search: true,
+  search: false,
   /** 表格搜索条件 */
   query: {},
   /** 时间快捷选择设置 */
@@ -1272,7 +1311,7 @@ const IndexTable = val => {
   let data = {
     ...val,
   };
-  columnList[2].checkarr = [];//重置下拉搜索框
+  columnList[2].checkarr = []; //重置下拉搜索框
   columnList[3].checkarr = [];
   data.current = page.value.currentPage; //页码
   data.size = page.value.pageSize; //条数
@@ -1303,7 +1342,7 @@ const IndexTable = val => {
         } else if (item.workOrderType == 5) {
           item.workOrderTypeName = columnList[2].checkarr[4].label; //其他
         }
-
+        // 提货环节下拉赋值
         if (item.discoveryNode == 1) {
           item.discoveryNodeName = columnList[3].checkarr[0].label; //提货环节
         } else if (item.discoveryNode == 2) {
@@ -1385,7 +1424,13 @@ const AddInfo = () => {
 
 // 首页新增表单确定
 const ConfirmForm = () => {
+  console.log(Indexform.value.deliveryDriver, 'Indexform.value.deliveryDriver');
   console.log(Indexform.value.processor, 'Indexform.value.processor');
+  // 匹配司机名字
+  Indexform.value.deliveryDriver = DeliveryDriver.value.find(
+    item => item.value == Indexform.value.deliveryDriver
+  ).label;
+  console.log(Indexform.value.deliveryDriver); // 输出李华
   FromDisabled.value = false; //启用输入框
   let processorEntityList = [];
   let ProcessingParty = {
@@ -1404,23 +1449,28 @@ const ConfirmForm = () => {
     typesOf: 1,
   };
   processorEntityList.push(ResponsibleParty);
-  Indexform.value.processorEntityList = processorEntityList;
+  DataSubmit.processorEntityList = processorEntityList;
   let DataSubmit = { ...Indexform.value };
   delete DataSubmit.duty, //移除多余字段
     delete DataSubmit.processor; //移除多余字段
   console.log(DataSubmit, '处理好的表单信息');
   Indexdialog.value = false; //关闭表单弹窗
-  $_submit(DataSubmit).then(res => {
+  // $_submit(DataSubmit).then(res => {
-    if (res.data.code == 200) {
+  //   if (res.data.code == 200) {
-      ElMessage({
+  //     ElMessage({
-        message: res.data.msg,
+  //       message: res.data.msg,
-        type: 'success',
+  //       type: 'success',
-      });
+  //     });
-      IndexTable();
+  Indexform.value = {}; //重置表单
-    }
+  //     IndexTable();
-  });
+  //   }
+  // });
+};
+// 顶部搜索
+const searchHide = () => {
+  console.log(details);
+  details.search = !details.search;
 };
-
 // 首页查看详情按钮
 const view = val => {
   console.log(val, '当前行数据');
@@ -1564,8 +1614,6 @@ const btnsc = val => {
   console.log(val);
 };
 
-
-
 // // 下拉框搜索公共函数
 // const updateDetailQuery = (index, propName, obj) => {
 //   // 更新或删除查询参数
@@ -1578,7 +1626,7 @@ const btnsc = val => {
 // const processRowProperty = (index, row, details) => {
 //   const nameRegex = /(\w+)Name$/; // 捕获以'Name'结尾的属性名
 //   const match = row.prop.match(nameRegex);
-  
+
 //   // 如果属性以'Name'结尾，则更新相应的查询参数
 //   if (match) {
 //     const basePropName = match[1]; // 获取不包含'Name'的属性名
@@ -1592,12 +1640,11 @@ const btnsc = val => {
 //   }
 // };
 
-
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
   console.log('index :>> ', index);
   console.log('row :>> ', row);
-  
+
   processRowProperty(index, row, details);
   console.log(details.query, details.query);
   IndexTable(details.query);
@@ -1612,10 +1659,16 @@ const selectionChange = list => {
 };
 
 /** 页码改变执行的回调 */
-const currentChange = () => {
+const currentChange = (val) => {
-  console.log('');
+  page.value.currentPage=val
+  IndexTable();
 };
-
+// 每页多少条
+const sizeChange=(val)=>{
+  console.log(val);
+  page.value.pageSize=val
+  IndexTable();
+}
 const changeProcessingResults = val => {
   // 首先删除取消的项目
   ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
@@ -1837,7 +1890,7 @@ const changeProcessingResults = val => {
 }
 .lptime {
   margin-top: 30px;
-  padding-left: 50px;
+  padding-left: 60px;
   display: flex;
   flex-direction: column;
   font-size: 14px;
@@ -1893,10 +1946,23 @@ const changeProcessingResults = val => {
     height: 38px;
   }
 }
-.el-fy{
+.el-fy {
   flex: 1;
-    display: flex;
+  display: flex;
-    align-items: flex-end;
+  align-items: flex-end;
-    margin-bottom: 10px;
+  margin-bottom: 10px;
+}
+.el-times{
+  :deep(.el-input__wrapper){
+    height: 30px !important;
+  }
+ 
+}
+.el_tims_box{
+  display: flex;
+}
+.el-btn{
+  width: 100%;
+
 }
 </style>

vite.config.js

@@ -19,12 +19,14 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
           // 老zyc
-            // target: 'http://192.168.10.75:8777',
+          // target: 'http://192.168.10.75:8777',
-             // 新zyc
+          // 新zyc
-            target: 'http://192.168.6.141:8777',
+          // target: 'http://192.168.6.141:8777',
-         
+          target: 'http://192.168.6.116:8777',
           // tjj
           //  target: 'http://192.168.10.25:13000',
+          // cg 
+            // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.10.94:8888',
           // target: 'http://test.api.huitongys.com',
           // target: 'http://h5uapi.huitongys.com',