Merge branch 'fix_bug_pro20231227' into dev

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -128,7 +128,8 @@
       <!--          </div>-->
       <!--        </div>-->
       <!--      </el-row>-->
-      <el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick">
+      <el-tabs type="border-card" v-model="activeTab" @tab-click="handleTabClick"   v-loading="checkloading"
+    element-loading-text="正在复核签收处理中...">
         <el-tab-pane label="客 户 列 表" name="tab1">
           <tablecmt
             class="tableNode"
@@ -515,7 +516,8 @@
           </div>
         </div>
         <div>------------------------------</div> -->
-        <div class="TcFrom">
+        <div class="TcFrom" 
+  >
           <el-form :model="TcForm" label-width="120px">
             <el-form-item label="收货人姓名">
               <el-input disabled v-model="TcForm.consignee" placeholder="暂无收货人姓名" />
@@ -685,6 +687,7 @@ export default {
   data() {
     return {
       html: '',
+      checkloading:false,//复核签收加载
       dialogImageUrl: '', //图片放大地址
       dialogVisible: false, //图片状态
       dialogImageUrlA: '',
@@ -714,6 +717,7 @@ export default {
       SignForPhotos: [],
       reservationId: null, //当前行的ID
       windowHeight: null,
+      CheckStore:null,
       columnList: [
         {
           prop: 'trainNumber',
@@ -3284,8 +3288,11 @@ export default {
       this.dialogImageUrlE = uploadFile.url;
       this.dialogVisibleE = true;
     },
-
+    // 复核签收确认弹窗
     submitForm() {
+      console.log(this.CheckStore,'要处理的值');
+      this.checkloading=true;//开启复核签收加载效果
+      this.signBox = false;
       // console.log('--------------->this.signtitle', this.signtitle);
       // console.log('--------------->this.signtitle', this.submitForm);
       let row = {};
@@ -3298,6 +3305,7 @@ export default {
       };
       // 提交图片处理
       //最后提交
+      
       row.reservationId = this.reservationId;
       // row.clerkSignPictures = this.signform.clerkSignPictures;
       row.clerkSignRemarks = this.TcForm.clerkSignRemarks; //备注
@@ -3336,6 +3344,7 @@ export default {
       this.signBox = false;
       getOneclickq(row)
         .then(res => {
+          this.checkloading=false;//关闭复核签收加载效果
           if (res.data.code == 200) {
             this.TCloading = false; //取消限制
             ElMessage({
@@ -3522,14 +3531,20 @@ export default {
     },
     handleSign(row) {
       console.log('签收>>>>>>>>>>', row);
-      console.log(row.id, '复合签收');
+      console.log(row.signId, '复合签收');
-      $_getDetail({ id: row.id }).then(res => {
+      $_getDetail({ id: row.signId }).then(res => {
         console.log(res, '复合返回值');
+        if(res.data.data){
+          this.CheckStore=res.data.data
+          console.log(this.CheckStore,'data');
+          console.log(res.data.data,'res');
+        }
+        
       });
       this.signtitle = '复核签收';
       // this.view = true;
       this.signform = row;
-      this.signBox = true;
+      this.signBox = true;//开启复合弹窗
       //  this.wid= row.id
       // this.getWrapdetails(this.wpage)
     },

vite.config.js

@@ -25,7 +25,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.6.122:8777',
           // 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',
           // target: 'http://192.168.10.57:13000',
           // tjj
           // sst