From df1cf1bc832a4e970483282b18f8bb581bb1eab3 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 21 Feb 2024 17:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E7=BA=BF=E6=8F=90=E8=B4=A7=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arteryDistrilbutionBillLadingList.js      |  32 +++-
 .../addArteryDistrilbutionBillLadingList.vue  | 140 ++++++++++++++++--
 ...teryDistrilbutionBillLadingListDetails.vue |  99 +++++++++----
 src/views/supervise/management.vue            |  30 ++--
 4 files changed, 232 insertions(+), 69 deletions(-)

diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js
index 2e8842a7..5b340a92 100644
--- a/src/option/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js
@@ -452,7 +452,7 @@ export const columnNewList = [
   {
     prop: 'waybillNo',
     label: '运单号',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
@@ -473,7 +473,7 @@ export const columnNewList = [
   {
     prop: 'shipperName',
     label: '发货人',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -483,7 +483,7 @@ export const columnNewList = [
   {
     prop: 'customerTrain',
     label: '客户车次号',
-    type: 1,
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -493,7 +493,27 @@ export const columnNewList = [
   {
     prop: 'shipper',
     label: '发货单位',
-    type: 1,
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'destinationWarehouseName',
+    label: '目的仓',
+    type: 2,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'consignee',
+    label: '收货单位',
+    type: 2,
     values: '',
     width: '130',
     checkarr: [],
@@ -503,7 +523,7 @@ export const columnNewList = [
   {
     prop: 'goodsName',
     label: '货物名称',
-    type: 1,
+    type: 2,
     values: '',
     width: '180',
     checkarr: [],
@@ -557,7 +577,7 @@ export const columnNewList = [
   {
     prop: 'remark',
     label: '运单备注',
-    type: 1,
+    type: 2,
     values: '',
     width: '150',
     checkarr: [],
diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
index bb7ebc32..eaad509d 100644
--- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue
@@ -215,7 +215,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="提货费用" prop="pickUpPlate">
+          <el-form-item label="提货费用" prop="totalFee">
             <el-input-number
               class="w100"
               controls-position="right"
@@ -241,6 +241,42 @@
             <span>运单池</span>
           </el-divider>
 
+          <div v-h5uShow="!details.search">
+            <!-- 查询模块 -->
+            <el-form :inline="true" ref="oldFormNode" :model="details.query" class="header_search">
+              <el-form-item label="开始时间:" class="el-times" prop="stockupDate">
+                <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
+                <el-date-picker
+                  v-model="details.query.stockupDate"
+                  type="daterange"
+                  unlink-panels
+                  range-separator="至"
+                  start-placeholder="开始时间"
+                  end-placeholder="结束时间"
+                  :shortcuts="details.shortcuts"
+                  value-format="YYYY-MM-DD"
+                  clearable
+                />
+              </el-form-item>
+              <!-- 查询按钮 -->
+              <el-form-item class="el-btn">
+                <el-button type="primary" icon="el-icon-search" @click="handleOldSearch"
+                  >搜 索</el-button
+                >
+                <el-button
+                  icon="el-icon-delete"
+                  @click="
+                    () => {
+                      oldFormNode.resetFields();
+                      handleOldSearch();
+                    }
+                  "
+                  >清 空</el-button
+                >
+              </el-form-item>
+            </el-form>
+          </div>
+
           <!-- 控件 -->
           <div class="flex-c-sb">
             <div class="avue-crud__right">
@@ -312,10 +348,10 @@
           <!-- 表格 -->
           <tablecmt
             class="tableNode mt10"
-            :columnList="details.columnNewList"
-            :tableData="details.addInfo.newData"
+            :columnList="details.newColumnNewList"
+            :tableData="details.addInfo.newRenderData"
             :loading="details.loadingObj.newlistLoading"
-            @inputTxt="inputsc"
+            @inputTxt="newInputsc"
             @timeCheck="timesc"
             @selectCheck="selectsc"
             @selection="list => selectionChange(list, 2)"
@@ -358,12 +394,6 @@
 </template>
 
 <script lang="ts" setup>
-import {
-  remove,
-  getListOwn,
-  getListOwnNUm,
-  getBillLadingExport,
-} from '@/api/distribution/distrilbutionBillLading';
 // 引入页面请求
 import {
   postPageList,
@@ -394,9 +424,11 @@ import dayjs from 'dayjs';
 import { ElMessage } from 'element-plus';
 import type { FormInstance, FormRules } from 'element-plus';
 import { downloadXls, setNodeHeight, debounce } from '@/utils/util';
-import { computed, ref, reactive, onMounted, nextTick } from 'vue';
+import func from '@/utils/func';
+import { computed, ref, reactive, onMounted, nextTick, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStore } from 'vuex';
+import { deepClone } from 'avue-plugin-ueditor/packages/ueditor/src/upload/util';
 
 // 实例化router
 const $router = useRouter();
@@ -407,9 +439,12 @@ const $store = useStore();
 
 // 表单实例
 const ruleFormRef = ref<FormInstance>();
+const oldFormNode = ref<FormInstance>();
+const newFormNode = ref<FormInstance>();
 
 const details = reactive({
   columnNewList,
+  newColumnNewList: deepClone(columnNewList),
   /** 列表配置抽屉 */
   drawerShow: false,
   // 弹框标题
@@ -476,6 +511,10 @@ const details = reactive({
     oldData: [],
     /** 已选择数据 */
     newData: [],
+    /** 已选择渲染数据 */
+    newRenderData: [],
+    /** 调度池查询信息 */
+    newQuery: {},
     /** 未选择 -- 复选框 */
     oldSelectionList: [],
     /** 已选择 -- 复选框 */
@@ -537,6 +576,8 @@ const details = reactive({
   pageType: 'add',
   /** 提货Id */
   billladingId: '',
+  /** 页面id 新增为: 1,  */
+  pageId: 0,
 });
 
 /** 节点信息 */
@@ -584,6 +625,7 @@ const onLoad = async (isRefresh = false) => {
       ...details.addInfo.oldPages,
       waybillNos: details.waybillNosList,
       id: details.billladingId,
+      ...details.query,
     });
 
     const { code, data } = res.data;
@@ -603,8 +645,8 @@ const onLoad = async (isRefresh = false) => {
 const initPage = async () => {
   await initData();
 
-  console.log('$route :>> ', $route);
   const { type, id } = $route.query;
+
   details.pageType = type;
   details.billladingId = id;
 
@@ -629,12 +671,34 @@ const initPage = async () => {
 
     delete details.form.waybillList;
     delete details.form.lineList;
+  } else if (details.pageType === 'add') {
+    details.addInfo.newData = [];
+    details.waybillNosList = [];
+    nextTick(() => {
+      ruleFormRef.value.resetFields();
+    });
   }
 
   onLoad();
 };
 
-initPage();
+// initPage();
+
+watch(
+  () => $route.fullPath,
+  () => {
+    const _id = $route.query.type === 'add' ? 1 : $route.query.id;
+    console.log('$route :>> ', $route);
+    if (
+      details.pageId === _id ||
+      $route.path !== '/distribution/inventory/addArteryDistrilbutionBillLadingList'
+    )
+      return;
+    details.pageId = _id;
+    initPage();
+  },
+  { immediate: true }
+);
 
 // 设置表格高度
 const setTableHeight = async () => {
@@ -694,8 +758,38 @@ const timesc = (index, row) => {
 const inputsc = (index, row) => {
   console.log(index, row);
   details.query[row.prop] = index;
+  if (!index) delete details.query[row.prop];
   onLoad();
 };
+const newInputsc = (value, row) => {
+  // newRenderData
+  try {
+    // 动态设置正则
+    const reg = new RegExp(value, 'i');
+
+    details.addInfo.newQuery[row.prop] = reg;
+
+    if (value === '') delete details.addInfo.newQuery[row.prop];
+
+    if (Object.keys(details.addInfo.newQuery).length === 0)
+      return (details.addInfo.newRenderData = details.addInfo.newData);
+
+    const _data = details.addInfo.newData.filter(value => {
+      let _flag = true;
+      for (let key in details.addInfo.newQuery) {
+        if (!details.addInfo.newQuery[key].test(value[key])) _flag = false;
+        if (!_flag) break;
+      }
+
+      return _flag;
+    });
+
+    details.addInfo.newRenderData = _data;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+  }
+};
 /** 是否显示搜索控件 */
 const searchHide = () => {
   details.search = !details.search;
@@ -720,6 +814,7 @@ const handleRefresh = type => {
   else {
     details.addInfo.newData = [];
     details.waybillNosList = [];
+    newInputsc('', { prop: 'aaa' });
     onLoad(true);
   }
 };
@@ -762,10 +857,21 @@ const getTime = dat => {
   return formattedDate.replace(/\//g, '-');
 };
 
+/** 搜索 -- 运单池 */
+const handleOldSearch = () => {
+  if (details.query.stockupDate && details.query.stockupDate.length !== 0) {
+    details.query.startDateStr = details.query.stockupDate[0];
+    details.query.endDateStr = details.query.stockupDate[1];
+  } else {
+    delete details.query.startDateStr;
+    delete details.query.endDateStr;
+  }
+
+  onLoad(true);
+};
 /** 搜索节点 */
 const remoteMethod = val =>
   debounce(async () => {
-    console.log('11231 :>> ', 11231);
     details.loadingObj.nodeLoading = true;
 
     try {
@@ -894,6 +1000,7 @@ const handleAddWaybill = () => {
   }
 
   details.addInfo.newData = [...details.addInfo.newData, ..._arr];
+  newInputsc('', { prop: 'aaa' });
 
   // clearSelectionList();
   onLoad(true);
@@ -913,7 +1020,7 @@ const handleRemoveWaybill = () => {
   }
 
   details.addInfo.newData = _copyNewData;
-
+  newInputsc('', { prop: 'aaa' });
   onLoad(true);
 };
 
@@ -1293,4 +1400,7 @@ const handleSubmit = async (formEl: FormInstance | undefined) => {
   ) {
   --el-color-danger: #f00;
 }
+.header_search > div {
+  width: 50%;
+}
 </style>
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
index 8ff107f6..ee7fd74a 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -39,9 +39,9 @@
               <span>备注：{{ deliverydata.remark }} </span>
             </el-col>
           </el-row>
-          <el-row v-if="!search">
+          <div v-h5uShow="!search">
             <!-- 查询模块 -->
-            <el-form :inline="true" :model="query" class="el-fr-d">
+            <el-form :inline="true" :model="query" class="header_search">
               <!-- <div class="fo-fl"> -->
               <el-form-item label="提货批次:">
                 <el-input v-model="query.serviceNumber" placeholder="请输入提货批次"></el-input>
@@ -67,7 +67,7 @@
                 <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
               </el-form-item>
             </el-form>
-          </el-row>
+          </div>
           <el-row>
             <div class="avue-crud__header">
               <!-- 头部左侧按钮模块 -->
@@ -91,7 +91,7 @@
           </el-row>
           <tablecmt
             :columnList="columnList"
-            :tableData="data"
+            :tableData="renderData"
             :loading="loading"
             @inputTxt="inputsc"
             @timeCheck="timesc"
@@ -139,25 +139,10 @@
             </template>
           </tablecmt>
 
-          <div class="col">
-            <!-- 分页模块 -->
-            <el-pagination
-              align="right"
-              background
-              @size-change="sizeChange"
-              @current-change="currentChange"
-              :current-page="page.currentPage"
-              :page-sizes="[30, 50, 80, 120]"
-              :page-size="page.pageSize"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="page.total"
-            >
-            </el-pagination>
-            <el-button icon="CircleCheckFilled" type="primary" @click="this.$router.go(-1)"
-              >确认修改</el-button
-            >
-            <!-- 站位的div -->
-            <div></div>
+          <div class="backbtn">
+            <el-button icon="CircleCheckFilled" type="primary" @click="this.$router.go(-1)">
+              确认修改
+            </el-button>
           </div>
         </el-tab-pane>
 
@@ -316,7 +301,7 @@ export default {
         {
           prop: 'openOrderTime',
           label: '开单日期',
-          type: 4,
+          type: 1,
           values: '',
           width: '180',
           checkarr: [],
@@ -381,7 +366,7 @@ export default {
         {
           prop: 'destinationWarehouseName',
           label: '目的仓',
-          type: 3,
+          type: 2,
           values: '',
           width: '150',
           checkarr: [],
@@ -400,8 +385,8 @@ export default {
           sortable: true,
         },
         {
-          prop: 'consigneeName',
-          label: '收货人',
+          prop: 'shipper',
+          label: '发货单位',
           type: 2,
           values: '',
           width: '180',
@@ -419,6 +404,26 @@ export default {
           fixed: false,
           sortable: true,
         },
+        {
+          prop: 'consigneeName',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'consignee',
+          label: '收货单位',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'consigneeMobile',
           label: '收货电话',
@@ -522,6 +527,8 @@ export default {
       selectionList: [],
       // 表单列表
       data: [],
+      /** 渲染数据 */
+      renderData: [],
       /** 查询所有计费模式 */
       chargeTypeList: [],
     };
@@ -601,10 +608,32 @@ export default {
       this.onLoad(this.page);
     },
 
-    inputsc(index, row) {
-      this.query[row.prop] = index;
-      if (index === '') delete this.query[row.prop];
-      this.onLoad(this.page);
+    inputsc(value, row) {
+      try {
+        // 动态设置正则
+        const reg = new RegExp(value, 'i');
+
+        this.query[row.prop] = reg;
+
+        if (value === '') delete this.query[row.prop];
+
+        if (Object.keys(this.query).length === 0) return (this.renderData = this.data);
+
+        const _data = this.data.filter(value => {
+          let _flag = true;
+          for (let key in this.query) {
+            if (!this.query[key].test(value[key])) _flag = false;
+            if (!_flag) break;
+          }
+
+          return _flag;
+        });
+
+        this.renderData = _data;
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+      }
     },
     timesc(index, row) {
       if (!!index) {
@@ -658,6 +687,7 @@ export default {
           val => val.dictKey == data.chargeType
         ).dictValue;
         this.data = data.waybillList;
+        this.inputsc('', { prop: 'aaa' });
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
@@ -666,7 +696,7 @@ export default {
     },
 
     /** 跳转到运单详情 */
-    handleGoWayBillDetail({row}) {
+    handleGoWayBillDetail({ row }) {
       if (row.waybillNo === '————') return this.$message.warning('暂无运单号');
 
       this.$router.push({
@@ -753,4 +783,9 @@ export default {
   font-size: 1.5rem;
   color: var(--el-color-primary);
 }
+
+.backbtn {
+  margin-top: 20px;
+  text-align: center;
+}
 </style>
diff --git a/src/views/supervise/management.vue b/src/views/supervise/management.vue
index 12879062..d64f97cd 100644
--- a/src/views/supervise/management.vue
+++ b/src/views/supervise/management.vue
@@ -34,8 +34,6 @@
             </el-select>
           </el-form-item>
 
-          
-
           <el-form-item class="el-btn">
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
           </el-form-item>
@@ -121,9 +119,9 @@
         label-width="120px"
         ref="ruleFormRef"
       >
-      <el-form-item label="归属部门">
-        <el-input v-model="departmentName" placeholder="暂无归属部门" disabled/>
-      </el-form-item>
+        <el-form-item label="归属部门">
+          <el-input v-model="departmentName" placeholder="暂无归属部门" disabled />
+        </el-form-item>
         <el-form-item label="考核范围" prop="examineDeptId">
           <el-tree-select
             v-model="lassificationform.examineDeptId"
@@ -203,7 +201,7 @@
         <P>请确认传入的文件为Excel文件格式</P>
 
         <a
-          href="http://47.108.51.143:9000/basic/upload/20240220/e3dcb2397124c1d60361b51473e9ae0c.xlsx"
+          href="http://47.108.51.143:9000/logpm/upload/20240221/d71584e609b2eb09664cb155c439bf18.xlsx"
           style="text-decoration: none"
         >
           <el-button type="primary" icon="Download"> 模版下载 </el-button>
@@ -280,13 +278,13 @@ const examineDeptName = ref(''); //考核部门名字
 
 /** 表格实例 */
 const tableNode = ref();
-const departmentName =ref('');//归属名称
-const departmentNameID =ref('');//归属ID
-let my_DATA=JSON.parse(localStorage.getItem('my_data'))
-departmentName.value = my_DATA.departmentName//归属名称
-departmentNameID.value = my_DATA.department//归属名称ID
-console.log(departmentName.value,'归属名称');
-console.log(departmentNameID.value,'归属名称ID');
+const departmentName = ref(''); //归属名称
+const departmentNameID = ref(''); //归属ID
+let my_DATA = JSON.parse(localStorage.getItem('my_data'));
+departmentName.value = my_DATA.departmentName; //归属名称
+departmentNameID.value = my_DATA.department; //归属名称ID
+console.log(departmentName.value, '归属名称');
+console.log(departmentNameID.value, '归属名称ID');
 // 获取分类指标
 // 在外部定义递归函数，用于加载和更新分类
 const loadChildren = (targetList, parentId, indicatorValue) => {
@@ -398,13 +396,13 @@ const rules = ref({
       trigger: ['change', 'blur'],
     },
   ],
-  examineDeptId:[
-  {
+  examineDeptId: [
+    {
       required: true,
       message: '请选择指考核范围',
       trigger: ['change', 'blur'],
     },
-  ]
+  ],
 });
 const details = reactive({
   /** 弹窗 */