Merge branch 'dev' into pre-production

src/api/distribution/distributionSignfor.js

@@ -325,14 +325,11 @@ export const $_updateSignAddValuePackage = data => {
  * 查询配送节点
  * @returns {AxiosPromise}
  */
-export const searchNode = (searchType, searchCode) => {
+export const searchNode = (params) => {
   return request({
     url: '/api/logpm-distribution/signfor/searchNode',
     method: 'get',
-    params: {
-      searchType,
-      searchCode,
-    },
+    params
   });
 };
 

src/axios.js

@@ -40,7 +40,9 @@ function generateReqKey(config) {
 // 添加请求到pendingRequests对象，并创建取消令牌
 function addPendingRequest(config) {
   const requestKey = generateReqKey(config);
-  config.cancelToken = config.cancelToken || new axios.CancelToken((cancel) => {
+  config.cancelToken =
+    config.cancelToken ||
+    new axios.CancelToken(cancel => {
       if (!pendingRequests.has(requestKey)) {
         pendingRequests.set(requestKey, cancel);
       }
@@ -107,7 +109,6 @@ axios.interceptors.request.use(
       config.data = serialize(config.data);
     }
 
-
     return config;
   },
   error => {
@@ -143,7 +144,7 @@ axios.interceptors.response.use(
         showClose: false, // 不显示关闭按钮
         closeOnPressEscape: false, // 禁止通过 ESC 键关闭
         closeOnClickModal: false, // 禁止点击遮罩关闭
-        callback: (action) => {
+        callback: action => {
           isAlertShowing = false; // 恢复为 false 表示弹窗已经关闭
           store.dispatch('FedLogOut').then(() => router.push({ path: '/login' }));
         },
@@ -160,8 +161,8 @@ axios.interceptors.response.use(
       }
       setTimeout(() => {
         msg.value = '';
-    }, 50);
-    msg.value=message
+      }, 1000);
+      msg.value = message;
       return Promise.reject(new Error(message));
     }
     // 正常状态返回responseData

src/views/distribution/signdetail/distributionSigndetail.vue

@@ -1,52 +1,14 @@
 <template>
   <basic-container>
-    <div class="avue-crud">
-      <el-row v-if="!search" class="el_row_top">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="fr-fm el_from_top" >
-          <div class="fr-fo">
-
-            <el-form-item label="类型:">
-              <el-select  v-model="searchType" placeholder="请选择搜索类型" @change="changetypesof" style="width:200px">
-                <el-option
-                        v-for="item in searchTypeDate"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item :label="title+':'">
-              <el-input v-model="query.searchCode" :placeholder="'请输入'+title"></el-input>
-            </el-form-item>
-          </div>
-          <!-- 查询按钮 -->
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-<!--          <div class="avue-crud__left">-->
-<!--            <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain-->
-<!--            >导出-->
-<!--            </el-button>-->
-<!--            &lt;!&ndash;            v-loading.fullscreen.lock="fullscreenLoading"&ndash;&gt;-->
-<!--            <el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain-->
-<!--            >导出图片-->
-<!--            </el-button>-->
-<!--          </div>-->
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+    <div class="avue-crud" v-loading="loading" element-loading-text="正在查询中...">
+      <div class="content-search">
+        <h3>请输入任务编号，进行签收明细查询</h3>
+        <div class="content">
+          <el-input v-model="query.searchCode" placeholder="请输入任务编号" />
+          <el-button type="primary" @click="searchChange">查询</el-button>
         </div>
       </div>
-      </el-row>
+      <el-row> </el-row>
       <div class="block">
         <el-timeline>
           <el-timeline-item
@@ -56,11 +18,11 @@
             :type="activity.type"
             :color="activity.color"
             :size="activity.size"
-                  :timestamp="activity.timestamp">
-            {{activity.content}}
+          >
             <el-card>
-              <p>操作人:{{activity.nodeUserName}}</p>
-              <p>描述:{{activity.nodeInfo}}</p>
+              <p>操作人:{{ activity.operator }}</p>
+              <p>描述:{{ activity.content }}</p>
+              <p>操作时间:{{ activity.createTime }}</p>
             </el-card>
           </el-timeline-item>
         </el-timeline>
@@ -70,90 +32,103 @@
 </template>
 
 <script>
-  import {
-    searchNode
-  } from '@/api/distribution/distributionSignfor';
-
+import { searchNode } from '@/api/distribution/distributionSignfor';
+import { ElMessage } from 'element-plus'
 export default {
   data() {
     return {
       search: false,
       reverse: true,
       query: {},
-      title:'请选择类型',
       searchType: '',
-      searchTypeDate:[
-        {
-          value: '1',
-          label: '配送单号'
-        },
-        {
-          value: '2',
-          label: '预约单号'
-        },
-        {
-          value: '3',
-          label: '自提单号'
-        },
-        {
-          value: '4',
-          label: '备货单号'
-        },
-      ],
-      activities: []
+      activities: [],
+      loading: false,
     };
   },
   mounted() {},
   computed: {},
   methods: {
-
     searchHide() {
       this.search = !this.search;
     },
     changetypesof(val) {
       console.log(val);
-    this.title=  this.searchTypeDate.find(res=>res.value==val).label
+      this.title = this.searchTypeDate.find(res => res.value == val).label;
     },
-    searchChange() {
-      if (this.searchType == '' || this.searchType === undefined){
-        this.$message.warning("请选择搜索类型");
+    async searchChange() {
+      try {
+        if (!this.query.searchCode) {
+          ElMessage({
+            message: '请输入查询条件',
+            type: 'warning',
+          });
           return;
         }
-      searchNode(this.searchType,this.query.searchCode).then(res=>{
+        this.loading = true;
+        await searchNode({
+          searchCode: this.query.searchCode,
+        }).then(res => {
           const data = res.data.data;
-        let  bbb = data.map(item=>{
+          this.activities = data.map(item => {
             return {
-            content : item.nodeName,
-            content : item.nodeName,
+              content: item.content,
+              operator: item.operator,
               color: '#0bbd87',
-            timestamp : item.time,
+              createTime: item.createTime,
               nodeUserName: item.nodeUserName,
               nodeInfo: item.nodeInfo,
+            };
+          });
+          this.activities = data;
+          console.log('  this.activities-------->', this.activities);
+        });
+      } catch (e) {
+        console.log(e, 'error');
+      } finally {
+        this.loading = false;
       }
-        })
-        console.log("bbb-------->",bbb);
-        this.activities = bbb;
-        console.log("res=>",res);
-      })
-    },
-    searchReset() {
-      this.query = {};
-      this.searchType = '';
     },
   },
 };
 </script>
 
 <style scoped lang="scss">
-  .el_row_top{
-  .el-form{
-    width: 100%;
+.content-search {
   display: flex;
-    justify-content: space-between;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding-bottom: 37px;
+}
+.content {
+  margin: auto;
+  display: flex;
+  height: 46px;
+
+  .el-input {
+    width: 400px;
+    height: 100%;
+  }
+  .el-button {
+    width: 100px;
+    height: 100%;
+    border: none;
+  }
+}
+.el_row_top {
+  margin-bottom: 29px;
+  padding: 19px 0;
+}
+.block {
+  .el-card {
+    padding: 0 10px;
+    :deep(.el-card__body) {
+      color: #d38729;
+      font-size: 16px;
     }
-  .el-btn{
-    margin-right: 0;
   }
 }
+:deep(.el-loading-parent--relative) {
+  height: 100%;
+}
 </style>
-

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -109,7 +109,7 @@
               <el-form-item label="车辆车牌:" prop="goodsShelfId" >
                 <el-input
                   v-model="waixieForm.vehicleNum"
-                  placeholdeonSubmitOrderr="请输入本次费用"
+                  placeholder="请输入车辆车牌"
                 ></el-input>
               </el-form-item>
             </el-col>