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

src/page/index/top/index.vue

@@ -13,7 +13,7 @@
       <top-menu ref="topMenu" v-if="setting.menu"></top-menu>
     </div>
     <div class="top-bar__right">
-      <!-- <top-search class="top-bar__item" v-if="setting.search"></top-search> -->
+      <top-search class="top-bar__item" v-if="setting.search"></top-search>
       <div v-if="setting.lock" class="top-bar__item">
         <top-lock></top-lock>
       </div>

src/views/cost/Deliverycostmanagement/Financialreview.vue

@@ -164,8 +164,7 @@ import {
   $_expenseDispatchFinancialReview,
 } from '@/api/storagecost/index.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { processRowProperty, setNodeHeight } from '@/utils/util';
+import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util';
-import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { downloadXls } from '@/utils/util';
 import { useStore } from 'vuex';
@@ -326,6 +325,12 @@ const currentChange = val => {
 const searchChangeS = () => {
   onLoad();
 };
+// 清空
+const searchReset = () => {
+  details.query = {};
+  handleClearTableQuery(details.columnList);
+  onLoad();
+};
 // 顶部搜索
 const searchHide = () => {
   console.log(details);

src/views/cost/Deliverycostmanagement/ServiceProviderPrice.vue

@@ -163,8 +163,7 @@
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/storagecost/ServiceProviderPrice.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { processRowProperty, setNodeHeight } from '@/utils/util';
+import { processRowProperty, setNodeHeight,handleClearTableQuery } from '@/utils/util';
-import functions from '@/utils/functions.js';
 import { getDriverList } from '@/api/basicdata/basicdataDriverArtery'; //司机信息
 import {
   $_getMyWarehouseList,
@@ -333,8 +332,15 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  // details.search = false; //关闭搜索
+  onLoad()
 };
+const searchReset=()=>{
+  details.query={}
+  queryTop.value={}
+  handleClearTableQuery(details.columnList);
+  onLoad()
+}
 // 每页多少条
 const sizeChange = val => {
   details.page.pageSize = val;
@@ -471,7 +477,13 @@ const PageOnload = async () => {
   await MyWarehouseList(); //获取仓库
   onLoad();
 };
-
+const AddInfo=()=>{
+  ElMessage({
+    message: '功能维护',
+    type: 'warning',
+  })
+  return
+}
 //页面初始化方法
 PageOnload();
 // 价格配置提交
@@ -628,10 +640,13 @@ const deleteTemplate = row => {
   width: 100%;
   display: flex;
   justify-content: space-between;
-  .el-btn {
+  :deep(.el-btn) {
     margin-right: 0;
     width: 15%;
     align-items: flex-start;
+    .el-form-item__content{
+      justify-content: flex-end;
+    }
   }
 }
 </style>

src/views/cost/Deliverycostmanagement/Traincostbreakdown.vue

@@ -156,7 +156,7 @@
               style="width: 100%"
               :rows="4"
               type="textarea"
-              placeholder="请填写结算备注(必填)"
+              placeholder="请填写结算备注"
             />
           </el-form-item>
         </el-form>
@@ -579,13 +579,6 @@ const confirmation = row => {
 };
 // 结算确定
 const SettlementconfirmationSubmit = async row => {
-  if (!Confirmsettlement.value.form.settlementNote) {
-    ElMessage({
-      message: '请填写结算备注',
-      type: 'warning',
-    });
-    return;
-  }
   try {
     Confirmsettlement.value.loading = true;
     let Submit = {

src/views/cost/Deliverycostmanagement/WarehouseDeliveryCost.vue

@@ -413,6 +413,7 @@ const searchReset = () => {
     item.values = '';
   });
   details.query = {};
+  queryTop.value={}
   onLoad();
 };
 // 结算时间跳转

src/views/cost/Deliverycostmanagement/WarehousePricingTemplate.vue

@@ -7,7 +7,7 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="queryTop" class="el-fr-d">
           <div>
-            <el-form-item label="中转仓">
+            <el-form-item label="仓库名称">
               <el-select
                 v-model="queryTop.warehouse"
                 multiple
@@ -23,7 +23,7 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="签收时间">
+            <el-form-item label="修改时间">
               <el-date-picker
                 v-model="queryTop.costSettlementYear"
                 type="datetimerange"
@@ -128,12 +128,10 @@ import {
   $_removeTemplate,
 } from '@/api/storagecost/index.js';
 import { processRowProperty, setNodeHeight } from '@/utils/util';
-import functions from '@/utils/functions.js';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { downloadXls } from '@/utils/util';
+import { downloadXls,handleClearTableQuery } from '@/utils/util';
 import { useStore } from 'vuex';
 import dayjs from 'dayjs';
-import error from '@/error';
 const $router = useRouter(); //跳转
 const $useStore = useStore(); //权限
 const $route = useRoute(); //获取地址栏参数
@@ -273,6 +271,13 @@ const selectionChange = list => {
 const searchChange = () => {
   onLoad();
 };
+// 清空
+const searchReset=()=>{
+  queryTop.value = {};
+  details.query = {};
+  handleClearTableQuery(details.columnList);
+  onLoad();
+}
 // 每页多少条
 const sizeChange = val => {
   details.page.pageSize = val;
@@ -426,10 +431,13 @@ const lyadded = () => {
   width: 100%;
   display: flex;
   justify-content: space-between;
-  .el-btn {
+  :deep(.el-btn) {
     margin-right: 0;
     width: 15%;
     align-items: flex-start;
+    .el-form-item__content{
+      justify-content: flex-end; 
+    }
   }
 }
 </style>

src/views/desk/notice.vue

@@ -27,7 +27,7 @@
           plain
           v-if="permission.notice_delete"
           @click="handleDelete"
-          >删 除
+          >批 量 删 除
         </el-button>
       </template>
       <template #="{ row }">

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -2536,7 +2536,13 @@ export default {
         if (_check.length) {
           this.$refs.orderChooseTable.handleCheckSelect(_check);
         } else {
-          this.$refs.orderChooseTable.handleCheckSelect(data.records);
+          console.log(data.records, 'data.records');
+          let _list = data.records.filter(item => {
+            return item.orderPackageStatusName !== '已签收';
+          });
+          console.log(_list, '_lsit');
+
+          this.$refs.orderChooseTable.handleCheckSelect(_list);
         }
         console.log(this.order.selectList, '已经回显的值');
         this.selectionClear();
@@ -3530,10 +3536,10 @@ export default {
         console.log('执行了二次操作');
         const data = res.data.data;
         this.dataList = data.records;
-        if(this.dataList?.length){
+        if (this.dataList?.length) {
           this.dataList.forEach(i => {
-          i.reservationNum = i.handQuantity;
+            i.reservationNum = i.handQuantity;
-        })
+          });
         }
 
         this.loading = false;