修复部分bug

src/api/basicdata/basicClient.js

@@ -8,25 +8,25 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
-    }
+    },
-  })
+  });
-}
+};
 
-export const getListCode = (params) => {
+export const getListCode = params => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/getFinallyClientCode',
     method: 'get',
-    params
+    params,
-  })
+  });
-}
+};
 
-export const $_getListlistName = (params) => {
+export const $_getListlistName = params => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/listName',
     method: 'get',
-    params
+    params,
-  })
+  });
-}
+};
 export const getListClient = (current, size, params) => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/list',
@@ -35,53 +35,53 @@ export const getListClient = (current, size, params) => {
       ...params,
       current,
       size,
-    }
+    },
-  })
+  });
-}
+};
 
-export const getDetail = (id) => {
+export const getDetail = id => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/detail',
     method: 'get',
     params: {
-      id
+      id,
-    }
+    },
-  })
+  });
-}
+};
 
-export const remove = (ids) => {
+export const remove = ids => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/remove',
     method: 'post',
     params: {
       ids,
-    }
+    },
-  })
+  });
-}
+};
 
-export const add = (row) => {
+export const add = row => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/submit',
     method: 'post',
-    data: row
+    data: row,
-  })
+  });
-}
+};
 
-export const update = (row) => {
+export const update = row => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/submit',
     method: 'post',
-    data: row
+    data: row,
-  })
+  });
-}
+};
 
-export const updateCargoControl = (row) => {
+export const updateCargoControl = row => {
   return request({
     url: '/api/logpm-basicdata/basicdataClient/update',
     method: 'post',
-    data: row
+    data: row,
-  })
+  });
-}
+};
 
 export const selectName = (current, size, params) => {
   return request({
@@ -91,8 +91,15 @@ export const selectName = (current, size, params) => {
       ...params,
       current,
       size,
-    }
+    },
-  })
+  });
-}
+};
-
 
+/** 获取客户日志 */
+export const getClientLogList = params => {
+  return request({
+    url: '/api/logpm-basicdata/clientLog/list',
+    method: 'get',
+    params,
+  });
+};

src/api/basicdata/basicdataTray.js

@@ -86,6 +86,7 @@ export const getDownloadTrayCode = ids => {
     params: {
       ids,
     },
+    responseType: 'blob',
   });
 };
 

src/components/tablecmt/tablecmt.vue

@@ -394,9 +394,7 @@ const isHaveSelection = ref(false);
 let selectarr = ref([]);
 /** 设置每行颜色 */
 const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => {
-  // console.log('selectarr.value :>> ', selectarr.value);
   for (let i = 0; i < selectarr.value.length; i++) {
-    // console.log('row :>> ', row);
     if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor';
   }
 
@@ -755,6 +753,8 @@ const handleWidthChange = (newWidth, oldWidth, column, event) => {
     break;
   }
 
+  console.log('props.columnListName :>> ', props.columnListName);
+
   functions.setStorage($route.fullPath + (props.columnListName || 'columnList'), props.columnList);
 };
 

src/option/distribution/abnormalList.js

@@ -40,6 +40,7 @@ export const columnList = [
       { value: 2, label: '无装车计划' },
       { value: 3, label: '无装车记录' },
       { value: 4, label: '无卸车记录' },
+      { value: 5, label: '卸车数据异常' },
     ],
     fixed: false,
     sortable: true,

src/option/distribution/arteryDistrilbutionBillLadingList.js

@@ -636,7 +636,7 @@ export const columnOldList = [
   },
   {
     prop: 'noBillladingNum',
-    label: '未入库件数',
+    label: '未提货件数',
     type: 1,
     values: '',
     width: '130',

src/option/finance/CustomerSettlement.js

@@ -14,6 +14,17 @@ export const columnList = [
     width: 55,
     fixed: true,
   },
+  {
+    prop: 'balanceOrderNo',
+    label: '结算单号',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'brand',
     label: '品牌',
@@ -106,6 +117,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'balanceTime',
+    label: '结算时间',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'totalBalanceFee',
     label: '结算单总金额',

src/utils/util.js

@@ -438,6 +438,29 @@ export const downloadXls = (fileArrayBuffer, filename) => {
     window.open(URL.createObjectURL(file));
   }
 };
+/**
+ * 下载excel
+ * @param {blob} fileArrayBuffer 文件流
+ * @param {String} filename 文件名称
+ */
+export const downloadPdf = (fileArrayBuffer, filename) => {
+  let data = new Blob([fileArrayBuffer], { type: 'application/pdf,charset=utf-8' });
+  if (typeof window.chrome !== 'undefined') {
+    // Chrome
+    var link = document.createElement('a');
+    link.href = window.URL.createObjectURL(data);
+    link.download = filename;
+    link.click();
+  } else if (typeof window.navigator.msSaveBlob !== 'undefined') {
+    // IE
+    var blob = new Blob([data], { type: 'application/force-download' });
+    window.navigator.msSaveBlob(blob, filename);
+  } else {
+    // Firefox
+    var file = new File([data], filename, { type: 'application/force-download' });
+    window.open(URL.createObjectURL(file));
+  }
+};
 
 /** 获取视口高度 */
 export const getWinHeight = () => {
@@ -635,9 +658,9 @@ export function debounce(func, delay) {
 
 /** 去除零宽字符 */
 export const removeZeroWidth = str => {
-  if(str){
+  if (str) {
     return str.replace(/[\u200B-\u200D\uFEFF]/g, '');
-  }else{
+  } else {
     return str;
   }
 };

src/views/basicdata/brand/basicClient.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <div class="avue-crud">
+    <div class="avue-crud" v-loading="loadingObj.pageLoading">
       <div v-h5uShow="!search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
@@ -140,6 +140,9 @@
                   <el-dropdown-item command="7">
                     <el-text>开通账号</el-text>
                   </el-dropdown-item>
+                  <el-dropdown-item command="8">
+                    <el-text>日志</el-text>
+                  </el-dropdown-item>
                 </el-dropdown-menu>
               </template>
             </el-dropdown>
@@ -212,8 +215,6 @@
         </div>
       </el-dialog>
 
-
-
       <el-dialog title="文件校验" append-to-body v-model="Fileverification" width="555px">
         <div>
           <el-divider content-position="left">文件校验</el-divider>
@@ -330,10 +331,18 @@
                         </el-select>
                       </el-form-item>-->
             <el-form-item label="联系人" prop="linkman" v-if="viewEntd">
-              <el-input v-model.trim="form.linkman" placeholder="请输入联系人" style="width: 100%" />
+              <el-input
+                v-model.trim="form.linkman"
+                placeholder="请输入联系人"
+                style="width: 100%"
+              />
             </el-form-item>
             <el-form-item label="联系电话" prop="phone" v-if="viewEntd">
-              <el-input v-model.trim="form.phone" placeholder="请输入联系电话" style="width: 100%" />
+              <el-input
+                v-model.trim="form.phone"
+                placeholder="请输入联系电话"
+                style="width: 100%"
+              />
             </el-form-item>
             <el-form-item label="地址" prop="bladeRegionProvinceId">
               <!--            <el-input v-model="form.bladeRegionProvinceId" placeholder="请输入省份"/>-->
@@ -510,6 +519,13 @@
       <!--        <BasicShopSub :mainId="basicClientId"></BasicShopSub>-->
       <!--      </el-drawer>-->
     </div>
+
+    <!-- 日志 -->
+    <el-dialog title="客户日志" width="50%" :align-center="true" v-model="popUpShow.logVisted">
+      <tablecmt ref="tableLogNode" class="mt10" :columnList="columnLogList" :tableData="logData">
+        <template #default="{ scope }"> </template>
+      </tablecmt>
+    </el-dialog>
   </basic-container>
 </template>
 
@@ -523,6 +539,7 @@ import {
   remove,
   getListCode,
   $_getListlistName,
+  getClientLogList,
 } from '@/api/basicdata/basicClient';
 import option from '@/option/basicdata/basicClient';
 import { mapGetters } from 'vuex';
@@ -545,8 +562,8 @@ export default {
       excelForm: {},
       fromloading: true,
       excelBox: false,
-      Fileverification:false,
+      Fileverification: false,
-      FileverificationLoadong:false,
+      FileverificationLoadong: false,
       excelOption: {
         submitBtn: false,
         emptyBtn: false,
@@ -892,7 +909,68 @@ export default {
         submitLoading: false,
         /** 上传文件 */
         UploadLoadong: false,
+        pageLoading: false,
+      },
+      popUpShow: {
+        logVisted: false,
       },
+      // 日志
+      columnLogList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 12,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'clientName',
+          label: '客户名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'operator',
+          label: '操作人',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'content',
+          label: '操作描述',
+          type: 2,
+          values: '',
+          width: '500',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'createTime',
+          label: '操作时间',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+      ],
+      logData: [],
     };
   },
   created() {},
@@ -1008,6 +1086,9 @@ export default {
         case 7:
           this.openAcount(row);
           break;
+        case 8:
+          this.handleShowLog(row);
+          break;
       }
     },
     //远程校验
@@ -1089,6 +1170,33 @@ export default {
       });
     },
 
+    /**
+     * 日志
+     */
+    async handleShowLog(row) {
+      try {
+        this.loadingObj.pageLoading = true;
+
+        const res = await getClientLogList({ clientId: row.id });
+
+        const { code, data } = res.data;
+        if (code !== 200) return;
+        this.logData = data;
+        // this.openAcountform.name = row.linkman;
+        // this.openAcountform.phone = row.phone;
+        // this.openAcountStatus = true;
+        this.popUpShow.logVisted = true;
+
+        await this.$nextTick();
+        console.log(this.$refs.tableLogNode.$el);
+        // getClientLogList
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
+    },
+
     //
     handleMall(row) {
       // console.log('>>>', row);
@@ -1169,8 +1277,8 @@ export default {
       this.showImgViewer = false;
     },
     // 文件校验
-    ckFileverification(){
+    ckFileverification() {
-      this.Fileverification=true;//开启弹窗
+      this.Fileverification = true; //开启弹窗
     },
     //文件上传前的一些业务需要的校验
     beforeUploadFn(file, fileList) {
@@ -1724,10 +1832,10 @@ export default {
     /** 上传文件 */
     handleBeforeUpload(file) {
       console.log('file :>> ', file);
-      if(this.Fileverification){
+      if (this.Fileverification) {
-        this.FileverificationLoadong=true
+        this.FileverificationLoadong = true;
         // 文件校验
-      }else{
+      } else {
         this.loadingObj.UploadLoadong = true;
       }
 
@@ -1742,11 +1850,11 @@ export default {
       if (whiteArr.indexOf(_fileType) !== -1) return true;
 
       this.$message.warning('请传入xls或xlsx格式的文件');
-      if(this.Fileverification){
+      if (this.Fileverification) {
-        this.FileverificationLoadong=false
+        this.FileverificationLoadong = false;
         // 文件校验
-      }else{
+      } else {
-      this.loadingObj.UploadLoadong = false;
+        this.loadingObj.UploadLoadong = false;
       }
       return false;
     },
@@ -1754,25 +1862,25 @@ export default {
     /** 长传成功 */
     handleSuccess(res) {
       console.log('res :>> ', res);
-      if(this.Fileverification){
+      if (this.Fileverification) {
-        this.FileverificationLoadong=true
+        this.FileverificationLoadong = true;
         // 文件校验
-      }else{
+      } else {
         this.loadingObj.UploadLoadong = true;
       }
       if (res.code !== 200) return this.$message.warning('上传失败');
       this.$message.success('上传成功');
-      if(this.loadingObj.submitLoading){
+      if (this.loadingObj.submitLoading) {
         onLoad(this.page);
       }
     },
 
     /** 上传失败 */
     handleClose(res) {
-      if(this.Fileverification){
+      if (this.Fileverification) {
-        this.FileverificationLoadong=false
+        this.FileverificationLoadong = false;
         // 文件校验
-      }else{
+      } else {
         this.loadingObj.UploadLoadong = false;
       }
       // UploadAjaxError

src/views/basicdata/warehouse/tray/basicdataTray.vue

@@ -90,9 +90,9 @@
           <el-button type="primary" icon="Printer" @click="handleShowHtml">查看二维码</el-button>
 
           <!-- 查看二维码 -->
-          <!-- <el-button type="primary" icon="Printer" @click="handleDownLoadTrayCode">
+          <el-button type="primary" icon="Printer" @click="handleDownLoadTrayCode">
             下载托盘码
-          </el-button> -->
+          </el-button>
 
           <!-- 报损 -->
           <el-button type="primary" icon="Edit" @click="handleBreakage">报 损</el-button>
@@ -283,7 +283,7 @@ import { mapGetters } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
 import {
-  downloadXls,
+  downloadPdf,
   setNodeHeight,
   getHtmls,
   deepClone,
@@ -662,9 +662,10 @@ const handleDownLoadTrayCode = async () => {
     let qr = details.selectionList.map(item => item.id).join(',');
     console.log(qr);
     const res = await getDownloadTrayCode(qr);
-    console.log(res.data);
+    console.log(res);
-    const { code, data } = res.data;
+    const { status, data } = res;
-    if (code !== 200) return;
+    if (status !== 200) return;
+    downloadPdf(data, '托盘码.pdf');
     console.log('data :>> ', data);
   } catch (error) {
     console.log('error :>> ', error);

src/views/distribution/artery/abnormalList.vue

@@ -110,7 +110,7 @@
             <el-text
               v-if="
                 Number(slotProps.scope.row.abnormalStatus) === 0 &&
-                [1, 4].includes(Number(slotProps.scope.row.abnormalType))
+                [1, 4, 5].includes(Number(slotProps.scope.row.abnormalType))
               "
               @click="handleAnException(slotProps.scope)"
             >
@@ -163,6 +163,7 @@
           同步数据
         </el-button>
       </template>
+
       <!-- 无卸车记录 -->
       <template v-else-if="Number(details.abnormalInfo.abnormalType) === 4">
         <el-button type="primary" icon="Delete" @click="() => handleAbnormal(3, '确认为本车次少货')"
@@ -176,6 +177,40 @@
           已入库
         </el-button>
       </template>
+
+      <!-- 无卸车记录 -->
+      <template v-else-if="Number(details.abnormalInfo.abnormalType) === 5">
+        <div class="flex1">
+          <el-form-item label="入库数量">
+            <el-input-number
+              class="w100"
+              style="width: 100%"
+              v-model="details.abnormalInfo.handleNum"
+              :max="details.abnormalInfo.num"
+              :value-no-clear="0"
+              :min="0"
+              :precision="0"
+              :controls="false"
+            />
+          </el-form-item>
+          <div class="flex-c-c mt20">
+            <el-button
+              type="primary"
+              icon="Refresh"
+              @click="() => handleAbnormal(5, '确认退回原仓库')"
+            >
+              退回原仓库
+            </el-button>
+            <el-button
+              type="primary"
+              icon="Position"
+              @click="() => handleAbnormal(6, '确认卸入本仓，剩余件数将退回原仓库')"
+            >
+              卸入本仓
+            </el-button>
+          </div>
+        </div>
+      </template>
     </div>
   </el-dialog>
 
@@ -255,7 +290,7 @@ const details = reactive<any>({
   /** 列表 */
   columnList: deepClone(columnList),
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -434,7 +469,8 @@ const beforeClose = done => {
 
 /** 处理异常 */
 const handleAnException = ({ row }) => {
-  details.abnormalInfo = row;
+  details.abnormalInfo = { ...row };
+  details.abnormalInfo.handleNum = 0;
   details.popUpShow.abnormalVisited = true;
 };
 
@@ -450,6 +486,10 @@ const handleAbnormal = (dealType, title) => {
       try {
         details.loadingObj.pageLoading = true;
         const submitData = { abnormalRecordId: details.abnormalInfo.id, dealType };
+        if (dealType === 6) {
+          if (!submitData.num) return ElMessage.warning('请输入入库数量');
+          submitData.num = details.abnormalInfo.handleNum;
+        }
         const res = await postDealAbnormal(submitData);
 
         const { code, msg } = res.data;

src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue

@@ -69,7 +69,7 @@
               type="primary"
               v-if="permissionObj.arteryDistrilbutionBillLadingList_confirmBill"
               icon="el-icon-check"
-              @click="handleEditBillladingStatus(2)"
+              @click="handleShowConfirm"
             >
               提货完成
             </el-button>
@@ -267,6 +267,40 @@
         </template>
       </el-dialog>
 
+      <!-- 确认提货完成 -->
+      <el-dialog
+        title="确认提货完成"
+        v-model="popUpShow.confirmBillLading"
+        width="780px"
+        :before-close="beforeClose"
+        append-to-body
+      >
+        <el-form ref="form" :model="form" label-width="120px">
+          <!-- 表单字段 -->
+
+          <el-form-item label="提货完成时间" prop="createTime">
+            <el-date-picker
+              class="w100 h100"
+              v-model="form.time"
+              type="datetime"
+              placeholder="请选择开单日期"
+              value-format="YYYY-MM-DD HH:mm:ss"
+            />
+          </el-form-item>
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleConfirmSubmit"
+              >提 交</el-button
+            >
+            <el-button icon="el-icon-circle-close" @click="popUpShow.confirmBillLading = false"
+              >取 消</el-button
+            >
+          </span>
+        </template>
+      </el-dialog>
+
       <!-- 查看明细 -->
       <el-dialog
         :title="title"
@@ -390,6 +424,8 @@ export default {
         distrilbutionDetailVisited: false,
         /** 新增线路是否显示 */
         addDistrilbutionLineVisited: false,
+        /** 确认提货 */
+        confirmBillLading: false,
       },
       // 是否显示查询
       search: true,
@@ -703,8 +739,8 @@ export default {
 
       const _data = this.selectionList[0];
 
-      if (Number(_data.billladingStatus) !== 1)
+      if (Number(_data.billladingStatus) !== 1 && Number(_data.billladingStatus) !== 2)
-        return this.$message.warning('提货任务状态不是未开始，无法编辑');
+        return this.$message.warning('提货任务只能是未开始或提货中可以编辑');
 
       this.$router.push({
         path: '/distribution/inventory/addArteryDistrilbutionBillLadingList',
@@ -765,6 +801,50 @@ export default {
         }
       });
     },
+    /** 提货完成 */
+    handleShowConfirm() {
+      if (!ChecksWhetherTheWarehouseIsSelected())
+        return this.$message.warning('多仓权限无法操作，请选择仓库');
+      if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
+
+      if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
+
+      this.popUpShow.confirmBillLading = true;
+      const item = this.selectionList[0];
+      this.form = {
+        minTime: new Date(item.startTime).getTime(),
+        time: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
+        id: item.id,
+      };
+      console.log('this.form :>> ', this.form);
+    },
+    async handleConfirmSubmit() {
+      try {
+        if (new Date(this.form.time).getTime() <= this.form.minTime)
+          return this.$message.warning('完成时间请大于提货开始时间');
+        this.popUpShow.confirmBillLading = false;
+        this.loadingObj.pageLoading = true;
+
+        const res = await postUpdateBillladingStatus({
+          id: this.form.id,
+          type: 2,
+          completeTime: this.form.time,
+        });
+
+        const { code, msg } = res.data;
+
+        if (code !== 200) return;
+        this.$message.success(msg);
+        // 清空复选框
+        this.selectionClear();
+        // 刷新表格
+        this.onLoad(this.page);
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.loadingObj.pageLoading = false;
+      }
+    },
     /** 开启添加提货数据弹窗 */
     handleAddDistrilbution() {
       if (!ChecksWhetherTheWarehouseIsSelected())

src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@@ -73,7 +73,10 @@
             <!-- 头部左侧按钮模块 -->
             <div>
               <el-button
-                v-if="permissionObj.arteryDistrilbutionBillLadingListDetails_confirmEdit"
+                v-if="
+                  permissionObj.arteryDistrilbutionBillLadingListDetails_confirmEdit &&
+                  [1, 2].includes(Number(deliverydata.billladingStatus))
+                "
                 icon="CircleCheckFilled"
                 type="primary"
                 @click="() => handleEditSubmit()"
@@ -144,8 +147,9 @@
                 <el-text
                   v-if="permissionObj.arteryDistrilbutionBillLadingListDetails_edit"
                   @click="handleEdit(slotProps.scope)"
-                  >编辑</el-text
                 >
+                  编辑
+                </el-text>
               </template>
             </template>
           </tablecmt>

src/views/finance/CustomerSettlement.vue

@@ -170,7 +170,7 @@ const details = reactive<any>({
   /** 列表 */
   columnList: deepClone(columnList),
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */