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

src/api/distribution/disStockListDetail.js

@@ -21,7 +21,14 @@ export const getDisStockList = (params) => {
     }
   })
 }
-
+// 库存品查看详情
+export const $_detailOwnSelfInventoryDetail = (params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockup/detailOwnSelfInventoryDetail',
+    method: 'get',
+    params,
+  })
+}
 /**
  * 库存品打印模板
  * @param params

src/option/warehouse/distributionStockArticle.js

@@ -11,7 +11,7 @@ export const columnList = [
       label: '序号',
       type: 12,
       values: '',
-      width: 55,
+      width:80,
       fixed: true,
     },
     {
@@ -39,9 +39,9 @@ export const columnList = [
     {
       prop: 'orderCode',
       label: '订单自编号',
-      type: 2,
+      type: 13,
       values: '',
-      width: '150',
+      width: '280',
       checkarr: [],
       fixed: false,
       sortable: true,
@@ -140,9 +140,9 @@ export const columnList = [
       {
         prop: 'earliestWarehouseEntryTime',
         label: '首次入库时间',
-        type: 2,
+        type: 4,
         values: '',
-        width: '150',
+        width: '180',
         checkarr: [],
         fixed: false,
         sortable: true,
@@ -153,7 +153,7 @@ export const columnList = [
         label: '最新入库时间',
         type: 4,
         values: '',
-        width: '150',
+        width: '180',
         checkarr: [],
         fixed: false,
         sortable: true,
@@ -195,7 +195,7 @@ export const columnList = [
       {
         prop: 'orderStatusName',
         label: '订单状态',
-        type: 2,
+        type: 1,
         values: '',
         width: '150',
         checkarr: [],
@@ -206,7 +206,7 @@ export const columnList = [
       {
         prop: 'orderReservationStatusName',
         label: '预约状态',
-        type: 2,
+        type: 1,
         values: '',
         width: '150',
         checkarr: [],
@@ -217,7 +217,7 @@ export const columnList = [
       {
         prop: 'reservationInfo',
         label: '预约信息',
-        type: 2,
+        type: 13,
         values: '',
         width: '150',
         checkarr: [],
@@ -307,7 +307,7 @@ export const columnList = [
       {
         prop: 'createTime',
         label: '创建时间',
-        type: 4,
+        type: 1,
         values: '',
         width: '150',
         checkarr: [],
@@ -318,7 +318,7 @@ export const columnList = [
       {
         prop: 'createUserName',
         label: '创建人',
-        type: 2,
+        type: 1,
         values: '',
         width: '150',
         checkarr: [],

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -1483,7 +1483,6 @@ const ConfirmForm = () => {
       delete DataSubmit.processor; //移除多余字段
       console.log(DataSubmit, '处理好的数据');
       // 提交表单信息stringify
-      return;
       Addloading.value = true; //开启页面加载
       $_submit(DataSubmit)
         .then(res => {

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -536,6 +536,8 @@ export default {
       },
       loginRules: {
         typeService: [{ required: true, message: '请选择服务类型', trigger: ['blur', 'change'] }],
+        cost: [{ required: true, message: '请输入费用', trigger: ['blur', 'change'] }],
+        cause: [{ required: true, message: '请输入原因', trigger: ['blur', 'change'] }],
       },
       /** loading */
       loadingObj: {

src/views/distribution/reservation/reservationAddFrom.vue

@@ -124,8 +124,8 @@
         </el-row>
       </el-form>
 
-      <el-tabs type="border-card" @tab-click="handleClick">
-        <el-tab-pane label="订单">
+      <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane name='orderTab' label="订单">
           <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
           <tablecmt
             class="tablesc"
@@ -174,7 +174,7 @@
           </tablecmt>
         </el-tab-pane>
 
-        <el-tab-pane label="库存品">
+        <el-tab-pane name='InventoryTab' label="库存品">
           <el-button class="el-btn-xz" link @click="handleAddInventory">新 增</el-button>
           <tablecmt
             class="tablesc"
@@ -505,18 +505,18 @@ import {
 } from '@/api/distribution/distributionStockArticle';
 import { getDetailDelivery } from '@/api/distribution/distributionDelivery';
 import { getInventoryList, selectInventoryDetail } from '@/api/distribution/distributionStockList';
-import { ElMessage } from 'element-plus';
 import option from '@/option/distribution/distributionStockArticle';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
 import { entryNum, updateEntryNum } from '@/api/distribution/distributionParcelNumber';
 import { setNodeHeight, removeZeroWidth } from '@/utils/util.js';
-
+import { ElMessage, ElMessageBox } from 'element-plus'
 export default {
   name: '/distribution/reservation/reservationAddFrom',
   data() {
     return {
+      activeName:'orderTab',
       Inventoryloading: true, //库存品加载
       packageQuery: {},
       reservationloading: false,
@@ -2019,7 +2019,7 @@ export default {
   },
   mounted() {
     this.init();
-
+  this.Copyfrom= JSON.parse(JSON.stringify(this.form))
     this.onLoad(this.page);
     this.getDictionary();
 
@@ -2539,9 +2539,8 @@ export default {
       this.$store.commit('DEL_TAG_CURRENT');
     },
     // 最后提交
-    onSubmit(formEl) {
-      // if (!formEl) return;
-      this.$refs.ruleForm.validate(async valid => {
+  async  onSubmit(formEl) {
+this.$refs.ruleForm.validate(async valid => {
         if (valid) {
           console.log('submit!');
           try {
@@ -2654,17 +2653,52 @@ export default {
                 message: '操作成功!',
               });
               this.back();
-            } else {
-              this.form.reservationStatus = '20';
+           } else {
+             this.form.reservationStatus = '20';
               const res = await autonomouslySave(this.form);
               console.log('res :>> ', res);
               if (res.data.code !== 200) return;
-
-              this.$message({
+       ElMessageBox.confirm(
+        '当前预约已完成，是否继续添加预约?',
+        '提示',
+      {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+      }
+  )
+    .then(() => {
+this.form=this.Copyfrom
+this.Copyfrom= JSON.parse(JSON.stringify(this.form))
+this.$refs.ruleForm.resetFields(); // 调用重置验证状态的方法
+this.renderOrderData=[]//订单重置
+this.serveType=[];//服务类型重置
+this.renderInventoryData=[]//库存品重置
+this.orderList=[]
+this.orderData = []
+this.packageListInfo=[]
+this.stockArticleInfo=[]
+this.inventoryDat= []
+this.inventoryData=[]
+this.inventoryList=[]
+delete this.query.marketName
+this.marketName=''
+this.activeName='orderTab',
+console.log(this.orderList,'');
+    })
+    .catch(() => {
+      this.$message({
                 type: 'success',
                 message: '操作成功!',
               });
               this.back();
+    })
+
+              // this.$message({
+              //   type: 'success',
+              //   message: '操作成功!',
+              // });
+              // this.back();
             }
           } catch (error) {
             console.log('error :>> ', error);
@@ -3282,6 +3316,7 @@ export default {
 
         if (code !== 200) return;
 
+        console.log('this.orderList',this.orderList)
         const _chooseArr = [...this.orderList];
 
         this.stockArticleInfo = records;

src/views/distribution/stockup/distributionStockupDetailsSelf.vue

@@ -74,6 +74,7 @@
         >
           <el-tab-pane label="自提列表" name="reservation">
             <tablecmt
+            class="tableNode"
               :columnList="columnList1"
               :tableData="data3"
               :loading="loading"
@@ -105,6 +106,7 @@
           </el-tab-pane>
           <el-tab-pane label="订单列表" name="library">
             <tablecmt
+            class="tableNode"
               :columnList="columnList2"
               :tableData="dataPare"
               :loading="loading"
@@ -139,6 +141,7 @@
               >备货</el-button
             >
             <tablecmt
+            class="tableNode"
               :columnList="columnList3"
               :tableData="data1"
               :loading="loading"
@@ -183,6 +186,7 @@
           <el-tab-pane label="库存品" name="enter">
             <el-button @click="handleBatchDetail1('2')">批量打印</el-button>
             <tablecmt
+            class="tableNode"
               :columnList="columnList4"
               :tableData="data2"
               :loading="loading"
@@ -198,8 +202,19 @@
                   @click="onDetail(slotProps.scope.row)"
                   >明细</el-text
                 >
+
+            <template v-if="slotProps.scope.column.label === '操作'">
+              <el-text
+                  @click="Inventorydetails(slotProps.scope.row)"
+                  >查看详情</el-text
+                >
+
+            
+          </template>
                 <!-- <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text> -->
               </template>
+
+              
             </tablecmt>
             <div class="avue-crud__pagination" style="width: 100%">
               <!-- 分页模块 -->
@@ -259,6 +274,7 @@
         >
 
         <tablecmt
+        class="tableNode"
           :columnList="columnInventoryBatch"
           :tableData="packageCodeList"
           :loading="loading"
@@ -354,6 +370,36 @@
         </template>
       </el-dialog>
     </div>
+
+
+
+    <!-- 库存品查看详情 -->
+    <el-dialog
+    v-model="dialogInventory"
+    title="详情"
+    width="60%"
+  >
+
+  <tablecmt
+          class="tableNodeS"
+          :columnList="TccolumnInventory"
+          :tableData="TccolumnInventoryData"
+          :loading="TcloadingInventory"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+          </template>
+        </tablecmt>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="dialogInventory = false">关闭</el-button>
+      </div>
+    </template>
+  </el-dialog>
   </basic-container>
 </template>
 
@@ -374,10 +420,11 @@ import {
   getListUser,
 } from '@/api/distribution/distributionStockup';
 import option from '@/option/distribution/distributionStockup';
+import {  setNodeHeight } from '@/utils/util';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList';
-import { getDisStockList, getPrintDetail } from '@/api/distribution/disStockListDetail';
+import { getDisStockList, getPrintDetail,$_detailOwnSelfInventoryDetail } from '@/api/distribution/disStockListDetail';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getStockDetail } from '@/api/distribution/distributionStock';
 import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
@@ -389,11 +436,97 @@ export default {
   data() {
     return {
       html: '', // 页面包条码内容
+      Inventoryform:{},
+      dialogInventory:false,//库存品详情弹窗
       dialogVisible: false, //二维码控制
       dialogPack: false, //包件控制
       height: 0,
+      TcloadingInventory:false,
       activeName: 'reservation',
       packageCodeList: [],
+      TccolumnInventoryData:[],
+      TccolumnInventory:[
+        {
+          prop: 'pickupBatch',
+          label: '自提批次号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'reservationTime',
+          label: '计划创建时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'codeCreatedTime',
+          label: '二维码生成时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockScanTime',
+          label: '备货扫描时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockPackageCode',
+          label: '包条码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'qrCode',
+          label: '下架库位',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        
+        
+
+      ],
       columnInventoryBatch: [
         {
           prop: '',
@@ -1474,6 +1607,38 @@ export default {
         this.packageCodeList = s;
       });
     },
+
+    heightTC(){
+            const _node = document.querySelectorAll('.tableNode');
+      setNodeHeight(_node, '', true);
+    },
+    // 库存品查看详情
+    Inventorydetails(val){
+      this.TcloadingInventory=true
+      console.log(val,'val');
+      this.Inventoryform={}
+      this.dialogInventory=true;//开启弹窗
+      let data={
+        billLadingId:val.billLadingId,
+        stockListId:val.stockListId,
+      }
+
+      if(this.$route.query.type==3){
+        $_detailOwnSelfInventoryDetail(data).then(res=>{
+console.log(res,'库存品详情');
+ if(res.data.code == 200){
+  this.TccolumnInventoryData=res.data.data
+ }else{
+  this.TccolumnInventoryData=[]
+ }
+const _node = document.querySelector('.tableNodeS');
+setNodeHeight(_node, '', true);
+ this.TcloadingInventory=false;
+})
+      }
+
+
+    },
     //打印
     printTemplate() {
       // const orderNodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
@@ -1589,20 +1754,22 @@ export default {
         this.goodsAreaIdData = fo;
       });
     },
-    handleClick(tab, event) {
+   async handleClick(tab, event) {
+            
       console.log(tab, event);
       console.log(tab.props.name);
       this.leibiao = tab.props.name;
       if (this.leibiao == 'library') {
         //订单
-        this.getOrderList(this.page);
+      await  this.getOrderList(this.page);
       } else if (this.leibiao == 'outbound') {
         //包件
-        this.getStockUpParcelsList(this.page1);
+        await this.getStockUpParcelsList(this.page1);
       } else if (this.leibiao == 'enter') {
         //库存品
-        this.getInventoryList(this.page2);
+        await this.getInventoryList(this.page2);
       }
+      this.heightTC()
     },
     init() {
       this.height = this.setPx(document.body.clientHeight - 570);
@@ -1839,6 +2006,7 @@ export default {
 
         this.loading = false;
         this.billStockListPage(page);
+        this.heightTC()
       });
     },
 
@@ -1916,6 +2084,7 @@ export default {
       this.page1.total = a.data.data.total;
       this.loading = false;
       this.selectionClear();
+      this.heightTC()
     },
     //查询订单列表
     async getOrderList(page) {
@@ -1934,6 +2103,7 @@ export default {
       this.page.total = a.data.data.total;
       this.loading = false;
       this.selectionClear();
+      this.heightTC()
     },
     //查询库存品列表
     async getInventoryList(page) {
@@ -1952,6 +2122,7 @@ export default {
       this.page2.total = a.data.data.total;
       this.loading = false;
       this.selectionClear();
+      this.heightTC()
     },
     //转换类型
     getOwnServer(row, name, list) {

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -1000,6 +1000,7 @@ export default {
         query: {
           id: row.row.id,
           name: '备货明细',
+          type:'3'
         },
       });
     },

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -15,13 +15,19 @@
             :model="StockInfo"
             v-if="kind"
           >
-            <div class="leftInfo">
+            <div class="leftInfo el_sj" >
+            
               <el-form-item label="配送司机">
+                <el-input class="el_msj" @change='SjCxChange' clearable v-model="sjInput" placeholder="请输入要查询的司机" />
                 <el-select
                   v-model="StockInfo.Sj"
                   placeholder="请选择司机信息"
                   multiple
                   @change="SJchangeSelect"
+                  ref='sjSelect'
+                  remote
+                  :loading='sjloading'
+                  loading-text='正在加载中'
                 >
                   <el-option-group
                     v-for="group in StockInfo.DriverInformation"
@@ -37,13 +43,17 @@
                   </el-option-group>
                 </el-select>
               </el-form-item>
-
+             
               <el-form-item label="配送车辆">
+                <el-input class="el_mcl" @change='CLCxChange' clearable v-model="clInput" placeholder="请输入要查询的车辆" />
                 <el-select
                   v-model="StockInfo.Cl"
                   placeholder="请选择配送车辆"
                   multiple
                   @change="CLchangeSelect"
+                  :loading='clloading'
+                  loading-text='正在加载中'
+                  ref='clSelect'
                 >
                   <el-option-group
                     v-for="group in StockInfo.VehicleInformation"
@@ -679,10 +689,13 @@ import { updateEntryNum, entryNum } from '@/api/distribution/distributionParcelN
 import { deepClone } from '@/utils/util.js';
 const route = useRoute();
 const router = useRouter();
+
 // 获取vuex仓库
+const StockInfoCopy=ref({})//拷贝初始化表单
 const $store = useStore();
 console.log($store, '仓库');
-
+const sjInput=ref('');//司机查询输入框
+const clInput=ref('');//车辆查询输入框
 // 选项卡
 const numTab = ref([
   {
@@ -695,6 +708,8 @@ const numTab = ref([
   },
 ]);
 const num = ref(null); //计步器
+const sjSelect=ref(null)
+const clSelect=ref(null)
 const Totalnumberoforders = ref(0); //订单总件数
 const Totalnumberofitemsinstock = ref(0); //在库件数
 const kind = ref(true); //标签切换
@@ -759,6 +774,8 @@ const inputValue = ref('number'); //零担输入的值
 const dataInfoID = ref(); //点击删除保存当前ID
 /** 编辑时, 初始化司机信息 */
 const chooseDriverIds = ref([]);
+const sjloading=ref(true)
+const clloading=ref(true)
 /** 编辑时, 初始化车辆信息 */
 const chooseCarIds = ref([]);
 
@@ -766,6 +783,9 @@ const chooseCarIds = ref([]);
 // 车辆选项
 // 备货人员
 // radio1 配送类型
+const DriverInformationCopy=ref([]);//拷贝司机信息
+const VehicleInformationCopy=ref([]);//拷贝司机信息
+
 const StockInfo = ref({
   createDate: new Date(), //默认日期
   radio: 1,
@@ -804,6 +824,49 @@ const StockInfo = ref({
   TemporaryDriver: [], //临时存放司机信息
   TemporaryVehicles: [], //临时存放车辆信息
 });
+// 司机查询
+const SjCxChange = () => {
+  if (sjInput.value) {
+    console.log(sjInput.value, '查询的司机');
+    console.log(StockInfo.value, '司机');
+    StockInfo.value.DriverInformation[1].options = StockInfo.value.DriverInformation[1].options.filter(res => res.name.includes(sjInput.value));
+
+  } else {
+    StockInfo.value.DriverInformation[1].options = DriverInformationCopy.value;
+  }
+  sjSelect.value[0].visible = true; // 展开下拉框
+}
+
+// 车牌查询
+const CLCxChange = () => {
+  if (clInput.value) {
+    console.log(clInput.value, '查询的车牌');
+    console.log(StockInfo.value, '车辆信息');
+    StockInfo.value.VehicleInformation[1].options =  StockInfo.value.VehicleInformation[1].options.filter(res => res.vehicleNub.includes(clInput.value));
+  } else {
+    StockInfo.value.VehicleInformation[1].options = VehicleInformationCopy.value;
+  }
+  clSelect.value[0].visible = true; // 展开下拉框
+}
+
+
+function deepCopy(obj) {
+  if (obj === null || typeof obj !== 'object') {
+    return obj;
+  }
+
+  // 创建一个新的对象，用于存储拷贝后的数据
+  const copy = Array.isArray(obj) ? [] : {};
+
+  // 遍历原始对象的所有属性，并递归进行拷贝
+  for (let key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      copy[key] = deepCopy(obj[key]);
+    }
+  }
+
+  return copy;
+}
 
 const selectable = (row, index) => {
   // row.orderPackageReservationStatusName == '已预约' ||
@@ -813,6 +876,7 @@ const selectable = (row, index) => {
     return true; //非禁用状态
   }
 };
+const DataSubmitCopy=ref({})
 // 提交的表单
 const DataSubmit = ref({
   allocationInfo: [
@@ -877,19 +941,31 @@ const btnClass = type => {
 //页面初始化请求需要的数据
 async function Info() {
   // 车辆信息
-  getVehicleList().then(res => {
+ await getVehicleList().then(res => {
     console.log(res, '车辆信息');
     StockInfo.value.VehicleInformation[1].options = res.data.data;
     vehicle.value = res.data.data; //存一份初始化信息 用于清空选择使用
+    VehicleInformationCopy.value = res.data.data; //查询车辆
+    
     console.log(StockInfo.value.VehicleInformation, 'StockInfo.VehicleInformation');
+  }).catch(()=>{
+
+  }).finally(()=>{
+    clloading.value=false
   });
   //   司机信息
-  getDriverList().then(res => {
+ await getDriverList().then(res => {
+
     console.log(res, '司机信息');
     // StockInfo.value.DriverInformation = res.data.data;
     StockInfo.value.DriverInformation[1].options = res.data.data;
+    DriverInformationCopy.value=res.data.data;//完整的司机信息
     driver.value = res.data.data; //存一份初始化信息 用于清空选择使用
     console.log(StockInfo.value.DriverInformation, '全部司机信息');
+  }).catch(()=>{
+
+  }).finally(()=>{
+    sjloading.value=false
   });
   //   备货人员信息
   await getListUser().then(res => {
@@ -909,7 +985,7 @@ async function Info() {
     StockInfo.value.StockPersonnel = data;
   });
   //   备货区域
-  $_stockUpInfo({
+ await $_stockUpInfo({
     params: deptId.value,
   }).then(res => {
     console.log(res, '备货区域');
@@ -917,16 +993,23 @@ async function Info() {
     console.log(StockInfo.value.StockUpArea, ' StockInfo.value.StockUpArea');
   });
   //   装卸班组
-  getListTeamInfo(deptId.value).then(res => {
+ await getListTeamInfo(deptId.value).then(res => {
     console.log(res.data.data, '装卸班组');
     StockInfo.value.UnloadingTeam = res.data.data; //卸车
     StockInfo.value.LoadingTeam = res.data.data; //装车
   });
   //   外协来源-数据字典数据获取
-  getDictionaryBiz('tripartite_source').then(res => {
+ await getDictionaryBiz('tripartite_source').then(res => {
     StockInfo.value.OutsourcingSources = res.data.data;
     console.log(StockInfo.value.OutsourcingSources, '外协来源');
   });
+
+  StockInfoCopy.value = deepCopy(StockInfo.value);
+console.log(StockInfoCopy.value,'StockInfoCopy.value123');
+
+
+
+DataSubmitCopy.value= deepCopy(DataSubmit.value);
 }
 // 导航标签切换
 const tabClick = val => {
@@ -1042,7 +1125,7 @@ const menuData = ref([
     label: '序号',
     type: 12,
     values: '',
-    width: 55,
+    width: 80,
     checkarr: [],
     fixed: true,
     sortable: false,
@@ -1098,7 +1181,7 @@ const menuData = ref([
     label: '订单总件数',
     type: 2,
     values: '',
-    width: '130',
+    width: '140',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1124,7 +1207,7 @@ const menuData = ref([
     label: '运单收货人',
     type: 2,
     values: '',
-    width: '130',
+    width: '140',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1135,7 +1218,7 @@ const menuData = ref([
     label: '运单收货人电话',
     type: 1,
     values: '',
-    width: '150',
+    width: '170',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1157,7 +1240,7 @@ const menuData = ref([
     label: '商场编号',
     type: 1,
     values: '',
-    width: '130',
+    width: '140',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1168,7 +1251,7 @@ const menuData = ref([
     label: '经销商编码',
     type: 1,
     values: '',
-    width: '130',
+    width: '140',
     checkarr: [],
     fixed: false,
     sortable: true,
@@ -1406,7 +1489,7 @@ const wrap = ref([
     label: '序号',
     type: 12,
     values: '',
-    width: 55,
+    width: 100,
     checkarr: [],
     fixed: true,
     sortable: false,
@@ -2454,11 +2537,14 @@ function removeDuplicatesById(arr) {
 }
 // 选择备货人员触发
 const StockPersonnel = val => {
-  console.log(val);
+  if(val){
+    console.log(val);
   let data = [];
   data = findObjectById(val, StockInfo.value.StockPersonnel);
   DataSubmit.value.stockup.forkliftId = data.id; //备货人员ID
   DataSubmit.value.stockup.forkliftName = data.realName; //备货人员姓名
+  }
+
 };
 // 选择备货区域触发
 const StockUpSera = val => {
@@ -2470,38 +2556,47 @@ const StockUpSera = val => {
 };
 //装车班组触发
 const Loading = val => {
+  if(val){
   let data = [];
   data = findObjectById(val, StockInfo.value.LoadingTeam);
   console.log(data, '装车');
   DataSubmit.value.stockup.loaderId = data.id; //装车ID
   DataSubmit.value.stockup.loaderName = data.groupName; //装车名称
+  }
+
 };
 // 卸车班组触发
 const unload = val => {
+  if(val){
   let data = [];
   data = findObjectById(val, StockInfo.value.UnloadingTeam); //卸车ID
   DataSubmit.value.stockup.unloaderId = data.id;
   DataSubmit.value.stockup.unloaderName = data.groupName; //卸车ID
   console.log(data, '卸车');
+  }
+
 };
 // 外协来源触发
 const Outsourcing = val => {
-  let data = [];
+  if(val){
+    let data = [];
   data = findObjectById(val, StockInfo.value.OutsourcingSources);
   console.log(data);
   DataSubmit.value.tripartite.distributionCompany = data.dictValue; //外协来源赋值
+  }
+
 };
 // 选择司机触发
 const SJchangeSelect = val => {
-  if (val.length === 0) {
+  if (!val.length) {
     DataSubmit.value.masterDriverName = null; //清空司机信息
     StockInfo.value.VehicleInformation[1].options = vehicle.value; //初始化车辆
     return;
   }
-  if (val.length > 0) {
+  if (val.length) {
     let SJname = null; //用来少选第一选择的司机名称
     SJname = CurrentVehicle(val, StockInfo.value.DriverInformation[1].options);
-    console.log(SJname[0].name, '司机');
+    
     DataSubmit.value.masterDriverName = SJname[0].name;
     let data = []; //存储函数筛选后的司机车辆信息
     let dataInfo = []; //临时存储的司机车辆信息
@@ -2538,7 +2633,7 @@ const SJchangeSelect = val => {
 
 // 选择车辆触发
 const CLchangeSelect = val => {
-  if (val.length === 0) {
+  if (!val.length) {
     StockInfo.value.DriverInformation[1].options = driver.value; //初始化司机信息
     DataSubmit.value.masterVehicleNub = null; //清空司机牌照
     return;
@@ -2548,7 +2643,7 @@ const CLchangeSelect = val => {
   let dataInfo = []; //临时存储的当前车辆的所有司机信息
   let ClData = []; //临时存放车辆信息
   let ClName = null; //用来筛选第一选择的车牌信息
-  if (val.length > 0) {
+  if (val.length) {
     ClName = CurrentVehicle(val, StockInfo.value.VehicleInformation[1].options);
     DataSubmit.value.masterVehicleNub = ClName[0].vehicleNub; //处理好的车牌
     data = CurrentVehicle(val, StockInfo.value.VehicleInformation[1].options);
@@ -2733,6 +2828,7 @@ const handleBack = () => {
 
 // 最后提交订单
 const SubmitCommercial = async () => {
+
   let code = null;
   try {
     //kind为假就说明目前是在外协页面
@@ -2811,18 +2907,29 @@ const SubmitCommercial = async () => {
 
     if (code !== 200) return;
     state.value = false; //重置满足条件
-    ElMessage.success('操作成功');
-
-    ElMessageBox.alert('操作成功', '', {
-      confirmButtonText: '关闭',
-      callback: (action: Action) => {
-        handleBack();
-      },
-      type: 'success',
-      draggable: true,
-    }).catch(() => {
+    ElMessageBox.confirm(
+    '计划添加成功,是否继续添加?',
+    '提示',
+    {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }
+  )
+    .then(() => {
+StockInfo.value = StockInfoCopy.value
+StockInfoCopy.value = deepCopy(StockInfo.value);
+DataSubmit.value = DataSubmitCopy.value
+DataSubmitCopy.value= deepCopy(DataSubmit.value);
+dataInfo.value=[]
+clInput.value=''
+sjInput.value=''
+    })
+    .catch(() => {
       handleBack();
-    });
+    })
+
+
   }
   console.log(DataSubmit.value, '准备提交的信息');
 };
@@ -3400,4 +3507,23 @@ const SubmitCommercial = async () => {
   min-width: 300px;
   font-size: 14px;
 }
+
+
+
+:deep(.el_sj){
+  position: relative;
+  .el-form-item__label{
+    margin-bottom: 30px;
+  }
+}
+.el_msj{
+  position: absolute;
+    top: -32px;
+    width: 66.8%;
+}
+.el_mcl{
+  position: absolute;
+    top: -32px;
+    width: 66.8%;
+}
 </style>

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -1848,6 +1848,7 @@ export default {
             this.deliveryDriver = b;
             this.driverList = b;
             this.driverInfo = driverInfo;
+            this.loadingObj.pageLoading=false
           } else {
             let deliveryTripartiteVO = deliveryData.deliveryTripartiteVO;
             this.aaa = false;
@@ -1858,10 +1859,17 @@ export default {
             this.waixieForm.vehicleNum = deliveryTripartiteVO.vehicleNum;
             this.waixieForm.driverPhone = deliveryTripartiteVO.driverPhone;
             this.waixieForm.deliveryFee = deliveryTripartiteVO.deliveryFee;
+            this.loadingObj.pageLoading=false
           }
+        }).catch(()=>{
+          
+        }).finally(()=>{
+        
+          this.loading = false;
         });
       }
-      this.loading = false;
+ 
+   
     },
   },
 };

src/views/warehouse/parcelList/distributionParcelList.vue

@@ -314,7 +314,7 @@ export default {
           label: '服务类型',
           type: 2,
           values: '',
-          width: '80',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -325,7 +325,7 @@ export default {
           label: '提货批次',
           type: 2,
           values: '',
-          width: '80',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -336,7 +336,7 @@ export default {
           label: '装车时间',
           type: 2,
           values: '',
-          width: '100',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -348,7 +348,7 @@ export default {
           label: '客户车次号',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -390,7 +390,7 @@ export default {
           label: '备货状态',
           type: 3,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -439,7 +439,7 @@ export default {
           label: '上架状态',
           type: 3,
           values: '',
-          width: '90',
+          width: '140',
           checkarr: [
             {
               label: '待上架',
@@ -468,7 +468,7 @@ export default {
           label: '预约单编号',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -508,7 +508,7 @@ export default {
           label: '实际装车人',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -528,7 +528,7 @@ export default {
           label: '实际签收人',
           type: 2,
           values: '',
-          width: '130',
+          width: '140',
           checkarr: [],
           fixed: false,
           sortable: true,
@@ -548,7 +548,7 @@ export default {
           label: '配送车次号',
           type: 2,
           values: '',
-          width: '130',
+          width: '150',
           checkarr: [],
           fixed: false,
           sortable: true,

src/views/warehouse/warehousesignedorder/distributionStockArticle.vue

@@ -5,12 +5,48 @@
       <!-- 搜索模块 -->
       <el-row v-if="search">
         <!-- 查询模块 -->
-        <el-form :inline="true" :model="query" class="el-fr-d">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="TopQuery" class="el-fr-d">
           <!-- 查询按钮 -->
-          <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>
+
+          <div class="el_top_left">
+            <div> 
+    
+            <el-form-item label="最新入库时间">
+              <el-date-picker
+                v-model="TopQuery.warehouseEntryTime"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                format="YYYY-MM-DD"
+                date-format="YYYY/MM/DD"
+                time-format="A"
+                @change="Toptiem"
+              />
+            </el-form-item>
+
+            <el-form-item label="文员复核时间">
+              <el-date-picker
+                v-model="TopQuery.signinTime"
+                type="datetimerange"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                format="YYYY-MM-DD"
+                date-format="YYYY/MM/DD"
+                time-format="A"
+                @change="Toptiem"
+              />
+            </el-form-item>
+          </div>
+
+            <!-- 查询按钮 -->
+            <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>
+          </div>
         </el-form>
       </el-row>
 
@@ -19,8 +55,7 @@
         <div class="avue-crud__header">
           <!-- 头部左侧按钮模块 -->
           <div class="avue-crud__left">
-            <el-button type="primary" @click="AddInfo">
-              <el-icon><Plus /></el-icon>导出</el-button
+          <el-button type="primary" @click="AddInfo"><el-icon><Download /></el-icon>导出</el-button
             >
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -36,7 +71,7 @@
       <el-row>
         <!-- 列表模块 -->
         <tablecmt
-	  class="tableNode"
+          class="tableNode"
           :columnList="columnList"
           :tableData="data"
           :loading="loadingObj.list"
@@ -47,6 +82,27 @@
           @selection="selectionChange"
         >
           <template #default="slotProps">
+            <template v-if="slotProps.scope.column.label === '订单自编号'">
+              <el-text class="el_textBtn" @click="OrdernumberClick(slotProps.scope.row)">
+                {{
+                  slotProps.scope.column.label === '订单自编号'
+                    ? slotProps.scope.row.orderCode
+                    : ''
+                }}
+              </el-text>
+            </template>
+
+            <template v-if="slotProps.scope.column.label === '预约信息'">
+              <el-text class="el_textBtn" @click="informationClick(slotProps.scope.row)">
+                {{
+                  slotProps.scope.column.label === '预约信息'
+                    ? slotProps.scope.row.reservationInfo
+                    : ''
+                }}
+              </el-text>
+            </template>
+
+            
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="ElBtnClass">
                 <el-button @click="view(slotProps.scope)">查看</el-button>
@@ -89,12 +145,15 @@
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
 import { columnList } from '@/option/warehouse/distributionStockArticle.js';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
-import { processRowProperty,setNodeHeight } from '@/utils/util';	
-import {$_signforList } from '@/api/distribution/distributionStockArticle.js';
+import { processRowProperty, setNodeHeight } from '@/utils/util';
+import { $_signforList } from '@/api/distribution/distributionStockArticle.js';
 import functions from '@/utils/functions.js';
 import { ElMessageBox } from 'element-plus';
-import { downloadXls } from '@/utils/util'; 
+const $router = useRouter();//跳转
+import { useStore } from 'vuex';
 import dayjs from 'dayjs';
+const TopQuery = ref({});
+const queryCarn = ref({});
 const details = reactive({
   /** 是否开启搜索 */
   search: false,
@@ -136,7 +195,7 @@ const details = reactive({
   columnList,
 
   /** 列表数据 */
-  data: [{}],
+  data: [],
   /** 页面loading */
   loadingObj: {
     /** 列表加载loading */
@@ -213,7 +272,6 @@ const showdrawer = _flag => {
 const inputsc = (index, row) => {
   details.query[row.prop] = index;
   processRowProperty(index, row, details);
-    
 };
 // 实例函数
 
@@ -244,31 +302,56 @@ const selectionChange = list => {
 };
 // 网页顶部搜索按钮
 const searchChange = () => {
-  details.search = false; //关闭搜索
+  // 日期处理
+  if (TopQuery.value.warehouseEntryTime) {
+    queryCarn.value.startTaskTime = dayjs(TopQuery.value.warehouseEntryTime[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.endTaskTime = dayjs(TopQuery.value.warehouseEntryTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+  } else {
+    delete queryCarn.value.warehouseEntryTimestartTaskTime;
+    delete queryCarn.value.warehouseEntryTimeendTaskTime;
+  }
+
+  if (TopQuery.value.signinTime) {
+    queryCarn.value.startTaskTime = dayjs(TopQuery.value.signinTime[0]).format('YYYY-MM-DD HH:mm:ss'); //开始日期
+    queryCarn.value.endTaskTime = dayjs(TopQuery.value.signinTime[1]).format('YYYY-MM-DD HH:mm:ss'); //结束日期
+  } else {
+    delete queryCarn.value.signinTimestartTaskTime;
+    delete queryCarn.value.signinTimeendTaskTime;
+  }
+
   getrain();
 };
 // 每页多少条
 const sizeChange = val => {
   page.value.pageSize = val;
+  getrain();
 };
 /** 页码改变执行的回调 */
 const currentChange = val => {
   page.value.currentPage = val;
+  getrain();
 };
 // 刷新按钮
 const searchChangeS = () => {
-  // details.columnList.forEach(item => {
-  //   item.values = '';
-  // });
   details.search = false; //关闭搜索
+  getrain();
 };
 // 顶部搜索
 const searchHide = () => {
   console.log(details);
   details.search = !details.search;
- const _node = document.querySelector('.tableNode');
+  const _node = document.querySelector('.tableNode');
   setNodeHeight(_node, '', true);
 };
+// 清空
+const searchReset = () => {
+  details.query = {};
+  details.columnList.forEach(item => {
+    item.values = '';
+  });
+  details.page.total = 0;
+  details.data = [];
+};
 // 字典公共函数
 function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
@@ -309,28 +392,62 @@ function updateDictionary(targetArray, dictionaryType) {
 // };
 // onLoad();
 
-
-
 // 获取数据
-const getrain=()=>{
-    let data={
-        current:details.page.currentPage,
-        size:details.page.pageSize,
-        ...details.query,
-    }
-    details.loadingObj.list=true
-    $_signforList(data).then(res=>{
-        console.log(res,'当前参数');
-        details.page.total  =  res.data.data.total
-        details.data = res.data.data.records
-  
-    }).catch(()=>{
-        
-    }).finally(()=>{
-        details.loadingObj.list=false
+const getrain = () => {
+  let data = {
+    current: details.page.currentPage,
+    size: details.page.pageSize,
+    ...details.query,
+    ...queryCarn.value,
+  };
+  details.loadingObj.list = true;
+  $_signforList(data)
+    .then(res => {
+      console.log(res, '当前参数');
+      details.page.total = res.data.data.total;
+      details.data = res.data.data.records;
     })
+    .catch(() => {})
+    .finally(() => {
+      details.loadingObj.list = false;
+    });
+};
+// getrain();
+
+const removeParentheses=(str)=>{
+      const index = str.indexOf("("); // 找到左括号的位置
+      if (index !== -1) {
+        return str.substring(0, index); // 删除左括号及其后面的内容
+      }
+      return str;
+    }
+// 预约信息
+const informationClick=(val)=>{
+  return
+  console.log(val,'预约信息');
+ let data= removeParentheses(val.reservationInfo)
+ console.log(data,'处理好的数据');
+
+ $router.push({
+      path: '/distribution/signfor/distributionSignforedt',
+      query: {
+        id:'1772931455518982145',
+        reservationId:'1772875103987769346',
+        name: '1772875103987769346' + '-预约单详情',
+      },
+    });
+}
+
+const OrdernumberClick=(val)=>{
+  $router.push({
+    path: '/distribution/inventory/distributionStockArticleDetails',
+      query: {
+        id:val.id,
+        name: `${val.orderCode}预约单详情`,
+        isZero:0,
+      },
+    });
 }
-getrain()
 </script>
 
 <style scoped lang="scss">