Merge branch 'dev' into pre-production

src/api/basicdata/basicdataFreight.js

@@ -57,3 +57,32 @@ export const $_QueryUserName = (params) => {
     params
   })
 }
+
+// 查询品牌
+export const $_brand = (params) => {
+  return request({
+    url: '/api/logpm-basicdata-zqb/basicdataStoreBrand/detail',
+    method: 'get',
+    params
+  })
+}
+
+// 查询品类
+
+
+
+export const $_category = (params) => {
+  return request({
+    url: '/api/logpm-basicdata-zqb/basicdataCategory/detail',
+    method: 'get',
+    params
+  })
+}
+
+export const $_getDeptLazyTree = params => {
+  return request({
+    url: '/api/logpm-basicdata/basicdataCategory/lazy-tree',
+    method: 'get',
+    params
+  });
+};

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -749,7 +749,7 @@
                         </template>
                       </el-upload>
 
-                      <el-select
+                      <!-- <el-select
                         v-model="separateMessageResponsibility"
                         multiple
                         filterable
@@ -765,7 +765,7 @@
                           :value="item.value"
                           :disabled="item.disabled"
                         />
-                      </el-select>
+                      </el-select> -->
                     </div>
                     <el-button type="primary" class="el_next" @click="NextRecord()">
                       下一条
@@ -780,6 +780,7 @@
                     @input="appoint(Msgtextarea)"
                   />
                   <div class="msgHf">
+                    <el-button type="primary" @click="replyMessage()"> 结束回复 </el-button>
                     <el-button type="primary" @click="replyMessage()"> 回复 </el-button>
                   </div>
                 </div>
@@ -2699,7 +2700,6 @@ const CustomerServiceCompleted = () => {
   right: 0;
   bottom: 0;
   :deep(.el-button) {
-    margin-left: 20px;
   }
 }
 .ovhe {
@@ -2935,7 +2935,10 @@ const CustomerServiceCompleted = () => {
   align-items: center;
   justify-content: space-between;
 }
-:deep(.el-upload){
+
+:deep(.Transport_damage_photos){
+  .el-upload{
   display: none;
 }
+}
 </style>

src/views/basicdata/brand/basicdataFreight.vue

@@ -51,28 +51,32 @@
       <!--                   @click="$refs.crud.rowAdd()">新增</el-button>-->
       <!--      </template>-->
     </avue-crud>
-    <el-dialog
+    <el-dialog v-model="Detailspop" title="详情" width="60%">
-    v-model="Detailspop"
+      <el-form
-    title="详情"
+        class="el_formInfo"
-    width="60%"
+        :model="formInfo"
+        label-width="300px"
+        style="width: 100%"
+        disabled
       >
-  <el-form class="el_formInfo" :model="formInfo" label-width="300px" style="width:100%" disabled>
+        <div class="el_box_1">
-<div class='el_box_1'> 
+          <el-form-item label="客户名称">
-  <el-form-item label="用户名称">
             <el-input v-model="formInfo.clientName" />
           </el-form-item>
+
           <el-form-item label="品牌名称">
-      <el-input v-model="formInfo.clientName" />
+            <el-input v-model="formInfo.brand" />
           </el-form-item>
+
           <el-form-item label="一口价">
-      <el-input v-model="formInfo.clientName" />
+            <el-input v-model="formInfo.fixedPrice" />
           </el-form-item>
+
           <el-form-item label="品类">
             <el-input v-model="formInfo.clientName" />
           </el-form-item>
-
         </div>
-<div class='el_box_2'>
+        <div class="el_box_2">
           <el-form-item label="生效时间">
             <el-input v-model="formInfo.clientName" />
           </el-form-item>
@@ -98,7 +102,17 @@
 </template>
 
 <script>
-import { getList, getDetail, add, update, remove,$_QueryUserName } from '@/api/basicdata/basicdataFreight';
+import {
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+  $_QueryUserName,
+  $_brand,
+  $_category,
+  $_getDeptLazyTree,
+} from '@/api/basicdata/basicdataFreight';
 // import option from "@/option/basicdata/basicdataFreight";
 import { mapGetters } from 'vuex';
 import { exportBlob } from '@/api/common';
@@ -660,28 +674,44 @@ export default {
     beforeOpen(done, type) {
       this.Detailspop = true; //开启弹窗
       console.log(this.form.id);
+      console.log(this.form, 'from');
       console.log('查看');
       getDetail(this.form.id).then(res => {
+        this.formInfo.fixedPrice = this.form.fixedPrice == 1 ? '否' : this.form.fixedPrice == 2 ? '是' : '暂无';
         this.form = res.data.data;
         $_QueryUserName({
-            id:res.data.data.itemName
+          id: res.data.data.itemName,
-
         }).then(res => {
-            this.formInfo.clientName = res.data.data.clientName
+          this.formInfo.clientName = res.data.data.clientName;
           console.log(res, '客户名称');
-          })
         });
+        // 查询品牌
+        $_brand({
+          brandId: this.form.brand,
+          id: this.form.itemName,
+        }).then(res => {
+          console.log(res, '品牌');
+          this.formInfo.brand = res.data.data.brandName;
+        });
+
+
         return
+        $_category({
+          id:this.form.category
+        }).then(res=>{
+          console.log(res,'品类');
+        })
+      });
+      return;
       if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(res => {
           this.form = res.data.data;
           $_QueryUserName({
-            id:res.data.data.itemName
+            id: res.data.data.itemName,
-
           }).then(res => {
-            this.formInfo.clientName = res.data.data.clientName
+            this.formInfo.clientName = res.data.data.clientName;
             console.log(res, '客户名称');
-          })
+          });
         });
       }
       done();
@@ -751,7 +781,7 @@ export default {
 };
 </script>
 
-<style scoped lang='scss'>
+<style scoped lang="scss">
 :deep(.el-form-item__content) {
 }
 :deep(.avue-form__row) {
@@ -770,13 +800,14 @@ export default {
 }
 :deep(.no-print) {
   .el-button {
-     margin-right:0
+    margin-right: 0;
   }
 }
 .el_formInfo {
   display: flex;
   flex-direction: column;
-  .el_box_1,.el_box_2{
+  .el_box_1,
+  .el_box_2 {
     display: flex;
   }
 }

src/views/basicdata/brand/basicdataFreightFrom.vue

@@ -4,7 +4,7 @@
       <el-form :disabled="view" ref="form" :model="form" label-width="120px" :rules="rules">
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="用户名称" prop="province">
+            <el-form-item label="客户名称" prop="province">
               <el-select
                 style="width: 100%"
                 v-model="form.clientIds"
@@ -99,6 +99,7 @@
                 :show-all-levels="false"
                 style="width: 100%"
                 v-model="form.category"
+                @change="categoryChange"
               ></el-cascader>
             </el-form-item>
           </el-col>
@@ -314,6 +315,8 @@ export default {
       DryWarehouseDistributionBID: '', //仓库ID
       DryWarehouseDistributionCID: '', //配送ID
       clientOptions: [], //客户集合
+      categoryData:[],//品类数据
+      categoryDataID:[],//品类数据的ID
       activeName: 'second',
       // 分页信息
       page: {
@@ -359,13 +362,20 @@ export default {
         lazy: true,
         multiple: true,
         checkStrictly: true,
-        lazyLoad(node, resolve) {
+        lazyLoad:(node, resolve)=> {
+          console.log(this,'this');
+          let _this=this
           const { level } = node;
           setTimeout(async () => {
             // console.log("node/////////",node);
             const parentId = node.level === 0 ? 1 : node.data.value;
             // console.log("par",parentId);
             let shuju = await getDeptLazyTree(parentId);
+            console.log(shuju,'品类数据');
+            shuju.data.data.forEach((item=>{
+              _this.categoryData.push(item)
+            }))
+            console.log(_this.categoryData,'categoryData');
             // console.log(")))))))))))",shuju);
             const nodes = Array.from(shuju.data.data).map(item => ({
               value: item.id,
@@ -478,7 +488,23 @@ export default {
             // this.form.details = this.DryWarehouseDistributionB;
             this.form.details = [].concat(...this.DryWarehouseDistributionA, ...this.DryWarehouseDistributionB, ...this.DryWarehouseDistributionC);
             console.log('提交的数据》》》', this.form);
-   
+            console.log(this.categoryDataID,'id');
+            console.log(this.categoryData,'名字');
+            let matchedData = this.categoryDataID.map(subArray => {
+    // subArray 应该包含一个元素，即 id
+    if (subArray.length === 1) {
+        let idToMatch = subArray[0];
+        // 在 datas 中寻找匹配的 id
+        let matched = this.categoryData.find(data => data.id === idToMatch);
+        // 如果找到匹配，则返回对应的对象
+        if (matched) {
+            return matched;
+        }
+    }
+    return null;
+}).filter(item => item !== null);  // 过滤掉任何未匹配的值（null）
+console.log(matchedData,'筛选出来的值');
+            return
             add(this.form).then(() => {
               this.$store.commit('DEL_TAG_CURRENT'); //关闭当前页面
               this.$router.push('/basicdata/brand/basicdataFreight'); //添加成功跳转到列表
@@ -727,6 +753,20 @@ export default {
           break;
       }
     },
+     categoryChange(val,a){
+        console.log(val,a);
+        let newArray = val.map(subArray => {
+    // 如果内层数组长度大于 1，则只取最后一个元素组成新的数组
+    if (subArray.length > 1) {
+        return [subArray[subArray.length - 1]];
+    }
+    // 否则，直接保留这个数组
+    return subArray;
+});
+this.categoryDataID=newArray
+console.log(this.categoryDataID,'data中的数据');
+console.log(newArray,'重新组织的');
+      },
     
     handleCheckedCitiesChange(value, index) {
       //费用选择
@@ -873,6 +913,7 @@ export default {
         // console.log("字典》》》",res);
         this.delivery = res.data.data;
       });
+    
     },
   },
 };

src/views/distribution/inventory/distributionStockListMarket.vue

@@ -826,7 +826,7 @@ export default {
         //查询物料数据
         let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, {
           name: query,
-          pid: this.stockList.materialId,
+          // pid: this.stockList.materialId,
         }).then();
         console.log('物料信息', asd.data.data);
         if (!!asd.data.data) {
@@ -1115,7 +1115,7 @@ export default {
       this.getQuery.quantityStock = row.row.quantityStock;
       this.formInline.descriptionGoods = this.getQuery.name;
       let q = this.distributionUnit.find(i => i.dictKey == this.getQuery.logpmUnit);
-      this.getQuery.logpmUnitName = q.dictValue;
+      this.getQuery.logpmUnitName =q?q.dictValue:null;
       // getListParcelDetails(this.pageDetails.currentPage,this.pageDetails.pageSize,par).then(res => {
       //   console.log("<><>===", res.data.data);
       //   const data = res.data.data;

src/views/warehouse/warehouseStock/warehouseStock.vue

@@ -77,6 +77,7 @@ import option from '@/option/warehouse/warehouseStock';
 import { mapGetters } from 'vuex';
 import { ElMessage } from 'element-plus'
 import { downloadXls,checkParams} from '@/utils/util';
+import dayjs from 'dayjs';
 export default {
   data() {
     return {
@@ -93,7 +94,6 @@ export default {
           sortable: false,
           head: false,
         },
-
         {
           prop: 'nodeName',
           label: '节点名称',
@@ -105,9 +105,10 @@ export default {
           sortable: false,
           head: false,
         },
+
         {
           prop: 'scanNodeType',
-          label: '扫描详情',
+          label: '节点描述',
           type: 2,
           values: '',
           width: '130',
@@ -116,6 +117,16 @@ export default {
           sortable: false,
           head: false,
         },
+        {
+          prop: 'operatorTime',
+          label: '操作时间',
+          type: 4,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'serviceNumber',
           label: '服务号',
@@ -283,16 +294,7 @@ export default {
           fixed: false,
           sortable: false,
         },
-        {
+
-          prop: 'operatorTime',
-          label: '操作时间',
-          type: 4,
-          values: '',
-          width: '130',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
         // {
         //   prop: '',
         //   label: '操作',
@@ -485,18 +487,19 @@ checkParams(data, targetParam) {
   }
 },
 
-
     timesc(index, row) {
       // index = this.formatDate(index);
-      this.query[row.prop] = index;
+      if (!!index) {
-      console.log(checkParams(this.query, 'operatorTime'),'232323'); // 输出 true
+        index = dayjs(index).format('YYYY-MM-DD');
-      if(checkParams(this.query, 'operatorTime')){
-        ElMessage({
-        message: '请携带其他任意参数',
-        type: 'warning',
-      })
-        return
       }
+      this.query[row.prop] = index;
+      // if(checkParams(this.query, 'operatorTime')){
+      //   ElMessage({
+      //   message: '请携带其他任意参数',
+      //   type: 'warning',
+      // })
+      //   return
+      // }
       this.onLoad(this.page);
     },
     inputsc(index, row) {

vite.config.js

@@ -15,6 +15,8 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.126:8889',
           // hy
           // target: 'http://192.168.3.12:13000',
+          // cg 
+          // target: 'http://192.168.3.18:13000',   
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
@@ -23,7 +25,6 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.3.14:13000',  
           // target: 'http://192.168.10.25:2888',
           // target: 'http://192.168.10.57:13000',
           // tjj