Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -784,7 +784,7 @@
             >
               <template #default="slotProps">
                 <template v-if="slotProps.scope.column.label == '操作'">
-    
+
                   <el-text
                   v-if="slotProps.scope.row.auditingStatus === 1 || slotProps.scope.row.auditingStatusName == '待审核'"
                     size="small"
@@ -795,10 +795,10 @@
               </template>
             </tablecmt>
 
-          <div class="el_examine_approve"> 
+          <div class="el_examine_approve">
               <el-button type="primary" @click="allauditing">一键审批</el-button>
           </div>
-        
+
   </el-dialog>
 
 
@@ -3675,7 +3675,7 @@ export default {
         }
         this.AbnormalReviewloading = true;//开启加载
         this.selectionList.forEach(item=>{
-          DataSubmit.push(item.id) 
+          DataSubmit.push(item.id)
         })
       }
       loadingAbnormalPackageListAuditing(DataSubmit.join(',')).then(res => {
@@ -3684,7 +3684,7 @@ export default {
             type: 'success',
             message: '操作成功!',
           });
-        
+
           this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据
         }
       }).catch(res=>{
@@ -3692,7 +3692,7 @@ export default {
       }).finally(()=>{
         this.AbnormalReviewloading = false;//关闭加载
       });
-      
+
       this.viewAbnormalLoading(this.toexamineID); //审核完成更新数据
     },
     // 关闭异常审核
@@ -4140,6 +4140,7 @@ export default {
         if (valid) {
           this.form.stringValue = jsonString;
           if (!this.form.id) {
+
             this.form.masterId = this.propertyformdata.id;
             add(this.form).then(() => {
               this.box = false;
@@ -4905,7 +4906,7 @@ export default {
         this.loading=false;//关闭加载
       });
 
- 
+
     },
   },
 };

src/views/distribution/signdetail/distributionSigndetail.vue

@@ -1,11 +1,22 @@
 <template>
   <basic-container>
     <div class="avue-crud">
+      <el-row v-if="!search" class="el_row_top">
       <el-row v-if="!search" class="el_row_top">
         <!-- 查询模块 -->
+        <el-form :inline="true" :model="query" class="fr-fm el_from_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="请选择搜索类型">
+                <el-option
+                        v-for="item in searchTypeDate"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value">
+                </el-option>
+
             <el-form-item label="类型:">
               <el-select  v-model="searchType" placeholder="请选择搜索类型">
                 <el-option
@@ -16,6 +27,8 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="包条码:">
+              <el-input v-model="query.searchCode" placeholder="请输入包条码"></el-input>
             <el-form-item label="包条码:">
               <el-input v-model="query.searchCode" placeholder="请输入包条码"></el-input>
             </el-form-item>
@@ -38,6 +51,15 @@
 <!--            <el-button type="danger" icon="el-icon-picture" @click="handlePictureInfo" plain-->
 <!--            >导出图片-->
 <!--            </el-button>-->
+<!--          </div>-->
+<!--          <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">
@@ -65,6 +87,24 @@
           </el-timeline-item>
         </el-timeline>
       </div>
+      <div class="block">
+        <el-timeline>
+          <el-timeline-item
+                  v-for="(activity, index) in activities"
+                  :key="index"
+                  :icon="activity.icon"
+                  :type="activity.type"
+                  :color="activity.color"
+                  :size="activity.size"
+                  :timestamp="activity.timestamp">
+            {{activity.content}}
+            <el-card>
+              <p>操作人:{{activity.nodeUserName}}</p>
+              <p>描述:{{activity.nodeInfo}}</p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </div>
     </div>
   </basic-container>
 </template>
@@ -77,6 +117,7 @@
 
 
 
+  export default {
   export default {
   data() {
     return {
@@ -84,6 +125,18 @@
       reverse: true,
       query:{},
       searchType:'',
+      searchTypeDate:[
+        {
+          value: '1',
+          label: '配送单号'
+        },
+        {
+          value: '2',
+          label: '预约单号'
+      search:false,
+      reverse: true,
+      query:{},
+      searchType:'',
       searchTypeDate:[
         {
           value: '1',
@@ -96,6 +149,8 @@
         {
           value: '3',
           label: '自提单号'
+          value: '3',
+          label: '自提单号'
         },
         {
           value: '4',
@@ -106,12 +161,23 @@
     };
   },
   mounted() {},
+  computed: {},
+          value: '4',
+          label: '备货单号'
+        },
+      ],
+      activities: []
+    };
+  },
+  mounted() {},
   computed: {},
   methods: {
     searchHide() {
       this.search = !this.search;
     },
     searchChange() {
+      if (this.searchType == '' || this.searchType === undefined){
+        this.$message.warning("请选择搜索类型");
       if (this.searchType == '' || this.searchType === undefined){
         this.$message.warning("请选择搜索类型");
         return;
@@ -133,6 +199,26 @@
         console.log("res=>",res);
       })
     },
+    searchReset() {
+      this.query = {};
+      this.searchType = '';
+      searchNode(this.searchType,this.query.searchCode).then(res=>{
+        const data = res.data.data;
+        let  bbb = data.map(item=>{
+         return   {
+            content : item.nodeName,
+            content : item.nodeName,
+            color: '#0bbd87',
+            timestamp : item.time,
+            nodeUserName : item.nodeUserName,
+            nodeInfo : item.nodeInfo,
+          }
+        })
+        console.log("bbb-------->",bbb);
+        this.activities = bbb;
+        console.log("res=>",res);
+      })
+    },
     searchReset() {
       this.query = {};
       this.searchType = '';

vite.config.js

@@ -23,13 +23,13 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.10.57:13000',
+          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.169:9777',//CYZ  
+          // target: 'http://192.168.6.161:9777',//CYZ
           // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.10.29:13000',
-          // target: 'http://192.168.10.210:13000',//？ 
+          // target: 'http://192.168.10.210:13000',//？
           // target: 'http://h5uapi.huitongys.com',
           target: 'http://test.api.huo5you.com',