新增简称，驳回功能

src/api/distribution/distributionDeliveryList.js

@@ -369,4 +369,13 @@ export const $_showInventoryPackgeCode = params => {
     method: 'get',
     params,
   });
+};
+
+// 驳回
+export const $_loadingAbnormalPackageListTurnDown = params => {
+  return request({
+    url: '/api/logpm-distribution/signfor/loadingAbnormalPackageListTurnDown',
+    method: 'get',
+    params,
+  });
 };

src/views/basic/coderule/basicTenantCode.vue

@@ -147,6 +147,10 @@
       <el-form-item label="租户编码:" prop="code" label-width="100px">
         <el-input v-model="form.code" placeholder="请输入编码" style="width: 83%" />
       </el-form-item>
+
+      <el-form-item label="简称:"  label-width="100px">
+        <el-input v-model="form.desName" placeholder="请输入简称" style="width: 83%" />
+      </el-form-item>
     </el-form>
     <!-- 表单按钮 -->
     <template #footer>

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -173,7 +173,6 @@
                 v-if="slotProps.scope.row.isHaveAbnormalPackage == '2'"
                 >异常审核
               </el-text>
-              <!-- v-if="slotProps.scope.row.isHaveAbnormalPackage == '2'" -->
 
               <el-text
                 type="primary"
@@ -886,6 +885,14 @@
               @click="auditing(slotProps.scope.row)"
               >审 核</el-text
             >
+              <el-text
+              v-if="slotProps.scope.row.auditingStatusName == '待审核'"
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="RejectFn(slotProps.scope.row)"
+                >驳回
+              </el-text>
           </template>
         </template>
       </tablecmt>
@@ -894,6 +901,38 @@
         <el-button type="primary" @click="allauditing">一键审批</el-button>
       </div>
     </el-dialog>
+
+
+
+  <el-dialog
+    v-model="dialogViReject"
+    title="驳回"
+    width="500"
+  >
+    <div>
+      <span>货物是否在库:&emsp;</span>
+      <el-select
+      v-model="yesOrNo"
+      placeholder="请选择货物是否在库"
+      style="width: 240px"
+    >
+      <el-option
+        v-for="item in ViRejectselect"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      />
+    </el-select>
+    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="ViReject">
+          确定
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
   </basic-container>
 </template>
 
@@ -918,6 +957,7 @@ import {
   printBatch,
   $_deliveryZeroPackage,
   $_showInventoryPackgeCode,
+  $_loadingAbnormalPackageListTurnDown,
 } from '@/api/distribution/distributionDeliveryList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { exportBlob } from '@/api/common';
@@ -954,6 +994,20 @@ import { useStore } from 'vuex';
 export default {
   data() {
     return {
+      ViRejectselect: [
+    {
+    value: true,
+    label: '是',
+    },
+    {
+    value: false,
+    label: '否',
+    },
+
+    ],
+      dialogViReject:false,//驳回弹窗
+      RejectRow:{},//驳回点击当前单子
+      yesOrNo:null,
       accessControl:'',
       html: '',
       reservationActiveName: 'reservationPackage',
@@ -3888,6 +3942,35 @@ if($useStore.getters && $useStore.getters.permission){
           this.AbnormalReviewloading = false; //关闭加载
         });
     },
+    RejectFn(row){
+      console.log(row);
+      this.RejectRow=row;
+      this.dialogViReject=true;
+    },
+    // 确定驳回
+    ViReject(){
+      if(this.yesOrNo==null){
+        ElMessage({
+        message: '请选择货物是否在库',
+        type: 'warning',
+        })
+        return
+      }
+      console.log(this.RejectRow,'this.RejectRow');
+      let data={
+        ids:this.RejectRow.id,
+        yesOrNo:this.yesOrNo,
+      } 
+      this.AbnormalReviewloading =true; //开启加载
+      this.dialogViReject=false;
+    $_loadingAbnormalPackageListTurnDown(data).then(res=>{
+    if(res.data.code ==200){
+      console.log(res,'驳回成功返回值');
+      this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
+    }
+
+    })
+    },
     //审批异常装车包件
     auditing(row) {
       this.AbnormalReviewloading = true; //开启加载

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -7,7 +7,7 @@
           <el-form-item label="入库时间:" class="el-times">
             <el-date-picker
               v-model="warehouseEntryTimeEnd"
-              type="datetimerange"
+              type="daterange"
               unlink-panels
               range-separator="至"
               start-placeholder="开始时间"
@@ -18,7 +18,7 @@
           <el-form-item label="装车时间:" class="el-times">
             <el-date-picker
               v-model="loadingTime"
-              type="datetimerange"
+              type="daterange"
               unlink-panels
               range-separator="至"
               start-placeholder="开始时间"
@@ -29,7 +29,7 @@
           <el-form-item label="签收时间:" class="el-times">
             <el-date-picker
               v-model="signingTime"
-              type="datetimerange"
+              type="daterange"
               unlink-panels
               range-separator="至"
               start-placeholder="开始时间"
@@ -923,7 +923,7 @@ export default {
         this.loadingTime.length === 0 &&
         this.signingTime.length === 0
       )
-        return this.$message.warning('请输入搜索条件!!!');
+        return this.$message.warning('请选择时间!!!');
 
       /** 入库时间 */
       this.query.startWarehouseEntryTimeEnd = this.warehouseEntryTimeEnd[0];