Merge branch 'dev' into pre-production

src/components/HeaderSearch/HeaderSearch.vue

@@ -0,0 +1,138 @@
+<template>
+  <div v-h5uShow="props.search">
+    <!-- 查询模块 -->
+    <el-form :inline="true" :model="props.query" class="header_search">
+      <el-form-item v-for="item in props.searchOption" :key="item.prop" :label="item.label">
+        <template v-if="item.type === 'input'">
+          <el-input
+            v-model.trim="query[item.prop]"
+            :placeholder="`请输入${item.label}`"
+            clearable
+          ></el-input>
+        </template>
+
+        <template v-else-if="item.type === 'select'">
+          <el-select
+            v-model="query[item.prop]"
+            :placeholder="`请输入${item.label}`"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="value in item.checkarr || []"
+              :key="value.dictValue"
+              :label="value.dictValue"
+              :value="value.dictKey"
+            />
+          </el-select>
+        </template>
+
+        <template v-else-if="item.type === 'time'">
+          <el-date-picker
+            v-model="query[item.prop]"
+            type="datetimerange"
+            unlink-panels
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            :shortcuts="details.shortcuts"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            clearable
+          />
+        </template>
+      </el-form-item>
+
+      <!-- 查询按钮 -->
+      <el-form-item class="el-btn">
+        <el-button type="primary" icon="el-icon-search" @click="handleSearch">搜 索</el-button>
+        <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, reactive, type PropType } from 'vue';
+
+type SerachOption = {
+  /** 标题 */
+  label: string;
+  /** 查询属性 */
+  prop: string;
+  /** 标题宽度 */
+  labelWidth?: string;
+  /** 搜索类型 */
+  type: 'input' | 'select' | 'time';
+  /** 下拉框搜索的值 */
+  checkarr: { dictKey: string; dictValue: string }[];
+}[];
+
+const props = defineProps({
+  search: {
+    type: Boolean,
+    required: true,
+  },
+  /** 是否显示弹窗 */
+  modelValue: {
+    type: Boolean,
+    required: true,
+  },
+  /** 查询的容器 */
+  query: {
+    type: Boolean,
+    required: true,
+  },
+  /** 搜索配置项 */
+  searchOption: {
+    type: Array as PropType<SerachOption>,
+    required: true,
+  },
+});
+
+const $emit = defineEmits(['update:modelValue', 'search', 'remove']);
+
+const details = reactive({
+  /** 时间快捷选择设置 */
+  shortcuts: [
+    {
+      text: '最近一周',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近一个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+        return [start, end];
+      },
+    },
+    {
+      text: '最近三个月',
+      value: () => {
+        const end = new Date();
+        const start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+        return [start, end];
+      },
+    },
+  ],
+});
+
+/** 搜索 */
+const handleSearch = () => {
+  $emit('search', props.query);
+};
+
+/** 清空搜索框 */
+const searchReset = () => {
+  $emit('remove');
+};
+</script>
+
+<style scoped lang="scss"></style>

src/components/MyPrint/MyPrint.vue

@@ -60,7 +60,7 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, computed, ref, nextTick, reactive } from 'vue';
+import { defineProps, computed, ref, nextTick, reactive, watch } from 'vue';
 import print from '@/utils/print';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getObjType } from '@/utils/util';
@@ -249,6 +249,21 @@ const printTemplate = () => {
 const handleFullScrean = () => {
   details.isFullscreen = !details.isFullscreen;
 };
+
+watch(
+  () => props.modelValue,
+  async () => {
+    if (!props.modelValue) return;
+
+    await nextTick();
+
+    setTimeout(() => {
+      const node = document.querySelectorAll('.printCode .isEdit');
+      console.log('node :>> ', node);
+      node.forEach(val => val.setAttribute('contenteditable', true));
+    }, 500);
+  }
+);
 </script>
 
 <style scoped lang="scss">

src/components/edittablehead/index.vue

@@ -163,7 +163,7 @@ const initTable = async () => {
 
         if (item.prop + item.label + item.type !== value.prop + value.label + value.type) continue;
         item.checkarr = value.checkarr || [];
-        _setArr.push(item);
+        _setArr.push({ ...value, width: item.width });
         _oldArr.splice(i, 1);
         break;
       }

src/main.js

@@ -23,6 +23,7 @@ import thirdRegister from './components/third-register/main.vue';
 import NfDesignBase from '@saber/nf-design-base-elp';
 import flowDesign from './components/flow-design/main.vue';
 import tablecmt from './components/tablecmt/tablecmt.vue';
+import HeaderSearch from './components/HeaderSearch/HeaderSearch.vue';
 import webCamera from './components/webCameraIMG/webCamera.vue';
 import SelectBox from './components/SelectBox/SelectBox.vue';
 import edittablehead from './components/edittablehead/index.vue';
@@ -60,6 +61,8 @@ app.component('tablecmt', tablecmt);
 app.component('webCamera', webCamera);
 app.component('edittablehead', edittablehead);
 app.component('SelectBox', SelectBox);
+/** 表头搜索 */
+app.component('HeaderSearch', HeaderSearch);
 /** 打印 */
 app.component('MyPrint', MyPrint);
 /** 上传Excel */

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -490,6 +490,7 @@
                       :min="0"
                       :max="item.ProportionMax"
                       :controls="false"
+                      :precision="2"
                       :value-on-clear="0"
                     />
                   </el-form-item>
@@ -786,7 +787,7 @@ const form = ref({
       responsibilityRatio: 0, //占比
       description: '', //三方责任人
       tripartite: '', //说明
-      ProportionMax: 100, //最大值校验
+      ProportionMax: 99999999999999999, //最大值校验
       Processingoptions: [
         //提货责任方列表
       ],
@@ -925,7 +926,7 @@ const responsibilities = async () => {
       responsibilityRatio: 0, //占比
       description: '', //三方责任人
       tripartite: '', //说明
-      ProportionMax: 100, //最大值校验
+      ProportionMax: 99999999999999999, //最大值校验
       Processingoptions: [
         //提货责任方列表
         ...ResponsibleParty.value,
@@ -1095,7 +1096,7 @@ const AddResponsible = () => {
     responsibilityRatio: 0, //占比
     description: '', //三方责任人
     tripartite: '', //说明
-    ProportionMax: 100, //最大值校验
+    ProportionMax: 99999999999999999, //最大值校验
     Processingoptions: [
       //提货责任方列表
       ...ResponsibleParty.value,
@@ -1110,7 +1111,7 @@ const AddResponsible = () => {
     id: form.value.responsibilitiesList.length + 1,
   };
   form.value.responsibilitiesList.push(data);
-  calculateMaxValues();
+  // calculateMaxValues();
 };
 // 责任方移除
 const Responsemoval = index => {
@@ -1124,7 +1125,7 @@ const Responsemoval = index => {
     form.value.responsibilitiesList.forEach((item, index) => {
       item.id = index + 1;
     });
-    calculateMaxValues(); //调用占比计算
+    // calculateMaxValues(); //调用占比计算
     ElMessage({
       message: '移除成功.',
       type: 'success',
@@ -1134,6 +1135,7 @@ const Responsemoval = index => {
 };
 
 const calculateMaxValues = () => {
+  return
   // 计算每个输入框剩余最大值
   let data = form.value.responsibilitiesList;
   let totalUsed = data.reduce((acc, item) => acc + item.responsibilityRatio, 0);

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -8,8 +8,16 @@
         type="border-card"
         @tab-click="TabactiveClick"
       >
-        <el-tab-pane label="订单填写" :name="1"></el-tab-pane>
-        <el-tab-pane label="零担填写" :name="2"> </el-tab-pane>
+        <el-tab-pane
+          label="订单信息"
+          :name="1"
+          :disabled="form.basis.TabactiveName == 2"
+        ></el-tab-pane>
+        <el-tab-pane
+          label="零担信息"
+          :name="2"
+          :disabled="form.basis.TabactiveName == 1"
+        ></el-tab-pane>
       </el-tabs>
     </div>
     <!-- 主体内容 -->
@@ -490,16 +498,16 @@
                   </el-form-item>
 
                   <el-form-item
-                    label="占比(%)"
+                    label="金额（元）"
                     :prop="`responsibilitiesList[${index}.responsibilityRatio]`"
                     :rules="ruleForm.responsibilityRatio"
-                    @change="CompanyProportionInput"
                   >
                     <el-input-number
                       v-model="item.responsibilityRatio"
                       :min="0"
                       :max="item.ProportionMax"
                       :controls="false"
+                      :precision="2"
                       :value-on-clear="0"
                     />
                   </el-form-item>
@@ -533,7 +541,7 @@
                   </el-form-item>
 
                   <el-button
-                    v-if="!index && $route.query.typesOf !=0"
+                    v-if="!index && $route.query.typesOf != 0"
                     type="primary"
                     class="el_addPackage"
                     @click="AddResponsible"
@@ -553,11 +561,11 @@
                 <div></div>
               </template>
             </div>
-            <div class="el_top">
+            <!-- <div class="el_top">
               <div class="el_Package_num">
                 <span>公司占比:{{ form.Proportion }}(%)</span>
               </div>
-            </div>
+            </div> -->
           </el-tab-pane>
         </el-tabs>
 
@@ -931,7 +939,7 @@ const form = ref({
       responsibilityRatio: 0, //占比
       description: '', //三方责任人
       tripartite: '', //说明
-      ProportionMax: 100, //最大值校验
+      ProportionMax: 99999999999999999, //最大值校验
       Processingoptions: [
         //提货责任方列表
       ],
@@ -1011,10 +1019,10 @@ const workOrderStatus = computed(() => {
 
 // 修改提交权限
 const Modificationsubmission = () => {
-  if (['10','90'].includes($route.query.workOrderStatus)) {
-      return true;
-    }
-    return false
+  if (['10', '90'].includes($route.query.workOrderStatus)) {
+    return true;
+  }
+  return false;
 };
 // 申诉成立权限
 const Appealestablished = () => {
@@ -1023,14 +1031,14 @@ const Appealestablished = () => {
       return true;
     }
   }
-  return false
+  return false;
 };
 // 处理结果修改权限
 const resultmodification = () => {
   if ($route.query.workOrderStatus == '21') {
     return true;
   }
-  return false
+  return false;
 };
 // 工单状态
 const NumberState = computed(() => {
@@ -1084,7 +1092,7 @@ const responsibilities = async () => {
       responsibilityRatio: 0, //占比
       description: '', //三方责任人
       tripartite: '', //说明
-      ProportionMax: 100, //最大值校验
+      ProportionMax: 99999999999999999, //最大值校验
       Processingoptions: [
         //提货责任方列表
         ...ResponsibleParty.value,
@@ -1128,22 +1136,17 @@ const PageState = () => {
     // );
     // form.value.UserPermissions = matchingItem.dictValue;
 
-
     // 获取用户角色信息，并拆分为数组
-     const roleNames = await JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name.split(
-        ','
-      );
-      // 根据角色名称查找匹配项目
-      const matchingItem = res.data.data.find(item => roleNames.includes(item.dictValue));
-      if (matchingItem) {
-        form.value.UserPermissions = matchingItem.dictValue;
-      } else {
-        form.value.UserPermissions = '仓库客服';
-      }
-
-
-
-
+    const roleNames = await JSON.parse(
+      localStorage.getItem('TWMS-userInfo')
+    ).content.role_name.split(',');
+    // 根据角色名称查找匹配项目
+    const matchingItem = res.data.data.find(item => roleNames.includes(item.dictValue));
+    if (matchingItem) {
+      form.value.UserPermissions = matchingItem.dictValue;
+    } else {
+      form.value.UserPermissions = '仓库客服';
+    }
   });
   // 内部责任划分初始化
   responsibilities();
@@ -1184,6 +1187,9 @@ const getPageData = async () => {
           });
         });
       }
+      form.value.PackageList[0].packageCode
+        ? (form.value.basis.TabactiveName = 1)
+        : (form.value.basis.TabactiveName = 2);
       //   基础信息
       // trainNumber: ['3', '5', '6', '7'].includes(form.value.groundlineType), //车次号
       // deliveryTime: ['5', '6', '7'].includes(form.value.groundlineType), //配送时间
@@ -1252,7 +1258,7 @@ const getPageData = async () => {
             responsibilityRatio: Number(item.responsibilityRatio), //占比
             description: item.description, //说明
             tripartite: item.tripartite, //责任人
-            ProportionMax: 100, //最大值校验
+            ProportionMax: 999999999999999999, //最大值校验
             inputDisplay: true,
             valueId: item.id,
             Processingoptions: [
@@ -1273,7 +1279,7 @@ const getPageData = async () => {
             id: form.value.responsibilitiesList.length + 1,
           };
           form.value.responsibilitiesList.push(data);
-          calculateMaxValues();
+          // calculateMaxValues();
         });
       }
       // 是否置空完结初始值
@@ -1498,7 +1504,7 @@ const AddResponsible = () => {
     responsibilityRatio: 0, //占比
     description: '', //三方责任人
     tripartite: '', //说明
-    ProportionMax: 100, //最大值校验
+    ProportionMax: 999999999999999999999999999999, //最大值校验
     inputDisplay: false, //是否可以输入
     Processingoptions: [
       //提货责任方列表
@@ -1514,7 +1520,7 @@ const AddResponsible = () => {
     id: form.value.responsibilitiesList.length + 1,
   };
   form.value.responsibilitiesList.push(data);
-  calculateMaxValues();
+  // calculateMaxValues();
 };
 // 责任方移除
 const Responsemoval = index => {
@@ -1528,7 +1534,7 @@ const Responsemoval = index => {
     form.value.responsibilitiesList.forEach((item, index) => {
       item.id = index + 1;
     });
-    calculateMaxValues(); //调用占比计算
+    // calculateMaxValues(); //调用占比计算
     ElMessage({
       message: '移除成功.',
       type: 'success',
@@ -1538,6 +1544,7 @@ const Responsemoval = index => {
 };
 
 const calculateMaxValues = () => {
+  return
   // 计算每个输入框剩余最大值
   let data = form.value.responsibilitiesList;
   let totalUsed = data.reduce((acc, item) => acc + item.responsibilityRatio, 0);
@@ -2058,12 +2065,12 @@ const onSubmit = () => {
               tripartite: item.tripartite, //三方责任人
               description: item.description, //说明
             };
-                     // 责任人查询
-                 let    Responsibleperson = item.ResponsibleoNameptions.find(
+            // 责任人查询
+            let Responsibleperson = item.ResponsibleoNameptions.find(
               res => res.id == item.personResponsibleId
             );
-            console.log(Responsibleperson,'Responsibleperson');
-            
+            console.log(Responsibleperson, 'Responsibleperson');
+
             if (form.value.groundlineType == '1') {
               data.personResponsibleName = item.personResponsibleId; //责任人名称
               data.businessName = item.Processingoptions.find(
@@ -2071,8 +2078,10 @@ const onSubmit = () => {
               ).label; //责任方
               data.businessId = item.businessId; //责任方id
             } else {
-              data.personResponsibleId = Responsibleperson? Responsibleperson.id:null; //责任人id
-              data.personResponsibleName = item.ResponsibleoNameptions.find(res => res.id == item.personResponsibleId)?.name ||  item.personResponsibleId; //责任人名称
+              data.personResponsibleId = Responsibleperson ? Responsibleperson.id : null; //责任人id
+              data.personResponsibleName =
+                item.ResponsibleoNameptions.find(res => res.id == item.personResponsibleId)?.name ||
+                item.personResponsibleId; //责任人名称
               data.businessName = item.Responsibleoptions.find(
                 res => res.value == item.businessId
               ).label; //责任方
@@ -2094,8 +2103,8 @@ const onSubmit = () => {
       ) {
         submitData.decreaseImageEntityList = [];
         form.value.fileList.forEach(item => {
-          console.log(item,'图片12');
-          
+          console.log(item, '图片12');
+
           if (item.response || item.url) {
             submitData['decreaseImageEntityList'].push({
               imageName: item.response?.data.originalName || item.name, //图片名称
@@ -2154,9 +2163,9 @@ const onSubmit = () => {
       //是否直接提交到处理结果
       if (form.value.Processed) {
         submitData.workOrderStatus = 30;
-        submitData.resultIdentification=1;
-      }else{
-        submitData.resultIdentification=2;
+        submitData.resultIdentification = 1;
+      } else {
+        submitData.resultIdentification = 2;
       }
       $_modifyData(submitData)
         .then(res => {
@@ -2698,8 +2707,8 @@ const TabactiveClick = (a, b) => {
     }
   }
 }
-:deep(.el_foort_img){
-  .el-upload{
+:deep(.el_foort_img) {
+  .el-upload {
     display: none;
   }
 }

src/views/distribution/inventory/CreateOrder.vue

@@ -66,6 +66,7 @@
                   prefix-icon="Calendar"
                   type="datetime"
                   placeholder="创建时间"
+                  :clearable="false"
                 />
               </div>
             </div>

src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue

@@ -417,6 +417,12 @@
   ></edittablehead>
 </template>
 
+<script lang="ts">
+export default {
+  name: '/distribution/inventory/addArteryDistrilbutionBillLadingList',
+};
+</script>
+
 <script lang="ts" setup>
 // 引入页面请求
 import {

src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue

@@ -2,114 +2,105 @@
   <basic-container v-loading="loadingObj.pageLoading">
     <div class="avue-crud">
       <!-- 搜索模块 -->
-      <div v-h5uShow="!search">
-        <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="header_search">
-          <el-form-item label="批次号:">
-            <el-input v-model="query.serviceNumber" placeholder="请输入批次号" clearable></el-input>
-          </el-form-item>
-
-          <!-- 查询按钮 -->
-          <el-form-item class="el-btn">
-            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
-            <el-button icon="el-icon-delete" @click="searchReset">清 空</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+      <HeaderSearch
+        :search="search"
+        :query="query"
+        :searchOption="searchOption"
+        @search="() => searchChange()"
+        @remove="() => searchReset()"
+      />
 
       <!-- 控件模块 -->
-      <el-row>
-        <div class="avue-crud__header">
-          <!-- 头部左侧按钮模块 -->
-          <div class="avue-crud__left">
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_add"
-              icon="el-icon-plus"
-              @click="handleAdd"
-            >
-              新 增
-            </el-button>
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_edit"
-              icon="el-icon-edit"
-              @click="handleEdit"
-              >编 辑</el-button
-            >
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_addBillLadingData"
-              icon="el-icon-plus"
-              @click="handleAddDistrilbution"
-            >
-              添加提货数据
-            </el-button>
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_startBill"
-              icon="Check"
-              @click="handleEditBillladingStatus(1)"
-            >
-              开始提货
-            </el-button>
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_confirmBill"
-              icon="el-icon-check"
-              @click="handleShowConfirm"
-            >
-              提货完成
-            </el-button>
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_cancelConfirmBill"
-              icon="el-icon-close"
-              @click="handleEditBillladingStatus(3)"
-            >
-              取消完成
-            </el-button>
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_settleAccounts"
-              icon="el-icon-check"
-              @click="handleEditBillladingStatus(4)"
-            >
-              结 算
-            </el-button>
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_cancelSettleAccounts"
-              icon="el-icon-close"
-              @click="handleEditBillladingStatus(5)"
-            >
-              取消结算
-            </el-button>
-            <el-button
-              type="primary"
-              v-if="permissionObj.arteryDistrilbutionBillLadingList_cancelBill"
-              icon="el-icon-close"
-              @click="handleEditBillladingStatus(6)"
-            >
-              取消提货
-            </el-button>
-            <el-button
-              type="danger"
-              icon="el-icon-download"
-              @click="() => handleExportInfo('page')"
-              plain
-            >
-              导出
-            </el-button>
-          </div>
-          <!-- 头部右侧按钮模块 -->
-          <div class="avue-crud__right">
-            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
-            <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
-            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
-          </div>
+      <div class="avue-crud__header flex-c-sb">
+        <!-- 头部左侧按钮模块 -->
+        <div class="avue-crud__left">
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_add"
+            icon="el-icon-plus"
+            @click="handleAdd"
+          >
+            新 增
+          </el-button>
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_edit"
+            icon="el-icon-edit"
+            @click="handleEdit"
+            >编 辑</el-button
+          >
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_addBillLadingData"
+            icon="el-icon-plus"
+            @click="handleAddDistrilbution"
+          >
+            添加提货数据
+          </el-button>
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_startBill"
+            icon="Check"
+            @click="() => handleShowConfirm(1)"
+          >
+            开始提货
+          </el-button>
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_confirmBill"
+            icon="el-icon-check"
+            @click="() => handleShowConfirm(2)"
+          >
+            提货完成
+          </el-button>
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_cancelConfirmBill"
+            icon="el-icon-close"
+            @click="() => handleEditBillladingStatus(3)"
+          >
+            取消完成
+          </el-button>
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_settleAccounts"
+            icon="el-icon-check"
+            @click="() => handleEditBillladingStatus(4)"
+          >
+            结 算
+          </el-button>
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_cancelSettleAccounts"
+            icon="el-icon-close"
+            @click="() => handleEditBillladingStatus(5)"
+          >
+            取消结算
+          </el-button>
+          <el-button
+            type="primary"
+            v-if="permissionObj.arteryDistrilbutionBillLadingList_cancelBill"
+            icon="el-icon-close"
+            @click="() => handleEditBillladingStatus(6)"
+          >
+            取消提货
+          </el-button>
+          <el-button
+            type="danger"
+            icon="el-icon-download"
+            @click="() => handleExportInfo('page')"
+            plain
+          >
+            导出
+          </el-button>
+        </div>
+        <!-- 头部右侧按钮模块 -->
+        <div class="avue-crud__right">
+          <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+          <el-button icon="Operation" @click="showdrawer(true)" circle></el-button>
+          <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
         </div>
-      </el-row>
+      </div>
 
       <!-- 列表模块 -->
       <tablecmt
@@ -140,31 +131,23 @@
         </template>
       </tablecmt>
 
-      <!-- 统计 -->
-      <!-- <el-row>
-        <div>选择数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
-        <div>总计: 总数: , 运单数: , 件数: , 重量: , 体积: , 提货费: ,</div>
-      </el-row> -->
-
       <!-- 分页模块 -->
-      <el-row class="el-fy">
-        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-          <!-- 分页模块 -->
-          <el-pagination
-            align="right"
-            background
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.pageNum"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
-          </el-pagination>
-        </div>
-      </el-row>
+      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.pageNum"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
+      </div>
 
       <!-- 添加提货数据 -->
       <el-dialog
@@ -257,16 +240,22 @@
 
       <!-- 确认提货完成 -->
       <el-dialog
-        title="确认提货完成"
+        :title="`确认提货${{ 1: '开始', 2: '完成' }[form.type]}`"
         v-model="popUpShow.confirmBillLading"
         width="780px"
         :before-close="beforeClose"
+        align-center
+        destroy-on-close
         append-to-body
       >
-        <el-form ref="form" :model="form" label-width="120px">
+        <el-form ref="billLadingFormRef" :model="form" label-width="120px">
           <!-- 表单字段 -->
 
-          <el-form-item label="提货完成时间" prop="createTime">
+          <el-form-item
+            :label="`提货${{ 1: '开始', 2: '完成' }[form.type]}时间`"
+            :rules="[{ required: true, message: '请输入时间', trigger: 'change' }]"
+            prop="time"
+          >
             <el-date-picker
               class="w100 h100"
               v-model="form.time"
@@ -388,9 +377,9 @@ import {
   deepClone,
   handleTranslationDataSeclect,
   ChecksWhetherTheWarehouseIsSelected,
+  getObjType,
 } from '@/utils/util';
 import { dateNow } from '@/utils/date';
-import { detail } from '@/api/flow/flow';
 
 export default {
   data() {
@@ -456,7 +445,11 @@ export default {
       /** 字典 */
       clientType: [],
       options: [],
-      debounce,
+      searchOption: [
+        { label: '批次号', prop: 'serviceNumber', type: 'input' },
+        { label: '开始时间', prop: 'startTimeArr', type: 'time' },
+        { label: '完成时间', prop: 'completeTimeArr', type: 'time' },
+      ],
       /** 时间 */
       shortcuts: [
         {
@@ -493,37 +486,38 @@ export default {
           // 开启页面loading
           this.loading = true;
 
-          // 请求页面数据
-          const res = await postPageList({ ...page, ...this.query, ...params });
+          const submitData = { ...page, ...this.query, ...params };
 
-          console.log('res :>> ', res);
-          const { code, data } = res.data;
-          if (code !== 200) return;
+          // 开始时间
+          if (
+            getObjType(submitData.startTimeArr) === 'array' &&
+            submitData.startTimeArr.length > 0
+          ) {
+            submitData.startTimeStartStr = submitData.startTimeArr[0];
+            submitData.startTimeEndStr = submitData.startTimeArr[1];
+          }
 
-          this.data = data.records;
-          let _billladingStatusOption = [];
-          let _chargeTypeOption = [];
+          // 完成时间
+          if (
+            getObjType(submitData.completeTimeArr) === 'array' &&
+            submitData.completeTimeArr.length > 0
+          ) {
+            submitData.completeTimeStartStr = submitData.completeTimeArr[0];
+            submitData.completeTimeEndStr = submitData.completeTimeArr[1];
+          }
 
-          for (let i = 0; i < this.columnList.length; i++) {
-            const value = this.columnList[i];
+          delete submitData.startTimeArr;
+          delete submitData.completeTimeArr;
 
-            if (value.prop === 'billladingStatusName') _billladingStatusOption = value.checkarr;
-            else if (value.prop === 'chargeTypeName') _chargeTypeOption = value.checkarr;
-          }
+          // 请求页面数据
+          const res = await postPageList(submitData);
 
-          for (let i = 0; i < this.data.length; i++) {
-            const value = this.data[i];
+          const { code, data } = res.data;
+          if (code !== 200) return;
 
-            value.billladingStatusName = (
-              _billladingStatusOption.find(item => item.value === Number(value.billladingStatus)) ||
-              {}
-            ).label;
-            value.chargeTypeName = (
-              _chargeTypeOption.find(item => item.value === Number(value.chargeType)) || {}
-            ).label;
-          }
+          this.data = data.records;
 
-          console.log('this.data :>> ', this.data);
+          handleTranslationDataSeclect(this.data, this.columnList);
 
           this.page.total = data.total;
         } catch (error) {
@@ -788,7 +782,7 @@ export default {
       });
     },
     /** 提货完成 */
-    handleShowConfirm() {
+    handleShowConfirm(type) {
       if (!ChecksWhetherTheWarehouseIsSelected())
         return this.$message.warning('多仓权限无法操作，请选择仓库');
       if (this.selectionList.length === 0) return this.$message.error('最少选择一条数据');
@@ -801,35 +795,40 @@ export default {
         minTime: new Date(item.startTime).getTime(),
         time: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         id: item.id,
+        type,
       };
       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;
+    handleConfirmSubmit() {
+      this.$refs.billLadingFormRef.validate(async valid => {
+        if (!valid) return;
+        if (!this.form.time) return this.$message.warning('请选择时间');
+        try {
+          if (this.form.type !== 1 && 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 res = await postUpdateBillladingStatus({
+            id: this.form.id,
+            type: this.form.type,
+            completeTime: this.form.time,
+          });
 
-        const { code, msg } = res.data;
+          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;
-      }
+          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() {

src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@@ -49,7 +49,7 @@
               <el-button
                 v-if="
                   permissionObj.arteryDistrilbutionBillLadingListDetails_confirmEdit &&
-                  [1, 2].includes(Number(deliverydata.billladingStatus))
+                  [1, 2, 3].includes(Number(deliverydata.billladingStatus))
                 "
                 icon="CircleCheckFilled"
                 type="primary"

src/views/waybill/CreateZeroOrder.vue

@@ -58,7 +58,12 @@
               <el-icon><User /></el-icon>
               <span style="margin-left: 10px">{{ details.query.openOrderUserName }}</span>
             </div>
-            <el-date-picker v-model="query.openOrderDate" type="datetime" placeholder="创建时间" />
+            <el-date-picker
+              v-model="query.openOrderDate"
+              type="datetime"
+              :clearable="false"
+              placeholder="创建时间"
+            />
           </div>
         </div>
 

src/views/waybill/WaybillOrderList.vue

@@ -2,7 +2,7 @@
   <basic-container v-loading="details.loadingObj.pageLoading">
     <div class="avue-crud">
       <!-- 搜索模块 -->
-      <div v-h5uShow="!search">
+      <div v-h5uShow="search">
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
           <!-- <el-form-item label="有效状态">