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

src/views/Pricesystem/Price/PriceWarehousing.vue

@@ -336,9 +336,9 @@ const onLoad = async () => {
 
     function handleFormUpdate(disableIndexAndCategory, unitLabel, tableTitle, perPiece = false) {
       const unitMapping = {
-        按件计费: `${unitLabel}/件`,
-        '按重量计费(t)': `${unitLabel}/KG`,
-        '按吨计费(t)': `${unitLabel}/t`,
+        '按件计费': `${unitLabel}`,
+        '按重量计费(t)': `${unitLabel}`,
+        '按吨计费(t)': `${unitLabel}`,
       };
 
       const unit = unitMapping[tableTitle] || unitLabel;
@@ -346,8 +346,10 @@ const onLoad = async () => {
       updateLabelsWithUnit(unit, {
         '30天内': '30天内',
         '30天-60天': '30天-60天',
-        '60天外': '60天外',
-        上限: '上限',
+        '60天-90天': '60天-90天',
+        '60天-90天': '60天-90天',
+        '90天外': '90天外',
+        '上限': '上限',
       });
 
       tabform.value.title = tableTitle;

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -1104,22 +1104,18 @@ const handle = () => {
   });
 };
 // 是否可以查看完结信息
-const Completionpermissions = computed(async () => {
-  if (await localStorage.getItem('my_data')) {
-    Mydata.value = await JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
+const Completionpermissions = computed(() => {
+  const myDataStr = localStorage.getItem('my_data');
+  if (myDataStr) {
+    Mydata.value = JSON.parse(myDataStr);
   }
-  if (CompensationParty.value.length) {
-    console.log(CompletedView.value, 'CompletedView.value');
+  if (CompensationParty.value && CompensationParty.value.length) {
+
     if (CompletedView.value.includes(Mydata.value.id) || UserPermissions.value != '仓库客服') {
-      console.log(
-        CompletedView.value.includes(Mydata.id),
-        'CompletedView.value.includes(Mydata.id)'
-      );
       return true;
-    } else {
-      return false;
-    }
+    } 
   }
+  return false;
 });
 const onLoad = async () => {
   pageState.value = true; //开启页面加载

src/views/distribution/signdetail/distributionSigndetail.vue

@@ -33,7 +33,7 @@
 
 <script>
 import { searchNode } from '@/api/distribution/distributionSignfor';
-import { ElMessage } from 'element-plus'
+import { ElMessage } from 'element-plus';
 export default {
   data() {
     return {
@@ -64,6 +64,7 @@ export default {
           });
           return;
         }
+        this.activities = [];
         this.loading = true;
         await searchNode({
           searchCode: this.query.searchCode,

vite.config.js

@@ -15,10 +15,15 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.126:8889',
           // hy
           // target: 'http://192.168.3.12:13000',
+          // longge
+          // target: 'http://192.168.3.16:13000',
           // xiaohei
+            //  target:'http://192.168.3.65:13000',       
           // target: 'http://192.168.3.65:13000',
           // lmy
           // target: 'http://192.168.10.123:8889',
+          // cg 
+            //  target: 'http://192.168.3.73:13000',
           // cg
           //  target: 'http://192.168.3.2:13000',
           // target: 'http://192.168.10.101:8888',
@@ -35,7 +40,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.3.16:13000',
           target: 'http://192.168.3.73:13000', //？
           // target: 'http://h5uapi.huitongys.com',
-          // target: 'http://test.api.huo5u.com',
+          target: 'http://test.api.huo5u.com', 
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },
@@ -46,6 +51,9 @@ export default ({ mode, command }) => {
         },
       },
     },
+    esbuild:{
+      drop: ['console','debugger']
+    },
     resolve: {
       alias: {
         '~': resolve(__dirname, './'),