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

src/utils/LodopFuncs.js

@@ -113,7 +113,8 @@ export function getLodop(oOBJECT,oEMBED){
       return LODOP;
     };
 
-    LODOP.SET_LICENSES("","加密的秘钥","","");     // 加密密钥 防止不兼容 （删除水印）
+    // LODOP.SET_LICENSES("","加密的秘钥","","");     // 加密密钥 防止不兼容 （删除水印）、
+    LODOP.SET_LICENSES("","13528A153BAEE3A0254B9507DCDE2839","EDE92F75B6A3D917F65910","D60BC84D7CF2DE18156A6F88987304CB6D8");
     //===如下空白位置适合调用统一功能(如注册语句、语言选择等):===
     //LODOP.SET_LICENSES("北京XXXXX公司","8xxxxxxxxxxxxx5","","");
 

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -507,6 +507,16 @@ async function initnumber() {
   console.log(res.data.data);
   details.countnumber = res.data.data;
 }
+// watchEffect(()=>{
+//   if(details.isshowupt){
+//     details.inputtxts=''
+//     details.inputtxts1=''
+//   }
+//   if(details.isshowdow){
+//     details.inputtxts=''
+//     details.inputtxts1=''
+//   }
+// })
 async function initconfig() {
   let res = await getstoreCargo();
   details.arrlist = res.data.data;
@@ -738,6 +748,8 @@ async function checkshelves() {
 //   }
 // };
 const showupt = value => {
+  details.inputtxts=''
+  details.inputtxts1=''
   console.log('112312');
   details.isshowupt = value;
   switch (details.isshowupt) {
@@ -1488,6 +1500,8 @@ const searchbutdown = async () => {
   }
 };
 const showdown = async value => {
+  details.inputtxts=''
+  details.inputtxts1=''
   if (value == 5) {
     let url = 'downAllocation?ids='+details.checkite.id;
     let data={
@@ -2315,6 +2329,7 @@ const {
     border-radius: 30px;
     color: #fff;
     cursor: pointer;
+    font-size: 15px;
   }
   .xz {
     background-color: #b345f1 !important;

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -951,17 +951,17 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'goodsAllocation',
-          label: '货位信息',
-          type: 2,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'goodsAllocation',
+        //   label: '货位信息',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           prop: 'consigneeUnit',
           label: '收货单位',
@@ -1003,7 +1003,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'consigneePerson',
+          prop: 'customerName',
           label: '终端收货人',
           type: 1,
           values: '',
@@ -1013,7 +1013,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'consigneeAddress',
+          prop: 'customerAddress',
           label: '终端收货地址',
           type: 1,
           values: '',
@@ -1023,7 +1023,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'consigneeMobile',
+          prop: 'customerTelephone',
           label: '终端收货电话',
           type: 1,
           values: '',
@@ -2257,7 +2257,7 @@ export default {
             },
             {
               label: '终端收货人',
-              prop: 'consigneePerson',
+              prop: 'customerName',
               search: true,
               width: '100px'
             },

src/views/distribution/reservation/atlas.vue

@@ -18,6 +18,7 @@
         </div>
       </div>
       <div style="display: flex; align-items: center; justify-content: center">
+        <el-button @click="checkgoto">确认(转配送)</el-button>
         <el-button icon="el-icon-circle-close" @click="back">返 回</el-button>
       </div>
     </div>
@@ -56,6 +57,7 @@ onMounted(() => {
 watchEffect(() => {
   console.log(router.currentRoute.value.query.id);
   details.item = router.currentRoute.value.query.id;
+  if(!details.item)return
   getReservationAddr(details.item).then(res => {
     // selectStockArticleAtlasInfo(details.item.id).then(res => {
     console.log(res.data.data);
@@ -86,6 +88,16 @@ function initmap() {
     center: [104.293242, 30.582939], //初始化地图中心点
   });
 }
+function checkgoto() {
+      let ids = details.item;
+      router.push({
+        path: '/distribution/turndelivery/deliveryMarket',
+        query: {
+          id: ids,
+          name: '市配计划',
+        },
+      });
+}
 function init(data) {
   // maplabel()
   console.log(details.mapLoc);

src/views/distribution/reservation/reservationSubmitFrom.vue

@@ -486,7 +486,13 @@
 
 
 <script>
-  import { add, update, remove, getReservationInfo } from '@/api/distribution/distributionReservation';
+  import {
+    add,
+    update,
+    remove,
+    getReservationInfo,
+    autonomouslySave
+  } from '@/api/distribution/distributionReservation';
   import {
     getStockArticleList,
     selectStockArticleList,
@@ -1140,7 +1146,8 @@
         //     });
         //   });
         // } else {
-          add(this.form).then(() => {
+        this.form.reservationStatus = '20';
+        autonomouslySave(this.form).then(() => {
             this.$router.go(-1);
             this.$message({
               type: 'success',
@@ -1183,6 +1190,7 @@
           this.form = res.data.data;
         });
       },
+
       rowDel(row) {
         this.$confirm('确定将选择数据删除?', {
           confirmButtonText: '确定',

src/views/distribution/signfor/distributionSignforedt.vue

@@ -441,24 +441,24 @@ export default {
             search: true,
             width: '130px'
           },
-          // {
-          //   label: '终端收货人',
-          //   prop: 'consigneePerson',
-          //   search: true,
-          //   width: '120px'
-          // },
-          // {
-          //   label: '终端收货地址',
-          //   prop: 'consigneeAddress',
-          //   search: true,
-          //   width: '120px'
-          // },
-          // {
-          //   label: '终端收货电话',
-          //   prop: 'consigneeMobile',
-          //   search: true,
-          //   width: '120px'
-          // }
+          {
+            label: '终端收货人',
+            prop: 'customerName',
+            search: true,
+            width: '120px'
+          },
+          {
+            label: '终端收货地址',
+            prop: 'customerTelephone',
+            search: true,
+            width: '120px'
+          },
+          {
+            label: '终端收货电话',
+            prop: 'customerAddress',
+            search: true,
+            width: '120px'
+          }
 
         ]
       },

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -1335,7 +1335,7 @@
             console.log('------------->', res);
             const data = res.data.data;
             this.page.total = data.total;
-            this. reservationData= data.records;
+            this. reservationData= data;
             console.log('>>>>>>>>>>>', this.data);
             this.loading = false;
           });

vite.config.js

@@ -14,7 +14,7 @@ export default ({ mode, command }) => {
         '/api': {
           // target: 'http://192.168.10.126:8889',
           // target: 'http://192.168.10.48:8888',
-          // target: 'http://192.168.10.123:8889',
+          target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.75:8777',
           target: 'http://test.api.huitongys.com',
           // target: 'http://192.168.10.101:8888',
@@ -43,12 +43,16 @@ export default ({ mode, command }) => {
         output: {
           // 分包
           manualChunks(id) {
-            if (id.includes('node_modules')) {
-              return id.toString().split('node_modules/')[1].split('/')[0].toString();
+            if (id.includes("node_modules")) {
+              return id
+                .toString()
+                .split("node_modules/")[1]
+                .split("/")[0]
+                .toString();
             }
           },
         },
       },
-    },
+    }
   });
 };